Always include all clients in SUBDIRS and use conditionals instead.

git-svn-id: svn+ssh://svn.dolda2000.com/srv/svn/repos/src/doldaconnect@1085 959494ce-11ee-0310-bf91-de5d638817bd

diff --git a/clients/Makefile.am b/clients/Makefile.am
index 742729f..66e3e71 100644 (file)
--- a/clients/Makefile.am
+++ b/clients/Makefile.am
@@ -1,5 +1,4 @@
-SUBDIRS=@clients@
-DIST_SUBDIRS=gtk2 tty gnome-trans-applet gaim
+SUBDIRS=gtk2 tty gnome-trans-applet gaim
 EXTRA_DIST=hellodolda.png
 
 iconsdir = $(datadir)/pixmaps

diff --git a/clients/gaim/Makefile.am b/clients/gaim/Makefile.am
index 605386b..f5f19b8 100644 (file)
--- a/clients/gaim/Makefile.am
+++ b/clients/gaim/Makefile.am
@@ -1,6 +1,8 @@
 plugindir = $(libdir)/gaim
 
+if CLI_GAIM
 plugin_LTLIBRARIES = libdolcon-gaim.la
+endif
 
 libdolcon_gaim_la_SOURCES = gaim-dolcon.c
 

diff --git a/clients/gnome-trans-applet/Makefile.am b/clients/gnome-trans-applet/Makefile.am
index 1fa5b13..cf46b3f 100644 (file)
--- a/clients/gnome-trans-applet/Makefile.am
+++ b/clients/gnome-trans-applet/Makefile.am
@@ -1,4 +1,7 @@
+if CLI_GNOMEAPPLET
 libexec_PROGRAMS=dolcon-trans-applet
+server_DATA=Dolcon_Transferapplet_Factory.server
+endif
 
 dolcon_trans_applet_SOURCES=   dolcon-trans-applet.c \
                                conduit-pipe.c \
@@ -14,7 +17,6 @@ dolcon_trans_applet_CPPFLAGS=$(shell pkg-config --cflags libpanelapplet-2.0) -DL
 BUILT_SOURCES=Dolcon_Transferapplet_Factory.server
 
 serverdir=$(libdir)/bonobo/servers
-server_DATA=Dolcon_Transferapplet_Factory.server
 
 EXTRA_DIST=Dolcon_Transferapplet_Factory.server.in
 

diff --git a/clients/gtk2/Makefile.am b/clients/gtk2/Makefile.am
index cd88c53..8c75120 100644 (file)
--- a/clients/gtk2/Makefile.am
+++ b/clients/gtk2/Makefile.am
@@ -1,4 +1,7 @@
+if CLI_GTK2
 bin_PROGRAMS=dolcon
+app_DATA=dolcon.desktop
+endif
 
 dolcon_SOURCES=        main.c \
                progressbar.c \
@@ -22,4 +25,3 @@ dolcon_CPPFLAGS=@GTK2_CFLAGS@ @LIBXML_CFLAGS@ \
 mainwnd.desc: ../../config.h
 
 appdir=$(datadir)/applications
-app_DATA=dolcon.desktop

diff --git a/configure.in b/configure.in
index 73d2f91..2d2017f 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -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,8 +142,8 @@ 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
@@ -154,8 +151,8 @@ AC_ARG_ENABLE(gaimplugin, [  --enable-gaimplugin     Enable GNOME transfer apple
 if test "$enable_gaimplugin" = yes; then
        experimental=yes
        gaimplugin_msg=Yes
-       clients="$clients gaim"
 fi
+AM_CONDITIONAL(CLI_GAIM, test "$gaimplugin_msg" = Yes)
 
 # Guile check (XXX: Shouldn't have to be enabled manually)
 guile_msg=No
@@ -250,7 +247,7 @@ AC_TYPE_SIGNAL
 
 CPPFLAGS="-I\$(top_srcdir)/include $CPPFLAGS"
 
-AC_SUBST([clients extlibs])
+AC_SUBST([extlibs])
 AC_OUTPUT([
 Makefile
 autopackage/Makefile