Skip to content

John McEleney / mailutils

Go to a project
Toggle navigation
Toggle navigation pinning
Commit 8ce30633 8ce3063351c0139d8f1fa1c30d5c8de28050883e by Sergey Poznyakoff
Options

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
Inline Side-by-side
Showing 2 changed files with 4 additions and 3 deletions
...@@ -567,7 +567,6 @@ check_dbm_impl() { ...@@ -567,7 +567,6 @@ check_dbm_impl() {
567 [AC_CHECK_HEADERS(tchdb.h, 567 [AC_CHECK_HEADERS(tchdb.h,
568 AC_DEFINE(WITH_TOKYOCABINET,1, 568 AC_DEFINE(WITH_TOKYOCABINET,1,
569 [Enable use of Tokyo Cabinet])) 569 [Enable use of Tokyo Cabinet]))
570 DBMLIB_DEPENDENCY="$DBMLIB_DEPENDENCY -lz -lbz2 -lrt"
571 DBMLIBS="$DBMLIBS -ltokyocabinet" 570 DBMLIBS="$DBMLIBS -ltokyocabinet"
572 status_dbm="$status_dbm,Tokyo Cabinet"]);; 571 status_dbm="$status_dbm,Tokyo Cabinet"]);;
573 572
...@@ -576,7 +575,6 @@ check_dbm_impl() { ...@@ -576,7 +575,6 @@ check_dbm_impl() {
576 [AC_CHECK_HEADERS(kclangc.h, 575 [AC_CHECK_HEADERS(kclangc.h,
577 AC_DEFINE(WITH_KYOTOCABINET,1, 576 AC_DEFINE(WITH_KYOTOCABINET,1,
578 [Enable use of Kyoto Cabinet])) 577 [Enable use of Kyoto Cabinet]))
579 DBMLIB_DEPENDENCY="$DBMLIB_DEPENDENCY -lz -lbz2 -lrt"
580 DBMLIBS="$DBMLIBS -lkyotocabinet" 578 DBMLIBS="$DBMLIBS -lkyotocabinet"
581 status_dbm="$status_dbm,Kyoto Cabinet"]);; 579 status_dbm="$status_dbm,Kyoto Cabinet"]);;
582 esac 580 esac
...@@ -1169,6 +1167,9 @@ GINT_INIT([gint],[1.8 with-guile], ...@@ -1169,6 +1167,9 @@ GINT_INIT([gint],[1.8 with-guile],
1169 LIBMU_SCM_DEPS='${MU_LIB_MBOX} ${MU_LIB_IMAP} ${MU_LIB_POP} ${MU_LIB_MH} ${MU_LIB_MAILDIR} ${MU_LIB_MAILER}' 1167 LIBMU_SCM_DEPS='${MU_LIB_MBOX} ${MU_LIB_IMAP} ${MU_LIB_POP} ${MU_LIB_MH} ${MU_LIB_MAILDIR} ${MU_LIB_MAILER}'
1170 MU_GUILE_SIEVE_MOD_DIR='$(GUILE_SITE)/$(PACKAGE)/sieve-modules' 1168 MU_GUILE_SIEVE_MOD_DIR='$(GUILE_SITE)/$(PACKAGE)/sieve-modules'
1171 GINT_INCLUDES='${MU_APP_COMMON_INCLUDES}' 1169 GINT_INCLUDES='${MU_APP_COMMON_INCLUDES}'
1170 if test $REPLACE_STRERROR = 1; then
1171 GINT_LDADD='${top_builddir}/lib/gnu/libgnu.la'
1172 fi
1172 ],[useguile=no]) 1173 ],[useguile=no])
1173 1174
1174 AM_CONDITIONAL([MU_COND_LIBMU_SCM],[test "$useguile" = "yes"]) 1175 AM_CONDITIONAL([MU_COND_LIBMU_SCM],[test "$useguile" = "yes"])
......
gint @ acb32e84
1 Subproject commit 42f4712085b40173eaea58e14b1a579291a6fe3a 1 Subproject commit acb32e84269f1c00b5f1cdd03a920420dcdfa2bc
......