if available use pkg-config to determine compiler and linker flags at

2006-01-06  Sven Neumann  <sven@gimp.org>

	* gimptool-2.0.in: if available use pkg-config to determine
	compiler and linker flags at runtime. Fixes bug #324761.
This commit is contained in:
Sven Neumann 2006-01-06 16:01:16 +00:00 committed by Sven Neumann
parent f77a5a9017
commit 103594c6af
2 changed files with 15 additions and 5 deletions

View File

@ -1,3 +1,8 @@
2006-01-06 Sven Neumann <sven@gimp.org>
* gimptool-2.0.in: if available use pkg-config to determine
compiler and linker flags at runtime. Fixes bug #324761.
2006-01-06 Sven Neumann <sven@gimp.org> 2006-01-06 Sven Neumann <sven@gimp.org>
* plug-ins/jpeg/jpeg-save.c (save_image): give more feedback by * plug-ins/jpeg/jpeg-save.c (save_image): give more feedback by

View File

@ -92,15 +92,20 @@ if test $# -eq 0; then
fi fi
if test x${PKG_CONFIG+set} != xset ; then if test x${PKG_CONFIG+set} != xset ; then
gtk_cflags='@GTK_CFLAGS@' PKG_CONFIG=pkg-config
gtk_libs='@GTK_LIBS@' fi
glib_cflags='@GLIB_CFLAGS@'
glib_libs='@GLIB_LIBS@' if $PKG_CONFIG --atleast-pkgconfig-version 0.7 ; then
else
gtk_cflags=`$PKG_CONFIG --cflags gtk+-2.0` gtk_cflags=`$PKG_CONFIG --cflags gtk+-2.0`
gtk_libs=`$PKG_CONFIG --libs gtk+-2.0` gtk_libs=`$PKG_CONFIG --libs gtk+-2.0`
glib_cflags=`$PKG_CONFIG --cflags glib-2.0` glib_cflags=`$PKG_CONFIG --cflags glib-2.0`
glib_libs=`$PKG_CONFIG --libs glib-2.0` glib_libs=`$PKG_CONFIG --libs glib-2.0`
else
echo "*** pkg-config not found or too old; using paths from gimp compilation." 1>&2
gtk_cflags='@GTK_CFLAGS@'
gtk_libs='@GTK_LIBS@'
glib_cflags='@GLIB_CFLAGS@'
glib_libs='@GLIB_LIBS@'
fi fi
if test x${INSTALL+set} != xset ; then if test x${INSTALL+set} != xset ; then