Compile dolconf conditionally.

git-svn-id: svn+ssh://svn.dolda2000.com/srv/svn/repos/src/doldaconnect@1011 959494ce-11ee-0310-bf91-de5d638817bd

diff --git a/config/Makefile.am b/config/Makefile.am
index 3d275f0..58ed667 100644 (file)
--- a/config/Makefile.am
+++ b/config/Makefile.am
@@ -1,4 +1,7 @@
-bin_PROGRAMS=locktouch tthsum dolconf
+bin_PROGRAMS=locktouch tthsum
+if DOLCONF
+bin_PROGRAMS+=dolconf
+endif
 if BASECONV
 bin_PROGRAMS+=baseconv
 else

diff --git a/configure.in b/configure.in
index 0a8dd6d..0f9bd3f 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -14,9 +14,6 @@ m4_defun([_LT_AC_LANG_F77_CONFIG], true)
 AM_PROG_LIBTOOL
 
 AC_CHECK_LIB(pam, pam_start, , AC_MSG_ERROR([*** must have PAM]))
-# Doesn't work on at least FreeBSD, and the existance of PAM should
-# already indicate that dlopen works.
-# AC_CHECK_LIB(dl, dlopen, , AC_MSG_ERROR([*** PAM requires a working dynamic loader (libdl)]))
 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]))
@@ -91,6 +88,19 @@ if test "$enable_gtk2ui" != no -a "$HAS_GTK2" = yes; then
        gtk2ui_msg=Yes
 fi
 
+# Dolconf check
+dolconf_msg=No
+AC_ARG_ENABLE(dolconf, [  --enable-dolconf        Build the configuration helper])
+if test "$enable_dolconf" = yes -a "$HAS_GTK2" = no; then
+       AC_MSG_ERROR([*** cannot build dolconf without GTK2])
+fi
+if test "$enable_dolconf" != no -a "$HAS_GTK2" = yes; then
+       AM_CONDITIONAL(DOLCONF, true)
+       dolconf_msg=Yes
+else
+       AM_CONDITIONAL(DOLCONF, false)
+fi
+
 # Gtk progress bar check
 gtk2pbar_msg=No
 AH_TEMPLATE(ENABLE_GTK2PBAR, [define to compile GTK2 progress bars (experimental)])
@@ -231,6 +241,7 @@ echo
 echo "    Kerberos 5 support:      $krb_msg"
 echo "    GTK2 user interface:     $gtk2ui_msg"
 echo "    GTK2 progress bars:      $gtk2pbar_msg"
+echo "    Dolconf configurator:    $dolconf_msg"
 echo "    Guile extension library: $guile_msg"
 echo "    GNOME transfer applet:   $gnometrapplet_msg"
 echo "    Gaim chat plugin:        $gaimplugin_msg"