remove testgconfclient from build, should now be made nongraphical and

2001-05-09  Havoc Pennington  <hp@redhat.com>

	* gconf/Makefile.am: remove testgconfclient from build, should
	now be made nongraphical and stuck in tests/

	* Makefile.am (SUBDIRS): remove "wrappers" from subdirs

	* configure.in: remove Guile cruft, fix up pkg-config usage

	* acinclude.m4: Use the pkg-config macros, remove gnome-common
	dependency. Requires CVS pkg-config, need a pkg-config release.
        (Since OAF doesn't build against ORBit1 anyway, I figured why not
	check this in too...)

8 files changed, 40 insertions, 247 deletions

diff --git a/ChangeLog b/ChangeLog
index d3cb3c9d..6d1aadf1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2001-05-09  Havoc Pennington  <hp@redhat.com>
+
+	* gconf/Makefile.am: remove testgconfclient from build, should 
+	now be made nongraphical and stuck in tests/
+
+	* Makefile.am (SUBDIRS): remove "wrappers" from subdirs
+
+	* configure.in: remove Guile cruft, fix up pkg-config usage
+
+	* acinclude.m4: Use the pkg-config macros, remove gnome-common
+	dependency. Requires CVS pkg-config, need a pkg-config release.
+        (Since OAF doesn't build against ORBit1 anyway, I figured why not
+	check this in too...)
+	
 2001-04-28  Murray Cumming  <murrayc@usa.net>
 
 	* gconf/gconf-client.c, gconf/gconf-client.h,
diff --git a/Makefile.am b/Makefile.am
index 95f560c7..43f5bcc1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,5 @@
 
-SUBDIRS = gconf backends wrappers po doc examples standard-schemas
+SUBDIRS = gconf backends po doc examples standard-schemas
 DIST_SUBDIRS=tests $(SUBDIRS)
 
 EXTRA_DIST=gconf-config.in gconf.m4.in gconf.spec.in gconf.spec TODO \
diff --git a/acinclude.m4 b/acinclude.m4
index 324b69b0..ea011dde 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -335,191 +335,3 @@ strdup __argz_count __argz_stringify __argz_next])
    sed -e "/^#/d" -e "/^\$/d" -e "s,.*,	$posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \
 	< $srcdir/po/POTFILES.in > po/POTFILES
   ])
-
-dnl GNOME_PKGCONFIG_CHECK_VERSION() extracts up to 6 decimal numbers out of given-version
-dnl and required-version, using any non-number letters as delimiters. it then
-dnl compares each of those 6 numbers in order 1..6 to each other, requirering
-dnl all of the 6 given-version numbers to be greater than, or at least equal
-dnl to the corresponding number of required-version.
-dnl GNOME_PKGCONFIG_CHECK_VERSION(given-version, required-version [, match-action] [, else-action])
-AC_DEFUN([GNOME_PKGCONFIG_CHECK_VERSION],[
-[eval `echo "$1:0:0:0:0:0:0" | sed -e 's/^[^0-9]*//' -e 's/[^0-9]\+/:/g' \
- -e 's/\([^:]*\):\([^:]*\):\([^:]*\):\([^:]*\):\([^:]*\):.*/ac_v1=\1 ac_v2=\2 ac_v3=\3 ac_v4=\4 ac_v5=\5 ac_v6=\6/' \
-`]
-[eval `echo "$2:0:0:0:0:0:0" | sed -e 's/^[^0-9]*//' -e 's/[^0-9]\+/:/g' \
- -e 's/\([^:]*\):\([^:]*\):\([^:]*\):\([^:]*\):\([^:]*\):.*/ac_r1=\1 ac_r2=\2 ac_r3=\3 ac_r4=\4 ac_r5=\5 ac_r6=\6/' \
-`]
-ac_vm=[`expr \( $ac_v1 \> $ac_r1 \) \| \( \( $ac_v1 \= $ac_r1 \) \& \(          \
-              \( $ac_v2 \> $ac_r2 \) \| \( \( $ac_v2 \= $ac_r2 \) \& \(         \
-               \( $ac_v3 \> $ac_r3 \) \| \( \( $ac_v3 \= $ac_r3 \) \& \(        \
-                \( $ac_v4 \> $ac_r4 \) \| \( \( $ac_v4 \= $ac_r4 \) \& \(       \
-                 \( $ac_v5 \> $ac_r5 \) \| \( \( $ac_v5 \= $ac_r5 \) \& \(      \
-                  \( $ac_v6 \>= $ac_r6 \)                                       \
-                 \) \)  \
-                \) \)   \
-               \) \)    \
-              \) \)     \
-             \) \)      `]
-case $ac_vm in
-[1)]
-        [$3]
-        ;;
-*[)]
-        [$4]
-        ;;
-esac
-])
-
-dnl
-dnl GNOME_CHECK_PKGCONFIG (script-if-enabled, [failflag])
-dnl
-AC_DEFUN([GNOME_CHECK_PKGCONFIG],[
-	AC_PATH_PROG(PKG_CONFIG, pkg-config)
-	have_pkgconfig=no
-	if test -x "$PKG_CONFIG" ; then
-	    have_pkgconfig=yes
-	else
-	    PKG_CONFIG=
-	fi
-	AC_MSG_CHECKING(for pkg-config)
-	if test x$have_pkgconfig = xyes ; then
-	    pkgconfig_required_version=0.4.1
-	    pkgconfig_version=`pkg-config --version`
-	    GNOME_PKGCONFIG_CHECK_VERSION($pkgconfig_version, $pkgconfig_required_version, [have_pkgconfig=yes], [have_pkgconfig=no])
-	fi
-	if test x$have_pkgconfig = xyes ; then
-	    AC_MSG_RESULT(yes)
-	else
-	    PKG_CONFIG=
-	    AC_MSG_RESULT(not found)
- 	    if test x$2 = xfail; then
-		AC_MSG_ERROR([
-*** You need the latest pkg-config (at least $pkgconfig_required_version).
-*** Get the latest version of pkg-config from
-*** http://pkgconfig.sourceforge.net.])
-	    fi
-	fi
-	AC_SUBST(PKG_CONFIG)
-
-	AC_PROVIDE([GNOME_REQUIRE_PKGCONFIG])
-])
-
-dnl
-dnl GNOME_REQUIRE_PKGCONFIG
-dnl
-AC_DEFUN([GNOME_REQUIRE_PKGCONFIG],[
-	GNOME_CHECK_PKGCONFIG([], fail)
-])
-
-dnl Check if the C compiler accepts a certain C flag, and if so adds it to
-dnl CFLAGS
-AC_DEFUN([GNOME_PKGCONFIG_CHECK_CFLAG], [
-  AC_REQUIRE([GNOME_REQUIRE_PKGCONFIG])
-
-  AC_MSG_CHECKING(if C compiler accepts $1)
-  save_CFLAGS="$CFLAGS"
-
-  dnl make sure we add it only once
-  dnl this one doesn't seem to work: *[\ \	]$1[\ \ ]*) ;;
-  case " $CFLAGS " in
-  *\ $1\ *) echo $ac_n "(already in CFLAGS) ... " ;;
-  *\ $1\	*) echo $ac_n "(already in CFLAGS) ... " ;;
-  *\	$1\ *) echo $ac_n "(already in CFLAGS) ... " ;;
-  *\	$1\	*) echo $ac_n "(already in CFLAGS) ... " ;;
-  *) CFLAGS="$CFLAGS $1" ;;
-  esac
-
-  AC_TRY_COMPILE([#include <stdio.h>], [printf("hello");],
-	         [ AC_MSG_RESULT(yes)],dnl
-	         [ CFLAGS="$save_CFLAGS" AC_MSG_RESULT(no) ])
-])
-
-dnl add $ACLOCAL_FLAGS (and optionally more dirs) to the aclocal
-dnl commandline, so make can work even if it needs to rerun aclocal
-AC_DEFUN([GNOME_PKGCONFIG_ACLOCALFLAGS],
-[
-  AC_REQUIRE([GNOME_REQUIRE_PKGCONFIG])
-
-  test -n "$ACLOCAL_FLAGS" && ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS"
-
-  for i in "$1"; do
-    ACLOCAL="$ACLOCAL -I $i"
-  done
-])
-
-AC_DEFUN([GNOME_PKGCONFIG_CHECK_OPTIONAL_MODULES],
-[
-    AC_REQUIRE([GNOME_REQUIRE_PKGCONFIG])
-
-    name=$1
-    depvar=$3
-
-    AC_MSG_CHECKING(for libraries)
-    pkg_list=""
-    for module in $2 ""; do
-	if test -n "$module"; then
-	    if `echo $module |grep -q ":"`; then
-		dnl has version requirement
-		pkg_module_name=`echo $module |sed 's/\(.*\):.*/\1/'`
-		test_version=`echo $module |sed 's/.*:\(.*\)/\1/'`
-
-		msg=`$PKG_CONFIG $pkg_module_name 2>&1`
-		if test -z "$msg"; then
-		    dnl module exists
-		    pkg_version=`$PKG_CONFIG --modversion $pkg_module_name`
-		    GNOME_PKGCONFIG_CHECK_VERSION($pkg_version, $test_version,
-			dnl has the right version
-			echo $ac_n "$pkg_module_name "
-			pkg_list="$pkg_list $pkg_module_name"
-		    ,
-			AC_MSG_RESULT([($pkg_module_name)])
-			if test x$4 = xfail ; then
-				AC_MSG_ERROR([An old version of $pkg_module_name (version $pkg_version) was found. You need at least version $test_version])
-			else
-				AC_MSG_WARN([An old version of $pkg_module_name (version $pkg_version) was found. You need at least version $test_version])
-			fi
-		    )
-		else
-		    dnl doesn't exist
-		    AC_MSG_RESULT([($pkg_module_name)])
-		    if test x$4 = xfail ; then
-			AC_MSG_ERROR([$msg])
-		    else
-			AC_MSG_WARN([$msg])
-		    fi
-		fi
-	    else
-		msg=`$PKG_CONFIG $module 2>&1`
-		if test -z "$msg"; then
-		    echo $ac_n "$module "
-		    pkg_list="$pkg_list $module"
-		else
-		    AC_MSG_RESULT([($module)])
-		    if test x$4 = xfail ; then
-			AC_MSG_ERROR([$msg])
-		    else
-			AC_MSG_WARN([$msg])
-		    fi
-		fi
-	    fi
-	fi
-    done
-    AC_MSG_RESULT([])
-    if test -n "$pkg_list"; then
-	eval $name'_CFLAGS'=\"`$PKG_CONFIG --cflags $pkg_list`\"
-	eval $name'_LIBS'=\"`$PKG_CONFIG --libs $pkg_list`\"
-	if test -n "$depvar"; then
-	    eval $depvar'_DEPENDS'=\"\$$depname'_DEPENDS' $pkg_list\"
-	else
-	    eval $name'_DEPENDS'=\"$pkg_list\"
-	fi
-	if test -z "$4" ; then
-	    eval 'HAVE_'$name=yes
-	fi
-    fi
-])
-
-AC_DEFUN([GNOME_PKGCONFIG_CHECK_MODULES],
-[
-	GNOME_PKGCONFIG_CHECK_OPTIONAL_MODULES($1,$2,$3,fail)
-])
diff --git a/backends/Makefile.am b/backends/Makefile.am
index 69d6160e..484458d9 100644
--- a/backends/Makefile.am
+++ b/backends/Makefile.am
@@ -1,5 +1,5 @@
 INCLUDES= -I$(top_srcdir) -I$(top_builddir) -I$(top_builddir)/gconf \
-	$(GLIB_CFLAGS) $(OAF_CFLAGS) $(ORBIT_CFLAGS) $(XML_CFLAGS) \
+	$(DEPENDENT_WITH_XML_CFLAGS) \
 	-DGCONF_ENABLE_INTERNALS=1 -DG_LOG_DOMAIN=\"GConf-Backends\"
 
 EXTRA_DIST=README.bdb
@@ -24,10 +24,10 @@ libgconfbackend_xml_la_SOURCES = \
 	xml-backend.c
 
 libgconfbackend_xml_la_LDFLAGS = -avoid-version -module
-libgconfbackend_xml_la_LIBADD  = $(GLIB_LIBS) $(XML_LIBS)
+libgconfbackend_xml_la_LIBADD  = $(DEPENDENT_WITH_XML_LIBS)
 
 libgconfbackend_bdb_la_SOURCES = bdb.c bdb.h bdb-backend.c val-encode.c val-encode.h dir-utils.c dir-utils.h
 
 
 libgconfbackend_bdb_la_LDFLAGS = -avoid-version -module
-libgconfbackend_bdb_la_LIBADD = $(GLIB_LIBS) $(BDB_LIBS)
+libgconfbackend_bdb_la_LIBADD = $(DEPENDENT_LIBS) $(BDB_LIBS)
diff --git a/configure.in b/configure.in
index f502ad13..88d97a82 100644
--- a/configure.in
+++ b/configure.in
@@ -137,23 +137,23 @@ if test "x$docs_only" = "xyes"; then
         AC_FYI("Only building documentation")
 else
 
-GNOME_PKGCONFIG_CHECK_MODULES(GLIB, gmodule-2.0:1.3.1 gobject-2.0:1.3.1)
-GNOME_PKGCONFIG_CHECK_OPTIONAL_MODULES(GTK, gtk+-2.0:1.3.1)
-GNOME_PKGCONFIG_CHECK_MODULES(OAF, oaf-2.0)
-GNOME_PKGCONFIG_CHECK_MODULES(XML, libxml-2.0:2.2.8)
-AC_PATH_PROG(OAF_CONFIG, oaf-config)
-AC_SUBST(OAF_CONFIG)
-AC_SUBST(GLIB_LIBS)
-AC_SUBST(GLIB_CFLAGS)
-AC_SUBST(OAF_LIBS)
-AC_SUBST(OAF_CFLAGS)
-AC_SUBST(GTK_LIBS)
-AC_SUBST(GTK_CFLAGS)
-AC_SUBST(XML_LIBS)
-AC_SUBST(XML_CFLAGS)
+PKGCONFIG_MODULES='gmodule-2.0 >= 1.3.5 gobject-2.0 >= 1.3.5 oaf-2.0'
+PKGCONFIG_MODULES_WITH_XML=$PKGCONFIG_MODULES" libxml-2.0"
+PKGCONFIG_MODULES_WITH_GTK="gtk+-2.0 "$PKGCONFIG_MODULES
+
+PKG_CHECK_MODULES(DEPENDENT, $PKGCONFIG_MODULES)
+PKG_CHECK_MODULES(DEPENDENT_WITH_XML, $PKGCONFIG_MODULES_WITH_XML)
+PKG_CHECK_MODULES(DEPENDENT_WITH_GTK, $PKGCONFIG_MODULES_WITH_GTK, HAVE_GTK=yes, HAVE_GTK=no)
 
 AM_CONDITIONAL(GTK, test x$HAVE_GTK != xno)
 
+AC_SUBST(DEPENDENT_LIBS)
+AC_SUBST(DEPENDENT_CFLAGS)
+AC_SUBST(DEPENDENT_WITH_XML_LIBS)
+AC_SUBST(DEPENDENT_WITH_XML_CFLAGS)
+AC_SUBST(DEPENDENT_WITH_GTK_LIBS)
+AC_SUBST(DEPENDENT_WITH_GTK_CFLAGS)
+
 BDB_LIBS=
 BDB_CFLAGS=
 
@@ -174,21 +174,6 @@ AC_CHECK_LIB(popt, poptGetArg, POPT_LIBS=-lpopt,
 *** ftp://ftp.redhat.com/pub/redhat/code/popt and try again.]]))])
 AC_SUBST(POPT_LIBS)
 
-AC_PATH_PROG(GUILE_CONFIG,guile-config,no)
-if (test x$GUILE_CONFIG = xno); then
-  AC_MSG_WARN(didn't find guile-config, won't build Guile wrappers)
-else
-  GUILE_LIBS=`$GUILE_CONFIG link`
-  GUILE_CFLAGS=`$GUILE_CONFIG compile`
-fi
-if (test -z "$GUILE_LIBS"); then
-  AC_MSG_WARN(guile-config reports no libraries, won't build Guile wrappers)
-fi
-
-AM_CONDITIONAL(GUILE, test -n "$GUILE_LIBS")
-AC_SUBST(GUILE_LIBS)
-AC_SUBST(GUILE_CFLAGS)
-
 AC_CHECK_HEADER(pthread.h, have_pthreads=yes)
 AM_CONDITIONAL(PTHREADS, test -n "$have_pthreads")
 
@@ -253,7 +238,6 @@ gconf/Makefile
 gconf/default.path
 gconf/gconfd.oafinfo
 backends/Makefile
-wrappers/Makefile
 po/Makefile.in
 doc/Makefile
 doc/gconf/Makefile
diff --git a/examples/Makefile.am b/examples/Makefile.am
index d1fb8808..80f6211f 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -1,6 +1,5 @@
 INCLUDES=-I$(top_srcdir) -I$(top_srcdir)/gconf -I$(top_builddir)/gconf \
-	-I$(top_srcdir)/wrappers/gtk -I$(top_builddir)/wrappers/gtk \
-	$(GLIB_CFLAGS) $(OAF_CFLAGS) $(GMODULE_CFLAGS) $(GTK_CFLAGS) \
+	$(DEPENDENT_WITH_GTK_CFLAGS) \
         -DGCONF_SRCDIR=\""$(absolute_top_srcdir)"\" -DGCONF_SYSCONFDIR=\""$(sysconfdir)"\"
 
 EFENCE=
@@ -13,7 +12,7 @@ endif
 
 noinst_PROGRAMS=$(GTK_EXAMPLES)
 
-GTK_EXAMPLES_LINK= $(EFENCE) $(INTLLIBS) $(OAF_LIBS) $(GTK_LIBS) $(top_builddir)/gconf/libgconf-$(MAJOR_VERSION).la $(EFENCE)
+GTK_EXAMPLES_LINK= $(EFENCE) $(INTLLIBS) $(DEPENDENT_WITH_GTK_LIBS) $(top_builddir)/gconf/libgconf-$(MAJOR_VERSION).la $(EFENCE)
 
 basic_gconf_app_SOURCES = basic-gconf-app.c
 
diff --git a/gconf/Makefile.am b/gconf/Makefile.am
index a1c0a685..ab8c9a5b 100644
--- a/gconf/Makefile.am
+++ b/gconf/Makefile.am
@@ -3,10 +3,7 @@ NULL=
 INCLUDES=\
 	-I$(top_srcdir) \
 	-I$(top_builddir) \
-	$(GLIB_CFLAGS) \
-	$(XML_CFLAGS) \
-	$(OAF_CFLAGS) \
-	$(GTK_CFLAGS) \
+	$(DEPENDENT_CFLAGS) \
 	-DG_LOG_DOMAIN=\"GConf\"                   \
 	-DGCONF_LOCALE_DIR=\""$(gconflocaledir)"\"  \
         -DGCONF_SRCDIR=\""$(absolute_top_srcdir)"\" \
@@ -25,14 +22,6 @@ lib_LTLIBRARIES = libgconf-2.la
 
 bin_PROGRAMS = gconfd-2 gconftool-2
 
-if GTK
-GTK_PROGS = testgconfclient
-else
-GTK_PROGS =
-endif
-
-noinst_PROGRAMS = $(GTK_PROGS)
-
 CORBA_SOURCES = GConf-common.c GConf-skels.c GConf-stubs.c GConf.h
 
 BUILT_SOURCES = \
@@ -67,7 +56,7 @@ gconfd_2_SOURCES = \
 	gconfd.h		\
 	gconfd.c
 
-gconfd_2_LDADD = $(EFENCE) $(INTLLIBS) $(OAF_LIBS) $(GLIB_LIBS) libgconf-$(MAJOR_VERSION).la
+gconfd_2_LDADD = $(EFENCE) $(INTLLIBS) $(DEPENDENT_LIBS) libgconf-$(MAJOR_VERSION).la
 
 # gconf_testclient_SOURCES = \
 # 	testclient.c
@@ -77,7 +66,7 @@ gconfd_2_LDADD = $(EFENCE) $(INTLLIBS) $(OAF_LIBS) $(GLIB_LIBS) libgconf-$(MAJOR
 gconftool_2_SOURCES = \
 	gconftool.c
 
-gconftool_2_LDADD = $(EFENCE) $(INTLLIBS) $(OAF_LIBS) $(GLIB_LIBS) $(POPT_LIBS) $(XML_LIBS) libgconf-$(MAJOR_VERSION).la
+gconftool_2_LDADD = $(EFENCE) $(INTLLIBS) $(DEPENDENT_WITH_XML_LIBS) $(POPT_LIBS) libgconf-$(MAJOR_VERSION).la
 
 $(CORBA_SOURCES): $(srcdir)/GConf.idl
 	orbit-idl $(srcdir)/GConf.idl
@@ -101,7 +90,7 @@ libgconf_2_la_SOURCES = \
 
 libgconf_2_la_LDFLAGS = -version-info $(GCONF_CURRENT):$(GCONF_REVISION):$(GCONF_AGE)
 
-libgconf_2_la_LIBADD = $(INTLLIBS) $(OAF_LIBS) $(GLIB_LIBS)
+libgconf_2_la_LIBADD = $(INTLLIBS) $(DEPENDENT_LIBS)
 
 EXTRA_DIST=GConf.idl gconfd.oafinfo.in default.path.in gconfmarshal.list
 
@@ -127,8 +116,3 @@ gconfmarshal.h gconfmarshal.c: @REBUILD@ stamp-gconfmarshal.h
 	&& cp xgen-gmc gconfmarshal.c \
 	&& rm -f xgen-gmc xgen-gmc~
 
-testgconfclient_SOURCES = \
-	testgconfclient.c
-
-testgconfclient_LDADD = \
-	libgconf-2.la $(GTK_LIBS)
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 66480593..f0bfdc30 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -3,12 +3,12 @@ EFENCE=
 
 INCLUDES = -I$(top_srcdir) -I$(top_builddir) -I$(top_srcdir)/gconf \
 	-I$(top_builddir)/gconf \
-	-I$(includedir) $(GLIB_CFLAGS) $(OAF_CFLAGS) \
+	-I$(includedir) $(DEPENDENT_CFLAGS) \
 	 -DG_LOG_DOMAIN=\"GConf-Tests\" -DGCONF_ENABLE_INTERNALS=1
 
 noinst_PROGRAMS=testgconf testlisteners testschemas testchangeset testencode testunique testpersistence testdirlist testaddress
 
-TESTLIBS= $(INTLLIBS) $(GLIB_LIBS) $(OAF_LIBS) $(top_builddir)/gconf/libgconf-$(MAJOR_VERSION).la  $(EFENCE)
+TESTLIBS= $(INTLLIBS) $(DEPENDENT_LIBS) $(top_builddir)/gconf/libgconf-$(MAJOR_VERSION).la  $(EFENCE)
 
 testunique_SOURCES=testunique.c