don't test for things which bakefile already tests for (STRIP, RANLIB, INSTALL, WINDRES, ...); don't chech for VPATH support in make at all as we don't use it any more
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@47918 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
parent
5e3c3fc9b8
commit
ebda9490d0
747
configure
vendored
747
configure
vendored
@ -1,5 +1,5 @@
|
||||
#! /bin/sh
|
||||
# From configure.in Id: configure.in 47800 2007-07-29 00:28:07Z VZ .
|
||||
# From configure.in Id: configure.in 47822 2007-07-29 19:08:51Z VZ .
|
||||
# Guess values for system-dependent variables and create Makefiles.
|
||||
# Generated by GNU Autoconf 2.61 for wxWidgets 2.9.0.
|
||||
#
|
||||
@ -679,16 +679,7 @@ EGREP
|
||||
CXX
|
||||
CXXFLAGS
|
||||
ac_ct_CXX
|
||||
RANLIB
|
||||
AR
|
||||
INSTALL_PROGRAM
|
||||
INSTALL_SCRIPT
|
||||
INSTALL_DATA
|
||||
STRIP
|
||||
WINDRES
|
||||
DLLTOOL
|
||||
IF_GNU_MAKE
|
||||
LN_S
|
||||
subdirs
|
||||
PKG_CONFIG
|
||||
GTK_CFLAGS
|
||||
@ -767,12 +758,19 @@ SAMPLES_RPATH_POSTLINK
|
||||
HOST_SUFFIX
|
||||
CPPUNIT_CFLAGS
|
||||
CPPUNIT_LIBS
|
||||
RANLIB
|
||||
INSTALL_PROGRAM
|
||||
INSTALL_SCRIPT
|
||||
INSTALL_DATA
|
||||
LN_S
|
||||
SET_MAKE
|
||||
MAKE_SET
|
||||
AROPTIONS
|
||||
STRIP
|
||||
NM
|
||||
INSTALL_DIR
|
||||
LDFLAGS_GUI
|
||||
IF_GNU_MAKE
|
||||
PLATFORM_UNIX
|
||||
PLATFORM_WIN32
|
||||
PLATFORM_MSDOS
|
||||
@ -805,6 +803,7 @@ USE_SOSYMLINKS
|
||||
SONAME_FLAG
|
||||
DEPS_TRACKING
|
||||
BK_DEPS
|
||||
WINDRES
|
||||
GCC_PCH
|
||||
ICC_PCH
|
||||
BK_MAKE_PCH
|
||||
@ -1018,6 +1017,7 @@ LIBWXMACRES
|
||||
POSTLINK_COMMAND
|
||||
MACSETFILE
|
||||
GCC
|
||||
DLLTOOL
|
||||
CPPUNIT_CONFIG
|
||||
LIBOBJS
|
||||
LTLIBOBJS'
|
||||
@ -20190,103 +20190,6 @@ echo "$as_me: error: C++ compiler is needed to build wxWidgets" >&2;}
|
||||
{ (exit 1); exit 1; }; }
|
||||
fi
|
||||
|
||||
if test -n "$ac_tool_prefix"; then
|
||||
# Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
|
||||
set dummy ${ac_tool_prefix}ranlib; ac_word=$2
|
||||
{ echo "$as_me:$LINENO: checking for $ac_word" >&5
|
||||
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
|
||||
if test "${ac_cv_prog_RANLIB+set}" = set; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
else
|
||||
if test -n "$RANLIB"; then
|
||||
ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
|
||||
else
|
||||
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
||||
for as_dir in $PATH
|
||||
do
|
||||
IFS=$as_save_IFS
|
||||
test -z "$as_dir" && as_dir=.
|
||||
for ac_exec_ext in '' $ac_executable_extensions; do
|
||||
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
||||
ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
|
||||
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
||||
break 2
|
||||
fi
|
||||
done
|
||||
done
|
||||
IFS=$as_save_IFS
|
||||
|
||||
fi
|
||||
fi
|
||||
RANLIB=$ac_cv_prog_RANLIB
|
||||
if test -n "$RANLIB"; then
|
||||
{ echo "$as_me:$LINENO: result: $RANLIB" >&5
|
||||
echo "${ECHO_T}$RANLIB" >&6; }
|
||||
else
|
||||
{ echo "$as_me:$LINENO: result: no" >&5
|
||||
echo "${ECHO_T}no" >&6; }
|
||||
fi
|
||||
|
||||
|
||||
fi
|
||||
if test -z "$ac_cv_prog_RANLIB"; then
|
||||
ac_ct_RANLIB=$RANLIB
|
||||
# Extract the first word of "ranlib", so it can be a program name with args.
|
||||
set dummy ranlib; ac_word=$2
|
||||
{ echo "$as_me:$LINENO: checking for $ac_word" >&5
|
||||
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
|
||||
if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
else
|
||||
if test -n "$ac_ct_RANLIB"; then
|
||||
ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
|
||||
else
|
||||
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
||||
for as_dir in $PATH
|
||||
do
|
||||
IFS=$as_save_IFS
|
||||
test -z "$as_dir" && as_dir=.
|
||||
for ac_exec_ext in '' $ac_executable_extensions; do
|
||||
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
||||
ac_cv_prog_ac_ct_RANLIB="ranlib"
|
||||
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
||||
break 2
|
||||
fi
|
||||
done
|
||||
done
|
||||
IFS=$as_save_IFS
|
||||
|
||||
fi
|
||||
fi
|
||||
ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
|
||||
if test -n "$ac_ct_RANLIB"; then
|
||||
{ echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
|
||||
echo "${ECHO_T}$ac_ct_RANLIB" >&6; }
|
||||
else
|
||||
{ echo "$as_me:$LINENO: result: no" >&5
|
||||
echo "${ECHO_T}no" >&6; }
|
||||
fi
|
||||
|
||||
if test "x$ac_ct_RANLIB" = x; then
|
||||
RANLIB=":"
|
||||
else
|
||||
case $cross_compiling:$ac_tool_warned in
|
||||
yes:)
|
||||
{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
|
||||
whose name does not start with the host triplet. If you think this
|
||||
configuration is useful to you, please write to autoconf@gnu.org." >&5
|
||||
echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
|
||||
whose name does not start with the host triplet. If you think this
|
||||
configuration is useful to you, please write to autoconf@gnu.org." >&2;}
|
||||
ac_tool_warned=yes ;;
|
||||
esac
|
||||
RANLIB=$ac_ct_RANLIB
|
||||
fi
|
||||
else
|
||||
RANLIB="$ac_cv_prog_RANLIB"
|
||||
fi
|
||||
|
||||
|
||||
if test "x$SUNCXX" != xyes; then
|
||||
if test -n "$ac_tool_prefix"; then
|
||||
# Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
|
||||
@ -20391,96 +20294,6 @@ echo "$as_me: error: ar is needed to build wxWidgets" >&2;}
|
||||
fi
|
||||
fi
|
||||
|
||||
# Find a good install program. We prefer a C program (faster),
|
||||
# so one script is as good as another. But avoid the broken or
|
||||
# incompatible versions:
|
||||
# SysV /etc/install, /usr/sbin/install
|
||||
# SunOS /usr/etc/install
|
||||
# IRIX /sbin/install
|
||||
# AIX /bin/install
|
||||
# AmigaOS /C/install, which installs bootblocks on floppy discs
|
||||
# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
|
||||
# AFS /usr/afsws/bin/install, which mishandles nonexistent args
|
||||
# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
|
||||
# OS/2's system install, which has a completely different semantic
|
||||
# ./install, which can be erroneously created by make from ./install.sh.
|
||||
{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
|
||||
echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; }
|
||||
if test -z "$INSTALL"; then
|
||||
if test "${ac_cv_path_install+set}" = set; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
else
|
||||
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
||||
for as_dir in $PATH
|
||||
do
|
||||
IFS=$as_save_IFS
|
||||
test -z "$as_dir" && as_dir=.
|
||||
# Account for people who put trailing slashes in PATH elements.
|
||||
case $as_dir/ in
|
||||
./ | .// | /cC/* | \
|
||||
/etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
|
||||
?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \
|
||||
/usr/ucb/* ) ;;
|
||||
*)
|
||||
# OSF1 and SCO ODT 3.0 have their own names for install.
|
||||
# Don't use installbsd from OSF since it installs stuff as root
|
||||
# by default.
|
||||
for ac_prog in ginstall scoinst install; do
|
||||
for ac_exec_ext in '' $ac_executable_extensions; do
|
||||
if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
|
||||
if test $ac_prog = install &&
|
||||
grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
|
||||
# AIX install. It has an incompatible calling convention.
|
||||
:
|
||||
elif test $ac_prog = install &&
|
||||
grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
|
||||
# program-specific install script used by HP pwplus--don't use.
|
||||
:
|
||||
else
|
||||
ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
|
||||
break 3
|
||||
fi
|
||||
fi
|
||||
done
|
||||
done
|
||||
;;
|
||||
esac
|
||||
done
|
||||
IFS=$as_save_IFS
|
||||
|
||||
|
||||
fi
|
||||
if test "${ac_cv_path_install+set}" = set; then
|
||||
INSTALL=$ac_cv_path_install
|
||||
else
|
||||
# As a last resort, use the slow shell script. Don't cache a
|
||||
# value for INSTALL within a source directory, because that will
|
||||
# break other packages using the cache if that directory is
|
||||
# removed, or if the value is a relative name.
|
||||
INSTALL=$ac_install_sh
|
||||
fi
|
||||
fi
|
||||
{ echo "$as_me:$LINENO: result: $INSTALL" >&5
|
||||
echo "${ECHO_T}$INSTALL" >&6; }
|
||||
|
||||
# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
|
||||
# It thinks the first close brace ends the variable substitution.
|
||||
test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
|
||||
|
||||
test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
|
||||
|
||||
test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
|
||||
|
||||
|
||||
case ${INSTALL} in
|
||||
/* ) # Absolute
|
||||
;;
|
||||
?:* ) # Drive letter, considered as absolute.
|
||||
;;
|
||||
*)
|
||||
INSTALL=`pwd`/${INSTALL} ;;
|
||||
esac
|
||||
|
||||
retest_macosx_linking=no
|
||||
|
||||
#if test "$wxUSE_MAC" = 1; then
|
||||
@ -20725,495 +20538,6 @@ case "${host}" in
|
||||
;;
|
||||
esac
|
||||
|
||||
if test -n "$ac_tool_prefix"; then
|
||||
# Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
|
||||
set dummy ${ac_tool_prefix}strip; ac_word=$2
|
||||
{ echo "$as_me:$LINENO: checking for $ac_word" >&5
|
||||
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
|
||||
if test "${ac_cv_prog_STRIP+set}" = set; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
else
|
||||
if test -n "$STRIP"; then
|
||||
ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
|
||||
else
|
||||
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
||||
for as_dir in $PATH
|
||||
do
|
||||
IFS=$as_save_IFS
|
||||
test -z "$as_dir" && as_dir=.
|
||||
for ac_exec_ext in '' $ac_executable_extensions; do
|
||||
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
||||
ac_cv_prog_STRIP="${ac_tool_prefix}strip"
|
||||
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
||||
break 2
|
||||
fi
|
||||
done
|
||||
done
|
||||
IFS=$as_save_IFS
|
||||
|
||||
fi
|
||||
fi
|
||||
STRIP=$ac_cv_prog_STRIP
|
||||
if test -n "$STRIP"; then
|
||||
{ echo "$as_me:$LINENO: result: $STRIP" >&5
|
||||
echo "${ECHO_T}$STRIP" >&6; }
|
||||
else
|
||||
{ echo "$as_me:$LINENO: result: no" >&5
|
||||
echo "${ECHO_T}no" >&6; }
|
||||
fi
|
||||
|
||||
|
||||
fi
|
||||
if test -z "$ac_cv_prog_STRIP"; then
|
||||
ac_ct_STRIP=$STRIP
|
||||
# Extract the first word of "strip", so it can be a program name with args.
|
||||
set dummy strip; ac_word=$2
|
||||
{ echo "$as_me:$LINENO: checking for $ac_word" >&5
|
||||
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
|
||||
if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
else
|
||||
if test -n "$ac_ct_STRIP"; then
|
||||
ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
|
||||
else
|
||||
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
||||
for as_dir in $PATH
|
||||
do
|
||||
IFS=$as_save_IFS
|
||||
test -z "$as_dir" && as_dir=.
|
||||
for ac_exec_ext in '' $ac_executable_extensions; do
|
||||
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
||||
ac_cv_prog_ac_ct_STRIP="strip"
|
||||
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
||||
break 2
|
||||
fi
|
||||
done
|
||||
done
|
||||
IFS=$as_save_IFS
|
||||
|
||||
fi
|
||||
fi
|
||||
ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
|
||||
if test -n "$ac_ct_STRIP"; then
|
||||
{ echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
|
||||
echo "${ECHO_T}$ac_ct_STRIP" >&6; }
|
||||
else
|
||||
{ echo "$as_me:$LINENO: result: no" >&5
|
||||
echo "${ECHO_T}no" >&6; }
|
||||
fi
|
||||
|
||||
if test "x$ac_ct_STRIP" = x; then
|
||||
STRIP="true"
|
||||
else
|
||||
case $cross_compiling:$ac_tool_warned in
|
||||
yes:)
|
||||
{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
|
||||
whose name does not start with the host triplet. If you think this
|
||||
configuration is useful to you, please write to autoconf@gnu.org." >&5
|
||||
echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
|
||||
whose name does not start with the host triplet. If you think this
|
||||
configuration is useful to you, please write to autoconf@gnu.org." >&2;}
|
||||
ac_tool_warned=yes ;;
|
||||
esac
|
||||
STRIP=$ac_ct_STRIP
|
||||
fi
|
||||
else
|
||||
STRIP="$ac_cv_prog_STRIP"
|
||||
fi
|
||||
|
||||
|
||||
if test "$wxUSE_WINE" = "yes"; then
|
||||
if test -n "$ac_tool_prefix"; then
|
||||
# Extract the first word of "${ac_tool_prefix}wrc", so it can be a program name with args.
|
||||
set dummy ${ac_tool_prefix}wrc; ac_word=$2
|
||||
{ echo "$as_me:$LINENO: checking for $ac_word" >&5
|
||||
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
|
||||
if test "${ac_cv_prog_WINDRES+set}" = set; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
else
|
||||
if test -n "$WINDRES"; then
|
||||
ac_cv_prog_WINDRES="$WINDRES" # Let the user override the test.
|
||||
else
|
||||
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
||||
for as_dir in $PATH
|
||||
do
|
||||
IFS=$as_save_IFS
|
||||
test -z "$as_dir" && as_dir=.
|
||||
for ac_exec_ext in '' $ac_executable_extensions; do
|
||||
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
||||
ac_cv_prog_WINDRES="${ac_tool_prefix}wrc"
|
||||
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
||||
break 2
|
||||
fi
|
||||
done
|
||||
done
|
||||
IFS=$as_save_IFS
|
||||
|
||||
fi
|
||||
fi
|
||||
WINDRES=$ac_cv_prog_WINDRES
|
||||
if test -n "$WINDRES"; then
|
||||
{ echo "$as_me:$LINENO: result: $WINDRES" >&5
|
||||
echo "${ECHO_T}$WINDRES" >&6; }
|
||||
else
|
||||
{ echo "$as_me:$LINENO: result: no" >&5
|
||||
echo "${ECHO_T}no" >&6; }
|
||||
fi
|
||||
|
||||
|
||||
fi
|
||||
if test -z "$ac_cv_prog_WINDRES"; then
|
||||
ac_ct_WINDRES=$WINDRES
|
||||
# Extract the first word of "wrc", so it can be a program name with args.
|
||||
set dummy wrc; ac_word=$2
|
||||
{ echo "$as_me:$LINENO: checking for $ac_word" >&5
|
||||
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
|
||||
if test "${ac_cv_prog_ac_ct_WINDRES+set}" = set; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
else
|
||||
if test -n "$ac_ct_WINDRES"; then
|
||||
ac_cv_prog_ac_ct_WINDRES="$ac_ct_WINDRES" # Let the user override the test.
|
||||
else
|
||||
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
||||
for as_dir in $PATH
|
||||
do
|
||||
IFS=$as_save_IFS
|
||||
test -z "$as_dir" && as_dir=.
|
||||
for ac_exec_ext in '' $ac_executable_extensions; do
|
||||
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
||||
ac_cv_prog_ac_ct_WINDRES="wrc"
|
||||
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
||||
break 2
|
||||
fi
|
||||
done
|
||||
done
|
||||
IFS=$as_save_IFS
|
||||
|
||||
fi
|
||||
fi
|
||||
ac_ct_WINDRES=$ac_cv_prog_ac_ct_WINDRES
|
||||
if test -n "$ac_ct_WINDRES"; then
|
||||
{ echo "$as_me:$LINENO: result: $ac_ct_WINDRES" >&5
|
||||
echo "${ECHO_T}$ac_ct_WINDRES" >&6; }
|
||||
else
|
||||
{ echo "$as_me:$LINENO: result: no" >&5
|
||||
echo "${ECHO_T}no" >&6; }
|
||||
fi
|
||||
|
||||
if test "x$ac_ct_WINDRES" = x; then
|
||||
WINDRES=""
|
||||
else
|
||||
case $cross_compiling:$ac_tool_warned in
|
||||
yes:)
|
||||
{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
|
||||
whose name does not start with the host triplet. If you think this
|
||||
configuration is useful to you, please write to autoconf@gnu.org." >&5
|
||||
echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
|
||||
whose name does not start with the host triplet. If you think this
|
||||
configuration is useful to you, please write to autoconf@gnu.org." >&2;}
|
||||
ac_tool_warned=yes ;;
|
||||
esac
|
||||
WINDRES=$ac_ct_WINDRES
|
||||
fi
|
||||
else
|
||||
WINDRES="$ac_cv_prog_WINDRES"
|
||||
fi
|
||||
|
||||
RESCOMP="$WINDRES"
|
||||
else
|
||||
case "${host}" in
|
||||
*-*-cygwin* | *-*-mingw32* )
|
||||
if test -n "$ac_tool_prefix"; then
|
||||
# Extract the first word of "${ac_tool_prefix}windres", so it can be a program name with args.
|
||||
set dummy ${ac_tool_prefix}windres; ac_word=$2
|
||||
{ echo "$as_me:$LINENO: checking for $ac_word" >&5
|
||||
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
|
||||
if test "${ac_cv_prog_WINDRES+set}" = set; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
else
|
||||
if test -n "$WINDRES"; then
|
||||
ac_cv_prog_WINDRES="$WINDRES" # Let the user override the test.
|
||||
else
|
||||
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
||||
for as_dir in $PATH
|
||||
do
|
||||
IFS=$as_save_IFS
|
||||
test -z "$as_dir" && as_dir=.
|
||||
for ac_exec_ext in '' $ac_executable_extensions; do
|
||||
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
||||
ac_cv_prog_WINDRES="${ac_tool_prefix}windres"
|
||||
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
||||
break 2
|
||||
fi
|
||||
done
|
||||
done
|
||||
IFS=$as_save_IFS
|
||||
|
||||
fi
|
||||
fi
|
||||
WINDRES=$ac_cv_prog_WINDRES
|
||||
if test -n "$WINDRES"; then
|
||||
{ echo "$as_me:$LINENO: result: $WINDRES" >&5
|
||||
echo "${ECHO_T}$WINDRES" >&6; }
|
||||
else
|
||||
{ echo "$as_me:$LINENO: result: no" >&5
|
||||
echo "${ECHO_T}no" >&6; }
|
||||
fi
|
||||
|
||||
|
||||
fi
|
||||
if test -z "$ac_cv_prog_WINDRES"; then
|
||||
ac_ct_WINDRES=$WINDRES
|
||||
# Extract the first word of "windres", so it can be a program name with args.
|
||||
set dummy windres; ac_word=$2
|
||||
{ echo "$as_me:$LINENO: checking for $ac_word" >&5
|
||||
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
|
||||
if test "${ac_cv_prog_ac_ct_WINDRES+set}" = set; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
else
|
||||
if test -n "$ac_ct_WINDRES"; then
|
||||
ac_cv_prog_ac_ct_WINDRES="$ac_ct_WINDRES" # Let the user override the test.
|
||||
else
|
||||
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
||||
for as_dir in $PATH
|
||||
do
|
||||
IFS=$as_save_IFS
|
||||
test -z "$as_dir" && as_dir=.
|
||||
for ac_exec_ext in '' $ac_executable_extensions; do
|
||||
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
||||
ac_cv_prog_ac_ct_WINDRES="windres"
|
||||
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
||||
break 2
|
||||
fi
|
||||
done
|
||||
done
|
||||
IFS=$as_save_IFS
|
||||
|
||||
fi
|
||||
fi
|
||||
ac_ct_WINDRES=$ac_cv_prog_ac_ct_WINDRES
|
||||
if test -n "$ac_ct_WINDRES"; then
|
||||
{ echo "$as_me:$LINENO: result: $ac_ct_WINDRES" >&5
|
||||
echo "${ECHO_T}$ac_ct_WINDRES" >&6; }
|
||||
else
|
||||
{ echo "$as_me:$LINENO: result: no" >&5
|
||||
echo "${ECHO_T}no" >&6; }
|
||||
fi
|
||||
|
||||
if test "x$ac_ct_WINDRES" = x; then
|
||||
WINDRES=""
|
||||
else
|
||||
case $cross_compiling:$ac_tool_warned in
|
||||
yes:)
|
||||
{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
|
||||
whose name does not start with the host triplet. If you think this
|
||||
configuration is useful to you, please write to autoconf@gnu.org." >&5
|
||||
echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
|
||||
whose name does not start with the host triplet. If you think this
|
||||
configuration is useful to you, please write to autoconf@gnu.org." >&2;}
|
||||
ac_tool_warned=yes ;;
|
||||
esac
|
||||
WINDRES=$ac_ct_WINDRES
|
||||
fi
|
||||
else
|
||||
WINDRES="$ac_cv_prog_WINDRES"
|
||||
fi
|
||||
|
||||
RESCOMP="$WINDRES"
|
||||
if test -n "$ac_tool_prefix"; then
|
||||
# Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
|
||||
set dummy ${ac_tool_prefix}dlltool; ac_word=$2
|
||||
{ echo "$as_me:$LINENO: checking for $ac_word" >&5
|
||||
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
|
||||
if test "${ac_cv_prog_DLLTOOL+set}" = set; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
else
|
||||
if test -n "$DLLTOOL"; then
|
||||
ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
|
||||
else
|
||||
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
||||
for as_dir in $PATH
|
||||
do
|
||||
IFS=$as_save_IFS
|
||||
test -z "$as_dir" && as_dir=.
|
||||
for ac_exec_ext in '' $ac_executable_extensions; do
|
||||
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
||||
ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
|
||||
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
||||
break 2
|
||||
fi
|
||||
done
|
||||
done
|
||||
IFS=$as_save_IFS
|
||||
|
||||
fi
|
||||
fi
|
||||
DLLTOOL=$ac_cv_prog_DLLTOOL
|
||||
if test -n "$DLLTOOL"; then
|
||||
{ echo "$as_me:$LINENO: result: $DLLTOOL" >&5
|
||||
echo "${ECHO_T}$DLLTOOL" >&6; }
|
||||
else
|
||||
{ echo "$as_me:$LINENO: result: no" >&5
|
||||
echo "${ECHO_T}no" >&6; }
|
||||
fi
|
||||
|
||||
|
||||
fi
|
||||
if test -z "$ac_cv_prog_DLLTOOL"; then
|
||||
ac_ct_DLLTOOL=$DLLTOOL
|
||||
# Extract the first word of "dlltool", so it can be a program name with args.
|
||||
set dummy dlltool; ac_word=$2
|
||||
{ echo "$as_me:$LINENO: checking for $ac_word" >&5
|
||||
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
|
||||
if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
else
|
||||
if test -n "$ac_ct_DLLTOOL"; then
|
||||
ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
|
||||
else
|
||||
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
||||
for as_dir in $PATH
|
||||
do
|
||||
IFS=$as_save_IFS
|
||||
test -z "$as_dir" && as_dir=.
|
||||
for ac_exec_ext in '' $ac_executable_extensions; do
|
||||
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
||||
ac_cv_prog_ac_ct_DLLTOOL="dlltool"
|
||||
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
||||
break 2
|
||||
fi
|
||||
done
|
||||
done
|
||||
IFS=$as_save_IFS
|
||||
|
||||
fi
|
||||
fi
|
||||
ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
|
||||
if test -n "$ac_ct_DLLTOOL"; then
|
||||
{ echo "$as_me:$LINENO: result: $ac_ct_DLLTOOL" >&5
|
||||
echo "${ECHO_T}$ac_ct_DLLTOOL" >&6; }
|
||||
else
|
||||
{ echo "$as_me:$LINENO: result: no" >&5
|
||||
echo "${ECHO_T}no" >&6; }
|
||||
fi
|
||||
|
||||
if test "x$ac_ct_DLLTOOL" = x; then
|
||||
DLLTOOL=""
|
||||
else
|
||||
case $cross_compiling:$ac_tool_warned in
|
||||
yes:)
|
||||
{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
|
||||
whose name does not start with the host triplet. If you think this
|
||||
configuration is useful to you, please write to autoconf@gnu.org." >&5
|
||||
echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
|
||||
whose name does not start with the host triplet. If you think this
|
||||
configuration is useful to you, please write to autoconf@gnu.org." >&2;}
|
||||
ac_tool_warned=yes ;;
|
||||
esac
|
||||
DLLTOOL=$ac_ct_DLLTOOL
|
||||
fi
|
||||
else
|
||||
DLLTOOL="$ac_cv_prog_DLLTOOL"
|
||||
fi
|
||||
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
|
||||
{ echo "$as_me:$LINENO: checking if make is GNU make" >&5
|
||||
echo $ECHO_N "checking if make is GNU make... $ECHO_C" >&6; }
|
||||
if test "${wx_cv_prog_makeisgnu+set}" = set; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
else
|
||||
|
||||
if ( ${SHELL-sh} -c "${MAKE-make} --version" 2> /dev/null |
|
||||
$EGREP -s GNU > /dev/null); then
|
||||
wx_cv_prog_makeisgnu="yes"
|
||||
else
|
||||
wx_cv_prog_makeisgnu="no"
|
||||
fi
|
||||
|
||||
fi
|
||||
{ echo "$as_me:$LINENO: result: $wx_cv_prog_makeisgnu" >&5
|
||||
echo "${ECHO_T}$wx_cv_prog_makeisgnu" >&6; }
|
||||
|
||||
if test "x$wx_cv_prog_makeisgnu" = "xyes"; then
|
||||
IF_GNU_MAKE=""
|
||||
else
|
||||
IF_GNU_MAKE="#"
|
||||
fi
|
||||
|
||||
|
||||
|
||||
if test "x$wx_cv_prog_makeisgnu" != "xyes"; then
|
||||
{ echo "$as_me:$LINENO: checking if make supports VPATH" >&5
|
||||
echo $ECHO_N "checking if make supports VPATH... $ECHO_C" >&6; }
|
||||
if test "${wx_cv_prog_makevpath+set}" = set; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
else
|
||||
|
||||
cat - << EOF > confMake
|
||||
check : file
|
||||
cp \$? \$@
|
||||
cp \$? final_file
|
||||
EOF
|
||||
|
||||
if test ! -d sub ; then
|
||||
mkdir sub
|
||||
fi
|
||||
echo dummy > sub/file
|
||||
${MAKE-make} -f confMake VPATH=sub 2>&5 > /dev/null
|
||||
RESULT=$?
|
||||
rm -f sub/file check final_file confMake
|
||||
rmdir sub
|
||||
if test "$RESULT" = 0; then
|
||||
wx_cv_prog_makevpath="yes"
|
||||
else
|
||||
wx_cv_prog_makevpath="no"
|
||||
fi
|
||||
|
||||
fi
|
||||
{ echo "$as_me:$LINENO: result: $wx_cv_prog_makevpath" >&5
|
||||
echo "${ECHO_T}$wx_cv_prog_makevpath" >&6; }
|
||||
|
||||
if test "x$wx_cv_prog_makevpath" != "xyes"; then
|
||||
{ { echo "$as_me:$LINENO: error:
|
||||
You need a make-utility that is able to use the variable
|
||||
VPATH correctly.
|
||||
If your version of make does not support VPATH correctly,
|
||||
please install GNU-make (possibly as gmake), and start
|
||||
configure with the following command:
|
||||
export MAKE=gmake; ./configure for sh-type shells
|
||||
setenv MAKE gmake; ./configure for csh-type shells
|
||||
Also please do remember to use gmake in this case every time
|
||||
you are trying to compile.
|
||||
" >&5
|
||||
echo "$as_me: error:
|
||||
You need a make-utility that is able to use the variable
|
||||
VPATH correctly.
|
||||
If your version of make does not support VPATH correctly,
|
||||
please install GNU-make (possibly as gmake), and start
|
||||
configure with the following command:
|
||||
export MAKE=gmake; ./configure for sh-type shells
|
||||
setenv MAKE gmake; ./configure for csh-type shells
|
||||
Also please do remember to use gmake in this case every time
|
||||
you are trying to compile.
|
||||
" >&2;}
|
||||
{ (exit 1); exit 1; }; }
|
||||
fi fi
|
||||
{ echo "$as_me:$LINENO: checking whether ln -s works" >&5
|
||||
echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6; }
|
||||
LN_S=$as_ln_s
|
||||
if test "$LN_S" = "ln -s"; then
|
||||
{ echo "$as_me:$LINENO: result: yes" >&5
|
||||
echo "${ECHO_T}yes" >&6; }
|
||||
else
|
||||
{ echo "$as_me:$LINENO: result: no, using $LN_S" >&5
|
||||
echo "${ECHO_T}no, using $LN_S" >&6; }
|
||||
fi
|
||||
|
||||
|
||||
|
||||
|
||||
if test "x$XLCXX" = "xyes" -a "x$USE_AIX" = "x1"; then
|
||||
CXXFLAGS="-qunique $CXXFLAGS"
|
||||
@ -53460,6 +52784,15 @@ echo "$as_me: error: Versions of Bakefile used to generate makefiles ($BAKEFILE_
|
||||
fi
|
||||
|
||||
|
||||
case ${INSTALL} in
|
||||
/* ) # Absolute
|
||||
;;
|
||||
?:* ) # Drive letter, considered as absolute.
|
||||
;;
|
||||
*)
|
||||
INSTALL=`pwd`/${INSTALL} ;;
|
||||
esac
|
||||
|
||||
if test $GCC_PCH = 1
|
||||
then
|
||||
if test "$wx_cv_gcc_pch_bug" = yes; then
|
||||
@ -54536,16 +53869,7 @@ EGREP!$EGREP$ac_delim
|
||||
CXX!$CXX$ac_delim
|
||||
CXXFLAGS!$CXXFLAGS$ac_delim
|
||||
ac_ct_CXX!$ac_ct_CXX$ac_delim
|
||||
RANLIB!$RANLIB$ac_delim
|
||||
AR!$AR$ac_delim
|
||||
INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim
|
||||
INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim
|
||||
INSTALL_DATA!$INSTALL_DATA$ac_delim
|
||||
STRIP!$STRIP$ac_delim
|
||||
WINDRES!$WINDRES$ac_delim
|
||||
DLLTOOL!$DLLTOOL$ac_delim
|
||||
IF_GNU_MAKE!$IF_GNU_MAKE$ac_delim
|
||||
LN_S!$LN_S$ac_delim
|
||||
subdirs!$subdirs$ac_delim
|
||||
PKG_CONFIG!$PKG_CONFIG$ac_delim
|
||||
GTK_CFLAGS!$GTK_CFLAGS$ac_delim
|
||||
@ -54570,6 +53894,15 @@ REZ!$REZ$ac_delim
|
||||
DEREZ!$DEREZ$ac_delim
|
||||
SETFILE!$SETFILE$ac_delim
|
||||
LIBICONV!$LIBICONV$ac_delim
|
||||
SDL_CONFIG!$SDL_CONFIG$ac_delim
|
||||
SDL_CFLAGS!$SDL_CFLAGS$ac_delim
|
||||
SDL_LIBS!$SDL_LIBS$ac_delim
|
||||
LIBGNOMEPRINTUI_CFLAGS!$LIBGNOMEPRINTUI_CFLAGS$ac_delim
|
||||
LIBGNOMEPRINTUI_LIBS!$LIBGNOMEPRINTUI_LIBS$ac_delim
|
||||
GNOMEVFS_CFLAGS!$GNOMEVFS_CFLAGS$ac_delim
|
||||
GNOMEVFS_LIBS!$GNOMEVFS_LIBS$ac_delim
|
||||
HILDON_CFLAGS!$HILDON_CFLAGS$ac_delim
|
||||
HILDON_LIBS!$HILDON_LIBS$ac_delim
|
||||
_ACEOF
|
||||
|
||||
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
|
||||
@ -54611,15 +53944,6 @@ _ACEOF
|
||||
ac_delim='%!_!# '
|
||||
for ac_last_try in false false false false false :; do
|
||||
cat >conf$$subs.sed <<_ACEOF
|
||||
SDL_CONFIG!$SDL_CONFIG$ac_delim
|
||||
SDL_CFLAGS!$SDL_CFLAGS$ac_delim
|
||||
SDL_LIBS!$SDL_LIBS$ac_delim
|
||||
LIBGNOMEPRINTUI_CFLAGS!$LIBGNOMEPRINTUI_CFLAGS$ac_delim
|
||||
LIBGNOMEPRINTUI_LIBS!$LIBGNOMEPRINTUI_LIBS$ac_delim
|
||||
GNOMEVFS_CFLAGS!$GNOMEVFS_CFLAGS$ac_delim
|
||||
GNOMEVFS_LIBS!$GNOMEVFS_LIBS$ac_delim
|
||||
HILDON_CFLAGS!$HILDON_CFLAGS$ac_delim
|
||||
HILDON_LIBS!$HILDON_LIBS$ac_delim
|
||||
CAIRO_CFLAGS!$CAIRO_CFLAGS$ac_delim
|
||||
CAIRO_LIBS!$CAIRO_LIBS$ac_delim
|
||||
GST_CFLAGS!$GST_CFLAGS$ac_delim
|
||||
@ -54665,12 +53989,19 @@ SAMPLES_RPATH_POSTLINK!$SAMPLES_RPATH_POSTLINK$ac_delim
|
||||
HOST_SUFFIX!$HOST_SUFFIX$ac_delim
|
||||
CPPUNIT_CFLAGS!$CPPUNIT_CFLAGS$ac_delim
|
||||
CPPUNIT_LIBS!$CPPUNIT_LIBS$ac_delim
|
||||
RANLIB!$RANLIB$ac_delim
|
||||
INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim
|
||||
INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim
|
||||
INSTALL_DATA!$INSTALL_DATA$ac_delim
|
||||
LN_S!$LN_S$ac_delim
|
||||
SET_MAKE!$SET_MAKE$ac_delim
|
||||
MAKE_SET!$MAKE_SET$ac_delim
|
||||
AROPTIONS!$AROPTIONS$ac_delim
|
||||
STRIP!$STRIP$ac_delim
|
||||
NM!$NM$ac_delim
|
||||
INSTALL_DIR!$INSTALL_DIR$ac_delim
|
||||
LDFLAGS_GUI!$LDFLAGS_GUI$ac_delim
|
||||
IF_GNU_MAKE!$IF_GNU_MAKE$ac_delim
|
||||
PLATFORM_UNIX!$PLATFORM_UNIX$ac_delim
|
||||
PLATFORM_WIN32!$PLATFORM_WIN32$ac_delim
|
||||
PLATFORM_MSDOS!$PLATFORM_MSDOS$ac_delim
|
||||
@ -54703,11 +54034,13 @@ USE_SOSYMLINKS!$USE_SOSYMLINKS$ac_delim
|
||||
SONAME_FLAG!$SONAME_FLAG$ac_delim
|
||||
DEPS_TRACKING!$DEPS_TRACKING$ac_delim
|
||||
BK_DEPS!$BK_DEPS$ac_delim
|
||||
WINDRES!$WINDRES$ac_delim
|
||||
GCC_PCH!$GCC_PCH$ac_delim
|
||||
ICC_PCH!$ICC_PCH$ac_delim
|
||||
BK_MAKE_PCH!$BK_MAKE_PCH$ac_delim
|
||||
COND_BUILD_DEBUG!$COND_BUILD_DEBUG$ac_delim
|
||||
COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT!$COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT$ac_delim
|
||||
COND_BUILD_DEBUG_DEBUG_INFO_DEFAULT!$COND_BUILD_DEBUG_DEBUG_INFO_DEFAULT$ac_delim
|
||||
_ACEOF
|
||||
|
||||
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
|
||||
@ -54749,7 +54082,6 @@ _ACEOF
|
||||
ac_delim='%!_!# '
|
||||
for ac_last_try in false false false false false :; do
|
||||
cat >conf$$subs.sed <<_ACEOF
|
||||
COND_BUILD_DEBUG_DEBUG_INFO_DEFAULT!$COND_BUILD_DEBUG_DEBUG_INFO_DEFAULT$ac_delim
|
||||
COND_BUILD_DEBUG_UNICODE_0!$COND_BUILD_DEBUG_UNICODE_0$ac_delim
|
||||
COND_BUILD_DEBUG_UNICODE_1!$COND_BUILD_DEBUG_UNICODE_1$ac_delim
|
||||
COND_BUILD_RELEASE!$COND_BUILD_RELEASE$ac_delim
|
||||
@ -54846,6 +54178,7 @@ COND_SHARED_1_USE_GUI_1_USE_OPENGL_1!$COND_SHARED_1_USE_GUI_1_USE_OPENGL_1$ac_de
|
||||
COND_SHARED_1_USE_XRC_1!$COND_SHARED_1_USE_XRC_1$ac_delim
|
||||
COND_TOOLKIT_!$COND_TOOLKIT_$ac_delim
|
||||
COND_TOOLKIT_COCOA!$COND_TOOLKIT_COCOA$ac_delim
|
||||
COND_TOOLKIT_COCOA_USE_GUI_1!$COND_TOOLKIT_COCOA_USE_GUI_1$ac_delim
|
||||
_ACEOF
|
||||
|
||||
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
|
||||
@ -54887,7 +54220,6 @@ _ACEOF
|
||||
ac_delim='%!_!# '
|
||||
for ac_last_try in false false false false false :; do
|
||||
cat >conf$$subs.sed <<_ACEOF
|
||||
COND_TOOLKIT_COCOA_USE_GUI_1!$COND_TOOLKIT_COCOA_USE_GUI_1$ac_delim
|
||||
COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0!$COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0$ac_delim
|
||||
COND_TOOLKIT_DFB!$COND_TOOLKIT_DFB$ac_delim
|
||||
COND_TOOLKIT_DFB_USE_GUI_1!$COND_TOOLKIT_DFB_USE_GUI_1$ac_delim
|
||||
@ -54984,6 +54316,7 @@ WXCONFIG_RESFLAGS!$WXCONFIG_RESFLAGS$ac_delim
|
||||
EXE_LINKER!$EXE_LINKER$ac_delim
|
||||
GUIDIST!$GUIDIST$ac_delim
|
||||
DISTDIR!$DISTDIR$ac_delim
|
||||
SAMPLES_SUBDIRS!$SAMPLES_SUBDIRS$ac_delim
|
||||
_ACEOF
|
||||
|
||||
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
|
||||
@ -55025,7 +54358,6 @@ _ACEOF
|
||||
ac_delim='%!_!# '
|
||||
for ac_last_try in false false false false false :; do
|
||||
cat >conf$$subs.sed <<_ACEOF
|
||||
SAMPLES_SUBDIRS!$SAMPLES_SUBDIRS$ac_delim
|
||||
LDFLAGS_GL!$LDFLAGS_GL$ac_delim
|
||||
OPENGL_LIBS!$OPENGL_LIBS$ac_delim
|
||||
DMALLOC_LIBS!$DMALLOC_LIBS$ac_delim
|
||||
@ -55039,6 +54371,7 @@ LIBWXMACRES!$LIBWXMACRES$ac_delim
|
||||
POSTLINK_COMMAND!$POSTLINK_COMMAND$ac_delim
|
||||
MACSETFILE!$MACSETFILE$ac_delim
|
||||
GCC!$GCC$ac_delim
|
||||
DLLTOOL!$DLLTOOL$ac_delim
|
||||
CPPUNIT_CONFIG!$CPPUNIT_CONFIG$ac_delim
|
||||
LIBOBJS!$LIBOBJS$ac_delim
|
||||
LTLIBOBJS!$LTLIBOBJS$ac_delim
|
||||
|
||||
115
configure.in
115
configure.in
@ -1098,10 +1098,6 @@ if test "$CXX" = "g++" -a "$GXX" != "yes"; then
|
||||
AC_MSG_ERROR([C++ compiler is needed to build wxWidgets])
|
||||
fi
|
||||
|
||||
dnl ranlib command
|
||||
dnl defines RANLIB with the appropriate command
|
||||
AC_PROG_RANLIB
|
||||
|
||||
dnl ar command
|
||||
dnl defines AR with the appropriate command
|
||||
dnl
|
||||
@ -1113,21 +1109,6 @@ if test "x$SUNCXX" != xyes; then
|
||||
fi
|
||||
fi
|
||||
|
||||
dnl install checks
|
||||
dnl defines INSTALL with the appropriate command
|
||||
AC_PROG_INSTALL
|
||||
|
||||
dnl make install path absolute (if not already);
|
||||
dnl will fail with (some) MSDOS paths
|
||||
case ${INSTALL} in
|
||||
/* ) # Absolute
|
||||
;;
|
||||
?:* ) # Drive letter, considered as absolute.
|
||||
;;
|
||||
*)
|
||||
INSTALL=`pwd`/${INSTALL} ;;
|
||||
esac
|
||||
|
||||
retest_macosx_linking=no
|
||||
|
||||
dnl Support the old --enable-universal_binary in case anyone was using it.
|
||||
@ -1278,91 +1259,6 @@ case "${host}" in
|
||||
;;
|
||||
esac
|
||||
|
||||
dnl strip command
|
||||
dnl defines STRIP as strip or nothing (true) if not found
|
||||
AC_CHECK_TOOL(STRIP, strip, true)
|
||||
|
||||
dnl Win32 tools
|
||||
if test "$wxUSE_WINE" = "yes"; then
|
||||
AC_CHECK_TOOL(WINDRES, wrc)
|
||||
RESCOMP="$WINDRES"
|
||||
else
|
||||
case "${host}" in
|
||||
*-*-cygwin* | *-*-mingw32* )
|
||||
dnl Bakefile CVS (as of 2005-11-24) now detects windres properly
|
||||
dnl ... maybe it does, but it does not make it available here
|
||||
dnl anymore, so do it ourselves still.
|
||||
AC_CHECK_TOOL(WINDRES, windres)
|
||||
RESCOMP="$WINDRES"
|
||||
AC_CHECK_TOOL(DLLTOOL, dlltool)
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
|
||||
dnl does make support "-include" (only GNU make does AFAIK)?
|
||||
AC_CACHE_CHECK([if make is GNU make], wx_cv_prog_makeisgnu,
|
||||
[
|
||||
if ( ${SHELL-sh} -c "${MAKE-make} --version" 2> /dev/null |
|
||||
$EGREP -s GNU > /dev/null); then
|
||||
wx_cv_prog_makeisgnu="yes"
|
||||
else
|
||||
wx_cv_prog_makeisgnu="no"
|
||||
fi
|
||||
])
|
||||
|
||||
if test "x$wx_cv_prog_makeisgnu" = "xyes"; then
|
||||
IF_GNU_MAKE=""
|
||||
else
|
||||
IF_GNU_MAKE="#"
|
||||
fi
|
||||
|
||||
AC_SUBST(IF_GNU_MAKE)
|
||||
|
||||
dnl we don't need to check for VPATH support in GNU make - it does have it
|
||||
if test "x$wx_cv_prog_makeisgnu" != "xyes"; then
|
||||
dnl check if VPATH works
|
||||
AC_CACHE_CHECK([if make supports VPATH], wx_cv_prog_makevpath, [
|
||||
dnl create Makefile
|
||||
cat - << EOF > confMake
|
||||
check : file
|
||||
cp \$? \$@
|
||||
cp \$? final_file
|
||||
EOF
|
||||
|
||||
if test ! -d sub ; then
|
||||
mkdir sub
|
||||
fi
|
||||
echo dummy > sub/file
|
||||
${MAKE-make} -f confMake VPATH=sub 2>&5 > /dev/null
|
||||
RESULT=$?
|
||||
rm -f sub/file check final_file confMake
|
||||
rmdir sub
|
||||
if test "$RESULT" = 0; then
|
||||
wx_cv_prog_makevpath="yes"
|
||||
else
|
||||
wx_cv_prog_makevpath="no"
|
||||
fi
|
||||
])
|
||||
|
||||
if test "x$wx_cv_prog_makevpath" != "xyes"; then
|
||||
AC_MSG_ERROR([
|
||||
You need a make-utility that is able to use the variable
|
||||
VPATH correctly.
|
||||
If your version of make does not support VPATH correctly,
|
||||
please install GNU-make (possibly as gmake), and start
|
||||
configure with the following command:
|
||||
export MAKE=gmake; ./configure for sh-type shells
|
||||
setenv MAKE gmake; ./configure for csh-type shells
|
||||
Also please do remember to use gmake in this case every time
|
||||
you are trying to compile.
|
||||
])
|
||||
fi dnl make without VPATH
|
||||
fi dnl not GNU make
|
||||
|
||||
dnl needed for making link to setup.h
|
||||
AC_PROG_LN_S
|
||||
|
||||
|
||||
dnl ------------------------------------------------------------------------
|
||||
dnl Platform specific tests
|
||||
dnl ------------------------------------------------------------------------
|
||||
@ -7769,6 +7665,17 @@ fi
|
||||
|
||||
AC_BAKEFILE([m4_include(autoconf_inc.m4)])
|
||||
|
||||
dnl make install path absolute (if not already);
|
||||
dnl will fail with (some) MSDOS paths
|
||||
case ${INSTALL} in
|
||||
/* ) # Absolute
|
||||
;;
|
||||
?:* ) # Drive letter, considered as absolute.
|
||||
;;
|
||||
*)
|
||||
INSTALL=`pwd`/${INSTALL} ;;
|
||||
esac
|
||||
|
||||
dnl find out if the compiler supports PCH
|
||||
dnl
|
||||
dnl TODO: this should be in bakefile
|
||||
|
||||
Loading…
Reference in New Issue
Block a user