#! /bin/sh
# From configure.in Id: configure.in.
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.57 for wxWindows 2.5.0.
+# Generated by GNU Autoconf 2.57 for wxWindows 2.5.1.
#
# Report bugs to <wx-dev@lists.wxwindows.org>.
#
# Identity of this package.
PACKAGE_NAME='wxWindows'
PACKAGE_TARNAME='wxwindows'
-PACKAGE_VERSION='2.5.0'
-PACKAGE_STRING='wxWindows 2.5.0'
+PACKAGE_VERSION='2.5.1'
+PACKAGE_STRING='wxWindows 2.5.1'
PACKAGE_BUGREPORT='wx-dev@lists.wxwindows.org'
ac_unique_file="wx-config.in"
#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 YACC LEX LEXLIB LEX_OUTPUT_ROOT 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 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 EXTRALIBS EXTRALIBS_XML EXTRALIBS_ODBC EXTRALIBS_GUI EXTRALIBS_OPENGL UNICODE BUILD DEBUG_INFO DEBUG_FLAG SHARED TOOLKIT_LOWERCASE TOOLKIT_VERSION SAMPLES_RPATH_FLAG SAMPLES_RPATH_POSTLINK HOST_SUFFIX SET_MAKE MAKE_SET INSTALL_DIR LDFLAGS_GUI PLATFORM_UNIX PLATFORM_WIN32 PLATFORM_MSDOS PLATFORM_MAC PLATFORM_MACOSX SO_SUFFIX SO_SUFFIX_MODULE 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_RELEASE COND_BUILD_RELEASE_DEBUG_INFO_DEFAULT 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_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_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_SOVERSION_1 COND_PLATFORM_MAC_1 COND_PLATFORM_UNIX_0 COND_PLATFORM_UNIX_1 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_OS2 COND_TOOLKIT_OS2_USE_GUI_1 COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_X11 COND_TOOLKIT_X11_USE_GUI_1 COND_UNICODE_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_SOSYMLINKS_1 COND_USE_SOVERLINUX_1 COND_USE_SOVERSION_0 COND_USE_SOVERSOLARIS_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 LEX_STEM 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 WX_LARGEFILE_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 MACOSX_BUNDLE LIBWXMACRES MACRESCOMP MACSETFILE MACRESWXCONFIG GCC DLLTOOL AS NM LD MAKEINFO INSTALL_LIBRARY 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 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 EXTRALIBS EXTRALIBS_XML EXTRALIBS_HTML EXTRALIBS_ODBC EXTRALIBS_GUI EXTRALIBS_OPENGL UNICODE BUILD DEBUG_INFO DEBUG_FLAG SHARED TOOLKIT_LOWERCASE TOOLKIT_VERSION SAMPLES_RPATH_FLAG SAMPLES_RPATH_POSTLINK HOST_SUFFIX 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 LIBPREFIX 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_RELEASE COND_BUILD_RELEASE_DEBUG_INFO_DEFAULT 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_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_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_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_SOSYMLINKS_1 COND_USE_SOVERLINUX_1 COND_USE_SOVERSION_0 COND_USE_SOVERSOLARIS_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 WX_LARGEFILE_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 MACOSX_BUNDLE LIBWXMACRES MACRESCOMP MACSETFILE MACRESWXCONFIG GCC DLLTOOL AS LD MAKEINFO INSTALL_LIBRARY LIBOBJS LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
# 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 wxWindows 2.5.0 to adapt to many kinds of systems.
+\`configure' configures wxWindows 2.5.1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of wxWindows 2.5.0:";;
+ short | recursive ) echo "Configuration of wxWindows 2.5.1:";;
esac
cat <<\_ACEOF
--enable-no_exceptions create code without C++ exceptions handling
--enable-permissive compile code disregarding strict ANSI
--enable-no_deps create code without dependency information
- --enable-compat20 enable wxWindows 2.0 compatibility
--enable-compat22 enable wxWindows 2.2 compatibility
--disable-compat24 disable wxWindows 2.4 compatibility
--enable-rpath=DIR output the rpath flag from wx-config
--enable-http use wxHTTP (requires wxProtocol
--enable-fileproto use wxFileProto class (requires wxProtocol
--enable-sockets use socket/network classes
- --enable-ole use OLE classes
+ --enable-ole use OLE classes (Win32 only)
--enable-dataobj use data object classes
--enable-ipc use interprocess communication (wxSocket etc.)
+ --enable-apple_ieee use the Apple IEEE codec
+ --enable-catch_segvs catch signals in wxApp::OnFatalException (Unix only)
--enable-cmdline use wxCmdLineParser class
--enable-datetime use wxDateTime class
- --enable-stopwatch use wxStopWatch class
--enable-dialupman use dialup network classes
- --enable-apple_ieee use the Apple IEEE codec
- --enable-timer use wxTimer class
- --enable-wave use wxWave class
- --enable-fraction use wxFraction class
--enable-dynlib use wxLibrary class for DLL loading
--enable-dynamicloader use (new) wxDynamicLibrary class
- --enable-longlong use wxLongLong class
+ --enable-exceptions build exception-safe library
+ --enable-ffile use wxFFile class
+ --enable-file use wxFile class
+ --enable-filesystem use virtual file systems classes
+ --enable-fontmap use font encodings conversion classes
+ --enable-fs_inet use virtual HTTP/FTP filesystems
+ --enable-fs_zip use virtual ZIP filesystems
--enable-geometry use geometry class
--enable-log use logging system
+ --enable-longlong use wxLongLong class
+ --enable-mimetype use wxMimeTypesManager
+ --enable-mslu use MS Layer for Unicode on Windows 9x (Win32 only)
+ --enable-snglinst use wxSingleInstanceChecker class
--enable-streams use wxStream etc classes
- --enable-file use wxFile classes
- --enable-ffile use wxFFile classes
+ --enable-std_iostreams use standard C++ stream classes
+ --enable-stopwatch use wxStopWatch class
+ --enable-sysoptions use wxSystemOptions
--enable-textbuf use wxTextBuffer class
--enable-textfile use wxTextFile class
- --enable-fontmap use font encodings conversion classes
+ --enable-timer use wxTimer class
--enable-unicode compile wxString with Unicode support
- --enable-mslu use MS Layer for Unicode on Windows 9x (win32 only)
+ --enable-wave use wxWave class
--enable-wxprintfv use wxWindows implementation of vprintf()
- --enable-std_iostreams use standard C++ stream classes
- --enable-filesystem use virtual file systems classes
- --enable-fs_inet use virtual HTTP/FTP filesystems
- --enable-fs_zip use virtual ZIP filesystems
--enable-zipstream use wxZipInputStream
- --enable-catch_segvs catch signals and pass them to wxApp::OnFatalException
- --enable-snglinst use wxSingleInstanceChecker class
- --enable-mimetype use wxMimeTypesManager
- --enable-sysoptions use wxSystemOptions
+ --enable-gzstream use wxGzipInputStream
--enable-url use wxURL class
--enable-protocol use wxProtocol class
--enable-protocol-http HTTP support in wxProtocol
--enable-gauge use wxGauge class
--enable-grid use wxGrid class
--enable-imaglist use wxImageList class
+ --enable-listbook use wxListbook class
--enable-listbox use wxListBox class
--enable-listctrl use wxListCtrl class
--enable-notebook use wxNotebook class
--with-libpng use libpng (PNG image format)
--with-libjpeg use libjpeg (JPEG file format)
--with-libtiff use libtiff (TIFF file format)
+ --with-libxpm use libxpm (XPM file format)
+ --with-libmspack use libmspack (CHM help files loading)
--with-opengl use OpenGL (or Mesa)
--with-dmalloc use dmalloc library (http://dmalloc.com/)
--with-regex enable support for wxRegEx class
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
-wxWindows configure 2.5.0
+wxWindows configure 2.5.1
generated by GNU Autoconf 2.57
Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by wxWindows $as_me 2.5.0, which was
+It was created by wxWindows $as_me 2.5.1, which was
generated by GNU Autoconf 2.57. Invocation command line was
$ $0 $@
WX_MAJOR_VERSION_NUMBER=2
WX_MINOR_VERSION_NUMBER=5
-WX_RELEASE_NUMBER=0
+WX_RELEASE_NUMBER=1
WX_VERSION=$WX_MAJOR_VERSION_NUMBER.$WX_MINOR_VERSION_NUMBER.$WX_RELEASE_NUMBER
WX_RELEASE=$WX_MAJOR_VERSION_NUMBER.$WX_MINOR_VERSION_NUMBER
WX_MSW_VERSION=$WX_MAJOR_VERSION_NUMBER$WX_MINOR_VERSION_NUMBER$WX_RELEASE_NUMBER
-WX_CURRENT=0
+WX_CURRENT=1
WX_REVISION=0
WX_AGE=0
USE_UNIX=1
+USE_OS2=0
USE_WIN32=0
USE_DOS=0
USE_BEOS=0
*-pc-os2_emx | *-pc-os2-emx )
cat >>confdefs.h <<\_ACEOF
#define __EMX__ 1
+_ACEOF
+
+ USE_OS2=1
+ cat >>confdefs.h <<\_ACEOF
+#define __OS2__ 1
_ACEOF
PROGRAM_EXT=".exe"
DEFAULT_DEFAULT_wxUSE_PM=1
+ CXX=gcc
+ LDFLAGS="$LDFLAGS -Zcrtdll -Zsysv-signals"
+ ac_executable_extensions=".exe"
+ export ac_executable_extensions
+ ac_save_IFS="$IFS"
+ IFS='\\'
+ ac_TEMP_PATH=
+ for ac_dir in $PATH; do
+ IFS=$ac_save_IFS
+ if test -z "$ac_TEMP_PATH"; then
+ ac_TEMP_PATH="$ac_dir"
+ else
+ ac_TEMP_PATH="$ac_TEMP_PATH/$ac_dir"
+ fi
+ done
+ export PATH="$ac_TEMP_PATH"
+ unset ac_TEMP_PATH
;;
powerpc-*-darwin* )
DEFAULT_wxUSE_DMALLOC=no
DEFAULT_wxUSE_APPLE_IEEE=no
+ DEFAULT_wxUSE_EXCEPTIONS=no
DEFAULT_wxUSE_LOG=yes
DEFAULT_wxUSE_LOGWINDOW=no
DEFAULT_wxUSE_LOGGUI=no
DEFAULT_wxUSE_LIBPNG=no
DEFAULT_wxUSE_LIBJPEG=no
DEFAULT_wxUSE_LIBTIFF=no
+ DEFAULT_wxUSE_LIBXPM=no
DEFAULT_wxUSE_ODBC=no
DEFAULT_wxUSE_OPENGL=no
DEFAULT_wxUSE_FS_ZIP=no
DEFAULT_wxUSE_BUSYINFO=no
DEFAULT_wxUSE_ZIPSTREAM=no
+ DEFAULT_wxUSE_GZSTREAM=no
DEFAULT_wxUSE_VALIDATORS=no
DEFAULT_wxUSE_ACCEL=no
DEFAULT_wxUSE_GAUGE=no
DEFAULT_wxUSE_GRID=no
DEFAULT_wxUSE_IMAGLIST=no
+ DEFAULT_wxUSE_LISTBOOK=no
DEFAULT_wxUSE_LISTBOX=no
DEFAULT_wxUSE_LISTCTRL=no
DEFAULT_wxUSE_NOTEBOOK=no
DEFAULT_wxUSE_DMALLOC=no
DEFAULT_wxUSE_APPLE_IEEE=yes
+ DEFAULT_wxUSE_EXCEPTIONS=yes
DEFAULT_wxUSE_LOG=yes
DEFAULT_wxUSE_LOGWINDOW=yes
DEFAULT_wxUSE_LOGGUI=yes
DEFAULT_wxUSE_GUI=yes
- DEFAULT_wxUSE_REGEX=yes
+ DEFAULT_wxUSE_REGEX=sys
DEFAULT_wxUSE_XML=yes
- DEFAULT_wxUSE_EXPAT=yes
- DEFAULT_wxUSE_ZLIB=yes
- DEFAULT_wxUSE_LIBPNG=yes
- DEFAULT_wxUSE_LIBJPEG=yes
- DEFAULT_wxUSE_LIBTIFF=yes
+ DEFAULT_wxUSE_EXPAT=sys
+ DEFAULT_wxUSE_ZLIB=sys
+ DEFAULT_wxUSE_LIBPNG=sys
+ DEFAULT_wxUSE_LIBJPEG=sys
+ DEFAULT_wxUSE_LIBTIFF=sys
+ DEFAULT_wxUSE_LIBXPM=sys
+ DEFAULT_wxUSE_LIBMSPACK=yes
DEFAULT_wxUSE_ODBC=no
DEFAULT_wxUSE_OPENGL=no
DEFAULT_wxUSE_FS_ZIP=yes
DEFAULT_wxUSE_BUSYINFO=yes
DEFAULT_wxUSE_ZIPSTREAM=yes
+ DEFAULT_wxUSE_GZSTREAM=yes
DEFAULT_wxUSE_VALIDATORS=yes
DEFAULT_wxUSE_ACCEL=yes
DEFAULT_wxUSE_GAUGE=yes
DEFAULT_wxUSE_GRID=yes
DEFAULT_wxUSE_IMAGLIST=yes
+ DEFAULT_wxUSE_LISTBOOK=yes
DEFAULT_wxUSE_LISTBOX=yes
DEFAULT_wxUSE_LISTCTRL=yes
DEFAULT_wxUSE_NOTEBOOK=yes
fi
+ echo "$as_me:$LINENO: checking for --with-libxpm" >&5
+echo $ECHO_N "checking for --with-libxpm... $ECHO_C" >&6
+ no_cache=0
+
+# Check whether --with-libxpm or --without-libxpm was given.
+if test "${with_libxpm+set}" = set; then
+ withval="$with_libxpm"
+
+ if test "$withval" = yes; then
+ ac_cv_use_libxpm='wxUSE_LIBXPM=yes'
+ elif test "$withval" = no; then
+ ac_cv_use_libxpm='wxUSE_LIBXPM=no'
+ elif test "$withval" = sys; then
+ ac_cv_use_libxpm='wxUSE_LIBXPM=sys'
+ elif test "$withval" = builtin; then
+ ac_cv_use_libxpm='wxUSE_LIBXPM=builtin'
+ else
+ { { echo "$as_me:$LINENO: error: Invalid value for --with-libxpm: should be yes, no, sys, or builtin" >&5
+echo "$as_me: error: Invalid value for --with-libxpm: should be yes, no, sys, or builtin" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+
+else
+
+ LINE=`grep "wxUSE_LIBXPM" ${wx_arg_cache_file}`
+ if test "x$LINE" != x ; then
+ eval "DEFAULT_$LINE"
+ else
+ no_cache=1
+ fi
+
+ ac_cv_use_libxpm='wxUSE_LIBXPM='$DEFAULT_wxUSE_LIBXPM
+
+fi;
+
+ eval "$ac_cv_use_libxpm"
+ if test "$no_cache" != 1; then
+ echo $ac_cv_use_libxpm >> ${wx_arg_cache_file}.tmp
+ fi
+
+ if test "$wxUSE_LIBXPM" = yes; then
+ echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+ elif test "$wxUSE_LIBXPM" = no; then
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+ elif test "$wxUSE_LIBXPM" = sys; then
+ echo "$as_me:$LINENO: result: system version" >&5
+echo "${ECHO_T}system version" >&6
+ elif test "$wxUSE_LIBXPM" = builtin; then
+ echo "$as_me:$LINENO: result: builtin version" >&5
+echo "${ECHO_T}builtin version" >&6
+ else
+ { { echo "$as_me:$LINENO: error: Invalid value for --with-libxpm: should be yes, no, sys, or builtin" >&5
+echo "$as_me: error: Invalid value for --with-libxpm: should be yes, no, sys, or builtin" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+
+
+ echo "$as_me:$LINENO: checking for --with-libmspack" >&5
+echo $ECHO_N "checking for --with-libmspack... $ECHO_C" >&6
+ no_cache=0
+
+# Check whether --with-libmspack or --without-libmspack was given.
+if test "${with_libmspack+set}" = set; then
+ withval="$with_libmspack"
+
+ if test "$withval" = yes; then
+ ac_cv_use_libmspack='wxUSE_LIBMSPACK=yes'
+ else
+ ac_cv_use_libmspack='wxUSE_LIBMSPACK=no'
+ fi
+
+else
+
+ LINE=`grep "wxUSE_LIBMSPACK" ${wx_arg_cache_file}`
+ if test "x$LINE" != x ; then
+ eval "DEFAULT_$LINE"
+ else
+ no_cache=1
+ fi
+
+ ac_cv_use_libmspack='wxUSE_LIBMSPACK='$DEFAULT_wxUSE_LIBMSPACK
+
+fi;
+
+ eval "$ac_cv_use_libmspack"
+ if test "$no_cache" != 1; then
+ echo $ac_cv_use_libmspack >> ${wx_arg_cache_file}.tmp
+ fi
+
+ if test "$wxUSE_LIBMSPACK" = yes; then
+ 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
+ fi
+
+
echo "$as_me:$LINENO: checking for --with-opengl" >&5
echo $ECHO_N "checking for --with-opengl... $ECHO_C" >&6
no_cache=0
- enablestring=
- echo "$as_me:$LINENO: checking for --${enablestring:-enable}-compat20" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-compat20... $ECHO_C" >&6
- no_cache=0
- # Check whether --enable-compat20 or --disable-compat20 was given.
-if test "${enable_compat20+set}" = set; then
- enableval="$enable_compat20"
-
- if test "$enableval" = yes; then
- ac_cv_use_compat20='WXWIN_COMPATIBILITY_2=yes'
- else
- ac_cv_use_compat20='WXWIN_COMPATIBILITY_2=no'
- fi
-
-else
-
- LINE=`grep "WXWIN_COMPATIBILITY_2" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- else
- no_cache=1
- fi
-
- ac_cv_use_compat20='WXWIN_COMPATIBILITY_2='$DEFAULT_WXWIN_COMPATIBILITY_2
-
-fi;
-
- eval "$ac_cv_use_compat20"
- if test "$no_cache" != 1; then
- echo $ac_cv_use_compat20 >> ${wx_arg_cache_file}.tmp
- fi
-
- if test "$WXWIN_COMPATIBILITY_2" = yes; then
- 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
- fi
-
-
enablestring=
echo "$as_me:$LINENO: checking for --${enablestring:-enable}-compat22" >&5
echo $ECHO_N "checking for --${enablestring:-enable}-compat22... $ECHO_C" >&6
- enablestring=
- echo "$as_me:$LINENO: checking for --${enablestring:-enable}-cmdline" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-cmdline... $ECHO_C" >&6
- no_cache=0
- # Check whether --enable-cmdline or --disable-cmdline was given.
-if test "${enable_cmdline+set}" = set; then
- enableval="$enable_cmdline"
-
- if test "$enableval" = yes; then
- ac_cv_use_cmdline='wxUSE_CMDLINE_PARSER=yes'
- else
- ac_cv_use_cmdline='wxUSE_CMDLINE_PARSER=no'
- fi
-
-else
-
- LINE=`grep "wxUSE_CMDLINE_PARSER" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- else
- no_cache=1
- fi
-
- ac_cv_use_cmdline='wxUSE_CMDLINE_PARSER='$DEFAULT_wxUSE_CMDLINE_PARSER
-
-fi;
-
- eval "$ac_cv_use_cmdline"
- if test "$no_cache" != 1; then
- echo $ac_cv_use_cmdline >> ${wx_arg_cache_file}.tmp
- fi
-
- if test "$wxUSE_CMDLINE_PARSER" = yes; then
- 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
- fi
-
-
- enablestring=
- echo "$as_me:$LINENO: checking for --${enablestring:-enable}-datetime" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-datetime... $ECHO_C" >&6
- no_cache=0
- # Check whether --enable-datetime or --disable-datetime was given.
-if test "${enable_datetime+set}" = set; then
- enableval="$enable_datetime"
-
- if test "$enableval" = yes; then
- ac_cv_use_datetime='wxUSE_DATETIME=yes'
- else
- ac_cv_use_datetime='wxUSE_DATETIME=no'
- fi
-
-else
-
- LINE=`grep "wxUSE_DATETIME" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- else
- no_cache=1
- fi
-
- ac_cv_use_datetime='wxUSE_DATETIME='$DEFAULT_wxUSE_DATETIME
-
-fi;
-
- eval "$ac_cv_use_datetime"
- if test "$no_cache" != 1; then
- echo $ac_cv_use_datetime >> ${wx_arg_cache_file}.tmp
- fi
-
- if test "$wxUSE_DATETIME" = yes; then
- 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
- fi
-
-
- enablestring=
- echo "$as_me:$LINENO: checking for --${enablestring:-enable}-stopwatch" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-stopwatch... $ECHO_C" >&6
- no_cache=0
- # Check whether --enable-stopwatch or --disable-stopwatch was given.
-if test "${enable_stopwatch+set}" = set; then
- enableval="$enable_stopwatch"
-
- if test "$enableval" = yes; then
- ac_cv_use_stopwatch='wxUSE_STOPWATCH=yes'
- else
- ac_cv_use_stopwatch='wxUSE_STOPWATCH=no'
- fi
-
-else
-
- LINE=`grep "wxUSE_STOPWATCH" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- else
- no_cache=1
- fi
-
- ac_cv_use_stopwatch='wxUSE_STOPWATCH='$DEFAULT_wxUSE_STOPWATCH
-
-fi;
-
- eval "$ac_cv_use_stopwatch"
- if test "$no_cache" != 1; then
- echo $ac_cv_use_stopwatch >> ${wx_arg_cache_file}.tmp
- fi
-
- if test "$wxUSE_STOPWATCH" = yes; then
- 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
- fi
-
-
- enablestring=
- echo "$as_me:$LINENO: checking for --${enablestring:-enable}-dialupman" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-dialupman... $ECHO_C" >&6
- no_cache=0
- # Check whether --enable-dialupman or --disable-dialupman was given.
-if test "${enable_dialupman+set}" = set; then
- enableval="$enable_dialupman"
-
- if test "$enableval" = yes; then
- ac_cv_use_dialupman='wxUSE_DIALUP_MANAGER=yes'
- else
- ac_cv_use_dialupman='wxUSE_DIALUP_MANAGER=no'
- fi
-
-else
-
- LINE=`grep "wxUSE_DIALUP_MANAGER" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- else
- no_cache=1
- fi
-
- ac_cv_use_dialupman='wxUSE_DIALUP_MANAGER='$DEFAULT_wxUSE_DIALUP_MANAGER
-
-fi;
-
- eval "$ac_cv_use_dialupman"
- if test "$no_cache" != 1; then
- echo $ac_cv_use_dialupman >> ${wx_arg_cache_file}.tmp
- fi
-
- if test "$wxUSE_DIALUP_MANAGER" = yes; then
- 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
- fi
-
-
enablestring=
echo "$as_me:$LINENO: checking for --${enablestring:-enable}-apple_ieee" >&5
echo $ECHO_N "checking for --${enablestring:-enable}-apple_ieee... $ECHO_C" >&6
enablestring=
- echo "$as_me:$LINENO: checking for --${enablestring:-enable}-timer" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-timer... $ECHO_C" >&6
+ echo "$as_me:$LINENO: checking for --${enablestring:-enable}-catch_segvs" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-catch_segvs... $ECHO_C" >&6
no_cache=0
- # Check whether --enable-timer or --disable-timer was given.
-if test "${enable_timer+set}" = set; then
- enableval="$enable_timer"
+ # Check whether --enable-catch_segvs or --disable-catch_segvs was given.
+if test "${enable_catch_segvs+set}" = set; then
+ enableval="$enable_catch_segvs"
if test "$enableval" = yes; then
- ac_cv_use_timer='wxUSE_TIMER=yes'
+ ac_cv_use_catch_segvs='wxUSE_ON_FATAL_EXCEPTION=yes'
else
- ac_cv_use_timer='wxUSE_TIMER=no'
+ ac_cv_use_catch_segvs='wxUSE_ON_FATAL_EXCEPTION=no'
fi
else
- LINE=`grep "wxUSE_TIMER" ${wx_arg_cache_file}`
+ LINE=`grep "wxUSE_ON_FATAL_EXCEPTION" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
eval "DEFAULT_$LINE"
else
no_cache=1
fi
- ac_cv_use_timer='wxUSE_TIMER='$DEFAULT_wxUSE_TIMER
+ ac_cv_use_catch_segvs='wxUSE_ON_FATAL_EXCEPTION='$DEFAULT_wxUSE_ON_FATAL_EXCEPTION
fi;
- eval "$ac_cv_use_timer"
+ eval "$ac_cv_use_catch_segvs"
if test "$no_cache" != 1; then
- echo $ac_cv_use_timer >> ${wx_arg_cache_file}.tmp
+ echo $ac_cv_use_catch_segvs >> ${wx_arg_cache_file}.tmp
fi
- if test "$wxUSE_TIMER" = yes; then
+ if test "$wxUSE_ON_FATAL_EXCEPTION" = yes; then
echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6
else
enablestring=
- echo "$as_me:$LINENO: checking for --${enablestring:-enable}-wave" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-wave... $ECHO_C" >&6
+ echo "$as_me:$LINENO: checking for --${enablestring:-enable}-cmdline" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-cmdline... $ECHO_C" >&6
no_cache=0
- # Check whether --enable-wave or --disable-wave was given.
-if test "${enable_wave+set}" = set; then
- enableval="$enable_wave"
+ # Check whether --enable-cmdline or --disable-cmdline was given.
+if test "${enable_cmdline+set}" = set; then
+ enableval="$enable_cmdline"
if test "$enableval" = yes; then
- ac_cv_use_wave='wxUSE_WAVE=yes'
+ ac_cv_use_cmdline='wxUSE_CMDLINE_PARSER=yes'
else
- ac_cv_use_wave='wxUSE_WAVE=no'
+ ac_cv_use_cmdline='wxUSE_CMDLINE_PARSER=no'
fi
else
- LINE=`grep "wxUSE_WAVE" ${wx_arg_cache_file}`
+ LINE=`grep "wxUSE_CMDLINE_PARSER" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
eval "DEFAULT_$LINE"
else
no_cache=1
fi
- ac_cv_use_wave='wxUSE_WAVE='$DEFAULT_wxUSE_WAVE
+ ac_cv_use_cmdline='wxUSE_CMDLINE_PARSER='$DEFAULT_wxUSE_CMDLINE_PARSER
fi;
- eval "$ac_cv_use_wave"
+ eval "$ac_cv_use_cmdline"
if test "$no_cache" != 1; then
- echo $ac_cv_use_wave >> ${wx_arg_cache_file}.tmp
+ echo $ac_cv_use_cmdline >> ${wx_arg_cache_file}.tmp
fi
- if test "$wxUSE_WAVE" = yes; then
+ if test "$wxUSE_CMDLINE_PARSER" = yes; then
echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6
else
enablestring=
- echo "$as_me:$LINENO: checking for --${enablestring:-enable}-fraction" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-fraction... $ECHO_C" >&6
+ echo "$as_me:$LINENO: checking for --${enablestring:-enable}-datetime" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-datetime... $ECHO_C" >&6
no_cache=0
- # Check whether --enable-fraction or --disable-fraction was given.
-if test "${enable_fraction+set}" = set; then
- enableval="$enable_fraction"
+ # Check whether --enable-datetime or --disable-datetime was given.
+if test "${enable_datetime+set}" = set; then
+ enableval="$enable_datetime"
if test "$enableval" = yes; then
- ac_cv_use_fraction='wxUSE_FRACTION=yes'
+ ac_cv_use_datetime='wxUSE_DATETIME=yes'
else
- ac_cv_use_fraction='wxUSE_FRACTION=no'
+ ac_cv_use_datetime='wxUSE_DATETIME=no'
fi
else
- LINE=`grep "wxUSE_FRACTION" ${wx_arg_cache_file}`
+ LINE=`grep "wxUSE_DATETIME" ${wx_arg_cache_file}`
+ if test "x$LINE" != x ; then
+ eval "DEFAULT_$LINE"
+ else
+ no_cache=1
+ fi
+
+ ac_cv_use_datetime='wxUSE_DATETIME='$DEFAULT_wxUSE_DATETIME
+
+fi;
+
+ eval "$ac_cv_use_datetime"
+ if test "$no_cache" != 1; then
+ echo $ac_cv_use_datetime >> ${wx_arg_cache_file}.tmp
+ fi
+
+ if test "$wxUSE_DATETIME" = yes; then
+ 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
+ fi
+
+
+ enablestring=
+ echo "$as_me:$LINENO: checking for --${enablestring:-enable}-dialupman" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-dialupman... $ECHO_C" >&6
+ no_cache=0
+ # Check whether --enable-dialupman or --disable-dialupman was given.
+if test "${enable_dialupman+set}" = set; then
+ enableval="$enable_dialupman"
+
+ if test "$enableval" = yes; then
+ ac_cv_use_dialupman='wxUSE_DIALUP_MANAGER=yes'
+ else
+ ac_cv_use_dialupman='wxUSE_DIALUP_MANAGER=no'
+ fi
+
+else
+
+ LINE=`grep "wxUSE_DIALUP_MANAGER" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
eval "DEFAULT_$LINE"
else
no_cache=1
fi
- ac_cv_use_fraction='wxUSE_FRACTION='$DEFAULT_wxUSE_FRACTION
+ ac_cv_use_dialupman='wxUSE_DIALUP_MANAGER='$DEFAULT_wxUSE_DIALUP_MANAGER
fi;
- eval "$ac_cv_use_fraction"
+ eval "$ac_cv_use_dialupman"
if test "$no_cache" != 1; then
- echo $ac_cv_use_fraction >> ${wx_arg_cache_file}.tmp
+ echo $ac_cv_use_dialupman >> ${wx_arg_cache_file}.tmp
fi
- if test "$wxUSE_FRACTION" = yes; then
+ if test "$wxUSE_DIALUP_MANAGER" = yes; then
echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6
else
enablestring=
- echo "$as_me:$LINENO: checking for --${enablestring:-enable}-longlong" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-longlong... $ECHO_C" >&6
+ echo "$as_me:$LINENO: checking for --${enablestring:-enable}-exceptions" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-exceptions... $ECHO_C" >&6
no_cache=0
- # Check whether --enable-longlong or --disable-longlong was given.
-if test "${enable_longlong+set}" = set; then
- enableval="$enable_longlong"
+ # Check whether --enable-exceptions or --disable-exceptions was given.
+if test "${enable_exceptions+set}" = set; then
+ enableval="$enable_exceptions"
if test "$enableval" = yes; then
- ac_cv_use_longlong='wxUSE_LONGLONG=yes'
+ ac_cv_use_exceptions='wxUSE_EXCEPTIONS=yes'
else
- ac_cv_use_longlong='wxUSE_LONGLONG=no'
+ ac_cv_use_exceptions='wxUSE_EXCEPTIONS=no'
fi
else
- LINE=`grep "wxUSE_LONGLONG" ${wx_arg_cache_file}`
+ LINE=`grep "wxUSE_EXCEPTIONS" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
eval "DEFAULT_$LINE"
else
no_cache=1
fi
- ac_cv_use_longlong='wxUSE_LONGLONG='$DEFAULT_wxUSE_LONGLONG
+ ac_cv_use_exceptions='wxUSE_EXCEPTIONS='$DEFAULT_wxUSE_EXCEPTIONS
fi;
- eval "$ac_cv_use_longlong"
+ eval "$ac_cv_use_exceptions"
if test "$no_cache" != 1; then
- echo $ac_cv_use_longlong >> ${wx_arg_cache_file}.tmp
+ echo $ac_cv_use_exceptions >> ${wx_arg_cache_file}.tmp
fi
- if test "$wxUSE_LONGLONG" = yes; then
+ if test "$wxUSE_EXCEPTIONS" = yes; then
echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6
else
enablestring=
- echo "$as_me:$LINENO: checking for --${enablestring:-enable}-geometry" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-geometry... $ECHO_C" >&6
+ echo "$as_me:$LINENO: checking for --${enablestring:-enable}-ffile" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-ffile... $ECHO_C" >&6
no_cache=0
- # Check whether --enable-geometry or --disable-geometry was given.
-if test "${enable_geometry+set}" = set; then
- enableval="$enable_geometry"
+ # Check whether --enable-ffile or --disable-ffile was given.
+if test "${enable_ffile+set}" = set; then
+ enableval="$enable_ffile"
if test "$enableval" = yes; then
- ac_cv_use_geometry='wxUSE_GEOMETRY=yes'
+ ac_cv_use_ffile='wxUSE_FFILE=yes'
else
- ac_cv_use_geometry='wxUSE_GEOMETRY=no'
+ ac_cv_use_ffile='wxUSE_FFILE=no'
fi
else
- LINE=`grep "wxUSE_GEOMETRY" ${wx_arg_cache_file}`
+ LINE=`grep "wxUSE_FFILE" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
eval "DEFAULT_$LINE"
else
no_cache=1
fi
- ac_cv_use_geometry='wxUSE_GEOMETRY='$DEFAULT_wxUSE_GEOMETRY
+ ac_cv_use_ffile='wxUSE_FFILE='$DEFAULT_wxUSE_FFILE
fi;
- eval "$ac_cv_use_geometry"
+ eval "$ac_cv_use_ffile"
if test "$no_cache" != 1; then
- echo $ac_cv_use_geometry >> ${wx_arg_cache_file}.tmp
+ echo $ac_cv_use_ffile >> ${wx_arg_cache_file}.tmp
fi
- if test "$wxUSE_GEOMETRY" = yes; then
+ if test "$wxUSE_FFILE" = yes; then
echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6
else
enablestring=
- echo "$as_me:$LINENO: checking for --${enablestring:-enable}-log" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-log... $ECHO_C" >&6
+ echo "$as_me:$LINENO: checking for --${enablestring:-enable}-file" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-file... $ECHO_C" >&6
no_cache=0
- # Check whether --enable-log or --disable-log was given.
-if test "${enable_log+set}" = set; then
- enableval="$enable_log"
+ # Check whether --enable-file or --disable-file was given.
+if test "${enable_file+set}" = set; then
+ enableval="$enable_file"
if test "$enableval" = yes; then
- ac_cv_use_log='wxUSE_LOG=yes'
+ ac_cv_use_file='wxUSE_FILE=yes'
else
- ac_cv_use_log='wxUSE_LOG=no'
+ ac_cv_use_file='wxUSE_FILE=no'
fi
else
- LINE=`grep "wxUSE_LOG" ${wx_arg_cache_file}`
+ LINE=`grep "wxUSE_FILE" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
eval "DEFAULT_$LINE"
else
no_cache=1
fi
- ac_cv_use_log='wxUSE_LOG='$DEFAULT_wxUSE_LOG
+ ac_cv_use_file='wxUSE_FILE='$DEFAULT_wxUSE_FILE
fi;
- eval "$ac_cv_use_log"
+ eval "$ac_cv_use_file"
if test "$no_cache" != 1; then
- echo $ac_cv_use_log >> ${wx_arg_cache_file}.tmp
+ echo $ac_cv_use_file >> ${wx_arg_cache_file}.tmp
fi
- if test "$wxUSE_LOG" = yes; then
+ if test "$wxUSE_FILE" = yes; then
echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6
else
enablestring=
- echo "$as_me:$LINENO: checking for --${enablestring:-enable}-streams" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-streams... $ECHO_C" >&6
+ echo "$as_me:$LINENO: checking for --${enablestring:-enable}-filesystem" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-filesystem... $ECHO_C" >&6
no_cache=0
- # Check whether --enable-streams or --disable-streams was given.
-if test "${enable_streams+set}" = set; then
- enableval="$enable_streams"
+ # Check whether --enable-filesystem or --disable-filesystem was given.
+if test "${enable_filesystem+set}" = set; then
+ enableval="$enable_filesystem"
if test "$enableval" = yes; then
- ac_cv_use_streams='wxUSE_STREAMS=yes'
+ ac_cv_use_filesystem='wxUSE_FILESYSTEM=yes'
else
- ac_cv_use_streams='wxUSE_STREAMS=no'
+ ac_cv_use_filesystem='wxUSE_FILESYSTEM=no'
fi
else
- LINE=`grep "wxUSE_STREAMS" ${wx_arg_cache_file}`
+ LINE=`grep "wxUSE_FILESYSTEM" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
eval "DEFAULT_$LINE"
else
no_cache=1
fi
- ac_cv_use_streams='wxUSE_STREAMS='$DEFAULT_wxUSE_STREAMS
+ ac_cv_use_filesystem='wxUSE_FILESYSTEM='$DEFAULT_wxUSE_FILESYSTEM
fi;
- eval "$ac_cv_use_streams"
+ eval "$ac_cv_use_filesystem"
if test "$no_cache" != 1; then
- echo $ac_cv_use_streams >> ${wx_arg_cache_file}.tmp
+ echo $ac_cv_use_filesystem >> ${wx_arg_cache_file}.tmp
fi
- if test "$wxUSE_STREAMS" = yes; then
+ if test "$wxUSE_FILESYSTEM" = yes; then
echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6
else
enablestring=
- echo "$as_me:$LINENO: checking for --${enablestring:-enable}-file" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-file... $ECHO_C" >&6
+ echo "$as_me:$LINENO: checking for --${enablestring:-enable}-fontmap" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-fontmap... $ECHO_C" >&6
no_cache=0
- # Check whether --enable-file or --disable-file was given.
-if test "${enable_file+set}" = set; then
- enableval="$enable_file"
+ # Check whether --enable-fontmap or --disable-fontmap was given.
+if test "${enable_fontmap+set}" = set; then
+ enableval="$enable_fontmap"
if test "$enableval" = yes; then
- ac_cv_use_file='wxUSE_FILE=yes'
+ ac_cv_use_fontmap='wxUSE_FONTMAP=yes'
else
- ac_cv_use_file='wxUSE_FILE=no'
+ ac_cv_use_fontmap='wxUSE_FONTMAP=no'
fi
else
- LINE=`grep "wxUSE_FILE" ${wx_arg_cache_file}`
+ LINE=`grep "wxUSE_FONTMAP" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
eval "DEFAULT_$LINE"
else
no_cache=1
fi
- ac_cv_use_file='wxUSE_FILE='$DEFAULT_wxUSE_FILE
+ ac_cv_use_fontmap='wxUSE_FONTMAP='$DEFAULT_wxUSE_FONTMAP
fi;
- eval "$ac_cv_use_file"
+ eval "$ac_cv_use_fontmap"
if test "$no_cache" != 1; then
- echo $ac_cv_use_file >> ${wx_arg_cache_file}.tmp
+ echo $ac_cv_use_fontmap >> ${wx_arg_cache_file}.tmp
fi
- if test "$wxUSE_FILE" = yes; then
+ if test "$wxUSE_FONTMAP" = yes; then
echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6
else
enablestring=
- echo "$as_me:$LINENO: checking for --${enablestring:-enable}-ffile" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-ffile... $ECHO_C" >&6
+ echo "$as_me:$LINENO: checking for --${enablestring:-enable}-fs_inet" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-fs_inet... $ECHO_C" >&6
no_cache=0
- # Check whether --enable-ffile or --disable-ffile was given.
-if test "${enable_ffile+set}" = set; then
- enableval="$enable_ffile"
+ # Check whether --enable-fs_inet or --disable-fs_inet was given.
+if test "${enable_fs_inet+set}" = set; then
+ enableval="$enable_fs_inet"
if test "$enableval" = yes; then
- ac_cv_use_ffile='wxUSE_FFILE=yes'
+ ac_cv_use_fs_inet='wxUSE_FS_INET=yes'
else
- ac_cv_use_ffile='wxUSE_FFILE=no'
+ ac_cv_use_fs_inet='wxUSE_FS_INET=no'
fi
else
- LINE=`grep "wxUSE_FFILE" ${wx_arg_cache_file}`
+ LINE=`grep "wxUSE_FS_INET" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
eval "DEFAULT_$LINE"
else
no_cache=1
fi
- ac_cv_use_ffile='wxUSE_FFILE='$DEFAULT_wxUSE_FFILE
+ ac_cv_use_fs_inet='wxUSE_FS_INET='$DEFAULT_wxUSE_FS_INET
fi;
- eval "$ac_cv_use_ffile"
+ eval "$ac_cv_use_fs_inet"
if test "$no_cache" != 1; then
- echo $ac_cv_use_ffile >> ${wx_arg_cache_file}.tmp
+ echo $ac_cv_use_fs_inet >> ${wx_arg_cache_file}.tmp
fi
- if test "$wxUSE_FFILE" = yes; then
+ if test "$wxUSE_FS_INET" = yes; then
echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6
else
enablestring=
- echo "$as_me:$LINENO: checking for --${enablestring:-enable}-textbuf" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-textbuf... $ECHO_C" >&6
+ echo "$as_me:$LINENO: checking for --${enablestring:-enable}-fs_zip" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-fs_zip... $ECHO_C" >&6
no_cache=0
- # Check whether --enable-textbuf or --disable-textbuf was given.
-if test "${enable_textbuf+set}" = set; then
- enableval="$enable_textbuf"
+ # Check whether --enable-fs_zip or --disable-fs_zip was given.
+if test "${enable_fs_zip+set}" = set; then
+ enableval="$enable_fs_zip"
if test "$enableval" = yes; then
- ac_cv_use_textbuf='wxUSE_TEXTBUFFER=yes'
+ ac_cv_use_fs_zip='wxUSE_FS_ZIP=yes'
else
- ac_cv_use_textbuf='wxUSE_TEXTBUFFER=no'
+ ac_cv_use_fs_zip='wxUSE_FS_ZIP=no'
fi
else
- LINE=`grep "wxUSE_TEXTBUFFER" ${wx_arg_cache_file}`
+ LINE=`grep "wxUSE_FS_ZIP" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
eval "DEFAULT_$LINE"
else
no_cache=1
fi
- ac_cv_use_textbuf='wxUSE_TEXTBUFFER='$DEFAULT_wxUSE_TEXTBUFFER
+ ac_cv_use_fs_zip='wxUSE_FS_ZIP='$DEFAULT_wxUSE_FS_ZIP
fi;
- eval "$ac_cv_use_textbuf"
+ eval "$ac_cv_use_fs_zip"
if test "$no_cache" != 1; then
- echo $ac_cv_use_textbuf >> ${wx_arg_cache_file}.tmp
+ echo $ac_cv_use_fs_zip >> ${wx_arg_cache_file}.tmp
fi
- if test "$wxUSE_TEXTBUFFER" = yes; then
+ if test "$wxUSE_FS_ZIP" = yes; then
echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6
else
enablestring=
- echo "$as_me:$LINENO: checking for --${enablestring:-enable}-textfile" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-textfile... $ECHO_C" >&6
+ echo "$as_me:$LINENO: checking for --${enablestring:-enable}-geometry" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-geometry... $ECHO_C" >&6
no_cache=0
- # Check whether --enable-textfile or --disable-textfile was given.
-if test "${enable_textfile+set}" = set; then
- enableval="$enable_textfile"
+ # Check whether --enable-geometry or --disable-geometry was given.
+if test "${enable_geometry+set}" = set; then
+ enableval="$enable_geometry"
if test "$enableval" = yes; then
- ac_cv_use_textfile='wxUSE_TEXTFILE=yes'
+ ac_cv_use_geometry='wxUSE_GEOMETRY=yes'
else
- ac_cv_use_textfile='wxUSE_TEXTFILE=no'
+ ac_cv_use_geometry='wxUSE_GEOMETRY=no'
fi
else
- LINE=`grep "wxUSE_TEXTFILE" ${wx_arg_cache_file}`
+ LINE=`grep "wxUSE_GEOMETRY" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
eval "DEFAULT_$LINE"
else
no_cache=1
fi
- ac_cv_use_textfile='wxUSE_TEXTFILE='$DEFAULT_wxUSE_TEXTFILE
+ ac_cv_use_geometry='wxUSE_GEOMETRY='$DEFAULT_wxUSE_GEOMETRY
fi;
- eval "$ac_cv_use_textfile"
+ eval "$ac_cv_use_geometry"
if test "$no_cache" != 1; then
- echo $ac_cv_use_textfile >> ${wx_arg_cache_file}.tmp
+ echo $ac_cv_use_geometry >> ${wx_arg_cache_file}.tmp
fi
- if test "$wxUSE_TEXTFILE" = yes; then
+ if test "$wxUSE_GEOMETRY" = yes; then
echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6
else
enablestring=
- echo "$as_me:$LINENO: checking for --${enablestring:-enable}-fontmap" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-fontmap... $ECHO_C" >&6
+ echo "$as_me:$LINENO: checking for --${enablestring:-enable}-log" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-log... $ECHO_C" >&6
no_cache=0
- # Check whether --enable-fontmap or --disable-fontmap was given.
-if test "${enable_fontmap+set}" = set; then
- enableval="$enable_fontmap"
+ # Check whether --enable-log or --disable-log was given.
+if test "${enable_log+set}" = set; then
+ enableval="$enable_log"
if test "$enableval" = yes; then
- ac_cv_use_fontmap='wxUSE_FONTMAP=yes'
+ ac_cv_use_log='wxUSE_LOG=yes'
else
- ac_cv_use_fontmap='wxUSE_FONTMAP=no'
+ ac_cv_use_log='wxUSE_LOG=no'
fi
else
- LINE=`grep "wxUSE_FONTMAP" ${wx_arg_cache_file}`
+ LINE=`grep "wxUSE_LOG" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
eval "DEFAULT_$LINE"
else
no_cache=1
fi
- ac_cv_use_fontmap='wxUSE_FONTMAP='$DEFAULT_wxUSE_FONTMAP
+ ac_cv_use_log='wxUSE_LOG='$DEFAULT_wxUSE_LOG
fi;
- eval "$ac_cv_use_fontmap"
+ eval "$ac_cv_use_log"
if test "$no_cache" != 1; then
- echo $ac_cv_use_fontmap >> ${wx_arg_cache_file}.tmp
+ echo $ac_cv_use_log >> ${wx_arg_cache_file}.tmp
fi
- if test "$wxUSE_FONTMAP" = yes; then
+ if test "$wxUSE_LOG" = yes; then
echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6
else
enablestring=
- echo "$as_me:$LINENO: checking for --${enablestring:-enable}-unicode" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-unicode... $ECHO_C" >&6
+ echo "$as_me:$LINENO: checking for --${enablestring:-enable}-longlong" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-longlong... $ECHO_C" >&6
no_cache=0
- # Check whether --enable-unicode or --disable-unicode was given.
-if test "${enable_unicode+set}" = set; then
- enableval="$enable_unicode"
+ # Check whether --enable-longlong or --disable-longlong was given.
+if test "${enable_longlong+set}" = set; then
+ enableval="$enable_longlong"
if test "$enableval" = yes; then
- ac_cv_use_unicode='wxUSE_UNICODE=yes'
+ ac_cv_use_longlong='wxUSE_LONGLONG=yes'
else
- ac_cv_use_unicode='wxUSE_UNICODE=no'
+ ac_cv_use_longlong='wxUSE_LONGLONG=no'
fi
else
- LINE=`grep "wxUSE_UNICODE" ${wx_arg_cache_file}`
+ LINE=`grep "wxUSE_LONGLONG" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
eval "DEFAULT_$LINE"
else
no_cache=1
fi
- ac_cv_use_unicode='wxUSE_UNICODE='$DEFAULT_wxUSE_UNICODE
+ ac_cv_use_longlong='wxUSE_LONGLONG='$DEFAULT_wxUSE_LONGLONG
fi;
- eval "$ac_cv_use_unicode"
+ eval "$ac_cv_use_longlong"
if test "$no_cache" != 1; then
- echo $ac_cv_use_unicode >> ${wx_arg_cache_file}.tmp
+ echo $ac_cv_use_longlong >> ${wx_arg_cache_file}.tmp
fi
- if test "$wxUSE_UNICODE" = yes; then
+ if test "$wxUSE_LONGLONG" = yes; then
+ 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
+ fi
+
+
+ enablestring=
+ echo "$as_me:$LINENO: checking for --${enablestring:-enable}-mimetype" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-mimetype... $ECHO_C" >&6
+ no_cache=0
+ # Check whether --enable-mimetype or --disable-mimetype was given.
+if test "${enable_mimetype+set}" = set; then
+ enableval="$enable_mimetype"
+
+ if test "$enableval" = yes; then
+ ac_cv_use_mimetype='wxUSE_MIMETYPE=yes'
+ else
+ ac_cv_use_mimetype='wxUSE_MIMETYPE=no'
+ fi
+
+else
+
+ LINE=`grep "wxUSE_MIMETYPE" ${wx_arg_cache_file}`
+ if test "x$LINE" != x ; then
+ eval "DEFAULT_$LINE"
+ else
+ no_cache=1
+ fi
+
+ ac_cv_use_mimetype='wxUSE_MIMETYPE='$DEFAULT_wxUSE_MIMETYPE
+
+fi;
+
+ eval "$ac_cv_use_mimetype"
+ if test "$no_cache" != 1; then
+ echo $ac_cv_use_mimetype >> ${wx_arg_cache_file}.tmp
+ fi
+
+ if test "$wxUSE_MIMETYPE" = yes; then
echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6
else
enablestring=
- echo "$as_me:$LINENO: checking for --${enablestring:-enable}-wxprintfv" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-wxprintfv... $ECHO_C" >&6
+ echo "$as_me:$LINENO: checking for --${enablestring:-enable}-snglinst" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-snglinst... $ECHO_C" >&6
no_cache=0
- # Check whether --enable-wxprintfv or --disable-wxprintfv was given.
-if test "${enable_wxprintfv+set}" = set; then
- enableval="$enable_wxprintfv"
+ # Check whether --enable-snglinst or --disable-snglinst was given.
+if test "${enable_snglinst+set}" = set; then
+ enableval="$enable_snglinst"
if test "$enableval" = yes; then
- ac_cv_use_wxprintfv='wxUSE_EXPERIMENTAL_PRINTF=yes'
+ ac_cv_use_snglinst='wxUSE_SNGLINST_CHECKER=yes'
else
- ac_cv_use_wxprintfv='wxUSE_EXPERIMENTAL_PRINTF=no'
+ ac_cv_use_snglinst='wxUSE_SNGLINST_CHECKER=no'
fi
else
- LINE=`grep "wxUSE_EXPERIMENTAL_PRINTF" ${wx_arg_cache_file}`
+ LINE=`grep "wxUSE_SNGLINST_CHECKER" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
eval "DEFAULT_$LINE"
else
no_cache=1
fi
- ac_cv_use_wxprintfv='wxUSE_EXPERIMENTAL_PRINTF='$DEFAULT_wxUSE_EXPERIMENTAL_PRINTF
+ ac_cv_use_snglinst='wxUSE_SNGLINST_CHECKER='$DEFAULT_wxUSE_SNGLINST_CHECKER
fi;
- eval "$ac_cv_use_wxprintfv"
+ eval "$ac_cv_use_snglinst"
if test "$no_cache" != 1; then
- echo $ac_cv_use_wxprintfv >> ${wx_arg_cache_file}.tmp
+ echo $ac_cv_use_snglinst >> ${wx_arg_cache_file}.tmp
fi
- if test "$wxUSE_EXPERIMENTAL_PRINTF" = yes; then
+ if test "$wxUSE_SNGLINST_CHECKER" = yes; then
+ 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
+ fi
+
+
+ enablestring=
+ echo "$as_me:$LINENO: checking for --${enablestring:-enable}-streams" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-streams... $ECHO_C" >&6
+ no_cache=0
+ # Check whether --enable-streams or --disable-streams was given.
+if test "${enable_streams+set}" = set; then
+ enableval="$enable_streams"
+
+ if test "$enableval" = yes; then
+ ac_cv_use_streams='wxUSE_STREAMS=yes'
+ else
+ ac_cv_use_streams='wxUSE_STREAMS=no'
+ fi
+
+else
+
+ LINE=`grep "wxUSE_STREAMS" ${wx_arg_cache_file}`
+ if test "x$LINE" != x ; then
+ eval "DEFAULT_$LINE"
+ else
+ no_cache=1
+ fi
+
+ ac_cv_use_streams='wxUSE_STREAMS='$DEFAULT_wxUSE_STREAMS
+
+fi;
+
+ eval "$ac_cv_use_streams"
+ if test "$no_cache" != 1; then
+ echo $ac_cv_use_streams >> ${wx_arg_cache_file}.tmp
+ fi
+
+ if test "$wxUSE_STREAMS" = yes; then
echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6
else
enablestring=
- echo "$as_me:$LINENO: checking for --${enablestring:-enable}-filesystem" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-filesystem... $ECHO_C" >&6
+ echo "$as_me:$LINENO: checking for --${enablestring:-enable}-stopwatch" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-stopwatch... $ECHO_C" >&6
no_cache=0
- # Check whether --enable-filesystem or --disable-filesystem was given.
-if test "${enable_filesystem+set}" = set; then
- enableval="$enable_filesystem"
+ # Check whether --enable-stopwatch or --disable-stopwatch was given.
+if test "${enable_stopwatch+set}" = set; then
+ enableval="$enable_stopwatch"
if test "$enableval" = yes; then
- ac_cv_use_filesystem='wxUSE_FILESYSTEM=yes'
+ ac_cv_use_stopwatch='wxUSE_STOPWATCH=yes'
else
- ac_cv_use_filesystem='wxUSE_FILESYSTEM=no'
+ ac_cv_use_stopwatch='wxUSE_STOPWATCH=no'
fi
else
- LINE=`grep "wxUSE_FILESYSTEM" ${wx_arg_cache_file}`
+ LINE=`grep "wxUSE_STOPWATCH" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
eval "DEFAULT_$LINE"
else
no_cache=1
fi
- ac_cv_use_filesystem='wxUSE_FILESYSTEM='$DEFAULT_wxUSE_FILESYSTEM
+ ac_cv_use_stopwatch='wxUSE_STOPWATCH='$DEFAULT_wxUSE_STOPWATCH
fi;
- eval "$ac_cv_use_filesystem"
+ eval "$ac_cv_use_stopwatch"
if test "$no_cache" != 1; then
- echo $ac_cv_use_filesystem >> ${wx_arg_cache_file}.tmp
+ echo $ac_cv_use_stopwatch >> ${wx_arg_cache_file}.tmp
fi
- if test "$wxUSE_FILESYSTEM" = yes; then
+ if test "$wxUSE_STOPWATCH" = yes; then
echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6
else
enablestring=
- echo "$as_me:$LINENO: checking for --${enablestring:-enable}-fs_inet" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-fs_inet... $ECHO_C" >&6
+ echo "$as_me:$LINENO: checking for --${enablestring:-enable}-system_options" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-system_options... $ECHO_C" >&6
no_cache=0
- # Check whether --enable-fs_inet or --disable-fs_inet was given.
-if test "${enable_fs_inet+set}" = set; then
- enableval="$enable_fs_inet"
+ # Check whether --enable-system_options or --disable-system_options was given.
+if test "${enable_system_options+set}" = set; then
+ enableval="$enable_system_options"
if test "$enableval" = yes; then
- ac_cv_use_fs_inet='wxUSE_FS_INET=yes'
+ ac_cv_use_system_options='wxUSE_SYSTEM_OPTIONS=yes'
else
- ac_cv_use_fs_inet='wxUSE_FS_INET=no'
+ ac_cv_use_system_options='wxUSE_SYSTEM_OPTIONS=no'
fi
else
- LINE=`grep "wxUSE_FS_INET" ${wx_arg_cache_file}`
+ LINE=`grep "wxUSE_SYSTEM_OPTIONS" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
eval "DEFAULT_$LINE"
else
no_cache=1
fi
- ac_cv_use_fs_inet='wxUSE_FS_INET='$DEFAULT_wxUSE_FS_INET
+ ac_cv_use_system_options='wxUSE_SYSTEM_OPTIONS='$DEFAULT_wxUSE_SYSTEM_OPTIONS
fi;
- eval "$ac_cv_use_fs_inet"
+ eval "$ac_cv_use_system_options"
if test "$no_cache" != 1; then
- echo $ac_cv_use_fs_inet >> ${wx_arg_cache_file}.tmp
+ echo $ac_cv_use_system_options >> ${wx_arg_cache_file}.tmp
fi
- if test "$wxUSE_FS_INET" = yes; then
+ if test "$wxUSE_SYSTEM_OPTIONS" = yes; then
echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6
else
enablestring=
- echo "$as_me:$LINENO: checking for --${enablestring:-enable}-fs_zip" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-fs_zip... $ECHO_C" >&6
+ echo "$as_me:$LINENO: checking for --${enablestring:-enable}-textbuf" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-textbuf... $ECHO_C" >&6
no_cache=0
- # Check whether --enable-fs_zip or --disable-fs_zip was given.
-if test "${enable_fs_zip+set}" = set; then
- enableval="$enable_fs_zip"
+ # Check whether --enable-textbuf or --disable-textbuf was given.
+if test "${enable_textbuf+set}" = set; then
+ enableval="$enable_textbuf"
if test "$enableval" = yes; then
- ac_cv_use_fs_zip='wxUSE_FS_ZIP=yes'
+ ac_cv_use_textbuf='wxUSE_TEXTBUFFER=yes'
else
- ac_cv_use_fs_zip='wxUSE_FS_ZIP=no'
+ ac_cv_use_textbuf='wxUSE_TEXTBUFFER=no'
fi
else
- LINE=`grep "wxUSE_FS_ZIP" ${wx_arg_cache_file}`
+ LINE=`grep "wxUSE_TEXTBUFFER" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
eval "DEFAULT_$LINE"
else
no_cache=1
fi
- ac_cv_use_fs_zip='wxUSE_FS_ZIP='$DEFAULT_wxUSE_FS_ZIP
+ ac_cv_use_textbuf='wxUSE_TEXTBUFFER='$DEFAULT_wxUSE_TEXTBUFFER
fi;
- eval "$ac_cv_use_fs_zip"
+ eval "$ac_cv_use_textbuf"
if test "$no_cache" != 1; then
- echo $ac_cv_use_fs_zip >> ${wx_arg_cache_file}.tmp
+ echo $ac_cv_use_textbuf >> ${wx_arg_cache_file}.tmp
fi
- if test "$wxUSE_FS_ZIP" = yes; then
+ if test "$wxUSE_TEXTBUFFER" = yes; then
echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6
else
enablestring=
- echo "$as_me:$LINENO: checking for --${enablestring:-enable}-zipstream" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-zipstream... $ECHO_C" >&6
+ echo "$as_me:$LINENO: checking for --${enablestring:-enable}-textfile" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-textfile... $ECHO_C" >&6
no_cache=0
- # Check whether --enable-zipstream or --disable-zipstream was given.
-if test "${enable_zipstream+set}" = set; then
- enableval="$enable_zipstream"
+ # Check whether --enable-textfile or --disable-textfile was given.
+if test "${enable_textfile+set}" = set; then
+ enableval="$enable_textfile"
if test "$enableval" = yes; then
- ac_cv_use_zipstream='wxUSE_ZIPSTREAM=yes'
+ ac_cv_use_textfile='wxUSE_TEXTFILE=yes'
else
- ac_cv_use_zipstream='wxUSE_ZIPSTREAM=no'
+ ac_cv_use_textfile='wxUSE_TEXTFILE=no'
fi
else
- LINE=`grep "wxUSE_ZIPSTREAM" ${wx_arg_cache_file}`
+ LINE=`grep "wxUSE_TEXTFILE" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
eval "DEFAULT_$LINE"
else
no_cache=1
fi
- ac_cv_use_zipstream='wxUSE_ZIPSTREAM='$DEFAULT_wxUSE_ZIPSTREAM
+ ac_cv_use_textfile='wxUSE_TEXTFILE='$DEFAULT_wxUSE_TEXTFILE
fi;
- eval "$ac_cv_use_zipstream"
+ eval "$ac_cv_use_textfile"
if test "$no_cache" != 1; then
- echo $ac_cv_use_zipstream >> ${wx_arg_cache_file}.tmp
+ echo $ac_cv_use_textfile >> ${wx_arg_cache_file}.tmp
fi
- if test "$wxUSE_ZIPSTREAM" = yes; then
+ if test "$wxUSE_TEXTFILE" = yes; then
echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6
else
fi
+ enablestring=
+ echo "$as_me:$LINENO: checking for --${enablestring:-enable}-timer" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-timer... $ECHO_C" >&6
+ no_cache=0
+ # Check whether --enable-timer or --disable-timer was given.
+if test "${enable_timer+set}" = set; then
+ enableval="$enable_timer"
+
+ if test "$enableval" = yes; then
+ ac_cv_use_timer='wxUSE_TIMER=yes'
+ else
+ ac_cv_use_timer='wxUSE_TIMER=no'
+ fi
+
+else
+
+ LINE=`grep "wxUSE_TIMER" ${wx_arg_cache_file}`
+ if test "x$LINE" != x ; then
+ eval "DEFAULT_$LINE"
+ else
+ no_cache=1
+ fi
+
+ ac_cv_use_timer='wxUSE_TIMER='$DEFAULT_wxUSE_TIMER
+
+fi;
+
+ eval "$ac_cv_use_timer"
+ if test "$no_cache" != 1; then
+ echo $ac_cv_use_timer >> ${wx_arg_cache_file}.tmp
+ fi
+
+ if test "$wxUSE_TIMER" = yes; then
+ 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
+ fi
+
enablestring=
- echo "$as_me:$LINENO: checking for --${enablestring:-enable}-catch_segvs" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-catch_segvs... $ECHO_C" >&6
+ echo "$as_me:$LINENO: checking for --${enablestring:-enable}-unicode" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-unicode... $ECHO_C" >&6
no_cache=0
- # Check whether --enable-catch_segvs or --disable-catch_segvs was given.
-if test "${enable_catch_segvs+set}" = set; then
- enableval="$enable_catch_segvs"
+ # Check whether --enable-unicode or --disable-unicode was given.
+if test "${enable_unicode+set}" = set; then
+ enableval="$enable_unicode"
if test "$enableval" = yes; then
- ac_cv_use_catch_segvs='wxUSE_ON_FATAL_EXCEPTION=yes'
+ ac_cv_use_unicode='wxUSE_UNICODE=yes'
else
- ac_cv_use_catch_segvs='wxUSE_ON_FATAL_EXCEPTION=no'
+ ac_cv_use_unicode='wxUSE_UNICODE=no'
fi
else
- LINE=`grep "wxUSE_ON_FATAL_EXCEPTION" ${wx_arg_cache_file}`
+ LINE=`grep "wxUSE_UNICODE" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
eval "DEFAULT_$LINE"
else
no_cache=1
fi
- ac_cv_use_catch_segvs='wxUSE_ON_FATAL_EXCEPTION='$DEFAULT_wxUSE_ON_FATAL_EXCEPTION
+ ac_cv_use_unicode='wxUSE_UNICODE='$DEFAULT_wxUSE_UNICODE
fi;
- eval "$ac_cv_use_catch_segvs"
+ eval "$ac_cv_use_unicode"
if test "$no_cache" != 1; then
- echo $ac_cv_use_catch_segvs >> ${wx_arg_cache_file}.tmp
+ echo $ac_cv_use_unicode >> ${wx_arg_cache_file}.tmp
fi
- if test "$wxUSE_ON_FATAL_EXCEPTION" = yes; then
+ if test "$wxUSE_UNICODE" = yes; then
echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6
else
enablestring=
- echo "$as_me:$LINENO: checking for --${enablestring:-enable}-snglinst" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-snglinst... $ECHO_C" >&6
+ echo "$as_me:$LINENO: checking for --${enablestring:-enable}-wave" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-wave... $ECHO_C" >&6
no_cache=0
- # Check whether --enable-snglinst or --disable-snglinst was given.
-if test "${enable_snglinst+set}" = set; then
- enableval="$enable_snglinst"
+ # Check whether --enable-wave or --disable-wave was given.
+if test "${enable_wave+set}" = set; then
+ enableval="$enable_wave"
if test "$enableval" = yes; then
- ac_cv_use_snglinst='wxUSE_SNGLINST_CHECKER=yes'
+ ac_cv_use_wave='wxUSE_WAVE=yes'
else
- ac_cv_use_snglinst='wxUSE_SNGLINST_CHECKER=no'
+ ac_cv_use_wave='wxUSE_WAVE=no'
fi
else
- LINE=`grep "wxUSE_SNGLINST_CHECKER" ${wx_arg_cache_file}`
+ LINE=`grep "wxUSE_WAVE" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
eval "DEFAULT_$LINE"
else
no_cache=1
fi
- ac_cv_use_snglinst='wxUSE_SNGLINST_CHECKER='$DEFAULT_wxUSE_SNGLINST_CHECKER
+ ac_cv_use_wave='wxUSE_WAVE='$DEFAULT_wxUSE_WAVE
fi;
- eval "$ac_cv_use_snglinst"
+ eval "$ac_cv_use_wave"
if test "$no_cache" != 1; then
- echo $ac_cv_use_snglinst >> ${wx_arg_cache_file}.tmp
+ echo $ac_cv_use_wave >> ${wx_arg_cache_file}.tmp
fi
- if test "$wxUSE_SNGLINST_CHECKER" = yes; then
+ if test "$wxUSE_WAVE" = yes; then
echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6
else
fi
+ enablestring=
+ echo "$as_me:$LINENO: checking for --${enablestring:-enable}-wxprintfv" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-wxprintfv... $ECHO_C" >&6
+ no_cache=0
+ # Check whether --enable-wxprintfv or --disable-wxprintfv was given.
+if test "${enable_wxprintfv+set}" = set; then
+ enableval="$enable_wxprintfv"
+
+ if test "$enableval" = yes; then
+ ac_cv_use_wxprintfv='wxUSE_EXPERIMENTAL_PRINTF=yes'
+ else
+ ac_cv_use_wxprintfv='wxUSE_EXPERIMENTAL_PRINTF=no'
+ fi
+
+else
+
+ LINE=`grep "wxUSE_EXPERIMENTAL_PRINTF" ${wx_arg_cache_file}`
+ if test "x$LINE" != x ; then
+ eval "DEFAULT_$LINE"
+ else
+ no_cache=1
+ fi
+
+ ac_cv_use_wxprintfv='wxUSE_EXPERIMENTAL_PRINTF='$DEFAULT_wxUSE_EXPERIMENTAL_PRINTF
+
+fi;
+
+ eval "$ac_cv_use_wxprintfv"
+ if test "$no_cache" != 1; then
+ echo $ac_cv_use_wxprintfv >> ${wx_arg_cache_file}.tmp
+ fi
+
+ if test "$wxUSE_EXPERIMENTAL_PRINTF" = yes; then
+ 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
+ fi
+
enablestring=
- echo "$as_me:$LINENO: checking for --${enablestring:-enable}-mimetype" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-mimetype... $ECHO_C" >&6
+ echo "$as_me:$LINENO: checking for --${enablestring:-enable}-zipstream" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-zipstream... $ECHO_C" >&6
no_cache=0
- # Check whether --enable-mimetype or --disable-mimetype was given.
-if test "${enable_mimetype+set}" = set; then
- enableval="$enable_mimetype"
+ # Check whether --enable-zipstream or --disable-zipstream was given.
+if test "${enable_zipstream+set}" = set; then
+ enableval="$enable_zipstream"
if test "$enableval" = yes; then
- ac_cv_use_mimetype='wxUSE_MIMETYPE=yes'
+ ac_cv_use_zipstream='wxUSE_ZIPSTREAM=yes'
else
- ac_cv_use_mimetype='wxUSE_MIMETYPE=no'
+ ac_cv_use_zipstream='wxUSE_ZIPSTREAM=no'
fi
else
- LINE=`grep "wxUSE_MIMETYPE" ${wx_arg_cache_file}`
+ LINE=`grep "wxUSE_ZIPSTREAM" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
eval "DEFAULT_$LINE"
else
no_cache=1
fi
- ac_cv_use_mimetype='wxUSE_MIMETYPE='$DEFAULT_wxUSE_MIMETYPE
+ ac_cv_use_zipstream='wxUSE_ZIPSTREAM='$DEFAULT_wxUSE_ZIPSTREAM
fi;
- eval "$ac_cv_use_mimetype"
+ eval "$ac_cv_use_zipstream"
if test "$no_cache" != 1; then
- echo $ac_cv_use_mimetype >> ${wx_arg_cache_file}.tmp
+ echo $ac_cv_use_zipstream >> ${wx_arg_cache_file}.tmp
fi
- if test "$wxUSE_MIMETYPE" = yes; then
+ if test "$wxUSE_ZIPSTREAM" = yes; then
echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6
else
enablestring=
- echo "$as_me:$LINENO: checking for --${enablestring:-enable}-system_options" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-system_options... $ECHO_C" >&6
+ echo "$as_me:$LINENO: checking for --${enablestring:-enable}-gzstream" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-gzstream... $ECHO_C" >&6
no_cache=0
- # Check whether --enable-system_options or --disable-system_options was given.
-if test "${enable_system_options+set}" = set; then
- enableval="$enable_system_options"
+ # Check whether --enable-gzstream or --disable-gzstream was given.
+if test "${enable_gzstream+set}" = set; then
+ enableval="$enable_gzstream"
if test "$enableval" = yes; then
- ac_cv_use_system_options='wxUSE_SYSTEM_OPTIONS=yes'
+ ac_cv_use_gzstream='wxUSE_GZSTREAM=yes'
else
- ac_cv_use_system_options='wxUSE_SYSTEM_OPTIONS=no'
+ ac_cv_use_gzstream='wxUSE_GZSTREAM=no'
fi
else
- LINE=`grep "wxUSE_SYSTEM_OPTIONS" ${wx_arg_cache_file}`
+ LINE=`grep "wxUSE_GZSTREAM" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
eval "DEFAULT_$LINE"
else
no_cache=1
fi
- ac_cv_use_system_options='wxUSE_SYSTEM_OPTIONS='$DEFAULT_wxUSE_SYSTEM_OPTIONS
+ ac_cv_use_gzstream='wxUSE_GZSTREAM='$DEFAULT_wxUSE_GZSTREAM
fi;
- eval "$ac_cv_use_system_options"
+ eval "$ac_cv_use_gzstream"
if test "$no_cache" != 1; then
- echo $ac_cv_use_system_options >> ${wx_arg_cache_file}.tmp
+ echo $ac_cv_use_gzstream >> ${wx_arg_cache_file}.tmp
fi
- if test "$wxUSE_SYSTEM_OPTIONS" = yes; then
+ if test "$wxUSE_GZSTREAM" = yes; then
echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6
else
DEFAULT_wxUSE_GAUGE=yes
DEFAULT_wxUSE_GRID=yes
DEFAULT_wxUSE_IMAGLIST=yes
+ DEFAULT_wxUSE_LISTBOOK=yes
DEFAULT_wxUSE_LISTBOX=yes
DEFAULT_wxUSE_LISTCTRL=yes
DEFAULT_wxUSE_NOTEBOOK=yes
DEFAULT_wxUSE_GAUGE=no
DEFAULT_wxUSE_GRID=no
DEFAULT_wxUSE_IMAGLIST=no
+ DEFAULT_wxUSE_LISTBOOK=no
DEFAULT_wxUSE_LISTBOX=no
DEFAULT_wxUSE_LISTCTRL=no
DEFAULT_wxUSE_NOTEBOOK=no
fi
+ enablestring=
+ echo "$as_me:$LINENO: checking for --${enablestring:-enable}-listbook" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-listbook... $ECHO_C" >&6
+ no_cache=0
+ # Check whether --enable-listbook or --disable-listbook was given.
+if test "${enable_listbook+set}" = set; then
+ enableval="$enable_listbook"
+
+ if test "$enableval" = yes; then
+ ac_cv_use_listbook='wxUSE_LISTBOOK=yes'
+ else
+ ac_cv_use_listbook='wxUSE_LISTBOOK=no'
+ fi
+
+else
+
+ LINE=`grep "wxUSE_LISTBOOK" ${wx_arg_cache_file}`
+ if test "x$LINE" != x ; then
+ eval "DEFAULT_$LINE"
+ else
+ no_cache=1
+ fi
+
+ ac_cv_use_listbook='wxUSE_LISTBOOK='$DEFAULT_wxUSE_LISTBOOK
+
+fi;
+
+ eval "$ac_cv_use_listbook"
+ if test "$no_cache" != 1; then
+ echo $ac_cv_use_listbook >> ${wx_arg_cache_file}.tmp
+ fi
+
+ if test "$wxUSE_LISTBOOK" = yes; then
+ 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
+ fi
+
+
enablestring=
echo "$as_me:$LINENO: checking for --${enablestring:-enable}-listbox" >&5
echo $ECHO_N "checking for --${enablestring:-enable}-listbox... $ECHO_C" >&6
case "${host}" in
*-pc-os2_emx | *-pc-os2-emx )
PATH_IFS=';'
- LEX_STEM="lexyy"
;;
*)
PATH_IFS=':'
- LEX_STEM="lex.yy"
;;
esac
echo "$var=$value" >> ${wx_arg_cache_file}
fi
if test "$value" = 1; then
- toolkit_echo=`echo $toolkit | tr [A-Z] [a-z]`
+ toolkit_echo=`echo $toolkit | tr "[A-Z]" "[a-z]"`
echo "$as_me:$LINENO: result: $toolkit_echo" >&5
echo "${ECHO_T}$toolkit_echo" >&6
fi
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
for ac_declaration in \
- ''\
- '#include <stdlib.h>' \
+ '' \
'extern "C" void std::exit (int) throw (); using std::exit;' \
'extern "C" void std::exit (int); using std::exit;' \
'extern "C" void exit (int) throw ();' \
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-#include <stdlib.h>
$ac_declaration
+#include <stdlib.h>
int
main ()
{
fi
fi
for ac_declaration in \
- ''\
- '#include <stdlib.h>' \
+ '' \
'extern "C" void std::exit (int) throw (); using std::exit;' \
'extern "C" void std::exit (int); using std::exit;' \
'extern "C" void exit (int) throw ();' \
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-#include <stdlib.h>
$ac_declaration
+#include <stdlib.h>
int
main ()
{
done
done
- test -z "$ac_cv_prog_AR" && ac_cv_prog_AR="ar"
fi
fi
AR=$ac_cv_prog_AR
echo "${ECHO_T}no" >&6
fi
+if test "x$AR" = "x" ; then
+ { { echo "$as_me:$LINENO: error: ar is needed to build wxWindows" >&5
+echo "$as_me: error: ar is needed to build wxWindows" >&2;}
+ { (exit 1); exit 1; }; }
+fi
# Find a good install program. We prefer a C program (faster),
# so one script is as good as another. But avoid the broken or
" >&2;}
{ (exit 1); exit 1; }; }
fi fi
-for ac_prog in 'bison -y' byacc
-do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_YACC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- if test -n "$YACC"; then
- ac_cv_prog_YACC="$YACC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_prog_YACC="$ac_prog"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-
-fi
-fi
-YACC=$ac_cv_prog_YACC
-if test -n "$YACC"; then
- echo "$as_me:$LINENO: result: $YACC" >&5
-echo "${ECHO_T}$YACC" >&6
-else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
- test -n "$YACC" && break
-done
-test -n "$YACC" || YACC="yacc"
-
-
-for ac_prog in flex lex
-do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_LEX+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- if test -n "$LEX"; then
- ac_cv_prog_LEX="$LEX" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_prog_LEX="$ac_prog"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-
-fi
-fi
-LEX=$ac_cv_prog_LEX
-if test -n "$LEX"; then
- echo "$as_me:$LINENO: result: $LEX" >&5
-echo "${ECHO_T}$LEX" >&6
+echo "$as_me:$LINENO: checking whether ln -s works" >&5
+echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6
+LN_S=$as_ln_s
+if test "$LN_S" = "ln -s"; then
+ 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: result: no, using $LN_S" >&5
+echo "${ECHO_T}no, using $LN_S" >&6
fi
- test -n "$LEX" && break
-done
-test -n "$LEX" || LEX=":"
-if test -z "$LEXLIB"
-then
- echo "$as_me:$LINENO: checking for yywrap in -lfl" >&5
-echo $ECHO_N "checking for yywrap in -lfl... $ECHO_C" >&6
-if test "${ac_cv_lib_fl_yywrap+set}" = set; then
+case "${host}" in
+ *-pc-os2_emx | *-pc-os2-emx )
+ if test "$wxUSE_MOTIF" = 1 -o "$wxUSE_GTK" = 1 -o "$wxUSE_X11" = 1; then
+ echo "$as_me:$LINENO: checking for drand48 in -lcExt" >&5
+echo $ECHO_N "checking for drand48 in -lcExt... $ECHO_C" >&6
+if test "${ac_cv_lib_cExt_drand48+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lfl $LIBS"
+LIBS="-lcExt $LIBS"
cat >conftest.$ac_ext <<_ACEOF
#line $LINENO "configure"
/* confdefs.h. */
#endif
/* We use char because int might match the return type of a gcc2
builtin and then its argument prototype would still apply. */
-char yywrap ();
+char drand48 ();
int
main ()
{
-yywrap ();
+drand48 ();
;
return 0;
}
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- ac_cv_lib_fl_yywrap=yes
+ ac_cv_lib_cExt_drand48=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_fl_yywrap=no
+ac_cv_lib_cExt_drand48=no
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_fl_yywrap" >&5
-echo "${ECHO_T}$ac_cv_lib_fl_yywrap" >&6
-if test $ac_cv_lib_fl_yywrap = yes; then
- LEXLIB="-lfl"
-else
- echo "$as_me:$LINENO: checking for yywrap in -ll" >&5
-echo $ECHO_N "checking for yywrap in -ll... $ECHO_C" >&6
-if test "${ac_cv_lib_l_yywrap+set}" = set; then
+echo "$as_me:$LINENO: result: $ac_cv_lib_cExt_drand48" >&5
+echo "${ECHO_T}$ac_cv_lib_cExt_drand48" >&6
+if test $ac_cv_lib_cExt_drand48 = yes; then
+ LIBS="$LIBS -lcExt"
+fi
+
+ else
+ RESPROGRAMOBJ="\${top_srcdir}/include/wx/os2/wx.res"
+ fi
+ echo "$as_me:$LINENO: checking for gcc 3 or later" >&5
+echo $ECHO_N "checking for gcc 3 or later... $ECHO_C" >&6
+if test "${wx_cv_gcc3+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-ll $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
+
+ cat >conftest.$ac_ext <<_ACEOF
#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-/* Override any gcc2 internal prototype to avoid an error. */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
-char yywrap ();
int
main ()
{
-yywrap ();
+
+ #if (__GNUC__ < 3)
+ #error old gcc
+ #endif
+
;
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -s conftest$ac_exeext'
+ { ac_try='test -s conftest.$ac_objext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- ac_cv_lib_l_yywrap=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_l_yywrap=no
-fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_l_yywrap" >&5
-echo "${ECHO_T}$ac_cv_lib_l_yywrap" >&6
-if test $ac_cv_lib_l_yywrap = yes; then
- LEXLIB="-ll"
-fi
-fi
-
-fi
+ wx_cv_gcc3=yes
-if test "x$LEX" != "x:"; then
- echo "$as_me:$LINENO: checking lex output file root" >&5
-echo $ECHO_N "checking lex output file root... $ECHO_C" >&6
-if test "${ac_cv_prog_lex_root+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- # The minimal lex program is just a single line: %%. But some broken lexes
-# (Solaris, I think it was) want two %% lines, so accommodate them.
-cat >conftest.l <<_ACEOF
-%%
-%%
-_ACEOF
-{ (eval echo "$as_me:$LINENO: \"$LEX conftest.l\"") >&5
- (eval $LEX conftest.l) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
-if test -f lex.yy.c; then
- ac_cv_prog_lex_root=lex.yy
-elif test -f lexyy.c; then
- ac_cv_prog_lex_root=lexyy
-else
- { { echo "$as_me:$LINENO: error: cannot find output from $LEX; giving up" >&5
-echo "$as_me: error: cannot find output from $LEX; giving up" >&2;}
- { (exit 1); exit 1; }; }
-fi
-fi
-echo "$as_me:$LINENO: result: $ac_cv_prog_lex_root" >&5
-echo "${ECHO_T}$ac_cv_prog_lex_root" >&6
-rm -f conftest.l
-LEX_OUTPUT_ROOT=$ac_cv_prog_lex_root
-
-echo "$as_me:$LINENO: checking whether yytext is a pointer" >&5
-echo $ECHO_N "checking whether yytext is a pointer... $ECHO_C" >&6
-if test "${ac_cv_prog_lex_yytext_pointer+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- # POSIX says lex can declare yytext either as a pointer or an array; the
-# default is implementation-dependent. Figure out which it is, since
-# not all implementations provide the %pointer and %array declarations.
-ac_cv_prog_lex_yytext_pointer=no
-echo 'extern char *yytext;' >>$LEX_OUTPUT_ROOT.c
-ac_save_LIBS=$LIBS
-LIBS="$LIBS $LEXLIB"
-cat >conftest.$ac_ext <<_ACEOF
-`cat $LEX_OUTPUT_ROOT.c`
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_prog_lex_yytext_pointer=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_save_LIBS
-rm -f "${LEX_OUTPUT_ROOT}.c"
-
-fi
-echo "$as_me:$LINENO: result: $ac_cv_prog_lex_yytext_pointer" >&5
-echo "${ECHO_T}$ac_cv_prog_lex_yytext_pointer" >&6
-if test $ac_cv_prog_lex_yytext_pointer = yes; then
-cat >>confdefs.h <<\_ACEOF
-#define YYTEXT_POINTER 1
-_ACEOF
+ wx_cv_gcc3=no
-fi
fi
+rm -f conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: checking whether ln -s works" >&5
-echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6
-LN_S=$as_ln_s
-if test "$LN_S" = "ln -s"; then
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-else
- echo "$as_me:$LINENO: result: no, using $LN_S" >&5
-echo "${ECHO_T}no, using $LN_S" >&6
-fi
-
-
-case "${host}" in
- *-pc-os2_emx | *-pc-os2-emx )
- LIBS="$LIBS -lstdcpp"
- if test "$wxUSE_MOTIF" = 1 -o "$wxUSE_GTK" = 1 -o "$wxUSE_X11" = 1; then
- echo "$as_me:$LINENO: checking for drand48 in -lcExt" >&5
-echo $ECHO_N "checking for drand48 in -lcExt... $ECHO_C" >&6
-if test "${ac_cv_lib_cExt_drand48+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lcExt $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-/* Override any gcc2 internal prototype to avoid an error. */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
-char drand48 ();
-int
-main ()
-{
-drand48 ();
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_lib_cExt_drand48=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_cExt_drand48=no
-fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_cExt_drand48" >&5
-echo "${ECHO_T}$ac_cv_lib_cExt_drand48" >&6
-if test $ac_cv_lib_cExt_drand48 = yes; then
- LIBS="$LIBS -lcExt"
-fi
-
+echo "$as_me:$LINENO: result: $wx_cv_gcc3" >&5
+echo "${ECHO_T}$wx_cv_gcc3" >&6
+ if test "$wx_cv_gcc3" = "no"; then
+ LIBS="$LIBS -lstdcpp"
else
- RESPROGRAMOBJ="\${top_srcdir}/include/wx/os2/wx.res"
+ LIBS="$LIBS -lstdcxx"
fi
;;
esac
esac
if test "$wxUSE_GUI" = "yes"; then
- if test "$wxUSE_UNIX" = "yes"; then
+ if test "$wxUSE_UNIX" = "yes" -a "$wxUSE_PM" != 1; then
-for ac_header in X11/XKBlib.h
+for ac_header in X11/Xlib.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
if eval "test \"\${$as_ac_Header+set}\" = set"; then
fi
+done
+
+
+for ac_header in X11/XKBlib.h
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+ #if HAVE_X11_XLIB_H
+ #include <X11/Xlib.h>
+ #endif
+
+
+#include <$ac_header>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ eval "$as_ac_Header=yes"
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+eval "$as_ac_Header=no"
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
done
fi
fi
if test $ac_cv_header_tiffio_h = yes; then
- echo "$as_me:$LINENO: checking for TIFFError in -ltiff" >&5
+
+ echo "$as_me:$LINENO: checking for TIFFError in -ltiff" >&5
echo $ECHO_N "checking for TIFFError in -ltiff... $ECHO_C" >&6
if test "${ac_cv_lib_tiff_TIFFError+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
fi
+
fi
if test "$wxUSE_EXPAT" != "no"; then
- wxUSE_XML=1
+ wxUSE_XML=yes
cat >>confdefs.h <<\_ACEOF
#define wxUSE_EXPAT 1
_ACEOF
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc in
yes:no )
- { echo "$as_me:$LINENO: WARNING: expat.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: expat.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: expat.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: expat.h: proceeding with the preprocessor's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: expat.h: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: expat.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { echo "$as_me:$LINENO: WARNING: expat.h: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: expat.h: proceeding with the preprocessor's result" >&2;}
+ (
+ cat <<\_ASBOX
+## ------------------------------------ ##
+## Report this to bug-autoconf@gnu.org. ##
+## ------------------------------------ ##
+_ASBOX
+ ) |
+ sed "s/^/$as_me: WARNING: /" >&2
+ ;;
+ no:yes )
+ { echo "$as_me:$LINENO: WARNING: expat.h: present but cannot be compiled" >&5
+echo "$as_me: WARNING: expat.h: present but cannot be compiled" >&2;}
+ { echo "$as_me:$LINENO: WARNING: expat.h: check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: expat.h: check for missing prerequisite headers?" >&2;}
+ { echo "$as_me:$LINENO: WARNING: expat.h: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: expat.h: proceeding with the preprocessor's result" >&2;}
+ (
+ cat <<\_ASBOX
+## ------------------------------------ ##
+## Report this to bug-autoconf@gnu.org. ##
+## ------------------------------------ ##
+_ASBOX
+ ) |
+ sed "s/^/$as_me: WARNING: /" >&2
+ ;;
+esac
+echo "$as_me:$LINENO: checking for expat.h" >&5
+echo $ECHO_N "checking for expat.h... $ECHO_C" >&6
+if test "${ac_cv_header_expat_h+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ ac_cv_header_expat_h=$ac_header_preproc
+fi
+echo "$as_me:$LINENO: result: $ac_cv_header_expat_h" >&5
+echo "${ECHO_T}$ac_cv_header_expat_h" >&6
+
+fi
+if test $ac_cv_header_expat_h = yes; then
+ found_expat_h=1
+fi
+
+
+ if test "x$found_expat_h" = "x1"; then
+ echo "$as_me:$LINENO: checking if expat.h is valid C++ header" >&5
+echo $ECHO_N "checking if expat.h is valid C++ header... $ECHO_C" >&6
+if test "${wx_cv_expat_is_not_broken+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+
+
+
+ ac_ext=cc
+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
+#line $LINENO "configure"
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <expat.h>
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ wx_cv_expat_is_not_broken=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+wx_cv_expat_is_not_broken=no
+
+fi
+rm -f 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_expat_is_not_broken" >&5
+echo "${ECHO_T}$wx_cv_expat_is_not_broken" >&6
+ if test "$wx_cv_expat_is_not_broken" = "yes" ; then
+ echo "$as_me:$LINENO: checking for XML_ParserCreate in -lexpat" >&5
+echo $ECHO_N "checking for XML_ParserCreate in -lexpat... $ECHO_C" >&6
+if test "${ac_cv_lib_expat_XML_ParserCreate+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lexpat $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+/* Override any gcc2 internal prototype to avoid an error. */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+char XML_ParserCreate ();
+int
+main ()
+{
+XML_ParserCreate ();
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_lib_expat_XML_ParserCreate=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_expat_XML_ParserCreate=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:$LINENO: result: $ac_cv_lib_expat_XML_ParserCreate" >&5
+echo "${ECHO_T}$ac_cv_lib_expat_XML_ParserCreate" >&6
+if test $ac_cv_lib_expat_XML_ParserCreate = yes; then
+ EXPAT_LINK=" -lexpat"
+fi
+
+ fi
+ fi
+ if test "x$EXPAT_LINK" = "x" ; then
+ if test "$wxUSE_EXPAT" = "sys" ; then
+ { { echo "$as_me:$LINENO: error: system expat library not found! Use --with-expat=builtin to use built-in version" >&5
+echo "$as_me: error: system expat library not found! Use --with-expat=builtin to use built-in version" >&2;}
+ { (exit 1); exit 1; }; }
+ else
+ { echo "$as_me:$LINENO: WARNING: system expat library not found, will use built-in instead" >&5
+echo "$as_me: WARNING: system expat library not found, will use built-in instead" >&2;}
+ wxUSE_EXPAT=builtin
+ fi
+ else
+ wxUSE_EXPAT=sys
+ fi
+ fi
+ if test "$wxUSE_EXPAT" = "builtin" ; then
+
+
+subdirs="$subdirs src/expat"
+
+ fi
+fi
+
+
+
+if test "$wxUSE_LIBMSPACK" != "no"; then
+
+ if test "${ac_cv_header_mspack_h+set}" = set; then
+ echo "$as_me:$LINENO: checking for mspack.h" >&5
+echo $ECHO_N "checking for mspack.h... $ECHO_C" >&6
+if test "${ac_cv_header_mspack_h+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+echo "$as_me:$LINENO: result: $ac_cv_header_mspack_h" >&5
+echo "${ECHO_T}$ac_cv_header_mspack_h" >&6
+else
+ # Is the header compilable?
+echo "$as_me:$LINENO: checking mspack.h usability" >&5
+echo $ECHO_N "checking mspack.h usability... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+#include <mspack.h>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_header_compiler=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_header_compiler=no
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6
+
+# Is the header present?
+echo "$as_me:$LINENO: checking mspack.h presence" >&5
+echo $ECHO_N "checking mspack.h presence... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <mspack.h>
+_ACEOF
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+ (eval $ac_cpp conftest.$ac_ext) 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); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+ else
+ ac_cpp_err=
+ fi
+else
+ ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+ ac_header_preproc=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_preproc=no
+fi
+rm -f conftest.err conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6
+
+# So? What about this header?
+case $ac_header_compiler:$ac_header_preproc in
+ yes:no )
+ { echo "$as_me:$LINENO: WARNING: mspack.h: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: mspack.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { echo "$as_me:$LINENO: WARNING: mspack.h: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: mspack.h: proceeding with the preprocessor's result" >&2;}
(
cat <<\_ASBOX
## ------------------------------------ ##
sed "s/^/$as_me: WARNING: /" >&2
;;
no:yes )
- { echo "$as_me:$LINENO: WARNING: expat.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: expat.h: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: expat.h: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: expat.h: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: expat.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: expat.h: proceeding with the preprocessor's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: mspack.h: present but cannot be compiled" >&5
+echo "$as_me: WARNING: mspack.h: present but cannot be compiled" >&2;}
+ { echo "$as_me:$LINENO: WARNING: mspack.h: check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: mspack.h: check for missing prerequisite headers?" >&2;}
+ { echo "$as_me:$LINENO: WARNING: mspack.h: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: mspack.h: proceeding with the preprocessor's result" >&2;}
(
cat <<\_ASBOX
## ------------------------------------ ##
sed "s/^/$as_me: WARNING: /" >&2
;;
esac
-echo "$as_me:$LINENO: checking for expat.h" >&5
-echo $ECHO_N "checking for expat.h... $ECHO_C" >&6
-if test "${ac_cv_header_expat_h+set}" = set; then
+echo "$as_me:$LINENO: checking for mspack.h" >&5
+echo $ECHO_N "checking for mspack.h... $ECHO_C" >&6
+if test "${ac_cv_header_mspack_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- ac_cv_header_expat_h=$ac_header_preproc
+ ac_cv_header_mspack_h=$ac_header_preproc
fi
-echo "$as_me:$LINENO: result: $ac_cv_header_expat_h" >&5
-echo "${ECHO_T}$ac_cv_header_expat_h" >&6
+echo "$as_me:$LINENO: result: $ac_cv_header_mspack_h" >&5
+echo "${ECHO_T}$ac_cv_header_mspack_h" >&6
fi
-if test $ac_cv_header_expat_h = yes; then
- found_expat_h=1
+if test $ac_cv_header_mspack_h = yes; then
+ found_mspack_h=1
fi
- if test "x$found_expat_h" = "x1"; then
- echo "$as_me:$LINENO: checking if expat.h is valid C++ header" >&5
-echo $ECHO_N "checking if expat.h is valid C++ header... $ECHO_C" >&6
-if test "${wx_cv_expat_is_not_broken+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
-
-
- ac_ext=cc
-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
-#line $LINENO "configure"
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <expat.h>
-int
-main ()
-{
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- wx_cv_expat_is_not_broken=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-wx_cv_expat_is_not_broken=no
-
-fi
-rm -f 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_expat_is_not_broken" >&5
-echo "${ECHO_T}$wx_cv_expat_is_not_broken" >&6
- if test "$wx_cv_expat_is_not_broken" = "yes" ; then
- echo "$as_me:$LINENO: checking for XML_ParserCreate in -lexpat" >&5
-echo $ECHO_N "checking for XML_ParserCreate in -lexpat... $ECHO_C" >&6
-if test "${ac_cv_lib_expat_XML_ParserCreate+set}" = set; then
+ if test "x$found_mspack_h" = "x1"; then
+ echo "$as_me:$LINENO: checking for mspack_create_chm_decompressor in -lmspack" >&5
+echo $ECHO_N "checking for mspack_create_chm_decompressor in -lmspack... $ECHO_C" >&6
+if test "${ac_cv_lib_mspack_mspack_create_chm_decompressor+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lexpat $LIBS"
+LIBS="-lmspack $LIBS"
cat >conftest.$ac_ext <<_ACEOF
#line $LINENO "configure"
/* confdefs.h. */
#endif
/* We use char because int might match the return type of a gcc2
builtin and then its argument prototype would still apply. */
-char XML_ParserCreate ();
+char mspack_create_chm_decompressor ();
int
main ()
{
-XML_ParserCreate ();
+mspack_create_chm_decompressor ();
;
return 0;
}
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- ac_cv_lib_expat_XML_ParserCreate=yes
+ ac_cv_lib_mspack_mspack_create_chm_decompressor=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_expat_XML_ParserCreate=no
+ac_cv_lib_mspack_mspack_create_chm_decompressor=no
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_expat_XML_ParserCreate" >&5
-echo "${ECHO_T}$ac_cv_lib_expat_XML_ParserCreate" >&6
-if test $ac_cv_lib_expat_XML_ParserCreate = yes; then
- EXPAT_LINK=" -lexpat"
+echo "$as_me:$LINENO: result: $ac_cv_lib_mspack_mspack_create_chm_decompressor" >&5
+echo "${ECHO_T}$ac_cv_lib_mspack_mspack_create_chm_decompressor" >&6
+if test $ac_cv_lib_mspack_mspack_create_chm_decompressor = yes; then
+ MSPACK_LINK=" -lmspack"
fi
- fi
- fi
- if test "x$EXPAT_LINK" = "x" ; then
- if test "$wxUSE_EXPAT" = "sys" ; then
- { { echo "$as_me:$LINENO: error: system expat library not found! Use --with-expat=builtin to use built-in version" >&5
-echo "$as_me: error: system expat library not found! Use --with-expat=builtin to use built-in version" >&2;}
- { (exit 1); exit 1; }; }
- else
- { echo "$as_me:$LINENO: WARNING: system expat library not found, will use built-in instead" >&5
-echo "$as_me: WARNING: system expat library not found, will use built-in instead" >&2;}
- wxUSE_EXPAT=builtin
- fi
- else
- wxUSE_EXPAT=sys
- fi
fi
- if test "$wxUSE_EXPAT" = "builtin" ; then
-
-
-subdirs="$subdirs src/expat"
+ if test "x$MSPACK_LINK" = "x" ; then
+ wxUSE_LIBMSPACK=no
+ else
+ cat >>confdefs.h <<\_ACEOF
+#define wxUSE_LIBMSPACK 1
+_ACEOF
fi
fi
if test "$wxUSE_MSW" = 1 ; then
TOOLKIT=MSW
GUIDIST=MSW_DIST
+
+ case "${host}" in
+ *-*-mingw32* )
+ WXCONFIG_LDFLAGS_GUI="$LDFLAGS -Wl,--subsystem,windows -mwindows"
+ esac
fi
if test "$wxUSE_GTK" = 1; then
echo "$as_me:$LINENO: checking for libmgl location" >&5
echo $ECHO_N "checking for libmgl location... $ECHO_C" >&6
- case "${host}" in
+ case "${host}" in
*-*-linux* )
- if test "x$wxUSE_SHARED" = xyes ; then
- mgl_os_candidates="linux/gcc/glibc.so linux/gcc/glibc"
+ if test "x$wxUSE_SHARED" = xyes ; then
+ mgl_os_candidates="linux/gcc/x86/so linux/gcc/x86/a linux/gcc/glibc.so linux/gcc/glibc"
else
- mgl_os_candidates="linux/gcc/glibc linux/gcc/glibc.so"
+ mgl_os_candidates="linux/gcc/x86/a linux/gcc/x86/so linux/gcc/glibc linux/gcc/glibc.so"
fi
;;
*-pc-msdosdjgpp )
fi
fi
- xpm_link=
- echo "$as_me:$LINENO: checking for Xpm library" >&5
-echo $ECHO_N "checking for Xpm library... $ECHO_C" >&6
-
-ac_find_libraries=
-for ac_dir in $SEARCH_LIB /usr/lib;
- do
- for ac_extension in a so sl dylib; do
- if test -f "$ac_dir/libXpm.$ac_extension"; then
- ac_find_libraries=$ac_dir
- break 2
- fi
- done
- done
-
- if test "$ac_find_libraries" != "" ; then
-
- echo "$GUI_TK_LIBRARY" | grep "\-L$ac_find_libraries" > /dev/null
- result=$?
- if test $result = 0; then
- ac_path_to_link=""
- else
- ac_path_to_link=" -L$ac_find_libraries"
- fi
-
- GUI_TK_LIBRARY="$GUI_TK_LIBRARY$ac_path_to_link"
- xpm_link=" -lXpm"
- cat >>confdefs.h <<\_ACEOF
-#define wxHAVE_LIB_XPM 1
-_ACEOF
-
- echo "$as_me:$LINENO: result: found at $ac_find_libraries" >&5
-echo "${ECHO_T}found at $ac_find_libraries" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
- #include <X11/xpm.h>
-
-int
-main ()
-{
-
- int version;
- version = XpmLibraryVersion();
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-
- xpm_link=" -lXpm"
- cat >>confdefs.h <<\_ACEOF
-#define wxHAVE_LIB_XPM 1
-_ACEOF
-
- echo "$as_me:$LINENO: result: found in default search path" >&5
-echo "${ECHO_T}found in default search path" >&6
- COMPILED_X_PROGRAM=0
-
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
- { echo "$as_me:$LINENO: WARNING: library will be compiled without support for images in XPM format" >&5
-echo "$as_me: WARNING: library will be compiled without support for images in XPM format" >&2;}
-
-
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
- fi
-
- echo "$as_me:$LINENO: checking for XShapeQueryExtension in -lXext" >&5
-echo $ECHO_N "checking for XShapeQueryExtension in -lXext... $ECHO_C" >&6
-if test "${ac_cv_lib_Xext_XShapeQueryExtension+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lXext $GUI_TK_LIBRARY -lX11 $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-/* Override any gcc2 internal prototype to avoid an error. */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
-char XShapeQueryExtension ();
-int
-main ()
-{
-XShapeQueryExtension ();
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_lib_Xext_XShapeQueryExtension=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_Xext_XShapeQueryExtension=no
-fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_Xext_XShapeQueryExtension" >&5
-echo "${ECHO_T}$ac_cv_lib_Xext_XShapeQueryExtension" >&6
-if test $ac_cv_lib_Xext_XShapeQueryExtension = yes; then
-
- GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lXext"
- wxHAVE_XEXT_LIB=1
-
-fi
-
-
if test "$wxUSE_UNICODE" = "yes"; then
succeeded=no
fi
fi
- xpm_link=
- echo "$as_me:$LINENO: checking for Xpm library" >&5
-echo $ECHO_N "checking for Xpm library... $ECHO_C" >&6
-
-ac_find_libraries=
-for ac_dir in $SEARCH_LIB /usr/lib;
- do
- for ac_extension in a so sl dylib; do
- if test -f "$ac_dir/libXpm.$ac_extension"; then
- ac_find_libraries=$ac_dir
- break 2
- fi
- done
- done
-
- if test "$ac_find_libraries" != "" ; then
-
- echo "$GUI_TK_LIBRARY" | grep "\-L$ac_find_libraries" > /dev/null
- result=$?
- if test $result = 0; then
- ac_path_to_link=""
- else
- ac_path_to_link=" -L$ac_find_libraries"
- fi
-
- GUI_TK_LIBRARY="$GUI_TK_LIBRARY$ac_path_to_link"
-
- xpm_link=" -lXpm"
- cat >>confdefs.h <<\_ACEOF
-#define wxHAVE_LIB_XPM 1
-_ACEOF
-
- echo "$as_me:$LINENO: result: found at $ac_find_libraries" >&5
-echo "${ECHO_T}found at $ac_find_libraries" >&6
- else
- save_CFLAGS=$CFLAGS
- CFLAGS="$CFLAGS $TOOLKIT_INCLUDE"
-
- cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
- #include <X11/xpm.h>
-
-int
-main ()
-{
-
- int version;
- version = XpmLibraryVersion();
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-
- xpm_link=" -lXpm"
- cat >>confdefs.h <<\_ACEOF
-#define wxHAVE_LIB_XPM 1
-_ACEOF
-
- echo "$as_me:$LINENO: result: found in default search path" >&5
-echo "${ECHO_T}found in default search path" >&6
- COMPILED_X_PROGRAM=0
-
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
- { echo "$as_me:$LINENO: WARNING: library will be compiled without support for images in XPM format" >&5
-echo "$as_me: WARNING: library will be compiled without support for images in XPM format" >&2;}
-
-
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-
- CFLAGS=$save_CFLAGS
- fi
-
echo "$as_me:$LINENO: checking if we need -lXp and/or -lSM -lICE" >&5
echo $ECHO_N "checking if we need -lXp and/or -lSM -lICE... $ECHO_C" >&6
libp_link=""
libs_found=0
for libp in "" " -lXp"; do
if test "$libs_found" = "0"; then
- for libsm_ice in " -lSM -lICE"; do
+ for libsm_ice in "" " -lSM -lICE"; do
if test "$libs_found" = "0"; then
save_LIBS="$LIBS"
LIBS="$GUI_TK_LIBRARY -lXm${xpm_link} ${libp} -lXmu -lXext -lXt${libsm_ice} -lX11"
TOOLKIT_VPATH="\${top_srcdir}/src/motif${PATH_IFS}\${top_srcdir}/src/motif/xmcombo${PATH_IFS}\${top_srcdir}/src/x11"
TOOLKIT=MOTIF
GUIDIST=MOTIF_DIST
- wxHAVE_XEXT_LIB=1
fi
- if test "$wxUSE_X11" = 1 -o "$wxUSE_MOTIF" = 1 &&
- test "$wxHAVE_XEXT_LIB" = 1; then
- save_CFLAGS="$CFLAGS"
- CFLAGS="$CFLAGS $TOOLKIT_INCLUDE"
+ if test "$wxUSE_X11" = 1 -o "$wxUSE_MOTIF" = 1; then
+ if test "$wxUSE_LIBXPM" = "sys"; then
+ echo "$as_me:$LINENO: checking for Xpm library" >&5
+echo $ECHO_N "checking for Xpm library... $ECHO_C" >&6
+
+ac_find_libraries=
+for ac_dir in $SEARCH_LIB /usr/lib;
+ do
+ for ac_extension in a so sl dylib; do
+ if test -f "$ac_dir/libXpm.$ac_extension"; then
+ ac_find_libraries=$ac_dir
+ break 2
+ fi
+ done
+ done
+
+ if test "$ac_find_libraries" != "" ; then
+
+ echo "$GUI_TK_LIBRARY" | grep "\-L$ac_find_libraries" > /dev/null
+ result=$?
+ if test $result = 0; then
+ ac_path_to_link=""
+ else
+ ac_path_to_link=" -L$ac_find_libraries"
+ fi
+
+ GUI_TK_LIBRARY="$GUI_TK_LIBRARY$ac_path_to_link"
+ echo "$as_me:$LINENO: result: found at $ac_find_libraries" >&5
+echo "${ECHO_T}found at $ac_find_libraries" >&6
+
+ echo "$as_me:$LINENO: checking for X11/xpm.h" >&5
+echo $ECHO_N "checking for X11/xpm.h... $ECHO_C" >&6
+if test "${wx_cv_x11_xpm_h+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+
+ save_CFLAGS=$CFLAGS
+ CFLAGS="$CFLAGS $TOOLKIT_INCLUDE"
+
+ cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+ #include <X11/xpm.h>
+
+int
+main ()
+{
+
+ int version;
+ version = XpmLibraryVersion();
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ wx_cv_x11_xpm_h=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+wx_cv_x11_xpm_h=no
+
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+
+ CFLAGS=$save_CFLAGS
+
+
+fi
+echo "$as_me:$LINENO: result: $wx_cv_x11_xpm_h" >&5
+echo "${ECHO_T}$wx_cv_x11_xpm_h" >&6
+
+ if test $wx_cv_x11_xpm_h = "yes"; then
+ xpm_link=" -lXpm"
+ cat >>confdefs.h <<\_ACEOF
+#define wxHAVE_LIB_XPM 1
+_ACEOF
+
+ else
+ { echo "$as_me:$LINENO: WARNING: built-in less efficient XPM decoder will be used" >&5
+echo "$as_me: WARNING: built-in less efficient XPM decoder will be used" >&2;}
+ fi
+ fi
+
+ fi
+
+ echo "$as_me:$LINENO: checking for XShapeQueryExtension in -lXext" >&5
+echo $ECHO_N "checking for XShapeQueryExtension in -lXext... $ECHO_C" >&6
+if test "${ac_cv_lib_Xext_XShapeQueryExtension+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lXext $GUI_TK_LIBRARY -lX11 $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+/* Override any gcc2 internal prototype to avoid an error. */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+char XShapeQueryExtension ();
+int
+main ()
+{
+XShapeQueryExtension ();
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_lib_Xext_XShapeQueryExtension=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_Xext_XShapeQueryExtension=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:$LINENO: result: $ac_cv_lib_Xext_XShapeQueryExtension" >&5
+echo "${ECHO_T}$ac_cv_lib_Xext_XShapeQueryExtension" >&6
+if test $ac_cv_lib_Xext_XShapeQueryExtension = yes; then
+
+ GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lXext"
+ wxHAVE_XEXT_LIB=1
+
+fi
+
+
+ if test "$wxHAVE_XEXT_LIB" = 1; then
+ save_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS $TOOLKIT_INCLUDE"
- echo "$as_me:$LINENO: checking for X11/extensions/shape.h" >&5
+ echo "$as_me:$LINENO: checking for X11/extensions/shape.h" >&5
echo $ECHO_N "checking for X11/extensions/shape.h... $ECHO_C" >&6
- cat >conftest.$ac_ext <<_ACEOF
+ cat >conftest.$ac_ext <<_ACEOF
#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
- #include <X11/Xlib.h>
- #include <X11/extensions/shape.h>
+ #include <X11/Xlib.h>
+ #include <X11/extensions/shape.h>
int
main ()
{
- int dummy1, dummy2;
- XShapeQueryExtension((Display*)NULL,
- (int*)NULL, (int*)NULL);
+ int dummy1, dummy2;
+ XShapeQueryExtension((Display*)NULL,
+ (int*)NULL, (int*)NULL);
;
return 0;
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- cat >>confdefs.h <<\_ACEOF
+ cat >>confdefs.h <<\_ACEOF
#define HAVE_XSHAPE 1
_ACEOF
- echo "$as_me:$LINENO: result: found" >&5
+ echo "$as_me:$LINENO: result: found" >&5
echo "${ECHO_T}found" >&6
else
sed 's/^/| /' conftest.$ac_ext >&5
- echo "$as_me:$LINENO: result: not found" >&5
+ echo "$as_me:$LINENO: result: not found" >&5
echo "${ECHO_T}not found" >&6
fi
rm -f conftest.$ac_objext conftest.$ac_ext
- CFLAGS="$save_CFLAGS"
+ CFLAGS="$save_CFLAGS"
+
+ fi
fi
if test "$wxUSE_MAC" = 1; then
- CPPFLAGS="$CPPFLAGS -fpascal-strings -I\${top_srcdir}/src/mac/morefilex -I/Developer/Headers/FlatCarbon"
+ echo "$as_me:$LINENO: checking for compiler syntax to enable Pascal strings" >&5
+echo $ECHO_N "checking for compiler syntax to enable Pascal strings... $ECHO_C" >&6
+ if test "$GCC" = yes; then
+ echo "$as_me:$LINENO: result: gcc" >&5
+echo "${ECHO_T}gcc" >&6
+ CPPFLAGS_PASCAL="-fpascal-strings"
+ elif test "`echo $CXX | sed -e 's@.*/@@'`" = "xlC"; then
+ echo "$as_me:$LINENO: result: xlc" >&5
+echo "${ECHO_T}xlc" >&6
+ CPPFLAGS_PASCAL="-qmacpstr"
+ else
+ echo "$as_me:$LINENO: result: none" >&5
+echo "${ECHO_T}none" >&6
+ fi
+
+ CPPFLAGS="$CPPFLAGS $CPPFLAGS_PASCAL -I\${top_srcdir}/src/mac/morefilex -I/Developer/Headers/FlatCarbon"
TOOLKIT_VPATH="\${top_srcdir}/src/mac${PATH_IFS}\${top_srcdir}/src/mac/morefilex"
TOOLKIT=MAC
if test "$wxUSE_PM" = 1; then
TOOLKIT=PM
GUIDIST=GTK_DIST
- { echo "$as_me:$LINENO: WARNING: OS/2 threads are not yet supported... disabled" >&5
-echo "$as_me: WARNING: OS/2 threads are not yet supported... disabled" >&2;}
- wxUSE_THREADS="no"
fi
if test "$TOOLKIT" = "PM" ; then
if test "x$found_sql_h" = "x1" ; then
- echo "$as_me:$LINENO: checking for iodbc in -lSQLAllocEnv" >&5
-echo $ECHO_N "checking for iodbc in -lSQLAllocEnv... $ECHO_C" >&6
-if test "${ac_cv_lib_SQLAllocEnv_iodbc+set}" = set; then
+ echo "$as_me:$LINENO: checking for SQLAllocEnv in -liodbc" >&5
+echo $ECHO_N "checking for SQLAllocEnv in -liodbc... $ECHO_C" >&6
+if test "${ac_cv_lib_iodbc_SQLAllocEnv+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lSQLAllocEnv $LIBS"
+LIBS="-liodbc $LIBS"
cat >conftest.$ac_ext <<_ACEOF
#line $LINENO "configure"
/* confdefs.h. */
#endif
/* We use char because int might match the return type of a gcc2
builtin and then its argument prototype would still apply. */
-char iodbc ();
+char SQLAllocEnv ();
int
main ()
{
-iodbc ();
+SQLAllocEnv ();
;
return 0;
}
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- ac_cv_lib_SQLAllocEnv_iodbc=yes
+ ac_cv_lib_iodbc_SQLAllocEnv=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_SQLAllocEnv_iodbc=no
+ac_cv_lib_iodbc_SQLAllocEnv=no
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_SQLAllocEnv_iodbc" >&5
-echo "${ECHO_T}$ac_cv_lib_SQLAllocEnv_iodbc" >&6
-if test $ac_cv_lib_SQLAllocEnv_iodbc = yes; then
+echo "$as_me:$LINENO: result: $ac_cv_lib_iodbc_SQLAllocEnv" >&5
+echo "${ECHO_T}$ac_cv_lib_iodbc_SQLAllocEnv" >&6
+if test $ac_cv_lib_iodbc_SQLAllocEnv = yes; then
ODBC_LINK=" -liodbc"
else
- echo "$as_me:$LINENO: checking for unixodbc in -lSQLAllocEnv" >&5
-echo $ECHO_N "checking for unixodbc in -lSQLAllocEnv... $ECHO_C" >&6
-if test "${ac_cv_lib_SQLAllocEnv_unixodbc+set}" = set; then
+ echo "$as_me:$LINENO: checking for SQLAllocEnv in -lunixodbc" >&5
+echo $ECHO_N "checking for SQLAllocEnv in -lunixodbc... $ECHO_C" >&6
+if test "${ac_cv_lib_unixodbc_SQLAllocEnv+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lSQLAllocEnv $LIBS"
+LIBS="-lunixodbc $LIBS"
cat >conftest.$ac_ext <<_ACEOF
#line $LINENO "configure"
/* confdefs.h. */
#endif
/* We use char because int might match the return type of a gcc2
builtin and then its argument prototype would still apply. */
-char unixodbc ();
+char SQLAllocEnv ();
int
main ()
{
-unixodbc ();
+SQLAllocEnv ();
;
return 0;
}
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- ac_cv_lib_SQLAllocEnv_unixodbc=yes
+ ac_cv_lib_unixodbc_SQLAllocEnv=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_SQLAllocEnv_unixodbc=no
+ac_cv_lib_unixodbc_SQLAllocEnv=no
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_SQLAllocEnv_unixodbc" >&5
-echo "${ECHO_T}$ac_cv_lib_SQLAllocEnv_unixodbc" >&6
-if test $ac_cv_lib_SQLAllocEnv_unixodbc = yes; then
+echo "$as_me:$LINENO: result: $ac_cv_lib_unixodbc_SQLAllocEnv" >&5
+echo "${ECHO_T}$ac_cv_lib_unixodbc_SQLAllocEnv" >&6
+if test $ac_cv_lib_unixodbc_SQLAllocEnv = yes; then
ODBC_LINK=" -lunixodbc"
else
- echo "$as_me:$LINENO: checking for odbc in -lSQLAllocEnv" >&5
-echo $ECHO_N "checking for odbc in -lSQLAllocEnv... $ECHO_C" >&6
-if test "${ac_cv_lib_SQLAllocEnv_odbc+set}" = set; then
+ echo "$as_me:$LINENO: checking for SQLAllocEnv in -lodbc" >&5
+echo $ECHO_N "checking for SQLAllocEnv in -lodbc... $ECHO_C" >&6
+if test "${ac_cv_lib_odbc_SQLAllocEnv+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lSQLAllocEnv $LIBS"
+LIBS="-lodbc $LIBS"
cat >conftest.$ac_ext <<_ACEOF
#line $LINENO "configure"
/* confdefs.h. */
#endif
/* We use char because int might match the return type of a gcc2
builtin and then its argument prototype would still apply. */
-char odbc ();
+char SQLAllocEnv ();
int
main ()
{
-odbc ();
+SQLAllocEnv ();
;
return 0;
}
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- ac_cv_lib_SQLAllocEnv_odbc=yes
+ ac_cv_lib_odbc_SQLAllocEnv=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_SQLAllocEnv_odbc=no
+ac_cv_lib_odbc_SQLAllocEnv=no
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_SQLAllocEnv_odbc" >&5
-echo "${ECHO_T}$ac_cv_lib_SQLAllocEnv_odbc" >&6
-if test $ac_cv_lib_SQLAllocEnv_odbc = yes; then
+echo "$as_me:$LINENO: result: $ac_cv_lib_odbc_SQLAllocEnv" >&5
+echo "${ECHO_T}$ac_cv_lib_odbc_SQLAllocEnv" >&6
+if test $ac_cv_lib_odbc_SQLAllocEnv = yes; then
ODBC_LINK=" -lodbc"
fi
#define wxUSE_ODBC 1
_ACEOF
+ if test "$wxUSE_ODBC" = "builtin" ; then
+ cat >>confdefs.h <<\_ACEOF
+#define wxUSE_BUILTIN_IODBC 1
+_ACEOF
+
+ fi
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS db"
WXODBCFLAG="-D_IODBC_"
case "${host}" in
*-*-linux* | *-*-gnu* )
SAMPLES_RPATH_FLAG="-Wl,-rpath,\$(top_builddir)lib"
- SAMPLES_RPATH_POSTLINK="\"libnames=\`cd \$(LIBDIRNAME) ; ls -1 | grep '\.so\.[0-9][0-9]*\$'\` ; \\\\
-inst_cmd='install_name_tool ' ; \\\\
-for i in \$libnames ; do \\\\
- inst_cmd=\"\$inst_cmd -change \$(prefix)/lib/\\$i \$(LIBDIRNAME)/\\$i\" ; \\\\
-done ; \\\\
-echo \$inst_cmd\""
-
- ;;
+ ;;
*-*-solaris2* )
if test "$GCC" = yes ; then
;;
powerpc-*-darwin* )
- SAMPLES_RPATH_POSTLINK="libnames=\`cd \$(LIBDIRNAME) ; ls -1 | grep '\.so\.0-90-9*\$'\` ; \\
-inst_cmd='install_name_tool ' ; \\
-for i in \$libnames ; do \\
- inst_cmd=\"\$inst_cmd -change \$(prefix)/lib/\\$i \$(LIBDIRNAME)/\\$i\" ; \\
-done ; \\
-echo \$inst_cmd "
+ SAMPLES_RPATH_POSTLINK="\$(top_builddir)change-install-names \$(LIBDIRNAME) \$(prefix) \$@"
+ cat <<EOF >change-install-names
+#!/bin/sh
+libnames=\`cd \${1} ; ls -1 | grep '\.[0-9][0-9]*\.dylib\$'\`
+inst_cmd="install_name_tool "
+for i in \${libnames} ; do
+ inst_cmd="\${inst_cmd} -change \${2}/lib/\${i} \${1}/\${i}"
+done
+\${inst_cmd} \${3}
+EOF
+ chmod +x change-install-names
;;
esac
if test $ac_cv_lib_nsl_inet_addr = yes; then
INET_LINK="nsl"
else
- echo "$as_me:$LINENO: checking for inet_addr in -lresolv" >&5
+
+ echo "$as_me:$LINENO: checking for inet_addr in -lresolv" >&5
echo $ECHO_N "checking for inet_addr in -lresolv... $ECHO_C" >&6
if test "${ac_cv_lib_resolv_inet_addr+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
if test $ac_cv_lib_resolv_inet_addr = yes; then
INET_LINK="resolv"
else
- echo "$as_me:$LINENO: checking for inet_addr in -lsocket" >&5
+
+ echo "$as_me:$LINENO: checking for inet_addr in -lsocket" >&5
echo $ECHO_N "checking for inet_addr in -lsocket... $ECHO_C" >&6
if test "${ac_cv_lib_socket_inet_addr+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
fi
+
fi
+
fi
+echo "$as_me:$LINENO: checking for known CD-ROM interface" >&5
+echo $ECHO_N "checking for known CD-ROM interface... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#ifdef __linux__
+ #include <linux/cdrom.h>
+ #else
+ /* For Solaris */
+ #include <sys/cdio.h>
+ #endif
+
+int
+main ()
+{
+struct cdrom_tocentry entry, old_entry;
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+ cat >>confdefs.h <<\_ACEOF
+#define HAVE_KNOWN_CDROM_INTERFACE 1
+_ACEOF
+
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
cat >confcache <<\_ACEOF
CPP_MT_FLAG=
-if test "$TOOLKIT" != "MSW"; then
+if test "$TOOLKIT" != "MSW" -a "$USE_OS2" != 1; then
THREADS_LINK=
fi
- echo "$as_me:$LINENO: checking for pthread_cleanup_push/pop" >&5
-echo $ECHO_N "checking for pthread_cleanup_push/pop... $ECHO_C" >&6
-if test "${wx_cv_func_pthread_cleanup_push+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
- cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <pthread.h>
-int
-main ()
-{
-
- pthread_cleanup_push(NULL, NULL);
- pthread_cleanup_pop(0);
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-
- wx_cv_func_pthread_cleanup_push=yes
-
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
- wx_cv_func_pthread_cleanup_push=no
-
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-
-fi
-echo "$as_me:$LINENO: result: $wx_cv_func_pthread_cleanup_push" >&5
-echo "${ECHO_T}$wx_cv_func_pthread_cleanup_push" >&6
-
- if test "$wx_cv_func_pthread_cleanup_push" = "yes"; then
- cat >>confdefs.h <<\_ACEOF
-#define HAVE_THREAD_CLEANUP_FUNCTIONS 1
-_ACEOF
-
- fi
echo "$as_me:$LINENO: checking for pthread_mutexattr_t" >&5
CFLAGS="$CFLAGS_OLD"
fi
;;
+ *-pc-os2*emx )
+ CFLAGS="$CFLAGS -Zmt -D__ST_MT_ERRNO__"
+ CXXFLAGS="$CXXFLAGS -Zmt -D__ST_MT_ERRNO__"
+ LDFLAGS="$LDFLAGS -Zmt"
+ ;;
esac
fi
fi
fi
-if test "$WXWIN_COMPATIBILITY_2" = "yes"; then
- cat >>confdefs.h <<\_ACEOF
-#define WXWIN_COMPATIBILITY_2 1
-_ACEOF
-
-
- WXWIN_COMPATIBILITY_2_2="yes"
-fi
-
if test "x$WXWIN_COMPATIBILITY_2_2" = "xyes"; then
cat >>confdefs.h <<\_ACEOF
#define WXWIN_COMPATIBILITY_2_2 1
fi
+if test "$wxUSE_GZSTREAM" = "yes"; then
+ cat >>confdefs.h <<\_ACEOF
+#define wxUSE_GZSTREAM 1
+_ACEOF
+
+fi
+
if test "$wxUSE_ON_FATAL_EXCEPTION" = "yes"; then
cat >>confdefs.h <<\_ACEOF
#define wxUSE_ON_FATAL_EXCEPTION 1
if test $ac_cv_func_socket = yes; then
:
else
- echo "$as_me:$LINENO: checking for socket in -lsocket" >&5
+
+ echo "$as_me:$LINENO: checking for socket in -lsocket" >&5
echo $ECHO_N "checking for socket in -lsocket... $ECHO_C" >&6
if test "${ac_cv_lib_socket_socket+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
echo "${ECHO_T}$ac_cv_lib_socket_socket" >&6
if test $ac_cv_lib_socket_socket = yes; then
if test "$INET_LINK" != " -lsocket"; then
- INET_LINK="$INET_LINK -lsocket"
- fi
+ INET_LINK="$INET_LINK -lsocket"
+ fi
else
- { echo "$as_me:$LINENO: WARNING: socket library not found - sockets will be disabled" >&5
+ { echo "$as_me:$LINENO: WARNING: socket library not found - sockets will be disabled" >&5
echo "$as_me: WARNING: socket library not found - sockets will be disabled" >&2;}
- wxUSE_SOCKETS=no
+ wxUSE_SOCKETS=no
fi
+
fi
fi
fi
-if test "$TOOLKIT" != "MSW"; then
+if test "$TOOLKIT" != "MSW" -a "$USE_OS2" != 1; then
HAVE_DL_FUNCS=0
HAVE_SHL_FUNCS=0
_ACEOF
else
- echo "$as_me:$LINENO: checking for dlerror in -ldl" >&5
+
+ echo "$as_me:$LINENO: checking for dlerror in -ldl" >&5
echo $ECHO_N "checking for dlerror in -ldl... $ECHO_C" >&6
if test "${ac_cv_lib_dl_dlerror+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
fi
+
+
fi
done
fi
+if test "$wxUSE_LISTBOOK" = "yes"; then
+ cat >>confdefs.h <<\_ACEOF
+#define wxUSE_LISTBOOK 1
+_ACEOF
+
+ USES_CONTROLS=1
+fi
+
if test "$wxUSE_LISTBOX" = "yes"; then
cat >>confdefs.h <<\_ACEOF
#define wxUSE_LISTBOX 1
{ echo "$as_me:$LINENO: WARNING: Popup window not yet supported under Mac OS X... disabled" >&5
echo "$as_me: WARNING: Popup window not yet supported under Mac OS X... disabled" >&2;}
else
- if test "$wxUSE_MOTIF" = 1; then
- { echo "$as_me:$LINENO: WARNING: wxPopupWindow not yet supported under Motif... disabled" >&5
-echo "$as_me: WARNING: wxPopupWindow not yet supported under Motif... disabled" >&2;}
- else
- if test "$wxUSE_PM" = 1; then
- { echo "$as_me:$LINENO: WARNING: wxPopupWindow not yet supported under PM... disabled" >&5
+ if test "$wxUSE_PM" = 1; then
+ { echo "$as_me:$LINENO: WARNING: wxPopupWindow not yet supported under PM... disabled" >&5
echo "$as_me: WARNING: wxPopupWindow not yet supported under PM... disabled" >&2;}
- else
- cat >>confdefs.h <<\_ACEOF
+ else
+ cat >>confdefs.h <<\_ACEOF
#define wxUSE_POPUPWIN 1
_ACEOF
- USES_CONTROLS=1
- fi
+ USES_CONTROLS=1
fi
fi
fi
fi
+if test "$wxUSE_ACCESSIBILITY" = "yes"; then
+ cat >>confdefs.h <<\_ACEOF
+#define wxUSE_ACCESSIBILITY 1
+_ACEOF
+
+ SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS access"
+fi
if test "$wxUSE_DRAGIMAGE" = "yes"; then
cat >>confdefs.h <<\_ACEOF
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS dragimag"
fi
-if test "$wxUSE_ACCESSIBILITY" = "yes"; then
+if test "$wxUSE_EXCEPTIONS" = "yes"; then
cat >>confdefs.h <<\_ACEOF
-#define wxUSE_ACCESSIBILITY 1
+#define wxUSE_EXCEPTIONS 1
_ACEOF
- SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS access"
+fi
+
+USE_HTML=0
+if test "$wxUSE_HTML" = "yes"; then
+ cat >>confdefs.h <<\_ACEOF
+#define wxUSE_HTML 1
+_ACEOF
+
+ USE_HTML=1
+ SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS html html/about html/help html/helpview html/printing html/test html/virtual html/widget html/zip htlbox"
fi
if test "$wxUSE_MENUS" = "yes"; then
fi
-if test "$wxUSE_SYSTEM_OPTIONS" = "yes"; then
- cat >>confdefs.h <<\_ACEOF
-#define wxUSE_SYSTEM_OPTIONS 1
-_ACEOF
-
-if test "$TOOLKIT" = "MSW" -o "$TOOLKIT" = "GTK" -o "$TOOLKIT" = "X11" -o \
- "$TOOLKIT" = "MOTIF"; then
- SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS taskbar"
-fi
-
-fi
-
if test "$wxUSE_MINIFRAME" = "yes"; then
cat >>confdefs.h <<\_ACEOF
#define wxUSE_MINIFRAME 1
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS minifram"
fi
-USE_HTML=0
-if test "$wxUSE_HTML" = "yes"; then
+if test "$wxUSE_SYSTEM_OPTIONS" = "yes"; then
cat >>confdefs.h <<\_ACEOF
-#define wxUSE_HTML 1
+#define wxUSE_SYSTEM_OPTIONS 1
_ACEOF
- USE_HTML=1
- SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS html html/about html/help html/helpview html/printing html/test html/virtual html/widget html/zip htlbox"
+ if test "$TOOLKIT" = "MSW" -o "$TOOLKIT" = "GTK" -o "$TOOLKIT" = "X11" -o \
+ "$TOOLKIT" = "MOTIF"; then
+ SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS taskbar"
+ fi
fi
+
if test "$wxUSE_VALIDATORS" = "yes"; then
cat >>confdefs.h <<\_ACEOF
#define wxUSE_VALIDATORS 1
fi
+if test "$wxUSE_UNICODE" = "yes" -a "$wxUSE_UNICODE_MSLU" = "yes" ; then
+ LIBS=" -lunicows $LIBS"
+fi
+
+
if test "$wxUSE_IMAGE" = "yes" ; then
- cat >>confdefs.h <<\_ACEOF
+ cat >>confdefs.h <<\_ACEOF
#define wxUSE_IMAGE 1
_ACEOF
-fi
-if test "$wxUSE_GIF" = "yes" ; then
- cat >>confdefs.h <<\_ACEOF
+ if test "$wxUSE_GIF" = "yes" ; then
+ cat >>confdefs.h <<\_ACEOF
#define wxUSE_GIF 1
_ACEOF
-fi
+ fi
-if test "$wxUSE_PCX" = "yes" ; then
- cat >>confdefs.h <<\_ACEOF
+ if test "$wxUSE_PCX" = "yes" ; then
+ cat >>confdefs.h <<\_ACEOF
#define wxUSE_PCX 1
_ACEOF
-fi
+ fi
-if test "$wxUSE_IFF" = "yes" ; then
- cat >>confdefs.h <<\_ACEOF
+ if test "$wxUSE_IFF" = "yes" ; then
+ cat >>confdefs.h <<\_ACEOF
#define wxUSE_IFF 1
_ACEOF
-fi
+ fi
-if test "$wxUSE_PNM" = "yes" ; then
- cat >>confdefs.h <<\_ACEOF
+ if test "$wxUSE_PNM" = "yes" ; then
+ cat >>confdefs.h <<\_ACEOF
#define wxUSE_PNM 1
_ACEOF
-fi
+ fi
-if test "$wxUSE_XPM" = "yes" ; then
- cat >>confdefs.h <<\_ACEOF
+ if test "$wxUSE_XPM" = "yes" ; then
+ cat >>confdefs.h <<\_ACEOF
#define wxUSE_XPM 1
_ACEOF
-fi
+ fi
-if test "$wxUSE_ICO_CUR" = "yes" ; then
- cat >>confdefs.h <<\_ACEOF
+ if test "$wxUSE_ICO_CUR" = "yes" ; then
+ cat >>confdefs.h <<\_ACEOF
#define wxUSE_ICO_CUR 1
_ACEOF
-fi
-
-if test "$wxUSE_UNICODE" = "yes" -a "$wxUSE_UNICODE_MSLU" = "yes" ; then
- LIBS=" -lunicows $LIBS"
+ fi
fi
CORE_GUI_LIBS="html $CORE_GUI_LIBS"
fi
+if test "$wxUSE_GUI" != "yes"; then
+ CORE_GUI_LIBS=""
+fi
+
LIBS=`echo $LIBS | sed 's/ \+/ /g'`
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 | sed 's/ \+/ /g'`
-TOOLKIT_LOWERCASE=`echo $TOOLKIT | tr [A-Z] [a-z]`
+
+TOOLKIT_LOWERCASE=`echo $TOOLKIT | tr "[A-Z]" "[a-z]"`
- if test "$build" != "$host" ; then
- AR=$host_alias-ar
- STRIP=$host_alias-strip
- else
- # Extract the first word of "ar", so it can be a program name with args.
-set dummy ar; ac_word=$2
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
+set dummy ${ac_tool_prefix}ar; ac_word=$2
echo "$as_me:$LINENO: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
if test "${ac_cv_prog_AR+set}" = set; then
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_prog_AR="ar"
+ ac_cv_prog_AR="${ac_tool_prefix}ar"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
- test -z "$ac_cv_prog_AR" && ac_cv_prog_AR="ar"
fi
fi
AR=$ac_cv_prog_AR
echo "${ECHO_T}no" >&6
fi
- # Extract the first word of "strip", so it can be a program name with args.
-set dummy strip; ac_word=$2
+fi
+if test -z "$ac_cv_prog_AR"; then
+ ac_ct_AR=$AR
+ # Extract the first word of "ar", so it can be a program name with args.
+set dummy ar; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ if test -n "$ac_ct_AR"; then
+ ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_ac_ct_AR="ar"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+
+ test -z "$ac_cv_prog_ac_ct_AR" && ac_cv_prog_ac_ct_AR="ar"
+fi
+fi
+ac_ct_AR=$ac_cv_prog_ac_ct_AR
+if test -n "$ac_ct_AR"; then
+ echo "$as_me:$LINENO: result: $ac_ct_AR" >&5
+echo "${ECHO_T}$ac_ct_AR" >&6
+else
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+ AR=$ac_ct_AR
+else
+ AR="$ac_cv_prog_AR"
+fi
+
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
+set dummy ${ac_tool_prefix}strip; ac_word=$2
echo "$as_me:$LINENO: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
if test "${ac_cv_prog_STRIP+set}" = set; then
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_prog_STRIP="strip"
+ ac_cv_prog_STRIP="${ac_tool_prefix}strip"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
- test -z "$ac_cv_prog_STRIP" && ac_cv_prog_STRIP="true"
fi
fi
STRIP=$ac_cv_prog_STRIP
echo "${ECHO_T}no" >&6
fi
- fi
+fi
+if test -z "$ac_cv_prog_STRIP"; then
+ ac_ct_STRIP=$STRIP
+ # Extract the first word of "strip", so it can be a program name with args.
+set dummy strip; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ if test -n "$ac_ct_STRIP"; then
+ ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_ac_ct_STRIP="strip"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+
+ test -z "$ac_cv_prog_ac_ct_STRIP" && ac_cv_prog_ac_ct_STRIP=":"
+fi
+fi
+ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
+if test -n "$ac_ct_STRIP"; then
+ echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
+echo "${ECHO_T}$ac_ct_STRIP" >&6
+else
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+ STRIP=$ac_ct_STRIP
+else
+ STRIP="$ac_cv_prog_STRIP"
+fi
+
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}nm", so it can be a program name with args.
+set dummy ${ac_tool_prefix}nm; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_NM+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ if test -n "$NM"; then
+ ac_cv_prog_NM="$NM" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_NM="${ac_tool_prefix}nm"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+
+fi
+fi
+NM=$ac_cv_prog_NM
+if test -n "$NM"; then
+ echo "$as_me:$LINENO: result: $NM" >&5
+echo "${ECHO_T}$NM" >&6
+else
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+fi
+if test -z "$ac_cv_prog_NM"; then
+ ac_ct_NM=$NM
+ # Extract the first word of "nm", so it can be a program name with args.
+set dummy nm; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_ac_ct_NM+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ if test -n "$ac_ct_NM"; then
+ ac_cv_prog_ac_ct_NM="$ac_ct_NM" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_ac_ct_NM="nm"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+
+ test -z "$ac_cv_prog_ac_ct_NM" && ac_cv_prog_ac_ct_NM=":"
+fi
+fi
+ac_ct_NM=$ac_cv_prog_ac_ct_NM
+if test -n "$ac_ct_NM"; then
+ echo "$as_me:$LINENO: result: $ac_ct_NM" >&5
+echo "${ECHO_T}$ac_ct_NM" >&6
+else
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+ NM=$ac_ct_NM
+else
+ NM="$ac_cv_prog_NM"
+fi
+
case ${host} in
*-hp-hpux* )
PLATFORM_MSDOS=0
PLATFORM_MAC=0
PLATFORM_MACOSX=0
+ PLATFORM_OS2=0
case "${host}" in
*-*-cygwin* | *-*-mingw32* )
PLATFORM_WIN32=1
;;
- *-pc-msdosdjgpp | *-pc-os2_emx | *-pc-os2-emx )
+ *-pc-msdosdjgpp )
PLATFORM_MSDOS=1
;;
+ *-pc-os2_emx | *-pc-os2-emx )
+ PLATFORM_OS2=1
+ ;;
powerpc-*-darwin* )
PLATFORM_MAC=1
PLATFORM_MACOSX=1
+
SO_SUFFIX="so"
SO_SUFFIX_MODULE="so"
EXEEXT=""
+ LIBPREFIX=lib
DLLPREFIX=lib
DLLPREFIX_MODULE=
EXEEXT=".exe"
DLLPREFIX=""
;;
- *-pc-msdosdjgpp | *-pc-os2_emx | *-pc-os2-emx )
+ *-pc-msdosdjgpp )
EXEEXT=".exe"
DLLPREFIX=""
;;
+ *-pc-os2_emx | *-pc-os2-emx )
+ EXEEXT=".exe"
+ DLLPREFIX=""
+ LIBPREFIX=""
+ ;;
powerpc-*-darwin* )
SO_SUFFIX="dylib"
SO_SUFFIX_MODULE="bundle"
+
SHARED_LD_CC="\$(CC) -shared -o"
SHARED_LD_CXX="\$(CXX) -shared -o"
CXXFLAGS="$CXXFLAGS -fno-common"
- cat <<EOF >shared-ld-sh
+ echo "$as_me:$LINENO: checking for gcc 3.1 or later" >&5
+echo $ECHO_N "checking for gcc 3.1 or later... $ECHO_C" >&6
+if test "${wx_cv_gcc31+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+
+ cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+int
+main ()
+{
+
+ #if (__GNUC__ < 3) || \
+ ((__GNUC__ == 3) && (__GNUC_MINOR__ < 1))
+ #error old gcc
+ #endif
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+
+ wx_cv_gcc31=yes
+
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+ wx_cv_gcc31=no
+
+
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+
+fi
+echo "$as_me:$LINENO: result: $wx_cv_gcc31" >&5
+echo "${ECHO_T}$wx_cv_gcc31" >&6
+ if test "$wx_cv_gcc31" = "no"; then
+ cat <<EOF >shared-ld-sh
#!/bin/sh
#-----------------------------------------------------------------------------
#-- Name: distrib/mac/shared-ld-sh
exit 0
EOF
- chmod +x shared-ld-sh
+ chmod +x shared-ld-sh
+
+ SHARED_LD_CC="`pwd`/shared-ld-sh -dynamiclib -headerpad_max_install_names -o"
+ SHARED_LD_MODULE_CC="`pwd`/shared-ld-sh -bundle -headerpad_max_install_names -o"
+ SHARED_LD_CXX="$SHARED_LD_CC"
+ SHARED_LD_MODULE_CXX="$SHARED_LD_MODULE_CC"
+ else
+ SHARED_LD_CC="\${CC} -dynamiclib -single_module -headerpad_max_install_names -o"
+ SHARED_LD_MODULE_CC="\${CC} -bundle -single_module -headerpad_max_install_names -o"
+ SHARED_LD_CXX="\${CXX} -dynamiclib -single_module -headerpad_max_install_names -o"
+ SHARED_LD_MODULE_CXX="\${CXX} -bundle -single_module -headerpad_max_install_names -o"
+ fi
- SHARED_LD_CC="`pwd`/shared-ld-sh -dynamiclib -undefined suppress -flat_namespace -o"
- SHARED_LD_MODULE_CC="`pwd`/shared-ld-sh -bundle -undefined suppress -flat_namespace -o"
- SHARED_LD_CXX="$SHARED_LD_CC"
- SHARED_LD_MODULE_CXX="$SHARED_LD_MODULE_CC"
PIC_FLAG="-dynamic -fPIC"
- ;;
+ ;;
*-*-aix* )
if test "x$GCC" != "xyes"; then
*-*-sunos4* | \
*-*-osf* | \
*-*-dgux5* | \
+ *-pc-os2_emx | *-pc-os2-emx | \
*-*-sysv5* )
;;
else
depfile=\`basename \$objfile | sed -e 's/\..*$/.d/g'\`
if test -f \$depfile ; then
- sed -e "/^\$objfile/! s,\$depobjname:,\$objfile:,g" \$depfile >\${DEPSDIR}/\${objfile}.d
+ sed -e "/^\$objfile/!s,\$depobjname:,\$objfile:,g" \$depfile >\${DEPSDIR}/\${objfile}.d
rm -f \$depfile
fi
fi
main ()
{
- #if !defined(__GNUC__) || !defined(__GNUC_MINOR__) || \
- (__GNUC__ < 3) || (__GNUC__ == 3 && __GNUC_MINOR__ < 4)
- #error "no pch support"
+ #if !defined(__GNUC__) || !defined(__GNUC_MINOR__)
+ #error "no pch support"
+ #endif
+ #if (__GNUC__ < 3)
+ #error "no pch support"
+ #endif
+ #if (__GNUC__ == 3) && \
+ ((!defined(__APPLE_CC__) && (__GNUC_MINOR__ < 4)) || \
+ ( defined(__APPLE_CC__) && (__GNUC_MINOR__ < 3)))
+ #error "no pch support"
#endif
;
COND_MONOLITHIC_0_SHARED_0_USE_HTML_1=""
fi
+ COND_MONOLITHIC_0_SHARED_0_USE_ODBC_1="#"
+ if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x0" -a "x$USE_ODBC" = "x1" ; then
+ COND_MONOLITHIC_0_SHARED_0_USE_ODBC_1=""
+ fi
+
COND_MONOLITHIC_0_SHARED_1="#"
if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x1" ; then
COND_MONOLITHIC_0_SHARED_1=""
COND_MONOLITHIC_0_SHARED_1_USE_HTML_1=""
fi
+ COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1="#"
+ if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x1" -a "x$USE_ODBC" = "x1" ; then
+ COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1=""
+ fi
+
COND_MONOLITHIC_1="#"
if test "x$MONOLITHIC" = "x1" ; then
COND_MONOLITHIC_1=""
COND_PLATFORM_MACOSX_1_TOOLKIT_MAC=""
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=""
+ fi
+
COND_PLATFORM_MACOSX_1_USE_SOVERSION_1="#"
if test "x$PLATFORM_MACOSX" = "x1" -a "x$USE_SOVERSION" = "x1" ; then
COND_PLATFORM_MACOSX_1_USE_SOVERSION_1=""
COND_PLATFORM_MAC_1=""
fi
+ COND_PLATFORM_OS2_1="#"
+ if test "x$PLATFORM_OS2" = "x1" ; then
+ COND_PLATFORM_OS2_1=""
+ fi
+
COND_PLATFORM_UNIX_0="#"
if test "x$PLATFORM_UNIX" = "x0" ; then
COND_PLATFORM_UNIX_0=""
COND_PLATFORM_UNIX_1=""
fi
+ COND_PLATFORM_UNIX_1_USE_GUI_1="#"
+ if test "x$PLATFORM_UNIX" = "x1" -a "x$USE_GUI" = "x1" ; then
+ COND_PLATFORM_UNIX_1_USE_GUI_1=""
+ fi
+
COND_PLATFORM_WIN32_0="#"
if test "x$PLATFORM_WIN32" = "x0" ; then
COND_PLATFORM_WIN32_0=""
COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0=""
fi
- COND_TOOLKIT_OS2="#"
- if test "x$TOOLKIT" = "xOS2" ; then
- COND_TOOLKIT_OS2=""
+ COND_TOOLKIT_PM="#"
+ if test "x$TOOLKIT" = "xPM" ; then
+ COND_TOOLKIT_PM=""
fi
- COND_TOOLKIT_OS2_USE_GUI_1="#"
- if test "x$TOOLKIT" = "xOS2" -a "x$USE_GUI" = "x1" ; then
- COND_TOOLKIT_OS2_USE_GUI_1=""
+ COND_TOOLKIT_PM_USE_GUI_1="#"
+ if test "x$TOOLKIT" = "xPM" -a "x$USE_GUI" = "x1" ; then
+ COND_TOOLKIT_PM_USE_GUI_1=""
fi
- COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0="#"
- if test "x$TOOLKIT" = "xOS2" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then
- COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0=""
+ COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0="#"
+ if test "x$TOOLKIT" = "xPM" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then
+ COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0=""
fi
COND_TOOLKIT_X11="#"
COND_UNICODE_1=""
fi
+ COND_USE_EXCEPTIONS_0="#"
+ if test "x$USE_EXCEPTIONS" = "x0" ; then
+ COND_USE_EXCEPTIONS_0=""
+ fi
+
+ COND_USE_EXCEPTIONS_1="#"
+ if test "x$USE_EXCEPTIONS" = "x1" ; then
+ COND_USE_EXCEPTIONS_1=""
+ fi
+
COND_USE_GUI_0="#"
if test "x$USE_GUI" = "x0" ; then
COND_USE_GUI_0=""
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_SOSYMLINKS_1="#"
if test "x$USE_SOSYMLINKS" = "x1" ; then
COND_USE_SOSYMLINKS_1=""
powerpc-*-darwin* )
CPPFLAGS="-DNO_GCC_PRAGMA $CPPFLAGS"
;;
- *)
- ;;
esac
fi
+case "${host}" in
+ powerpc-*-darwin* )
+ CODE_GEN_FLAGS_CXX="-DNO_GCC_PRAGMA $CODE_GEN_FLAGS_CXX"
+ ;;
+esac
SAMPLES_SUBDIRS="`echo $SAMPLES_SUBDIRS | tr -s ' ' | tr ' ' '\n' | sort | uniq | tr '\n' ' '| tr -d '\r'`"
makefiles="samples/Makefile.in samples/console/Makefile.in"
else makefiles="utils/HelpGen/Makefile.in \
utils/HelpGen/src/Makefile.in \
- utils/makegen/Makefile.in"
+ utils/tex2rtf/Makefile.in \
+ utils/tex2rtf/src/Makefile.in"
fi
fi
} >&5
cat >&5 <<_CSEOF
-This file was extended by wxWindows $as_me 2.5.0, which was
+This file was extended by wxWindows $as_me 2.5.1, which was
generated by GNU Autoconf 2.57. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-wxWindows config.status 2.5.0
+wxWindows config.status 2.5.1
configured by $0, generated by GNU Autoconf 2.57,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
s,@INSTALL_DATA@,$INSTALL_DATA,;t t
s,@STRIP@,$STRIP,;t t
s,@IF_GNU_MAKE@,$IF_GNU_MAKE,;t t
-s,@YACC@,$YACC,;t t
-s,@LEX@,$LEX,;t t
-s,@LEXLIB@,$LEXLIB,;t t
-s,@LEX_OUTPUT_ROOT@,$LEX_OUTPUT_ROOT,;t t
s,@LN_S@,$LN_S,;t t
s,@CXXCPP@,$CXXCPP,;t t
s,@subdirs@,$subdirs,;t t
s,@MONOLITHIC@,$MONOLITHIC,;t t
s,@EXTRALIBS@,$EXTRALIBS,;t t
s,@EXTRALIBS_XML@,$EXTRALIBS_XML,;t t
+s,@EXTRALIBS_HTML@,$EXTRALIBS_HTML,;t t
s,@EXTRALIBS_ODBC@,$EXTRALIBS_ODBC,;t t
s,@EXTRALIBS_GUI@,$EXTRALIBS_GUI,;t t
s,@EXTRALIBS_OPENGL@,$EXTRALIBS_OPENGL,;t t
s,@HOST_SUFFIX@,$HOST_SUFFIX,;t t
s,@SET_MAKE@,$SET_MAKE,;t t
s,@MAKE_SET@,$MAKE_SET,;t t
+s,@ac_ct_AR@,$ac_ct_AR,;t t
+s,@ac_ct_STRIP@,$ac_ct_STRIP,;t t
+s,@NM@,$NM,;t t
+s,@ac_ct_NM@,$ac_ct_NM,;t t
s,@INSTALL_DIR@,$INSTALL_DIR,;t t
s,@LDFLAGS_GUI@,$LDFLAGS_GUI,;t t
s,@PLATFORM_UNIX@,$PLATFORM_UNIX,;t t
s,@PLATFORM_MSDOS@,$PLATFORM_MSDOS,;t t
s,@PLATFORM_MAC@,$PLATFORM_MAC,;t t
s,@PLATFORM_MACOSX@,$PLATFORM_MACOSX,;t t
+s,@PLATFORM_OS2@,$PLATFORM_OS2,;t t
s,@SO_SUFFIX@,$SO_SUFFIX,;t t
s,@SO_SUFFIX_MODULE@,$SO_SUFFIX_MODULE,;t t
+s,@LIBPREFIX@,$LIBPREFIX,;t t
s,@DLLPREFIX@,$DLLPREFIX,;t t
s,@DLLPREFIX_MODULE@,$DLLPREFIX_MODULE,;t t
s,@AIX_CXX_LD@,$AIX_CXX_LD,;t t
s,@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@,$COND_MONOLITHIC_0_SHARED_0_USE_GUI_1,;t t
s,@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1@,$COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1,;t t
s,@COND_MONOLITHIC_0_SHARED_0_USE_HTML_1@,$COND_MONOLITHIC_0_SHARED_0_USE_HTML_1,;t t
+s,@COND_MONOLITHIC_0_SHARED_0_USE_ODBC_1@,$COND_MONOLITHIC_0_SHARED_0_USE_ODBC_1,;t t
s,@COND_MONOLITHIC_0_SHARED_1@,$COND_MONOLITHIC_0_SHARED_1,;t t
s,@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@,$COND_MONOLITHIC_0_SHARED_1_USE_GUI_1,;t t
s,@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1@,$COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1,;t t
s,@COND_MONOLITHIC_0_SHARED_1_USE_HTML_1@,$COND_MONOLITHIC_0_SHARED_1_USE_HTML_1,;t t
+s,@COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1@,$COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1,;t t
s,@COND_MONOLITHIC_1@,$COND_MONOLITHIC_1,;t t
s,@COND_MONOLITHIC_1_SHARED_0@,$COND_MONOLITHIC_1_SHARED_0,;t t
s,@COND_MONOLITHIC_1_SHARED_1@,$COND_MONOLITHIC_1_SHARED_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_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
+s,@COND_PLATFORM_OS2_1@,$COND_PLATFORM_OS2_1,;t t
s,@COND_PLATFORM_UNIX_0@,$COND_PLATFORM_UNIX_0,;t t
s,@COND_PLATFORM_UNIX_1@,$COND_PLATFORM_UNIX_1,;t t
+s,@COND_PLATFORM_UNIX_1_USE_GUI_1@,$COND_PLATFORM_UNIX_1_USE_GUI_1,;t t
s,@COND_PLATFORM_WIN32_0@,$COND_PLATFORM_WIN32_0,;t t
s,@COND_PLATFORM_WIN32_1@,$COND_PLATFORM_WIN32_1,;t t
s,@COND_SHARED_0@,$COND_SHARED_0,;t t
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_OS2@,$COND_TOOLKIT_OS2,;t t
-s,@COND_TOOLKIT_OS2_USE_GUI_1@,$COND_TOOLKIT_OS2_USE_GUI_1,;t t
-s,@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@,$COND_TOOLKIT_OS2_USE_GUI_1_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_X11@,$COND_TOOLKIT_X11,;t t
s,@COND_TOOLKIT_X11_USE_GUI_1@,$COND_TOOLKIT_X11_USE_GUI_1,;t t
s,@COND_UNICODE_1@,$COND_UNICODE_1,;t t
+s,@COND_USE_EXCEPTIONS_0@,$COND_USE_EXCEPTIONS_0,;t t
+s,@COND_USE_EXCEPTIONS_1@,$COND_USE_EXCEPTIONS_1,;t t
s,@COND_USE_GUI_0@,$COND_USE_GUI_0,;t t
s,@COND_USE_GUI_1@,$COND_USE_GUI_1,;t t
s,@COND_USE_GUI_1_WXUNIV_0@,$COND_USE_GUI_1_WXUNIV_0,;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_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_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,@LEX_STEM@,$LEX_STEM,;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,@WXCONFIG_LIBS_STATIC_GL@,$WXCONFIG_LIBS_STATIC_GL,;t t
s,@WXCONFIG_INCLUDE@,$WXCONFIG_INCLUDE,;t t
s,@WXCONFIG_RPATH@,$WXCONFIG_RPATH,;t t
+s,@WXCONFIG_LDFLAGS_GUI@,$WXCONFIG_LDFLAGS_GUI,;t t
s,@WX_LARGEFILE_FLAGS@,$WX_LARGEFILE_FLAGS,;t t
s,@CODE_GEN_FLAGS@,$CODE_GEN_FLAGS,;t t
s,@CODE_GEN_FLAGS_CXX@,$CODE_GEN_FLAGS_CXX,;t t
s,@GCC@,$GCC,;t t
s,@DLLTOOL@,$DLLTOOL,;t t
s,@AS@,$AS,;t t
-s,@NM@,$NM,;t t
s,@LD@,$LD,;t t
s,@MAKEINFO@,$MAKEINFO,;t t
s,@INSTALL_LIBRARY@,$INSTALL_LIBRARY,;t t
echo
echo "Configured wxWindows ${WX_VERSION} for \`${host}'"
echo ""
-echo " Which GUI toolkit should wxWindows use? ${TOOLKIT:-base only}"
+echo " Which GUI toolkit should wxWindows use? ${TOOLKIT_LOWERCASE:-base only}"
echo " Should wxWindows be compiled into single library? ${wxUSE_MONOLITHIC:-yes}"
echo " Should wxWindows be compiled in debug mode? ${wxUSE_DEBUG:-no}"
echo " Should wxWindows be compiled in Unicode mode? ${wxUSE_UNICODE:-no}"
echo " What level of wxWindows compatibility should be enabled?"
-echo " wxWindows 2.0 ${WXWIN_COMPATIBILITY_2:-no}"
echo " wxWindows 2.2 ${WXWIN_COMPATIBILITY_2_2:-no}"
echo " wxWindows 2.4 ${WXWIN_COMPATIBILITY_2_4:-yes}"
echo " png ${wxUSE_LIBPNG-none}"
echo " regex ${wxUSE_REGEX}"
echo " tiff ${wxUSE_LIBTIFF-none}"
+if test "$wxUSE_X11" = 1 -o "$wxUSE_MOTIF" = 1; then
+echo " xpm ${wxUSE_LIBXPM-none}"
+fi
echo " zlib ${wxUSE_ZLIB}"
echo " odbc ${wxUSE_ODBC}"
echo " expat ${wxUSE_EXPAT}"
+echo " libmspack ${wxUSE_LIBMSPACK}"
echo ""
projects / wxWidgets.git / blobdiff