From 07fd529e71f910fda7288780e38680b2527133ea Mon Sep 17 00:00:00 2001 From: Manish Singh Date: Fri, 31 Mar 2000 00:49:11 +0000 Subject: [PATCH] made glib cflags extraction smarter -Yosh --- ChangeLog | 4 ++++ configure.in | 9 ++++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index ff99f28972..05bc009714 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Thu Mar 30 16:48:06 PST 2000 Manish Singh + + * configure.in: made glib cflags extraction smarter + Thu Mar 30 01:51:05 PST 2000 Manish Singh * Made 1.1.19 release diff --git a/configure.in b/configure.in index 1d396807d8..edfcdfc379 100644 --- a/configure.in +++ b/configure.in @@ -103,7 +103,14 @@ changequote(,)dnl dnl Evil stuff to extract GLIB stuff from gtk-config output dnl (we want to make sure it matches with the gtk we're using) -GLIB_CFLAGS=`echo $GTK_CFLAGS | sed 's/^.*\(-I[^ ]*glib[^ ]* *-I[^ ]*\).*$/\1/'` +GTK_TEMP_CFLAGS=`echo $GTK_CFLAGS | sed 's/^\(-I[^ ]*\).*$/\1/'` +if echo $GTK_TEMP_CFLAGS | grep 'glib/include$' > /dev/null; then + GTK_TEMP_CFLAGS=$GTK_CFLAGS +else + GTK_TEMP_CFLAGS=`echo $GTK_CFLAGS | sed 's/^-I[^ ]* \(.*\)$/\1/'` +fi +GLIB_CFLAGS=`echo $GTK_TEMP_CFLAGS | sed 's/^\(-I[^ ]*glib[^ ]* *-I[^ ]*\).*/\1/'` + GLIB_LDFLAGS=`echo $GTK_LIBS | sed -e 's/^.*-lgdk[^ ]* *\(-L[^ ]*\).*$/\1/' -e 's/^.* -lgdk[^ ]* .*$//'` if test -z "$GLIB_LDFLAGS" ; then GLIB_LDFLAGS=`echo $GTK_LIBS | sed 's/^ *\(-L[^ ]*\) .*$/\1/'`