X-Git-Url: http://git.dolda2000.com/gitweb/?a=blobdiff_plain;f=configure.in;h=daf5d05566fc8d128182a31137d90129832626ba;hb=a96bf02b5b45c9f4e1af5c4259ccb2b838904273;hp=6e4d7373cd17fef7db0d16b7a66dc7c8af1812d7;hpb=d05758f6eda21695e6215d60d28b9747d0b8aaa3;p=doldaconnect.git

diff --git a/configure.in b/configure.in
index 6e4d737..daf5d05 100644
--- a/configure.in
+++ b/configure.in
@@ -23,16 +23,31 @@ AC_PROG_LIBTOOL
 
 DOLDA_AC_GROUP([Checking required libraries])
 
-AC_CHECK_LIB(pam, pam_start, , AC_MSG_ERROR([*** must have PAM]))
-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
 
 DOLDA_AC_GROUP([Checking optional libraries])
 
+# PAM check
+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])],
+		     [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 "$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])
 DOLDA_PKG([HAS_GTK2], [test "$with_gtk2" = no && HAS_GTK2=no],
@@ -54,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])],
@@ -61,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])])
@@ -71,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])
@@ -81,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,
@@ -154,6 +182,20 @@ if test "$with_krb5" != no -a "$HAS_KRB5" = yes; then
 fi
 AC_SUBST([KRB5_LIBS KRB5_CFLAGS])
 
+# Linux keyring
+AH_TEMPLATE(HAVE_KEYUTILS, [define if your system supports the Linux keyring functions])
+AC_ARG_WITH(keyutils, [  --with-keyutils           Enable support for the Linux keyring stash])
+DOLDA_PKG([HAS_KEYUTILS], [test "$with_keyutils" = no && HAS_KEYUTILS=no],
+			  [AC_CHECK_LIB(keyutils, keyctl_search, [:], [HAS_KEYUTILS=no])])
+if test "$with_keyutils" = yes -a "$HAS_KEYUTILS" = no; then
+   	AC_MSG_ERROR([*** cannot find keyutils on this system])
+fi
+if test "$HAS_KEYUTILS" = yes; then
+   	AC_DEFINE(HAVE_KEYUTILS)
+	KEYUTILS_LIBS=-lkeyutils
+fi
+AC_SUBST([KEYUTILS_LIBS])
+
 DOLDA_AC_GROUP([Checking operating system features])
 
 # Misc. functions checks
@@ -170,9 +212,6 @@ AC_CHECK_MEMBER(struct sockaddr_in6.sin6_family, [ AC_DEFINE(HAVE_IPV6) ], , [#i
 AH_TEMPLATE(HAVE_RESOLVER, [define if your system supports the res_* functions to fetch DNS RRs])
 AC_CHECK_LIB(resolv, res_query, [ AC_DEFINE(HAVE_RESOLVER)
 				  LDFLAGS="$LDFLAGS -lresolv" ])
-AH_TEMPLATE(HAVE_KEYUTILS, [define if your system supports the Linux keyring functions])
-AC_CHECK_LIB(keyutils, keyctl_search, [ AC_DEFINE(HAVE_KEYUTILS)
-					LDFLAGS="$LDFLAGS -lkeyutils" ])
 
 # Unix credentials selector
 AH_TEMPLATE(UNIX_AUTH_STYLE, [undefine for no Unix auth, 1 for Linux style, 2 for BSD style])
@@ -204,6 +243,18 @@ CPPFLAGS="-I\$(top_srcdir)/include $CPPFLAGS"
 
 DOLDA_AC_GROUP([Writing output])
 
+AH_TEMPLATE(RELEASEINFO, [define release information reported by various programs (should be left to configure to define)])
+relinfo="relver ${VERSION}\\n"
+relinfo="${relinfo}builddate $(date)\\n"
+if test -d .git && which git-rev-parse >/dev/null 2>&1; then
+   	relinfo="${relinfo}source git $(git-rev-parse HEAD)\\n"
+elif test -r source; then
+	relinfo="${relinfo}source $(cat source)\\n"
+else
+	relinfo="${relinfo}source unknown\\n"
+fi
+AC_DEFINE_UNQUOTED([RELEASEINFO], ["$relinfo"])
+
 AC_SUBST([extlibs])
 AC_OUTPUT([
 Makefile
@@ -218,6 +269,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
@@ -227,18 +279,24 @@ config/Makefile
 config/cmd/Makefile
 config/util/Makefile
 contrib/Makefile
+share/Makefile
+autopackage/doldacond.apspec
 autopackage/dolcon.apspec
 autopackage/dcuilib.apspec
 autopackage/dcguile.apspec
+autopackage/guishell.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"