mirror of
https://git.FreeBSD.org/ports.git
synced 2024-11-06 22:51:41 +00:00
68 lines
2.9 KiB
Plaintext
68 lines
2.9 KiB
Plaintext
--- configure.orig Sat Nov 27 22:05:06 1999
|
|
+++ configure Sat Nov 27 22:07:13 1999
|
|
@@ -906,8 +906,8 @@
|
|
x_includes="/usr/include"
|
|
fi
|
|
|
|
-LIBS="$LIBS `gtk-config --libs`"
|
|
-CFLAGS="$CFLAGS `gtk-config --cflags` -Wall"
|
|
+LIBS="$LIBS `${GTK_CONFIG} --libs`"
|
|
+CFLAGS="$CFLAGS `${GTK_CONFIG} --cflags` -Wall"
|
|
|
|
# Check whether --with-gtk-prefix or --without-gtk-prefix was given.
|
|
if test "${with_gtk_prefix+set}" = set; then
|
|
@@ -937,18 +937,18 @@
|
|
if test x$gtk_config_exec_prefix != x ; then
|
|
gtk_config_args="$gtk_config_args --exec-prefix=$gtk_config_exec_prefix"
|
|
if test x${GTK_CONFIG+set} != xset ; then
|
|
- GTK_CONFIG=$gtk_config_exec_prefix/bin/gtk-config
|
|
+ GTK_CONFIG=$gtk_config_exec_prefix/bin/${GTK_CONFIG}
|
|
fi
|
|
fi
|
|
if test x$gtk_config_prefix != x ; then
|
|
gtk_config_args="$gtk_config_args --prefix=$gtk_config_prefix"
|
|
if test x${GTK_CONFIG+set} != xset ; then
|
|
- GTK_CONFIG=$gtk_config_prefix/bin/gtk-config
|
|
+ GTK_CONFIG=$gtk_config_prefix/bin/${GTK_CONFIG}
|
|
fi
|
|
fi
|
|
|
|
- # Extract the first word of "gtk-config", so it can be a program name with args.
|
|
-set dummy gtk-config; ac_word=$2
|
|
+ # Extract the first word of "${GTK_CONFIG}", so it can be a program name with args.
|
|
+set dummy ${GTK_CONFIG}; ac_word=$2
|
|
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
|
echo "configure:954: checking for $ac_word" >&5
|
|
if eval "test \"`echo '$''{'ac_cv_path_GTK_CONFIG'+set}'`\" = set"; then
|
|
@@ -1084,10 +1084,10 @@
|
|
else
|
|
echo "$ac_t""no" 1>&6
|
|
# if test "$GTK_CONFIG" = "no" ; then
|
|
-# echo "*** The gtk-config script installed by GTK could not be found"
|
|
+# echo "*** The ${GTK_CONFIG} script installed by GTK could not be found"
|
|
# echo "*** If GTK was installed in PREFIX, make sure PREFIX/bin is in"
|
|
# echo "*** your path, or set the GTK_CONFIG environment variable to the"
|
|
-# echo "*** full path to gtk-config."
|
|
+# echo "*** full path to ${GTK_CONFIG}."
|
|
# else
|
|
# if test -f conf.gtktest ; then
|
|
# :
|
|
@@ -1116,7 +1116,7 @@
|
|
# [ echo "*** The test program failed to compile or link. See the file config.log for the"
|
|
# echo "*** exact error that occured. This usually means GTK was incorrectly installed"
|
|
# echo "*** or that you have moved GTK since it was installed. In the latter case, you"
|
|
-# echo "*** may want to edit the gtk-config script: $GTK_CONFIG" ])
|
|
+# echo "*** may want to edit the ${GTK_CONFIG} script: $GTK_CONFIG" ])
|
|
# CFLAGS="$ac_save_CFLAGS"
|
|
# LIBS="$ac_save_LIBS"
|
|
# fi
|
|
@@ -1135,7 +1135,7 @@
|
|
fi
|
|
|
|
echo -n "checking where to put bluefish library files... "
|
|
-install_location=/usr/local/lib/bluefish
|
|
+install_location=/usr/X11R6/lib/bluefish
|
|
# Check whether --with-install-location or --without-install-location was given.
|
|
if test "${with_install_location+set}" = set; then
|
|
withval="$with_install_location"
|