diff --git a/src/configure.in b/src/configure.in
index 55e92a5a4b69d87199c9a916683f2b23a760ac28..a321906d9ba1a422d3d6e4d803c5746f28a0c3ab 100644
--- a/src/configure.in
+++ b/src/configure.in
@@ -1,4 +1,4 @@
-AC_REVISION("$Id: configure.in,v 1.755 2003/12/16 19:52:17 grendel Exp $")
+AC_REVISION("$Id: configure.in,v 1.756 2003/12/17 22:04:50 marcus Exp $")
AC_INIT(interpret.c)
AC_CONFIG_HEADER(machine.h)
@@ -686,11 +686,11 @@ case "$pike_cv_sys_os" in
FreeBSD*)
# FreeBSD have other naming convention for gtk-config and sdl-config
if test "x${GTK_CONFIG}" == "x"; then
- GTK_CONFIG=`which gtk12-config`
+ GTK_CONFIG=`which ${ac_tool_prefix}gtk12-config`
export GTK_CONFIG
fi
if test "x${SDL_CONFIG}" == "x"; then
- SDL_CONFIG=`which sdl11-config`
+ SDL_CONFIG=`which ${ac_tool_prefix}sdl11-config`
export SDL_CONFIG
fi
;;
@@ -2765,7 +2765,7 @@ int main(int argc, char **argv)
AC_MSG_RESULT(yes)
using_threads="yes (freebsd)"
- AC_PATH_PROG(PTHREAD_CONFIG,pthread-config,no)
+ AC_PATH_PROG(PTHREAD_CONFIG,${ac_tool_prefix}pthread-config,no)
if test "x$PTHREAD_CONFIG" = xno ; then
AC_SYS_COMPILER_FLAG(-pthread, pthread, CFLAGS, LIBS="$LIBS -lc_r")
LD_FALLBACK_FLAGS="${LD_FALLBACK_FLAGS-} -lc_r"
@@ -2815,9 +2815,9 @@ rm confdefs.out.2 >/dev/null 2>/dev/null || :
fi
else
- CFLAGS="$CFLAGS `pthread-config --cflags`"
- LIBS="$LIBS `pthread-config --libs`"
- LDFLAGS="$CFLAGS `pthread-config --ldflags`"
+ CFLAGS="$CFLAGS `${ac_tool_prefix}pthread-config --cflags`"
+ LIBS="$LIBS `${ac_tool_prefix}pthread-config --libs`"
+ LDFLAGS="$CFLAGS `${ac_tool_prefix}pthread-config --ldflags`"
fi
fi
;;
diff --git a/src/modules/_Image_FreeType/configure.in b/src/modules/_Image_FreeType/configure.in
index 3db2794d83a389866635de97a02529c5d17bec89..3c67e0b35efc84cdef44bbe8b37073e5fbc0442a 100644
--- a/src/modules/_Image_FreeType/configure.in
+++ b/src/modules/_Image_FreeType/configure.in
@@ -10,7 +10,7 @@ if test "x$with_freetype" = "xyes" ; then
PIKE_FEATURE_NODEP(Image.FreeType)
- MY_AC_PATH_PROG(FT_CONFIG, freetype-config, no)
+ MY_AC_PATH_PROG(FT_CONFIG, ${ac_tool_prefix}freetype-config, no)
if test "$FT_CONFIG" = "no" ; then
:
diff --git a/src/post_modules/GTK/configure.in b/src/post_modules/GTK/configure.in
index dfca46cf83f2f4ab15b13f34285b4be54c2d80c8..a8f0d2aa520350df9187c1edab5de29c9ea3c707 100644
--- a/src/post_modules/GTK/configure.in
+++ b/src/post_modules/GTK/configure.in
@@ -18,7 +18,7 @@ for module in . $3; do
esac
done
-MY_AC_PATH_PROG(LIBGLADE_CONFIG, libglade-config, no)
+MY_AC_PATH_PROG(LIBGLADE_CONFIG, ${ac_tool_prefix}libglade-config, no)
AC_MSG_CHECKING(for libglade)
if test "$LIBGLADE_CONFIG" = "no"; then
AC_MSG_RESULT(no)
@@ -67,21 +67,21 @@ AC_ARG_ENABLE(gtktest, [ --disable-gtktest Do not try to compile and run
if test x$gtk_config_exec_prefix != x ; then
gtk_config_args="$gtk_config_args --exec-prefix=$gtk_config_exec_prefix"
- if test -f $gtk_config_exec_prefix/bin/gtk-config-2.0; then
- GTK_CONFIG=$gtk_config_exec_prefix/bin/gtk-config-2.0
+ if test -f $gtk_config_exec_prefix/bin/${ac_tool_prefix}gtk-config-2.0; then
+ GTK_CONFIG=$gtk_config_exec_prefix/bin/${ac_tool_prefix}gtk-config-2.0
else
if test x${GTK_CONFIG+set} != xset ; then
- GTK_CONFIG=$gtk_config_exec_prefix/bin/gtk-config
+ GTK_CONFIG=$gtk_config_exec_prefix/bin/${ac_tool_prefix}gtk-config
fi
fi
fi
if test x$gtk_config_prefix != x ; then
gtk_config_args="$gtk_config_args --prefix=$gtk_config_prefix"
- if test -f $gtk_config_prefix/bin/gtk-config-2.0; then
- GTK_CONFIG=$gtk_config_prefix/bin/gtk-config-2.0
+ if test -f $gtk_config_prefix/bin/${ac_tool_prefix}gtk-config-2.0; then
+ GTK_CONFIG=$gtk_config_prefix/bin/${ac_tool_prefix}gtk-config-2.0
else
if test x${GTK_CONFIG+set} != xset ; then
- GTK_CONFIG=$gtk_config_prefix/bin/gtk-config
+ GTK_CONFIG=$gtk_config_prefix/bin/${ac_tool_prefix}gtk-config
fi
fi
fi
@@ -287,7 +287,7 @@ if test "x$with_GTK" = "xyes" ; then
PIKE_FEATURE_NODEP(GTK.GladeXML)
if test "x$with_GTK2" = "xyes" ; then
PIKE_FEATURE_NODEP(GTK2)
- MY_AC_PATH_PROG(PKG_CONFIG,pkg-config,no)
+ MY_AC_PATH_PROG(PKG_CONFIG,${ac_tool_prefix}pkg-config,no)
else
PKG_CONFIG=no
fi
@@ -298,7 +298,7 @@ AC_SUBST(have_gtk_20)
AC_SUBST(have_gtk_120)
if test "$PKG_CONFIG" = "no" ; then
- MY_AC_PATH_PROG(GTK_CONFIG, gtk-config,no)
+ MY_AC_PATH_PROG(GTK_CONFIG, ${ac_tools_prefix}gtk-config,no)
AM_PATH_GTK(1.2.0,[have_gtk_120=gtk_120],[have_gtk_120=no_gtk_120])
if test x$have_gtk_120 = xno_gtk_120 ; then
AM_PATH_GTK(1.1.13,[WITH_GTK=1],[WITH_GTK=0])
@@ -306,10 +306,10 @@ AC_SUBST(have_gtk_120)
WITH_GTK=1
fi
else
- if pkg-config gtk+-2.0 2>/dev/null ; then
+ if ${ac_tool_prefix}pkg-config gtk+-2.0 2>/dev/null ; then
PIKE_FEATURE_OK(GTK2)
- GTK_CFLAGS="`pkg-config gtk+-2.0 --cflags`"
- GTK_LIBS="`pkg-config gtk+-2.0 --libs`"
+ GTK_CFLAGS="`${ac_tool_prefix}pkg-config gtk+-2.0 --cflags`"
+ GTK_LIBS="`${ac_tool_prefix}pkg-config gtk+-2.0 --libs`"
echo "**** WARNING: Using GTK 2.0"
echo "**** THis is not recommended"
echo "LIBS: $GTK_LIBS"
@@ -317,7 +317,7 @@ AC_SUBST(have_gtk_120)
AC_CHECK_LIB(iconv,iconv,,,$GTK_LIBS)
WITH_GTK=2
else
- MY_AC_PATH_PROG(GTK_CONFIG, gtk-config,no)
+ MY_AC_PATH_PROG(GTK_CONFIG, ${ac_tool_prefix}gtk-config,no)
AM_PATH_GTK(1.2.0,[have_gtk_120=gtk_120],[have_gtk_120=no_gtk_120])
if test x$have_gtk_120 = xno_gtk_120 ; then
AM_PATH_GTK(1.1.13,[WITH_GTK=1],[WITH_GTK=0])
@@ -410,7 +410,7 @@ if test "x$WITH_GTK" = x1 ; then
if test "x$with_gnome" = "xyes"; then
PIKE_FEATURE_NODEP(Gnome)
- MY_AC_PATH_PROG(GNOME_CONFIG,gnome-config,no)
+ MY_AC_PATH_PROG(GNOME_CONFIG,${ac_tool_prefix}gnome-config,no)
if test "$GNOME_CONFIG" = "no"; then
:
diff --git a/src/post_modules/SDL/configure.in b/src/post_modules/SDL/configure.in
index 9c7f1e34e0324dd6d5cbd98505e1c67b84c6ed38..a5eaa80bab57c80f35b0d3b328a285dfb1877b50 100644
--- a/src/post_modules/SDL/configure.in
+++ b/src/post_modules/SDL/configure.in
@@ -1,4 +1,4 @@
-# $Id: configure.in,v 1.6 2003/09/10 12:40:50 mirar Exp $
+# $Id: configure.in,v 1.7 2003/12/17 22:04:50 marcus Exp $
AC_INIT(SDL.cmod)
AC_MODULE_INIT()
@@ -21,18 +21,18 @@ AC_ARG_ENABLE(sdltest, [ --disable-sdltest Do not try to compile and run
if test x$sdl_exec_prefix != x ; then
sdl_args="$sdl_args --exec-prefix=$sdl_exec_prefix"
if test x${SDL_CONFIG+set} != xset ; then
- SDL_CONFIG=$sdl_exec_prefix/bin/sdl-config
+ SDL_CONFIG=$sdl_exec_prefix/bin/${ac_tool_prefix}sdl-config
fi
fi
if test x$sdl_prefix != x ; then
sdl_args="$sdl_args --prefix=$sdl_prefix"
if test x${SDL_CONFIG+set} != xset ; then
- SDL_CONFIG=$sdl_prefix/bin/sdl-config
+ SDL_CONFIG=$sdl_prefix/bin/${ac_tool_prefix}sdl-config
fi
fi
dnl AC_REQUIRE([AC_CANONICAL_TARGET])
- AC_PATH_PROG(SDL_CONFIG, sdl-config, no)
+ AC_PATH_PROG(SDL_CONFIG, ${ac_tool_prefix}sdl-config, no)
min_sdl_version=ifelse([$1], ,0.11.0,$1)
AC_MSG_CHECKING(for SDL - version >= $min_sdl_version)
no_sdl=""
diff --git a/src/post_modules/_Image_SVG/configure.in b/src/post_modules/_Image_SVG/configure.in
index 4f1f68d0dc67f8daad1f0d5b8a425409bfe6b375..0f2489e14d1d13d2725dd43dbf99cb78f3df8c0a 100644
--- a/src/post_modules/_Image_SVG/configure.in
+++ b/src/post_modules/_Image_SVG/configure.in
@@ -1,5 +1,5 @@
#
-# $Id: configure.in,v 1.1 2002/05/10 21:51:51 per Exp $
+# $Id: configure.in,v 1.2 2003/12/17 22:04:50 marcus Exp $
#
AC_INIT(svg.c)
@@ -16,10 +16,10 @@ AC_SUBST(SVG_LIBS)
if test x$with_svg = xyes ; then
PIKE_FEATURE_NODEP(Image.SVG)
- MY_AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
- if pkg-config librsvg-2.0 2>/dev/null ; then
- SVG_CFLAGS="`pkg-config librsvg-2.0 --cflags`"
- SVG_LIBS="`pkg-config librsvg-2.0 --libs`"
+ MY_AC_PATH_PROG(PKG_CONFIG, ${ac_tool_prefix}pkg-config, no)
+ if ${ac_tool_prefix}pkg-config librsvg-2.0 2>/dev/null ; then
+ SVG_CFLAGS="`${ac_tool_prefix}pkg-config librsvg-2.0 --cflags`"
+ SVG_LIBS="`${ac_tool_prefix}pkg-config librsvg-2.0 --libs`"
AC_MSG_CHECKING(if librsvg actually works)
OLDCPPFLAGS="$CPPFLAGS"