9b2f027b72
PR: 32956 Submitted by: Edwin Groothuis <edwin@mavetju.org>
62 lines
1.9 KiB
Plaintext
62 lines
1.9 KiB
Plaintext
$FreeBSD$
|
|
|
|
--- configure.orig Mon Oct 15 21:41:00 2001
|
|
+++ configure Mon Dec 17 22:55:13 2001
|
|
@@ -2546,7 +2546,7 @@
|
|
CATOBJEXT=.cat
|
|
INSTOBJEXT=.cat
|
|
DATADIRNAME=lib
|
|
- INTLDEPS='$(top_builddir)/intl/libintl.a'
|
|
+ INTLDEPS='$(PREFIX)/lib/libintl.a'
|
|
INTLLIBS=$INTLDEPS
|
|
LIBS=`echo $LIBS | sed -e 's/-lintl//'`
|
|
nls_cv_header_intl=intl/libintl.h
|
|
@@ -2675,7 +2675,7 @@
|
|
CATOBJEXT=.gmo
|
|
INSTOBJEXT=.mo
|
|
DATADIRNAME=share
|
|
- INTLDEPS='$(top_builddir)/intl/libintl.a'
|
|
+ INTLDEPS='$(PREFIX)/lib/libintl.a'
|
|
INTLLIBS=$INTLDEPS
|
|
LIBS=`echo $LIBS | sed -e 's/-lintl//'`
|
|
nls_cv_header_intl=intl/libintl.h
|
|
@@ -3095,7 +3095,7 @@
|
|
|
|
|
|
# Extract the first word of "gtk-config", so it can be a program name with args.
|
|
-set dummy gtk-config; ac_word=$2
|
|
+set dummy ${GTK_CONFIG}; ac_word=$2
|
|
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
|
echo "configure:3101: checking for $ac_word" >&5
|
|
if eval "test \"`echo '$''{'ac_cv_path_GTKCONFIG'+set}'`\" = set"; then
|
|
@@ -3130,15 +3130,15 @@
|
|
fi
|
|
|
|
if test "x$GTKCONFIG" != "x"; then
|
|
- GTK_INC=`gtk-config --cflags`
|
|
- LIBGTK=`gtk-config --libs`
|
|
+ GTK_INC=`${GTK_CONFIG} --cflags`
|
|
+ LIBGTK=`${GTK_CONFIG} --libs`
|
|
LIBS="$LIBS $LIBGTK"
|
|
else
|
|
{ echo "configure: error: *** gtk is required ***" 1>&2; exit 1; }
|
|
fi
|
|
|
|
# Extract the first word of "glib-config", so it can be a program name with args.
|
|
-set dummy glib-config; ac_word=$2
|
|
+set dummy ${GLIB_CONFIG}; ac_word=$2
|
|
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
|
echo "configure:3144: checking for $ac_word" >&5
|
|
if eval "test \"`echo '$''{'ac_cv_path_GLIBCONFIG'+set}'`\" = set"; then
|
|
@@ -3173,8 +3173,8 @@
|
|
fi
|
|
|
|
if test "x$GLIBCONFIG" != "x"; then
|
|
- GLIB_INC=`glib-config --cflags`
|
|
- LIBGLIB=`glib-config --libs`
|
|
+ GLIB_INC=`${GLIB_CONFIG} --cflags`
|
|
+ LIBGLIB=`${GLIB_CONFIG} --libs`
|
|
LIBS="$LIBS $LIBGLIB"
|
|
else
|
|
{ echo "configure: error: *** glib is required ***" 1>&2; exit 1; }
|