[gnet-dev] Patch to fix AM_PATH_GLIB issues when it's not found

[Rodney Dawes <dobey free fr>]

Here is a patch that let's gnet use pkg-config instead of the
AM_PATH_GLIB macro, if you don't --enable-glib2. It works quite
nicely. I also patched src/Makefile.am to use GTHREAD_LIBS in
the LDADD instead of GTHREAD_CFLAGS.

-- dobey

diff -uNr gnet-1.1.4.orig/configure.ac gnet-1.1.4/configure.ac
--- gnet-1.1.4.orig/configure.ac	Mon May 13 22:44:28 2002
+++ gnet-1.1.4/configure.ac	Fri Jul  5 01:46:13 2002
@@ -127,16 +127,13 @@
 		     [gthread])
 fi
 
-if test "x${PKGCONFIG}" = "xyes" -a "x${enable_glib2}" = "xyes"; then
+if test "x${enable_glib2}" = "xyes"; then
 	# Check for 2.0, then 1.2
-	PKG_CHECK_MODULES(GLIB,
-			  [glib-2.0],
-			  ,
-			  [PKG_CHECK_MODULES(GLIB, glib)])
-	PKG_CHECK_MODULES(GTHREAD,
-			  [gthread-2.0],
-			  ,
-			  [PKG_CHECK_MODULES(GTHREAD, gthread)])
+	PKG_CHECK_MODULES(GLIB, glib-2.0)
+	PKG_CHECK_MODULES(GTHREAD, gthread-2.0)
+else
+  PKG_CHECK_MODULES(GLIB, glib)
+  PKG_CHECK_MODULES(GTHREAD, gthread)
 fi
 
 
diff -uNr gnet-1.1.4.orig/src/Makefile.am gnet-1.1.4/src/Makefile.am
--- gnet-1.1.4.orig/src/Makefile.am	Mon Dec  3 15:02:34 2001
+++ gnet-1.1.4/src/Makefile.am	Fri Jul  5 01:46:22 2002
@@ -14,7 +14,7 @@
 libgnet_la_LDFLAGS = \
 	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
 	-release $(LT_RELEASE) \
-	$(GLIB_LIBS) $(GTHREAD_CFLAGS)
+	$(GLIB_LIBS) $(GTHREAD_LIBS)
 
 libgnet_la_SOURCES = 		\
 	gnet.c			\