]> git.saurik.com Git - wxWidgets.git/blobdiff - configure
Untabified (TABs seem to cause strange problems with autoconf-2.59, at least
[wxWidgets.git] / configure
index 17533309f9ea31a601658aaaf718d9d4bfd460e7..321894857bcdbe6fd8fbd312701be69e52cd6dac 100755 (executable)
--- a/configure
+++ b/configure
@@ -313,7 +313,7 @@ ac_includes_default="\
 #endif"
 
 ac_subdirs_all="$ac_subdirs_all src/expat"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP CXX CXXFLAGS ac_ct_CXX RANLIB ac_ct_RANLIB AR INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA STRIP IF_GNU_MAKE LN_S CXXCPP subdirs PKG_CONFIG GTK_CFLAGS GTK_LIBS GTK_CONFIG PANGOFT2_CFLAGS PANGOFT2_LIBS X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS PANGOX_CFLAGS PANGOX_LIBS PANGOXFT_CFLAGS PANGOXFT_LIBS RESCOMP DEREZ SETFILE LIBICONV EXTRALIBS_ESD SDL_CONFIG SDL_CFLAGS SDL_LIBS CORE_BASE_LIBS CORE_GUI_LIBS wxUSE_ZLIB wxUSE_REGEX wxUSE_EXPAT wxUSE_ODBC wxUSE_LIBJPEG wxUSE_LIBPNG wxUSE_LIBTIFF VENDOR OFFICIAL_BUILD WXUNIV MONOLITHIC USE_PLUGINS EXTRALIBS EXTRALIBS_XML EXTRALIBS_HTML EXTRALIBS_ODBC EXTRALIBS_GUI EXTRALIBS_OPENGL EXTRALIBS_SDL WITH_PLUGIN_SDL UNICODE BUILD DEBUG_INFO DEBUG_FLAG SHARED TOOLKIT_LOWERCASE TOOLKIT_VERSION SAMPLES_RPATH_FLAG SAMPLES_RPATH_POSTLINK HOST_SUFFIX CPPUNIT_CFLAGS CPPUNIT_LIBS SET_MAKE MAKE_SET ac_ct_AR ac_ct_STRIP NM ac_ct_NM INSTALL_DIR LDFLAGS_GUI PLATFORM_UNIX PLATFORM_WIN32 PLATFORM_MSDOS PLATFORM_MAC PLATFORM_MACOSX PLATFORM_OS2 SO_SUFFIX SO_SUFFIX_MODULE DLLIMP_SUFFIX LIBPREFIX LIBEXT DLLPREFIX DLLPREFIX_MODULE AIX_CXX_LD SHARED_LD_CC SHARED_LD_CXX SHARED_LD_MODULE_CC SHARED_LD_MODULE_CXX PIC_FLAG USE_SOVERSION USE_SOVERLINUX USE_SOVERSOLARIS USE_MACVERSION USE_SOSYMLINKS SONAME_FLAG DEPS_TRACKING GCC_PCH 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_DEPS_TRACKING_0 COND_DEPS_TRACKING_1 COND_GCC_PCH_1 COND_MONOLITHIC_0 COND_MONOLITHIC_0_SHARED_0 COND_MONOLITHIC_0_SHARED_0_USE_GUI_1 COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1 COND_MONOLITHIC_0_SHARED_0_USE_HTML_1 COND_MONOLITHIC_0_SHARED_0_USE_ODBC_1 COND_MONOLITHIC_0_SHARED_1 COND_MONOLITHIC_0_SHARED_1_USE_GUI_1 COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1 COND_MONOLITHIC_0_SHARED_1_USE_HTML_1 COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1 COND_MONOLITHIC_0_USE_ODBC_1 COND_MONOLITHIC_1 COND_MONOLITHIC_1_SHARED_0 COND_MONOLITHIC_1_SHARED_1 COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1 COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1 COND_PLATFORM_MACOSX_0_USE_SOVERSION_1 COND_PLATFORM_MACOSX_1 COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA COND_PLATFORM_MACOSX_1_TOOLKIT_GTK COND_PLATFORM_MACOSX_1_TOOLKIT_MAC COND_PLATFORM_MACOSX_1_USE_GUI_1 COND_PLATFORM_MACOSX_1_USE_SOVERSION_1 COND_PLATFORM_MAC_1 COND_PLATFORM_OS2_1 COND_PLATFORM_UNIX_0 COND_PLATFORM_UNIX_1 COND_PLATFORM_UNIX_1_USE_GUI_1 COND_PLATFORM_UNIX_1_USE_PLUGINS_0 COND_PLATFORM_WIN32_0 COND_PLATFORM_WIN32_1 COND_SHARED_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_WXUSE_EXPAT_BUILTIN COND_SHARED_0_WXUSE_ODBC_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_COCOA COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_GTK COND_TOOLKIT_GTK_USE_GUI_1 COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_MAC COND_TOOLKIT_MAC_USE_GUI_1 COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_MAC_WXUNIV_0 COND_TOOLKIT_MGL COND_TOOLKIT_MGL_USE_GUI_1 COND_TOOLKIT_MOTIF COND_TOOLKIT_MOTIF_USE_GUI_1 COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_MSW COND_TOOLKIT_MSW_USE_GUI_1 COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_MSW_WXUNIV_0 COND_TOOLKIT_PM COND_TOOLKIT_PM_USE_GUI_1 COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_PM_WXUNIV_0 COND_TOOLKIT_WINCE COND_TOOLKIT_WINCE_USE_GUI_1 COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_X11 COND_TOOLKIT_X11_USE_GUI_1 COND_UNICODE_1 COND_USE_EXCEPTIONS_0 COND_USE_EXCEPTIONS_1 COND_USE_GUI_0 COND_USE_GUI_1 COND_USE_GUI_1_WXUNIV_0 COND_USE_GUI_1_WXUNIV_1 COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN COND_USE_ODBC_1 COND_USE_PLUGINS_0 COND_USE_SOSYMLINKS_1 COND_USE_SOVERLINUX_1 COND_USE_SOVERSION_0 COND_USE_SOVERSOLARIS_1 COND_WITH_PLUGIN_SDL_1 COND_WITH_SDL_1 COND_WXUNIV_1 COND_WXUSE_EXPAT_BUILTIN COND_WXUSE_LIBJPEG_BUILTIN COND_WXUSE_LIBPNG_BUILTIN COND_WXUSE_LIBTIFF_BUILTIN COND_WXUSE_ODBC_BUILTIN COND_WXUSE_REGEX_BUILTIN COND_WXUSE_ZLIB_BUILTIN PATH_IFS WX_MAJOR_VERSION_NUMBER WX_MINOR_VERSION_NUMBER WX_RELEASE_NUMBER WX_LIBRARY_NAME_STATIC WX_LIBRARY_NAME_SHARED WX_LIBRARY_BASENAME_NOGUI WX_LIBRARY_BASENAME_GUI WX_LIBRARY_IMPORTLIB WX_TARGET_LIBRARY WX_LIBRARY_LINK1 WX_LIBRARY_LINK2 PROGRAM_EXT WX_LIBRARY_NAME_STATIC_GL WX_LIBRARY_NAME_SHARED_GL WX_TARGET_LIBRARY_GL WX_LIBRARY_LINK1_GL WX_LIBRARY_LINK2_GL WX_ALL WX_ALL_INSTALLED SHARED_LD WX_TARGET_LIBRARY_TYPE STATIC_FLAG WXDEBUG_DEFINE USE_GUI AFMINSTALL WIN32INSTALL TOOLKIT TOOLKIT_DIR TOOLKIT_VPATH TOOLCHAIN_NAME TOOLCHAIN_DEFS TOOLCHAIN_DLL_DEFS top_builddir_wxconfig cross_compiling WXCONFIG_EXTRALIBS WXCONFIG_LIBS WXCONFIG_LIBS_GL WXCONFIG_LIBS_STATIC WXCONFIG_LIBS_STATIC_GL WXCONFIG_INCLUDE WXCONFIG_RPATH WXCONFIG_LDFLAGS_GUI WXCONFIG_DATA_FILE WX_LARGEFILE_FLAGS GCC_PRAGMA_FLAGS CODE_GEN_FLAGS CODE_GEN_FLAGS_CXX ALL_OBJECTS ALL_HEADERS ALL_SOURCES GUIDIST PORT_FILES DISTDIR SAMPLES_SUBDIRS LDFLAGS_GL LDFLAGS_VERSIONING LDFLAGS_EXE OPENGL_LIBS DMALLOC_LIBS WX_VERSION_TAG RESFLAGS RESPROGRAMOBJ WX_RESOURCES_MACOSX_ASCII WX_RESOURCES_MACOSX_DATA LIBWXMACRES MACRESCOMP MACSETFILE MACRESWXCONFIG GCC DLLTOOL AS LD MAKEINFO INSTALL_LIBRARY CPPUNIT_CONFIG LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP CXX CXXFLAGS ac_ct_CXX RANLIB ac_ct_RANLIB AR INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA STRIP IF_GNU_MAKE LN_S CXXCPP subdirs PKG_CONFIG GTK_CFLAGS GTK_LIBS GTK_CONFIG PANGOFT2_CFLAGS PANGOFT2_LIBS X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS PANGOX_CFLAGS PANGOX_LIBS PANGOXFT_CFLAGS PANGOXFT_LIBS RESCOMP DEREZ SETFILE LIBICONV EXTRALIBS_ESD SDL_CONFIG SDL_CFLAGS SDL_LIBS CORE_BASE_LIBS CORE_GUI_LIBS wxUSE_ZLIB wxUSE_REGEX wxUSE_EXPAT wxUSE_ODBC wxUSE_LIBJPEG wxUSE_LIBPNG wxUSE_LIBTIFF VENDOR OFFICIAL_BUILD WXUNIV MONOLITHIC USE_PLUGINS EXTRALIBS EXTRALIBS_XML EXTRALIBS_HTML EXTRALIBS_ODBC EXTRALIBS_GUI EXTRALIBS_OPENGL EXTRALIBS_SDL WITH_PLUGIN_SDL UNICODE BUILD DEBUG_INFO DEBUG_FLAG SHARED TOOLKIT_LOWERCASE TOOLKIT_VERSION SAMPLES_RPATH_FLAG SAMPLES_RPATH_POSTLINK HOST_SUFFIX CPPUNIT_CFLAGS CPPUNIT_LIBS SET_MAKE MAKE_SET ac_ct_AR ac_ct_STRIP NM ac_ct_NM INSTALL_DIR LDFLAGS_GUI PLATFORM_UNIX PLATFORM_WIN32 PLATFORM_MSDOS PLATFORM_MAC PLATFORM_MACOSX PLATFORM_OS2 SO_SUFFIX SO_SUFFIX_MODULE DLLIMP_SUFFIX LIBPREFIX LIBEXT DLLPREFIX DLLPREFIX_MODULE AIX_CXX_LD SHARED_LD_CC SHARED_LD_CXX SHARED_LD_MODULE_CC SHARED_LD_MODULE_CXX PIC_FLAG USE_SOVERSION USE_SOVERLINUX USE_SOVERSOLARIS USE_MACVERSION USE_SOSYMLINKS SONAME_FLAG DEPS_TRACKING GCC_PCH 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_DEPS_TRACKING_0 COND_DEPS_TRACKING_1 COND_GCC_PCH_1 COND_MONOLITHIC_0 COND_MONOLITHIC_0_SHARED_0 COND_MONOLITHIC_0_SHARED_0_USE_GUI_1 COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1 COND_MONOLITHIC_0_SHARED_0_USE_HTML_1 COND_MONOLITHIC_0_SHARED_0_USE_ODBC_1 COND_MONOLITHIC_0_SHARED_1 COND_MONOLITHIC_0_SHARED_1_USE_GUI_1 COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1 COND_MONOLITHIC_0_SHARED_1_USE_HTML_1 COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1 COND_MONOLITHIC_0_USE_ODBC_1 COND_MONOLITHIC_1 COND_MONOLITHIC_1_SHARED_0 COND_MONOLITHIC_1_SHARED_1 COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1 COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1 COND_PLATFORM_MACOSX_0_USE_SOVERSION_1 COND_PLATFORM_MACOSX_1 COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA COND_PLATFORM_MACOSX_1_TOOLKIT_GTK COND_PLATFORM_MACOSX_1_TOOLKIT_MAC COND_PLATFORM_MACOSX_1_TOOLKIT_MOTIF COND_PLATFORM_MACOSX_1_TOOLKIT_X11 COND_PLATFORM_MACOSX_1_USE_GUI_1 COND_PLATFORM_MACOSX_1_USE_SOVERSION_1 COND_PLATFORM_MAC_1 COND_PLATFORM_OS2_1 COND_PLATFORM_UNIX_0 COND_PLATFORM_UNIX_1 COND_PLATFORM_UNIX_1_USE_GUI_1 COND_PLATFORM_UNIX_1_USE_PLUGINS_0 COND_PLATFORM_WIN32_0 COND_PLATFORM_WIN32_1 COND_SHARED_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_WXUSE_EXPAT_BUILTIN COND_SHARED_0_WXUSE_ODBC_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_COCOA COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_GTK COND_TOOLKIT_GTK_USE_GUI_1 COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0 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_MOTIF_USE_GUI_1 COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_MSW COND_TOOLKIT_MSW_USE_GUI_1 COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_PM COND_TOOLKIT_PM_USE_GUI_1 COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_WINCE COND_TOOLKIT_WINCE_USE_GUI_1 COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_X11 COND_TOOLKIT_X11_USE_GUI_1 COND_UNICODE_1 COND_USE_EXCEPTIONS_0 COND_USE_EXCEPTIONS_1 COND_USE_GUI_0 COND_USE_GUI_1 COND_USE_GUI_1_WXUNIV_0 COND_USE_GUI_1_WXUNIV_1 COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN COND_USE_PLUGINS_0 COND_USE_SOSYMLINKS_1 COND_USE_SOVERLINUX_1 COND_USE_SOVERSION_0 COND_USE_SOVERSOLARIS_1 COND_WITH_PLUGIN_SDL_1 COND_WXUNIV_1 COND_WXUSE_EXPAT_BUILTIN COND_WXUSE_LIBJPEG_BUILTIN COND_WXUSE_LIBPNG_BUILTIN COND_WXUSE_LIBTIFF_BUILTIN COND_WXUSE_ODBC_BUILTIN COND_WXUSE_REGEX_BUILTIN COND_WXUSE_ZLIB_BUILTIN COND_TOOLKIT_MAC_WXUNIV_0 COND_TOOLKIT_MSW_WXUNIV_0 COND_TOOLKIT_PM_WXUNIV_0 COND_USE_ODBC_1 PATH_IFS WX_MAJOR_VERSION_NUMBER WX_MINOR_VERSION_NUMBER WX_RELEASE_NUMBER WX_SUBRELEASE_NUMBER WX_LIBRARY_NAME_STATIC WX_LIBRARY_NAME_SHARED WX_LIBRARY_BASENAME_NOGUI WX_LIBRARY_BASENAME_GUI WX_LIBRARY_IMPORTLIB WX_TARGET_LIBRARY WX_LIBRARY_LINK1 WX_LIBRARY_LINK2 PROGRAM_EXT WX_LIBRARY_NAME_STATIC_GL WX_LIBRARY_NAME_SHARED_GL WX_TARGET_LIBRARY_GL WX_LIBRARY_LINK1_GL WX_LIBRARY_LINK2_GL WX_ALL WX_ALL_INSTALLED SHARED_LD WX_TARGET_LIBRARY_TYPE STATIC_FLAG WXDEBUG_DEFINE USE_GUI AFMINSTALL WIN32INSTALL TOOLKIT TOOLKIT_DIR TOOLKIT_VPATH TOOLCHAIN_NAME TOOLCHAIN_DEFS TOOLCHAIN_DLL_DEFS top_builddir_wxconfig cross_compiling WXCONFIG_EXTRALIBS WXCONFIG_LIBS WXCONFIG_LIBS_GL WXCONFIG_LIBS_STATIC WXCONFIG_LIBS_STATIC_GL WXCONFIG_INCLUDE WXCONFIG_RPATH WXCONFIG_LDFLAGS_GUI WXCONFIG_DATA_FILE WX_LARGEFILE_FLAGS GCC_PRAGMA_FLAGS CODE_GEN_FLAGS CODE_GEN_FLAGS_CXX ALL_OBJECTS ALL_HEADERS ALL_SOURCES GUIDIST PORT_FILES DISTDIR SAMPLES_SUBDIRS LDFLAGS_GL LDFLAGS_VERSIONING LDFLAGS_EXE OPENGL_LIBS DMALLOC_LIBS WX_VERSION_TAG RESFLAGS RESPROGRAMOBJ WX_RESOURCES_MACOSX_ASCII WX_RESOURCES_MACOSX_DATA LIBWXMACRES MACRESCOMP MACSETFILE MACRESWXCONFIG GCC DLLTOOL AS LD MAKEINFO INSTALL_LIBRARY CPPUNIT_CONFIG LIBOBJS LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -1037,7 +1037,8 @@ Optional Features:
   --disable-gtktest       Do not try to compile and run a test GTK program
   --disable-sdltest       Do not try to compile and run a test SDL program
   --enable-omf            use OMF object format (OS/2)
-  --disable-precomp-headers  don't use precompiled headers even if compiler can
+  --disable-precomp-headers
+                          don't use precompiled headers even if compiler can
 
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
@@ -1650,6 +1651,7 @@ test -n "$target_alias" &&
 WX_MAJOR_VERSION_NUMBER=2
 WX_MINOR_VERSION_NUMBER=5
 WX_RELEASE_NUMBER=2
+WX_SUBRELEASE_NUMBER=3
 
 WX_VERSION=$WX_MAJOR_VERSION_NUMBER.$WX_MINOR_VERSION_NUMBER.$WX_RELEASE_NUMBER
 WX_RELEASE=$WX_MAJOR_VERSION_NUMBER.$WX_MINOR_VERSION_NUMBER
@@ -11991,15 +11993,6 @@ case ${INSTALL} in
      INSTALL=`pwd`/${INSTALL} ;;
 esac
 
-case ${host} in
-    *-hp-hpux* )
-        INSTALL_DIR="mkdir"
-        ;;
-
-    *)  INSTALL_DIR="$INSTALL -d"
-        ;;
-esac
-
 
 case "${host}" in
 
@@ -12490,7 +12483,7 @@ fi
 echo "$as_me:$LINENO: result: $ac_cv_strings_strcasecmp" >&5
 echo "${ECHO_T}$ac_cv_strings_strcasecmp" >&6
 
-          if test x"$ac_cv_string_strcasecmp" = "xyes"; then
+          if test x"$ac_cv_strings_strcasecmp" = "xyes"; then
               cat >>confdefs.h <<\_ACEOF
 #define HAVE_STRCASECMP_IN_STRINGS_H 1
 _ACEOF
@@ -18705,12 +18698,6 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
 
 
-  if test "$cross_compiling" = "yes"; then
-    cat >>confdefs.h <<\_ACEOF
-#define wxUSE_IOSTREAMH 1
-_ACEOF
-
-  else
 
 
     ac_ext=cc
@@ -18886,7 +18873,6 @@ 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
 
 
 
@@ -37177,6 +37163,7 @@ if test "$wxUSE_SPLASH" = "yes"; then
 #define wxUSE_SPLASH 1
 _ACEOF
 
+    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS splash"
 fi
 
 if test "$wxUSE_STARTUP_TIPS" = "yes"; then
@@ -37731,18 +37718,18 @@ if test "$GXX" = yes ; then
 
 EXTRA_CFLAGS="$WXDEBUG $WXODBCFLAG $PROFILE $OPTIMISE"
 
-CPPFLAGS=`echo $WXDEBUG_DEFINE $INCLUDES $CPPFLAGS | sed 's/ \\+/ /g'`
-CFLAGS=`echo $CODE_GEN_FLAGS $EXTRA_CFLAGS $CFLAGS $CXXWARNINGS | sed 's/ \\+/ /g'`
-CXXFLAGS=`echo $CODE_GEN_FLAGS $CODE_GEN_FLAGS_CXX $EXTRA_CFLAGS $CXXFLAGS $CXXWARNINGS | sed 's/ \+/ /g'`
+CPPFLAGS=`echo $WXDEBUG_DEFINE $INCLUDES $CPPFLAGS`
+CFLAGS=`echo $CODE_GEN_FLAGS $EXTRA_CFLAGS $CFLAGS $CXXWARNINGS`
+CXXFLAGS=`echo $CODE_GEN_FLAGS $CODE_GEN_FLAGS_CXX $EXTRA_CFLAGS $CXXFLAGS $CXXWARNINGS`
 
 
-LIBS=`echo $LIBS | sed 's/ \+/ /g'`
+LIBS=`echo $LIBS`
 EXTRALIBS="$LDFLAGS $LDFLAGS_VERSIONING $LIBS $DMALLOC_LIBS"
 EXTRALIBS_XML="$EXPAT_LINK"
 EXTRALIBS_HTML="$MSPACK_LINK"
 EXTRALIBS_ODBC="$ODBC_LINK"
 if test "$wxUSE_GUI" = "yes"; then
-    EXTRALIBS_GUI=`echo $GUI_TK_LIBRARY $PNG_LINK $JPEG_LINK $TIFF_LINK $WEBKIT_LINK | sed 's/ \+/ /g'`
+    EXTRALIBS_GUI=`echo $GUI_TK_LIBRARY $PNG_LINK $JPEG_LINK $TIFF_LINK $WEBKIT_LINK`
 fi
 if test "$wxUSE_OPENGL" = "yes"; then
     EXTRALIBS_OPENGL="$LDFLAGS_GL $OPENGL_LIBS"
@@ -38307,7 +38294,7 @@ fi
 
     case ${BAKEFILE_HOST} in
         *-hp-hpux* )
-            INSTALL_DIR="mkdir"
+            INSTALL_DIR="mkdir -p"
             ;;
         *)  INSTALL_DIR="$INSTALL -d"
             ;;
@@ -39561,6 +39548,9 @@ fi
     BAKEFILE_BAKEFILE_M4_VERSION="0.1.4"
 
 
+
+
+
 BAKEFILE_AUTOCONF_INC_M4_VERSION="0.1.4"
 
 
@@ -39629,7 +39619,6 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 
                     echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6
-                                                            CPPFLAGS="-fpch-deps $CPPFLAGS"
                     GCC_PCH=1
 
 else
@@ -39761,7 +39750,6 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 
                     echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6
-                                                            CPPFLAGS="-fpch-deps $CPPFLAGS"
                     GCC_PCH=1
 
 else
@@ -39825,7 +39813,6 @@ EOF
 
 
 
-
     COND_BUILD_DEBUG="#"
     if test "x$BUILD" = "xdebug" ; then
         COND_BUILD_DEBUG=""
@@ -40011,6 +39998,16 @@ EOF
         COND_PLATFORM_MACOSX_1_TOOLKIT_MAC=""
     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=""
+    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=""
@@ -40156,11 +40153,6 @@ EOF
         COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0=""
     fi
 
-    COND_TOOLKIT_MAC_WXUNIV_0="#"
-    if test "x$TOOLKIT" = "xMAC" -a "x$WXUNIV" = "x0" ; then
-        COND_TOOLKIT_MAC_WXUNIV_0=""
-    fi
-
     COND_TOOLKIT_MGL="#"
     if test "x$TOOLKIT" = "xMGL" ; then
         COND_TOOLKIT_MGL=""
@@ -40201,11 +40193,6 @@ EOF
         COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0=""
     fi
 
-    COND_TOOLKIT_MSW_WXUNIV_0="#"
-    if test "x$TOOLKIT" = "xMSW" -a "x$WXUNIV" = "x0" ; then
-        COND_TOOLKIT_MSW_WXUNIV_0=""
-    fi
-
     COND_TOOLKIT_PM="#"
     if test "x$TOOLKIT" = "xPM" ; then
         COND_TOOLKIT_PM=""
@@ -40221,11 +40208,6 @@ EOF
         COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0=""
     fi
 
-    COND_TOOLKIT_PM_WXUNIV_0="#"
-    if test "x$TOOLKIT" = "xPM" -a "x$WXUNIV" = "x0" ; then
-        COND_TOOLKIT_PM_WXUNIV_0=""
-    fi
-
     COND_TOOLKIT_WINCE="#"
     if test "x$TOOLKIT" = "xWINCE" ; then
         COND_TOOLKIT_WINCE=""
@@ -40301,11 +40283,6 @@ EOF
         COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN=""
     fi
 
-    COND_USE_ODBC_1="#"
-    if test "x$USE_ODBC" = "x1" ; then
-        COND_USE_ODBC_1=""
-    fi
-
     COND_USE_PLUGINS_0="#"
     if test "x$USE_PLUGINS" = "x0" ; then
         COND_USE_PLUGINS_0=""
@@ -40336,11 +40313,6 @@ EOF
         COND_WITH_PLUGIN_SDL_1=""
     fi
 
-    COND_WITH_SDL_1="#"
-    if test "x$WITH_SDL" = "x1" ; then
-        COND_WITH_SDL_1=""
-    fi
-
     COND_WXUNIV_1="#"
     if test "x$WXUNIV" = "x1" ; then
         COND_WXUNIV_1=""
@@ -40566,6 +40538,16 @@ EOF
         COND_PLATFORM_MACOSX_1_TOOLKIT_MAC=""
     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=""
+    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=""
@@ -40711,6 +40693,11 @@ EOF
         COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0=""
     fi
 
+    COND_TOOLKIT_MAC_WXUNIV_0="#"
+    if test "x$TOOLKIT" = "xMAC" -a "x$WXUNIV" = "x0" ; then
+        COND_TOOLKIT_MAC_WXUNIV_0=""
+    fi
+
     COND_TOOLKIT_MGL="#"
     if test "x$TOOLKIT" = "xMGL" ; then
         COND_TOOLKIT_MGL=""
@@ -40751,6 +40738,11 @@ EOF
         COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0=""
     fi
 
+    COND_TOOLKIT_MSW_WXUNIV_0="#"
+    if test "x$TOOLKIT" = "xMSW" -a "x$WXUNIV" = "x0" ; then
+        COND_TOOLKIT_MSW_WXUNIV_0=""
+    fi
+
     COND_TOOLKIT_PM="#"
     if test "x$TOOLKIT" = "xPM" ; then
         COND_TOOLKIT_PM=""
@@ -40766,6 +40758,11 @@ EOF
         COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0=""
     fi
 
+    COND_TOOLKIT_PM_WXUNIV_0="#"
+    if test "x$TOOLKIT" = "xPM" -a "x$WXUNIV" = "x0" ; then
+        COND_TOOLKIT_PM_WXUNIV_0=""
+    fi
+
     COND_TOOLKIT_WINCE="#"
     if test "x$TOOLKIT" = "xWINCE" ; then
         COND_TOOLKIT_WINCE=""
@@ -41835,6 +41832,7 @@ cat >>$CONFIG_STATUS <<_ACEOF
 
             TOOLCHAIN_NAME="${TOOLCHAIN_NAME}"
             WXCONFIG_DATA_FILE="${WXCONFIG_DATA_FILE}"
+            WX_RELEASE="${WX_RELEASE}"
             LN_S="${LN_S}"
 
 
@@ -42103,6 +42101,8 @@ s,@COND_PLATFORM_MACOSX_1@,$COND_PLATFORM_MACOSX_1,;t t
 s,@COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA@,$COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA,;t t
 s,@COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@,$COND_PLATFORM_MACOSX_1_TOOLKIT_GTK,;t t
 s,@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@,$COND_PLATFORM_MACOSX_1_TOOLKIT_MAC,;t t
+s,@COND_PLATFORM_MACOSX_1_TOOLKIT_MOTIF@,$COND_PLATFORM_MACOSX_1_TOOLKIT_MOTIF,;t t
+s,@COND_PLATFORM_MACOSX_1_TOOLKIT_X11@,$COND_PLATFORM_MACOSX_1_TOOLKIT_X11,;t t
 s,@COND_PLATFORM_MACOSX_1_USE_GUI_1@,$COND_PLATFORM_MACOSX_1_USE_GUI_1,;t t
 s,@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@,$COND_PLATFORM_MACOSX_1_USE_SOVERSION_1,;t t
 s,@COND_PLATFORM_MAC_1@,$COND_PLATFORM_MAC_1,;t t
@@ -42132,7 +42132,6 @@ s,@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@,$COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0,;t
 s,@COND_TOOLKIT_MAC@,$COND_TOOLKIT_MAC,;t t
 s,@COND_TOOLKIT_MAC_USE_GUI_1@,$COND_TOOLKIT_MAC_USE_GUI_1,;t t
 s,@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@,$COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0,;t t
-s,@COND_TOOLKIT_MAC_WXUNIV_0@,$COND_TOOLKIT_MAC_WXUNIV_0,;t t
 s,@COND_TOOLKIT_MGL@,$COND_TOOLKIT_MGL,;t t
 s,@COND_TOOLKIT_MGL_USE_GUI_1@,$COND_TOOLKIT_MGL_USE_GUI_1,;t t
 s,@COND_TOOLKIT_MOTIF@,$COND_TOOLKIT_MOTIF,;t t
@@ -42141,11 +42140,9 @@ s,@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@,$COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0
 s,@COND_TOOLKIT_MSW@,$COND_TOOLKIT_MSW,;t t
 s,@COND_TOOLKIT_MSW_USE_GUI_1@,$COND_TOOLKIT_MSW_USE_GUI_1,;t t
 s,@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@,$COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0,;t t
-s,@COND_TOOLKIT_MSW_WXUNIV_0@,$COND_TOOLKIT_MSW_WXUNIV_0,;t t
 s,@COND_TOOLKIT_PM@,$COND_TOOLKIT_PM,;t t
 s,@COND_TOOLKIT_PM_USE_GUI_1@,$COND_TOOLKIT_PM_USE_GUI_1,;t t
 s,@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@,$COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0,;t t
-s,@COND_TOOLKIT_PM_WXUNIV_0@,$COND_TOOLKIT_PM_WXUNIV_0,;t t
 s,@COND_TOOLKIT_WINCE@,$COND_TOOLKIT_WINCE,;t t
 s,@COND_TOOLKIT_WINCE_USE_GUI_1@,$COND_TOOLKIT_WINCE_USE_GUI_1,;t t
 s,@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@,$COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0,;t t
@@ -42161,14 +42158,12 @@ s,@COND_USE_GUI_1_WXUNIV_1@,$COND_USE_GUI_1_WXUNIV_1,;t t
 s,@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@,$COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN,;t t
 s,@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@,$COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN,;t t
 s,@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@,$COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN,;t t
-s,@COND_USE_ODBC_1@,$COND_USE_ODBC_1,;t t
 s,@COND_USE_PLUGINS_0@,$COND_USE_PLUGINS_0,;t t
 s,@COND_USE_SOSYMLINKS_1@,$COND_USE_SOSYMLINKS_1,;t t
 s,@COND_USE_SOVERLINUX_1@,$COND_USE_SOVERLINUX_1,;t t
 s,@COND_USE_SOVERSION_0@,$COND_USE_SOVERSION_0,;t t
 s,@COND_USE_SOVERSOLARIS_1@,$COND_USE_SOVERSOLARIS_1,;t t
 s,@COND_WITH_PLUGIN_SDL_1@,$COND_WITH_PLUGIN_SDL_1,;t t
-s,@COND_WITH_SDL_1@,$COND_WITH_SDL_1,;t t
 s,@COND_WXUNIV_1@,$COND_WXUNIV_1,;t t
 s,@COND_WXUSE_EXPAT_BUILTIN@,$COND_WXUSE_EXPAT_BUILTIN,;t t
 s,@COND_WXUSE_LIBJPEG_BUILTIN@,$COND_WXUSE_LIBJPEG_BUILTIN,;t t
@@ -42177,10 +42172,15 @@ s,@COND_WXUSE_LIBTIFF_BUILTIN@,$COND_WXUSE_LIBTIFF_BUILTIN,;t t
 s,@COND_WXUSE_ODBC_BUILTIN@,$COND_WXUSE_ODBC_BUILTIN,;t t
 s,@COND_WXUSE_REGEX_BUILTIN@,$COND_WXUSE_REGEX_BUILTIN,;t t
 s,@COND_WXUSE_ZLIB_BUILTIN@,$COND_WXUSE_ZLIB_BUILTIN,;t t
+s,@COND_TOOLKIT_MAC_WXUNIV_0@,$COND_TOOLKIT_MAC_WXUNIV_0,;t t
+s,@COND_TOOLKIT_MSW_WXUNIV_0@,$COND_TOOLKIT_MSW_WXUNIV_0,;t t
+s,@COND_TOOLKIT_PM_WXUNIV_0@,$COND_TOOLKIT_PM_WXUNIV_0,;t t
+s,@COND_USE_ODBC_1@,$COND_USE_ODBC_1,;t t
 s,@PATH_IFS@,$PATH_IFS,;t t
 s,@WX_MAJOR_VERSION_NUMBER@,$WX_MAJOR_VERSION_NUMBER,;t t
 s,@WX_MINOR_VERSION_NUMBER@,$WX_MINOR_VERSION_NUMBER,;t t
 s,@WX_RELEASE_NUMBER@,$WX_RELEASE_NUMBER,;t t
+s,@WX_SUBRELEASE_NUMBER@,$WX_SUBRELEASE_NUMBER,;t t
 s,@WX_LIBRARY_NAME_STATIC@,$WX_LIBRARY_NAME_STATIC,;t t
 s,@WX_LIBRARY_NAME_SHARED@,$WX_LIBRARY_NAME_SHARED,;t t
 s,@WX_LIBRARY_BASENAME_NOGUI@,$WX_LIBRARY_BASENAME_NOGUI,;t t
@@ -42853,18 +42853,20 @@ echo "$as_me: executing $ac_dest commands" >&6;}
               mv -f setup.h lib/wx/include/${TOOLCHAIN_NAME}/wx/setup.h
             fi
 
-            if test -f wx-config; then
+                                                                                                if test ! -h wx-config; then
                 chmod +x wx-config
                 mv -f wx-config lib/wx/config/${WXCONFIG_DATA_FILE}
-                ( cd lib/wx/config ;
-                  rm -f ${TOOLCHAIN_NAME}
-                  ${LN_S} ${WXCONFIG_DATA_FILE} ${TOOLCHAIN_NAME} )
+                ${LN_S} wx-config-${WX_RELEASE} wx-config
             fi
+            ( cd lib/wx/config ;
+              rm -f ${TOOLCHAIN_NAME}
+              ${LN_S} ${WXCONFIG_DATA_FILE} ${TOOLCHAIN_NAME} )
+
             if test -f wx-config-wrapper; then
                 chmod +x wx-config-wrapper
-                mv -f wx-config-wrapper wx-config
+                mv -f wx-config-wrapper wx-config-${WX_RELEASE}
                 rm -f wx${TOOLCHAIN_NAME}-config
-                ${LN_S} wx-config wx${TOOLCHAIN_NAME}-config
+                ${LN_S} wx-config-${WX_RELEASE} wx${TOOLCHAIN_NAME}-config
             fi
            ;;
   esac