X-Git-Url: http://dolda2000.com/gitweb/?p=doldaconnect.git;a=blobdiff_plain;f=configure.in;h=4f35321a650dd8a2cc80842ae801e8746395a7df;hp=f90ec5f43088bb3e89ea80e068ef4da71a2296f1;hb=refs%2Fheads%2Fjava;hpb=a9477b339d8edadb9eb109718e3acffc178d65c6

diff --git a/configure.in b/configure.in
index f90ec5f..4f35321 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])
@@ -109,15 +109,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])
@@ -243,6 +234,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
@@ -267,6 +270,8 @@ config/Makefile
 config/cmd/Makefile
 config/util/Makefile
 contrib/Makefile
+contrib/doldaconnect.spec
+share/Makefile
 autopackage/doldacond.apspec
 autopackage/dolcon.apspec
 autopackage/dcuilib.apspec
@@ -281,7 +286,6 @@ 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"