+G_LOG_DOMAIN="Captive"

glib-2.0: +gobject
 - used by new GObject-based VFS interface of libcaptive
gnome-vfs-module-2.0: now compiled unconditionally for the whole package
+linc,ORBit2: used by sandbox
+./src/libcaptive/sandbox/

diff --git a/configure.in b/configure.in
index db69481..b5513ca 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -33,8 +33,6 @@ dnl FIXME: should we use AM_GLIB_GNU_GETTEXT of glib-gettext.m4 ?
 ALL_LINGUAS="cs"
 AM_GNU_GETTEXT
 
-AM_PATH_GLIB_2_0(,,[AC_MSG_ERROR([Captive requires glib-2.0 library.])],[gmodule])
-
 GTK_DOC_CHECK
 
 dnl discard -g -O2 settings
@@ -61,6 +59,9 @@ dnl Separate 'acconfig.h' is no longer recommended by autoconf
 AH_TOP([
 #ifndef _CAPTIVE_CONFIG_H
 #define _CAPTIVE_CONFIG_H 1
+
+#include <glib/gtypes.h>       /* for 'gchar' */
+#define G_LOG_DOMAIN ((const gchar *)"Captive")
 ])
 AH_BOTTOM([
 #endif /* !_CAPTIVE_CONFIG_H */
@@ -93,17 +94,29 @@ AH_VERBATIM([ENABLE_NLS_HOOK],[
 #endif /* !ENABLE_NLS */
 ])
 
+AM_PATH_GLIB_2_0(,,[AC_MSG_ERROR([Captive requires glib-2.0 library.])],[gmodule gobject])
 dnl Force glib for the whole package
 CFLAGS="$CFLAGS $GLIB_CFLAGS"
-AC_SUBST(CFLAGS)
 LIBS="$LIBS $GLIB_LIBS"
-AC_SUBST(LIBS)
 
-dnl for $(top_srcdir)/src/client/libcaptive-gnomevfs/
-PKG_CHECK_MODULES(GNOME_VFS_MODULE, gnome-vfs-module-2.0)
-AC_SUBST(GNOME_VFS_MODULE_CFLAGS)
-AC_SUBST(GNOME_VFS_MODULE_LIBS)
+dnl popt
+AC_CHECK_LIB(popt,poptParseArgvString,,[AC_MSG_ERROR([Captive requires popt library.])])
+
+PKG_CHECK_MODULES(GNOME_VFS_MODULE,gnome-vfs-module-2.0)
+CFLAGS="$CFLAGS $GNOME_VFS_MODULE_CFLAGS"
+LIBS="$LIBS $GNOME_VFS_MODULE_LIBS"
 
+dnl for $(top_srcdir)/src/libcaptive/sandbox/split-sandbox.c
+AM_PATH_LINC(,,[AC_MSG_ERROR([Captive requires linc library used by ORBit.])])
+
+dnl for $(top_srcdir)/src/libcaptive/client/
+dnl Do not use '[client server]' as $4 to prevent: configure: test: too many arguments
+dnl  - currently this argument is not used by 'orbit2-config' in any way anyway
+AM_PATH_ORBIT2(,,[AC_MSG_ERROR([Captive requires ORBit library.])])
+
+
+AC_SUBST(CFLAGS)
+AC_SUBST(LIBS)
 
 dnl "Makefile" output files MUST have pathnames incl./excl. "./" prefix as specified!
 AC_OUTPUT([
@@ -153,6 +166,7 @@ Makefile
 ./src/libcaptive/ps/Makefile
 ./src/libcaptive/rtl/Makefile
 ./src/libcaptive/storage/Makefile
+./src/libcaptive/sandbox/Makefile
 ./src/libcaptive/client/Makefile
 ./src/client/Makefile
 ./src/client/cmdline/Makefile