2005-08-07 [colin] 1.9.13cvs24

[claws.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 83b1d1d7cbc4632b337495b91e004c65c34528ce..225689dd28f51d3ef2dcaa939cb80c9876fe3f31 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -8,10 +8,10 @@ PACKAGE=sylpheed-claws
 dnl version number
 MAJOR_VERSION=1
 MINOR_VERSION=9
-MICRO_VERSION=12
+MICRO_VERSION=13
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=82
+EXTRA_VERSION=24
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
@@ -142,7 +142,7 @@ AC_CHECK_FUNCS(bind_textdomain_codeset)
 LIBS=$syl_save_LIBS
 
 dnl for gettext
-ALL_LINGUAS="bg ca cs de el en_GB es fi fr hr hu it ja ko nl pl pt_BR ru sk sr sv zh_CN zh_TW.Big5"
+ALL_LINGUAS="bg ca cs de el en_GB es fi fr hr hu it ja ko nb nl pl pt_BR ru sk sr sv zh_CN zh_TW.Big5"
 GETTEXT_PACKAGE=sylpheed-claws
 AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Define text domain.])
@@ -419,6 +419,29 @@ else
 fi
 AC_SUBST(PTHREAD_LIBS)
 
+t_oldLibs="$LIBS"
+LIBS="$LIBS"
+ac_cv_var__res_options=no
+AC_TRY_LINK([#include <sys/types.h>
+            #include <sys/socket.h>
+            #include <netinet/in.h>
+            #include <arpa/nameser.h>
+            #include <resolv.h>],
+               [_res.options = RES_INIT;],
+               ac_cv_var__res_options=yes);
+if test "$ac_cv_var__res_options" != "yes"; then
+       LIBRESOLV="-lresolv"
+fi
+LIBS="$t_oldLibs"
+
+if test "x$LIBRESOLV" = "x"; then
+       AC_CHECK_LIB(resolv, res_query, [LIBRESOLV=-lresolv])
+       LIBS="$t_oldLibs"
+fi
+AC_SUBST(LIBRESOLV)
+
+LIBS="$LIBS $LIBRESOLV"
+                
 dnl for LDAP support in addressbook
 dnl no check for libraries; dynamically loaded
 AC_ARG_ENABLE(ldap,
@@ -592,6 +615,23 @@ else
 fi
 AM_CONDITIONAL(BUILD_PGPMIME_PLUGIN, test x"$ac_cv_enable_pgpmime_plugin" = xyes)
 
+AC_MSG_CHECKING([whether to build PGP/Inline plugin])
+AC_ARG_ENABLE(pgpinline-plugin,
+       [  --disable-pgpinline-plugin           Do not build PGP/Inline plugin],
+       [ac_cv_enable_pgpinline_plugin=$enableval], [ac_cv_enable_pgpinline_plugin=yes])
+if test x"$ac_cv_enable_pgpinline_plugin" = xyes; then
+       AC_MSG_RESULT(yes)
+       if test x"$ac_cv_enable_pgpcore_plugin" = xyes; then
+               PLUGINS="pgpinline $PLUGINS"
+       else
+               AC_MSG_WARN([*** PGP/Inline plugin cannot be built ***])
+               AC_MSG_WARN([*** without the PGP/CORE plugin     ***])
+       fi
+else
+       AC_MSG_RESULT(no)
+fi
+AM_CONDITIONAL(BUILD_PGPINLINE_PLUGIN, test x"$ac_cv_enable_pgpinline_plugin" = xyes)
+
 dnl --- MathML Viewer ---
 AC_MSG_CHECKING([whether to build MathML-Viewer plugin])
 AC_ARG_ENABLE(mathml-viewer-plugin,
@@ -742,6 +782,7 @@ src/plugins/trayicon/libeggtrayicon/Makefile
 src/plugins/clamav/Makefile
 src/plugins/pgpcore/Makefile
 src/plugins/pgpmime/Makefile
+src/plugins/pgpinline/Makefile
 doc/Makefile
 doc/faq/Makefile
 doc/faq/de/Makefile