From d0ad48dd0dafa488eec60d20b18d706c617e5861 Mon Sep 17 00:00:00 2001 From: Fredrik Tolf Date: Sun, 27 Jan 2008 15:54:09 +0100 Subject: [PATCH] Made libz, libbz2 and libgdbm optional. --- configure.in | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/configure.in b/configure.in index 77b90d5..b8d1d88 100644 --- a/configure.in +++ b/configure.in @@ -21,16 +21,15 @@ m4_defun([_LT_AC_LANG_CXX_CONFIG], true) m4_defun([_LT_AC_LANG_F77_CONFIG], true) AC_PROG_LIBTOOL -DOLDA_AC_GROUP([Checking required libraries]) - -AC_CHECK_LIB(z, deflate, [:], AC_MSG_ERROR([*** must have zlib])) -AC_CHECK_LIB(bz2, BZ2_bzWriteOpen, [:], AC_MSG_ERROR([*** must have bzlib])) -AC_CHECK_LIB(gdbm, gdbm_open, [:], AC_MSG_ERROR([*** must have gdbm])) - experimental=no DOLDA_AC_GROUP([Checking optional libraries]) +# Standard libraries +AC_CHECK_LIB(z, deflate, [HAS_LIBZ=yes], [HAS_LIBZ=no]) +AC_CHECK_LIB(bz2, BZ2_bzWriteOpen, [HAS_LIBBZ2=yes], [HAS_LIBBZ2=no]) +AC_CHECK_LIB(gdbm, gdbm_open, [HAS_GDBM=yes], [HAS_GDBM=no]) + # PAM check pam_msg=no AH_TEMPLATE(HAVE_PAM, [define to compile support for PAM authentication]) @@ -94,12 +93,13 @@ DOLDA_PKG([HAS_LIBPURPLE], [PKG_CHECK_MODULES(PURPLE, purple, [], [HAS_LIBPURPLE [DOLDA_CHECK_HEADER(plugin.h, [], [HAS_LIBPURPLE=no], $PURPLE_CFLAGS)]) # Daemon check -DOLDA_ENABLE(daemon, [ --enable-daemon Enable the daemon], yes, []) +DOLDA_ENABLE(daemon, [ --enable-daemon Enable the daemon], yes, + [HAS_LIBZ HAS_LIBBZ2 HAS_GDBM]) AM_CONDITIONAL(DAEMON, test "$enable_daemon" = yes) # Gtk GUI check DOLDA_ENABLE(gtk2ui, [ --enable-gtk2ui Enable the GTK2 user interface], yes, - [HAS_GTK2 HAS_LIBXML]) + [HAS_GTK2 HAS_LIBBZ2 HAS_LIBXML]) AM_CONDITIONAL(CLI_GTK2, test "$enable_gtk2ui" = yes) # Dolconf check -- 2.11.0