X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d439c2517e70e689b38f971168e926d6c997b0dd..497bf19285e2a444720ee7f97bf412b116269935:/configure

diff --git a/configure b/configure
index 8607efcba7..7697a87f25 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 <wx-dev@lists.wxwidgets.org>.
 #
@@ -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
@@ -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
@@ -965,8 +964,6 @@ LIBNOTIFY_LIBS
 LIBNOTIFY_CFLAGS
 GNOMEVFS_LIBS
 GNOMEVFS_CFLAGS
-LIBGNOMEPRINTUI_LIBS
-LIBGNOMEPRINTUI_CFLAGS
 GTKPRINT_LIBS
 GTKPRINT_CFLAGS
 SDL_LIBS
@@ -1109,7 +1106,6 @@ with_libxpm
 with_libiconv
 with_libmspack
 with_gtkprint
-with_gnomeprint
 with_gnomevfs
 with_libnotify
 with_hildon
@@ -1288,6 +1284,7 @@ enable_notebook
 enable_notifmsg
 enable_odcombobox
 enable_popupwin
+enable_prefseditor
 enable_radiobox
 enable_radiobtn
 enable_richmsgdlg
@@ -1412,8 +1409,6 @@ MesaGL_CFLAGS
 MesaGL_LIBS
 GTKPRINT_CFLAGS
 GTKPRINT_LIBS
-LIBGNOMEPRINTUI_CFLAGS
-LIBGNOMEPRINTUI_LIBS
 GNOMEVFS_CFLAGS
 GNOMEVFS_LIBS
 LIBNOTIFY_CFLAGS
@@ -1969,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]...
 
@@ -2038,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
 
@@ -2222,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
@@ -2339,7 +2335,6 @@ Optional Packages:
   --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
@@ -2410,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
@@ -2504,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.
@@ -3358,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 $@
@@ -3819,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
@@ -5178,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
@@ -13035,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
@@ -19823,8 +19814,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; }
@@ -19890,89 +19879,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 <string.h>
-
-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 <strings.h>
-
-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
 
@@ -21934,7 +21840,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
@@ -23247,9 +23153,6 @@ fi
 
 
 
-AFMINSTALL=
-WIN32INSTALL=
-
 TOOLKIT=
 TOOLKIT_INCLUDE=
 WIDGET_SET=
@@ -23295,12 +23198,7 @@ fi
                         LIBS="$LIBS -lkernel32 -luser32"
     esac
 
-        RESFLAGS="--include-dir \$(top_srcdir)/include --include-dir \$(top_srcdir)/\$(program_dir) --define __WIN32__ --define __GNUWIN32__ $WINDRES_CPU_DEFINE"
-    RESPROGRAMOBJ="\$(PROGRAM)_resources.o"
-
-                WXCONFIG_RESFLAGS="--define __WIN32__ --define __GNUWIN32__ $WINDRES_CPU_DEFINE"
-
-        WIN32INSTALL=win32install
+        WXCONFIG_RESFLAGS="--define __WIN32__ --define __GNUWIN32__ $WINDRES_CPU_DEFINE"
 fi
 
 if test "$wxUSE_GUI" = "yes"; then
@@ -24644,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
 
@@ -24914,7 +24811,6 @@ $as_echo "MicroWindows' libraries found." >&6; }
 
         wxUSE_UNIVERSAL="yes"
 
-        AFMINSTALL=afminstall
         TOOLKIT=MICROWIN
         GUIDIST=MICROWIN_DIST
 
@@ -25612,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
@@ -29374,16 +29269,18 @@ rm -f core conftest.err conftest.$ac_objext \
             DYLIB_RPATH_POSTLINK="${HOST_PREFIX}install_name_tool -id \$@ \$@"
             cat <<EOF >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"
@@ -29873,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"
@@ -29885,6 +29795,7 @@ _ACEOF
 fi
 done
 
+fi
 
 if test "$USE_HPUX" = 1 -a "$GCC" != "yes"; then
     CPPFLAGS="-D_INCLUDE__STDC_A1_SOURCE $CPPFLAGS"
@@ -34186,109 +34097,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
@@ -36641,6 +36449,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
@@ -37744,7 +37558,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
@@ -38013,9 +37827,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
@@ -39614,7 +39425,7 @@ EOF
       ;;
 
       powerpc-apple-macos* | \
-      *-*-freebsd* | *-*-openbsd* | *-*-netbsd* | *-*-k*bsd*-gnu | \
+      *-*-freebsd* | *-*-openbsd* | *-*-netbsd* | *-*-gnu* | *-*-k*bsd*-gnu | \
       *-*-mirbsd* | \
       *-*-sunos4* | \
       *-*-osf* | \
@@ -39656,7 +39467,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
@@ -40819,11 +40630,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=""
@@ -40979,6 +40800,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=""
@@ -41286,11 +41117,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
@@ -41394,10 +41225,6 @@ SAMPLES_SUBDIRS="`echo $SAMPLES_SUBDIRS | tr -s ' ' | tr ' ' '\n' | sort | uniq
 
 
 
-
-
-
-
 
 
 
@@ -42152,7 +41979,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
@@ -42218,7 +42045,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\\"