X-Git-Url: http://dolda2000.com/gitweb/?a=blobdiff_plain;f=configure.in;h=172596430b7fd07965a8cdb16cad57de252dfb9e;hb=17b4b1d58dc141084cdea8ffcd58d18982ad44fb;hp=73d2f91ab9753d170e7444173beca7c0c2c311b4;hpb=3be6a9b7c6aac4fe975cbab1d9b946536dd5ddd2;p=doldaconnect.git

diff --git a/configure.in b/configure.in
index 73d2f91..1725964 100644
--- a/configure.in
+++ b/configure.in
@@ -1,5 +1,5 @@
 AC_INIT(daemon/main.c)
-AM_INIT_AUTOMAKE([doldaconnect], [0.4])
+AM_INIT_AUTOMAKE([doldaconnect], [0.5])
 AM_CONFIG_HEADER(config.h)
 
 AC_PROG_CC
@@ -20,7 +20,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]))
 
-clients=tty
 extlibs=
 experimental=no
 
@@ -108,10 +107,10 @@ if test "$enable_gtk2ui" = yes; then
 		AC_MSG_ERROR([*** the GTK2 UI needs libxml2])
 	fi
 fi
-if test "$enable_gtk2ui" != no -a "$HAS_GTK2" = yes; then
-	clients="$clients gtk2"
+if test "$enable_gtk2ui" != no -a "$HAS_GTK2" = yes -a "$HAS_LIBXML" = yes; then
 	gtk2ui_msg=Yes
 fi
+AM_CONDITIONAL(CLI_GTK2, test "$gtk2ui_msg" = Yes)
 
 # Dolconf check
 dolconf_msg=No
@@ -120,11 +119,9 @@ if test "$enable_dolconf" = yes -a "$HAS_GTK2" = no; then
 	AC_MSG_ERROR([*** cannot build dolconf without GTK2])
 fi
 if test "$enable_dolconf" != no -a "$HAS_GTK2" = yes; then
-	AM_CONDITIONAL(DOLCONF, true)
 	dolconf_msg=Yes
-else
-	AM_CONDITIONAL(DOLCONF, false)
 fi
+AM_CONDITIONAL(DOLCONF, test "$dolconf_msg" = Yes)
 
 # Gtk progress bar check
 gtk2pbar_msg=No
@@ -145,16 +142,25 @@ AC_ARG_ENABLE(gnomeapplet, [  --enable-gnomeapplet    Enable GNOME transfer appl
 if test "$enable_gnomeapplet" = yes; then
 	experimental=yes
 	gnometrapplet_msg=Yes
-	clients="$clients gnome-trans-applet"
 fi
+AM_CONDITIONAL(CLI_GNOMEAPPLET, test "$gnometrapplet_msg" = Yes)
 
 # Gaim plugin check
-gaimplugin_msg=No
-AC_ARG_ENABLE(gaimplugin, [  --enable-gaimplugin     Enable GNOME transfer applet (experimental)])
+gaimplugin_msg=
+AC_ARG_ENABLE(gaimplugin, [  --enable-gaimplugin     Enable Gaim chat plugin (experimental)])
 if test "$enable_gaimplugin" = yes; then
 	experimental=yes
-	gaimplugin_msg=Yes
-	clients="$clients gaim"
+	gaimplugin_msg="Gaim $gaimplugin_msg"
+fi
+AM_CONDITIONAL(CLI_GAIM, test "$enable_gaimplugin" = yes)
+AC_ARG_ENABLE(pidginplugin, [  --enable-pidginplugin   Enable Pidgin chat plugin (experimental)])
+if test "$enable_pidginplugin" = yes; then
+	experimental=yes
+	gaimplugin_msg="Pidgin $gaimplugin_msg"
+fi
+AM_CONDITIONAL(CLI_PIDGIN, test "$enable_pidginplugin" = yes)
+if test -z "$gaimplugin_msg"; then
+   	gaimplugin_msg=No
 fi
 
 # Guile check (XXX: Shouldn't have to be enabled manually)
@@ -250,7 +256,7 @@ AC_TYPE_SIGNAL
 
 CPPFLAGS="-I\$(top_srcdir)/include $CPPFLAGS"
 
-AC_SUBST([clients extlibs])
+AC_SUBST([extlibs])
 AC_OUTPUT([
 Makefile
 autopackage/Makefile
@@ -270,6 +276,8 @@ doc/Makefile
 doc/man/Makefile
 po/Makefile.in
 config/Makefile
+config/cmd/Makefile
+config/util/Makefile
 contrib/Makefile
 autopackage/dolcon.apspec
 autopackage/dcuilib.apspec