X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/06a08679949455a2ac990ba2dbbc8ea2ff1f3f82..a9638bb6eb1105b01062fbe8c6f212b852088f22:/configure diff --git a/configure b/configure index 5335cc837f..d8a7fef102 100755 --- a/configure +++ b/configure @@ -889,6 +889,8 @@ 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_TOOLKIT_OSX_IPHONE_USE_GUI_1 +COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_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 @@ -950,6 +952,8 @@ COND_TOOLKIT_OSX_CARBON_USE_GUI_1 COND_TOOLKIT_OSX_COCOA COND_TOOLKIT_OSX_COCOA_USE_GUI_1 COND_TOOLKIT_OSX_IPHONE +COND_TOOLKIT_OSX_IPHONE_USE_GUI_1 +COND_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_PM COND_TOOLKIT_PM_USE_GUI_1 COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0 @@ -1736,6 +1740,7 @@ Optional Features: --enable-exceptions build exception-safe library --enable-ffile use wxFFile class --enable-file use wxFile class + --enable-filehistory use wxFileHistory class --enable-filesystem use virtual file systems classes --enable-fontenum use wxFontEnumerator class --enable-fontmap use font encodings conversion classes @@ -1883,6 +1888,7 @@ Optional Features: --enable-metafiles use wxMetaFile (Win32 only) --enable-dragimage use wxDragImage --enable-accessibility enable accessibility support + --enable-uiactionsim use wxUIActionSimulator (experimental) --enable-palette use wxPalette class --enable-image use wxImage class --enable-gif use gif images (GIF file format) @@ -1919,9 +1925,11 @@ Optional Packages: --with-motif use Motif/Lesstif --with-osx_carbon use Mac OS X (Carbon) --with-osx_cocoa use Mac OS X (Cocoa) + --with-osx_iphone use iPhone OS X port --with-osx use Mac OS X (default port, currently Carbon) --with-carbon same as --with-osx_carbon --with-cocoa same as --with-osx_cocoa + --with-iphone same as --with-osx_iphone --with-mac same as --with-osx --with-old_cocoa use old, deprecated, Cocoa port --with-wine use Wine @@ -2608,12 +2616,13 @@ USE_ALPHA= NEEDS_D_REENTRANT_FOR_R_FUNCS=0 -ALL_TOOLKITS="COCOA GTK OSX_CARBON OSX_COCOA MGL MICROWIN MOTIF MSW PM X11 DFB" +ALL_TOOLKITS="COCOA GTK OSX_CARBON OSX_COCOA OSX_IPHONE MGL MICROWIN MOTIF MSW PM X11 DFB" DEFAULT_wxUSE_OLD_COCOA=0 DEFAULT_wxUSE_GTK=0 DEFAULT_wxUSE_OSX_CARBON=0 DEFAULT_wxUSE_OSX_COCOA=0 +DEFAULT_wxUSE_OSX_IPHONE=0 DEFAULT_wxUSE_MGL=0 DEFAULT_wxUSE_MICROWIN=0 DEFAULT_wxUSE_MOTIF=0 @@ -2626,6 +2635,7 @@ DEFAULT_DEFAULT_wxUSE_OLD_COCOA=0 DEFAULT_DEFAULT_wxUSE_GTK=0 DEFAULT_DEFAULT_wxUSE_OSX_CARBON=0 DEFAULT_DEFAULT_wxUSE_OSX_COCOA=0 +DEFAULT_DEFAULT_wxUSE_OSX_IPHONE=0 DEFAULT_DEFAULT_wxUSE_MGL=0 DEFAULT_DEFAULT_wxUSE_MICROWIN=0 DEFAULT_DEFAULT_wxUSE_MOTIF=0 @@ -2694,6 +2704,14 @@ _ACEOF DEFAULT_DEFAULT_wxUSE_MOTIF=1 ;; + *-*-qnx*) + USE_QNX=1 + cat >>confdefs.h <<\_ACEOF +#define __QNX__ 1 +_ACEOF + + DEFAULT_DEFAULT_wxUSE_X11=1 + ;; *-*-solaris2* ) USE_SUN=1 USE_SOLARIS=1 @@ -2890,6 +2908,20 @@ _ACEOF DEFAULT_STD_FLAG=no ;; + arm-apple-darwin*) + USE_BSD=1 + USE_DARWIN=1 + cat >>confdefs.h <<\_ACEOF +#define __BSD__ 1 +_ACEOF + + cat >>confdefs.h <<\_ACEOF +#define __DARWIN__ 1 +_ACEOF + + DEFAULT_DEFAULT_wxUSE_OSX_IPHONE=1 + ;; + *-*-darwin* ) USE_BSD=1 USE_DARWIN=1 @@ -2943,6 +2975,7 @@ DEFAULT_wxUSE_LIBSDL=no DEFAULT_wxUSE_ACCESSIBILITY=no DEFAULT_wxUSE_IPV6=no DEFAULT_wxUSE_GSTREAMER8=no +DEFAULT_wxUSE_UIACTIONSIMULATOR=no DEFAULT_wxUSE_UNICODE_UTF8=auto DEFAULT_wxUSE_OPENGL=auto @@ -3327,6 +3360,12 @@ if test "${with_osx_cocoa+set}" = set; then fi +# Check whether --with-osx_iphone was given. +if test "${with_osx_iphone+set}" = set; then + withval=$with_osx_iphone; wxUSE_OSX_IPHONE="$withval" CACHE_OSX_IPHONE=1 TOOLKIT_GIVEN=1 +fi + + # Check whether --with-osx was given. if test "${with_osx+set}" = set; then withval=$with_osx; wxUSE_OSX_CARBON="$withval" CACHE_OSX_CARBON=1 TOOLKIT_GIVEN=1 @@ -3345,6 +3384,12 @@ if test "${with_cocoa+set}" = set; then fi +# Check whether --with-iphone was given. +if test "${with_iphone+set}" = set; then + withval=$with_iphone; wxUSE_OSX_IPHONE="$withval" CACHE_OSX_IPHONE=1 TOOLKIT_GIVEN=1 +fi + + # Check whether --with-mac was given. if test "${with_mac+set}" = set; then withval=$with_mac; wxUSE_OSX_CARBON="$withval" CACHE_OSX_CARBON=1 TOOLKIT_GIVEN=1 @@ -3540,7 +3585,7 @@ echo "$as_me: error: BeOS GUI is not supported yet, use --disable-gui" >&2;} fi NUM_TOOLKITS=`expr ${wxUSE_OLD_COCOA:-0} + ${wxUSE_GTK:-0} + ${wxUSE_OSX_CARBON:-0} \ - + ${wxUSE_OSX_COCOA:-0} + ${wxUSE_MGL:-0} + ${wxUSE_DFB:-0} \ + + ${wxUSE_OSX_COCOA:-0} + ${wxUSE_OSX_IPHONE:-0} + ${wxUSE_MGL:-0} + ${wxUSE_DFB:-0} \ + ${wxUSE_MICROWIN:-0} + ${wxUSE_MOTIF:-0} + ${wxUSE_MSW:-0} + ${wxUSE_X11:-0}` case "${host}" in @@ -3565,8 +3610,10 @@ echo "$as_me: error: Please specify at most one toolkit" >&2;} # to be removed when --disable-gtk2 isn't needed if test "x$wxUSE_GTK2" = "xyes"; then wxGTK_VERSION=2 + wxUSE_GTK1=0 elif test "x$wxUSE_GTK2" = "xno"; then wxGTK_VERSION=1 + wxUSE_GTK1=1 fi for toolkit in $ALL_TOOLKITS; do @@ -3589,7 +3636,9 @@ echo "${ECHO_T}base only" >&6; } fi wxUSE_MAC=0 -if test "$wxUSE_OSX_CARBON" = 1 -o "$wxUSE_OSX_COCOA" = 1; then +if test "$wxUSE_OSX_CARBON" = 1 \ + -o "$wxUSE_OSX_COCOA" = 1 \ + -o "$wxUSE_OSX_IPHONE" = 1; then wxUSE_MAC=1 fi @@ -6972,6 +7021,50 @@ fi 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}-filehistory" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-filehistory... $ECHO_C" >&6; } + # Check whether --enable-filehistory was given. +if test "${enable_filehistory+set}" = set; then + enableval=$enable_filehistory; + if test "$enableval" = yes; then + wx_cv_use_filehistory='wxUSE_FILE_HISTORY=yes' + else + wx_cv_use_filehistory='wxUSE_FILE_HISTORY=no' + fi + +else + + wx_cv_use_filehistory='wxUSE_FILE_HISTORY=${'DEFAULT_wxUSE_FILE_HISTORY":-$defaultval}" + +fi + + + eval "$wx_cv_use_filehistory" + + if test x"$enablestring" = xdisable; then + if test $wxUSE_FILE_HISTORY = no; then + result=yes + else + result=no + fi + else + result=$wxUSE_FILE_HISTORY + fi + + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + + enablestring= defaultval=$wxUSE_ALL_FEATURES if test -z "$defaultval"; then @@ -13517,6 +13610,50 @@ fi 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}-uiactionsim" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-uiactionsim... $ECHO_C" >&6; } + # Check whether --enable-uiactionsim was given. +if test "${enable_uiactionsim+set}" = set; then + enableval=$enable_uiactionsim; + if test "$enableval" = yes; then + wx_cv_use_uiactionsim='wxUSE_UIACTIONSIMULATOR=yes' + else + wx_cv_use_uiactionsim='wxUSE_UIACTIONSIMULATOR=no' + fi + +else + + wx_cv_use_uiactionsim='wxUSE_UIACTIONSIMULATOR=${'DEFAULT_wxUSE_UIACTIONSIMULATOR":-$defaultval}" + +fi + + + eval "$wx_cv_use_uiactionsim" + + if test x"$enablestring" = xdisable; then + if test $wxUSE_UIACTIONSIMULATOR = no; then + result=yes + else + result=no + fi + else + result=$wxUSE_UIACTIONSIMULATOR + fi + + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + + enablestring= @@ -18465,13 +18602,22 @@ done echo "$as_me: WARNING: Assuming OS X 10.4, use --with-macosx-version-min to override." >&2;} OSX_VERSION="10.4" fi - if test "$wxUSE_OSX_CARBON" = 1 -o "x$OSX_VERSION" = "x10.4"; then - # otherwise configure stops on leopard for universal_binary - wxUSE_MACOSX_VERSION_MIN=10.4 - else - # for OS X Cocoa, use 10.5 so we can get 64-bit compile on Snow Leopard - wxUSE_MACOSX_VERSION_MIN=10.5 - fi + + case "$OSX_VERSION" in + 10.4* ) + wxUSE_MACOSX_VERSION_MIN=10.4 + ;; + + * ) + if test "$wxUSE_OSX_CARBON" = 1; then + # otherwise configure stops on leopard for universal_binary + wxUSE_MACOSX_VERSION_MIN=10.4 + else + # for Cocoa, use 10.5 to be able to compile it in 64 bits too + wxUSE_MACOSX_VERSION_MIN=10.5 + fi + ;; + esac fi NEEDS_GCC40="no" @@ -24650,10 +24796,142 @@ if test "x$SUNCC" = xyes; then fi if test "x$SGICC" = "xyes"; then - CFLAGS="-woff 3970 $CFLAGS" + { echo "$as_me:$LINENO: checking if cc version is 7.4.4 or greater" >&5 +echo $ECHO_N "checking if cc version is 7.4.4 or greater... $ECHO_C" >&6; } +if test "${wx_cv_prog_sgicc744+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. */ + +int +main () +{ + + #if _SGI_COMPILER_VERSION >= 744 + chock me: mipsPro is 7.4.4 or later + #endif + + ; + 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_prog_sgicc744=no +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + wx_cv_prog_sgicc744=yes + +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + +fi +{ echo "$as_me:$LINENO: result: $wx_cv_prog_sgicc744" >&5 +echo "${ECHO_T}$wx_cv_prog_sgicc744" >&6; } + + if test "x$wx_cv_prog_sgicc744" = "xyes"; then + CFLAGS="-woff 3970 $CFLAGS" + fi fi if test "x$SGICXX" = "xyes"; then - CXXFLAGS="-woff 3970 $CXXFLAGS" + { echo "$as_me:$LINENO: checking if CC version is 7.4.4 or greater" >&5 +echo $ECHO_N "checking if CC version is 7.4.4 or greater... $ECHO_C" >&6; } +if test "${wx_cv_prog_sgicxx744+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 () +{ + + #if _SGI_COMPILER_VERSION >= 744 + chock me: mipsPro is 7.4.4 or later + #endif + + ; + 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_prog_sgicxx744=no +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + wx_cv_prog_sgicxx744=yes + +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_prog_sgicxx744" >&5 +echo "${ECHO_T}$wx_cv_prog_sgicxx744" >&6; } + + if test "x$wx_cv_prog_sgicxx744" = "xyes"; then + CXXFLAGS="-woff 3970 $CXXFLAGS" + fi fi if test "x$HPCC" = "xyes"; then @@ -27087,9 +27365,9 @@ echo "${ECHO_T}$ac_cv_header_png_h" >&6; } if test "$ac_cv_header_png_h" = "yes"; then - { echo "$as_me:$LINENO: checking for png_check_sig in -lpng" >&5 -echo $ECHO_N "checking for png_check_sig in -lpng... $ECHO_C" >&6; } -if test "${ac_cv_lib_png_png_check_sig+set}" = set; then + { echo "$as_me:$LINENO: checking for png_sig_cmp in -lpng" >&5 +echo $ECHO_N "checking for png_sig_cmp in -lpng... $ECHO_C" >&6; } +if test "${ac_cv_lib_png_png_sig_cmp+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS @@ -27107,11 +27385,11 @@ cat >>conftest.$ac_ext <<_ACEOF #ifdef __cplusplus extern "C" #endif -char png_check_sig (); +char png_sig_cmp (); int main () { -return png_check_sig (); +return png_sig_cmp (); ; return 0; } @@ -27134,21 +27412,21 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 test ! -s conftest.err } && test -s conftest$ac_exeext && $as_test_x conftest$ac_exeext; then - ac_cv_lib_png_png_check_sig=yes + ac_cv_lib_png_png_sig_cmp=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_lib_png_png_check_sig=no + ac_cv_lib_png_png_sig_cmp=no fi rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_png_png_check_sig" >&5 -echo "${ECHO_T}$ac_cv_lib_png_png_check_sig" >&6; } -if test $ac_cv_lib_png_png_check_sig = yes; then +{ echo "$as_me:$LINENO: result: $ac_cv_lib_png_png_sig_cmp" >&5 +echo "${ECHO_T}$ac_cv_lib_png_png_sig_cmp" >&6; } +if test $ac_cv_lib_png_png_sig_cmp = yes; then PNG_LINK=" -lpng -lz" fi @@ -28482,7 +28760,7 @@ fi case "${host}" in - x86_64-*-mingw32* ) + x86_64-*-mingw32* ) LIBS="$LIBS -lwinspool -lwinmm -lshell32 -lcomctl32 -lcomdlg32 -lwctl3d32 -ladvapi32 -lwsock32 -lgdi32" WINDRES_CPU_DEFINE="--define WX_CPU_AMD64" @@ -33021,6 +33299,10 @@ echo "${ECHO_T}none" >&6; } TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D__WXMAC__ -D__WXOSX__" fi + if test "$wxUSE_OSX_IPHONE" = 1; then + TOOLKIT=OSX_IPHONE + fi + if test "$wxUSE_OLD_COCOA" = 1; then TOOLKIT=COCOA GUIDIST=COCOA_DIST @@ -33262,8 +33544,9 @@ fi +USE_XINERAMA=0 if test "$wxUSE_DISPLAY" = "yes"; then - if test "$wxUSE_UNIX" = "yes" -a "$wxUSE_MAC" != 1 -a "$wxUSE_OLD_COCOA" != 1; then + if test "$wxUSE_MOTIF" = 1 -o "$wxUSE_X11" = 1 -o "$wxUSE_GTK1" = 1; then { echo "$as_me:$LINENO: checking for Xinerama" >&5 echo $ECHO_N "checking for Xinerama... $ECHO_C" >&6; } @@ -33295,11 +33578,70 @@ echo $ECHO_N "checking for Xinerama... $ECHO_C" >&6; } if test "$ac_path_to_link" != " -L/usr/lib" ; then LDFLAGS="$LDFLAGS $ac_path_to_link" fi + USE_XINERAMA=1 GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lXinerama" { echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6; } + else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } + { echo "$as_me:$LINENO: WARNING: Xinerama not found; disabling wxDisplay" >&5 +echo "$as_me: WARNING: Xinerama not found; disabling wxDisplay" >&2;} + wxUSE_DISPLAY="no" + fi + elif test "$wxUSE_MSW" = 1; then + { echo "$as_me:$LINENO: checking for ddraw.h" >&5 +echo $ECHO_N "checking for ddraw.h... $ECHO_C" >&6; } +if test "${ac_cv_header_ddraw_h+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 - { echo "$as_me:$LINENO: checking for Xxf86vm extension" >&5 +#include +_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_header_ddraw_h=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_header_ddraw_h=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ echo "$as_me:$LINENO: result: $ac_cv_header_ddraw_h" >&5 +echo "${ECHO_T}$ac_cv_header_ddraw_h" >&6; } + + + fi +fi + +if test "$wxUSE_DISPLAY" = "yes"; then + if test "$USE_XINERAMA" = 1 -o "$wxUSE_GTK" = 1; then + { echo "$as_me:$LINENO: checking for Xxf86vm extension" >&5 echo $ECHO_N "checking for Xxf86vm extension... $ECHO_C" >&6; } ac_find_libraries= @@ -33313,8 +33655,8 @@ echo $ECHO_N "checking for Xxf86vm extension... $ECHO_C" >&6; } done done - if test "$ac_find_libraries" != "" ; then - { echo "$as_me:$LINENO: result: yes" >&5 + if test "$ac_find_libraries" != "" ; then + { echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6; } for ac_header in X11/extensions/xf86vmode.h @@ -33332,9 +33674,9 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #if HAVE_X11_XLIB_H - #include - #endif + #if HAVE_X11_XLIB_H + #include + #endif #include <$ac_header> @@ -33374,71 +33716,16 @@ if test `eval echo '${'$as_ac_Header'}'` = yes; then #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF - GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lXxf86vm" + GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lXxf86vm" fi done - else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } - fi - else { echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6; } - { echo "$as_me:$LINENO: WARNING: Xinerama not found; disabling wxDisplay" >&5 -echo "$as_me: WARNING: Xinerama not found; disabling wxDisplay" >&2;} - wxUSE_DISPLAY="no" fi - elif test "$wxUSE_MSW" = 1; then - { echo "$as_me:$LINENO: checking for ddraw.h" >&5 -echo $ECHO_N "checking for ddraw.h... $ECHO_C" >&6; } -if test "${ac_cv_header_ddraw_h+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 - -#include -_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_header_ddraw_h=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_header_ddraw_h=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_ddraw_h" >&5 -echo "${ECHO_T}$ac_cv_header_ddraw_h" >&6; } - - fi fi @@ -39303,6 +39590,10 @@ echo "$as_me: WARNING: BeOS threads are not yet supported... disabled" >&2;} fi ;; + *-*-qnx*) + THREAD_OPTS="" + ;; + *-*-*UnixWare*) if test "x$GCC" != "xyes"; then THREAD_OPTS="-Ethread" @@ -39310,7 +39601,15 @@ echo "$as_me: WARNING: BeOS threads are not yet supported... disabled" >&2;} ;; esac - THREAD_OPTS="$THREAD_OPTS pthread none" + case "${host}" in + *-*-qnx*) + THREAD_OPTS="none pthread" + ;; + + *) + THREAD_OPTS="$THREAD_OPTS pthread none" + ;; + esac THREADS_OK=no for flag in $THREAD_OPTS; do @@ -41879,7 +42178,7 @@ fi if test "$GCC" = "yes" ; then if test "$wxUSE_NO_RTTI" = "yes" ; then - WXCONFIG_CXXFLAGS="$WXCONFIG_CXXFLAGS -fno-rtti" + WXCONFIG_CXXFLAGS="$WXCONFIG_CXXFLAGS -DwxNO_RTTI -fno-rtti" fi if test "$wxUSE_NO_EXCEPTIONS" = "yes" ; then WXCONFIG_CXXFLAGS="$WXCONFIG_CXXFLAGS -fno-exceptions" @@ -42550,13 +42849,8 @@ fi if test "$wxUSE_FSWATCHER" = "yes"; then - cat >>confdefs.h <<\_ACEOF -#define wxUSE_FSWATCHER 1 -_ACEOF - - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS fswatcher" - - if test "$wxUSE_UNIX" = "yes"; then + if test "$wxUSE_MSW" != "1"; then + if test "$wxUSE_UNIX" = "yes"; then for ac_header in sys/inotify.h do @@ -42615,12 +42909,12 @@ fi done - if test "$ac_cv_header_sys_inotify_h" = "yes"; then - cat >>confdefs.h <<\_ACEOF + if test "$ac_cv_header_sys_inotify_h" = "yes"; then + cat >>confdefs.h <<\_ACEOF #define wxHAS_INOTIFY 1 _ACEOF - else + else for ac_header in sys/event.h do @@ -42679,17 +42973,30 @@ fi done - if test "$ac_cv_header_sys_event_h" = "yes"; then - cat >>confdefs.h <<\_ACEOF + if test "$ac_cv_header_sys_event_h" = "yes"; then + cat >>confdefs.h <<\_ACEOF #define wxHAS_KQUEUE 1 _ACEOF - else - { echo "$as_me:$LINENO: WARNING: No native wxFileSystemWatcher implementation available for on this platform" >&5 -echo "$as_me: WARNING: No native wxFileSystemWatcher implementation available for on this platform" >&2;} + else + wxUSE_FSWATCHER=no + fi fi + else + wxUSE_FSWATCHER=no fi fi + + if test "$wxUSE_FSWATCHER" = "yes"; then + cat >>confdefs.h <<\_ACEOF +#define wxUSE_FSWATCHER 1 +_ACEOF + + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS fswatcher" + else + { echo "$as_me:$LINENO: WARNING: wxFileSystemWatcher won't be available on this platform" >&5 +echo "$as_me: WARNING: wxFileSystemWatcher won't be available on this platform" >&2;} + fi fi @@ -43849,6 +44156,13 @@ _ACEOF fi fi +if test "$wxUSE_FILE_HISTORY" = "yes"; then + cat >>confdefs.h <<\_ACEOF +#define wxUSE_FILE_HISTORY 1 +_ACEOF + +fi + if test "$wxUSE_FILESYSTEM" = "yes"; then if test "$wxUSE_STREAMS" != yes -o \( "$wxUSE_FILE" != yes -a "$wxUSE_FFILE" != yes \); then { echo "$as_me:$LINENO: WARNING: wxFileSystem requires wxStreams and wxFile or wxFFile... disabled" >&5 @@ -46101,6 +46415,14 @@ _ACEOF fi +if test "$wxUSE_UIACTIONSIMULATOR" = "yes" ; then + cat >>confdefs.h <<\_ACEOF +#define wxUSE_UIACTIONSIMULATOR 1 +_ACEOF + + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS uiaction" +fi + USES_CONTROLS=0 if test "$wxUSE_CONTROLS" = "yes"; then @@ -47247,7 +47569,8 @@ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include +#include + #include int main () { @@ -47988,19 +48311,7 @@ fi -TOOLKIT_LOWERCASE=xxx -if test "$TOOLKIT" = "MAC"; then - TOOLKIT_LOWERCASE=osx_carbon -fi -if test "$TOOLKIT" = "OSX_CARBON"; then - TOOLKIT_LOWERCASE=osx_carbon -fi -if test "$TOOLKIT" = "OSX_COCOA"; then - TOOLKIT_LOWERCASE=osx_cocoa -fi -if test "$TOOLKIT_LOWERCASE" = "xxx"; then - TOOLKIT_LOWERCASE=`echo $TOOLKIT | tr '[A-Z]' '[a-z]'` -fi +TOOLKIT_LOWERCASE=`echo $TOOLKIT | tr '[A-Z]' '[a-z]'` @@ -50681,6 +50992,16 @@ EOF COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0="" fi + COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1="#" + if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xOSX_IPHONE" -a "x$USE_GUI" = "x1" ; then + COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1="" + fi + + COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0="#" + if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xOSX_IPHONE" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then + COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0="" + fi + COND_PLATFORM_MACOSX_1_USE_GUI_1="#" if test "x$PLATFORM_MACOSX" = "x1" -a "x$USE_GUI" = "x1" ; then COND_PLATFORM_MACOSX_1_USE_GUI_1="" @@ -50986,6 +51307,16 @@ EOF COND_TOOLKIT_OSX_IPHONE="" fi + COND_TOOLKIT_OSX_IPHONE_USE_GUI_1="#" + if test "x$TOOLKIT" = "xOSX_IPHONE" -a "x$USE_GUI" = "x1" ; then + COND_TOOLKIT_OSX_IPHONE_USE_GUI_1="" + fi + + COND_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0="#" + if test "x$TOOLKIT" = "xOSX_IPHONE" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then + COND_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0="" + fi + COND_TOOLKIT_PM="#" if test "x$TOOLKIT" = "xPM" ; then COND_TOOLKIT_PM="" @@ -52744,6 +53075,8 @@ COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1!$COND_PLATFORM_MACOSX_1_TOOL 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_TOOLKIT_OSX_IPHONE_USE_GUI_1!$COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1$ac_delim +COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0!$COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_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 @@ -52760,8 +53093,6 @@ COND_PLATFORM_UNIX_1_TOOLKIT_MGL_USE_GUI_1!$COND_PLATFORM_UNIX_1_TOOLKIT_MGL_USE COND_PLATFORM_UNIX_1_USE_GUI_1!$COND_PLATFORM_UNIX_1_USE_GUI_1$ac_delim COND_PLATFORM_UNIX_1_USE_PLUGINS_0!$COND_PLATFORM_UNIX_1_USE_PLUGINS_0$ac_delim COND_PLATFORM_WIN32_0!$COND_PLATFORM_WIN32_0$ac_delim -COND_PLATFORM_WIN32_1!$COND_PLATFORM_WIN32_1$ac_delim -COND_PLATFORM_WIN32_1_SHARED_0!$COND_PLATFORM_WIN32_1_SHARED_0$ac_delim _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then @@ -52803,6 +53134,8 @@ _ACEOF ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF +COND_PLATFORM_WIN32_1!$COND_PLATFORM_WIN32_1$ac_delim +COND_PLATFORM_WIN32_1_SHARED_0!$COND_PLATFORM_WIN32_1_SHARED_0$ac_delim COND_SHARED_0!$COND_SHARED_0$ac_delim COND_SHARED_0_TOOLKIT_MAC_WXUNIV_0!$COND_SHARED_0_TOOLKIT_MAC_WXUNIV_0$ac_delim COND_SHARED_0_TOOLKIT_MSW_WXUNIV_0!$COND_SHARED_0_TOOLKIT_MSW_WXUNIV_0$ac_delim @@ -52846,6 +53179,8 @@ COND_TOOLKIT_OSX_CARBON_USE_GUI_1!$COND_TOOLKIT_OSX_CARBON_USE_GUI_1$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_IPHONE!$COND_TOOLKIT_OSX_IPHONE$ac_delim +COND_TOOLKIT_OSX_IPHONE_USE_GUI_1!$COND_TOOLKIT_OSX_IPHONE_USE_GUI_1$ac_delim +COND_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0!$COND_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0$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 @@ -52896,10 +53231,6 @@ 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 _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then @@ -52941,6 +53272,10 @@ _ACEOF ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF +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 @@ -52989,7 +53324,7 @@ LIBOBJS!$LIBOBJS$ac_delim LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 46; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 50; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5