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
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
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
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
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
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
CPPFLAGS="-I\$(top_srcdir)/include $CPPFLAGS"
-AC_SUBST([clients extlibs])
+AC_SUBST([extlibs])
AC_OUTPUT([
Makefile
autopackage/Makefile
doc/man/Makefile
po/Makefile.in
config/Makefile
+config/cmd/Makefile
+config/util/Makefile
contrib/Makefile
autopackage/dolcon.apspec
autopackage/dcuilib.apspec