#! /bin/sh
-# From configure.in Id: configure.in 51582 2008-02-07 20:59:50Z DE .
+# From configure.in Id: configure.in 56641 2008-11-02 02:16:09Z VZ .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.61 for wxWidgets 2.9.0.
#
WINDRES
REZ
SETFILE
+OBJCXXFLAGS
GCC_PCH
ICC_PCH
BK_MAKE_PCH
COND_BUILD_RELEASE_DEBUG_INFO_DEFAULT
COND_BUILD_RELEASE_UNICODE_0
COND_BUILD_RELEASE_UNICODE_1
+COND_BUILD_debug
+COND_BUILD_debug_DEBUG_FLAG_default
+COND_BUILD_debug_DEBUG_INFO_default
+COND_BUILD_debug_UNICODE_0
+COND_BUILD_debug_UNICODE_1
+COND_BUILD_release
+COND_BUILD_release_DEBUG_INFO_default
+COND_BUILD_release_UNICODE_0
+COND_BUILD_release_UNICODE_1
COND_DEBUG_FLAG_1
COND_DEBUG_INFO_0
COND_DEBUG_INFO_1
COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_HTML_1
COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_MEDIA_1
COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_QA_1
+COND_MONOLITHIC_0_SHARED_0_USE_PROPGRID_1
COND_MONOLITHIC_0_SHARED_0_USE_RICHTEXT_1
COND_MONOLITHIC_0_SHARED_0_USE_STC_1
COND_MONOLITHIC_0_SHARED_0_USE_XRC_1
COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1
COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1
COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1
+COND_MONOLITHIC_0_SHARED_1_USE_PROPGRID_1
COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1
COND_MONOLITHIC_0_SHARED_1_USE_STC_1
COND_MONOLITHIC_0_SHARED_1_USE_XRC_1
COND_MONOLITHIC_0_USE_GUI_1_USE_MEDIA_1
COND_MONOLITHIC_0_USE_HTML_1
COND_MONOLITHIC_0_USE_MEDIA_1
+COND_MONOLITHIC_0_USE_PROPGRID_1
COND_MONOLITHIC_0_USE_QA_1
COND_MONOLITHIC_0_USE_RICHTEXT_1
COND_MONOLITHIC_0_USE_STC_1
COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1
COND_PLATFORM_MACOSX_0_USE_SOVERSION_1
COND_PLATFORM_MACOSX_1
-COND_PLATFORM_MACOSX_1_TOOLKIT_
-COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA
-COND_PLATFORM_MACOSX_1_TOOLKIT_GTK
-COND_PLATFORM_MACOSX_1_TOOLKIT_MAC
-COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1
-COND_PLATFORM_MACOSX_1_TOOLKIT_MOTIF
-COND_PLATFORM_MACOSX_1_TOOLKIT_X11
+COND_PLATFORM_MACOSX_1_PLATFORM_MSDOS_0
+COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1
+COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0
+COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1
+COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0
COND_PLATFORM_MACOSX_1_USE_GUI_1
+COND_PLATFORM_MACOSX_1_USE_OPENGL_1
COND_PLATFORM_MACOSX_1_USE_SOVERSION_1
COND_PLATFORM_MACOS_1
COND_PLATFORM_MAC_0
COND_SHARED_0_TOOLKIT_MSW_WXUNIV_0
COND_SHARED_0_TOOLKIT_PM_WXUNIV_0
COND_SHARED_0_USE_GUI_1_USE_OPENGL_1
-COND_SHARED_0_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN
-COND_SHARED_0_USE_GUI_1_WXUSE_LIBPNG_BUILTIN
-COND_SHARED_0_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN
+COND_SHARED_0_USE_GUI_1_wxUSE_LIBJPEG_builtin
+COND_SHARED_0_USE_GUI_1_wxUSE_LIBPNG_builtin
+COND_SHARED_0_USE_GUI_1_wxUSE_LIBTIFF_builtin
COND_SHARED_0_USE_STC_1
-COND_SHARED_0_WXUSE_EXPAT_BUILTIN
-COND_SHARED_0_WXUSE_REGEX_BUILTIN
-COND_SHARED_0_WXUSE_ZLIB_BUILTIN
+COND_SHARED_0_wxUSE_EXPAT_builtin
+COND_SHARED_0_wxUSE_REGEX_builtin
+COND_SHARED_0_wxUSE_ZLIB_builtin
COND_SHARED_1
COND_SHARED_1_USE_GUI_1_USE_OPENGL_1
COND_TOOLKIT_
COND_TOOLKIT_GTK_TOOLKIT_VERSION_2
COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1
COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0
-COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_WXUNIV_0
COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1
COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0
COND_TOOLKIT_GTK_USE_GUI_1
COND_TOOLKIT_MAC
-COND_TOOLKIT_MAC_USE_GUI_1
-COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0
COND_TOOLKIT_MGL
COND_TOOLKIT_MGL_USE_GUI_1
COND_TOOLKIT_MOTIF
COND_TOOLKIT_MSW_USE_GUI_1
COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0
COND_TOOLKIT_MSW_WXUNIV_0
+COND_TOOLKIT_OSX_CARBON
+COND_TOOLKIT_OSX_CARBON_USE_GUI_1
+COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0
+COND_TOOLKIT_OSX_COCOA
+COND_TOOLKIT_OSX_COCOA_USE_GUI_1
+COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0
+COND_TOOLKIT_OSX_IPHONE
COND_TOOLKIT_PM
COND_TOOLKIT_PM_USE_GUI_1
COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0
COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN
COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN
COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN
+COND_USE_GUI_1_wxUSE_LIBJPEG_builtin
+COND_USE_GUI_1_wxUSE_LIBPNG_builtin
+COND_USE_GUI_1_wxUSE_LIBTIFF_builtin
COND_USE_OPENGL_1
COND_USE_PCH_1
COND_USE_PLUGINS_0
COND_WXUSE_LIBTIFF_BUILTIN
COND_WXUSE_REGEX_BUILTIN
COND_WXUSE_ZLIB_BUILTIN
+COND_wxUSE_EXPAT_builtin
+COND_wxUSE_LIBJPEG_builtin
+COND_wxUSE_LIBPNG_builtin
+COND_wxUSE_LIBTIFF_builtin
+COND_wxUSE_REGEX_builtin
+COND_wxUSE_ZLIB_builtin
DEREZ
SHARED
WX_LIBRARY_BASENAME_NOGUI
--disable-gtk2 use GTK+ 1.2 instead of 2.0
--enable-gpe use GNOME PDA Environment features if possible
--disable-shared create static library instead of shared
- --disable-optimise create optimised code
--enable-debug same as debug_flag and debug_info
--enable-stl use STL for containers
--enable-std_iostreams use standard C++ stream classes
--disable-unicode compile without Unicode support
--enable-mslu use MS Layer for Unicode on Windows 9x (Win32 only)
--enable-utf8 use UTF-8 representation for strings (Unix only)
- --enable-utf8only only support UTF-8 locales in UTF-8 build (Unix only)
+ --enable-utf8only only support UTF-8 locales in UTF-8 build (Unix only)
--enable-extended_rtti use extended RTTI (XTI)
--enable-omf use OMF object format
--enable-debug_flag set __WXDEBUG__ flag (recommended for developers!)
--enable-debug_info create code with debugging information
+ --disable-optimise compile without optimisations
--enable-debug_gdb create code with extra GDB debugging information
--enable-debug_cntxt use wxDebugContext
--enable-mem_tracing create code with memory tracing
--enable-objc_uniquifying enable Objective-C class name uniquifying
--disable-visibility disable use of ELF symbols visibility even if supported
--enable-intl use internationalization system
+ --enable-xlocale use x-locale support (requires wxLocale)
--enable-config use wxConfig (and derived) classes
--enable-protocols use wxProtocol and derived classes
--enable-ftp use wxFTP (requires wxProtocol
--enable-textfile use wxTextFile class
--enable-timer use wxTimer class
--enable-variant use wxVariant class
- --enable-weakref make wxEvtHandler trackable with wxWeakRef<>
--enable-zipstream use wxZip streams
--enable-url use wxURL class
--enable-protocol use wxProtocol class
--enable-htmlhelp use wxHTML-based help
--enable-xrc use XRC resources sub-library
--enable-aui use AUI docking library
+ --enable-propgrid use wxPropertyGrid library
--enable-stc use wxStyledTextCtrl library
--enable-constraints use layout-constraints system
--enable-loggui use standard GUI logger
--with-themes=all|list use only the specified comma-separated list of wxUniversal themes
--with-gtk[=VERSION] use GTK+, VERSION can be 2 (default), 1 or "any"
--with-motif use Motif/Lesstif
- --with-mac use Mac OS X
+ --with-osx_carbon use Mac OS X (Carbon)
+ --with-osx_cocoa use Mac OS X (Cocoa)
+ --with-mac use Mac OS X (Default)
--with-cocoa use Cocoa
--with-wine use Wine
--with-msw use MS-Windows
NEEDS_D_REENTRANT_FOR_R_FUNCS=0
-ALL_TOOLKITS="COCOA GTK MAC MGL MICROWIN MOTIF MSW PM X11 DFB"
+ALL_TOOLKITS="COCOA GTK OSX_CARBON OSX_COCOA MGL MICROWIN MOTIF MSW PM X11 DFB"
DEFAULT_wxUSE_COCOA=0
DEFAULT_wxUSE_GTK=0
-DEFAULT_wxUSE_MAC=0
+DEFAULT_wxUSE_OSX_CARBON=0
+DEFAULT_wxUSE_OSX_COCOA=0
DEFAULT_wxUSE_MGL=0
DEFAULT_wxUSE_MICROWIN=0
DEFAULT_wxUSE_MOTIF=0
DEFAULT_DEFAULT_wxUSE_COCOA=0
DEFAULT_DEFAULT_wxUSE_GTK=0
-DEFAULT_DEFAULT_wxUSE_MAC=0
+DEFAULT_DEFAULT_wxUSE_OSX_CARBON=0
+DEFAULT_DEFAULT_wxUSE_OSX_COCOA=0
DEFAULT_DEFAULT_wxUSE_MGL=0
DEFAULT_DEFAULT_wxUSE_MICROWIN=0
DEFAULT_DEFAULT_wxUSE_MOTIF=0
#define TARGET_CARBON 1
_ACEOF
- DEFAULT_DEFAULT_wxUSE_MAC=1
+ DEFAULT_DEFAULT_wxUSE_OSX_CARBON=1
DEFAULT_STD_FLAG=no
;;
powerpc-apple-macos* )
USE_UNIX=0
ac_cv_c_bigendian=yes
SO_SUFFIX=shlib
- DEFAULT_DEFAULT_wxUSE_MAC=1
+ DEFAULT_DEFAULT_wxUSE_OSX_CARBON=1
DEFAULT_STD_FLAG=no
;;
fi
+# Check whether --with-osx_carbon was given.
+if test "${with_osx_carbon+set}" = set; then
+ withval=$with_osx_carbon; wxUSE_OSX_CARBON="$withval" CACHE_OSX_CARBON=1 TOOLKIT_GIVEN=1
+fi
+
+
+# Check whether --with-osx_cocoa was given.
+if test "${with_osx_cocoa+set}" = set; then
+ withval=$with_osx_cocoa; wxUSE_OSX_COCOA="$withval" CACHE_OSX_COCOA=1 TOOLKIT_GIVEN=1
+fi
+
+
# Check whether --with-mac was given.
if test "${with_mac+set}" = set; then
- withval=$with_mac; wxUSE_MAC="$withval" CACHE_MAC=1 TOOLKIT_GIVEN=1
+ withval=$with_mac; wxUSE_OSX_CARBON="$withval" CACHE_OSX_CARBON=1 TOOLKIT_GIVEN=1
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
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}`
+ NUM_TOOLKITS=`expr ${wxUSE_COCOA:-0} + ${wxUSE_GTK:-0} + ${wxUSE_OSX_CARBON:-0} \
+ + ${wxUSE_OSX_COCOA:-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 )
fi
fi
+wxUSE_MAC=0
+if test "$wxUSE_OSX_CARBON" = 1 -o "$wxUSE_OSX_COCOA" = 1; then
+ wxUSE_MAC=1
+fi
+
{ echo "$as_me:$LINENO: checking for --with-libpng" >&5
echo "${ECHO_T}$result" >&6; }
- enablestring=disable
- defaultval=
- if test -z "$defaultval"; then
- if test x"$enablestring" = xdisable; then
- defaultval=yes
- else
- defaultval=no
- fi
- fi
-
- { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-optimise" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-optimise... $ECHO_C" >&6; }
- # Check whether --enable-optimise was given.
-if test "${enable_optimise+set}" = set; then
- enableval=$enable_optimise;
- if test "$enableval" = yes; then
- wx_cv_use_optimise='wxUSE_OPTIMISE=yes'
- else
- wx_cv_use_optimise='wxUSE_OPTIMISE=no'
- fi
-
-else
-
- wx_cv_use_optimise='wxUSE_OPTIMISE=${'DEFAULT_wxUSE_OPTIMISE":-$defaultval}"
-
-fi
-
-
- eval "$wx_cv_use_optimise"
-
- if test x"$enablestring" = xdisable; then
- if test $wxUSE_OPTIMISE = yes; then
- result=no
- else
- result=yes
- fi
- else
- result=$wxUSE_OPTIMISE
- fi
-
- { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
-
-
enablestring=
defaultval=
if test -z "$defaultval"; then
BUILD=debug
fi
+if test "$wxUSE_DEBUG" = "yes"; then
+ DEFAULT_wxUSE_OPTIMISE=no
+fi
+
+
+ enablestring=disable
+ defaultval=
+ if test -z "$defaultval"; then
+ if test x"$enablestring" = xdisable; then
+ defaultval=yes
+ else
+ defaultval=no
+ fi
+ fi
+
+ { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-optimise" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-optimise... $ECHO_C" >&6; }
+ # Check whether --enable-optimise was given.
+if test "${enable_optimise+set}" = set; then
+ enableval=$enable_optimise;
+ if test "$enableval" = yes; then
+ wx_cv_use_optimise='wxUSE_OPTIMISE=yes'
+ else
+ wx_cv_use_optimise='wxUSE_OPTIMISE=no'
+ fi
+
+else
+
+ wx_cv_use_optimise='wxUSE_OPTIMISE=${'DEFAULT_wxUSE_OPTIMISE":-$defaultval}"
+
+fi
+
+
+ eval "$wx_cv_use_optimise"
+
+ if test x"$enablestring" = xdisable; then
+ if test $wxUSE_OPTIMISE = yes; then
+ result=no
+ else
+ result=yes
+ fi
+ else
+ result=$wxUSE_OPTIMISE
+ fi
+
+ { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
+
enablestring=
defaultval=
echo "${ECHO_T}$result" >&6; }
+ enablestring=
+ defaultval=$wxUSE_ALL_FEATURES
+ if test -z "$defaultval"; then
+ if test x"$enablestring" = xdisable; then
+ defaultval=yes
+ else
+ defaultval=no
+ fi
+ fi
+
+ { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-xlocale" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-xlocale... $ECHO_C" >&6; }
+ # Check whether --enable-xlocale was given.
+if test "${enable_xlocale+set}" = set; then
+ enableval=$enable_xlocale;
+ if test "$enableval" = yes; then
+ wx_cv_use_xlocale='wxUSE_XLOCALE=yes'
+ else
+ wx_cv_use_xlocale='wxUSE_XLOCALE=no'
+ fi
+
+else
+
+ wx_cv_use_xlocale='wxUSE_XLOCALE=${'DEFAULT_wxUSE_XLOCALE":-$defaultval}"
+
+fi
+
+
+ eval "$wx_cv_use_xlocale"
+
+ if test x"$enablestring" = xdisable; then
+ if test $wxUSE_XLOCALE = yes; then
+ result=no
+ else
+ result=yes
+ fi
+ else
+ result=$wxUSE_XLOCALE
+ fi
+
+ { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
+
enablestring=
defaultval=$wxUSE_ALL_FEATURES
if test -z "$defaultval"; then
echo "${ECHO_T}$result" >&6; }
- enablestring=
- defaultval=$wxUSE_ALL_FEATURES
- if test -z "$defaultval"; then
- if test x"$enablestring" = xdisable; then
- defaultval=yes
- else
- defaultval=no
- fi
- fi
-
- { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-weakref" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-weakref... $ECHO_C" >&6; }
- # Check whether --enable-weakref was given.
-if test "${enable_weakref+set}" = set; then
- enableval=$enable_weakref;
- if test "$enableval" = yes; then
- wx_cv_use_weakref='wxUSE_WEAKREF=yes'
- else
- wx_cv_use_weakref='wxUSE_WEAKREF=no'
- fi
-
-else
-
- wx_cv_use_weakref='wxUSE_WEAKREF=${'DEFAULT_wxUSE_WEAKREF":-$defaultval}"
-
-fi
-
-
- eval "$wx_cv_use_weakref"
-
- if test x"$enablestring" = xdisable; then
- if test $wxUSE_WEAKREF = yes; then
- result=no
- else
- result=yes
- fi
- else
- result=$wxUSE_WEAKREF
- fi
-
- { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
-
-
enablestring=
defaultval=$wxUSE_ALL_FEATURES
if test -z "$defaultval"; then
echo "${ECHO_T}$result" >&6; }
+ enablestring=
+ defaultval=$wxUSE_ALL_FEATURES
+ if test -z "$defaultval"; then
+ if test x"$enablestring" = xdisable; then
+ defaultval=yes
+ else
+ defaultval=no
+ fi
+ fi
+
+ { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-propgrid" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-propgrid... $ECHO_C" >&6; }
+ # Check whether --enable-propgrid was given.
+if test "${enable_propgrid+set}" = set; then
+ enableval=$enable_propgrid;
+ if test "$enableval" = yes; then
+ wx_cv_use_propgrid='wxUSE_PROPGRID=yes'
+ else
+ wx_cv_use_propgrid='wxUSE_PROPGRID=no'
+ fi
+
+else
+
+ wx_cv_use_propgrid='wxUSE_PROPGRID=${'DEFAULT_wxUSE_PROPGRID":-$defaultval}"
+
+fi
+
+
+ eval "$wx_cv_use_propgrid"
+
+ if test x"$enablestring" = xdisable; then
+ if test $wxUSE_PROPGRID = yes; then
+ result=no
+ else
+ result=yes
+ fi
+ else
+ result=$wxUSE_PROPGRID
+ fi
+
+ { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
+
enablestring=
defaultval=$wxUSE_ALL_FEATURES
if test -z "$defaultval"; then
- { echo "$as_me:$LINENO: checking if C++ compiler supports bool" >&5
-echo $ECHO_N "checking if C++ compiler supports bool... $ECHO_C" >&6; }
-if test "${wx_cv_cpp_bool+set}" = set; then
+ { echo "$as_me:$LINENO: checking if C++ compiler supports the explicit keyword" >&5
+echo $ECHO_N "checking if C++ compiler supports the explicit keyword... $ECHO_C" >&6; }
+if test "${wx_cv_explicit+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
- cat >conftest.$ac_ext <<_ACEOF
+ cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
+ class Foo { public: explicit Foo(int) {} };
int
main ()
{
- bool b = true;
-
return 0;
;
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
- wx_cv_cpp_bool=yes
-
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
- wx_cv_cpp_bool=no
-
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
- ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-fi
-{ echo "$as_me:$LINENO: result: $wx_cv_cpp_bool" >&5
-echo "${ECHO_T}$wx_cv_cpp_bool" >&6; }
-
- if test "$wx_cv_cpp_bool" = "yes"; then
- cat >>confdefs.h <<\_ACEOF
-#define HAVE_BOOL 1
-_ACEOF
-
- fi
-
-
-
- { echo "$as_me:$LINENO: checking if C++ compiler supports the explicit keyword" >&5
-echo $ECHO_N "checking if C++ compiler supports the explicit keyword... $ECHO_C" >&6; }
-if test "${wx_cv_explicit+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
-
- ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
-
- cat >conftest.$ac_ext <<_ACEOF
+ cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
- class Foo { public: explicit Foo(int) {} };
+ class Foo { public: explicit Foo(int) {} };
+ static void TakeFoo(const Foo& foo) { }
int
main ()
{
- return 0;
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_cxx_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
-
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
- class Foo { public: explicit Foo(int) {} };
- static void TakeFoo(const Foo& foo) { }
-
-int
-main ()
-{
-
- TakeFoo(17);
- return 0;
+ TakeFoo(17);
+ return 0;
;
return 0;
fi
-{ echo "$as_me:$LINENO: checking whether the compiler supports const_cast<>" >&5
-echo $ECHO_N "checking whether the compiler supports const_cast<>... $ECHO_C" >&6; }
-if test "${ac_cv_cxx_const_cast+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
- ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-int
-main ()
-{
-int x = 0;const int& y = x;int& z = const_cast<int&>(y);return z;
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_cxx_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_cv_cxx_const_cast=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_cxx_const_cast=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_cxx_const_cast" >&5
-echo "${ECHO_T}$ac_cv_cxx_const_cast" >&6; }
-if test "$ac_cv_cxx_const_cast" = yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_CONST_CAST
-_ACEOF
-
-fi
-
-{ echo "$as_me:$LINENO: checking whether the compiler supports reinterpret_cast<>" >&5
-echo $ECHO_N "checking whether the compiler supports reinterpret_cast<>... $ECHO_C" >&6; }
-if test "${ac_cv_cxx_reinterpret_cast+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
- ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <typeinfo>
-class Base { public : Base () {} virtual void f () = 0;};
-class Derived : public Base { public : Derived () {} virtual void f () {} };
-class Unrelated { public : Unrelated () {} };
-int g (Unrelated&) { return 0; }
-int
-main ()
-{
-
-Derived d;Base& b=d;Unrelated& e=reinterpret_cast<Unrelated&>(b);return g(e);
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_cxx_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_cv_cxx_reinterpret_cast=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_cxx_reinterpret_cast=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_cxx_reinterpret_cast" >&5
-echo "${ECHO_T}$ac_cv_cxx_reinterpret_cast" >&6; }
-if test "$ac_cv_cxx_reinterpret_cast" = yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_REINTERPRET_CAST
-_ACEOF
-
-fi
-
-{ echo "$as_me:$LINENO: checking whether the compiler supports static_cast<>" >&5
-echo $ECHO_N "checking whether the compiler supports static_cast<>... $ECHO_C" >&6; }
-if test "${ac_cv_cxx_static_cast+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
- ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <typeinfo>
-class Base { public : Base () {} virtual void f () = 0; };
-class Derived : public Base { public : Derived () {} virtual void f () {} };
-int g (Derived&) { return 0; }
-int
-main ()
-{
-
-Derived d; Base& b = d; Derived& s = static_cast<Derived&> (b); return g (s);
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_cxx_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_cv_cxx_static_cast=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_cxx_static_cast=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_cxx_static_cast" >&5
-echo "${ECHO_T}$ac_cv_cxx_static_cast" >&6; }
-if test "$ac_cv_cxx_static_cast" = yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_STATIC_CAST
-_ACEOF
-
-fi
-
-
if test "x$SUNCXX" = xyes; then
CXXFLAGS="-features=tmplife $CXXFLAGS"
fi
fi
- { echo "$as_me:$LINENO: checking for hash_map" >&5
-echo $ECHO_N "checking for hash_map... $ECHO_C" >&6; }
-if test "${ac_cv_header_hash_map+set}" = set; then
+ if test "$wx_cv_class_gnuhashmapset" = yes; then
+ cat >>confdefs.h <<\_ACEOF
+#define HAVE_EXT_HASH_MAP 1
+_ACEOF
+
+ cat >>confdefs.h <<\_ACEOF
+#define HAVE_GNU_CXX_HASH_MAP 1
+_ACEOF
+
+ fi
+
+ { echo "$as_me:$LINENO: checking for unordered_map" >&5
+echo $ECHO_N "checking for unordered_map... $ECHO_C" >&6; }
+if test "${ac_cv_header_unordered_map+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#include <hash_map>
+#include <unordered_map>
_ACEOF
rm -f conftest.$ac_objext
if { (ac_try="$ac_compile"
test -z "$ac_cxx_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
- ac_cv_header_hash_map=yes
+ ac_cv_header_unordered_map=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
- ac_cv_header_hash_map=no
+ ac_cv_header_unordered_map=no
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_hash_map" >&5
-echo "${ECHO_T}$ac_cv_header_hash_map" >&6; }
-if test $ac_cv_header_hash_map = yes; then
- { echo "$as_me:$LINENO: checking for standard hash_map and hash_set" >&5
-echo $ECHO_N "checking for standard hash_map and hash_set... $ECHO_C" >&6; }
-if test "${wx_cv_class_stdhashmapset+set}" = set; then
+{ echo "$as_me:$LINENO: result: $ac_cv_header_unordered_map" >&5
+echo "${ECHO_T}$ac_cv_header_unordered_map" >&6; }
+if test $ac_cv_header_unordered_map = yes; then
+ { echo "$as_me:$LINENO: checking for unordered_map and unordered_set in std" >&5
+echo $ECHO_N "checking for unordered_map and unordered_set in std... $ECHO_C" >&6; }
+if test "${wx_cv_class_stdunorderedmapset+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-#include <hash_map>
- #include <hash_set>
+#include <unordered_map>
+ #include <unordered_set>
int
main ()
{
-std::hash_map<double*, char*, std::hash<double*>, std::equal_to<double*> > test1;
- std::hash_set<char*, std::hash<char*>, std::equal_to<char*> > test2;
+std::unordered_map<double*, char*> test1;
+ std::unordered_set<char*> test2;
;
return 0;
}
test -z "$ac_cxx_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
- wx_cv_class_stdhashmapset=yes
+ wx_cv_class_stdunorderedmapset=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
- wx_cv_class_stdhashmapset=no
+ wx_cv_class_stdunorderedmapset=no
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-{ echo "$as_me:$LINENO: result: $wx_cv_class_stdhashmapset" >&5
-echo "${ECHO_T}$wx_cv_class_stdhashmapset" >&6; }
+{ echo "$as_me:$LINENO: result: $wx_cv_class_stdunorderedmapset" >&5
+echo "${ECHO_T}$wx_cv_class_stdunorderedmapset" >&6; }
fi
- if test "$wx_cv_class_stdhashmapset" = yes; then
- cat >>confdefs.h <<\_ACEOF
-#define HAVE_HASH_MAP 1
+ if test "$wx_cv_class_stdunorderedmapset" = yes; then
+ cat >>confdefs.h <<\_ACEOF
+#define HAVE_STD_UNORDERED_MAP 1
_ACEOF
- cat >>confdefs.h <<\_ACEOF
-#define HAVE_STD_HASH_MAP 1
+ cat >>confdefs.h <<\_ACEOF
+#define HAVE_STD_UNORDERED_SET 1
_ACEOF
- fi
-
- { echo "$as_me:$LINENO: checking for ext/hash_map" >&5
-echo $ECHO_N "checking for ext/hash_map... $ECHO_C" >&6; }
-if test "${ac_cv_header_ext_hash_map+set}" = set; then
+ else
+ { echo "$as_me:$LINENO: checking for tr1/unordered_map" >&5
+echo $ECHO_N "checking for tr1/unordered_map... $ECHO_C" >&6; }
+if test "${ac_cv_header_tr1_unordered_map+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#include <ext/hash_map>
+#include <tr1/unordered_map>
_ACEOF
rm -f conftest.$ac_objext
if { (ac_try="$ac_compile"
test -z "$ac_cxx_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
- ac_cv_header_ext_hash_map=yes
+ ac_cv_header_tr1_unordered_map=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
- ac_cv_header_ext_hash_map=no
+ ac_cv_header_tr1_unordered_map=no
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_ext_hash_map" >&5
-echo "${ECHO_T}$ac_cv_header_ext_hash_map" >&6; }
-if test $ac_cv_header_ext_hash_map = yes; then
- { echo "$as_me:$LINENO: checking for GNU hash_map and hash_set" >&5
-echo $ECHO_N "checking for GNU hash_map and hash_set... $ECHO_C" >&6; }
-if test "${wx_cv_class_gnuhashmapset+set}" = set; then
+{ echo "$as_me:$LINENO: result: $ac_cv_header_tr1_unordered_map" >&5
+echo "${ECHO_T}$ac_cv_header_tr1_unordered_map" >&6; }
+if test $ac_cv_header_tr1_unordered_map = yes; then
+ { echo "$as_me:$LINENO: checking for unordered_map and unordered_set in std::tr1" >&5
+echo $ECHO_N "checking for unordered_map and unordered_set in std::tr1... $ECHO_C" >&6; }
+if test "${wx_cv_class_tr1unorderedmapset+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-#include <ext/hash_map>
- #include <ext/hash_set>
+#include <tr1/unordered_map>
+ #include <tr1/unordered_set>
int
main ()
{
-__gnu_cxx::hash_map<double*, char*, __gnu_cxx::hash<double*>, std::equal_to<double*> > test1;
- __gnu_cxx::hash_set<char*, __gnu_cxx::hash<char*>, std::equal_to<char*> > test2;
+std::tr1::unordered_map<double*, char*> test1;
+ std::tr1::unordered_set<char*> test2;
+ #if defined(__GNUC__) && (__GNUC__==4) && (__GNUC_MINOR__<2)
+ #error can't use unordered_{map,set} with gcc-4.[01]: http://gcc.gnu.org/PR24389
+ #endif
;
return 0;
}
test -z "$ac_cxx_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
- wx_cv_class_gnuhashmapset=yes
+ wx_cv_class_tr1unorderedmapset=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
- wx_cv_class_gnuhashmapset=no
+ wx_cv_class_tr1unorderedmapset=no
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-{ echo "$as_me:$LINENO: result: $wx_cv_class_gnuhashmapset" >&5
-echo "${ECHO_T}$wx_cv_class_gnuhashmapset" >&6; }
+{ echo "$as_me:$LINENO: result: $wx_cv_class_tr1unorderedmapset" >&5
+echo "${ECHO_T}$wx_cv_class_tr1unorderedmapset" >&6; }
fi
- if test "$wx_cv_class_gnuhashmapset" = yes; then
- cat >>confdefs.h <<\_ACEOF
-#define HAVE_EXT_HASH_MAP 1
+ if test "$wx_cv_class_tr1unorderedmapset" = yes; then
+ cat >>confdefs.h <<\_ACEOF
+#define HAVE_TR1_UNORDERED_MAP 1
_ACEOF
- cat >>confdefs.h <<\_ACEOF
-#define HAVE_GNU_CXX_HASH_MAP 1
+ cat >>confdefs.h <<\_ACEOF
+#define HAVE_TR1_UNORDERED_SET 1
+_ACEOF
+
+ else
+ { echo "$as_me:$LINENO: checking for hash_map" >&5
+echo $ECHO_N "checking for hash_map... $ECHO_C" >&6; }
+if test "${ac_cv_header_hash_map+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+
+
+#include <hash_map>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_cxx_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_cv_header_hash_map=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_header_hash_map=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_header_hash_map" >&5
+echo "${ECHO_T}$ac_cv_header_hash_map" >&6; }
+if test $ac_cv_header_hash_map = yes; then
+ { echo "$as_me:$LINENO: checking for std::hash_map and hash_set" >&5
+echo $ECHO_N "checking for std::hash_map and hash_set... $ECHO_C" >&6; }
+if test "${wx_cv_class_stdhashmapset+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <hash_map>
+ #include <hash_set>
+int
+main ()
+{
+std::hash_map<double*, char*, std::hash<double*>, std::equal_to<double*> > test1;
+ std::hash_set<char*, std::hash<char*>, std::equal_to<char*> > test2;
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_cxx_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ wx_cv_class_stdhashmapset=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ wx_cv_class_stdhashmapset=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+
+fi
+{ echo "$as_me:$LINENO: result: $wx_cv_class_stdhashmapset" >&5
+echo "${ECHO_T}$wx_cv_class_stdhashmapset" >&6; }
+fi
+
+
+
+ if test "$wx_cv_class_stdhashmapset" = yes; then
+ cat >>confdefs.h <<\_ACEOF
+#define HAVE_HASH_MAP 1
+_ACEOF
+
+ cat >>confdefs.h <<\_ACEOF
+#define HAVE_STD_HASH_MAP 1
+_ACEOF
+
+ fi
+
+ { echo "$as_me:$LINENO: checking for ext/hash_map" >&5
+echo $ECHO_N "checking for ext/hash_map... $ECHO_C" >&6; }
+if test "${ac_cv_header_ext_hash_map+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+
+#include <ext/hash_map>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_cxx_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_cv_header_ext_hash_map=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_header_ext_hash_map=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_header_ext_hash_map" >&5
+echo "${ECHO_T}$ac_cv_header_ext_hash_map" >&6; }
+if test $ac_cv_header_ext_hash_map = yes; then
+ { echo "$as_me:$LINENO: checking for GNU hash_map and hash_set" >&5
+echo $ECHO_N "checking for GNU hash_map and hash_set... $ECHO_C" >&6; }
+if test "${wx_cv_class_gnuhashmapset+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <ext/hash_map>
+ #include <ext/hash_set>
+int
+main ()
+{
+__gnu_cxx::hash_map<double*, char*, __gnu_cxx::hash<double*>, std::equal_to<double*> > test1;
+ __gnu_cxx::hash_set<char*, __gnu_cxx::hash<char*>, std::equal_to<char*> > test2;
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_cxx_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ wx_cv_class_gnuhashmapset=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ wx_cv_class_gnuhashmapset=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+
+fi
+{ echo "$as_me:$LINENO: result: $wx_cv_class_gnuhashmapset" >&5
+echo "${ECHO_T}$wx_cv_class_gnuhashmapset" >&6; }
+fi
+
+
+
+ fi
fi
fi
SEARCH_INCLUDE="\
/usr/local/include \
+ /usr/local/X11/include \
+ /usr/local/include/X11 \
+ /usr/local/X11R6/include \
+ /usr/local/include/X11R6 \
\
/usr/Motif-2.1/include \
/usr/Motif-1.2/include \
\
/usr/X11R6/include \
/usr/X11R6.4/include \
- /usr/X11R5/include \
- /usr/X11R4/include \
\
/usr/include/X11R6 \
- /usr/include/X11R5 \
- /usr/include/X11R4 \
- \
- /usr/local/X11R6/include \
- /usr/local/X11R5/include \
- /usr/local/X11R4/include \
- \
- /usr/local/include/X11R6 \
- /usr/local/include/X11R5 \
- /usr/local/include/X11R4 \
\
/usr/X11/include \
/usr/include/X11 \
- /usr/local/X11/include \
- /usr/local/include/X11 \
\
/usr/XFree86/include/X11 \
/usr/pkg/include \
\
+ /usr/local/X1R5/include \
+ /usr/local/include/X11R5 \
+ /usr/X11R5/include \
+ /usr/include/X11R5 \
+ \
+ /usr/local/X11R4/include \
+ /usr/local/include/X11R4 \
+ /usr/X11R4/include \
+ /usr/include/X11R4 \
+ \
/usr/openwin/share/include"
{ echo "$as_me:$LINENO: checking for libraries directory" >&5
+ case "${host}" in
+ x86_64-*-mingw32* )
+ LIBS="$LIBS -lwinspool -lwinmm -lshell32 -lcomctl32 -lcomdlg32 -lwctl3d32 -ladvapi32 -lwsock32 -lgdi32"
+ ;;
+ * )
LIBS="$LIBS -lwinspool -lwinmm -lshell32 -lcomctl32 -lcomdlg32 -lctl3d32 -ladvapi32 -lwsock32 -lgdi32"
-
+ ;;
+ esac
if test "$wxUSE_ACCESSIBILITY" = "yes" ; then
LIBS="$LIBS -loleacc"
fi
fi
fi
- if test "$wxUSE_MAC" = 1; then
+ if test "$wxUSE_OSX_CARBON" = 1; then
{ echo "$as_me:$LINENO: checking for compiler syntax to enable Pascal strings" >&5
echo $ECHO_N "checking for compiler syntax to enable Pascal strings... $ECHO_C" >&6; }
if test "$GCC" = yes; then
CPPFLAGS="$CPPFLAGS_PASCAL -I\${top_srcdir}/src/mac/carbon/morefilex -DTARGET_CARBON $CPPFLAGS"
fi
- TOOLKIT=MAC
- GUIDIST=MACX_DIST
+ TOOLKIT=OSX_CARBON
+ GUIDIST=OSX_CARBON_DIST
WXBASEPORT="_carbon"
fi
+ if test "$wxUSE_OSX_COCOA" = 1; then
+ TOOLKIT=OSX_COCOA
+ GUIDIST=OSX_COCOA_DIST
+ fi
+
if test "$wxUSE_COCOA" = 1; then
TOOLKIT=COCOA
GUIDIST=COCOA_DIST
{ echo "$as_me:$LINENO: WARNING: wxGLCanvas not implemented for this port, library will be compiled without it." >&5
echo "$as_me: WARNING: wxGLCanvas not implemented for this port, library will be compiled without it." >&2;}
wxUSE_OPENGL="no"
- elif test "$wxUSE_MAC" = 1 -o "$wxUSE_COCOA" = 1; then
+ elif test "$wxUSE_OSX_CARBON" = 1 -o "$wxUSE_OSX_COCOA" = 1 -o "$wxUSE_COCOA" = 1; then
OPENGL_LIBS="-framework OpenGL -framework AGL"
elif test "$wxUSE_MSW" = 1; then
OPENGL_LIBS="-lopengl32 -lglu32"
-for ac_func in snprintf vsnprintf
+
+for ac_func in snprintf vsnprintf vsscanf
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
{ echo "$as_me:$LINENO: checking for $ac_func" >&5
done
+ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+
if test "$ac_cv_func_vsnprintf" = "yes"; then
{ echo "$as_me:$LINENO: checking for vsnprintf declaration" >&5
echo $ECHO_N "checking for vsnprintf declaration... $ECHO_C" >&6; }
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
+ test -z "$ac_cxx_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
wx_cv_func_vsnprintf_decl=yes
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
+ test -z "$ac_cxx_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
wx_cv_func_broken_vsnprintf_decl=no
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
+ test -z "$ac_cxx_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
wx_cv_func_snprintf_decl=yes
fi
fi
+if test "$ac_cv_func_vsscanf" = "yes"; then
+ { echo "$as_me:$LINENO: checking for vsscanf declaration" >&5
+echo $ECHO_N "checking for vsscanf declaration... $ECHO_C" >&6; }
+if test "${wx_cv_func_vsscanf_decl+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+ #include <stdio.h>
+ #include <stdarg.h>
+ #ifdef __MSL__
+ #if __MSL__ >= 0x6000
+ namespace std {}
+ using namespace std;
+ #endif
+ #endif
+
+int
+main ()
+{
+
+ char *buf;
+ va_list args;
+ vsscanf(buf, "%s", args);
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_cxx_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ wx_cv_func_vsscanf_decl=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ wx_cv_func_vsscanf_decl=no
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+
+fi
+{ echo "$as_me:$LINENO: result: $wx_cv_func_vsscanf_decl" >&5
+echo "${ECHO_T}$wx_cv_func_vsscanf_decl" >&6; }
+
+ if test "$wx_cv_func_vsscanf_decl" = "yes"; then
+ cat >>confdefs.h <<\_ACEOF
+#define HAVE_VSSCANF_DECL 1
+_ACEOF
+
+ fi
+fi
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
if test "$wxUSE_UNICODE" = yes; then
wchar_headers="#include <stdio.h>
{ echo "$as_me:$LINENO: WARNING: wxMutex won't be recursive on this platform" >&5
echo "$as_me: WARNING: wxMutex won't be recursive on this platform" >&2;}
fi
+ fi
+
+ { echo "$as_me:$LINENO: checking for __thread keyword" >&5
+echo $ECHO_N "checking for __thread keyword... $ECHO_C" >&6; }
+if test "${wx_cv_cc___thread+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <pthread.h>
+int
+main ()
+{
+
+ static __thread int n = 0;
+ static __thread int *p = 0;
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ wx_cv_cc___thread=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ wx_cv_cc___thread=no
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+fi
+{ echo "$as_me:$LINENO: result: $wx_cv_cc___thread" >&5
+echo "${ECHO_T}$wx_cv_cc___thread" >&6; }
+
+ if test "$wx_cv_cc___thread" = "yes"; then
+ cat >>confdefs.h <<\_ACEOF
+#define HAVE___THREAD_KEYWORD 1
+_ACEOF
+
fi
fi
else
if test "$wxUSE_THREADS" = "yes" ; then
case "${host}" in
+ x86_64-*-mingw32* )
+ ;;
*-*-mingw32* )
{ echo "$as_me:$LINENO: checking if compiler supports -mthreads" >&5
echo $ECHO_N "checking if compiler supports -mthreads... $ECHO_C" >&6; }
DEBUG_CFLAGS=
if test "$wxUSE_DEBUG_INFO" = "yes" ; then
DEBUG_CFLAGS="-g"
- wxUSE_OPTIMISE=no
fi
if test "$wxUSE_DEBUG_GDB" = "yes" ; then
HAVE_DL_FUNCS=0
HAVE_SHL_FUNCS=0
if test "$wxUSE_DYNAMIC_LOADER" = "yes" -o "$wxUSE_DYNLIB_CLASS" = "yes" ; then
- if test "$USE_DARWIN" = 1; then
- HAVE_DL_FUNCS=1
- elif test "$USE_DOS" = 1; then
+ if test "$USE_DOS" = 1; then
HAVE_DL_FUNCS=0
else
done
- if test "$HAVE_DL_FUNCS" = 1; then
+ if test "$HAVE_DL_FUNCS" = 1; then
for ac_func in dlerror
do
else
- { echo "$as_me:$LINENO: checking for dlerror in -ldl" >&5
+ { echo "$as_me:$LINENO: checking for dlerror in -ldl" >&5
echo $ECHO_N "checking for dlerror in -ldl... $ECHO_C" >&6; }
if test "${ac_cv_lib_dl_dlerror+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
fi
done
+ fi
fi
+
+ if test "$USE_DARWIN" = 1; then
+ HAVE_DL_FUNCS=1
fi
if test "$HAVE_DL_FUNCS" = 0; then
fi
fi
+if test "$wxUSE_XLOCALE" == "yes" ; then
+ cat >>confdefs.h <<\_ACEOF
+#define wxUSE_XLOCALE 1
+_ACEOF
+
+ { echo "$as_me:$LINENO: checking for locale_t" >&5
+echo $ECHO_N "checking for locale_t... $ECHO_C" >&6; }
+if test "${ac_cv_type_locale_t+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <xlocale.h>
+ #include <locale.h>
+
+typedef locale_t ac__type_new_;
+int
+main ()
+{
+if ((ac__type_new_ *) 0)
+ return 0;
+if (sizeof (ac__type_new_))
+ return 0;
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_cv_type_locale_t=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_type_locale_t=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_type_locale_t" >&5
+echo "${ECHO_T}$ac_cv_type_locale_t" >&6; }
+if test $ac_cv_type_locale_t = yes; then
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_LOCALE_T 1
+_ACEOF
+
+
+fi
+
+fi
+
if test "$wxUSE_LOG" = "yes"; then
cat >>confdefs.h <<\_ACEOF
#define wxUSE_LOG 1
fi
-if test "$wxUSE_WEAKREF" = "yes"; then
- cat >>confdefs.h <<\_ACEOF
-#define wxUSE_WEAKREF 1
-_ACEOF
-
-fi
-
if test "$wxUSE_FS_INET" = "yes"; then
cat >>confdefs.h <<\_ACEOF
#define wxUSE_FS_INET 1
if test "$TOOLKIT" = "MSW"; then
wxUSE_JOYSTICK=yes
- elif test "$TOOLKIT" = "MAC" -o "$TOOLKIT" = "COCOA"; then
+ elif test "$TOOLKIT" = "OSX" -o "$TOOLKIT" = "COCOA"; then
if test "$USE_DARWIN" = 1; then
{ echo "$as_me:$LINENO: checking headers have declarations needed for joystick support" >&5
echo $ECHO_N "checking headers have declarations needed for joystick support... $ECHO_C" >&6; }
_ACEOF
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS docview"
- if test "$wxUSE_MDI_ARCHITECTURE" = "yes"; then
- SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS docvwmdi"
- fi
fi
if test "$wxUSE_HELP" = "yes"; then
USES_CONTROLS=1
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS text"
+
+ cat >>confdefs.h <<\_ACEOF
+#define wxUSE_RICHEDIT 1
+_ACEOF
+
+ cat >>confdefs.h <<\_ACEOF
+#define wxUSE_RICHEDIT2 1
+_ACEOF
+
fi
if test "$wxUSE_TOGGLEBTN" = "yes"; then
USE_HTML=1
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS html html/about html/help html/helpview html/printing html/test html/virtual html/widget html/zip htlbox"
- if test "$wxUSE_MAC" = 1; then
- SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS html/htmlctrl"
- fi
fi
if test "$wxUSE_WEBKIT" = "yes"; then
if test "$wxUSE_MAC" = 1 -a "$USE_DARWIN" = 1; then
else
wxUSE_WEBKIT=no
fi
+ if test "$wxUSE_WEBKIT" = "yes"; then
+ SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS html/htmlctrl"
+ fi
fi
USE_XRC=0
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS aui"
fi
+USE_PROPGRID=0
+if test "$wxUSE_PROPGRID" = "yes"; then
+ cat >>confdefs.h <<\_ACEOF
+#define wxUSE_PROPGRID 1
+_ACEOF
+
+ USE_PROPGRID=1
+ SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS propgrid"
+fi
+
USE_STC=0
if test "$wxUSE_STC" = "yes"; then
cat >>confdefs.h <<\_ACEOF
fi
+if test "$wxUSE_MAC" = 1; then
+ wxUSE_GRAPHICS_CONTEXT="yes"
+fi
+
if test "$wxUSE_GRAPHICS_CONTEXT" = "yes"; then
if test "$wxUSE_MAC" = 1 -o "$wxUSE_COCOA" = 1; then
cat >>confdefs.h <<\_ACEOF
if test "$wxUSE_AUI" = "yes" ; then
BUILT_WX_LIBS="aui $BUILT_WX_LIBS"
fi
+ if test "$wxUSE_PROPGRID" = "yes" ; then
+ BUILT_WX_LIBS="propgrid $BUILT_WX_LIBS"
+ fi
+ if test "$wxUSE_RICHTEXT" = "yes" ; then
+ BUILT_WX_LIBS="richtext $BUILT_WX_LIBS"
+ fi
if test "$wxUSE_STC" = "yes" ; then
BUILT_WX_LIBS="stc $BUILT_WX_LIBS"
fi
if test "$wxUSE_SOUND" = "yes" || test "$wxUSE_MEDIACTRL" = "yes"; then
if test "$USE_DARWIN" = 1; then
LDFLAGS="$LDFLAGS -framework QuickTime"
- else
- LDFLAGS="$LDFLAGS -lQuickTimeLib"
fi
fi
if test "$USE_DARWIN" = 1; then
- LDFLAGS="$LDFLAGS -framework IOKit -framework Carbon -framework Cocoa -framework System"
- else
- LDFLAGS="$LDFLAGS -lCarbonLib"
+ LDFLAGS="$LDFLAGS -framework IOKit -framework Carbon -framework Cocoa -framework AudioToolbox -framework System -framework OpenGL"
fi
fi
if test "$wxUSE_COCOA" = 1 ; then
-TOOLKIT_LOWERCASE=`echo $TOOLKIT | tr '[A-Z]' '[a-z]'`
+TOOLKIT_LOWERCASE=xxx
+if test "$TOOLKIT" = "MAC"; then
+ TOOLKIT_LOWERCASE=osx
+fi
+if test "$TOOLKIT" = "OSX_CARBON"; then
+ TOOLKIT_LOWERCASE=osx
+fi
+if test "$TOOLKIT" = "OSX_COCOA"; then
+ TOOLKIT_LOWERCASE=osx
+fi
+if test "$TOOLKIT_LOWERCASE" = "xxx"; then
+ TOOLKIT_LOWERCASE=`echo $TOOLKIT | tr '[A-Z]' '[a-z]'`
+fi
PLATFORM_BEOS=1
;;
* )
- ;;
+ ;;
esac
fi
# Permission is given to use this file in any way.
DEPSMODE=${DEPSMODE}
-DEPSDIR=.deps
DEPSFLAG="${DEPSFLAG}"
-
-mkdir -p ${D}DEPSDIR
+DEPSDIRBASE=.deps
if test ${D}DEPSMODE = gcc ; then
${D}* ${D}{DEPSFLAG}
esac
shift
done
+ objfilebase=\`basename ${D}objfile\`
+ builddir=\`dirname ${D}objfile\`
depfile=\`basename ${D}srcfile | sed -e 's/\\..*${D}/.d/g'\`
depobjname=\`echo ${D}depfile |sed -e 's/\\.d/.o/g'\`
+ depsdir=${D}builddir/${D}DEPSDIRBASE
+ mkdir -p ${D}depsdir
# if the compiler failed, we're done:
if test ${D}{status} != 0 ; then
# move created file to the location we want it in:
if test -f ${D}depfile ; then
- sed -e "s,${D}depobjname:,${D}objfile:,g" ${D}depfile >${D}{DEPSDIR}/${D}{objfile}.d
+ sed -e "s,${D}depobjname:,${D}objfile:,g" ${D}depfile >${D}{depsdir}/${D}{objfilebase}.d
rm -f ${D}depfile
else
# "g++ -MMD -o fooobj.o foosrc.cpp" produces fooobj.d
- depfile=\`basename ${D}objfile | sed -e 's/\\..*${D}/.d/g'\`
+ depfile=\`echo "${D}objfile" | sed -e 's/\\..*${D}/.d/g'\`
if test ! -f ${D}depfile ; then
# "cxx -MD -o fooobj.o foosrc.cpp" creates fooobj.o.d (Compaq C++)
depfile="${D}objfile.d"
fi
if test -f ${D}depfile ; then
- sed -e "/^${D}objfile/!s,${D}depobjname:,${D}objfile:,g" ${D}depfile >${D}{DEPSDIR}/${D}{objfile}.d
+ sed -e "\\,^${D}objfile,!s,${D}depobjname:,${D}objfile:,g" ${D}depfile >${D}{depsdir}/${D}{objfilebase}.d
rm -f ${D}depfile
fi
fi
exit 0
+
elif test ${D}DEPSMODE = mwcc ; then
${D}* || exit ${D}?
# Run mwcc again with -MM and redirect into the dep file we want
fi
prevarg="${D}arg"
done
- ${D}* ${D}DEPSFLAG >${D}{DEPSDIR}/${D}{objfile}.d
+
+ objfilebase=\`basename ${D}objfile\`
+ builddir=\`dirname ${D}objfile\`
+ depsdir=${D}builddir/${D}DEPSDIRBASE
+ mkdir -p ${D}depsdir
+
+ ${D}* ${D}DEPSFLAG >${D}{depsdir}/${D}{objfilebase}.d
exit 0
+
elif test ${D}DEPSMODE = unixcc; then
${D}* || exit ${D}?
# Run compiler again with deps flag and redirect into the dep file.
esac
shift
done
- eval "${D}cmd ${D}DEPSFLAG" | sed "s|.*:|${D}objfile:|" >${D}{DEPSDIR}/${D}{objfile}.d
+
+ objfilebase=\`basename ${D}objfile\`
+ builddir=\`dirname ${D}objfile\`
+ depsdir=${D}builddir/${D}DEPSDIRBASE
+ mkdir -p ${D}depsdir
+
+ eval "${D}cmd ${D}DEPSFLAG" | sed "s|.*:|${D}objfile:|" >${D}{DEPSDIR}/${D}{objfilebase}.d
exit 0
+
else
${D}*
exit ${D}?
- BAKEFILE_BAKEFILE_M4_VERSION="0.2.3"
-BAKEFILE_AUTOCONF_INC_M4_VERSION="0.2.3"
+
+ BAKEFILE_BAKEFILE_M4_VERSION="0.2.5"
+
+
+BAKEFILE_AUTOCONF_INC_M4_VERSION="0.2.5"
shift
shift
+builddir=\`echo ${D}outfile | sed -e 's,/\\.pch/.*${D},,g'\`
+
compiler=""
headerfile=""
else
mkdir -p \`dirname ${D}{outfile}\`
fi
- depsfile=".deps/\`echo ${D}{outfile} | tr '/.' '__'\`.d"
- mkdir -p .deps
+ depsfile="${D}{builddir}/.deps/\`echo ${D}{outfile} | tr '/.' '__'\`.d"
+ mkdir -p ${D}{builddir}/.deps
if test "x${GCC_PCH}" = "x1" ; then
# can do this because gcc is >= 3.4:
${D}{compiler} -o ${D}{outfile} -MMD -MF "${D}{depsfile}" "${D}{headerfile}"
COND_BUILD_RELEASE_UNICODE_1=""
fi
+ COND_BUILD_debug="#"
+ if test "x$BUILD" = "xdebug" ; then
+ COND_BUILD_debug=""
+ fi
+
+ COND_BUILD_debug_DEBUG_FLAG_default="#"
+ if test "x$BUILD" = "xdebug" -a "x$DEBUG_FLAG" = "xdefault" ; then
+ COND_BUILD_debug_DEBUG_FLAG_default=""
+ fi
+
+ COND_BUILD_debug_DEBUG_INFO_default="#"
+ if test "x$BUILD" = "xdebug" -a "x$DEBUG_INFO" = "xdefault" ; then
+ COND_BUILD_debug_DEBUG_INFO_default=""
+ fi
+
+ COND_BUILD_debug_UNICODE_0="#"
+ if test "x$BUILD" = "xdebug" -a "x$UNICODE" = "x0" ; then
+ COND_BUILD_debug_UNICODE_0=""
+ fi
+
+ COND_BUILD_debug_UNICODE_1="#"
+ if test "x$BUILD" = "xdebug" -a "x$UNICODE" = "x1" ; then
+ COND_BUILD_debug_UNICODE_1=""
+ fi
+
+ COND_BUILD_release="#"
+ if test "x$BUILD" = "xrelease" ; then
+ COND_BUILD_release=""
+ fi
+
+ COND_BUILD_release_DEBUG_INFO_default="#"
+ if test "x$BUILD" = "xrelease" -a "x$DEBUG_INFO" = "xdefault" ; then
+ COND_BUILD_release_DEBUG_INFO_default=""
+ fi
+
+ COND_BUILD_release_UNICODE_0="#"
+ if test "x$BUILD" = "xrelease" -a "x$UNICODE" = "x0" ; then
+ COND_BUILD_release_UNICODE_0=""
+ fi
+
+ COND_BUILD_release_UNICODE_1="#"
+ if test "x$BUILD" = "xrelease" -a "x$UNICODE" = "x1" ; then
+ COND_BUILD_release_UNICODE_1=""
+ fi
+
COND_DEBUG_FLAG_1="#"
if test "x$DEBUG_FLAG" = "x1" ; then
COND_DEBUG_FLAG_1=""
COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_QA_1=""
fi
+ COND_MONOLITHIC_0_SHARED_0_USE_PROPGRID_1="#"
+ if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x0" -a "x$USE_PROPGRID" = "x1" ; then
+ COND_MONOLITHIC_0_SHARED_0_USE_PROPGRID_1=""
+ fi
+
COND_MONOLITHIC_0_SHARED_0_USE_RICHTEXT_1="#"
if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x0" -a "x$USE_RICHTEXT" = "x1" ; then
COND_MONOLITHIC_0_SHARED_0_USE_RICHTEXT_1=""
COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1=""
fi
+ COND_MONOLITHIC_0_SHARED_1_USE_PROPGRID_1="#"
+ if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x1" -a "x$USE_PROPGRID" = "x1" ; then
+ COND_MONOLITHIC_0_SHARED_1_USE_PROPGRID_1=""
+ fi
+
COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1="#"
if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x1" -a "x$USE_RICHTEXT" = "x1" ; then
COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1=""
COND_MONOLITHIC_0_USE_MEDIA_1=""
fi
+ COND_MONOLITHIC_0_USE_PROPGRID_1="#"
+ if test "x$MONOLITHIC" = "x0" -a "x$USE_PROPGRID" = "x1" ; then
+ COND_MONOLITHIC_0_USE_PROPGRID_1=""
+ fi
+
COND_MONOLITHIC_0_USE_QA_1="#"
if test "x$MONOLITHIC" = "x0" -a "x$USE_QA" = "x1" ; then
COND_MONOLITHIC_0_USE_QA_1=""
COND_PLATFORM_MACOSX_1=""
fi
- COND_PLATFORM_MACOSX_1_TOOLKIT_="#"
- if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "x" ; then
- COND_PLATFORM_MACOSX_1_TOOLKIT_=""
- fi
-
- COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA="#"
- if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xCOCOA" ; then
- COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA=""
+ COND_PLATFORM_MACOSX_1_PLATFORM_MSDOS_0="#"
+ if test "x$PLATFORM_MACOSX" = "x1" -a "x$PLATFORM_MSDOS" = "x0" ; then
+ COND_PLATFORM_MACOSX_1_PLATFORM_MSDOS_0=""
fi
- COND_PLATFORM_MACOSX_1_TOOLKIT_GTK="#"
- if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xGTK" ; then
- COND_PLATFORM_MACOSX_1_TOOLKIT_GTK=""
+ COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1="#"
+ if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xOSX_CARBON" -a "x$USE_GUI" = "x1" ; then
+ COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1=""
fi
- COND_PLATFORM_MACOSX_1_TOOLKIT_MAC="#"
- if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xMAC" ; then
- COND_PLATFORM_MACOSX_1_TOOLKIT_MAC=""
+ COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0="#"
+ if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xOSX_CARBON" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then
+ COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0=""
fi
- COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1="#"
- if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xMAC" -a "x$USE_GUI" = "x1" ; then
- COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1=""
+ COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1="#"
+ if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xOSX_COCOA" -a "x$USE_GUI" = "x1" ; then
+ COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1=""
fi
- COND_PLATFORM_MACOSX_1_TOOLKIT_MOTIF="#"
- if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xMOTIF" ; then
- COND_PLATFORM_MACOSX_1_TOOLKIT_MOTIF=""
- fi
-
- COND_PLATFORM_MACOSX_1_TOOLKIT_X11="#"
- if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xX11" ; then
- COND_PLATFORM_MACOSX_1_TOOLKIT_X11=""
+ COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0="#"
+ if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xOSX_COCOA" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then
+ COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0=""
fi
COND_PLATFORM_MACOSX_1_USE_GUI_1="#"
COND_PLATFORM_MACOSX_1_USE_GUI_1=""
fi
+ COND_PLATFORM_MACOSX_1_USE_OPENGL_1="#"
+ if test "x$PLATFORM_MACOSX" = "x1" -a "x$USE_OPENGL" = "x1" ; then
+ COND_PLATFORM_MACOSX_1_USE_OPENGL_1=""
+ fi
+
COND_PLATFORM_MACOSX_1_USE_SOVERSION_1="#"
if test "x$PLATFORM_MACOSX" = "x1" -a "x$USE_SOVERSION" = "x1" ; then
COND_PLATFORM_MACOSX_1_USE_SOVERSION_1=""
COND_SHARED_0_USE_GUI_1_USE_OPENGL_1=""
fi
- COND_SHARED_0_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN="#"
+ COND_SHARED_0_USE_GUI_1_wxUSE_LIBJPEG_builtin="#"
if test "x$SHARED" = "x0" -a "x$USE_GUI" = "x1" -a "x$wxUSE_LIBJPEG" = "xbuiltin" ; then
- COND_SHARED_0_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN=""
+ COND_SHARED_0_USE_GUI_1_wxUSE_LIBJPEG_builtin=""
fi
- COND_SHARED_0_USE_GUI_1_WXUSE_LIBPNG_BUILTIN="#"
+ COND_SHARED_0_USE_GUI_1_wxUSE_LIBPNG_builtin="#"
if test "x$SHARED" = "x0" -a "x$USE_GUI" = "x1" -a "x$wxUSE_LIBPNG" = "xbuiltin" ; then
- COND_SHARED_0_USE_GUI_1_WXUSE_LIBPNG_BUILTIN=""
+ COND_SHARED_0_USE_GUI_1_wxUSE_LIBPNG_builtin=""
fi
- COND_SHARED_0_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN="#"
+ COND_SHARED_0_USE_GUI_1_wxUSE_LIBTIFF_builtin="#"
if test "x$SHARED" = "x0" -a "x$USE_GUI" = "x1" -a "x$wxUSE_LIBTIFF" = "xbuiltin" ; then
- COND_SHARED_0_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN=""
+ COND_SHARED_0_USE_GUI_1_wxUSE_LIBTIFF_builtin=""
fi
COND_SHARED_0_USE_STC_1="#"
COND_SHARED_0_USE_STC_1=""
fi
- COND_SHARED_0_WXUSE_EXPAT_BUILTIN="#"
+ COND_SHARED_0_wxUSE_EXPAT_builtin="#"
if test "x$SHARED" = "x0" -a "x$wxUSE_EXPAT" = "xbuiltin" ; then
- COND_SHARED_0_WXUSE_EXPAT_BUILTIN=""
+ COND_SHARED_0_wxUSE_EXPAT_builtin=""
fi
- COND_SHARED_0_WXUSE_REGEX_BUILTIN="#"
+ COND_SHARED_0_wxUSE_REGEX_builtin="#"
if test "x$SHARED" = "x0" -a "x$wxUSE_REGEX" = "xbuiltin" ; then
- COND_SHARED_0_WXUSE_REGEX_BUILTIN=""
+ COND_SHARED_0_wxUSE_REGEX_builtin=""
fi
- COND_SHARED_0_WXUSE_ZLIB_BUILTIN="#"
+ COND_SHARED_0_wxUSE_ZLIB_builtin="#"
if test "x$SHARED" = "x0" -a "x$wxUSE_ZLIB" = "xbuiltin" ; then
- COND_SHARED_0_WXUSE_ZLIB_BUILTIN=""
+ COND_SHARED_0_wxUSE_ZLIB_builtin=""
fi
COND_SHARED_1="#"
COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0=""
fi
- COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_WXUNIV_0="#"
- if test "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x2" -a "x$WXUNIV" = "x0" ; then
- COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_WXUNIV_0=""
- fi
-
COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1="#"
if test "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x" -a "x$USE_GUI" = "x1" ; then
COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1=""
COND_TOOLKIT_MAC=""
fi
- COND_TOOLKIT_MAC_USE_GUI_1="#"
- if test "x$TOOLKIT" = "xMAC" -a "x$USE_GUI" = "x1" ; then
- COND_TOOLKIT_MAC_USE_GUI_1=""
- fi
-
- COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0="#"
- if test "x$TOOLKIT" = "xMAC" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then
- COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0=""
- fi
-
COND_TOOLKIT_MGL="#"
if test "x$TOOLKIT" = "xMGL" ; then
COND_TOOLKIT_MGL=""
COND_TOOLKIT_MSW_WXUNIV_0=""
fi
+ COND_TOOLKIT_OSX_CARBON="#"
+ if test "x$TOOLKIT" = "xOSX_CARBON" ; then
+ COND_TOOLKIT_OSX_CARBON=""
+ fi
+
+ COND_TOOLKIT_OSX_CARBON_USE_GUI_1="#"
+ if test "x$TOOLKIT" = "xOSX_CARBON" -a "x$USE_GUI" = "x1" ; then
+ COND_TOOLKIT_OSX_CARBON_USE_GUI_1=""
+ fi
+
+ COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0="#"
+ if test "x$TOOLKIT" = "xOSX_CARBON" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then
+ COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0=""
+ fi
+
+ COND_TOOLKIT_OSX_COCOA="#"
+ if test "x$TOOLKIT" = "xOSX_COCOA" ; then
+ COND_TOOLKIT_OSX_COCOA=""
+ fi
+
+ COND_TOOLKIT_OSX_COCOA_USE_GUI_1="#"
+ if test "x$TOOLKIT" = "xOSX_COCOA" -a "x$USE_GUI" = "x1" ; then
+ COND_TOOLKIT_OSX_COCOA_USE_GUI_1=""
+ fi
+
+ COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0="#"
+ if test "x$TOOLKIT" = "xOSX_COCOA" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then
+ COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0=""
+ fi
+
+ COND_TOOLKIT_OSX_IPHONE="#"
+ if test "x$TOOLKIT" = "xOSX_IPHONE" ; then
+ COND_TOOLKIT_OSX_IPHONE=""
+ fi
+
COND_TOOLKIT_PM="#"
if test "x$TOOLKIT" = "xPM" ; then
COND_TOOLKIT_PM=""
COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN=""
fi
+ COND_USE_GUI_1_wxUSE_LIBJPEG_builtin="#"
+ if test "x$USE_GUI" = "x1" -a "x$wxUSE_LIBJPEG" = "xbuiltin" ; then
+ COND_USE_GUI_1_wxUSE_LIBJPEG_builtin=""
+ fi
+
+ COND_USE_GUI_1_wxUSE_LIBPNG_builtin="#"
+ if test "x$USE_GUI" = "x1" -a "x$wxUSE_LIBPNG" = "xbuiltin" ; then
+ COND_USE_GUI_1_wxUSE_LIBPNG_builtin=""
+ fi
+
+ COND_USE_GUI_1_wxUSE_LIBTIFF_builtin="#"
+ if test "x$USE_GUI" = "x1" -a "x$wxUSE_LIBTIFF" = "xbuiltin" ; then
+ COND_USE_GUI_1_wxUSE_LIBTIFF_builtin=""
+ fi
+
COND_USE_OPENGL_1="#"
if test "x$USE_OPENGL" = "x1" ; then
COND_USE_OPENGL_1=""
COND_WXUSE_ZLIB_BUILTIN=""
fi
+ COND_wxUSE_EXPAT_builtin="#"
+ if test "x$wxUSE_EXPAT" = "xbuiltin" ; then
+ COND_wxUSE_EXPAT_builtin=""
+ fi
+
+ COND_wxUSE_LIBJPEG_builtin="#"
+ if test "x$wxUSE_LIBJPEG" = "xbuiltin" ; then
+ COND_wxUSE_LIBJPEG_builtin=""
+ fi
+
+ COND_wxUSE_LIBPNG_builtin="#"
+ if test "x$wxUSE_LIBPNG" = "xbuiltin" ; then
+ COND_wxUSE_LIBPNG_builtin=""
+ fi
+
+ COND_wxUSE_LIBTIFF_builtin="#"
+ if test "x$wxUSE_LIBTIFF" = "xbuiltin" ; then
+ COND_wxUSE_LIBTIFF_builtin=""
+ fi
+
+ COND_wxUSE_REGEX_builtin="#"
+ if test "x$wxUSE_REGEX" = "xbuiltin" ; then
+ COND_wxUSE_REGEX_builtin=""
+ fi
+
+ COND_wxUSE_ZLIB_builtin="#"
+ if test "x$wxUSE_ZLIB" = "xbuiltin" ; then
+ COND_wxUSE_ZLIB_builtin=""
+ fi
+
if test "$BAKEFILE_AUTOCONF_INC_M4_VERSION" = "" ; then
MACSETFILE="\$(SETFILE)"
- if test "$wxUSE_MAC" = 1; then
+ if test "$wxUSE_OSX_CARBON" = 1; then
POSTLINK_COMMAND="\$(REZ) -d __DARWIN__ -t APPL Carbon.r -o"
RESCOMP="$REZ"
WXCONFIG_RESFLAGS="-d __DARWIN__ -t APPL Carbon.r -o"
CFLAGS="$CFLAGS $CFLAGS_VISIBILITY"
CXXFLAGS="$CXXFLAGS $CXXFLAGS_VISIBILITY"
+OBJCFLAGS="$OBJCFLAGS $CFLAGS_VISIBILITY"
+OBJCXXFLAGS="$OBJCXXFLAGS $CXXFLAGS_VISIBILITY"
SAMPLES_SUBDIRS="`echo $SAMPLES_SUBDIRS | tr -s ' ' | tr ' ' '\n' | sort | uniq | tr '\n' ' '| tr -d '\r'`"
ac_config_files="$ac_config_files lib/wx/config/inplace-${TOOLCHAIN_FULLNAME}:wx-config-inplace.in"
+ac_config_files="$ac_config_files utils/ifacecheck/rungccxml.sh"
+
+
if test "$wx_cv_version_script" = "yes"; then
ac_config_files="$ac_config_files version-script"
makefiles=`(cd $srcdir ; find $subdir -name Makefile.in) | $EGREP -v "$disabled"`
fi
else
- if test ${subdir} = "samples"; then
+ if test ${subdir} = "samples"; then
makefiles="samples/Makefile.in $makefiles"
for sample in `echo $SAMPLES_SUBDIRS`; do
if test -d $srcdir/samples/$sample; then
done
elif test ${subdir} = "utils"; then
makefiles=""
- for util in HelpGen tex2rtf ; do
+ for util in ifacecheck ; do
if test -d $srcdir/utils/$util ; then
- makefiles="utils/$util/Makefile.in \
- utils/$util/src/Makefile.in \
+ makefiles="utils/$util/src/Makefile.in \
$makefiles"
fi
done
"rcdefs.h") CONFIG_COMMANDS="$CONFIG_COMMANDS rcdefs.h" ;;
"lib/wx/config/${TOOLCHAIN_FULLNAME}") CONFIG_FILES="$CONFIG_FILES lib/wx/config/${TOOLCHAIN_FULLNAME}:wx-config.in" ;;
"lib/wx/config/inplace-${TOOLCHAIN_FULLNAME}") CONFIG_FILES="$CONFIG_FILES lib/wx/config/inplace-${TOOLCHAIN_FULLNAME}:wx-config-inplace.in" ;;
+ "utils/ifacecheck/rungccxml.sh") CONFIG_FILES="$CONFIG_FILES utils/ifacecheck/rungccxml.sh" ;;
"version-script") CONFIG_FILES="$CONFIG_FILES version-script" ;;
"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
"wx-config") CONFIG_COMMANDS="$CONFIG_COMMANDS wx-config" ;;
WINDRES!$WINDRES$ac_delim
REZ!$REZ$ac_delim
SETFILE!$SETFILE$ac_delim
+OBJCXXFLAGS!$OBJCXXFLAGS$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
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
+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
COND_BUILD_DEBUG_UNICODE_0!$COND_BUILD_DEBUG_UNICODE_0$ac_delim
COND_BUILD_RELEASE_DEBUG_INFO_DEFAULT!$COND_BUILD_RELEASE_DEBUG_INFO_DEFAULT$ac_delim
COND_BUILD_RELEASE_UNICODE_0!$COND_BUILD_RELEASE_UNICODE_0$ac_delim
COND_BUILD_RELEASE_UNICODE_1!$COND_BUILD_RELEASE_UNICODE_1$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
+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
+COND_BUILD_release_DEBUG_INFO_default!$COND_BUILD_release_DEBUG_INFO_default$ac_delim
+COND_BUILD_release_UNICODE_0!$COND_BUILD_release_UNICODE_0$ac_delim
+COND_BUILD_release_UNICODE_1!$COND_BUILD_release_UNICODE_1$ac_delim
COND_DEBUG_FLAG_1!$COND_DEBUG_FLAG_1$ac_delim
COND_DEBUG_INFO_0!$COND_DEBUG_INFO_0$ac_delim
COND_DEBUG_INFO_1!$COND_DEBUG_INFO_1$ac_delim
COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_HTML_1!$COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_HTML_1$ac_delim
COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_MEDIA_1!$COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_MEDIA_1$ac_delim
COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_QA_1!$COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_QA_1$ac_delim
+COND_MONOLITHIC_0_SHARED_0_USE_PROPGRID_1!$COND_MONOLITHIC_0_SHARED_0_USE_PROPGRID_1$ac_delim
COND_MONOLITHIC_0_SHARED_0_USE_RICHTEXT_1!$COND_MONOLITHIC_0_SHARED_0_USE_RICHTEXT_1$ac_delim
COND_MONOLITHIC_0_SHARED_0_USE_STC_1!$COND_MONOLITHIC_0_SHARED_0_USE_STC_1$ac_delim
COND_MONOLITHIC_0_SHARED_0_USE_XRC_1!$COND_MONOLITHIC_0_SHARED_0_USE_XRC_1$ac_delim
COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1!$COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1$ac_delim
COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1!$COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1$ac_delim
COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1!$COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1$ac_delim
+COND_MONOLITHIC_0_SHARED_1_USE_PROPGRID_1!$COND_MONOLITHIC_0_SHARED_1_USE_PROPGRID_1$ac_delim
COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1!$COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1$ac_delim
COND_MONOLITHIC_0_SHARED_1_USE_STC_1!$COND_MONOLITHIC_0_SHARED_1_USE_STC_1$ac_delim
COND_MONOLITHIC_0_SHARED_1_USE_XRC_1!$COND_MONOLITHIC_0_SHARED_1_USE_XRC_1$ac_delim
COND_MONOLITHIC_0_USE_GUI_1_USE_MEDIA_1!$COND_MONOLITHIC_0_USE_GUI_1_USE_MEDIA_1$ac_delim
COND_MONOLITHIC_0_USE_HTML_1!$COND_MONOLITHIC_0_USE_HTML_1$ac_delim
COND_MONOLITHIC_0_USE_MEDIA_1!$COND_MONOLITHIC_0_USE_MEDIA_1$ac_delim
+COND_MONOLITHIC_0_USE_PROPGRID_1!$COND_MONOLITHIC_0_USE_PROPGRID_1$ac_delim
COND_MONOLITHIC_0_USE_QA_1!$COND_MONOLITHIC_0_USE_QA_1$ac_delim
COND_MONOLITHIC_0_USE_RICHTEXT_1!$COND_MONOLITHIC_0_USE_RICHTEXT_1$ac_delim
COND_MONOLITHIC_0_USE_STC_1!$COND_MONOLITHIC_0_USE_STC_1$ac_delim
COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1!$COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1$ac_delim
COND_PLATFORM_MACOSX_0_USE_SOVERSION_1!$COND_PLATFORM_MACOSX_0_USE_SOVERSION_1$ac_delim
COND_PLATFORM_MACOSX_1!$COND_PLATFORM_MACOSX_1$ac_delim
-COND_PLATFORM_MACOSX_1_TOOLKIT_!$COND_PLATFORM_MACOSX_1_TOOLKIT_$ac_delim
-COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA!$COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA$ac_delim
-COND_PLATFORM_MACOSX_1_TOOLKIT_GTK!$COND_PLATFORM_MACOSX_1_TOOLKIT_GTK$ac_delim
-COND_PLATFORM_MACOSX_1_TOOLKIT_MAC!$COND_PLATFORM_MACOSX_1_TOOLKIT_MAC$ac_delim
-COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1!$COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1$ac_delim
-COND_PLATFORM_MACOSX_1_TOOLKIT_MOTIF!$COND_PLATFORM_MACOSX_1_TOOLKIT_MOTIF$ac_delim
-COND_PLATFORM_MACOSX_1_TOOLKIT_X11!$COND_PLATFORM_MACOSX_1_TOOLKIT_X11$ac_delim
+COND_PLATFORM_MACOSX_1_PLATFORM_MSDOS_0!$COND_PLATFORM_MACOSX_1_PLATFORM_MSDOS_0$ac_delim
+COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1!$COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1$ac_delim
+COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0!$COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0$ac_delim
+COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1!$COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1$ac_delim
+COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0!$COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0$ac_delim
COND_PLATFORM_MACOSX_1_USE_GUI_1!$COND_PLATFORM_MACOSX_1_USE_GUI_1$ac_delim
+COND_PLATFORM_MACOSX_1_USE_OPENGL_1!$COND_PLATFORM_MACOSX_1_USE_OPENGL_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_0!$COND_PLATFORM_MAC_0$ac_delim
COND_SHARED_0_TOOLKIT_MSW_WXUNIV_0!$COND_SHARED_0_TOOLKIT_MSW_WXUNIV_0$ac_delim
COND_SHARED_0_TOOLKIT_PM_WXUNIV_0!$COND_SHARED_0_TOOLKIT_PM_WXUNIV_0$ac_delim
COND_SHARED_0_USE_GUI_1_USE_OPENGL_1!$COND_SHARED_0_USE_GUI_1_USE_OPENGL_1$ac_delim
-COND_SHARED_0_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN!$COND_SHARED_0_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN$ac_delim
-COND_SHARED_0_USE_GUI_1_WXUSE_LIBPNG_BUILTIN!$COND_SHARED_0_USE_GUI_1_WXUSE_LIBPNG_BUILTIN$ac_delim
-COND_SHARED_0_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN!$COND_SHARED_0_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN$ac_delim
+COND_SHARED_0_USE_GUI_1_wxUSE_LIBJPEG_builtin!$COND_SHARED_0_USE_GUI_1_wxUSE_LIBJPEG_builtin$ac_delim
+COND_SHARED_0_USE_GUI_1_wxUSE_LIBPNG_builtin!$COND_SHARED_0_USE_GUI_1_wxUSE_LIBPNG_builtin$ac_delim
+COND_SHARED_0_USE_GUI_1_wxUSE_LIBTIFF_builtin!$COND_SHARED_0_USE_GUI_1_wxUSE_LIBTIFF_builtin$ac_delim
COND_SHARED_0_USE_STC_1!$COND_SHARED_0_USE_STC_1$ac_delim
-COND_SHARED_0_WXUSE_EXPAT_BUILTIN!$COND_SHARED_0_WXUSE_EXPAT_BUILTIN$ac_delim
-COND_SHARED_0_WXUSE_REGEX_BUILTIN!$COND_SHARED_0_WXUSE_REGEX_BUILTIN$ac_delim
-COND_SHARED_0_WXUSE_ZLIB_BUILTIN!$COND_SHARED_0_WXUSE_ZLIB_BUILTIN$ac_delim
-COND_SHARED_1!$COND_SHARED_1$ac_delim
-COND_SHARED_1_USE_GUI_1_USE_OPENGL_1!$COND_SHARED_1_USE_GUI_1_USE_OPENGL_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
-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
-COND_TOOLKIT_GTK!$COND_TOOLKIT_GTK$ac_delim
-COND_TOOLKIT_GTK_TOOLKIT_VERSION_!$COND_TOOLKIT_GTK_TOOLKIT_VERSION_$ac_delim
-COND_TOOLKIT_GTK_TOOLKIT_VERSION_2!$COND_TOOLKIT_GTK_TOOLKIT_VERSION_2$ac_delim
+COND_SHARED_0_wxUSE_EXPAT_builtin!$COND_SHARED_0_wxUSE_EXPAT_builtin$ac_delim
+COND_SHARED_0_wxUSE_REGEX_builtin!$COND_SHARED_0_wxUSE_REGEX_builtin$ac_delim
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
+COND_SHARED_0_wxUSE_ZLIB_builtin!$COND_SHARED_0_wxUSE_ZLIB_builtin$ac_delim
+COND_SHARED_1!$COND_SHARED_1$ac_delim
+COND_SHARED_1_USE_GUI_1_USE_OPENGL_1!$COND_SHARED_1_USE_GUI_1_USE_OPENGL_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
+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
+COND_TOOLKIT_GTK!$COND_TOOLKIT_GTK$ac_delim
+COND_TOOLKIT_GTK_TOOLKIT_VERSION_!$COND_TOOLKIT_GTK_TOOLKIT_VERSION_$ac_delim
+COND_TOOLKIT_GTK_TOOLKIT_VERSION_2!$COND_TOOLKIT_GTK_TOOLKIT_VERSION_2$ac_delim
COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1!$COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1$ac_delim
COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0!$COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0$ac_delim
-COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_WXUNIV_0!$COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_WXUNIV_0$ac_delim
COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1!$COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1$ac_delim
COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0!$COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0$ac_delim
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
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
COND_TOOLKIT_MSW_USE_GUI_1!$COND_TOOLKIT_MSW_USE_GUI_1$ac_delim
COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0!$COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0$ac_delim
COND_TOOLKIT_MSW_WXUNIV_0!$COND_TOOLKIT_MSW_WXUNIV_0$ac_delim
+COND_TOOLKIT_OSX_CARBON!$COND_TOOLKIT_OSX_CARBON$ac_delim
+COND_TOOLKIT_OSX_CARBON_USE_GUI_1!$COND_TOOLKIT_OSX_CARBON_USE_GUI_1$ac_delim
+COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0!$COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0$ac_delim
+COND_TOOLKIT_OSX_COCOA!$COND_TOOLKIT_OSX_COCOA$ac_delim
+COND_TOOLKIT_OSX_COCOA_USE_GUI_1!$COND_TOOLKIT_OSX_COCOA_USE_GUI_1$ac_delim
+COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0!$COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0$ac_delim
+COND_TOOLKIT_OSX_IPHONE!$COND_TOOLKIT_OSX_IPHONE$ac_delim
COND_TOOLKIT_PM!$COND_TOOLKIT_PM$ac_delim
COND_TOOLKIT_PM_USE_GUI_1!$COND_TOOLKIT_PM_USE_GUI_1$ac_delim
COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0!$COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0$ac_delim
COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN!$COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN$ac_delim
COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN!$COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN$ac_delim
COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN!$COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN$ac_delim
+COND_USE_GUI_1_wxUSE_LIBJPEG_builtin!$COND_USE_GUI_1_wxUSE_LIBJPEG_builtin$ac_delim
+COND_USE_GUI_1_wxUSE_LIBPNG_builtin!$COND_USE_GUI_1_wxUSE_LIBPNG_builtin$ac_delim
+COND_USE_GUI_1_wxUSE_LIBTIFF_builtin!$COND_USE_GUI_1_wxUSE_LIBTIFF_builtin$ac_delim
COND_USE_OPENGL_1!$COND_USE_OPENGL_1$ac_delim
COND_USE_PCH_1!$COND_USE_PCH_1$ac_delim
COND_USE_PLUGINS_0!$COND_USE_PLUGINS_0$ac_delim
COND_WXUSE_LIBTIFF_BUILTIN!$COND_WXUSE_LIBTIFF_BUILTIN$ac_delim
COND_WXUSE_REGEX_BUILTIN!$COND_WXUSE_REGEX_BUILTIN$ac_delim
COND_WXUSE_ZLIB_BUILTIN!$COND_WXUSE_ZLIB_BUILTIN$ac_delim
+COND_wxUSE_EXPAT_builtin!$COND_wxUSE_EXPAT_builtin$ac_delim
+COND_wxUSE_LIBJPEG_builtin!$COND_wxUSE_LIBJPEG_builtin$ac_delim
+COND_wxUSE_LIBPNG_builtin!$COND_wxUSE_LIBPNG_builtin$ac_delim
+COND_wxUSE_LIBTIFF_builtin!$COND_wxUSE_LIBTIFF_builtin$ac_delim
+COND_wxUSE_REGEX_builtin!$COND_wxUSE_REGEX_builtin$ac_delim
+COND_wxUSE_ZLIB_builtin!$COND_wxUSE_ZLIB_builtin$ac_delim
DEREZ!$DEREZ$ac_delim
SHARED!$SHARED$ac_delim
WX_LIBRARY_BASENAME_NOGUI!$WX_LIBRARY_BASENAME_NOGUI$ac_delim
TOOLKIT!$TOOLKIT$ac_delim
TOOLKIT_DIR!$TOOLKIT_DIR$ac_delim
TOOLCHAIN_NAME!$TOOLCHAIN_NAME$ac_delim
-TOOLCHAIN_FULLNAME!$TOOLCHAIN_FULLNAME$ac_delim
-cross_compiling!$cross_compiling$ac_delim
-WIDGET_SET!$WIDGET_SET$ac_delim
-WX_RELEASE!$WX_RELEASE$ac_delim
-WX_VERSION!$WX_VERSION$ac_delim
-WX_SUBVERSION!$WX_SUBVERSION$ac_delim
-WX_CHARTYPE!$WX_CHARTYPE$ac_delim
-WX_DEBUGTYPE!$WX_DEBUGTYPE$ac_delim
-WXCONFIG_CPPFLAGS!$WXCONFIG_CPPFLAGS$ac_delim
-WXCONFIG_CFLAGS!$WXCONFIG_CFLAGS$ac_delim
-WXCONFIG_CXXFLAGS!$WXCONFIG_CXXFLAGS$ac_delim
-WXCONFIG_LIBS!$WXCONFIG_LIBS$ac_delim
-WXCONFIG_RPATH!$WXCONFIG_RPATH$ac_delim
-WXCONFIG_LDFLAGS_GUI!$WXCONFIG_LDFLAGS_GUI$ac_delim
-WXCONFIG_RESFLAGS!$WXCONFIG_RESFLAGS$ac_delim
-GUIDIST!$GUIDIST$ac_delim
-DISTDIR!$DISTDIR$ac_delim
-SAMPLES_SUBDIRS!$SAMPLES_SUBDIRS$ac_delim
-LDFLAGS_GL!$LDFLAGS_GL$ac_delim
-OPENGL_LIBS!$OPENGL_LIBS$ac_delim
-DMALLOC_LIBS!$DMALLOC_LIBS$ac_delim
-WX_VERSION_TAG!$WX_VERSION_TAG$ac_delim
-RESCOMP!$RESCOMP$ac_delim
-RESFLAGS!$RESFLAGS$ac_delim
-RESPROGRAMOBJ!$RESPROGRAMOBJ$ac_delim
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
+TOOLCHAIN_FULLNAME!$TOOLCHAIN_FULLNAME$ac_delim
+cross_compiling!$cross_compiling$ac_delim
+WIDGET_SET!$WIDGET_SET$ac_delim
+WX_RELEASE!$WX_RELEASE$ac_delim
+WX_VERSION!$WX_VERSION$ac_delim
+WX_SUBVERSION!$WX_SUBVERSION$ac_delim
+WX_CHARTYPE!$WX_CHARTYPE$ac_delim
+WX_DEBUGTYPE!$WX_DEBUGTYPE$ac_delim
+WXCONFIG_CPPFLAGS!$WXCONFIG_CPPFLAGS$ac_delim
+WXCONFIG_CFLAGS!$WXCONFIG_CFLAGS$ac_delim
+WXCONFIG_CXXFLAGS!$WXCONFIG_CXXFLAGS$ac_delim
+WXCONFIG_LIBS!$WXCONFIG_LIBS$ac_delim
+WXCONFIG_RPATH!$WXCONFIG_RPATH$ac_delim
+WXCONFIG_LDFLAGS_GUI!$WXCONFIG_LDFLAGS_GUI$ac_delim
+WXCONFIG_RESFLAGS!$WXCONFIG_RESFLAGS$ac_delim
+GUIDIST!$GUIDIST$ac_delim
+DISTDIR!$DISTDIR$ac_delim
+SAMPLES_SUBDIRS!$SAMPLES_SUBDIRS$ac_delim
+LDFLAGS_GL!$LDFLAGS_GL$ac_delim
+OPENGL_LIBS!$OPENGL_LIBS$ac_delim
+DMALLOC_LIBS!$DMALLOC_LIBS$ac_delim
+WX_VERSION_TAG!$WX_VERSION_TAG$ac_delim
+RESCOMP!$RESCOMP$ac_delim
+RESFLAGS!$RESFLAGS$ac_delim
+RESPROGRAMOBJ!$RESPROGRAMOBJ$ac_delim
WX_RESOURCES_MACOSX_ASCII!$WX_RESOURCES_MACOSX_ASCII$ac_delim
WX_RESOURCES_MACOSX_DATA!$WX_RESOURCES_MACOSX_DATA$ac_delim
LIBWXMACRES!$LIBWXMACRES$ac_delim
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 10; then
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 35; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
;;
"lib/wx/config/${TOOLCHAIN_FULLNAME}":F) chmod +x lib/wx/config/${TOOLCHAIN_FULLNAME} ;;
"lib/wx/config/inplace-${TOOLCHAIN_FULLNAME}":F) chmod +x lib/wx/config/inplace-${TOOLCHAIN_FULLNAME} ;;
+ "utils/ifacecheck/rungccxml.sh":F) chmod +x utils/ifacecheck/rungccxml.sh ;;
"wx-config":C) rm -f wx-config
${LN_S} lib/wx/config/inplace-${TOOLCHAIN_FULLNAME} wx-config
;;
projects / wxWidgets.git / blobdiff