X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/58dc544700817a40908f98bb8a223ae78fceeca6..e62b7692622880d48b62f555c1e356883232956c:/configure diff --git a/configure b/configure index afab070806..26c9014399 100755 --- a/configure +++ b/configure @@ -1,5 +1,4 @@ #! /bin/sh -# From configure.in Id. # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.69 for wxWidgets 2.9.5. # @@ -634,8 +633,6 @@ POSTLINK_COMMAND LIBWXMACRES WX_RESOURCES_MACOSX_DATA WX_RESOURCES_MACOSX_ASCII -RESPROGRAMOBJ -RESFLAGS RESCOMP WX_VERSION_TAG DMALLOC_LIBS @@ -662,8 +659,6 @@ TOOLCHAIN_FULLNAME TOOLCHAIN_NAME TOOLKIT_DIR TOOLKIT -WIN32INSTALL -AFMINSTALL USE_GUI WX_LIBRARY_BASENAME_GUI WX_LIBRARY_BASENAME_NOGUI @@ -706,6 +701,8 @@ COND_USE_EXCEPTIONS_1 COND_USE_EXCEPTIONS_0 COND_USE_CAIRO_1 COND_UNICODE_1 +COND_TOOLKIT_X11_WXUNIV_1 +COND_TOOLKIT_X11_USE_GUI_1_WXUNIV_1 COND_TOOLKIT_X11_USE_GUI_1 COND_TOOLKIT_X11 COND_TOOLKIT_WINCE_WXUNIV_0 @@ -737,7 +734,9 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_WXUNIV_0 COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1 COND_TOOLKIT_GTK_TOOLKIT_VERSION_3 +COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_WXUNIV_1 COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_WXUNIV_0 +COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_1 COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1 COND_TOOLKIT_GTK_TOOLKIT_VERSION_2 @@ -1288,6 +1287,7 @@ enable_notebook enable_notifmsg enable_odcombobox enable_popupwin +enable_prefseditor enable_radiobox enable_radiobtn enable_richmsgdlg @@ -2222,6 +2222,7 @@ Optional Features: --enable-notifmsg use wxNotificationMessage class --enable-odcombobox use wxOwnerDrawnComboBox class --enable-popupwin use wxPopUpWindow class + --enable-prefseditor use wxPreferencesEditor class --enable-radiobox use wxRadioBox class --enable-radiobtn use wxRadioButton class --enable-richmsgdlg use wxRichMessageDialog class @@ -13035,6 +13036,50 @@ fi $as_echo "$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 + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-prefseditor" >&5 +$as_echo_n "checking for --${enablestring:-enable}-prefseditor... " >&6; } + # Check whether --enable-prefseditor was given. +if test "${enable_prefseditor+set}" = set; then : + enableval=$enable_prefseditor; + if test "$enableval" = yes; then + wx_cv_use_prefseditor='wxUSE_PREFERENCES_EDITOR=yes' + else + wx_cv_use_prefseditor='wxUSE_PREFERENCES_EDITOR=no' + fi + +else + + wx_cv_use_prefseditor='wxUSE_PREFERENCES_EDITOR=${'DEFAULT_wxUSE_PREFERENCES_EDITOR":-$defaultval}" + +fi + + + eval "$wx_cv_use_prefseditor" + + if test x"$enablestring" = xdisable; then + if test $wxUSE_PREFERENCES_EDITOR = no; then + result=yes + else + result=no + fi + else + result=$wxUSE_PREFERENCES_EDITOR + fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5 +$as_echo "$result" >&6; } + + enablestring= defaultval=$wxUSE_ALL_FEATURES if test -z "$defaultval"; then @@ -19762,8 +19807,6 @@ if test "$wants_win32" = 1 ; then USE_WIN32=1 $as_echo "#define __WIN32__ 1" >>confdefs.h - $as_echo "#define __WIN95__ 1" >>confdefs.h - $as_echo "#define __WINDOWS__ 1" >>confdefs.h $as_echo "#define __GNUWIN32__ 1" >>confdefs.h @@ -19825,8 +19868,6 @@ if test "x$ac_cv_lib_cExt_drand48" = xyes; then : LIBS="$LIBS -lcExt" fi - else - RESPROGRAMOBJ="\${top_srcdir}/include/wx/os2/wx.res" fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gcc/libc version" >&5 $as_echo_n "checking for gcc/libc version... " >&6; } @@ -19892,89 +19933,6 @@ $as_echo "$as_me: WARNING: Building DLLs requires OMF mode, enabled" >&2;} wxUSE_OMF=yes enable_omf=yes fi - ;; - *) - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for strcasecmp() in string.h" >&5 -$as_echo_n "checking for strcasecmp() in string.h... " >&6; } -if ${ac_cv_string_strcasecmp+:} false; then : - $as_echo_n "(cached) " >&6 -else - - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - - #include - -int -main () -{ - - strcasecmp("foo", "bar"); - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_string_strcasecmp=yes -else - ac_cv_string_strcasecmp=no - -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_string_strcasecmp" >&5 -$as_echo "$ac_cv_string_strcasecmp" >&6; } - - if test x"$ac_cv_string_strcasecmp" = "xyes"; then - $as_echo "#define HAVE_STRCASECMP_IN_STRING_H 1" >>confdefs.h - - else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for strcasecmp() in strings.h" >&5 -$as_echo_n "checking for strcasecmp() in strings.h... " >&6; } -if ${ac_cv_strings_strcasecmp+:} false; then : - $as_echo_n "(cached) " >&6 -else - - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - - #include - -int -main () -{ - - strcasecmp("foo", "bar"); - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_strings_strcasecmp=yes -else - ac_cv_strings_strcasecmp=no - -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_strings_strcasecmp" >&5 -$as_echo "$ac_cv_strings_strcasecmp" >&6; } - - if test x"$ac_cv_strings_strcasecmp" = "xyes"; then - $as_echo "#define HAVE_STRCASECMP_IN_STRINGS_H 1" >>confdefs.h - - else - as_fn_error $? "No case-insensitive string comparison function found." "$LINENO" 5 - fi - fi - ;; esac @@ -23249,9 +23207,6 @@ fi -AFMINSTALL= -WIN32INSTALL= - TOOLKIT= TOOLKIT_INCLUDE= WIDGET_SET= @@ -23297,12 +23252,7 @@ fi LIBS="$LIBS -lkernel32 -luser32" esac - RESFLAGS="--include-dir \$(top_srcdir)/include --include-dir \$(top_srcdir)/\$(program_dir) --define __WIN32__ --define __WIN95__ --define __GNUWIN32__ $WINDRES_CPU_DEFINE" - RESPROGRAMOBJ="\$(PROGRAM)_resources.o" - - WXCONFIG_RESFLAGS="--define __WIN32__ --define __WIN95__ --define __GNUWIN32__ $WINDRES_CPU_DEFINE" - - WIN32INSTALL=win32install + WXCONFIG_RESFLAGS="--define __WIN32__ --define __GNUWIN32__ $WINDRES_CPU_DEFINE" fi if test "$wxUSE_GUI" = "yes"; then @@ -24646,7 +24596,6 @@ done TOOLKIT_INCLUDE="$wx_cv_cflags_gtk" GUI_TK_LIBRARY="$wx_cv_libs_gtk $GUI_TK_LIBRARY" - AFMINSTALL=afminstall TOOLKIT=GTK GUIDIST=GTK_DIST @@ -24916,7 +24865,6 @@ $as_echo "MicroWindows' libraries found." >&6; } wxUSE_UNIVERSAL="yes" - AFMINSTALL=afminstall TOOLKIT=MICROWIN GUIDIST=MICROWIN_DIST @@ -25614,7 +25562,6 @@ fi GUI_TK_LIBRARY=`echo $X_LIBS | sed 's/ -LNONE//' | sed 's/ -RNONE//'` TOOLKIT_INCLUDE=`echo $X_CFLAGS | sed 's/ -INONE//'` - AFMINSTALL=afminstall COMPILED_X_PROGRAM=0 fi @@ -29875,7 +29822,20 @@ if test "$WCSLEN_FOUND" = 1; then fi -for ac_func in wcsdup wcsftime strnlen wcsnlen wcscasecmp wcsncasecmp +for ac_func in wcsftime +do : + ac_fn_c_check_func "$LINENO" "wcsftime" "ac_cv_func_wcsftime" +if test "x$ac_cv_func_wcsftime" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_WCSFTIME 1 +_ACEOF + +fi +done + + +if test "$wxUSE_MAC" != 1; then + for ac_func in strnlen wcsdup wcsnlen wcscasecmp wcsncasecmp do : as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" @@ -29887,6 +29847,7 @@ _ACEOF fi done +fi if test "$USE_HPUX" = 1 -a "$GCC" != "yes"; then CPPFLAGS="-D_INCLUDE__STDC_A1_SOURCE $CPPFLAGS" @@ -36643,6 +36604,12 @@ $as_echo "$as_me: WARNING: wxPopupWindow not yet supported under PM... disabled" fi fi +if test "$wxUSE_PREFERENCES_EDITOR" = "yes"; then + $as_echo "#define wxUSE_PREFERENCES_EDITOR 1" >>confdefs.h + + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS prefseditor" +fi + if test "$wxUSE_DIALUP_MANAGER" = "yes"; then if test "$wxUSE_MAC" = 1 -o "$wxUSE_OLD_COCOA" = 1; then { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Dialup manager not supported on this platform... disabled" >&5 @@ -37746,7 +37713,7 @@ if test "$wxUSE_GUI" = "yes"; then SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS artprov controls dialogs drawing \ - erase event exec font image minimal preferences render \ + erase event exec font image minimal render \ shaped svg taborder vscroll widgets wrapsizer" if test "$wxUSE_MONOLITHIC" != "yes"; then @@ -40821,11 +40788,21 @@ EOF COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0="" fi + COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_1="#" + if test "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x2" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x1" ; then + COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_1="" + 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_2_WXUNIV_1="#" + if test "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x2" -a "x$WXUNIV" = "x1" ; then + COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_WXUNIV_1="" + fi + COND_TOOLKIT_GTK_TOOLKIT_VERSION_3="#" if test "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x3" ; then COND_TOOLKIT_GTK_TOOLKIT_VERSION_3="" @@ -40981,6 +40958,16 @@ EOF COND_TOOLKIT_X11_USE_GUI_1="" fi + COND_TOOLKIT_X11_USE_GUI_1_WXUNIV_1="#" + if test "x$TOOLKIT" = "xX11" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x1" ; then + COND_TOOLKIT_X11_USE_GUI_1_WXUNIV_1="" + fi + + COND_TOOLKIT_X11_WXUNIV_1="#" + if test "x$TOOLKIT" = "xX11" -a "x$WXUNIV" = "x1" ; then + COND_TOOLKIT_X11_WXUNIV_1="" + fi + COND_UNICODE_1="#" if test "x$UNICODE" = "x1" ; then COND_UNICODE_1="" @@ -41396,10 +41383,6 @@ SAMPLES_SUBDIRS="`echo $SAMPLES_SUBDIRS | tr -s ' ' | tr ' ' '\n' | sort | uniq - - - -