git-svn-id: svn+ssh://svn.dolda2000.com/srv/svn/repos/src/doldaconnect@1085
959494ce-11ee-0310-bf91-
de5d638817bd
-SUBDIRS=@clients@
-DIST_SUBDIRS=gtk2 tty gnome-trans-applet gaim
+SUBDIRS=gtk2 tty gnome-trans-applet gaim
EXTRA_DIST=hellodolda.png
iconsdir = $(datadir)/pixmaps
EXTRA_DIST=hellodolda.png
iconsdir = $(datadir)/pixmaps
plugindir = $(libdir)/gaim
plugindir = $(libdir)/gaim
plugin_LTLIBRARIES = libdolcon-gaim.la
plugin_LTLIBRARIES = libdolcon-gaim.la
libdolcon_gaim_la_SOURCES = gaim-dolcon.c
libdolcon_gaim_la_SOURCES = gaim-dolcon.c
libexec_PROGRAMS=dolcon-trans-applet
libexec_PROGRAMS=dolcon-trans-applet
+server_DATA=Dolcon_Transferapplet_Factory.server
+endif
dolcon_trans_applet_SOURCES= dolcon-trans-applet.c \
conduit-pipe.c \
dolcon_trans_applet_SOURCES= dolcon-trans-applet.c \
conduit-pipe.c \
BUILT_SOURCES=Dolcon_Transferapplet_Factory.server
serverdir=$(libdir)/bonobo/servers
BUILT_SOURCES=Dolcon_Transferapplet_Factory.server
serverdir=$(libdir)/bonobo/servers
-server_DATA=Dolcon_Transferapplet_Factory.server
EXTRA_DIST=Dolcon_Transferapplet_Factory.server.in
EXTRA_DIST=Dolcon_Transferapplet_Factory.server.in
+app_DATA=dolcon.desktop
+endif
dolcon_SOURCES= main.c \
progressbar.c \
dolcon_SOURCES= main.c \
progressbar.c \
mainwnd.desc: ../../config.h
appdir=$(datadir)/applications
mainwnd.desc: ../../config.h
appdir=$(datadir)/applications
AC_CHECK_LIB(bz2, BZ2_bzWriteOpen, , AC_MSG_ERROR([*** must have bzlib]))
AC_CHECK_LIB(gdbm, gdbm_open, , AC_MSG_ERROR([*** must have gdbm]))
AC_CHECK_LIB(bz2, BZ2_bzWriteOpen, , AC_MSG_ERROR([*** must have bzlib]))
AC_CHECK_LIB(gdbm, gdbm_open, , AC_MSG_ERROR([*** must have gdbm]))
AC_MSG_ERROR([*** the GTK2 UI needs libxml2])
fi
fi
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
+AM_CONDITIONAL(CLI_GTK2, test "$gtk2ui_msg" = Yes)
# Dolconf check
dolconf_msg=No
# Dolconf check
dolconf_msg=No
AC_MSG_ERROR([*** cannot build dolconf without GTK2])
fi
if test "$enable_dolconf" != no -a "$HAS_GTK2" = yes; then
AC_MSG_ERROR([*** cannot build dolconf without GTK2])
fi
if test "$enable_dolconf" != no -a "$HAS_GTK2" = yes; then
- AM_CONDITIONAL(DOLCONF, true)
-else
- AM_CONDITIONAL(DOLCONF, false)
+AM_CONDITIONAL(DOLCONF, test "$dolconf_msg" = Yes)
# Gtk progress bar check
gtk2pbar_msg=No
# Gtk progress bar check
gtk2pbar_msg=No
if test "$enable_gnomeapplet" = yes; then
experimental=yes
gnometrapplet_msg=Yes
if test "$enable_gnomeapplet" = yes; then
experimental=yes
gnometrapplet_msg=Yes
- clients="$clients gnome-trans-applet"
+AM_CONDITIONAL(CLI_GNOMEAPPLET, test "$gnometrapplet_msg" = Yes)
# Gaim plugin check
gaimplugin_msg=No
# Gaim plugin check
gaimplugin_msg=No
if test "$enable_gaimplugin" = yes; then
experimental=yes
gaimplugin_msg=Yes
if test "$enable_gaimplugin" = yes; then
experimental=yes
gaimplugin_msg=Yes
- clients="$clients gaim"
+AM_CONDITIONAL(CLI_GAIM, test "$gaimplugin_msg" = Yes)
# Guile check (XXX: Shouldn't have to be enabled manually)
guile_msg=No
# Guile check (XXX: Shouldn't have to be enabled manually)
guile_msg=No
CPPFLAGS="-I\$(top_srcdir)/include $CPPFLAGS"
CPPFLAGS="-I\$(top_srcdir)/include $CPPFLAGS"
-AC_SUBST([clients extlibs])
AC_OUTPUT([
Makefile
autopackage/Makefile
AC_OUTPUT([
Makefile
autopackage/Makefile