mirror of
https://gitlab.gnome.org/GNOME/gimp
synced 2024-10-19 22:34:37 +00:00
made glib cflags extraction smarter
-Yosh
This commit is contained in:
parent
ce3c91e638
commit
07fd529e71
|
@ -1,3 +1,7 @@
|
||||||
|
Thu Mar 30 16:48:06 PST 2000 Manish Singh <yosh@gimp.org>
|
||||||
|
|
||||||
|
* configure.in: made glib cflags extraction smarter
|
||||||
|
|
||||||
Thu Mar 30 01:51:05 PST 2000 Manish Singh <yosh@gimp.org>
|
Thu Mar 30 01:51:05 PST 2000 Manish Singh <yosh@gimp.org>
|
||||||
|
|
||||||
* Made 1.1.19 release
|
* Made 1.1.19 release
|
||||||
|
|
|
@ -103,7 +103,14 @@ changequote(,)dnl
|
||||||
|
|
||||||
dnl Evil stuff to extract GLIB stuff from gtk-config output
|
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)
|
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[^ ]* .*$//'`
|
GLIB_LDFLAGS=`echo $GTK_LIBS | sed -e 's/^.*-lgdk[^ ]* *\(-L[^ ]*\).*$/\1/' -e 's/^.* -lgdk[^ ]* .*$//'`
|
||||||
if test -z "$GLIB_LDFLAGS" ; then
|
if test -z "$GLIB_LDFLAGS" ; then
|
||||||
GLIB_LDFLAGS=`echo $GTK_LIBS | sed 's/^ *\(-L[^ ]*\) .*$/\1/'`
|
GLIB_LDFLAGS=`echo $GTK_LIBS | sed 's/^ *\(-L[^ ]*\) .*$/\1/'`
|
||||||
|
|
Loading…
Reference in a new issue