X-Git-Url: http://dolda2000.com/gitweb/?a=blobdiff_plain;f=configure.in;h=e42caf81362a49f5c9fa83d6d6cf0c391a4f5d66;hb=eb511463c7a9a6d1c190c6fb8b1ef13fc00c0ff9;hp=d93efa0ac94b8ca99ab7662a23293415fa577674;hpb=8af979f318c0e3d1d00a35996f6b5fecb055ac33;p=doldaconnect.git

diff --git a/configure.in b/configure.in
index d93efa0..e42caf8 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])
@@ -255,7 +245,6 @@ else
 fi
 AC_DEFINE_UNQUOTED([RELEASEINFO], ["$relinfo"])
 
-AC_SUBST([extlibs])
 AC_OUTPUT([
 Makefile
 autopackage/Makefile
@@ -279,6 +268,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
@@ -293,10 +284,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