Switch order of @x_cflags@ and $glib_cflags to match library order and in

Tue Oct 19 09:55:08 1999  Owen Taylor  <otaylor@redhat.com>

	* gtk-config.in (lib_gtk): Switch order of @x_cflags@
	and $glib_cflags to match library order and in the
	theory that an old version of GLib is more likely to
	be in the include directory for X then vice-versa.
	(Bug #2776)

8 files changed, 64 insertions, 8 deletions

diff --git a/ChangeLog b/ChangeLog
index 7157956fe..10cadeb47 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,10 +1,18 @@
+Tue Oct 19 09:55:08 1999  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk-config.in (lib_gtk): Switch order of @x_cflags@
+	and $glib_cflags to match library order and in the
+	theory that an old version of GLib is more likely to
+	be in the include directory for X then vice-versa.
+	(Bug #2776)
+
 Tue Oct 19 09:46:49 1999  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtkrc.c (gtk_rc_init): Always use LC_CTYPE 
 	to determine the locale for fontsets, not LC_MESSAGES;
 	the user may want English messages with a handling
 	for non-English languages. (LC_CTYPE=ru_RU LC_MESSAGES=fr_FR
-	will still be broken)
+	will still be broken) (Bug #2891)
 
 Tue Oct 19 20:36:42 1999  Changwoo Ryu  <cwryu@adam.kaist.ac.kr>
 
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 7157956fe..10cadeb47 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,10 +1,18 @@
+Tue Oct 19 09:55:08 1999  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk-config.in (lib_gtk): Switch order of @x_cflags@
+	and $glib_cflags to match library order and in the
+	theory that an old version of GLib is more likely to
+	be in the include directory for X then vice-versa.
+	(Bug #2776)
+
 Tue Oct 19 09:46:49 1999  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtkrc.c (gtk_rc_init): Always use LC_CTYPE 
 	to determine the locale for fontsets, not LC_MESSAGES;
 	the user may want English messages with a handling
 	for non-English languages. (LC_CTYPE=ru_RU LC_MESSAGES=fr_FR
-	will still be broken)
+	will still be broken) (Bug #2891)
 
 Tue Oct 19 20:36:42 1999  Changwoo Ryu  <cwryu@adam.kaist.ac.kr>
 
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 7157956fe..10cadeb47 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,10 +1,18 @@
+Tue Oct 19 09:55:08 1999  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk-config.in (lib_gtk): Switch order of @x_cflags@
+	and $glib_cflags to match library order and in the
+	theory that an old version of GLib is more likely to
+	be in the include directory for X then vice-versa.
+	(Bug #2776)
+
 Tue Oct 19 09:46:49 1999  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtkrc.c (gtk_rc_init): Always use LC_CTYPE 
 	to determine the locale for fontsets, not LC_MESSAGES;
 	the user may want English messages with a handling
 	for non-English languages. (LC_CTYPE=ru_RU LC_MESSAGES=fr_FR
-	will still be broken)
+	will still be broken) (Bug #2891)
 
 Tue Oct 19 20:36:42 1999  Changwoo Ryu  <cwryu@adam.kaist.ac.kr>
 
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 7157956fe..10cadeb47 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,10 +1,18 @@
+Tue Oct 19 09:55:08 1999  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk-config.in (lib_gtk): Switch order of @x_cflags@
+	and $glib_cflags to match library order and in the
+	theory that an old version of GLib is more likely to
+	be in the include directory for X then vice-versa.
+	(Bug #2776)
+
 Tue Oct 19 09:46:49 1999  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtkrc.c (gtk_rc_init): Always use LC_CTYPE 
 	to determine the locale for fontsets, not LC_MESSAGES;
 	the user may want English messages with a handling
 	for non-English languages. (LC_CTYPE=ru_RU LC_MESSAGES=fr_FR
-	will still be broken)
+	will still be broken) (Bug #2891)
 
 Tue Oct 19 20:36:42 1999  Changwoo Ryu  <cwryu@adam.kaist.ac.kr>
 
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 7157956fe..10cadeb47 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,10 +1,18 @@
+Tue Oct 19 09:55:08 1999  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk-config.in (lib_gtk): Switch order of @x_cflags@
+	and $glib_cflags to match library order and in the
+	theory that an old version of GLib is more likely to
+	be in the include directory for X then vice-versa.
+	(Bug #2776)
+
 Tue Oct 19 09:46:49 1999  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtkrc.c (gtk_rc_init): Always use LC_CTYPE 
 	to determine the locale for fontsets, not LC_MESSAGES;
 	the user may want English messages with a handling
 	for non-English languages. (LC_CTYPE=ru_RU LC_MESSAGES=fr_FR
-	will still be broken)
+	will still be broken) (Bug #2891)
 
 Tue Oct 19 20:36:42 1999  Changwoo Ryu  <cwryu@adam.kaist.ac.kr>
 
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 7157956fe..10cadeb47 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,10 +1,18 @@
+Tue Oct 19 09:55:08 1999  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk-config.in (lib_gtk): Switch order of @x_cflags@
+	and $glib_cflags to match library order and in the
+	theory that an old version of GLib is more likely to
+	be in the include directory for X then vice-versa.
+	(Bug #2776)
+
 Tue Oct 19 09:46:49 1999  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtkrc.c (gtk_rc_init): Always use LC_CTYPE 
 	to determine the locale for fontsets, not LC_MESSAGES;
 	the user may want English messages with a handling
 	for non-English languages. (LC_CTYPE=ru_RU LC_MESSAGES=fr_FR
-	will still be broken)
+	will still be broken) (Bug #2891)
 
 Tue Oct 19 20:36:42 1999  Changwoo Ryu  <cwryu@adam.kaist.ac.kr>
 
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 7157956fe..10cadeb47 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,10 +1,18 @@
+Tue Oct 19 09:55:08 1999  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk-config.in (lib_gtk): Switch order of @x_cflags@
+	and $glib_cflags to match library order and in the
+	theory that an old version of GLib is more likely to
+	be in the include directory for X then vice-versa.
+	(Bug #2776)
+
 Tue Oct 19 09:46:49 1999  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtkrc.c (gtk_rc_init): Always use LC_CTYPE 
 	to determine the locale for fontsets, not LC_MESSAGES;
 	the user may want English messages with a handling
 	for non-English languages. (LC_CTYPE=ru_RU LC_MESSAGES=fr_FR
-	will still be broken)
+	will still be broken) (Bug #2891)
 
 Tue Oct 19 20:36:42 1999  Changwoo Ryu  <cwryu@adam.kaist.ac.kr>
 
diff --git a/gtk-config.in b/gtk-config.in
index 956b2f50f..5cb9ef2e7 100644
--- a/gtk-config.in
+++ b/gtk-config.in
@@ -99,7 +99,7 @@ if test "$echo_cflags" = "yes"; then
           fi
         done
       fi
-      echo $includes @x_cflags@ $glib_cflags
+      echo $includes $glib_cflags @x_cflags@ 
 fi
 
 if test "$echo_libs" = "yes"; then