put dnl on a new line so it doesn't join lines, remove redundant
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49607 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
parent
c2e0288358
commit
bef5e9e5f6
94
configure
vendored
94
configure
vendored
@ -1,5 +1,5 @@
|
||||
#! /bin/sh
|
||||
# From configure.in Id: configure.in 49513 2007-10-29 12:09:59Z VZ .
|
||||
# From configure.in Id: configure.in 49606 2007-11-03 16:14:28Z PC .
|
||||
# Guess values for system-dependent variables and create Makefiles.
|
||||
# Generated by GNU Autoconf 2.61 for wxWidgets 2.9.0.
|
||||
#
|
||||
@ -869,7 +869,6 @@ COND_PLATFORM_MACOSX_1_TOOLKIT_X11
|
||||
COND_PLATFORM_MACOSX_1_USE_GUI_1
|
||||
COND_PLATFORM_MACOSX_1_USE_SOVERSION_1
|
||||
COND_PLATFORM_MACOS_1
|
||||
COND_PLATFORM_MAC_1
|
||||
COND_PLATFORM_MSDOS_1
|
||||
COND_PLATFORM_OS2_1
|
||||
COND_PLATFORM_UNIX_0
|
||||
@ -2945,7 +2944,7 @@ DEFAULT_wxUSE_GTK2=yes
|
||||
DEFAULT_wxUSE_OBJC_UNIQUIFYING=no
|
||||
|
||||
|
||||
for toolkit in `echo $ALL_TOOLKITS`; do
|
||||
for toolkit in $ALL_TOOLKITS; do
|
||||
LINE=`grep "wxUSE_$toolkit=" ${wx_arg_cache_file}`
|
||||
if test "x$LINE" != "x" ; then
|
||||
has_toolkit_in_cache=1
|
||||
@ -16451,7 +16450,7 @@ echo "$as_me: error: BeOS GUI is not supported yet, use --disable-gui" >&2;}
|
||||
fi
|
||||
|
||||
if test "$TOOLKIT_GIVEN" = 1; then
|
||||
for toolkit in `echo $ALL_TOOLKITS`; do
|
||||
for toolkit in $ALL_TOOLKITS; do
|
||||
var=wxUSE_$toolkit
|
||||
eval "value=\$${var}"
|
||||
if test "x$value" = "xno"; then
|
||||
@ -16465,7 +16464,7 @@ echo "$as_me: error: BeOS GUI is not supported yet, use --disable-gui" >&2;}
|
||||
fi
|
||||
done
|
||||
else
|
||||
for toolkit in `echo $ALL_TOOLKITS`; do
|
||||
for toolkit in $ALL_TOOLKITS; do
|
||||
if test "$has_toolkit_in_cache" != 1; then
|
||||
var=DEFAULT_DEFAULT_wxUSE_$toolkit
|
||||
else
|
||||
@ -16510,7 +16509,7 @@ echo "$as_me: error: Please specify at most one toolkit (maybe some are cached i
|
||||
wxGTK_VERSION=1
|
||||
fi
|
||||
|
||||
for toolkit in `echo $ALL_TOOLKITS`; do
|
||||
for toolkit in $ALL_TOOLKITS; do
|
||||
var=wxUSE_$toolkit
|
||||
eval "value=\$${var}"
|
||||
if test "x$value" != x; then
|
||||
@ -16524,7 +16523,7 @@ echo "$as_me: error: Please specify at most one toolkit (maybe some are cached i
|
||||
fi
|
||||
fi
|
||||
if test "$value" = 1; then
|
||||
toolkit_echo=`echo $toolkit | tr "[A-Z]" "[a-z]"`
|
||||
toolkit_echo=`echo $toolkit | tr A-Z a-z`
|
||||
{ echo "$as_me:$LINENO: result: $toolkit_echo" >&5
|
||||
echo "${ECHO_T}$toolkit_echo" >&6; }
|
||||
fi
|
||||
@ -29982,7 +29981,8 @@ fi
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
else if test "$wxUSE_LIBTIFF" = "builtin"; then
|
||||
else
|
||||
if test "$wxUSE_LIBTIFF" = "builtin"; then
|
||||
ac_configure_args="$ac_configure_args --disable-jpeg"
|
||||
fi
|
||||
fi
|
||||
@ -35142,7 +35142,7 @@ _ACEOF
|
||||
if test "$TOOLKIT" = "PM" ; then
|
||||
TOOLKIT_DIR="os2"
|
||||
else
|
||||
TOOLKIT_DIR=`echo ${TOOLKIT} | tr "[A-Z]" "[a-z]"`
|
||||
TOOLKIT_DIR=`echo ${TOOLKIT} | tr A-Z a-z`
|
||||
fi
|
||||
|
||||
if test "$wxUSE_UNIVERSAL" = "yes"; then
|
||||
@ -36397,7 +36397,7 @@ if test "$wxUSE_DEBUG_INFO" = "yes"; then
|
||||
DEBUG_INFO=1
|
||||
fi
|
||||
|
||||
WX_VERSION_TAG=`echo WX${lib_unicode_suffix}${lib_debug_suffix}${WX_LIB_FLAVOUR}_${WX_RELEASE} | tr "[a-z]" "[A-Z]"`
|
||||
WX_VERSION_TAG=`echo WX${lib_unicode_suffix}${lib_debug_suffix}${WX_LIB_FLAVOUR}_${WX_RELEASE} | tr a-z A-Z`
|
||||
|
||||
TOOLCHAIN_NAME="${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}${WX_LIB_FLAVOUR}-${WX_RELEASE}"
|
||||
|
||||
@ -49334,7 +49334,7 @@ fi
|
||||
|
||||
|
||||
|
||||
TOOLKIT_LOWERCASE=`echo $TOOLKIT | tr "[A-Z]" "[a-z]"`
|
||||
TOOLKIT_LOWERCASE=`echo $TOOLKIT | tr A-Z a-z`
|
||||
|
||||
|
||||
|
||||
@ -49406,7 +49406,7 @@ else
|
||||
|
||||
if $CXX -o conftest$PROGRAM_EXT conftest.cpp >/dev/null 2>&1
|
||||
then
|
||||
if tr -dc '[a-z]' < conftest$PROGRAM_EXT |
|
||||
if tr -dc a-z < conftest$PROGRAM_EXT |
|
||||
grep awidetest >/dev/null
|
||||
then
|
||||
wx_cv_gcc_pch_bug=no
|
||||
@ -51934,11 +51934,6 @@ EOF
|
||||
COND_PLATFORM_MACOS_1=""
|
||||
fi
|
||||
|
||||
COND_PLATFORM_MAC_1="#"
|
||||
if test "x$PLATFORM_MAC" = "x1" ; then
|
||||
COND_PLATFORM_MAC_1=""
|
||||
fi
|
||||
|
||||
COND_PLATFORM_MSDOS_1="#"
|
||||
if test "x$PLATFORM_MSDOS" = "x1" ; then
|
||||
COND_PLATFORM_MSDOS_1=""
|
||||
@ -52688,7 +52683,8 @@ ac_config_commands="$ac_config_commands wx-config"
|
||||
if test "$wxWITH_SUBDIRS" != "no"; then
|
||||
if test "$wxUSE_GUI" = "yes"; then
|
||||
SUBDIRS="samples demos utils"
|
||||
else SUBDIRS="samples utils"
|
||||
else
|
||||
SUBDIRS="samples utils"
|
||||
fi
|
||||
|
||||
|
||||
@ -52821,23 +52817,24 @@ echo "${ECHO_T}no" >&6; }
|
||||
|
||||
|
||||
|
||||
for subdir in `echo $SUBDIRS`; do
|
||||
for subdir in $SUBDIRS; do
|
||||
if test -d ${srcdir}/${subdir} ; then
|
||||
if test "$wxUSE_GUI" = "yes"; then
|
||||
if test ${subdir} = "samples"; then
|
||||
makefiles="samples/Makefile.in $makefiles"
|
||||
for sample in `echo $SAMPLES_SUBDIRS`; do
|
||||
for sample in $SAMPLES_SUBDIRS; do
|
||||
if test -d $srcdir/samples/$sample; then
|
||||
makefiles="samples/$sample/Makefile.in $makefiles"
|
||||
fi
|
||||
done
|
||||
else
|
||||
disabled_var=DISABLED_`echo $subdir | tr [a-z] [A-Z]`;
|
||||
disabled_var=DISABLED_`echo $subdir | tr a-z A-Z`
|
||||
eval "disabled=\$$disabled_var"
|
||||
disabled=/`echo X $disabled | sed 's@ @/|/@g'`/
|
||||
makefiles=`(cd $srcdir ; find $subdir -name Makefile.in) | $EGREP -v "$disabled"`
|
||||
fi
|
||||
else if test ${subdir} = "samples"; then
|
||||
else
|
||||
if test ${subdir} = "samples"; then
|
||||
makefiles="samples/Makefile.in samples/console/Makefile.in"
|
||||
elif test ${subdir} = "utils"; then
|
||||
makefiles=""
|
||||
@ -52848,7 +52845,8 @@ for subdir in `echo $SUBDIRS`; do
|
||||
$makefiles"
|
||||
fi
|
||||
done
|
||||
else makefiles=`(cd $srcdir ; find $subdir -name Makefile.in)`
|
||||
else
|
||||
makefiles=`(cd $srcdir ; find $subdir -name Makefile.in)`
|
||||
fi
|
||||
fi
|
||||
|
||||
@ -53837,7 +53835,6 @@ COND_PLATFORM_MACOSX_1_TOOLKIT_X11!$COND_PLATFORM_MACOSX_1_TOOLKIT_X11$ac_delim
|
||||
COND_PLATFORM_MACOSX_1_USE_GUI_1!$COND_PLATFORM_MACOSX_1_USE_GUI_1$ac_delim
|
||||
COND_PLATFORM_MACOSX_1_USE_SOVERSION_1!$COND_PLATFORM_MACOSX_1_USE_SOVERSION_1$ac_delim
|
||||
COND_PLATFORM_MACOS_1!$COND_PLATFORM_MACOS_1$ac_delim
|
||||
COND_PLATFORM_MAC_1!$COND_PLATFORM_MAC_1$ac_delim
|
||||
COND_PLATFORM_MSDOS_1!$COND_PLATFORM_MSDOS_1$ac_delim
|
||||
COND_PLATFORM_OS2_1!$COND_PLATFORM_OS2_1$ac_delim
|
||||
COND_PLATFORM_UNIX_0!$COND_PLATFORM_UNIX_0$ac_delim
|
||||
@ -53875,6 +53872,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0!$COND_TOOLKIT_GTK_TOOLKIT_V
|
||||
COND_TOOLKIT_GTK_USE_GUI_1!$COND_TOOLKIT_GTK_USE_GUI_1$ac_delim
|
||||
COND_TOOLKIT_MAC!$COND_TOOLKIT_MAC$ac_delim
|
||||
COND_TOOLKIT_MAC_USE_GUI_1!$COND_TOOLKIT_MAC_USE_GUI_1$ac_delim
|
||||
COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0!$COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0$ac_delim
|
||||
_ACEOF
|
||||
|
||||
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
|
||||
@ -53916,7 +53914,6 @@ _ACEOF
|
||||
ac_delim='%!_!# '
|
||||
for ac_last_try in false false false false false :; do
|
||||
cat >conf$$subs.sed <<_ACEOF
|
||||
COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0!$COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0$ac_delim
|
||||
COND_TOOLKIT_MGL!$COND_TOOLKIT_MGL$ac_delim
|
||||
COND_TOOLKIT_MGL_USE_GUI_1!$COND_TOOLKIT_MGL_USE_GUI_1$ac_delim
|
||||
COND_TOOLKIT_MOTIF!$COND_TOOLKIT_MOTIF$ac_delim
|
||||
@ -54013,6 +54010,7 @@ GCC!$GCC$ac_delim
|
||||
DLLTOOL!$DLLTOOL$ac_delim
|
||||
CPPUNIT_CONFIG!$CPPUNIT_CONFIG$ac_delim
|
||||
LIBOBJS!$LIBOBJS$ac_delim
|
||||
LTLIBOBJS!$LTLIBOBJS$ac_delim
|
||||
_ACEOF
|
||||
|
||||
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
|
||||
@ -54051,50 +54049,6 @@ CEOF$ac_eof
|
||||
_ACEOF
|
||||
|
||||
|
||||
ac_delim='%!_!# '
|
||||
for ac_last_try in false false false false false :; do
|
||||
cat >conf$$subs.sed <<_ACEOF
|
||||
LTLIBOBJS!$LTLIBOBJS$ac_delim
|
||||
_ACEOF
|
||||
|
||||
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 1; then
|
||||
break
|
||||
elif $ac_last_try; then
|
||||
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
|
||||
echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
|
||||
{ (exit 1); exit 1; }; }
|
||||
else
|
||||
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
|
||||
fi
|
||||
done
|
||||
|
||||
ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
|
||||
if test -n "$ac_eof"; then
|
||||
ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
|
||||
ac_eof=`expr $ac_eof + 1`
|
||||
fi
|
||||
|
||||
cat >>$CONFIG_STATUS <<_ACEOF
|
||||
cat >"\$tmp/subs-5.sed" <<\CEOF$ac_eof
|
||||
/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end
|
||||
_ACEOF
|
||||
sed '
|
||||
s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
|
||||
s/^/s,@/; s/!/@,|#_!!_#|/
|
||||
:n
|
||||
t n
|
||||
s/'"$ac_delim"'$/,g/; t
|
||||
s/$/\\/; p
|
||||
N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
|
||||
' >>$CONFIG_STATUS <conf$$subs.sed
|
||||
rm -f conf$$subs.sed
|
||||
cat >>$CONFIG_STATUS <<_ACEOF
|
||||
:end
|
||||
s/|#_!!_#|//g
|
||||
CEOF$ac_eof
|
||||
_ACEOF
|
||||
|
||||
|
||||
# VPATH may cause trouble with some makes, so we remove $(srcdir),
|
||||
# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
|
||||
# trailing colons and then remove the whole line if VPATH becomes empty
|
||||
@ -54338,7 +54292,7 @@ s&@abs_builddir@&$ac_abs_builddir&;t t
|
||||
s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
|
||||
s&@INSTALL@&$ac_INSTALL&;t t
|
||||
$ac_datarootdir_hack
|
||||
" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" | sed -f "$tmp/subs-3.sed" | sed -f "$tmp/subs-4.sed" | sed -f "$tmp/subs-5.sed" >$tmp/out
|
||||
" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" | sed -f "$tmp/subs-3.sed" | sed -f "$tmp/subs-4.sed" | sed 's/|#_!!_#|//g' >$tmp/out
|
||||
|
||||
test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
|
||||
{ ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
|
||||
|
||||
24
configure.in
24
configure.in
@ -402,7 +402,7 @@ dnl Always default to no. Only special cases require this.
|
||||
DEFAULT_wxUSE_OBJC_UNIQUIFYING=no
|
||||
|
||||
|
||||
for toolkit in `echo $ALL_TOOLKITS`; do
|
||||
for toolkit in $ALL_TOOLKITS; do
|
||||
LINE=`grep "wxUSE_$toolkit=" ${wx_arg_cache_file}`
|
||||
if test "x$LINE" != "x" ; then
|
||||
has_toolkit_in_cache=1
|
||||
@ -974,7 +974,7 @@ if test "$wxUSE_GUI" = "yes"; then
|
||||
|
||||
if test "$TOOLKIT_GIVEN" = 1; then
|
||||
dnl convert "yes", "any" or a number to 1 and "no" to 0
|
||||
for toolkit in `echo $ALL_TOOLKITS`; do
|
||||
for toolkit in $ALL_TOOLKITS; do
|
||||
var=wxUSE_$toolkit
|
||||
eval "value=\$${var}"
|
||||
if test "x$value" = "xno"; then
|
||||
@ -989,7 +989,7 @@ if test "$wxUSE_GUI" = "yes"; then
|
||||
done
|
||||
else
|
||||
dnl try to guess the most apropriate toolkit for this platform
|
||||
for toolkit in `echo $ALL_TOOLKITS`; do
|
||||
for toolkit in $ALL_TOOLKITS; do
|
||||
if test "$has_toolkit_in_cache" != 1; then
|
||||
var=DEFAULT_DEFAULT_wxUSE_$toolkit
|
||||
else
|
||||
@ -1034,7 +1034,7 @@ if test "$wxUSE_GUI" = "yes"; then
|
||||
fi
|
||||
|
||||
dnl cache the wxUSE_<TOOLKIT> values too
|
||||
for toolkit in `echo $ALL_TOOLKITS`; do
|
||||
for toolkit in $ALL_TOOLKITS; do
|
||||
var=wxUSE_$toolkit
|
||||
eval "value=\$${var}"
|
||||
if test "x$value" != x; then
|
||||
@ -2559,7 +2559,8 @@ if test "$wxUSE_LIBJPEG" != "no" ; then
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
else dnl wxUSE_LIBJPEG = "no"
|
||||
else
|
||||
dnl wxUSE_LIBJPEG = "no"
|
||||
if test "$wxUSE_LIBTIFF" = "builtin"; then
|
||||
dnl we have to prevent the builtin libtiff configure from building the
|
||||
dnl library with JPEG support as this was explicitly disabled by user,
|
||||
@ -7861,21 +7862,22 @@ if test "$wxWITH_SUBDIRS" != "no"; then
|
||||
dnl Configure samples, demos etc. directories, but only if they are present:
|
||||
if test "$wxUSE_GUI" = "yes"; then
|
||||
SUBDIRS="samples demos utils"
|
||||
else dnl we build wxBase only
|
||||
else
|
||||
dnl we build wxBase only
|
||||
dnl there are no wxBase programs in demos
|
||||
SUBDIRS="samples utils"
|
||||
fi
|
||||
dnl Add tests to the list of subdirs if cppunit 1.8.0+ is detected
|
||||
AM_PATH_CPPUNIT(1.8.0, [SUBDIRS="$SUBDIRS tests"])
|
||||
|
||||
for subdir in `echo $SUBDIRS`; do
|
||||
for subdir in $SUBDIRS; do
|
||||
if test -d ${srcdir}/${subdir} ; then
|
||||
if test "$wxUSE_GUI" = "yes"; then
|
||||
if test ${subdir} = "samples"; then
|
||||
dnl only take those samples which compile in the current
|
||||
dnl configuration and which exist
|
||||
makefiles="samples/Makefile.in $makefiles"
|
||||
for sample in `echo $SAMPLES_SUBDIRS`; do
|
||||
for sample in $SAMPLES_SUBDIRS; do
|
||||
if test -d $srcdir/samples/$sample; then
|
||||
makefiles="samples/$sample/Makefile.in $makefiles"
|
||||
fi
|
||||
@ -7889,7 +7891,8 @@ for subdir in `echo $SUBDIRS`; do
|
||||
disabled=/`echo X $disabled | sed 's@ @/|/@g'`/
|
||||
makefiles=`(cd $srcdir ; find $subdir -name Makefile.in) | $EGREP -v "$disabled"`
|
||||
fi
|
||||
else dnl we build wxBase only
|
||||
else
|
||||
dnl we build wxBase only
|
||||
dnl don't take all samples/utils, just those which build with
|
||||
dnl wxBase
|
||||
if test ${subdir} = "samples"; then
|
||||
@ -7903,7 +7906,8 @@ for subdir in `echo $SUBDIRS`; do
|
||||
$makefiles"
|
||||
fi
|
||||
done
|
||||
else dnl assume that everything compiles for tests
|
||||
else
|
||||
dnl assume that everything compiles for tests
|
||||
makefiles=`(cd $srcdir ; find $subdir -name Makefile.in)`
|
||||
fi
|
||||
fi
|
||||
|
||||
Loading…
Reference in New Issue
Block a user