2004-10-13 [colin] 0.9.12cvs126

[claws.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index bb72f76be7c9e5b670ccec10267d3e378a261163..b027c137fa1aecab300e44dca246e0d18291d76e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=12
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=44
+EXTRA_VERSION=126
 EXTRA_RELEASE=
 
 if test \( $EXTRA_VERSION -eq 0 \) -o \( "x$EXTRA_RELEASE" != "x" \); then
@@ -240,7 +240,9 @@ AC_ARG_ENABLE(openssl,
        [ac_cv_enable_openssl=$enableval], [ac_cv_enable_openssl=yes])
 if test x"$ac_cv_enable_openssl" = xyes; then
        PKG_CHECK_MODULES(OPENSSL, openssl >= 0.9.7, :, ac_cv_enable_openssl=no)
-       AC_DEFINE(USE_OPENSSL, 1, Define if you want OpenSSL support)
+       if test x$ac_cv_enable_openssl = xyes; then
+               AC_DEFINE(USE_OPENSSL, 1, Define if you want OpenSSL support)
+       fi
 fi
 AC_SUBST(OPENSSL_CFLAGS)
 AC_SUBST(OPENSSL_LIBS)
@@ -337,13 +339,40 @@ else
        AC_MSG_RESULT(no)
 fi
 
+dnl check for pthread support
+AC_ARG_ENABLE(pthread,
+       [  --disable-pthread           Disable pthread support],
+       [ac_cv_enable_pthread=$enableval], [ac_cv_enable_pthread=yes])
+AC_MSG_CHECKING([whether to use pthread])
+if test x$ac_cv_enable_pthread = xno; then
+       AC_MSG_RESULT(no)
+else
+       AC_MSG_RESULT(yes)
+
+       AC_CHECK_LIB(pthread, pthread_create, :, ac_cv_enable_pthread=no)
+       AC_CHECK_HEADERS(pthread.h, :, ac_cv_enable_pthread=no)
+
+       if test x$ac_cv_enable_pthread = xyes; then
+               AC_DEFINE(USE_PTHREAD, 1, Define if you have pthread)
+               PTHREAD_LIBS="-lpthread"
+       fi
+
+fi
+AC_SUBST(PTHREAD_LIBS)
+
 dnl for LDAP support in addressbook
 dnl no check for libraries; dynamically loaded
 AC_ARG_ENABLE(ldap,
        [  --enable-ldap           Enable LDAP support [default=no]],
        [ac_cv_enable_ldap=$enableval], [ac_cv_enable_ldap=no])
 AC_MSG_CHECKING([whether to use LDAP])
-if test "$ac_cv_enable_ldap" = yes; then
+if test x"$ac_cv_enable_ldap" = xno; then
+       AC_MSG_RESULT(no)
+elif test x"$ac_cv_enable_ldap" = xyes -a x"$ac_cv_enable_pthread" = xno; then
+       AC_MSG_RESULT(no - LDAP support needs pthread support)
+
+       ac_cv_enable_ldap=no
+else
        AC_MSG_RESULT(yes)
 
        dnl check for available libraries, and pull them in
@@ -353,11 +382,7 @@ if test "$ac_cv_enable_ldap" = yes; then
        AC_CHECK_LIB(lber, ber_get_tag, LDAP_LIBS="$LDAP_LIBS -llber",,
                     $LDAP_LIBS)
 
-       dnl we need libpthread for sylpheed ldap,  until we find
-       dnl a better way to handle ldap requests asynchronously...
-       AC_CHECK_LIB(pthread, pthread_create, LDAP_LIBS="$LDAP_LIBS -lpthread")
-
-       AC_CHECK_HEADERS(ldap.h lber.h pthread.h,
+       AC_CHECK_HEADERS(ldap.h lber.h,
                         [ ac_cv_enable_ldap=yes ],
                         [ ac_cv_enable_ldap=no ])
 
@@ -388,8 +413,6 @@ if test "$ac_cv_enable_ldap" = yes; then
                        AC_DEFINE(USE_LDAP_TLS, 1, Define if you want LDAP TLS support in addressbook.)
                fi
        fi
-else
-       AC_MSG_RESULT(no)
 fi
 
 dnl for JPilot support in addressbook
@@ -434,6 +457,27 @@ else
        AC_MSG_RESULT(no)
 fi
 
+dnl #######################################################################
+dnl # Check for startup notification
+dnl #######################################################################
+AC_ARG_ENABLE(startup-notification, [  --disable-startup-notification    compile without startup notification support],,enable_startup_notification=yes)
+
+if test "x$enable_startup_notification" = "xyes"; then
+       PKG_CHECK_MODULES(STARTUP_NOTIFICATION, libstartup-notification-1.0 >= 0.5,
+       [
+               AC_DEFINE(HAVE_STARTUP_NOTIFICATION, 1, [Define if we're using libstartup-notification.])
+               echo "Building with libstartup-notification"
+               enable_startup_notification=yes
+       ],
+       [
+               echo "Building without libstartup-notification"
+               enable_startup_notification=no
+       ])
+
+       AC_SUBST(STARTUP_NOTIFICATION_CFLAGS)
+       AC_SUBST(STARTUP_NOTIFICATION_LIBS)
+fi
+
 dnl *************************
 dnl ** section for plugins **
 dnl *************************
@@ -459,6 +503,21 @@ if test x"$ac_cv_enable_spamassassin_plugin" = xyes; then
 fi
 AM_CONDITIONAL(BUILD_SPAMASSASSIN_PLUGIN, test x"$ac_cv_enable_spamassassin_plugin" = xyes)
 
+dnl --- PGP/MIME ---
+AC_ARG_ENABLE(pgpmime-plugin,
+       [  --disable-pgpmime-plugin           Do not build PGP/MIME plugin],
+       [ac_cv_enable_pgpmime_plugin=$enableval], [ac_cv_enable_pgpmime_plugin=yes])
+if test x"$ac_cv_enable_pgpmime_plugin" = xyes; then
+       if test x"$ac_cv_enable_gpgme" != xyes; then
+               ac_cv_enable_pgpmime_plugin=no
+       fi
+
+       if test x"$ac_cv_enable_pgpmime_plugin" = xyes; then
+               PLUGINS="pgpmime $PLUGINS"
+       fi
+fi
+AM_CONDITIONAL(BUILD_PGPMIME_PLUGIN, test x"$ac_cv_enable_pgpmime_plugin" = xyes)
+
 dnl --- MathML Viewer ---
 AC_ARG_ENABLE(mathml-viewer-plugin,
        [  --disable-mathml-viewer-plugin    Do not build MathML-Viewer plugin],
@@ -568,6 +627,7 @@ src/plugins/image_viewer/Makefile
 src/plugins/trayicon/Makefile
 src/plugins/trayicon/libeggtrayicon/Makefile
 src/plugins/clamav/Makefile
+src/plugins/pgpmime/Makefile
 doc/Makefile
 doc/faq/Makefile
 doc/faq/de/Makefile