Commit 8ce30633 8ce3063351c0139d8f1fa1c30d5c8de28050883e by Sergey Poznyakoff

Minor changes to configure

* configure.ac: Assume tokyo|kyoto cabinet will pull the
necessary dependencies.
Add GINT_LDADD if necessary
* gint: Upgrade
1 parent ed9454c6
......@@ -567,7 +567,6 @@ check_dbm_impl() {
[AC_CHECK_HEADERS(tchdb.h,
AC_DEFINE(WITH_TOKYOCABINET,1,
[Enable use of Tokyo Cabinet]))
DBMLIB_DEPENDENCY="$DBMLIB_DEPENDENCY -lz -lbz2 -lrt"
DBMLIBS="$DBMLIBS -ltokyocabinet"
status_dbm="$status_dbm,Tokyo Cabinet"]);;
......@@ -576,7 +575,6 @@ check_dbm_impl() {
[AC_CHECK_HEADERS(kclangc.h,
AC_DEFINE(WITH_KYOTOCABINET,1,
[Enable use of Kyoto Cabinet]))
DBMLIB_DEPENDENCY="$DBMLIB_DEPENDENCY -lz -lbz2 -lrt"
DBMLIBS="$DBMLIBS -lkyotocabinet"
status_dbm="$status_dbm,Kyoto Cabinet"]);;
esac
......@@ -1169,6 +1167,9 @@ GINT_INIT([gint],[1.8 with-guile],
LIBMU_SCM_DEPS='${MU_LIB_MBOX} ${MU_LIB_IMAP} ${MU_LIB_POP} ${MU_LIB_MH} ${MU_LIB_MAILDIR} ${MU_LIB_MAILER}'
MU_GUILE_SIEVE_MOD_DIR='$(GUILE_SITE)/$(PACKAGE)/sieve-modules'
GINT_INCLUDES='${MU_APP_COMMON_INCLUDES}'
if test $REPLACE_STRERROR = 1; then
GINT_LDADD='${top_builddir}/lib/gnu/libgnu.la'
fi
],[useguile=no])
AM_CONDITIONAL([MU_COND_LIBMU_SCM],[test "$useguile" = "yes"])
......
gint @ acb32e84
Subproject commit 42f4712085b40173eaea58e14b1a579291a6fe3a
Subproject commit acb32e84269f1c00b5f1cdd03a920420dcdfa2bc
......