set DEFAULT_wxUSE_AUTOID_MANAGEMENT to no under non-MSW platforms (required moving the toolkit detection earlier in configure)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51052 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
parent
75a29ef15c
commit
91a2809da0
193
configure
vendored
193
configure
vendored
@ -1,5 +1,5 @@
|
||||
#! /bin/sh
|
||||
# From configure.in Id: configure.in 50845 2007-12-20 01:05:19Z VZ .
|
||||
# From configure.in Id: configure.in 51048 2008-01-06 21:01:38Z VZ .
|
||||
# Guess values for system-dependent variables and create Makefiles.
|
||||
# Generated by GNU Autoconf 2.61 for wxWidgets 2.9.0.
|
||||
#
|
||||
@ -3448,6 +3448,99 @@ echo "${ECHO_T}$result" >&6; }
|
||||
|
||||
|
||||
|
||||
{ echo "$as_me:$LINENO: checking for toolkit" >&5
|
||||
echo $ECHO_N "checking for toolkit... $ECHO_C" >&6; }
|
||||
|
||||
# In Wine, we need to default to MSW, not GTK or MOTIF
|
||||
if test "$wxUSE_WINE" = "yes"; then
|
||||
DEFAULT_DEFAULT_wxUSE_GTK=0
|
||||
DEFAULT_DEFAULT_wxUSE_MOTIF=0
|
||||
DEFAULT_DEFAULT_wxUSE_MSW=1
|
||||
wxUSE_SHARED=no
|
||||
CC=${CC:-winegcc}
|
||||
CXX=${CXX:-wineg++}
|
||||
fi
|
||||
|
||||
|
||||
if test "$wxUSE_GUI" = "yes"; then
|
||||
|
||||
if test "$USE_BEOS" = 1; then
|
||||
{ { echo "$as_me:$LINENO: error: BeOS GUI is not supported yet, use --disable-gui" >&5
|
||||
echo "$as_me: error: BeOS GUI is not supported yet, use --disable-gui" >&2;}
|
||||
{ (exit 1); exit 1; }; }
|
||||
fi
|
||||
|
||||
if test "$TOOLKIT_GIVEN" = 1; then
|
||||
for toolkit in $ALL_TOOLKITS; do
|
||||
var=wxUSE_$toolkit
|
||||
eval "value=\$${var}"
|
||||
if test "x$value" = "xno"; then
|
||||
eval "$var=0"
|
||||
elif test "x$value" != "x"; then
|
||||
eval "$var=1"
|
||||
fi
|
||||
|
||||
if test "x$value" != "x" -a "x$value" != "xyes" -a "x$value" != "xno"; then
|
||||
eval "wx${toolkit}_VERSION=$value"
|
||||
fi
|
||||
done
|
||||
else
|
||||
for toolkit in $ALL_TOOLKITS; do
|
||||
var=DEFAULT_DEFAULT_wxUSE_$toolkit
|
||||
eval "wxUSE_$toolkit=\$${var}"
|
||||
done
|
||||
fi
|
||||
|
||||
NUM_TOOLKITS=`expr ${wxUSE_COCOA:-0} + ${wxUSE_GTK:-0} + ${wxUSE_MAC:-0} \
|
||||
+ ${wxUSE_MGL:-0} + ${wxUSE_DFB:-0} + ${wxUSE_MICROWIN:-0} \
|
||||
+ ${wxUSE_MOTIF:-0} + ${wxUSE_MSW:-0} + ${wxUSE_X11:-0}`
|
||||
|
||||
case "${host}" in
|
||||
*-pc-os2_emx | *-pc-os2-emx )
|
||||
NUM_TOOLKITS=`expr ${NUM_TOOLKITS} + ${wxUSE_PM:-0}`
|
||||
esac
|
||||
|
||||
case "$NUM_TOOLKITS" in
|
||||
1)
|
||||
;;
|
||||
0)
|
||||
{ { echo "$as_me:$LINENO: error: Please specify a toolkit -- cannot determine the default for ${host}" >&5
|
||||
echo "$as_me: error: Please specify a toolkit -- cannot determine the default for ${host}" >&2;}
|
||||
{ (exit 1); exit 1; }; }
|
||||
;;
|
||||
*)
|
||||
{ { echo "$as_me:$LINENO: error: Please specify at most one toolkit" >&5
|
||||
echo "$as_me: error: Please specify at most one toolkit" >&2;}
|
||||
{ (exit 1); exit 1; }; }
|
||||
esac
|
||||
|
||||
# to be removed when --disable-gtk2 isn't needed
|
||||
if test "x$wxUSE_GTK2" = "xyes"; then
|
||||
wxGTK_VERSION=2
|
||||
elif test "x$wxUSE_GTK2" = "xno"; then
|
||||
wxGTK_VERSION=1
|
||||
fi
|
||||
|
||||
for toolkit in $ALL_TOOLKITS; do
|
||||
var=wxUSE_$toolkit
|
||||
eval "value=\$${var}"
|
||||
if test "$value" = 1; then
|
||||
toolkit_echo=`echo $toolkit | tr '[A-Z]' '[a-z]'`
|
||||
{ echo "$as_me:$LINENO: result: $toolkit_echo" >&5
|
||||
echo "${ECHO_T}$toolkit_echo" >&6; }
|
||||
fi
|
||||
done
|
||||
else
|
||||
if test "x$host_alias" != "x"; then
|
||||
{ echo "$as_me:$LINENO: result: base ($host_alias hosted) only" >&5
|
||||
echo "${ECHO_T}base ($host_alias hosted) only" >&6; }
|
||||
else
|
||||
{ echo "$as_me:$LINENO: result: base only" >&5
|
||||
echo "${ECHO_T}base only" >&6; }
|
||||
fi
|
||||
fi
|
||||
|
||||
|
||||
|
||||
{ echo "$as_me:$LINENO: checking for --with-libpng" >&5
|
||||
echo $ECHO_N "checking for --with-libpng... $ECHO_C" >&6; }
|
||||
@ -13657,6 +13750,11 @@ fi
|
||||
echo "${ECHO_T}$result" >&6; }
|
||||
|
||||
|
||||
if test "$wxUSE_MSW" != 1; then
|
||||
DEFAULT_wxUSE_AUTOID_MANAGEMENT=no
|
||||
fi
|
||||
|
||||
|
||||
enablestring=
|
||||
defaultval=$wxUSE_ALL_FEATURES
|
||||
if test -z "$defaultval"; then
|
||||
@ -13704,99 +13802,6 @@ echo "${ECHO_T}$result" >&6; }
|
||||
fi
|
||||
|
||||
|
||||
{ echo "$as_me:$LINENO: checking for toolkit" >&5
|
||||
echo $ECHO_N "checking for toolkit... $ECHO_C" >&6; }
|
||||
|
||||
# In Wine, we need to default to MSW, not GTK or MOTIF
|
||||
if test "$wxUSE_WINE" = "yes"; then
|
||||
DEFAULT_DEFAULT_wxUSE_GTK=0
|
||||
DEFAULT_DEFAULT_wxUSE_MOTIF=0
|
||||
DEFAULT_DEFAULT_wxUSE_MSW=1
|
||||
wxUSE_SHARED=no
|
||||
CC=${CC:-winegcc}
|
||||
CXX=${CXX:-wineg++}
|
||||
fi
|
||||
|
||||
|
||||
if test "$wxUSE_GUI" = "yes"; then
|
||||
|
||||
if test "$USE_BEOS" = 1; then
|
||||
{ { echo "$as_me:$LINENO: error: BeOS GUI is not supported yet, use --disable-gui" >&5
|
||||
echo "$as_me: error: BeOS GUI is not supported yet, use --disable-gui" >&2;}
|
||||
{ (exit 1); exit 1; }; }
|
||||
fi
|
||||
|
||||
if test "$TOOLKIT_GIVEN" = 1; then
|
||||
for toolkit in $ALL_TOOLKITS; do
|
||||
var=wxUSE_$toolkit
|
||||
eval "value=\$${var}"
|
||||
if test "x$value" = "xno"; then
|
||||
eval "$var=0"
|
||||
elif test "x$value" != "x"; then
|
||||
eval "$var=1"
|
||||
fi
|
||||
|
||||
if test "x$value" != "x" -a "x$value" != "xyes" -a "x$value" != "xno"; then
|
||||
eval "wx${toolkit}_VERSION=$value"
|
||||
fi
|
||||
done
|
||||
else
|
||||
for toolkit in $ALL_TOOLKITS; do
|
||||
var=DEFAULT_DEFAULT_wxUSE_$toolkit
|
||||
eval "wxUSE_$toolkit=\$${var}"
|
||||
done
|
||||
fi
|
||||
|
||||
NUM_TOOLKITS=`expr ${wxUSE_COCOA:-0} + ${wxUSE_GTK:-0} + ${wxUSE_MAC:-0} \
|
||||
+ ${wxUSE_MGL:-0} + ${wxUSE_DFB:-0} + ${wxUSE_MICROWIN:-0} \
|
||||
+ ${wxUSE_MOTIF:-0} + ${wxUSE_MSW:-0} + ${wxUSE_X11:-0}`
|
||||
|
||||
case "${host}" in
|
||||
*-pc-os2_emx | *-pc-os2-emx )
|
||||
NUM_TOOLKITS=`expr ${NUM_TOOLKITS} + ${wxUSE_PM:-0}`
|
||||
esac
|
||||
|
||||
case "$NUM_TOOLKITS" in
|
||||
1)
|
||||
;;
|
||||
0)
|
||||
{ { echo "$as_me:$LINENO: error: Please specify a toolkit -- cannot determine the default for ${host}" >&5
|
||||
echo "$as_me: error: Please specify a toolkit -- cannot determine the default for ${host}" >&2;}
|
||||
{ (exit 1); exit 1; }; }
|
||||
;;
|
||||
*)
|
||||
{ { echo "$as_me:$LINENO: error: Please specify at most one toolkit" >&5
|
||||
echo "$as_me: error: Please specify at most one toolkit" >&2;}
|
||||
{ (exit 1); exit 1; }; }
|
||||
esac
|
||||
|
||||
# to be removed when --disable-gtk2 isn't needed
|
||||
if test "x$wxUSE_GTK2" = "xyes"; then
|
||||
wxGTK_VERSION=2
|
||||
elif test "x$wxUSE_GTK2" = "xno"; then
|
||||
wxGTK_VERSION=1
|
||||
fi
|
||||
|
||||
for toolkit in $ALL_TOOLKITS; do
|
||||
var=wxUSE_$toolkit
|
||||
eval "value=\$${var}"
|
||||
if test "$value" = 1; then
|
||||
toolkit_echo=`echo $toolkit | tr '[A-Z]' '[a-z]'`
|
||||
{ echo "$as_me:$LINENO: result: $toolkit_echo" >&5
|
||||
echo "${ECHO_T}$toolkit_echo" >&6; }
|
||||
fi
|
||||
done
|
||||
else
|
||||
if test "x$host_alias" != "x"; then
|
||||
{ echo "$as_me:$LINENO: result: base ($host_alias hosted) only" >&5
|
||||
echo "${ECHO_T}base ($host_alias hosted) only" >&6; }
|
||||
else
|
||||
{ echo "$as_me:$LINENO: result: base only" >&5
|
||||
echo "${ECHO_T}base only" >&6; }
|
||||
fi
|
||||
fi
|
||||
|
||||
|
||||
cat >confcache <<\_ACEOF
|
||||
# This file is a shell script that caches the results of configure
|
||||
# tests run on this system so they can be shared between configure
|
||||
|
||||
187
configure.in
187
configure.in
@ -468,6 +468,96 @@ WX_ARG_ENABLE(nanox, [ --enable-nanox use NanoX], wxUSE_NANOX)
|
||||
AC_ARG_ENABLE(gtk2, [ --disable-gtk2 use GTK+ 1.2 instead of 2.0], [wxUSE_GTK2="$enableval"])
|
||||
WX_ARG_ENABLE(gpe, [ --enable-gpe use GNOME PDA Environment features if possible], wxUSE_GPE)
|
||||
|
||||
dnl check that no more than one toolkit is given and that if none are given that
|
||||
dnl we have a default one
|
||||
|
||||
AC_MSG_CHECKING(for toolkit)
|
||||
|
||||
# In Wine, we need to default to MSW, not GTK or MOTIF
|
||||
if test "$wxUSE_WINE" = "yes"; then
|
||||
DEFAULT_DEFAULT_wxUSE_GTK=0
|
||||
DEFAULT_DEFAULT_wxUSE_MOTIF=0
|
||||
DEFAULT_DEFAULT_wxUSE_MSW=1
|
||||
wxUSE_SHARED=no
|
||||
CC=${CC:-winegcc}
|
||||
CXX=${CXX:-wineg++}
|
||||
fi
|
||||
|
||||
|
||||
if test "$wxUSE_GUI" = "yes"; then
|
||||
|
||||
if test "$USE_BEOS" = 1; then
|
||||
AC_MSG_ERROR([BeOS GUI is not supported yet, use --disable-gui])
|
||||
fi
|
||||
|
||||
if test "$TOOLKIT_GIVEN" = 1; then
|
||||
dnl convert "yes", "any" or a number to 1 and "no" to 0
|
||||
for toolkit in $ALL_TOOLKITS; do
|
||||
var=wxUSE_$toolkit
|
||||
eval "value=\$${var}"
|
||||
if test "x$value" = "xno"; then
|
||||
eval "$var=0"
|
||||
elif test "x$value" != "x"; then
|
||||
eval "$var=1"
|
||||
fi
|
||||
|
||||
if test "x$value" != "x" -a "x$value" != "xyes" -a "x$value" != "xno"; then
|
||||
eval "wx${toolkit}_VERSION=$value"
|
||||
fi
|
||||
done
|
||||
else
|
||||
dnl try to guess the most apropriate toolkit for this platform
|
||||
for toolkit in $ALL_TOOLKITS; do
|
||||
var=DEFAULT_DEFAULT_wxUSE_$toolkit
|
||||
eval "wxUSE_$toolkit=\$${var}"
|
||||
done
|
||||
fi
|
||||
|
||||
dnl we suppose that expr is available (maybe there is a better way to do
|
||||
dnl this? what about using ALL_TOOLKITS? TODO)
|
||||
NUM_TOOLKITS=`expr ${wxUSE_COCOA:-0} + ${wxUSE_GTK:-0} + ${wxUSE_MAC:-0} \
|
||||
+ ${wxUSE_MGL:-0} + ${wxUSE_DFB:-0} + ${wxUSE_MICROWIN:-0} \
|
||||
+ ${wxUSE_MOTIF:-0} + ${wxUSE_MSW:-0} + ${wxUSE_X11:-0}`
|
||||
|
||||
dnl Allow wxUSE_PM only for OS/2 with EMX.
|
||||
case "${host}" in
|
||||
*-pc-os2_emx | *-pc-os2-emx )
|
||||
NUM_TOOLKITS=`expr ${NUM_TOOLKITS} + ${wxUSE_PM:-0}`
|
||||
esac
|
||||
|
||||
case "$NUM_TOOLKITS" in
|
||||
1)
|
||||
;;
|
||||
0)
|
||||
AC_MSG_ERROR(Please specify a toolkit -- cannot determine the default for ${host})
|
||||
;;
|
||||
*)
|
||||
AC_MSG_ERROR(Please specify at most one toolkit)
|
||||
esac
|
||||
|
||||
# to be removed when --disable-gtk2 isn't needed
|
||||
if test "x$wxUSE_GTK2" = "xyes"; then
|
||||
wxGTK_VERSION=2
|
||||
elif test "x$wxUSE_GTK2" = "xno"; then
|
||||
wxGTK_VERSION=1
|
||||
fi
|
||||
|
||||
for toolkit in $ALL_TOOLKITS; do
|
||||
var=wxUSE_$toolkit
|
||||
eval "value=\$${var}"
|
||||
if test "$value" = 1; then
|
||||
toolkit_echo=`echo $toolkit | tr '[[A-Z]]' '[[a-z]]'`
|
||||
AC_MSG_RESULT($toolkit_echo)
|
||||
fi
|
||||
done
|
||||
else
|
||||
if test "x$host_alias" != "x"; then
|
||||
AC_MSG_RESULT(base ($host_alias hosted) only)
|
||||
else
|
||||
AC_MSG_RESULT(base only)
|
||||
fi
|
||||
fi
|
||||
|
||||
dnl ---------------------------------------------------------------------------
|
||||
dnl external libraries
|
||||
dnl ---------------------------------------------------------------------------
|
||||
@ -917,101 +1007,18 @@ WX_ARG_FEATURE(ps-in-msw, [ --enable-ps-in-msw use PS printing in wxMSW
|
||||
WX_ARG_FEATURE(ownerdrawn, [ --enable-ownerdrawn use owner drawn controls (Win32 and OS/2 only)], wxUSE_OWNER_DRAWN)
|
||||
WX_ARG_FEATURE(uxtheme, [ --enable-uxtheme enable support for Windows XP themed look (Win32 only)], wxUSE_UXTHEME)
|
||||
WX_ARG_FEATURE(wxdib, [ --enable-wxdib use wxDIB class (Win32 only)], wxUSE_DIB)
|
||||
|
||||
dnl this one is not really MSW-specific but it exists mainly to be turned off
|
||||
dnl under MSW, it should be off by default on the other platforms
|
||||
if test "$wxUSE_MSW" != 1; then
|
||||
DEFAULT_wxUSE_AUTOID_MANAGEMENT=no
|
||||
fi
|
||||
|
||||
WX_ARG_FEATURE(autoidman, [ --enable-autoidman use automatic ids management], wxUSE_AUTOID_MANAGEMENT)
|
||||
|
||||
fi
|
||||
dnl for GUI only
|
||||
|
||||
dnl check that no more than one toolkit is given and that if none are given that
|
||||
dnl we have a default one
|
||||
|
||||
AC_MSG_CHECKING(for toolkit)
|
||||
|
||||
# In Wine, we need to default to MSW, not GTK or MOTIF
|
||||
if test "$wxUSE_WINE" = "yes"; then
|
||||
DEFAULT_DEFAULT_wxUSE_GTK=0
|
||||
DEFAULT_DEFAULT_wxUSE_MOTIF=0
|
||||
DEFAULT_DEFAULT_wxUSE_MSW=1
|
||||
wxUSE_SHARED=no
|
||||
CC=${CC:-winegcc}
|
||||
CXX=${CXX:-wineg++}
|
||||
fi
|
||||
|
||||
|
||||
if test "$wxUSE_GUI" = "yes"; then
|
||||
|
||||
if test "$USE_BEOS" = 1; then
|
||||
AC_MSG_ERROR([BeOS GUI is not supported yet, use --disable-gui])
|
||||
fi
|
||||
|
||||
if test "$TOOLKIT_GIVEN" = 1; then
|
||||
dnl convert "yes", "any" or a number to 1 and "no" to 0
|
||||
for toolkit in $ALL_TOOLKITS; do
|
||||
var=wxUSE_$toolkit
|
||||
eval "value=\$${var}"
|
||||
if test "x$value" = "xno"; then
|
||||
eval "$var=0"
|
||||
elif test "x$value" != "x"; then
|
||||
eval "$var=1"
|
||||
fi
|
||||
|
||||
if test "x$value" != "x" -a "x$value" != "xyes" -a "x$value" != "xno"; then
|
||||
eval "wx${toolkit}_VERSION=$value"
|
||||
fi
|
||||
done
|
||||
else
|
||||
dnl try to guess the most apropriate toolkit for this platform
|
||||
for toolkit in $ALL_TOOLKITS; do
|
||||
var=DEFAULT_DEFAULT_wxUSE_$toolkit
|
||||
eval "wxUSE_$toolkit=\$${var}"
|
||||
done
|
||||
fi
|
||||
|
||||
dnl we suppose that expr is available (maybe there is a better way to do
|
||||
dnl this? what about using ALL_TOOLKITS? TODO)
|
||||
NUM_TOOLKITS=`expr ${wxUSE_COCOA:-0} + ${wxUSE_GTK:-0} + ${wxUSE_MAC:-0} \
|
||||
+ ${wxUSE_MGL:-0} + ${wxUSE_DFB:-0} + ${wxUSE_MICROWIN:-0} \
|
||||
+ ${wxUSE_MOTIF:-0} + ${wxUSE_MSW:-0} + ${wxUSE_X11:-0}`
|
||||
|
||||
dnl Allow wxUSE_PM only for OS/2 with EMX.
|
||||
case "${host}" in
|
||||
*-pc-os2_emx | *-pc-os2-emx )
|
||||
NUM_TOOLKITS=`expr ${NUM_TOOLKITS} + ${wxUSE_PM:-0}`
|
||||
esac
|
||||
|
||||
case "$NUM_TOOLKITS" in
|
||||
1)
|
||||
;;
|
||||
0)
|
||||
AC_MSG_ERROR(Please specify a toolkit -- cannot determine the default for ${host})
|
||||
;;
|
||||
*)
|
||||
AC_MSG_ERROR(Please specify at most one toolkit)
|
||||
esac
|
||||
|
||||
# to be removed when --disable-gtk2 isn't needed
|
||||
if test "x$wxUSE_GTK2" = "xyes"; then
|
||||
wxGTK_VERSION=2
|
||||
elif test "x$wxUSE_GTK2" = "xno"; then
|
||||
wxGTK_VERSION=1
|
||||
fi
|
||||
|
||||
for toolkit in $ALL_TOOLKITS; do
|
||||
var=wxUSE_$toolkit
|
||||
eval "value=\$${var}"
|
||||
if test "$value" = 1; then
|
||||
toolkit_echo=`echo $toolkit | tr '[[A-Z]]' '[[a-z]]'`
|
||||
AC_MSG_RESULT($toolkit_echo)
|
||||
fi
|
||||
done
|
||||
else
|
||||
if test "x$host_alias" != "x"; then
|
||||
AC_MSG_RESULT(base ($host_alias hosted) only)
|
||||
else
|
||||
AC_MSG_RESULT(base only)
|
||||
fi
|
||||
fi
|
||||
|
||||
dnl ---------------------------------------------------------------------------
|
||||
dnl Checks for programs
|
||||
dnl ---------------------------------------------------------------------------
|
||||
|
||||
Loading…
Reference in New Issue
Block a user