5b6edbc6f8
Use GLIB_CONFIG instead of hardcoded glib12-config PR: ports/16379 Submitted by: KATO Tsuguru <tkato@prontomail.ne.jp>
34 lines
1.1 KiB
Plaintext
34 lines
1.1 KiB
Plaintext
--- configure.orig Sun Feb 27 11:57:26 2000
|
|
+++ configure Sun Feb 27 11:59:58 2000
|
|
@@ -2367,8 +2367,8 @@
|
|
echo "configure:2368: checking whether to build gmodulized imlib" >&5
|
|
oLIBS="$LIBS"
|
|
oCFLAGS="$CFLAGS"
|
|
- LIBS="$LIBS `glib-config --libs gmodule`"
|
|
- CFLAGS="$CFLAGS `glib-config --cflags gmodule`"
|
|
+ LIBS="$LIBS `${GLIB_CONFIG} --libs gmodule`"
|
|
+ CFLAGS="$CFLAGS `${GLIB_CONFIG} --cflags gmodule`"
|
|
if test "$cross_compiling" = yes; then
|
|
{ echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
|
|
else
|
|
@@ -2418,8 +2418,8 @@
|
|
#define USE_GMODULE 1
|
|
EOF
|
|
|
|
- GMODULE_LIBS="`glib-config --libs gmodule`"
|
|
- GMODULE_FLAGS="`glib-config --cflags gmodule`"
|
|
+ GMODULE_LIBS="`${GLIB_CONFIG} --libs gmodule`"
|
|
+ GMODULE_FLAGS="`${GLIB_CONFIG} --cflags gmodule`"
|
|
|
|
|
|
echo "$ac_t""yes" 1>&6
|
|
@@ -4536,7 +4536,7 @@
|
|
echo "$ac_t""$jpeg_ok" 1>&6
|
|
if test "$jpeg_ok" = yes; then
|
|
JPEGLIBS="-ljpeg"
|
|
- SUPPORT_LIBS="$SUPPORT_LIBS -ljpeg"; cat >> confdefs.h <<\EOF
|
|
+ SUPPORT_LIBS="$SUPPORT_LIBS"; cat >> confdefs.h <<\EOF
|
|
#define HAVE_LIBJPEG 1
|
|
EOF
|
|
|