summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>1999-03-15 03:26:12 +0000
committerJeff Garzik <jgarzik@src.gnome.org>1999-03-15 03:26:12 +0000
commit90d69893fde12b6cb0f9eabf7d64b689d34873da (patch)
treec5f6790fa4341a46cfb37e70693fb8263150693b
parent0a23dccde463991087c0fd090bb13fa7f228eb10 (diff)
downloadgtk+-90d69893fde12b6cb0f9eabf7d64b689d34873da.tar.gz
Use correct path to libgmodule.la when ref'ing uninstalled copy of glib.
1999-03-14 Jeff Garzik <jgarzik@pobox.com> * configure.in: Use correct path to libgmodule.la when ref'ing uninstalled copy of glib. (Already in stable branch, Bug #417)
-rw-r--r--ChangeLog6
-rw-r--r--ChangeLog.pre-2-06
-rw-r--r--ChangeLog.pre-2-106
-rw-r--r--ChangeLog.pre-2-26
-rw-r--r--ChangeLog.pre-2-46
-rw-r--r--ChangeLog.pre-2-66
-rw-r--r--ChangeLog.pre-2-86
-rw-r--r--configure.in2
8 files changed, 43 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 6ffd7a4be7..7377efc5fe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+1999-03-14 Jeff Garzik <jgarzik@pobox.com>
+
+ * configure.in:
+ Use correct path to libgmodule.la when ref'ing uninstalled copy
+ of glib. (Already in stable branch, Bug #417)
+
1999-03-15 Tor Lillqvist <tml@iki.fi>
Win32 merge and general portability stuff:
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 6ffd7a4be7..7377efc5fe 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,9 @@
+1999-03-14 Jeff Garzik <jgarzik@pobox.com>
+
+ * configure.in:
+ Use correct path to libgmodule.la when ref'ing uninstalled copy
+ of glib. (Already in stable branch, Bug #417)
+
1999-03-15 Tor Lillqvist <tml@iki.fi>
Win32 merge and general portability stuff:
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 6ffd7a4be7..7377efc5fe 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+1999-03-14 Jeff Garzik <jgarzik@pobox.com>
+
+ * configure.in:
+ Use correct path to libgmodule.la when ref'ing uninstalled copy
+ of glib. (Already in stable branch, Bug #417)
+
1999-03-15 Tor Lillqvist <tml@iki.fi>
Win32 merge and general portability stuff:
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 6ffd7a4be7..7377efc5fe 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,9 @@
+1999-03-14 Jeff Garzik <jgarzik@pobox.com>
+
+ * configure.in:
+ Use correct path to libgmodule.la when ref'ing uninstalled copy
+ of glib. (Already in stable branch, Bug #417)
+
1999-03-15 Tor Lillqvist <tml@iki.fi>
Win32 merge and general portability stuff:
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 6ffd7a4be7..7377efc5fe 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+1999-03-14 Jeff Garzik <jgarzik@pobox.com>
+
+ * configure.in:
+ Use correct path to libgmodule.la when ref'ing uninstalled copy
+ of glib. (Already in stable branch, Bug #417)
+
1999-03-15 Tor Lillqvist <tml@iki.fi>
Win32 merge and general portability stuff:
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 6ffd7a4be7..7377efc5fe 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+1999-03-14 Jeff Garzik <jgarzik@pobox.com>
+
+ * configure.in:
+ Use correct path to libgmodule.la when ref'ing uninstalled copy
+ of glib. (Already in stable branch, Bug #417)
+
1999-03-15 Tor Lillqvist <tml@iki.fi>
Win32 merge and general portability stuff:
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 6ffd7a4be7..7377efc5fe 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+1999-03-14 Jeff Garzik <jgarzik@pobox.com>
+
+ * configure.in:
+ Use correct path to libgmodule.la when ref'ing uninstalled copy
+ of glib. (Already in stable branch, Bug #417)
+
1999-03-15 Tor Lillqvist <tml@iki.fi>
Win32 merge and general portability stuff:
diff --git a/configure.in b/configure.in
index d35df400bf..23d9e37e50 100644
--- a/configure.in
+++ b/configure.in
@@ -256,7 +256,7 @@ else
esac
GLIB_CFLAGS="-I$glib_dir -I$glib_dir/gmodule"
- GLIB_LIBS="$glib_dir/libglib.la $glib_dir/gmodule.la"
+ GLIB_LIBS="$glib_dir/libglib.la $glib_dir/gmodule/libgmodule.la"
GLIB_DEPLIBS=
AC_SUBST(GLIB_CFLAGS)