0.9.6claws61

* configure.ac
* ac/openssl.m4
* ac/spamassassin.m4
* src/Makefile.am
        use extra variables for all libraries to make sure plugins
        are only linked with libraries they really need. $LIBS is always
        added to the linking parameters, but we only what the libraries
        listed in the Makefile

diff --git a/ChangeLog.claws b/ChangeLog.claws
index e93212b19cfef4a4aac69fe7d2a6c8d772db9f91..54687283d2e502ed02228c79e7b4cc61d8c38e6e 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,14 @@
+2003-10-30 [christoph] 0.9.6claws61
+
+       * configure.ac
+       * ac/openssl.m4
+       * ac/spamassassin.m4
+       * src/Makefile.am
+               use extra variables for all libraries to make sure plugins
+               are only linked with libraries they really need. $LIBS is always
+               added to the linking parameters, but we only what the libraries
+               listed in the Makefile
+
 2003-10-29 [paul]      0.9.6claws60
 
        * src/mimeview.c

diff --git a/ac/openssl.m4 b/ac/openssl.m4
index ad2013dd729c97914889d46eaba199e507fda49d..7aa3cc0dc3456a692729fb3beba5d323a3439953 100644 (file)
--- a/ac/openssl.m4
+++ b/ac/openssl.m4
@@ -38,8 +38,6 @@ AC_DEFUN(AM_PATH_OPENSSL,
                AC_ARG_WITH(openssl-libs, [  --with-openssl-libs=PREFIX         Location of OpenSSL libs.],
                        with_openssl_libs="$withval")
                if test "x${with_openssl_libs}" != "xno" -a "x${have_openssl_includes}" != "xno"; then
-                       LIBS_save="$LIBS"
-       
                        case $with_openssl_libs in
                        ""|-L*) ;;
                        *) with_openssl_libs="-L$with_openssl_libs" ;;
@@ -48,6 +46,7 @@ AC_DEFUN(AM_PATH_OPENSSL,
                        AC_CHECK_LIB(dl, dlopen, DL_LIBS="-ldl", DL_LIBS="")
                        AC_CACHE_CHECK([for OpenSSL libraries], openssl_libs,
                        [
+                               LIBS_save="$LIBS"
                                LIBS="$LIBS $with_openssl_libs -lssl -lcrypto $DL_LIBS"
                                AC_TRY_LINK_FUNC(SSL_read, openssl_libs="yes", openssl_libs="no")
                                LIBS="$LIBS_save"

diff --git a/ac/spamassassin.m4 b/ac/spamassassin.m4
index 67e4a97f54d72b1362523dcce0b6df4fcfd91602..9f783aa5136ea6eae3f715d9bf72acb23a288c9f 100644 (file)
--- a/ac/spamassassin.m4
+++ b/ac/spamassassin.m4
@@ -21,13 +21,6 @@ fi
 
 dnl ----------------------------------------------------------------------
 
-AC_CHECK_LIB(socket, socket)
-AC_CHECK_LIB(crypto, CRYPTO_lock)
-AC_CHECK_LIB(ssl, SSL_CTX_free,,,-lcrypto)
-AC_CHECK_LIB(inet, connect)
-AC_CHECK_LIB(nsl, t_accept)
-AC_CHECK_LIB(dl, dlopen)
-
 AC_CHECK_FUNCS(socket strdup strtod strtol snprintf shutdown)
 
 dnl ----------------------------------------------------------------------

diff --git a/configure.ac b/configure.ac
index 9dd448501c12e7d94ea7f354a32866fe5525f76b..5959301c960e5501c108add108b976427cd2eb23 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=6
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=60
+EXTRA_VERSION=61
 if test $EXTRA_VERSION -eq 0; then
     VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}claws
 else
@@ -291,8 +291,20 @@ dnl Check for X-Face support
 AC_ARG_ENABLE(compface,
        [  --disable-compface      Do not use compface (X-Face)],
        [ac_cv_enable_compface=$enableval], [ac_cv_enable_compface=yes])
-if test "$ac_cv_enable_compface" = yes; then
-       AC_CHECK_LIB(compface, uncompface,,[ac_cv_enable_compface=no])
+AC_MSG_CHECKING([whether to use compface])
+if test x"$ac_cv_enable_compface" = xyes; then
+       AC_MSG_RESULT(yes)
+       AC_CHECK_LIB(compface, uncompface, 
+               [AC_DEFINE(HAVE_LIBCOMPFACE, 1, Define if you want compface support.)],
+               [ac_cv_enable_compface=no])
+       if test x"$ac_cv_enable_compface" = xyes; then
+               COMPFACE_LIBS="-lcompface"
+       else
+               COMPFACE_LIBS=""
+       fi
+       AC_SUBST(COMPFACE_LIBS)
+else
+       AC_MSG_RESULT(no)
 fi
 
 dnl for LDAP support in addressbook
@@ -355,12 +367,14 @@ if test "$ac_cv_enable_jpilot" = yes; then
                                 [ ac_cv_enable_jpilot=yes
                                   AC_DEFINE(USE_JPILOT, 1, Define if you want JPilot support in addressbook.) ])
        fi
-       AC_MSG_CHECKING([whether jpilot is available])
-       AC_MSG_RESULT($ac_cv_enable_jpilot)
 
-       if test "$ac_cv_enable_jpilot" = yes; then
-               LIBS="$LIBS -lpisock"
+       AC_CHECK_LIB(pisock, unpack_Address, [JPILOT_LIBS="-lpisock"], [JPILOT_LIBS="" ac_cv_enable_jpilot="no"])
+       if test x"$ac_cv_enable_jpilot" = xyes; then
+               AC_DEFINE(USE_JPILOT, 1, Define if you want JPilot support in addressbook.)
+       else
+               AC_MSG_NOTICE([JPilot support not available])
        fi
+       AC_SUBST(JPILOT_LIBS)
 else
        AC_MSG_RESULT(no)
 fi

diff --git a/src/Makefile.am b/src/Makefile.am
index 17ecbe89366afd19ee2b25bc92ebc82fcee8825c..5fdc49bcb0a7cd75858e7b7546d51b48b36b6410 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -347,6 +347,8 @@ sylpheed_LDADD = \
        $(GPGME_LIBS) \
        $(LDAP_LIBS) \
        $(OPENSSL_LIBS) \
+       $(COMPFACE_LIBS) \
+       $(JPILOT_LIBS) \
        $(LIBICONV)
 
 AM_CPPFLAGS = \