commit dcf91e5545c7982007135e32b03e73e58a9e50d9 from: Paul Mangan date: Mon Aug 9 16:49:47 2004 UTC 2004-08-09 [paul] 0.9.12cvs55.3 * configure.ac * src/Makefile.am * src/common/Makefile.am sync with HEAD commit - 2dcd5aa0bfe3a60aa917a7805272da71dcd32545 commit + dcf91e5545c7982007135e32b03e73e58a9e50d9 blob - f12d1a843dceb48ddfcfba4fe297c536ee64091d blob + a1c8c34ab54e8cb54b9553881df68a22d30ad064 --- ChangeLog-gtk2.claws +++ ChangeLog-gtk2.claws @@ -1,3 +1,11 @@ +2004-08-09 [paul] 0.9.12cvs55.3 + + * configure.ac + * src/Makefile.am + * src/common/Makefile.am + sync with HEAD + + 2004-08-09 [paul] 0.9.12cvs55.2 * autogen.sh blob - 2af509475de192738c67f66a5c5c34dfa90d0ccd blob + d3aad81de559aa4f9c94da0c933191f86378e4b3 --- PATCHSETS +++ PATCHSETS @@ -110,3 +110,4 @@ ( cvs diff -u -r 1.396.2.7 -r 1.396.2.8 ChangeLog; cvs diff -u -r 1.2504.2.10 -r 1.2504.2.11 ChangeLog.claws; cvs diff -u -r 1.391.2.7 -r 1.391.2.8 ChangeLog.jp; cvs diff -u -r 1.654.2.138 -r 1.654.2.139 configure.ac; cvs diff -u -r 1.53.2.5 -r 1.53.2.6 po/POTFILES.in; cvs diff -u -r 1.155.2.7 -r 1.155.2.8 src/Makefile.am; cvs diff -u -r 1.3.2.2 -r 1.3.2.3 src/folderutils.c; cvs diff -u -r 1.115.2.12 -r 1.115.2.13 src/main.c; cvs diff -u -r -1.10.2.3 -r -1.10.2.4 src/pgpmime.c; cvs diff -u -r -1.1.4.1 -r -1.1.4.2 src/pgpmime.h; cvs diff -u -r -1.12.2.4 -r -1.12.2.5 src/sgpgme.c; cvs diff -u -r -1.4.2.2 -r -1.4.2.3 src/sgpgme.h; cvs diff -u -r 1.8 -r 1.9 src/plugins/Makefile.am; cvs diff -u -r 0 -r 1 src/plugins/pgpmime/.cvsignore; cvs diff -u -r 0 -r 1 src/plugins/pgpmime/Makefile.am; cvs diff -u -r 0 -r 1 src/plugins/pgpmime/pgpmime.c; cvs diff -u -r 0 -r 1 src/plugins/pgpmime/pgpmime.h; cvs diff -u -r 0 -r 1 src/plugins/pgpmime/plugin.c; cvs diff -u -r 0 -r 1 src/plugins/pgpmime/sgpgme.c; cvs diff -u -r 0 -r 1 src/plugins/pgpmime/sgpgme.h; ) > 0.9.12cvs54.1.patchset ( cvs diff -u -r 1.115.2.13 -r 1.115.2.14 src/main.c; cvs diff -u -r 1.9.2.4 -r 1.9.2.5 src/common/ssl.c; cvs diff -u -r 1.7.2.1 -r 1.7.2.2 src/common/sylpheed.c; cvs diff -u -r 1.5 -r 1.6 src/common/sylpheed.h; ) > 0.9.12cvs55.1.patchset ( cvs diff -u -r 1.4.2.2 -r 1.4.2.3 autogen.sh; cvs diff -u -r 1.654.2.140 -r 1.654.2.141 configure.ac; cvs diff -u -r -1.1.2.1 -r -1.1.2.2 po/poconv.sh; ) > 0.9.12cvs55.2.patchset +( cvs diff -u -r 1.654.2.141 -r 1.654.2.142 configure.ac; cvs diff -u -r 1.155.2.8 -r 1.155.2.9 src/Makefile.am; cvs diff -u -r 1.24.2.3 -r 1.24.2.4 src/common/Makefile.am; ) > 0.9.12cvs55.3.patchset blob - ce77e6b0c2b2a1d3a540e201f2f3f1363e99eb0d blob + 148543c20aaa1d9c81188f15f26cd554964ad960 --- configure.ac +++ configure.ac @@ -13,7 +13,7 @@ INTERFACE_AGE=0 BINARY_AGE=0 EXTRA_VERSION=55 EXTRA_RELEASE= -EXTRA_GTK2_VERSION=.2 +EXTRA_GTK2_VERSION=.3 if test \( $EXTRA_VERSION -eq 0 \) -o \( "x$EXTRA_RELEASE" != "x" \); then VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}${EXTRA_RELEASE}${EXTRA_GTK2_VERSION} @@ -366,13 +366,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 @@ -382,11 +409,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 ]) @@ -417,8 +440,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 @@ -576,9 +597,6 @@ fi AC_SUBST(CLAMAV_LIBS) AM_CONDITIONAL(BUILD_CLAMAV_PLUGIN, test x"$ac_cv_enable_clamav_plugin" = xyes) -AC_CHECK_LIB(pthread, pthread_create, - [ OPENSSL_LIBS="$OPENSSL_LIBS -lpthread" AC_DEFINE(USE_PTHREAD, 1, Define if you have lpthread) ]) - dnl **************************** dnl ** Final configure output ** dnl **************************** blob - debbcab0059514fb9263095128e2ea3e82e91977 blob + 1da9c7d36c04343fe726ba58b14693f023ac5c7a --- src/Makefile.am +++ src/Makefile.am @@ -368,6 +368,7 @@ sylpheed_LDADD = \ $(OPENSSL_LIBS) \ $(COMPFACE_LIBS) \ $(JPILOT_LIBS) \ + $(PTHREAD_LIBS) \ $(LIBICONV) AM_CPPFLAGS = \ blob - 5a7ff1e6981f4937fbb31df9f56fb311f2d476bf blob + 759273cddddc9bc7970cecb941687b78b4023196 --- src/common/Makefile.am +++ src/common/Makefile.am @@ -69,7 +69,8 @@ AM_CPPFLAGS = \ libsylpheedcommon_la_LIBADD = \ $(GLIB_LIBS) \ $(OPENSSL_LIBS) \ - $(CRYPT_LIBS) + $(CRYPT_LIBS) \ + $(PTHREAD_LIBS) EXTRA_DIST = \ version.h.in