X-Git-Url: http://dolda2000.com/gitweb/?a=blobdiff_plain;f=configure.in;h=548f9afffa3c2dc961da2dc932bff11d7b0d588f;hb=203b3877d564199078fac0feb7efe0621a914263;hp=6585ddd0ba88ef69f1c934327e56fd75ca68d18c;hpb=abdee8d991dd929d09a5d22cdf08e77fcbd64e54;p=doldaconnect.git

diff --git a/configure.in b/configure.in
index 6585ddd..548f9af 100644
--- a/configure.in
+++ b/configure.in
@@ -1,5 +1,5 @@
 AC_INIT(daemon/main.c)
-AM_INIT_AUTOMAKE([doldaconnect], [0.5])
+AM_INIT_AUTOMAKE([doldaconnect], [1.1])
 AM_CONFIG_HEADER(config.h)
 
 DOLDA_AC_GROUP([Checking build chain])
@@ -27,7 +27,6 @@ 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])
@@ -109,15 +108,6 @@ DOLDA_ENABLE(guishell, [  --enable-guishell       Build the GUI shell programs],
 		       [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,
-		       [HAS_GTK2 enable_gtk2ui])
-if test "$enable_gtk2pbar" = yes; then
-	experimental=yes
-	AC_DEFINE(ENABLE_GTK2PBAR)
-fi
-
 # Gnome applet check
 DOLDA_ENABLE(gnomeapplet, [  --enable-gnomeapplet    Enable GNOME transfer applet (experimental)], no,
 			  [HAS_LIBPANELAPPLET])
@@ -147,12 +137,12 @@ if test -z "$gaimplugin_msg"; then
 fi
 
 # Guile check (XXX: Shouldn't have to be enabled manually)
-guile_msg=no
+enable_guile=no
 if test "$with_guile" = yes; then
 	GUILE_FLAGS
-	extlibs="$extlibs guile"
-	guile_msg=yes
+	enable_guile=yes
 fi
+AM_CONDITIONAL(ELIB_GUILE, test "$enable_guile" = yes)
 
 # Check whether to install baseconv
 AC_ARG_ENABLE(baseconv, [  --enable-baseconv       Install the baseconv utility])
@@ -182,6 +172,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
@@ -198,9 +202,8 @@ 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" ])
+AC_CHECK_LIB(resolv, __res_query, [ AC_DEFINE(HAVE_RESOLVER)
+		     		    LDFLAGS="$LDFLAGS -lresolv" ])
 
 # Unix credentials selector
 AH_TEMPLATE(UNIX_AUTH_STYLE, [undefine for no Unix auth, 1 for Linux style, 2 for BSD style])
@@ -232,7 +235,18 @@ CPPFLAGS="-I\$(top_srcdir)/include $CPPFLAGS"
 
 DOLDA_AC_GROUP([Writing output])
 
-AC_SUBST([extlibs])
+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_OUTPUT([
 Makefile
 autopackage/Makefile
@@ -256,9 +270,13 @@ config/Makefile
 config/cmd/Makefile
 config/util/Makefile
 contrib/Makefile
+contrib/doldaconnect.spec
+share/Makefile
+autopackage/doldacond.apspec
 autopackage/dolcon.apspec
 autopackage/dcuilib.apspec
 autopackage/dcguile.apspec
+autopackage/guishell.apspec
 ])
 
 echo
@@ -268,10 +286,9 @@ 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 "    Guile extension library: $enable_guile"
 echo "    GNOME transfer applet:   $enable_gnomeapplet"
 echo "    Gaim chat plugin:        $gaimplugin_msg"
 echo