X-Git-Url: http://git.dolda2000.com/gitweb/?a=blobdiff_plain;f=configure.in;h=6585ddd0ba88ef69f1c934327e56fd75ca68d18c;hb=d3ecb000d7572e737429ad611fe995e53b8a0699;hp=71606687fc7a592834000ce09338f37cb6c9d541;hpb=ded209d3974f3f381e718b62acf4f430dc641562;p=doldaconnect.git

diff --git a/configure.in b/configure.in
index 7160668..6585ddd 100644
--- a/configure.in
+++ b/configure.in
@@ -23,9 +23,9 @@ 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]))
+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]))
 
 extlibs=
 experimental=no
@@ -37,14 +37,16 @@ pam_msg=no
 AH_TEMPLATE(HAVE_PAM, [define to compile support for PAM authentication])
 AC_ARG_WITH(pam, [  --with-pam              Enable PAM support])
 DOLDA_PKG([HAS_PAM], [test "$with_pam" = no && HAS_PAM=no],
-		     [AC_CHECK_LIB(pam, pam_start, , [HAS_PAM=no])])
+		     [AC_CHECK_LIB(pam, pam_start, [:], [HAS_PAM=no])],
+		     [PAM_LIBS=-lpam])
 if test "$with_pam" = yes -a "$HAS_PAM" = no; then
 	AC_MSG_ERROR([*** cannot find PAM on this system])
 fi
-if test "$with_pam" != no -a "$HAS_PAM" = yes; then
+if test "$HAS_PAM" = yes; then
 	AC_DEFINE(HAVE_PAM)
 	pam_msg=yes
 fi
+AC_SUBST(PAM_LIBS)
 
 # Gtk 2.0 check
 AC_ARG_WITH(gtk2, [  --with-gtk2             Enable GTK2 support])
@@ -67,6 +69,7 @@ if test "$with_libxml" = yes -a "$HAS_LIBXML" = no; then
 fi
 
 # libnotify check
+AH_TEMPLATE(HAVE_NOTIFY, [define to compile support for libnotify])
 AC_ARG_WITH(libnotify, [  --with-libnotify        Enable libnotify support])
 DOLDA_PKG([HAS_LIBNOTIFY], [test "$with_libnotify" = no && HAS_LIBNOTIFY=no],
 			   [PKG_CHECK_MODULES(LIBNOTIFY, libnotify, [], [HAS_LIBNOTIFY=no])],
@@ -74,6 +77,9 @@ DOLDA_PKG([HAS_LIBNOTIFY], [test "$with_libnotify" = no && HAS_LIBNOTIFY=no],
 if test "$with_libnotify" = yes -a "$HAS_LIBNOTIFY" = no; then
    	AC_MSG_ERROR([*** cannot find libnotify on this system])
 fi
+if test "$HAS_LIBNOTIFY" = yes; then
+   	AC_DEFINE(HAVE_NOTIFY)
+fi
 
 # libpanelapplet check
 DOLDA_PKG([HAS_LIBPANELAPPLET], [PKG_CHECK_MODULES(PANELAPPLET, libpanelapplet-2.0, [], [HAS_LIBPANELAPPLET=no])])
@@ -84,6 +90,10 @@ DOLDA_PKG([HAS_LIBGAIM], [PKG_CHECK_MODULES(GAIM, gaim, [], [HAS_LIBGAIM=no])],
 DOLDA_PKG([HAS_LIBPURPLE], [PKG_CHECK_MODULES(PURPLE, purple, [], [HAS_LIBPURPLE=no])],
 			   [DOLDA_CHECK_HEADER(plugin.h, [], [HAS_LIBPURPLE=no], $PURPLE_CFLAGS)])
 
+# Daemon check
+DOLDA_ENABLE(daemon, [  --enable-daemon         Enable the daemon], yes, [])
+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])
@@ -94,6 +104,11 @@ DOLDA_ENABLE(dolconf, [  --enable-dolconf        Build the configuration helper]
 		      [HAS_GTK2])
 AM_CONDITIONAL(DOLCONF, test "$enable_dolconf" = yes)
 
+# GUI shell check
+DOLDA_ENABLE(guishell, [  --enable-guishell       Build the GUI shell programs], yes,
+		       [HAS_GTK2])
+AM_CONDITIONAL(GUISHELL, test "$enable_guishell" = yes)
+
 # Gtk progress bar check
 AH_TEMPLATE(ENABLE_GTK2PBAR, [define to compile GTK2 progress bars (experimental)])
 DOLDA_ENABLE(gtk2pbar, [  --enable-gtk2pbar       Enable GTK2 progress bars (experimental)], no,
@@ -231,6 +246,7 @@ clients/gtk2/Makefile
 clients/tty/Makefile
 clients/gnome-trans-applet/Makefile
 clients/gaim/Makefile
+clients/gui-shell/Makefile
 include/Makefile
 include/doldaconnect/Makefile
 doc/Makefile
@@ -248,11 +264,13 @@ autopackage/dcguile.apspec
 echo
 echo "Dolda Connect has been configured with the following settings:"
 echo
+echo "    Daemon:                  $enable_daemon"
 echo "    PAM support:             $pam_msg"
 echo "    Kerberos 5 support:      $krb_msg"
 echo "    GTK2 user interface:     $enable_gtk2ui"
 echo "    GTK2 progress bars:      $enable_gtk2pbar"
 echo "    Dolconf configurator:    $enable_dolconf"
+echo "    GUI shell:               $enable_guishell"
 echo "    Guile extension library: $guile_msg"
 echo "    GNOME transfer applet:   $enable_gnomeapplet"
 echo "    Gaim chat plugin:        $gaimplugin_msg"