X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/54582f9ac65be400bf998d26197eba4f7650a574..dda975a007b96bc2625c1547395c914ef8028eec:/configure diff --git a/configure b/configure index 48cf932fd3..33a41b441b 100755 --- a/configure +++ b/configure @@ -1,7 +1,6 @@ #! /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. +# Generated by GNU Autoconf 2.69 for wxWidgets 3.0.0. # # Report bugs to . # @@ -581,8 +580,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='wxWidgets' PACKAGE_TARNAME='wxwidgets' -PACKAGE_VERSION='2.9.5' -PACKAGE_STRING='wxWidgets 2.9.5' +PACKAGE_VERSION='3.0.0' +PACKAGE_STRING='wxWidgets 3.0.0' PACKAGE_BUGREPORT='wx-dev@lists.wxwidgets.org' PACKAGE_URL='' @@ -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 @@ -806,6 +803,7 @@ COND_PLATFORM_MACOSX_0_USE_SOVERSION_1 COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1 COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1 COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1 +COND_MONOLITHIC_1_USE_STC_1 COND_MONOLITHIC_1_SHARED_1 COND_MONOLITHIC_1_SHARED_0 COND_MONOLITHIC_1 @@ -966,8 +964,6 @@ LIBNOTIFY_LIBS LIBNOTIFY_CFLAGS GNOMEVFS_LIBS GNOMEVFS_CFLAGS -LIBGNOMEPRINTUI_LIBS -LIBGNOMEPRINTUI_CFLAGS GTKPRINT_LIBS GTKPRINT_CFLAGS SDL_LIBS @@ -1104,11 +1100,12 @@ enable_gpe with_libpng with_libjpeg with_libtiff +with_libjbig +with_liblzma with_libxpm with_libiconv with_libmspack with_gtkprint -with_gnomeprint with_gnomevfs with_libnotify with_hildon @@ -1287,6 +1284,7 @@ enable_notebook enable_notifmsg enable_odcombobox enable_popupwin +enable_prefseditor enable_radiobox enable_radiobtn enable_richmsgdlg @@ -1411,8 +1409,6 @@ MesaGL_CFLAGS MesaGL_LIBS GTKPRINT_CFLAGS GTKPRINT_LIBS -LIBGNOMEPRINTUI_CFLAGS -LIBGNOMEPRINTUI_LIBS GNOMEVFS_CFLAGS GNOMEVFS_LIBS LIBNOTIFY_CFLAGS @@ -1968,7 +1964,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures wxWidgets 2.9.5 to adapt to many kinds of systems. +\`configure' configures wxWidgets 3.0.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -2037,7 +2033,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of wxWidgets 2.9.5:";; + short | recursive ) echo "Configuration of wxWidgets 3.0.0:";; esac cat <<\_ACEOF @@ -2221,6 +2217,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 @@ -2332,11 +2329,12 @@ Optional Packages: --with-libpng use libpng (PNG image format) --with-libjpeg use libjpeg (JPEG file format) --with-libtiff use libtiff (TIFF file format) + --without-libjbig don't use libjbig in libtiff even if available) + --without-liblzma don't use liblzma in libtiff even if available) --with-libxpm use libxpm (XPM file format) --with-libiconv use libiconv (character conversion) --with-libmspack use libmspack (CHM help files loading) --without-gtkprint don't use GTK printing support - --without-gnomeprint don't use GNOME printing libraries --with-gnomevfs use GNOME VFS for associating MIME types --with-libnotify use libnotify for notifications --with-hildon use Hildon framework for Nokia 770/800/810 @@ -2407,10 +2405,6 @@ Some influential environment variables: C compiler flags for GTKPRINT, overriding pkg-config GTKPRINT_LIBS linker flags for GTKPRINT, overriding pkg-config - LIBGNOMEPRINTUI_CFLAGS - C compiler flags for LIBGNOMEPRINTUI, overriding pkg-config - LIBGNOMEPRINTUI_LIBS - linker flags for LIBGNOMEPRINTUI, overriding pkg-config GNOMEVFS_CFLAGS C compiler flags for GNOMEVFS, overriding pkg-config GNOMEVFS_LIBS @@ -2501,7 +2495,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -wxWidgets configure 2.9.5 +wxWidgets configure 3.0.0 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -3355,7 +3349,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by wxWidgets $as_me 2.9.5, which was +It was created by wxWidgets $as_me 3.0.0, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3816,9 +3810,9 @@ else fi -wx_major_version_number=2 -wx_minor_version_number=9 -wx_release_number=5 +wx_major_version_number=3 +wx_minor_version_number=0 +wx_release_number=0 wx_subrelease_number=0 WX_RELEASE=$wx_major_version_number.$wx_minor_version_number @@ -4099,7 +4093,7 @@ case "${host}" in $as_echo "#define TARGET_CARBON 1" >>confdefs.h - DEFAULT_DEFAULT_wxUSE_OSX_CARBON=1 + DEFAULT_DEFAULT_wxUSE_OSX_COCOA=1 ;; *-*-beos* ) @@ -4911,6 +4905,94 @@ $as_echo "builtin version" >&6; } fi + withstring=without + defaultval=$wxUSE_ALL_FEATURES + if test -z "$defaultval"; then + if test x"$withstring" = xwithout; then + defaultval=yes + else + defaultval=no + fi + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${withstring:-with}-libjbig" >&5 +$as_echo_n "checking for --${withstring:-with}-libjbig... " >&6; } + +# Check whether --with-libjbig was given. +if test "${with_libjbig+set}" = set; then : + withval=$with_libjbig; + if test "$withval" = yes; then + wx_cv_use_libjbig='wxUSE_LIBJBIG=yes' + else + wx_cv_use_libjbig='wxUSE_LIBJBIG=no' + fi + +else + + wx_cv_use_libjbig='wxUSE_LIBJBIG=${'DEFAULT_wxUSE_LIBJBIG":-$defaultval}" + +fi + + + eval "$wx_cv_use_libjbig" + + if test x"$withstring" = xwithout; then + if test $wxUSE_LIBJBIG = yes; then + result=no + else + result=yes + fi + else + result=$wxUSE_LIBJBIG + fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5 +$as_echo "$result" >&6; } + + + withstring=without + defaultval=$wxUSE_ALL_FEATURES + if test -z "$defaultval"; then + if test x"$withstring" = xwithout; then + defaultval=yes + else + defaultval=no + fi + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${withstring:-with}-liblzma" >&5 +$as_echo_n "checking for --${withstring:-with}-liblzma... " >&6; } + +# Check whether --with-liblzma was given. +if test "${with_liblzma+set}" = set; then : + withval=$with_liblzma; + if test "$withval" = yes; then + wx_cv_use_liblzma='wxUSE_LIBLZMA=yes' + else + wx_cv_use_liblzma='wxUSE_LIBLZMA=no' + fi + +else + + wx_cv_use_liblzma='wxUSE_LIBLZMA=${'DEFAULT_wxUSE_LIBLZMA":-$defaultval}" + +fi + + + eval "$wx_cv_use_liblzma" + + if test x"$withstring" = xwithout; then + if test $wxUSE_LIBLZMA = yes; then + result=no + else + result=yes + fi + else + result=$wxUSE_LIBLZMA + fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5 +$as_echo "$result" >&6; } + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --with-libxpm" >&5 $as_echo_n "checking for --with-libxpm... " >&6; } @@ -5087,50 +5169,6 @@ fi $as_echo "$result" >&6; } - withstring=without - defaultval=$wxUSE_ALL_FEATURES - if test -z "$defaultval"; then - if test x"$withstring" = xwithout; then - defaultval=yes - else - defaultval=no - fi - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${withstring:-with}-gnomeprint" >&5 -$as_echo_n "checking for --${withstring:-with}-gnomeprint... " >&6; } - -# Check whether --with-gnomeprint was given. -if test "${with_gnomeprint+set}" = set; then : - withval=$with_gnomeprint; - if test "$withval" = yes; then - wx_cv_use_gnomeprint='wxUSE_LIBGNOMEPRINT=yes' - else - wx_cv_use_gnomeprint='wxUSE_LIBGNOMEPRINT=no' - fi - -else - - wx_cv_use_gnomeprint='wxUSE_LIBGNOMEPRINT=${'DEFAULT_wxUSE_LIBGNOMEPRINT":-$defaultval}" - -fi - - - eval "$wx_cv_use_gnomeprint" - - if test x"$withstring" = xwithout; then - if test $wxUSE_LIBGNOMEPRINT = yes; then - result=no - else - result=yes - fi - else - result=$wxUSE_LIBGNOMEPRINT - fi - - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5 -$as_echo "$result" >&6; } - - withstring= defaultval=$wxUSE_ALL_FEATURES if test -z "$defaultval"; then @@ -12944,6 +12982,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 @@ -19331,6 +19413,7 @@ $as_echo "$as_me: WARNING: Disabling precompiled headers due to universal binary OSX_ARCH_OPTS=`echo $OSX_ARCH_OPTS | sed -e 's/^/-arch /' -e 's/,/ -arch /g'` + CPPFLAGS="$OSX_ARCH_OPTS $CPPFLAGS" CXXFLAGS="$OSX_ARCH_OPTS $CXXFLAGS" CFLAGS="$OSX_ARCH_OPTS $CFLAGS" OBJCXXFLAGS="$OSX_ARCH_OPTS $OBJCXXFLAGS" @@ -19671,8 +19754,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 @@ -19734,8 +19815,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; } @@ -19801,89 +19880,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 @@ -20723,6 +20719,9 @@ if test $wx_cv_have_variadic_macros = "yes"; then fi +else + $as_echo "#define wxNO_VARIADIC_MACROS 1" >>confdefs.h + fi LARGEFILE_CPPFLAGS= @@ -21842,7 +21841,7 @@ if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF - + break fi done @@ -21869,7 +21868,7 @@ main () __sync_fetch_and_add(&value, 2); __sync_sub_and_fetch(&value, 1); /* but wxAtomicDec does, so mimic that: */ - unsigned int r2 = __sync_sub_and_fetch(&value, 1); + volatile unsigned int r2 = __sync_sub_and_fetch(&value, 1); ; return 0; @@ -22875,7 +22874,8 @@ $as_echo "$as_me: WARNING: system tiff library not found, will use built-in inst ac_configure_args="$ac_configure_args --disable-jpeg" fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for lzma_code in -llzma" >&5 + if test "$wxUSE_LIBLZMA" = "yes"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for lzma_code in -llzma" >&5 $as_echo_n "checking for lzma_code in -llzma... " >&6; } if ${ac_cv_lib_lzma_lzma_code+:} false; then : $as_echo_n "(cached) " >&6 @@ -22915,6 +22915,54 @@ if test "x$ac_cv_lib_lzma_lzma_code" = xyes; then : LIBS="$LIBS -llzma" fi + else + ac_configure_args="$ac_configure_args --disable-lzma" + fi + + if test "$wxUSE_LIBJBIG" = "yes"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for jbg_dec_init in -ljbig" >&5 +$as_echo_n "checking for jbg_dec_init in -ljbig... " >&6; } +if ${ac_cv_lib_jbig_jbg_dec_init+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-ljbig $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char jbg_dec_init (); +int +main () +{ +return jbg_dec_init (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_jbig_jbg_dec_init=yes +else + ac_cv_lib_jbig_jbg_dec_init=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_jbig_jbg_dec_init" >&5 +$as_echo "$ac_cv_lib_jbig_jbg_dec_init" >&6; } +if test "x$ac_cv_lib_jbig_jbg_dec_init" = xyes; then : + LIBS="$LIBS -ljbig" +fi + + else + ac_configure_args="$ac_configure_args --disable-jbig" + fi @@ -23106,9 +23154,6 @@ fi -AFMINSTALL= -WIN32INSTALL= - TOOLKIT= TOOLKIT_INCLUDE= WIDGET_SET= @@ -23142,8 +23187,7 @@ fi LIBS="$LIBS -lwinspool -lwinmm -lshell32 -lcomctl32 -lcomdlg32 -ladvapi32 -lwsock32 -lgdi32" case "${host}" in x86_64-*-mingw32* ) - WINDRES_CPU_DEFINE="--define WX_CPU_AMD64" - ;; + ;; esac if test "$wxUSE_ACCESSIBILITY" = "yes" ; then LIBS="$LIBS -loleacc" @@ -23154,12 +23198,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 @@ -23504,12 +23543,14 @@ else fi - pkg_config_args=gtk+-3.0 + pkg_gtk_version=gtk+-3.0 + pkg_config_args=$pkg_gtk_version for module in . $GTK_MODULES do case "$module" in gthread) - pkg_config_args="$pkg_config_args gthread-2.0" + pkg_gthread_version=gthread-2.0 + pkg_config_args="$pkg_config_args $pkg_gthread_version" ;; esac done @@ -23580,8 +23621,7 @@ $as_echo_n "checking for GTK+ - version >= $min_gtk_version... " >&6; } echo "Will use uninstalled version of GTK+ found in PKG_CONFIG_PATH" enable_gtktest=no fi - - if $PKG_CONFIG --atleast-version $min_gtk_version $pkg_config_args; then + if $PKG_CONFIG --atleast-version $min_gtk_version $pkg_gtk_version ; then : else no_gtk=yes @@ -24502,7 +24542,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 @@ -24772,7 +24811,6 @@ $as_echo "MicroWindows' libraries found." >&6; } wxUSE_UNIVERSAL="yes" - AFMINSTALL=afminstall TOOLKIT=MICROWIN GUIDIST=MICROWIN_DIST @@ -25470,7 +25508,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 @@ -29232,16 +29269,18 @@ rm -f core conftest.err conftest.$ac_objext \ DYLIB_RPATH_POSTLINK="${HOST_PREFIX}install_name_tool -id \$@ \$@" cat <change-install-names #!/bin/sh -libnames=\`cd \${2} ; ls -1 | grep '\.[0-9][0-9]*\.dylib\$'\` +libnames=\`cd \${1} ; ls -1 | grep '\.[0-9][0-9]*\.dylib\$'\` +changes='' +for dep in \${libnames} ; do + changes="\${changes} -change \${4}/\${dep} \${3}/\${dep}" +done for i in \${libnames} ; do - ${HOST_PREFIX}install_name_tool -id \${3}/\${i} \${1}/\${i} - for dep in \${libnames} ; do - ${HOST_PREFIX}install_name_tool -change \${2}/\${dep} \${3}/\${dep} \${1}/\${i} - done + ${HOST_PREFIX}install_name_tool \${changes} -id \${3}/\${i} \${1}/\${i} done +${HOST_PREFIX}install_name_tool \${changes} \${2}/wxrc-${WX_RELEASE} EOF chmod +x change-install-names - DYLIB_RPATH_INSTALL="\$(wx_top_builddir)/change-install-names \${DESTDIR}\${libdir} \$(wx_top_builddir)/lib \${libdir}" + DYLIB_RPATH_INSTALL="\$(wx_top_builddir)/change-install-names \${DESTDIR}\${libdir} \${DESTDIR}\${bindir} \${libdir} \$(wx_top_builddir)/lib" fi HEADER_PAD_OPTION="-headerpad_max_install_names" @@ -29731,7 +29770,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" @@ -29743,6 +29795,7 @@ _ACEOF fi done +fi if test "$USE_HPUX" = 1 -a "$GCC" != "yes"; then CPPFLAGS="-D_INCLUDE__STDC_A1_SOURCE $CPPFLAGS" @@ -32576,8 +32629,6 @@ $as_echo "$wx_cv_type_abi_forced_unwind" >&6; } else if test "$wxUSE_THREADS" = "yes" ; then case "${host}" in - x86_64-*-mingw32* ) - ;; *-*-mingw32* ) { $as_echo "$as_me:${as_lineno-$LINENO}: checking if compiler supports -mthreads" >&5 $as_echo_n "checking if compiler supports -mthreads... " >&6; } @@ -34044,109 +34095,6 @@ $as_echo "yes" >&6; } $as_echo "#define wxUSE_GTKPRINT 1" >>confdefs.h -fi - fi - - if test "$WXGTK3" = 1; then - wxUSE_LIBGNOMEPRINT=no - fi - - if test "$wxUSE_LIBGNOMEPRINT" = "yes" ; then - - -pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBGNOMEPRINTUI" >&5 -$as_echo_n "checking for LIBGNOMEPRINTUI... " >&6; } - -if test -n "$PKG_CONFIG"; then - if test -n "$LIBGNOMEPRINTUI_CFLAGS"; then - pkg_cv_LIBGNOMEPRINTUI_CFLAGS="$LIBGNOMEPRINTUI_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libgnomeprintui-2.2 >= 2.8\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libgnomeprintui-2.2 >= 2.8") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_LIBGNOMEPRINTUI_CFLAGS=`$PKG_CONFIG --cflags "libgnomeprintui-2.2 >= 2.8" 2>/dev/null` -else - pkg_failed=yes -fi - fi -else - pkg_failed=untried -fi -if test -n "$PKG_CONFIG"; then - if test -n "$LIBGNOMEPRINTUI_LIBS"; then - pkg_cv_LIBGNOMEPRINTUI_LIBS="$LIBGNOMEPRINTUI_LIBS" - else - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libgnomeprintui-2.2 >= 2.8\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libgnomeprintui-2.2 >= 2.8") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_LIBGNOMEPRINTUI_LIBS=`$PKG_CONFIG --libs "libgnomeprintui-2.2 >= 2.8" 2>/dev/null` -else - pkg_failed=yes -fi - fi -else - pkg_failed=untried -fi - - - -if test $pkg_failed = yes; then - -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes -else - _pkg_short_errors_supported=no -fi - if test $_pkg_short_errors_supported = yes; then - LIBGNOMEPRINTUI_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libgnomeprintui-2.2 >= 2.8"` - else - LIBGNOMEPRINTUI_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libgnomeprintui-2.2 >= 2.8"` - fi - # Put the nasty error message in config.log where it belongs - echo "$LIBGNOMEPRINTUI_PKG_ERRORS" >&5 - - - if test "$wxUSE_GTKPRINT" = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - else - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libgnomeprintui not found, library will use standard PostScript printing" >&5 -$as_echo "$as_me: WARNING: libgnomeprintui not found, library will use standard PostScript printing" >&2;} - fi - wxUSE_LIBGNOMEPRINT="no" - - -elif test $pkg_failed = untried; then - - if test "$wxUSE_GTKPRINT" = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - else - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libgnomeprintui not found, library will use standard PostScript printing" >&5 -$as_echo "$as_me: WARNING: libgnomeprintui not found, library will use standard PostScript printing" >&2;} - fi - wxUSE_LIBGNOMEPRINT="no" - - -else - LIBGNOMEPRINTUI_CFLAGS=$pkg_cv_LIBGNOMEPRINTUI_CFLAGS - LIBGNOMEPRINTUI_LIBS=$pkg_cv_LIBGNOMEPRINTUI_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - - GUI_TK_LIBRARY="$GUI_TK_LIBRARY $LIBGNOMEPRINTUI_LIBS" - CFLAGS="$LIBGNOMEPRINTUI_CFLAGS $CFLAGS" - CXXFLAGS="$LIBGNOMEPRINTUI_CFLAGS $CXXFLAGS" - $as_echo "#define wxUSE_LIBGNOMEPRINT 1" >>confdefs.h - - fi fi fi @@ -36499,6 +36447,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 @@ -37602,7 +37556,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 @@ -37871,9 +37825,6 @@ case "$TOOLKIT" in if test "$wxUSE_GTKPRINT" = "yes" ; then TOOLKIT_EXTRA="$TOOLKIT_EXTRA GTK+ printing"; fi - if test "$wxUSE_LIBGNOMEPRINT" = "yes" ; then - TOOLKIT_EXTRA="$TOOLKIT_EXTRA gnomeprint"; - fi if test "$wxUSE_LIBGNOMEVFS" = "yes" ; then TOOLKIT_EXTRA="$TOOLKIT_EXTRA gnomevfs" fi @@ -39472,7 +39423,7 @@ EOF ;; powerpc-apple-macos* | \ - *-*-freebsd* | *-*-openbsd* | *-*-netbsd* | *-*-k*bsd*-gnu | \ + *-*-freebsd* | *-*-openbsd* | *-*-netbsd* | *-*-gnu* | *-*-k*bsd*-gnu | \ *-*-mirbsd* | \ *-*-sunos4* | \ *-*-osf* | \ @@ -39514,7 +39465,7 @@ EOF case "${BAKEFILE_HOST}" in *-*-linux* | *-*-freebsd* | *-*-openbsd* | *-*-netbsd* | \ - *-*-k*bsd*-gnu | *-*-mirbsd* ) + *-*-k*bsd*-gnu | *-*-mirbsd* | *-*-gnu* ) if test "x$SUNCXX" = "xyes"; then SONAME_FLAG="-h " else @@ -40342,6 +40293,11 @@ EOF COND_MONOLITHIC_1_SHARED_1="" fi + COND_MONOLITHIC_1_USE_STC_1="#" + if test "x$MONOLITHIC" = "x1" -a "x$USE_STC" = "x1" ; then + COND_MONOLITHIC_1_USE_STC_1="" + fi + COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1="#" if test "x$OFFICIAL_BUILD" = "x0" -a "x$PLATFORM_WIN32" = "x1" ; then COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1="" @@ -40842,6 +40798,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="" @@ -41149,11 +41115,11 @@ $as_echo "$as_me: WARNING: *** see http://gcc.gnu.org/bugzilla/show_bug.cgi?id=1 fi -if test "$wxUSE_MAC" = 1 ; then +if test "$DEPS_TRACKING" = 1 -a "$wxUSE_MAC" = 1 ; then if test "x$wxUSE_UNIVERSAL_BINARY" != "xno" ; then if test "x$disable_macosx_deps" = "xyes"; then sed "s/DEPSMODE=gcc/DEPSMODE=none/" < bk-deps > temp - mv temp bk-deps + mv temp bk-deps chmod +x bk-deps fi fi @@ -41257,10 +41223,6 @@ SAMPLES_SUBDIRS="`echo $SAMPLES_SUBDIRS | tr -s ' ' | tr ' ' '\n' | sort | uniq - - - - @@ -42015,7 +41977,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by wxWidgets $as_me 2.9.5, which was +This file was extended by wxWidgets $as_me 3.0.0, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -42081,7 +42043,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -wxWidgets config.status 2.9.5 +wxWidgets config.status 3.0.0 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\"