Make GUI shell compilation optional, and add a desktop file for it.

[doldaconnect.git] / configure.in

diff --git a/configure.in b/configure.in
index 7160668..37eef90 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -41,7 +41,7 @@ DOLDA_PKG([HAS_PAM], [test "$with_pam" = no && HAS_PAM=no],
 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
@@ -67,6 +67,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 +75,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])])
@@ -94,6 +98,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 +240,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
@@ -253,6 +263,7 @@ 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"