X-Git-Url: http://git.dolda2000.com/gitweb/?a=blobdiff_plain;f=configure.in;h=c52a3e92758576c18610c949f6e2b0c2845015a1;hb=92694649f8d2ba5d2f6c8a76ba1497d5fe5afaa9;hp=bbeca731a4875473a28f9d2c11b9fc98cf555e15;hpb=9e5a735ca0027b9fcc9b6ed0cac935ecd2247acf;p=doldaconnect.git

diff --git a/configure.in b/configure.in
index bbeca73..c52a3e9 100644
--- a/configure.in
+++ b/configure.in
@@ -90,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])
@@ -178,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
@@ -194,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])
@@ -252,6 +267,7 @@ config/Makefile
 config/cmd/Makefile
 config/util/Makefile
 contrib/Makefile
+autopackage/doldacond.apspec
 autopackage/dolcon.apspec
 autopackage/dcuilib.apspec
 autopackage/dcguile.apspec
@@ -260,6 +276,7 @@ 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"