Separate out GLIB_LIBS and GLIB_DEPLIBS. This may fix the --with-glib

Wed Jan 27 17:05:40 1999  Owen Taylor  <otaylor@redhat.com>

	* Separate out GLIB_LIBS and GLIB_DEPLIBS. This
	may fix the --with-glib option. GLIB_LIBS are
	the libs to link example programs against, while
	GLIB_DEPLIBS are dependency libraries.

10 files changed, 56 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 0e49fdab4e..1f0dbe9765 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Wed Jan 27 17:05:40 1999  Owen Taylor  <otaylor@redhat.com>
+
+	* Separate out GLIB_LIBS and GLIB_DEPLIBS. This
+	may fix the --with-glib option. GLIB_LIBS are
+	the libs to link example programs against, while
+	GLIB_DEPLIBS are dependency libraries.
+
 Wed Jan 20 11:19:00 1999  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtklabel.c: Use floor() instead of truncating
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 0e49fdab4e..1f0dbe9765 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,10 @@
+Wed Jan 27 17:05:40 1999  Owen Taylor  <otaylor@redhat.com>
+
+	* Separate out GLIB_LIBS and GLIB_DEPLIBS. This
+	may fix the --with-glib option. GLIB_LIBS are
+	the libs to link example programs against, while
+	GLIB_DEPLIBS are dependency libraries.
+
 Wed Jan 20 11:19:00 1999  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtklabel.c: Use floor() instead of truncating
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 0e49fdab4e..1f0dbe9765 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,10 @@
+Wed Jan 27 17:05:40 1999  Owen Taylor  <otaylor@redhat.com>
+
+	* Separate out GLIB_LIBS and GLIB_DEPLIBS. This
+	may fix the --with-glib option. GLIB_LIBS are
+	the libs to link example programs against, while
+	GLIB_DEPLIBS are dependency libraries.
+
 Wed Jan 20 11:19:00 1999  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtklabel.c: Use floor() instead of truncating
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 0e49fdab4e..1f0dbe9765 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,10 @@
+Wed Jan 27 17:05:40 1999  Owen Taylor  <otaylor@redhat.com>
+
+	* Separate out GLIB_LIBS and GLIB_DEPLIBS. This
+	may fix the --with-glib option. GLIB_LIBS are
+	the libs to link example programs against, while
+	GLIB_DEPLIBS are dependency libraries.
+
 Wed Jan 20 11:19:00 1999  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtklabel.c: Use floor() instead of truncating
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 0e49fdab4e..1f0dbe9765 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,10 @@
+Wed Jan 27 17:05:40 1999  Owen Taylor  <otaylor@redhat.com>
+
+	* Separate out GLIB_LIBS and GLIB_DEPLIBS. This
+	may fix the --with-glib option. GLIB_LIBS are
+	the libs to link example programs against, while
+	GLIB_DEPLIBS are dependency libraries.
+
 Wed Jan 20 11:19:00 1999  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtklabel.c: Use floor() instead of truncating
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 0e49fdab4e..1f0dbe9765 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,10 @@
+Wed Jan 27 17:05:40 1999  Owen Taylor  <otaylor@redhat.com>
+
+	* Separate out GLIB_LIBS and GLIB_DEPLIBS. This
+	may fix the --with-glib option. GLIB_LIBS are
+	the libs to link example programs against, while
+	GLIB_DEPLIBS are dependency libraries.
+
 Wed Jan 20 11:19:00 1999  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtklabel.c: Use floor() instead of truncating
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 0e49fdab4e..1f0dbe9765 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,10 @@
+Wed Jan 27 17:05:40 1999  Owen Taylor  <otaylor@redhat.com>
+
+	* Separate out GLIB_LIBS and GLIB_DEPLIBS. This
+	may fix the --with-glib option. GLIB_LIBS are
+	the libs to link example programs against, while
+	GLIB_DEPLIBS are dependency libraries.
+
 Wed Jan 20 11:19:00 1999  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtklabel.c: Use floor() instead of truncating
diff --git a/configure.in b/configure.in
index b75cbdd239..19e2f59b9d 100644
--- a/configure.in
+++ b/configure.in
@@ -193,6 +193,7 @@ if test x$with_glib = x ; then
   glib_cflags=`$GLIB_CONFIG glib gmodule --cflags`
   glib_libs=`$GLIB_CONFIG glib gmodule --libs`
   GLIB_LIBS="$glib_libs"
+  GLIB_DEPLIBS="$glib_libs"
 else
   # Use uninstalled glib (assume they got the version right)
 
@@ -219,8 +220,9 @@ else
       ;;
   esac
 
-  GLIB_CFLAGS="-I$glib_dir"
-  GLIB_LIBS=$glib_dir/libglib-$glib_release.la
+  GLIB_CFLAGS="-I$glib_dir -I$glib_dir/gmodule"
+  GLIB_LIBS="$glib_dir/libglib.la $glib_dir/gmodule.la"
+  GLIB_DEPLIBS=
 
   AC_SUBST(GLIB_CFLAGS)
   AC_SUBST(GLIB_LIBS)
@@ -228,6 +230,7 @@ fi
 
 AC_SUBST(glib_cflags)
 AC_SUBST(glib_libs)
+AC_SUBST(GLIB_DEPLIBS)
 
 # Find the X11 include and library directories
 AC_PATH_X
diff --git a/gdk/Makefile.am b/gdk/Makefile.am
index 19dc325311..3161727020 100644
--- a/gdk/Makefile.am
+++ b/gdk/Makefile.am
@@ -67,7 +67,7 @@ LDADDS = \
 
 libgdk_la_LDFLAGS = \
 	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE) \
-         @GLIB_LIBS@	\
+         @GLIB_DEPLIBS@	\
          @x_ldflags@	\
          @x_libs@	\
          -lm
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index a0fde3aa84..81683ec0b9 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -305,7 +305,7 @@ stamp-m: @REBUILD@ $(srcdir)/gtkmarshal.list $(srcdir)/genmarshal.pl
 libgtk_la_LDFLAGS = \
 	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)	\
 	-release $(LT_RELEASE) 					\
-	@GLIB_LIBS@ 						\
+	@GLIB_DEPLIBS@ 						\
 	@x_ldflags@						\
 	@x_libs@ 						\
 	-lm