X-Git-Url: http://git.dolda2000.com/gitweb/?a=blobdiff_plain;f=configure.in;h=67dafb572825a2d1ff781882fafe8621955febd0;hb=ddb3658e4a9d9efb7a8628fee483e5371c426d12;hp=9383e9402e04236d7292964ee735f3cb992261f8;hpb=8b17e919cee63400e6de2c5f699c0a88d226b7e6;p=doldaconnect.git

diff --git a/configure.in b/configure.in
index 9383e94..67dafb5 100644
--- a/configure.in
+++ b/configure.in
@@ -1,5 +1,5 @@
 AC_INIT(daemon/main.c)
-AM_INIT_AUTOMAKE([doldaconnect], [0.3])
+AM_INIT_AUTOMAKE([doldaconnect], [0.4])
 AM_CONFIG_HEADER(config.h)
 
 AC_PROG_CC
@@ -7,10 +7,13 @@ AC_PROG_INSTALL
 
 AM_GNU_GETTEXT_VERSION(0.12.1)
 AM_GNU_GETTEXT([external])
+
+# Temporary hack to make libtool not check for g++ or g77
+m4_defun([_LT_AC_LANG_CXX_CONFIG], true)
+m4_defun([_LT_AC_LANG_F77_CONFIG], true)
 AM_PROG_LIBTOOL
 
 AC_CHECK_LIB(pam, pam_start, , AC_MSG_ERROR([*** must have PAM]))
-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]))
@@ -69,6 +72,23 @@ else
 	HAS_LIBXML=no
 fi
 
+# libnotify check
+AC_MSG_CHECKING([for libnotify package information])
+if test "$PKG_CONFIG" = yes; then
+	if pkg-config --modversion libnotify >/dev/null 2>&1; then
+	        AC_MSG_RESULT(yes)
+	else
+		AC_MSG_RESULT(no)
+		HAS_LIBNOTIFY=no
+	fi
+else
+	AC_MSG_RESULT(no)
+	HAS_LIBNOTIFY=no
+fi
+if test "$HAS_LIBNOTIFY" != no; then
+	AC_CHECK_LIB(notify, notify_init, [HAS_LIBNOTIFY=yes], [HAS_LIBNOTIFY=no], `pkg-config --libs libnotify`)
+fi
+
 # Gtk GUI check
 gtk2ui_msg=No
 AC_ARG_ENABLE(gtk2ui, [  --enable-gtk2ui         Enable the GTK2 user interface])
@@ -85,6 +105,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)])
@@ -124,6 +157,10 @@ if test "$with_guile" = yes; then
 	guile_msg=Yes
 fi
 
+# Check whether to install baseconv
+AC_ARG_ENABLE(baseconv, [  --enable-baseconv       Install the baseconv utility])
+AM_CONDITIONAL(BASECONV, test "$enable_baseconv" = yes)
+
 # Kerberos check
 krb_msg=No
 AH_TEMPLATE(HAVE_KRB5, [define to compile support for Kerberos 5 (not GSS-API) authentication])
@@ -205,8 +242,11 @@ clients/gnome-trans-applet/Makefile
 clients/gaim/Makefile
 include/Makefile
 include/doldaconnect/Makefile
+doc/Makefile
+doc/man/Makefile
 po/Makefile.in
 config/Makefile
+contrib/Makefile
 autopackage/dolcon.apspec
 autopackage/dcuilib.apspec
 autopackage/dcguile.apspec
@@ -218,6 +258,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"