#! /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 wxUSE_ZLIB wxUSE_REGEX wxUSE_EXPAT wxUSE_ODBC wxUSE_LIBJPEG wxUSE_LIBPNG wxUSE_LIBTIFF VENDOR OFFICIAL_BUILD WXUNIV MONOLITHIC EXTRALIBS EXTRALIBS_XML EXTRALIBS_GUI EXTRALIBS_OPENGL UNICODE BUILD DEBUG_INFO DEBUG_FLAG SHARED TOOLKIT_LOWERCASE TOOLKIT_VERSION SAMPLES_RPATH_FLAG HOST_SUFFIX SET_MAKE MAKE_SET INSTALL_DIR LDFLAGS_GUI PLATFORM_UNIX PLATFORM_WIN32 PLATFORM_MSDOS PLATFORM_MAC PLATFORM_MACOSX SO_SUFFIX DLLPREFIX AIX_CXX_LD SHARED_LD_CC SHARED_LD_CXX PIC_FLAG USE_SOVERSION USE_SOVERLINUX USE_SOVERSOLARIS USE_MACVERSION USE_SOSYMLINKS SONAME_FLAG DEPS_TRACKING 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_MONOLITHIC_0 COND_MONOLITHIC_0_SHARED_0 COND_MONOLITHIC_0_SHARED_0_USE_GUI_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_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_UNIX_1 COND_PLATFORM_WIN32_0 COND_PLATFORM_WIN32_1 COND_SHARED_0_USE_GUI_1_USE_OPENGL_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_GTK_USE_GUI_1_WXUNIV_1 COND_TOOLKIT_MAC COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_MGL COND_TOOLKIT_MGL_USE_GUI_1 COND_TOOLKIT_MGL_USE_GUI_1_WXUNIV_1 COND_TOOLKIT_MOTIF COND_TOOLKIT_MOTIF_USE_GUI_1 COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_MSW COND_TOOLKIT_MSW_USE_GUI_1 COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_1 COND_TOOLKIT_OS2 COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_X11 COND_TOOLKIT_X11_USE_GUI_1 COND_TOOLKIT_X11_USE_GUI_1_WXUNIV_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 COND_PLATFORM_MAC_1 COND_SHARED_1 COND_SHARED_0 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 ESD_LINK LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP CXX CXXFLAGS ac_ct_CXX RANLIB ac_ct_RANLIB AR INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA STRIP IF_GNU_MAKE LN_S CXXCPP subdirs PKG_CONFIG GTK_CFLAGS GTK_LIBS GTK_CONFIG PANGOFT2_CFLAGS PANGOFT2_LIBS X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS PANGOX_CFLAGS PANGOX_LIBS PANGOXFT_CFLAGS PANGOXFT_LIBS RESCOMP DEREZ SETFILE LIBICONV EXTRALIBS_ESD SDL_CONFIG SDL_CFLAGS SDL_LIBS CORE_BASE_LIBS CORE_GUI_LIBS wxUSE_ZLIB wxUSE_REGEX wxUSE_EXPAT wxUSE_ODBC wxUSE_LIBJPEG wxUSE_LIBPNG wxUSE_LIBTIFF VENDOR OFFICIAL_BUILD WXUNIV MONOLITHIC USE_PLUGINS EXTRALIBS EXTRALIBS_XML EXTRALIBS_HTML EXTRALIBS_ODBC EXTRALIBS_GUI EXTRALIBS_OPENGL EXTRALIBS_SDL WITH_PLUGIN_SDL UNICODE BUILD DEBUG_INFO DEBUG_FLAG SHARED TOOLKIT_LOWERCASE TOOLKIT_VERSION SAMPLES_RPATH_FLAG SAMPLES_RPATH_POSTLINK HOST_SUFFIX 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_DEBUG_UNICODE_0 COND_BUILD_DEBUG_UNICODE_1 COND_BUILD_RELEASE COND_BUILD_RELEASE_DEBUG_INFO_DEFAULT COND_BUILD_RELEASE_UNICODE_0 COND_BUILD_RELEASE_UNICODE_1 COND_DEBUG_FLAG_1 COND_DEBUG_INFO_0 COND_DEBUG_INFO_1 COND_DEPS_TRACKING_0 COND_DEPS_TRACKING_1 COND_GCC_PCH_1 COND_MONOLITHIC_0 COND_MONOLITHIC_0_SHARED_0 COND_MONOLITHIC_0_SHARED_0_USE_GUI_1 COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1 COND_MONOLITHIC_0_SHARED_0_USE_HTML_1 COND_MONOLITHIC_0_SHARED_0_USE_ODBC_1 COND_MONOLITHIC_0_SHARED_1 COND_MONOLITHIC_0_SHARED_1_USE_GUI_1 COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1 COND_MONOLITHIC_0_SHARED_1_USE_HTML_1 COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1 COND_MONOLITHIC_0_USE_ODBC_1 COND_MONOLITHIC_1 COND_MONOLITHIC_1_SHARED_0 COND_MONOLITHIC_1_SHARED_1 COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1 COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1 COND_PLATFORM_MACOSX_0_USE_SOVERSION_1 COND_PLATFORM_MACOSX_1 COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA COND_PLATFORM_MACOSX_1_TOOLKIT_GTK COND_PLATFORM_MACOSX_1_TOOLKIT_MAC COND_PLATFORM_MACOSX_1_USE_GUI_1 COND_PLATFORM_MACOSX_1_USE_SOVERSION_1 COND_PLATFORM_MAC_1 COND_PLATFORM_OS2_1 COND_PLATFORM_UNIX_0 COND_PLATFORM_UNIX_1 COND_PLATFORM_UNIX_1_USE_GUI_1 COND_PLATFORM_UNIX_1_USE_PLUGINS_0 COND_PLATFORM_WIN32_0 COND_PLATFORM_WIN32_1 COND_SHARED_0 COND_SHARED_0_USE_GUI_1_USE_OPENGL_1 COND_SHARED_0_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN COND_SHARED_0_USE_GUI_1_WXUSE_LIBPNG_BUILTIN COND_SHARED_0_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN COND_SHARED_0_WXUSE_EXPAT_BUILTIN COND_SHARED_0_WXUSE_ODBC_BUILTIN COND_SHARED_0_WXUSE_REGEX_BUILTIN COND_SHARED_0_WXUSE_ZLIB_BUILTIN COND_SHARED_1 COND_SHARED_1_USE_GUI_1_USE_OPENGL_1 COND_TOOLKIT_COCOA COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_GTK COND_TOOLKIT_GTK_USE_GUI_1 COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_MAC COND_TOOLKIT_MAC_USE_GUI_1 COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_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_PLUGINS_0 COND_USE_SOSYMLINKS_1 COND_USE_SOVERLINUX_1 COND_USE_SOVERSION_0 COND_USE_SOVERSOLARIS_1 COND_WITH_PLUGIN_SDL_1 COND_WITH_SDL_1 COND_WXUNIV_1 COND_WXUSE_EXPAT_BUILTIN COND_WXUSE_LIBJPEG_BUILTIN COND_WXUSE_LIBPNG_BUILTIN COND_WXUSE_LIBTIFF_BUILTIN COND_WXUSE_ODBC_BUILTIN COND_WXUSE_REGEX_BUILTIN COND_WXUSE_ZLIB_BUILTIN PATH_IFS WX_MAJOR_VERSION_NUMBER WX_MINOR_VERSION_NUMBER WX_RELEASE_NUMBER WX_LIBRARY_NAME_STATIC WX_LIBRARY_NAME_SHARED WX_LIBRARY_BASENAME_NOGUI WX_LIBRARY_BASENAME_GUI WX_LIBRARY_IMPORTLIB WX_TARGET_LIBRARY WX_LIBRARY_LINK1 WX_LIBRARY_LINK2 PROGRAM_EXT WX_LIBRARY_NAME_STATIC_GL WX_LIBRARY_NAME_SHARED_GL WX_TARGET_LIBRARY_GL WX_LIBRARY_LINK1_GL WX_LIBRARY_LINK2_GL WX_ALL WX_ALL_INSTALLED SHARED_LD WX_TARGET_LIBRARY_TYPE STATIC_FLAG WXDEBUG_DEFINE USE_GUI AFMINSTALL WIN32INSTALL TOOLKIT TOOLKIT_DIR TOOLKIT_VPATH TOOLCHAIN_NAME TOOLCHAIN_DEFS TOOLCHAIN_DLL_DEFS top_builddir_wxconfig cross_compiling WXCONFIG_EXTRALIBS WXCONFIG_LIBS WXCONFIG_LIBS_GL WXCONFIG_LIBS_STATIC WXCONFIG_LIBS_STATIC_GL WXCONFIG_INCLUDE WXCONFIG_RPATH WXCONFIG_LDFLAGS_GUI 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 LIBWXMACRES MACRESCOMP MACSETFILE MACRESWXCONFIG GCC GCC_SEARCHES_USR_LOCAL_INCLUDE 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
--disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
--enable-gui use GUI classes
- --disable-monolithic don't build wxWindows as single library
+ --enable-monolithic build wxWindows as single library
+ --enable-plugins build parts of wxWindows as loadable components
--enable-universal use wxWindows GUI controls instead of native ones
--enable-nanox use NanoX
--enable-gtk2 use GTK+ 2.0 if available (EXPERIMENTAL)
+ --enable-gpe use GNOME PDA Environment features if possible
--enable-shared create shared library code
--enable-optimise create optimised code
--enable-debug same as debug_flag and debug_info
--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-sound use wxSound 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
--disable-largefile omit support for large files
--disable-gtktest do not try to compile and run a test GTK+ program
--disable-gtktest Do not try to compile and run a test GTK program
+ --disable-sdltest Do not try to compile and run a test SDL program
+ --disable-precomp-headers don't use precompiled headers even if compiler can
Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
--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-sdl use SDL for audio on Unix
--with-opengl use OpenGL (or Mesa)
--with-dmalloc use dmalloc library (http://dmalloc.com/)
--with-regex enable support for wxRegEx class
--with-gtk-exec-prefix=PFX Exec prefix where GTK is installed (optional)
--with-x use the X Window System
--with-libiconv-prefix=DIR search for libiconv in DIR/include and DIR/lib
+ --with-sdl-prefix=PFX Prefix where SDL is installed (optional)
+ --with-sdl-exec-prefix=PFX Exec prefix where SDL is installed (optional)
Some influential environment variables:
CC C compiler command
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
PROGRAM_EXT=
SO_SUFFIX=so
SAMPLES_RPATH_FLAG=
+SAMPLES_RPATH_POSTLINK=
case "${host}" in
*-hp-hpux* )
*-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_LIBMSPACK=no
+ DEFAULT_wxUSE_LIBSDL=no
DEFAULT_wxUSE_ODBC=no
DEFAULT_wxUSE_OPENGL=no
DEFAULT_wxUSE_FFILE=no
DEFAULT_wxUSE_TEXTBUFFER=no
DEFAULT_wxUSE_TEXTFILE=no
- DEFAULT_wxUSE_WAVE=no
+ DEFAULT_wxUSE_SOUND=no
DEFAULT_wxUSE_INTL=no
DEFAULT_wxUSE_CONFIG=no
DEFAULT_wxUSE_FONTMAP=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_ICO_CUR=no
DEFAULT_wxUSE_ACCESSIBILITY=no
- DEFAULT_wxUSE_MONOLITHIC=yes
+ DEFAULT_wxUSE_MONOLITHIC=no
+ DEFAULT_wxUSE_PLUGINS=no
DEFAULT_wxUSE_OFFICIAL_BUILD=no
else
DEFAULT_wxUSE_UNIVERSAL=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_LIBPNG=yes
DEFAULT_wxUSE_LIBJPEG=yes
DEFAULT_wxUSE_LIBTIFF=yes
+ DEFAULT_wxUSE_LIBXPM=yes
+ DEFAULT_wxUSE_LIBMSPACK=yes
+ DEFAULT_wxUSE_LIBSDL=no
DEFAULT_wxUSE_ODBC=no
DEFAULT_wxUSE_OPENGL=no
DEFAULT_wxUSE_FFILE=yes
DEFAULT_wxUSE_TEXTBUFFER=yes
DEFAULT_wxUSE_TEXTFILE=yes
- DEFAULT_wxUSE_WAVE=no
+ DEFAULT_wxUSE_SOUND=yes
DEFAULT_wxUSE_INTL=yes
DEFAULT_wxUSE_CONFIG=yes
DEFAULT_wxUSE_FONTMAP=yes
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
DEFAULT_wxUSE_ICO_CUR=yes
DEFAULT_wxUSE_ACCESSIBILITY=no
- DEFAULT_wxUSE_MONOLITHIC=yes
+ DEFAULT_wxUSE_MONOLITHIC=no
+ DEFAULT_wxUSE_PLUGINS=no
DEFAULT_wxUSE_OFFICIAL_BUILD=no
fi
fi
+ enablestring=
+ echo "$as_me:$LINENO: checking for --${enablestring:-enable}-plugins" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-plugins... $ECHO_C" >&6
+ no_cache=0
+ # Check whether --enable-plugins or --disable-plugins was given.
+if test "${enable_plugins+set}" = set; then
+ enableval="$enable_plugins"
+
+ if test "$enableval" = yes; then
+ ac_cv_use_plugins='wxUSE_PLUGINS=yes'
+ else
+ ac_cv_use_plugins='wxUSE_PLUGINS=no'
+ fi
+
+else
+
+ LINE=`grep "wxUSE_PLUGINS" ${wx_arg_cache_file}`
+ if test "x$LINE" != x ; then
+ eval "DEFAULT_$LINE"
+ else
+ no_cache=1
+ fi
+
+ ac_cv_use_plugins='wxUSE_PLUGINS='$DEFAULT_wxUSE_PLUGINS
+
+fi;
+
+ eval "$ac_cv_use_plugins"
+ if test "$no_cache" != 1; then
+ echo $ac_cv_use_plugins >> ${wx_arg_cache_file}.tmp
+ fi
+
+ if test "$wxUSE_PLUGINS" = 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
+
+
if test "$wxUSE_GUI" = "yes"; then
fi
+ enablestring=
+ echo "$as_me:$LINENO: checking for --${enablestring:-enable}-gpe" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-gpe... $ECHO_C" >&6
+ no_cache=0
+ # Check whether --enable-gpe or --disable-gpe was given.
+if test "${enable_gpe+set}" = set; then
+ enableval="$enable_gpe"
+
+ if test "$enableval" = yes; then
+ ac_cv_use_gpe='wxUSE_GPE=yes'
+ else
+ ac_cv_use_gpe='wxUSE_GPE=no'
+ fi
+
+else
+
+ LINE=`grep "wxUSE_GPE" ${wx_arg_cache_file}`
+ if test "x$LINE" != x ; then
+ eval "DEFAULT_$LINE"
+ else
+ no_cache=1
+ fi
+
+ ac_cv_use_gpe='wxUSE_GPE='$DEFAULT_wxUSE_GPE
+
+fi;
+
+ eval "$ac_cv_use_gpe"
+ if test "$no_cache" != 1; then
+ echo $ac_cv_use_gpe >> ${wx_arg_cache_file}.tmp
+ fi
+
+ if test "$wxUSE_GPE" = 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-libpng" >&5
echo $ECHO_N "checking for --with-libpng... $ECHO_C" >&6
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-sdl" >&5
+echo $ECHO_N "checking for --with-sdl... $ECHO_C" >&6
+ no_cache=0
+
+# Check whether --with-sdl or --without-sdl was given.
+if test "${with_sdl+set}" = set; then
+ withval="$with_sdl"
+
+ if test "$withval" = yes; then
+ ac_cv_use_sdl='wxUSE_LIBSDL=yes'
+ else
+ ac_cv_use_sdl='wxUSE_LIBSDL=no'
+ fi
+
+else
+
+ LINE=`grep "wxUSE_LIBSDL" ${wx_arg_cache_file}`
+ if test "x$LINE" != x ; then
+ eval "DEFAULT_$LINE"
+ else
+ no_cache=1
+ fi
+
+ ac_cv_use_sdl='wxUSE_LIBSDL='$DEFAULT_wxUSE_LIBSDL
+
+fi;
+
+ eval "$ac_cv_use_sdl"
+ if test "$no_cache" != 1; then
+ echo $ac_cv_use_sdl >> ${wx_arg_cache_file}.tmp
+ fi
+
+ if test "$wxUSE_LIBSDL" = 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}-apple_ieee" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-apple_ieee... $ECHO_C" >&6
+ no_cache=0
+ # Check whether --enable-apple_ieee or --disable-apple_ieee was given.
+if test "${enable_apple_ieee+set}" = set; then
+ enableval="$enable_apple_ieee"
+
+ if test "$enableval" = yes; then
+ ac_cv_use_apple_ieee='wxUSE_APPLE_IEEE=yes'
+ else
+ ac_cv_use_apple_ieee='wxUSE_APPLE_IEEE=no'
+ fi
+
+else
+
+ LINE=`grep "wxUSE_APPLE_IEEE" ${wx_arg_cache_file}`
+ if test "x$LINE" != x ; then
+ eval "DEFAULT_$LINE"
+ else
+ no_cache=1
+ fi
+
+ ac_cv_use_apple_ieee='wxUSE_APPLE_IEEE='$DEFAULT_wxUSE_APPLE_IEEE
+
+fi;
+
+ eval "$ac_cv_use_apple_ieee"
+ if test "$no_cache" != 1; then
+ echo $ac_cv_use_apple_ieee >> ${wx_arg_cache_file}.tmp
+ fi
+
+ if test "$wxUSE_APPLE_IEEE" = 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
+ 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"
+
+ if test "$enableval" = yes; then
+ ac_cv_use_catch_segvs='wxUSE_ON_FATAL_EXCEPTION=yes'
+ else
+ ac_cv_use_catch_segvs='wxUSE_ON_FATAL_EXCEPTION=no'
+ fi
+
+else
+
+ 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_catch_segvs='wxUSE_ON_FATAL_EXCEPTION='$DEFAULT_wxUSE_ON_FATAL_EXCEPTION
+
+fi;
+
+ eval "$ac_cv_use_catch_segvs"
+ if test "$no_cache" != 1; then
+ echo $ac_cv_use_catch_segvs >> ${wx_arg_cache_file}.tmp
+ fi
+
+ if test "$wxUSE_ON_FATAL_EXCEPTION" = 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}-cmdline" >&5
echo $ECHO_N "checking for --${enablestring:-enable}-cmdline... $ECHO_C" >&6
enablestring=
- echo "$as_me:$LINENO: checking for --${enablestring:-enable}-stopwatch" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-stopwatch... $ECHO_C" >&6
+ 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-stopwatch or --disable-stopwatch was given.
-if test "${enable_stopwatch+set}" = set; then
- enableval="$enable_stopwatch"
+ # 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_stopwatch='wxUSE_STOPWATCH=yes'
+ ac_cv_use_dialupman='wxUSE_DIALUP_MANAGER=yes'
else
- ac_cv_use_stopwatch='wxUSE_STOPWATCH=no'
+ ac_cv_use_dialupman='wxUSE_DIALUP_MANAGER=no'
fi
else
- LINE=`grep "wxUSE_STOPWATCH" ${wx_arg_cache_file}`
+ 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_stopwatch='wxUSE_STOPWATCH='$DEFAULT_wxUSE_STOPWATCH
+ ac_cv_use_dialupman='wxUSE_DIALUP_MANAGER='$DEFAULT_wxUSE_DIALUP_MANAGER
fi;
- eval "$ac_cv_use_stopwatch"
+ eval "$ac_cv_use_dialupman"
if test "$no_cache" != 1; then
- echo $ac_cv_use_stopwatch >> ${wx_arg_cache_file}.tmp
+ echo $ac_cv_use_dialupman >> ${wx_arg_cache_file}.tmp
fi
- if test "$wxUSE_STOPWATCH" = 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}-dialupman" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-dialupman... $ECHO_C" >&6
+ echo "$as_me:$LINENO: checking for --${enablestring:-enable}-dynlib" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-dynlib... $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"
+ # Check whether --enable-dynlib or --disable-dynlib was given.
+if test "${enable_dynlib+set}" = set; then
+ enableval="$enable_dynlib"
if test "$enableval" = yes; then
- ac_cv_use_dialupman='wxUSE_DIALUP_MANAGER=yes'
+ ac_cv_use_dynlib='wxUSE_DYNLIB_CLASS=yes'
else
- ac_cv_use_dialupman='wxUSE_DIALUP_MANAGER=no'
+ ac_cv_use_dynlib='wxUSE_DYNLIB_CLASS=no'
fi
else
- LINE=`grep "wxUSE_DIALUP_MANAGER" ${wx_arg_cache_file}`
+ LINE=`grep "wxUSE_DYNLIB_CLASS" ${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
+ ac_cv_use_dynlib='wxUSE_DYNLIB_CLASS='$DEFAULT_wxUSE_DYNLIB_CLASS
fi;
- eval "$ac_cv_use_dialupman"
+ eval "$ac_cv_use_dynlib"
if test "$no_cache" != 1; then
- echo $ac_cv_use_dialupman >> ${wx_arg_cache_file}.tmp
+ echo $ac_cv_use_dynlib >> ${wx_arg_cache_file}.tmp
fi
- if test "$wxUSE_DIALUP_MANAGER" = yes; then
+ if test "$wxUSE_DYNLIB_CLASS" = yes; then
echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6
else
enablestring=
- echo "$as_me:$LINENO: checking for --${enablestring:-enable}-apple_ieee" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-apple_ieee... $ECHO_C" >&6
+ echo "$as_me:$LINENO: checking for --${enablestring:-enable}-dynamicloader" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-dynamicloader... $ECHO_C" >&6
no_cache=0
- # Check whether --enable-apple_ieee or --disable-apple_ieee was given.
-if test "${enable_apple_ieee+set}" = set; then
- enableval="$enable_apple_ieee"
+ # Check whether --enable-dynamicloader or --disable-dynamicloader was given.
+if test "${enable_dynamicloader+set}" = set; then
+ enableval="$enable_dynamicloader"
if test "$enableval" = yes; then
- ac_cv_use_apple_ieee='wxUSE_APPLE_IEEE=yes'
+ ac_cv_use_dynamicloader='wxUSE_DYNAMIC_LOADER=yes'
else
- ac_cv_use_apple_ieee='wxUSE_APPLE_IEEE=no'
+ ac_cv_use_dynamicloader='wxUSE_DYNAMIC_LOADER=no'
fi
else
- LINE=`grep "wxUSE_APPLE_IEEE" ${wx_arg_cache_file}`
+ LINE=`grep "wxUSE_DYNAMIC_LOADER" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
eval "DEFAULT_$LINE"
else
no_cache=1
fi
- ac_cv_use_apple_ieee='wxUSE_APPLE_IEEE='$DEFAULT_wxUSE_APPLE_IEEE
+ ac_cv_use_dynamicloader='wxUSE_DYNAMIC_LOADER='$DEFAULT_wxUSE_DYNAMIC_LOADER
fi;
- eval "$ac_cv_use_apple_ieee"
+ eval "$ac_cv_use_dynamicloader"
if test "$no_cache" != 1; then
- echo $ac_cv_use_apple_ieee >> ${wx_arg_cache_file}.tmp
+ echo $ac_cv_use_dynamicloader >> ${wx_arg_cache_file}.tmp
fi
- if test "$wxUSE_APPLE_IEEE" = yes; then
+ if test "$wxUSE_DYNAMIC_LOADER" = yes; then
echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6
else
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}-exceptions" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-exceptions... $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-exceptions or --disable-exceptions was given.
+if test "${enable_exceptions+set}" = set; then
+ enableval="$enable_exceptions"
if test "$enableval" = yes; then
- ac_cv_use_timer='wxUSE_TIMER=yes'
+ ac_cv_use_exceptions='wxUSE_EXCEPTIONS=yes'
else
- ac_cv_use_timer='wxUSE_TIMER=no'
+ ac_cv_use_exceptions='wxUSE_EXCEPTIONS=no'
fi
else
- LINE=`grep "wxUSE_TIMER" ${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_timer='wxUSE_TIMER='$DEFAULT_wxUSE_TIMER
+ ac_cv_use_exceptions='wxUSE_EXCEPTIONS='$DEFAULT_wxUSE_EXCEPTIONS
fi;
- eval "$ac_cv_use_timer"
+ eval "$ac_cv_use_exceptions"
if test "$no_cache" != 1; then
- echo $ac_cv_use_timer >> ${wx_arg_cache_file}.tmp
+ echo $ac_cv_use_exceptions >> ${wx_arg_cache_file}.tmp
fi
- if test "$wxUSE_TIMER" = 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}-wave" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-wave... $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-wave or --disable-wave was given.
-if test "${enable_wave+set}" = set; then
- enableval="$enable_wave"
+ # 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_wave='wxUSE_WAVE=yes'
+ ac_cv_use_ffile='wxUSE_FFILE=yes'
else
- ac_cv_use_wave='wxUSE_WAVE=no'
+ ac_cv_use_ffile='wxUSE_FFILE=no'
fi
else
- LINE=`grep "wxUSE_WAVE" ${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_wave='wxUSE_WAVE='$DEFAULT_wxUSE_WAVE
+ ac_cv_use_ffile='wxUSE_FFILE='$DEFAULT_wxUSE_FFILE
fi;
- eval "$ac_cv_use_wave"
+ eval "$ac_cv_use_ffile"
if test "$no_cache" != 1; then
- echo $ac_cv_use_wave >> ${wx_arg_cache_file}.tmp
+ echo $ac_cv_use_ffile >> ${wx_arg_cache_file}.tmp
fi
- if test "$wxUSE_WAVE" = 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}-fraction" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-fraction... $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-fraction or --disable-fraction was given.
-if test "${enable_fraction+set}" = set; then
- enableval="$enable_fraction"
+ # 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_fraction='wxUSE_FRACTION=yes'
+ ac_cv_use_file='wxUSE_FILE=yes'
else
- ac_cv_use_fraction='wxUSE_FRACTION=no'
+ ac_cv_use_file='wxUSE_FILE=no'
fi
else
- LINE=`grep "wxUSE_FRACTION" ${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_fraction='wxUSE_FRACTION='$DEFAULT_wxUSE_FRACTION
+ ac_cv_use_file='wxUSE_FILE='$DEFAULT_wxUSE_FILE
fi;
- eval "$ac_cv_use_fraction"
+ eval "$ac_cv_use_file"
if test "$no_cache" != 1; then
- echo $ac_cv_use_fraction >> ${wx_arg_cache_file}.tmp
+ echo $ac_cv_use_file >> ${wx_arg_cache_file}.tmp
fi
- if test "$wxUSE_FRACTION" = 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}-dynlib" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-dynlib... $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-dynlib or --disable-dynlib was given.
-if test "${enable_dynlib+set}" = set; then
- enableval="$enable_dynlib"
+ # 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_dynlib='wxUSE_DYNLIB_CLASS=yes'
+ ac_cv_use_filesystem='wxUSE_FILESYSTEM=yes'
else
- ac_cv_use_dynlib='wxUSE_DYNLIB_CLASS=no'
+ ac_cv_use_filesystem='wxUSE_FILESYSTEM=no'
fi
else
- LINE=`grep "wxUSE_DYNLIB_CLASS" ${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_dynlib='wxUSE_DYNLIB_CLASS='$DEFAULT_wxUSE_DYNLIB_CLASS
+ ac_cv_use_filesystem='wxUSE_FILESYSTEM='$DEFAULT_wxUSE_FILESYSTEM
fi;
- eval "$ac_cv_use_dynlib"
+ eval "$ac_cv_use_filesystem"
if test "$no_cache" != 1; then
- echo $ac_cv_use_dynlib >> ${wx_arg_cache_file}.tmp
+ echo $ac_cv_use_filesystem >> ${wx_arg_cache_file}.tmp
fi
- if test "$wxUSE_DYNLIB_CLASS" = 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}-dynamicloader" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-dynamicloader... $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-dynamicloader or --disable-dynamicloader was given.
-if test "${enable_dynamicloader+set}" = set; then
- enableval="$enable_dynamicloader"
+ # 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_dynamicloader='wxUSE_DYNAMIC_LOADER=yes'
+ ac_cv_use_fontmap='wxUSE_FONTMAP=yes'
else
- ac_cv_use_dynamicloader='wxUSE_DYNAMIC_LOADER=no'
+ ac_cv_use_fontmap='wxUSE_FONTMAP=no'
fi
else
- LINE=`grep "wxUSE_DYNAMIC_LOADER" ${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_dynamicloader='wxUSE_DYNAMIC_LOADER='$DEFAULT_wxUSE_DYNAMIC_LOADER
+ ac_cv_use_fontmap='wxUSE_FONTMAP='$DEFAULT_wxUSE_FONTMAP
fi;
- eval "$ac_cv_use_dynamicloader"
+ eval "$ac_cv_use_fontmap"
if test "$no_cache" != 1; then
- echo $ac_cv_use_dynamicloader >> ${wx_arg_cache_file}.tmp
+ echo $ac_cv_use_fontmap >> ${wx_arg_cache_file}.tmp
fi
- if test "$wxUSE_DYNAMIC_LOADER" = 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}-longlong" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-longlong... $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-longlong or --disable-longlong was given.
-if test "${enable_longlong+set}" = set; then
- enableval="$enable_longlong"
+ # 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_longlong='wxUSE_LONGLONG=yes'
+ ac_cv_use_fs_inet='wxUSE_FS_INET=yes'
else
- ac_cv_use_longlong='wxUSE_LONGLONG=no'
+ ac_cv_use_fs_inet='wxUSE_FS_INET=no'
fi
else
- LINE=`grep "wxUSE_LONGLONG" ${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_longlong='wxUSE_LONGLONG='$DEFAULT_wxUSE_LONGLONG
+ ac_cv_use_fs_inet='wxUSE_FS_INET='$DEFAULT_wxUSE_FS_INET
fi;
- eval "$ac_cv_use_longlong"
+ eval "$ac_cv_use_fs_inet"
if test "$no_cache" != 1; then
- echo $ac_cv_use_longlong >> ${wx_arg_cache_file}.tmp
+ echo $ac_cv_use_fs_inet >> ${wx_arg_cache_file}.tmp
fi
- if test "$wxUSE_LONGLONG" = yes; then
+ if test "$wxUSE_FS_INET" = 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}-fs_zip" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-fs_zip... $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"
+
+ if test "$enableval" = yes; then
+ ac_cv_use_fs_zip='wxUSE_FS_ZIP=yes'
+ else
+ ac_cv_use_fs_zip='wxUSE_FS_ZIP=no'
+ fi
+
+else
+
+ 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_fs_zip='wxUSE_FS_ZIP='$DEFAULT_wxUSE_FS_ZIP
+
+fi;
+
+ eval "$ac_cv_use_fs_zip"
+ if test "$no_cache" != 1; then
+ echo $ac_cv_use_fs_zip >> ${wx_arg_cache_file}.tmp
+ fi
+
+ 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}-streams" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-streams... $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-streams or --disable-streams was given.
-if test "${enable_streams+set}" = set; then
- enableval="$enable_streams"
+ # 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_streams='wxUSE_STREAMS=yes'
+ ac_cv_use_longlong='wxUSE_LONGLONG=yes'
else
- ac_cv_use_streams='wxUSE_STREAMS=no'
+ ac_cv_use_longlong='wxUSE_LONGLONG=no'
fi
else
- LINE=`grep "wxUSE_STREAMS" ${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_streams='wxUSE_STREAMS='$DEFAULT_wxUSE_STREAMS
+ ac_cv_use_longlong='wxUSE_LONGLONG='$DEFAULT_wxUSE_LONGLONG
fi;
- eval "$ac_cv_use_streams"
+ eval "$ac_cv_use_longlong"
if test "$no_cache" != 1; then
- echo $ac_cv_use_streams >> ${wx_arg_cache_file}.tmp
+ echo $ac_cv_use_longlong >> ${wx_arg_cache_file}.tmp
fi
- if test "$wxUSE_STREAMS" = yes; then
+ if test "$wxUSE_LONGLONG" = 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}-mimetype" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-mimetype... $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-mimetype or --disable-mimetype was given.
+if test "${enable_mimetype+set}" = set; then
+ enableval="$enable_mimetype"
if test "$enableval" = yes; then
- ac_cv_use_file='wxUSE_FILE=yes'
+ ac_cv_use_mimetype='wxUSE_MIMETYPE=yes'
else
- ac_cv_use_file='wxUSE_FILE=no'
+ ac_cv_use_mimetype='wxUSE_MIMETYPE=no'
fi
else
- LINE=`grep "wxUSE_FILE" ${wx_arg_cache_file}`
+ 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_file='wxUSE_FILE='$DEFAULT_wxUSE_FILE
+ ac_cv_use_mimetype='wxUSE_MIMETYPE='$DEFAULT_wxUSE_MIMETYPE
fi;
- eval "$ac_cv_use_file"
+ eval "$ac_cv_use_mimetype"
if test "$no_cache" != 1; then
- echo $ac_cv_use_file >> ${wx_arg_cache_file}.tmp
+ echo $ac_cv_use_mimetype >> ${wx_arg_cache_file}.tmp
fi
- if test "$wxUSE_FILE" = yes; then
+ 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}-ffile" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-ffile... $ECHO_C" >&6
+ echo "$as_me:$LINENO: checking for --${enablestring:-enable}-mslu" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-mslu... $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-mslu or --disable-mslu was given.
+if test "${enable_mslu+set}" = set; then
+ enableval="$enable_mslu"
if test "$enableval" = yes; then
- ac_cv_use_ffile='wxUSE_FFILE=yes'
+ ac_cv_use_mslu='wxUSE_UNICODE_MSLU=yes'
else
- ac_cv_use_ffile='wxUSE_FFILE=no'
+ ac_cv_use_mslu='wxUSE_UNICODE_MSLU=no'
fi
else
- LINE=`grep "wxUSE_FFILE" ${wx_arg_cache_file}`
+ LINE=`grep "wxUSE_UNICODE_MSLU" ${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_mslu='wxUSE_UNICODE_MSLU='$DEFAULT_wxUSE_UNICODE_MSLU
fi;
- eval "$ac_cv_use_ffile"
+ eval "$ac_cv_use_mslu"
if test "$no_cache" != 1; then
- echo $ac_cv_use_ffile >> ${wx_arg_cache_file}.tmp
+ echo $ac_cv_use_mslu >> ${wx_arg_cache_file}.tmp
fi
- if test "$wxUSE_FFILE" = yes; then
+ if test "$wxUSE_UNICODE_MSLU" = 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}-snglinst" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-snglinst... $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-snglinst or --disable-snglinst was given.
+if test "${enable_snglinst+set}" = set; then
+ enableval="$enable_snglinst"
if test "$enableval" = yes; then
- ac_cv_use_textbuf='wxUSE_TEXTBUFFER=yes'
+ ac_cv_use_snglinst='wxUSE_SNGLINST_CHECKER=yes'
else
- ac_cv_use_textbuf='wxUSE_TEXTBUFFER=no'
+ ac_cv_use_snglinst='wxUSE_SNGLINST_CHECKER=no'
fi
else
- LINE=`grep "wxUSE_TEXTBUFFER" ${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_textbuf='wxUSE_TEXTBUFFER='$DEFAULT_wxUSE_TEXTBUFFER
+ ac_cv_use_snglinst='wxUSE_SNGLINST_CHECKER='$DEFAULT_wxUSE_SNGLINST_CHECKER
fi;
- eval "$ac_cv_use_textbuf"
+ eval "$ac_cv_use_snglinst"
if test "$no_cache" != 1; then
- echo $ac_cv_use_textbuf >> ${wx_arg_cache_file}.tmp
+ echo $ac_cv_use_snglinst >> ${wx_arg_cache_file}.tmp
fi
- if test "$wxUSE_TEXTBUFFER" = yes; then
+ if test "$wxUSE_SNGLINST_CHECKER" = 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}-streams" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-streams... $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-streams or --disable-streams was given.
+if test "${enable_streams+set}" = set; then
+ enableval="$enable_streams"
if test "$enableval" = yes; then
- ac_cv_use_textfile='wxUSE_TEXTFILE=yes'
+ ac_cv_use_streams='wxUSE_STREAMS=yes'
else
- ac_cv_use_textfile='wxUSE_TEXTFILE=no'
+ ac_cv_use_streams='wxUSE_STREAMS=no'
fi
else
- LINE=`grep "wxUSE_TEXTFILE" ${wx_arg_cache_file}`
+ 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_textfile='wxUSE_TEXTFILE='$DEFAULT_wxUSE_TEXTFILE
+ ac_cv_use_streams='wxUSE_STREAMS='$DEFAULT_wxUSE_STREAMS
fi;
- eval "$ac_cv_use_textfile"
+ eval "$ac_cv_use_streams"
if test "$no_cache" != 1; then
- echo $ac_cv_use_textfile >> ${wx_arg_cache_file}.tmp
+ echo $ac_cv_use_streams >> ${wx_arg_cache_file}.tmp
fi
- if test "$wxUSE_TEXTFILE" = yes; then
+ 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}-fontmap" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-fontmap... $ECHO_C" >&6
+ echo "$as_me:$LINENO: checking for --${enablestring:-enable}-std_iostreams" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-std_iostreams... $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-std_iostreams or --disable-std_iostreams was given.
+if test "${enable_std_iostreams+set}" = set; then
+ enableval="$enable_std_iostreams"
if test "$enableval" = yes; then
- ac_cv_use_fontmap='wxUSE_FONTMAP=yes'
+ ac_cv_use_std_iostreams='wxUSE_STD_IOSTREAM=yes'
else
- ac_cv_use_fontmap='wxUSE_FONTMAP=no'
+ ac_cv_use_std_iostreams='wxUSE_STD_IOSTREAM=no'
fi
else
- LINE=`grep "wxUSE_FONTMAP" ${wx_arg_cache_file}`
+ LINE=`grep "wxUSE_STD_IOSTREAM" ${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_std_iostreams='wxUSE_STD_IOSTREAM='$DEFAULT_wxUSE_STD_IOSTREAM
fi;
- eval "$ac_cv_use_fontmap"
+ eval "$ac_cv_use_std_iostreams"
if test "$no_cache" != 1; then
- echo $ac_cv_use_fontmap >> ${wx_arg_cache_file}.tmp
+ echo $ac_cv_use_std_iostreams >> ${wx_arg_cache_file}.tmp
fi
- if test "$wxUSE_FONTMAP" = yes; then
+ if test "$wxUSE_STD_IOSTREAM" = 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}-stopwatch" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-stopwatch... $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-stopwatch or --disable-stopwatch was given.
+if test "${enable_stopwatch+set}" = set; then
+ enableval="$enable_stopwatch"
if test "$enableval" = yes; then
- ac_cv_use_unicode='wxUSE_UNICODE=yes'
+ ac_cv_use_stopwatch='wxUSE_STOPWATCH=yes'
else
- ac_cv_use_unicode='wxUSE_UNICODE=no'
+ ac_cv_use_stopwatch='wxUSE_STOPWATCH=no'
fi
else
- LINE=`grep "wxUSE_UNICODE" ${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_unicode='wxUSE_UNICODE='$DEFAULT_wxUSE_UNICODE
+ ac_cv_use_stopwatch='wxUSE_STOPWATCH='$DEFAULT_wxUSE_STOPWATCH
fi;
- eval "$ac_cv_use_unicode"
+ eval "$ac_cv_use_stopwatch"
if test "$no_cache" != 1; then
- echo $ac_cv_use_unicode >> ${wx_arg_cache_file}.tmp
+ echo $ac_cv_use_stopwatch >> ${wx_arg_cache_file}.tmp
fi
- if test "$wxUSE_UNICODE" = 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}-mslu" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-mslu... $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-mslu or --disable-mslu was given.
-if test "${enable_mslu+set}" = set; then
- enableval="$enable_mslu"
+ # 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_mslu='wxUSE_UNICODE_MSLU=yes'
+ ac_cv_use_system_options='wxUSE_SYSTEM_OPTIONS=yes'
else
- ac_cv_use_mslu='wxUSE_UNICODE_MSLU=no'
+ ac_cv_use_system_options='wxUSE_SYSTEM_OPTIONS=no'
fi
else
- LINE=`grep "wxUSE_UNICODE_MSLU" ${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_mslu='wxUSE_UNICODE_MSLU='$DEFAULT_wxUSE_UNICODE_MSLU
+ ac_cv_use_system_options='wxUSE_SYSTEM_OPTIONS='$DEFAULT_wxUSE_SYSTEM_OPTIONS
fi;
- eval "$ac_cv_use_mslu"
+ eval "$ac_cv_use_system_options"
if test "$no_cache" != 1; then
- echo $ac_cv_use_mslu >> ${wx_arg_cache_file}.tmp
+ echo $ac_cv_use_system_options >> ${wx_arg_cache_file}.tmp
fi
- if test "$wxUSE_UNICODE_MSLU" = 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}-wxprintfv" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-wxprintfv... $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-wxprintfv or --disable-wxprintfv was given.
-if test "${enable_wxprintfv+set}" = set; then
- enableval="$enable_wxprintfv"
+ # 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_wxprintfv='wxUSE_EXPERIMENTAL_PRINTF=yes'
+ ac_cv_use_textbuf='wxUSE_TEXTBUFFER=yes'
else
- ac_cv_use_wxprintfv='wxUSE_EXPERIMENTAL_PRINTF=no'
+ ac_cv_use_textbuf='wxUSE_TEXTBUFFER=no'
fi
else
- LINE=`grep "wxUSE_EXPERIMENTAL_PRINTF" ${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_wxprintfv='wxUSE_EXPERIMENTAL_PRINTF='$DEFAULT_wxUSE_EXPERIMENTAL_PRINTF
+ ac_cv_use_textbuf='wxUSE_TEXTBUFFER='$DEFAULT_wxUSE_TEXTBUFFER
fi;
- eval "$ac_cv_use_wxprintfv"
+ eval "$ac_cv_use_textbuf"
if test "$no_cache" != 1; then
- echo $ac_cv_use_wxprintfv >> ${wx_arg_cache_file}.tmp
+ echo $ac_cv_use_textbuf >> ${wx_arg_cache_file}.tmp
fi
- if test "$wxUSE_EXPERIMENTAL_PRINTF" = 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}-std_iostreams" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-std_iostreams... $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-std_iostreams or --disable-std_iostreams was given.
-if test "${enable_std_iostreams+set}" = set; then
- enableval="$enable_std_iostreams"
+ # 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_std_iostreams='wxUSE_STD_IOSTREAM=yes'
+ ac_cv_use_textfile='wxUSE_TEXTFILE=yes'
else
- ac_cv_use_std_iostreams='wxUSE_STD_IOSTREAM=no'
+ ac_cv_use_textfile='wxUSE_TEXTFILE=no'
fi
else
- LINE=`grep "wxUSE_STD_IOSTREAM" ${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_std_iostreams='wxUSE_STD_IOSTREAM='$DEFAULT_wxUSE_STD_IOSTREAM
+ ac_cv_use_textfile='wxUSE_TEXTFILE='$DEFAULT_wxUSE_TEXTFILE
fi;
- eval "$ac_cv_use_std_iostreams"
+ eval "$ac_cv_use_textfile"
if test "$no_cache" != 1; then
- echo $ac_cv_use_std_iostreams >> ${wx_arg_cache_file}.tmp
+ echo $ac_cv_use_textfile >> ${wx_arg_cache_file}.tmp
fi
- if test "$wxUSE_STD_IOSTREAM" = yes; then
+ if test "$wxUSE_TEXTFILE" = 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}-timer" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-timer... $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-timer or --disable-timer was given.
+if test "${enable_timer+set}" = set; then
+ enableval="$enable_timer"
if test "$enableval" = yes; then
- ac_cv_use_filesystem='wxUSE_FILESYSTEM=yes'
+ ac_cv_use_timer='wxUSE_TIMER=yes'
else
- ac_cv_use_filesystem='wxUSE_FILESYSTEM=no'
+ ac_cv_use_timer='wxUSE_TIMER=no'
fi
else
- LINE=`grep "wxUSE_FILESYSTEM" ${wx_arg_cache_file}`
+ 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_filesystem='wxUSE_FILESYSTEM='$DEFAULT_wxUSE_FILESYSTEM
+ ac_cv_use_timer='wxUSE_TIMER='$DEFAULT_wxUSE_TIMER
fi;
- eval "$ac_cv_use_filesystem"
+ eval "$ac_cv_use_timer"
if test "$no_cache" != 1; then
- echo $ac_cv_use_filesystem >> ${wx_arg_cache_file}.tmp
+ echo $ac_cv_use_timer >> ${wx_arg_cache_file}.tmp
fi
- if test "$wxUSE_FILESYSTEM" = yes; then
+ if test "$wxUSE_TIMER" = 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}-unicode" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-unicode... $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-unicode or --disable-unicode was given.
+if test "${enable_unicode+set}" = set; then
+ enableval="$enable_unicode"
if test "$enableval" = yes; then
- ac_cv_use_fs_inet='wxUSE_FS_INET=yes'
+ ac_cv_use_unicode='wxUSE_UNICODE=yes'
else
- ac_cv_use_fs_inet='wxUSE_FS_INET=no'
+ ac_cv_use_unicode='wxUSE_UNICODE=no'
fi
else
- LINE=`grep "wxUSE_FS_INET" ${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_fs_inet='wxUSE_FS_INET='$DEFAULT_wxUSE_FS_INET
+ ac_cv_use_unicode='wxUSE_UNICODE='$DEFAULT_wxUSE_UNICODE
fi;
- eval "$ac_cv_use_fs_inet"
+ eval "$ac_cv_use_unicode"
if test "$no_cache" != 1; then
- echo $ac_cv_use_fs_inet >> ${wx_arg_cache_file}.tmp
+ echo $ac_cv_use_unicode >> ${wx_arg_cache_file}.tmp
fi
- if test "$wxUSE_FS_INET" = 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}-fs_zip" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-fs_zip... $ECHO_C" >&6
+ echo "$as_me:$LINENO: checking for --${enablestring:-enable}-sound" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-sound... $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"
-
- if test "$enableval" = yes; then
- ac_cv_use_fs_zip='wxUSE_FS_ZIP=yes'
- else
- ac_cv_use_fs_zip='wxUSE_FS_ZIP=no'
- fi
-
-else
-
- 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_fs_zip='wxUSE_FS_ZIP='$DEFAULT_wxUSE_FS_ZIP
-
-fi;
-
- eval "$ac_cv_use_fs_zip"
- if test "$no_cache" != 1; then
- echo $ac_cv_use_fs_zip >> ${wx_arg_cache_file}.tmp
- fi
-
- if test "$wxUSE_FS_ZIP" = 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}-zipstream" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-zipstream... $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"
-
- if test "$enableval" = yes; then
- ac_cv_use_zipstream='wxUSE_ZIPSTREAM=yes'
- else
- ac_cv_use_zipstream='wxUSE_ZIPSTREAM=no'
- fi
-
-else
-
- 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_zipstream='wxUSE_ZIPSTREAM='$DEFAULT_wxUSE_ZIPSTREAM
-
-fi;
-
- eval "$ac_cv_use_zipstream"
- if test "$no_cache" != 1; then
- echo $ac_cv_use_zipstream >> ${wx_arg_cache_file}.tmp
- fi
-
- if test "$wxUSE_ZIPSTREAM" = 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
- 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-sound or --disable-sound was given.
+if test "${enable_sound+set}" = set; then
+ enableval="$enable_sound"
if test "$enableval" = yes; then
- ac_cv_use_catch_segvs='wxUSE_ON_FATAL_EXCEPTION=yes'
+ ac_cv_use_sound='wxUSE_SOUND=yes'
else
- ac_cv_use_catch_segvs='wxUSE_ON_FATAL_EXCEPTION=no'
+ ac_cv_use_sound='wxUSE_SOUND=no'
fi
else
- LINE=`grep "wxUSE_ON_FATAL_EXCEPTION" ${wx_arg_cache_file}`
+ LINE=`grep "wxUSE_SOUND" ${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_sound='wxUSE_SOUND='$DEFAULT_wxUSE_SOUND
fi;
- eval "$ac_cv_use_catch_segvs"
+ eval "$ac_cv_use_sound"
if test "$no_cache" != 1; then
- echo $ac_cv_use_catch_segvs >> ${wx_arg_cache_file}.tmp
+ echo $ac_cv_use_sound >> ${wx_arg_cache_file}.tmp
fi
- if test "$wxUSE_ON_FATAL_EXCEPTION" = yes; then
+ if test "$wxUSE_SOUND" = 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}-wxprintfv" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-wxprintfv... $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-wxprintfv or --disable-wxprintfv was given.
+if test "${enable_wxprintfv+set}" = set; then
+ enableval="$enable_wxprintfv"
if test "$enableval" = yes; then
- ac_cv_use_snglinst='wxUSE_SNGLINST_CHECKER=yes'
+ ac_cv_use_wxprintfv='wxUSE_EXPERIMENTAL_PRINTF=yes'
else
- ac_cv_use_snglinst='wxUSE_SNGLINST_CHECKER=no'
+ ac_cv_use_wxprintfv='wxUSE_EXPERIMENTAL_PRINTF=no'
fi
else
- LINE=`grep "wxUSE_SNGLINST_CHECKER" ${wx_arg_cache_file}`
+ 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_snglinst='wxUSE_SNGLINST_CHECKER='$DEFAULT_wxUSE_SNGLINST_CHECKER
+ ac_cv_use_wxprintfv='wxUSE_EXPERIMENTAL_PRINTF='$DEFAULT_wxUSE_EXPERIMENTAL_PRINTF
fi;
- eval "$ac_cv_use_snglinst"
+ eval "$ac_cv_use_wxprintfv"
if test "$no_cache" != 1; then
- echo $ac_cv_use_snglinst >> ${wx_arg_cache_file}.tmp
+ echo $ac_cv_use_wxprintfv >> ${wx_arg_cache_file}.tmp
fi
- if test "$wxUSE_SNGLINST_CHECKER" = yes; then
+ if test "$wxUSE_EXPERIMENTAL_PRINTF" = 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}-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
wxUSE_DRAG_AND_DROP=no
# Generic notebook requires tab dialog
DEFAULT_wxUSE_TABDIALOG=yes
- DEFAULT_wxUSE_TOOLBAR_NATIVE=no
DEFAULT_wxUSE_SCROLLBAR=no
DEFAULT_wxUSE_TOOLTIPS=no
DEFAULT_wxUSE_DRAGIMAGE=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
DEFAULT_DEFAULT_wxUSE_GTK=0
DEFAULT_DEFAULT_wxUSE_MOTIF=0
DEFAULT_DEFAULT_wxUSE_MSW=1
+ wxUSE_SHARED=no
fi
if test "$wxUSE_GUI" = "yes"; then
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
CC=winegcc
CXX=wineg++
RESCOMP=wrc
+ LDFLAGS_GUI="-mwindows"
fi
if test "$wants_win32" = 1 ; then
ac_compiler_gnu=$ac_cv_c_compiler_gnu
+echo "$as_me:$LINENO: checking for /usr/local/include in default include path" >&5
+echo $ECHO_N "checking for /usr/local/include in default include path... $ECHO_C" >&6
+GCC_SEARCHES_USR_LOCAL_INCLUDE="no"
+if test "$GCC" = "yes" ; then
+ echo | gcc -v -x c++ -E - 2>&1 | sed -n '/^#include </,$p' | \
+ sed -n '1,/End of search list\./p' | \
+ grep '^ */usr/local/include$' 2>&1 /dev/null \
+ && GCC_SEARCHES_USR_LOCAL_INCLUDE="yes"
+fi
+echo "$as_me:$LINENO: result: $GCC_SEARCHES_USR_LOCAL_INCLUDE" >&5
+echo "${ECHO_T}$GCC_SEARCHES_USR_LOCAL_INCLUDE" >&6
+
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
set dummy ${ac_tool_prefix}ranlib; ac_word=$2
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
-else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&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
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lfl $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 yywrap ();
-int
-main ()
-{
-yywrap ();
- ;
- 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_fl_yywrap=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_fl_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_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 $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-ll $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 yywrap ();
-int
-main ()
-{
-yywrap ();
- ;
- 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_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
-
-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
-
-fi
-
-fi
-
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
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
+ 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
else
RESPROGRAMOBJ="\${top_srcdir}/include/wx/os2/wx.res"
fi
- ;;
-esac
+ 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
+ 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 test "$wxUSE_MAC" = 1 -o "$wxUSE_COCOA" = 1; then
- echo "$as_me:$LINENO: checking for strings.h" >&5
-echo $ECHO_N "checking for strings.h... $ECHO_C" >&6
-if test "${ac_cv_header_strings_h+set}" = set; then
+int
+main ()
+{
+
+ #if (__GNUC__ < 3)
+ #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_gcc3=yes
+
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+ wx_cv_gcc3=no
+
+
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+
+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
+ LIBS="$LIBS -lstdcxx"
+ fi
+ ;;
+ *)
+
+
+
+ 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
+
+
+
+echo "$as_me:$LINENO: checking for strcasecmp() in string.h" >&5
+echo $ECHO_N "checking for strcasecmp() in string.h... $ECHO_C" >&6
+if test "${ac_cv_string_strcasecmp+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- ac_cv_header_strings_h=no
+
+ 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 <string.h>
+
+int
+main ()
+{
+
+ strcasecmp("foo", "bar");
+
+ ;
+ 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_string_strcasecmp=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_string_strcasecmp=no
+
fi
-echo "$as_me:$LINENO: result: $ac_cv_header_strings_h" >&5
-echo "${ECHO_T}$ac_cv_header_strings_h" >&6
- if test "$ac_cv_header_strings_h" = "no"; then
- echo "$as_me:$LINENO: result: forced no into cache" >&5
-echo "${ECHO_T}forced no into cache" >&6
- else
- { echo "$as_me:$LINENO: WARNING: strings.h is not compatible with Mac OS X" >&5
-echo "$as_me: WARNING: strings.h is not compatible with Mac OS X" >&2;}
- fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+
+fi
+echo "$as_me:$LINENO: result: $ac_cv_string_strcasecmp" >&5
+echo "${ECHO_T}$ac_cv_string_strcasecmp" >&6
+
+ if test x"$ac_cv_string_strcasecmp" = "xyes"; then
+ cat >>confdefs.h <<\_ACEOF
+#define HAVE_STRCASECMP_IN_STRING_H 1
+_ACEOF
+
+ else
+ echo "$as_me:$LINENO: checking for strcasecmp() in strings.h" >&5
+echo $ECHO_N "checking for strcasecmp() in strings.h... $ECHO_C" >&6
+if test "${ac_cv_strings_strcasecmp+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 <strings.h>
+
+int
+main ()
+{
+
+ strcasecmp("foo", "bar");
+
+ ;
+ 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_strings_strcasecmp=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_strings_strcasecmp=no
+
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+
fi
+echo "$as_me:$LINENO: result: $ac_cv_strings_strcasecmp" >&5
+echo "${ECHO_T}$ac_cv_strings_strcasecmp" >&6
+
+ if test x"$ac_cv_string_strcasecmp" = "xyes"; then
+ cat >>confdefs.h <<\_ACEOF
+#define HAVE_STRCASECMP_IN_STRINGS_H 1
+_ACEOF
+
+ else
+ { { echo "$as_me:$LINENO: error: No case-insensitive string comparison function found." >&5
+echo "$as_me: error: No case-insensitive string comparison function found." >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+ fi
+
+ 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
+
+ ;;
+esac
+
+
echo "$as_me:$LINENO: checking for ANSI C header files" >&5
echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
if test "${ac_cv_header_stdc+set}" = set; then
-for ac_header in strings.h
+for ac_header in stdlib.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
if eval "test \"\${$as_ac_Header+set}\" = set"; then
done
-
-for ac_header in stdlib.h
+for ac_header in malloc.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
if eval "test \"\${$as_ac_Header+set}\" = set"; then
done
-for ac_header in malloc.h
+for ac_header in unistd.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
if eval "test \"\${$as_ac_Header+set}\" = set"; then
done
-for ac_header in unistd.h
+for ac_header in wchar.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
if eval "test \"\${$as_ac_Header+set}\" = set"; then
done
-for ac_header in wchar.h
+if test "$ac_cv_header_wchar_h" != "yes"; then
+
+for ac_header in wcstr.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
if eval "test \"\${$as_ac_Header+set}\" = set"; then
done
+fi
-if test "$ac_cv_header_wchar_h" != "yes"; then
-for ac_header in wcstr.h
+for ac_header in fnmatch.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
if eval "test \"\${$as_ac_Header+set}\" = set"; then
done
+
+if test "x$ac_cv_header_fnmatch_h" = "xyes"; then
+
+for ac_func in fnmatch
+do
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+if eval "test \"\${$as_ac_var+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. */
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char $ac_func (); below.
+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+ <limits.h> exists even on freestanding compilers. */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+/* 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 $ac_func ();
+/* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+choke me
+#else
+char (*f) () = $ac_func;
+#endif
+#ifdef __cplusplus
+}
+#endif
+
+int
+main ()
+{
+return f != $ac_func;
+ ;
+ 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
+ eval "$as_ac_var=yes"
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+eval "$as_ac_var=no"
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+done
+
fi
-for ac_header in fnmatch.h
+for ac_header in langinfo.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
if eval "test \"\${$as_ac_Header+set}\" = set"; then
done
-if test "x$ac_cv_header_fnmatch_h" = "xyes"; then
-
-for ac_func in fnmatch
-do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$as_ac_var+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. */
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-/* 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 $ac_func ();
-/* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-choke me
-#else
-char (*f) () = $ac_func;
-#endif
-#ifdef __cplusplus
-}
-#endif
-
-int
-main ()
-{
-return f != $ac_func;
- ;
- 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
- eval "$as_ac_var=yes"
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-eval "$as_ac_var=no"
-fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-if test `eval echo '${'$as_ac_var'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-done
-
-fi
+case "${host}" in
+ *-pc-os2_emx | *-pc-os2-emx )
+ if test $ac_cv_header_langinfo_h = "yes"; then
+ LIBS="$LIBS -lintl"
+ fi
+ ;;
+esac
+if test "$wxUSE_GUI" = "yes"; then
+ if test "$wxUSE_UNIX" = "yes" -a "$wxUSE_PM" != 1; then
-for ac_header in langinfo.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
done
-case "${host}" in
- *-pc-os2_emx | *-pc-os2-emx )
- if test $ac_cv_header_langinfo_h = "yes"; then
- LIBS="$LIBS -lintl"
- fi
- ;;
-esac
-
-if test "$wxUSE_GUI" = "yes"; then
- if test "$wxUSE_UNIX" = "yes"; then
-
for ac_header in X11/XKBlib.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
- echo "$as_me:$LINENO: checking for $ac_header" >&5
+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
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
else
- # Is the header compilable?
-echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
+ 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
+
+ #if HAVE_X11_XLIB_H
+ #include <X11/Xlib.h>
+ #endif
+
+
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- ac_header_compiler=yes
+ eval "$as_ac_Header=yes"
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_header_compiler=no
+eval "$as_ac_Header=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 $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header 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 <$ac_header>
-_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: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: 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: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: 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 $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
- eval "$as_ac_Header=$ac_header_preproc"
fi
echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-
-fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-
-case "${host}" in
- arm-*-linux* )
- echo "$as_me:$LINENO: checking for long long" >&5
-echo $ECHO_N "checking for long long... $ECHO_C" >&6
-if test "${ac_cv_type_long_long+set}" = set; then
+echo "$as_me:$LINENO: checking for size_t" >&5
+echo $ECHO_N "checking for size_t... $ECHO_C" >&6
+if test "${ac_cv_type_size_t+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
int
main ()
{
-if ((long long *) 0)
+if ((size_t *) 0)
return 0;
-if (sizeof (long long))
+if (sizeof (size_t))
return 0;
;
return 0;
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- ac_cv_type_long_long=yes
+ ac_cv_type_size_t=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_type_long_long=no
+ac_cv_type_size_t=no
fi
rm -f conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_type_long_long" >&5
-echo "${ECHO_T}$ac_cv_type_long_long" >&6
+echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
+echo "${ECHO_T}$ac_cv_type_size_t" >&6
-echo "$as_me:$LINENO: checking size of long long" >&5
-echo $ECHO_N "checking size of long long... $ECHO_C" >&6
-if test "${ac_cv_sizeof_long_long+set}" = set; then
+echo "$as_me:$LINENO: checking size of size_t" >&5
+echo $ECHO_N "checking size of size_t... $ECHO_C" >&6
+if test "${ac_cv_sizeof_size_t+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- if test "$ac_cv_type_long_long" = yes; then
+ if test "$ac_cv_type_size_t" = yes; then
# The cast to unsigned long works around a bug in the HP C Compiler
# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
int
main ()
{
-static int test_array [1 - 2 * !(((long) (sizeof (long long))) >= 0)];
+static int test_array [1 - 2 * !(((long) (sizeof (size_t))) >= 0)];
test_array [0] = 0
;
int
main ()
{
-static int test_array [1 - 2 * !(((long) (sizeof (long long))) <= $ac_mid)];
+static int test_array [1 - 2 * !(((long) (sizeof (size_t))) <= $ac_mid)];
test_array [0] = 0
;
int
main ()
{
-static int test_array [1 - 2 * !(((long) (sizeof (long long))) < 0)];
+static int test_array [1 - 2 * !(((long) (sizeof (size_t))) < 0)];
test_array [0] = 0
;
int
main ()
{
-static int test_array [1 - 2 * !(((long) (sizeof (long long))) >= $ac_mid)];
+static int test_array [1 - 2 * !(((long) (sizeof (size_t))) >= $ac_mid)];
test_array [0] = 0
;
int
main ()
{
-static int test_array [1 - 2 * !(((long) (sizeof (long long))) <= $ac_mid)];
+static int test_array [1 - 2 * !(((long) (sizeof (size_t))) <= $ac_mid)];
test_array [0] = 0
;
rm -f conftest.$ac_objext conftest.$ac_ext
done
case $ac_lo in
-?*) ac_cv_sizeof_long_long=$ac_lo;;
-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (long long), 77
+?*) ac_cv_sizeof_size_t=$ac_lo;;
+'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (size_t), 77
See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (long long), 77
+echo "$as_me: error: cannot compute sizeof (size_t), 77
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; } ;;
esac
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-long longval () { return (long) (sizeof (long long)); }
-unsigned long ulongval () { return (long) (sizeof (long long)); }
+long longval () { return (long) (sizeof (size_t)); }
+unsigned long ulongval () { return (long) (sizeof (size_t)); }
#include <stdio.h>
#include <stdlib.h>
int
FILE *f = fopen ("conftest.val", "w");
if (! f)
exit (1);
- if (((long) (sizeof (long long))) < 0)
+ if (((long) (sizeof (size_t))) < 0)
{
long i = longval ();
- if (i != ((long) (sizeof (long long))))
+ if (i != ((long) (sizeof (size_t))))
exit (1);
fprintf (f, "%ld\n", i);
}
else
{
unsigned long i = ulongval ();
- if (i != ((long) (sizeof (long long))))
+ if (i != ((long) (sizeof (size_t))))
exit (1);
fprintf (f, "%lu\n", i);
}
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- ac_cv_sizeof_long_long=`cat conftest.val`
+ ac_cv_sizeof_size_t=`cat conftest.val`
else
echo "$as_me: program exited with status $ac_status" >&5
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status )
-{ { echo "$as_me:$LINENO: error: cannot compute sizeof (long long), 77
+{ { echo "$as_me:$LINENO: error: cannot compute sizeof (size_t), 77
See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (long long), 77
+echo "$as_me: error: cannot compute sizeof (size_t), 77
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
fi
fi
rm -f conftest.val
else
- ac_cv_sizeof_long_long=0
+ ac_cv_sizeof_size_t=0
fi
fi
-echo "$as_me:$LINENO: result: $ac_cv_sizeof_long_long" >&5
-echo "${ECHO_T}$ac_cv_sizeof_long_long" >&6
+echo "$as_me:$LINENO: result: $ac_cv_sizeof_size_t" >&5
+echo "${ECHO_T}$ac_cv_sizeof_size_t" >&6
cat >>confdefs.h <<_ACEOF
-#define SIZEOF_LONG_LONG $ac_cv_sizeof_long_long
+#define SIZEOF_SIZE_T $ac_cv_sizeof_size_t
_ACEOF
- ;;
- *-hp-hpux* )
+
+case "${host}" in
+ arm-*-linux* )
+ echo "$as_me:$LINENO: checking for long long" >&5
+echo $ECHO_N "checking for long long... $ECHO_C" >&6
+if test "${ac_cv_type_long_long+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. */
+$ac_includes_default
+int
+main ()
+{
+if ((long long *) 0)
+ return 0;
+if (sizeof (long long))
+ return 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
+ ac_cv_type_long_long=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_type_long_long=no
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: $ac_cv_type_long_long" >&5
+echo "${ECHO_T}$ac_cv_type_long_long" >&6
+
+echo "$as_me:$LINENO: checking size of long long" >&5
+echo $ECHO_N "checking size of long long... $ECHO_C" >&6
+if test "${ac_cv_sizeof_long_long+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ if test "$ac_cv_type_long_long" = yes; then
+ # The cast to unsigned long works around a bug in the HP C Compiler
+ # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+ # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+ # This bug is HP SR number 8606223364.
+ if test "$cross_compiling" = yes; then
+ # Depending upon the size, compute the lo and hi bounds.
+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
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long) (sizeof (long long))) >= 0)];
+test_array [0] = 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
+ ac_lo=0 ac_mid=0
+ while :; do
+ 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
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long) (sizeof (long long))) <= $ac_mid)];
+test_array [0] = 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
+ ac_hi=$ac_mid; break
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_lo=`expr $ac_mid + 1`
+ if test $ac_lo -le $ac_mid; then
+ ac_lo= ac_hi=
+ break
+ fi
+ ac_mid=`expr 2 '*' $ac_mid + 1`
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+ done
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+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
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long) (sizeof (long long))) < 0)];
+test_array [0] = 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
+ ac_hi=-1 ac_mid=-1
+ while :; do
+ 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
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long) (sizeof (long long))) >= $ac_mid)];
+test_array [0] = 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
+ ac_lo=$ac_mid; break
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_hi=`expr '(' $ac_mid ')' - 1`
+ if test $ac_mid -le $ac_hi; then
+ ac_lo= ac_hi=
+ break
+ fi
+ ac_mid=`expr 2 '*' $ac_mid`
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+ done
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_lo= ac_hi=
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+# Binary search between lo and hi bounds.
+while test "x$ac_lo" != "x$ac_hi"; do
+ ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
+ 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
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long) (sizeof (long long))) <= $ac_mid)];
+test_array [0] = 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
+ ac_hi=$ac_mid
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_lo=`expr '(' $ac_mid ')' + 1`
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+done
+case $ac_lo in
+?*) ac_cv_sizeof_long_long=$ac_lo;;
+'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (long long), 77
+See \`config.log' for more details." >&5
+echo "$as_me: error: cannot compute sizeof (long long), 77
+See \`config.log' for more details." >&2;}
+ { (exit 1); exit 1; }; } ;;
+esac
+else
+ if test "$cross_compiling" = yes; then
+ { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+See \`config.log' for more details." >&5
+echo "$as_me: error: cannot run test program while cross compiling
+See \`config.log' for more details." >&2;}
+ { (exit 1); exit 1; }; }
+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. */
+$ac_includes_default
+long longval () { return (long) (sizeof (long long)); }
+unsigned long ulongval () { return (long) (sizeof (long long)); }
+#include <stdio.h>
+#include <stdlib.h>
+int
+main ()
+{
+
+ FILE *f = fopen ("conftest.val", "w");
+ if (! f)
+ exit (1);
+ if (((long) (sizeof (long long))) < 0)
+ {
+ long i = longval ();
+ if (i != ((long) (sizeof (long long))))
+ exit (1);
+ fprintf (f, "%ld\n", i);
+ }
+ else
+ {
+ unsigned long i = ulongval ();
+ if (i != ((long) (sizeof (long long))))
+ exit (1);
+ fprintf (f, "%lu\n", i);
+ }
+ exit (ferror (f) || fclose (f) != 0);
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f 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='./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_sizeof_long_long=`cat conftest.val`
+else
+ echo "$as_me: program exited with status $ac_status" >&5
+echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+( exit $ac_status )
+{ { echo "$as_me:$LINENO: error: cannot compute sizeof (long long), 77
+See \`config.log' for more details." >&5
+echo "$as_me: error: cannot compute sizeof (long long), 77
+See \`config.log' for more details." >&2;}
+ { (exit 1); exit 1; }; }
+fi
+rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+fi
+fi
+rm -f conftest.val
+else
+ ac_cv_sizeof_long_long=0
+fi
+fi
+echo "$as_me:$LINENO: result: $ac_cv_sizeof_long_long" >&5
+echo "${ECHO_T}$ac_cv_sizeof_long_long" >&6
+cat >>confdefs.h <<_ACEOF
+#define SIZEOF_LONG_LONG $ac_cv_sizeof_long_long
+_ACEOF
+
+
+ ;;
+ *-hp-hpux* )
echo "$as_me:$LINENO: checking for long long" >&5
echo $ECHO_N "checking for long long... $ECHO_C" >&6
if test "${ac_cv_type_long_long+set}" = set; then
fi
-
ac_ext=cc
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
fi
+echo "$as_me:$LINENO: checking whether the compiler supports static_cast<>" >&5
+echo $ECHO_N "checking whether the compiler supports static_cast<>... $ECHO_C" >&6
+if test "${ac_cv_cxx_static_cast+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 <typeinfo>
+class Base { public : Base () {} virtual void f () = 0; };
+class Derived : public Base { public : Derived () {} virtual void f () {} };
+int g (Derived&) { return 0; }
+int
+main ()
+{
+
+Derived d; Base& b = d; Derived& s = static_cast<Derived&> (b); return g (s);
+ ;
+ 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
+ ac_cv_cxx_static_cast=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_cxx_static_cast=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: $ac_cv_cxx_static_cast" >&5
+echo "${ECHO_T}$ac_cv_cxx_static_cast" >&6
+if test "$ac_cv_cxx_static_cast" = yes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_STATIC_CAST
+_ACEOF
+
+fi
+
if test "$wxUSE_STL" = "yes"; then
ac_ext=cc
SEARCH_INCLUDE="\
/usr/local/include \
\
- /usr/Motif-1.2/include \
/usr/Motif-2.1/include \
- \
+ /usr/Motif-1.2/include \
/usr/include/Motif1.2 \
/opt/xpm/include/X11 \
/opt/GBxpm/include/ \
/opt/GBxpm/X11/include/ \
\
- /usr/Motif1.2/include \
/usr/dt/include \
/usr/openwin/include \
\
/usr/include/qt \
/usr/local/include/qt \
\
+ /usr/local/arm/3.3.2/include \
+ \
/usr/include/windows \
/usr/include/wine \
/usr/local/include/wine \
\
/usr/openwin/share/include"
-SEARCH_LIB="`echo "$SEARCH_INCLUDE" | sed s/include/lib/g` "
+SEARCH_LIB="/usr/lib /usr/lib32 `echo "$SEARCH_INCLUDE" | sed s/include/lib/g` /usr/lib64 /usr/X11R6/lib64"
cat >confcache <<\_ACEOF
-REGEX_INCLUDE=
if test "$wxUSE_REGEX" != "no"; then
cat >>confdefs.h <<\_ACEOF
#define wxUSE_REGEX 1
_ACEOF
+ if test "$wxUSE_UNICODE" = "yes" -a "$wxUSE_REGEX" = "yes"; then
+ { echo "$as_me:$LINENO: WARNING: Defaulting to the the builtin regex library for Unicode build." >&5
+echo "$as_me: WARNING: Defaulting to the the builtin regex library for Unicode build." >&2;}
+ wxUSE_REGEX=builtin
+ fi
+
if test "$wxUSE_REGEX" = "sys" -o "$wxUSE_REGEX" = "yes" ; then
if test "${ac_cv_header_regex_h+set}" = set; then
echo "$as_me:$LINENO: checking for regex.h" >&5
fi
else
wxUSE_REGEX=sys
- fi
- fi
+ cat >>confdefs.h <<\_ACEOF
+#define WX_NO_REGEX_ADVANCED 1
+_ACEOF
- if test "$wxUSE_REGEX" = "builtin" ; then
- REGEX_INCLUDE="-I\${top_srcdir}/src/regex"
+ fi
fi
fi
-ZLIB_INCLUDE=
ZLIB_LINK=
if test "$wxUSE_ZLIB" != "no" ; then
cat >>confdefs.h <<\_ACEOF
wxUSE_ZLIB=sys
fi
fi
-
- if test "$wxUSE_ZLIB" = "builtin" ; then
- ZLIB_INCLUDE="-I\${top_srcdir}/src/zlib"
- fi
fi
-PNG_INCLUDE=
PNG_LINK=
if test "$wxUSE_LIBPNG" != "no" ; then
cat >>confdefs.h <<\_ACEOF
fi
fi
- if test "$wxUSE_LIBPNG" = "builtin" ; then
- PNG_INCLUDE="-I\${top_srcdir}/src/png"
- fi
-
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS png"
fi
-JPEG_INCLUDE=
JPEG_LINK=
if test "$wxUSE_LIBJPEG" != "no" ; then
cat >>confdefs.h <<\_ACEOF
fi
fi
fi
-
- if test "$wxUSE_LIBJPEG" = "builtin" ; then
- JPEG_INCLUDE="-I\${top_srcdir}/src/jpeg"
- fi
fi
-TIFF_INCLUDE=
TIFF_LINK=
TIFF_PREREQ_LINKS=-lm
if test "$wxUSE_LIBTIFF" != "no" ; then
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
wxUSE_LIBTIFF=sys
fi
fi
-
- if test "$wxUSE_LIBTIFF" = "builtin" ; then
- TIFF_INCLUDE="-I\${top_srcdir}/src/tiff"
- fi
fi
if test "$wxUSE_EXPAT" != "no"; then
- wxUSE_XML=1
+ wxUSE_XML=yes
cat >>confdefs.h <<\_ACEOF
#define wxUSE_EXPAT 1
_ACEOF
+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
+## ------------------------------------ ##
+## Report this to bug-autoconf@gnu.org. ##
+## ------------------------------------ ##
+_ASBOX
+ ) |
+ sed "s/^/$as_me: WARNING: /" >&2
+ ;;
+ no:yes )
+ { 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
+## ------------------------------------ ##
+## Report this to bug-autoconf@gnu.org. ##
+## ------------------------------------ ##
+_ASBOX
+ ) |
+ sed "s/^/$as_me: WARNING: /" >&2
+ ;;
+esac
+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_mspack_h=$ac_header_preproc
+fi
+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_mspack_h = yes; then
+ found_mspack_h=1
+fi
+
+
+ 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="-lmspack $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 mspack_create_chm_decompressor ();
+int
+main ()
+{
+mspack_create_chm_decompressor ();
+ ;
+ 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_mspack_mspack_create_chm_decompressor=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+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_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
+ if test "x$MSPACK_LINK" = "x" ; then
+ wxUSE_LIBMSPACK=no
+ else
+ cat >>confdefs.h <<\_ACEOF
+#define wxUSE_LIBMSPACK 1
+_ACEOF
+
+ fi
+fi
+
+
+
AFMINSTALL=
WIN32INSTALL=
WXGTK12=
WXGTK127=
WXGTK20=
+ WXGPE=
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
fi
+
+
+ if test "$wxUSE_GPE" = "yes"; then
+ echo "$as_me:$LINENO: checking for gpewidget library" >&5
+echo $ECHO_N "checking for gpewidget 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/libgpewidget.$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="-L${prefix}/lib -lgpewidget $GUI_TK_LIBRARY"
+ WXGPE=1
+ echo "$as_me:$LINENO: result: found at $ac_find_libraries" >&5
+echo "${ECHO_T}found at $ac_find_libraries" >&6
+ else
+ echo "$as_me:$LINENO: result: not found" >&5
+echo "${ECHO_T}not found" >&6
+ fi
+
+ fi
fi
if test "$wxUSE_MGL" = 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
TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D__NANOX__ -DMWPIXEL_FORMAT=MWPF_TRUECOLOR0888 -DHAVE_FILEIO -DHAVE_BMP_SUPPORT=1 -DHAVE_GIF_SUPPORT=1 -DHAVE_PNM_SUPPORT=1 -DHAVE_XPM_SUPPORT=1 -DUNIX=1 -DUSE_EXPOSURE -DSCREEN_HEIGHT=480 -DSCREEN_WIDTH=640 -DSCREEN_DEPTH=4 -DX11=1"
GUI_TK_LIBRARY="$GUI_TK_LIBRARY \$(MICROWIN)/src/lib/libnano-X.a"
else
- GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lX11$xpm_link"
+ GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lX11"
fi
TOOLKIT_VPATH="\${top_srcdir}/src/x11"
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"
+ LIBS="$GUI_TK_LIBRARY -lXm ${libp} -lXmu -lXext -lXt${libsm_ice} -lX11"
save_CFLAGS=$CFLAGS
CFLAGS="$CFLAGS $TOOLKIT_INCLUDE"
rm -f conftest.$ac_objext conftest.$ac_ext
CFLAGS=$save_CFLAGS
- GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lXm$xpm_link${libp_link} -lXmu -lXext -lXt${libsm_ice_link} -lX11"
+ GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lXm${libp_link} -lXmu -lXext -lXt${libsm_ice_link} -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
- 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
+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 >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
- #include <X11/Xlib.h>
- #include <X11/extensions/shape.h>
+ #include <X11/xpm.h>
int
main ()
{
- int dummy1, dummy2;
- XShapeQueryExtension((Display*)NULL,
- (int*)NULL, (int*)NULL);
+ int version;
+ version = XpmLibraryVersion();
;
return 0;
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
- cat >>confdefs.h <<\_ACEOF
+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
+ GUI_TK_LIBRARY="$GUI_TK_LIBRARY -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 $ECHO_N "checking for X11/extensions/shape.h... $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 <X11/Xlib.h>
+ #include <X11/extensions/shape.h>
+
+int
+main ()
+{
+
+ int dummy1, dummy2;
+ XShapeQueryExtension((Display*)NULL,
+ (int*)NULL, (int*)NULL);
+
+ ;
+ 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
+
+ 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 "$TOOLKIT" != "MSW" ; then
- if test "$wxUSE_ODBC" != "no" ; then
- cat >>confdefs.h <<\_ACEOF
-#define wxUSE_ODBC 1
-_ACEOF
-
- SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS db"
-
- WXODBCFLAG="-D_IODBC_"
-
-
- if test "$wxUSE_ODBC" = "sys" ; then
+ if test "$wxUSE_ODBC" = "sys" -o "$wxUSE_ODBC" = "yes" ; then
- if test "${ac_cv_header_sql_h+set}" = set; then
+ if test "${ac_cv_header_sql_h+set}" = set; then
echo "$as_me:$LINENO: checking for sql.h" >&5
echo $ECHO_N "checking for sql.h... $ECHO_C" >&6
if test "${ac_cv_header_sql_h+set}" = set; then
echo "$as_me:$LINENO: result: $ac_cv_header_sql_h" >&5
echo "${ECHO_T}$ac_cv_header_sql_h" >&6
+fi
+if test $ac_cv_header_sql_h = yes; then
+ found_sql_h=1
fi
- echo "$as_me:$LINENO: checking for library containing SQLAllocEnv" >&5
-echo $ECHO_N "checking for library containing SQLAllocEnv... $ECHO_C" >&6
-if test "${ac_cv_search_SQLAllocEnv+set}" = set; then
+ if test "x$found_sql_h" = "x1" ; 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_func_search_save_LIBS=$LIBS
-ac_cv_search_SQLAllocEnv=no
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-liodbc $LIBS"
cat >conftest.$ac_ext <<_ACEOF
#line $LINENO "configure"
/* confdefs.h. */
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- ac_cv_search_SQLAllocEnv="none required"
+ ac_cv_lib_iodbc_SQLAllocEnv=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+ac_cv_lib_iodbc_SQLAllocEnv=no
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-if test "$ac_cv_search_SQLAllocEnv" = no; then
- for ac_lib in iodbc unixodbc odbc ; do
- LIBS="-l$ac_lib $ac_func_search_save_LIBS"
- cat >conftest.$ac_ext <<_ACEOF
+LIBS=$ac_check_lib_save_LIBS
+fi
+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 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="-lunixodbc $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- ac_cv_search_SQLAllocEnv="-l$ac_lib"
-break
+ ac_cv_lib_unixodbc_SQLAllocEnv=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+ac_cv_lib_unixodbc_SQLAllocEnv=no
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- done
-fi
-LIBS=$ac_func_search_save_LIBS
+LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:$LINENO: result: $ac_cv_search_SQLAllocEnv" >&5
-echo "${ECHO_T}$ac_cv_search_SQLAllocEnv" >&6
-if test "$ac_cv_search_SQLAllocEnv" != no; then
- test "$ac_cv_search_SQLAllocEnv" = "none required" || LIBS="$ac_cv_search_SQLAllocEnv $LIBS"
+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 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="-lodbc $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 SQLAllocEnv ();
+int
+main ()
+{
+SQLAllocEnv ();
+ ;
+ 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_odbc_SQLAllocEnv=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+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_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
+
+
+fi
- wxUSE_ODBC=builtin;
- { echo "$as_me:$LINENO: WARNING: can't find system Odbc library falling back to builtin " >&5
-echo "$as_me: WARNING: can't find system Odbc library falling back to builtin " >&2;}
fi
fi
- if test "$wxUSE_ODBC" != "sys" ; then
- ALL_OBJECTS="${ALL_OBJECTS} \$(IODBCOBJS)"
+ if test "x$ODBC_LINK" = "x" ; then
+ if test "$wxUSE_ODBC" = "sys" ; then
+ { { echo "$as_me:$LINENO: error: system ODBC library not found! Use --with-odbc=builtin to use built-in version" >&5
+echo "$as_me: error: system ODBC library not found! Use --with-odbc=builtin to use built-in version" >&2;}
+ { (exit 1); exit 1; }; }
+ else
+ { echo "$as_me:$LINENO: WARNING: system ODBC library not found, will use built-in instead" >&5
+echo "$as_me: WARNING: system ODBC library not found, will use built-in instead" >&2;}
+ wxUSE_ODBC=builtin
+ fi
+ else
+ wxUSE_ODBC=sys
fi
-
fi
+ if test "$wxUSE_ODBC" != "no" ; then
+ cat >>confdefs.h <<\_ACEOF
+#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_"
+ fi
fi
if test "$wxUSE_REGEX" = "builtin" ; then
ALL_OBJECTS="${ALL_OBJECTS} \$(ZLIBOBJS)"
fi
+if test "$wxUSE_DISPLAY" = "yes"; then
+ if test "$wxUSE_UNIX" = "yes" -a "$wxUSE_MAC" != 1; then
+ echo "$as_me:$LINENO: checking for Xinerama" >&5
+echo $ECHO_N "checking for Xinerama... $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/libXinerama.$ac_extension"; then
+ ac_find_libraries=$ac_dir
+ break 2
+ fi
+ done
+ done
+
+ if test "$ac_find_libraries" != "" ; then
+
+ echo "$LDFLAGS" | 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
+
+ if test "$ac_path_to_link" != " -L/usr/lib" ; then
+ LDFLAGS="$LDFLAGS $ac_path_to_link"
+ fi
+ GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lXinerama"
+ echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+
+ echo "$as_me:$LINENO: checking for Xxf86vm extension" >&5
+echo $ECHO_N "checking for Xxf86vm extension... $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/libXxf86vm.$ac_extension"; then
+ ac_find_libraries=$ac_dir
+ break 2
+ fi
+ done
+ done
+
+ if test "$ac_find_libraries" != "" ; then
+ echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+
+for ac_header in X11/extensions/xf86vmode.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
+
+ GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lXxf86vm"
+
+fi
+
+done
+
+ else
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+ fi
+
+ else
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: WARNING: \"*** Xinerama not found; disabling wxDisplay\"" >&5
+echo "$as_me: WARNING: \"*** Xinerama not found; disabling wxDisplay\"" >&2;}
+ wxUSE_DISPLAY="no"
+ fi
+ fi
+fi
+
USE_OPENGL=0
if test "$wxUSE_OPENGL" = "yes"; then
if test "$ac_find_includes" != "" ; then
echo "$as_me:$LINENO: result: found in $ac_find_includes" >&5
echo "${ECHO_T}found in $ac_find_includes" >&6
- set -x
if test "x$ac_find_includes" = "x/usr/include"; then
ac_path_to_include=""
fi
CPPFLAGS="$CPPFLAGS$ac_path_to_include"
- set +x
fi
if test "${ac_cv_header_GL_gl_h+set}" = set; then
fi
fi
- if "$found_gl" != 1; then
+ if test "$found_gl" != 1; then
echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6
echo "$as_me:$LINENO: checking for -lMesaGL" >&5
#define wxUSE_GLCANVAS 1
_ACEOF
- SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS opengl"
+ SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS opengl opengl/cube opengl/penguin opengl/isosurf"
fi
fi
WX_LIBRARY_LINK1_GL="lib${WX_LIBRARY_GL}.${WX_CURRENT}.${SO_SUFFIX}"
WX_LIBRARY_LINK2_GL="lib${WX_LIBRARY_GL}.${SO_SUFFIX}"
- if test "$wxUSE_MAC" = 1; then
- WX_RESOURCES_MACOSX_ASCII="lib${WX_LIBRARY}.${WX_CURRENT}.r"
+ if test "$wxUSE_MAC" = 1 -o "$wxUSE_COCOA" = "1"; then
+ WX_RESOURCES_MACOSX_ASCII="lib${WX_LIBRARY}.${WX_CURRENT}.r"
WX_RESOURCES_MACOSX_DATA="lib${WX_LIBRARY}.${WX_CURRENT}.rsrc"
fi
;;
case "${host}" in
*-*-linux* | *-*-gnu* )
SAMPLES_RPATH_FLAG="-Wl,-rpath,\$(top_builddir)lib"
- ;;
+ ;;
*-*-solaris2* )
if test "$GCC" = yes ; then
SAMPLES_RPATH_FLAG="-R\$(top_builddir)lib"
fi
;;
+
+ powerpc-*-darwin* )
+ 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 "x$WX_TARGET_LIBRARY" = "x"; then
STATIC_FLAG="no"
fi
-MACRESCOMP="@#"
-MACSETFILE="@#"
-MACRESWXCONFIG="#"
-if test "$wxUSE_MAC" = 1; then
+if test "$wxUSE_MAC" = 1 -o "$wxUSE_COCOA" = 1; then
LIBWXMACRES="\$(top_builddir)lib/${WX_RESOURCES_MACOSX_ASCII}"
WX_ALL="${WX_ALL} ${LIBWXMACRES}"
WX_ALL_INSTALLED="${WX_ALL_INSTALLED} preinstall_res"
+
# Extract the first word of "Rez", so it can be a program name with args.
set dummy Rez; ac_word=$2
echo "$as_me:$LINENO: checking for $ac_word" >&5
echo "${ECHO_T}no" >&6
fi
- MACOSX_BUNDLE="bundle"
- MACRESCOMP="\$(RESCOMP) -d __DARWIN__ -t APPL Carbon.r ${LIBWXMACRES} -o"
- MACSETFILE="\$(SETFILE)"
- MACRESWXCONFIG="${RESCOMP} -d __DARWIN__ -t APPL Carbon.r \${exec_prefix}/lib/${WX_RESOURCES_MACOSX_ASCII} -o"
-elif test "$wxUSE_COCOA" = 1; then
- # Extract the first word of "Rez", so it can be a program name with args.
-set dummy Rez; 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_RESCOMP+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- if test -n "$RESCOMP"; then
- ac_cv_prog_RESCOMP="$RESCOMP" # 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_RESCOMP="Rez"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-
- test -z "$ac_cv_prog_RESCOMP" && ac_cv_prog_RESCOMP="/Developer/Tools/Rez"
-fi
-fi
-RESCOMP=$ac_cv_prog_RESCOMP
-if test -n "$RESCOMP"; then
- echo "$as_me:$LINENO: result: $RESCOMP" >&5
-echo "${ECHO_T}$RESCOMP" >&6
-else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
- # Extract the first word of "DeRez", so it can be a program name with args.
-set dummy DeRez; 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_DEREZ+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- if test -n "$DEREZ"; then
- ac_cv_prog_DEREZ="$DEREZ" # 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_DEREZ="DeRez"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
- test -z "$ac_cv_prog_DEREZ" && ac_cv_prog_DEREZ="/Developer/Tools/DeRez"
-fi
-fi
-DEREZ=$ac_cv_prog_DEREZ
-if test -n "$DEREZ"; then
- echo "$as_me:$LINENO: result: $DEREZ" >&5
-echo "${ECHO_T}$DEREZ" >&6
-else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
+ MACSETFILE="\$(SETFILE)"
- # Extract the first word of "SetFile", so it can be a program name with args.
-set dummy SetFile; 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_SETFILE+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- if test -n "$SETFILE"; then
- ac_cv_prog_SETFILE="$SETFILE" # 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_SETFILE="SetFile"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
+ if test "$wxUSE_MAC" = 1; then
+ MACRESCOMP="\$(RESCOMP) -d __DARWIN__ -t APPL Carbon.r ${LIBWXMACRES} -o"
- test -z "$ac_cv_prog_SETFILE" && ac_cv_prog_SETFILE="/Developer/Tools/SetFile"
-fi
-fi
-SETFILE=$ac_cv_prog_SETFILE
-if test -n "$SETFILE"; then
- echo "$as_me:$LINENO: result: $SETFILE" >&5
-echo "${ECHO_T}$SETFILE" >&6
+ MACRESWXCONFIG="${RESCOMP} -d __DARWIN__ -t APPL Carbon.r \\\${exec_prefix}/lib/${WX_RESOURCES_MACOSX_ASCII} -o"
+ else
+ MACRESCOMP="echo -n | \$(RESCOMP) -d __DARWIN__ -t APPL ${LIBWXMACRES} -o"
+ MACRESWXCONFIG="echo -n \\\| ${RESCOMP} -d __DARWIN__ -t APPL \\\${exec_prefix}/lib/${WX_RESOURCES_MACOSX_ASCII} -o"
+ fi
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
+ MACSETFILE="@#"
+ MACRESWXCONFIG="#"
- MACRESCOMP="echo -n | \$(RESCOMP) -d __DARWIN__ -t APPL ${LIBWXMACRES} -o"
- MACSETFILE="\$(SETFILE)"
- MACRESWXCONFIG="echo -n | ${RESCOMP} -d __DARWIN__ -t APPL \${exec_prefix}/lib/${WX_RESOURCES_MACOSX_ASCII} -o"
-else
- if test "$wxUSE_PM" = 1; then
+ if test "$wxUSE_PM" = 1; then
MACRESCOMP="emxbind -ep"
+ else
+ MACRESCOMP="@#"
fi
fi
+
echo "$as_me:$LINENO: checking for mode_t" >&5
echo $ECHO_N "checking for mode_t... $ECHO_C" >&6
if test "${ac_cv_type_mode_t+set}" = set; then
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
-ESD_LINK=
-if test "${ac_cv_header_esd_h+set}" = set; then
- echo "$as_me:$LINENO: checking for esd.h" >&5
-echo $ECHO_N "checking for esd.h... $ECHO_C" >&6
-if test "${ac_cv_header_esd_h+set}" = set; then
+EXTRALIBS_ESD=
+echo "$as_me:$LINENO: checking for esd_close in -lesd" >&5
+echo $ECHO_N "checking for esd_close in -lesd... $ECHO_C" >&6
+if test "${ac_cv_lib_esd_esd_close+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lesd $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 esd_close ();
+int
+main ()
+{
+esd_close ();
+ ;
+ 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_esd_esd_close=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_esd_esd_close=no
fi
-echo "$as_me:$LINENO: result: $ac_cv_header_esd_h" >&5
-echo "${ECHO_T}$ac_cv_header_esd_h" >&6
+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_esd_esd_close" >&5
+echo "${ECHO_T}$ac_cv_lib_esd_esd_close" >&6
+if test $ac_cv_lib_esd_esd_close = yes; then
+
+
+for ac_header in esd.h
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+ 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
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
else
# Is the header compilable?
-echo "$as_me:$LINENO: checking esd.h usability" >&5
-echo $ECHO_N "checking esd.h usability... $ECHO_C" >&6
+echo "$as_me:$LINENO: checking $ac_header usability" >&5
+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
cat >conftest.$ac_ext <<_ACEOF
#line $LINENO "configure"
/* confdefs.h. */
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-#include <esd.h>
+#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
echo "${ECHO_T}$ac_header_compiler" >&6
# Is the header present?
-echo "$as_me:$LINENO: checking esd.h presence" >&5
-echo $ECHO_N "checking esd.h presence... $ECHO_C" >&6
+echo "$as_me:$LINENO: checking $ac_header presence" >&5
+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
cat >conftest.$ac_ext <<_ACEOF
#line $LINENO "configure"
/* confdefs.h. */
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-#include <esd.h>
+#include <$ac_header>
_ACEOF
if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc in
yes:no )
- { echo "$as_me:$LINENO: WARNING: esd.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: esd.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: esd.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: esd.h: proceeding with the preprocessor's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
(
cat <<\_ASBOX
## ------------------------------------ ##
sed "s/^/$as_me: WARNING: /" >&2
;;
no:yes )
- { echo "$as_me:$LINENO: WARNING: esd.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: esd.h: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: esd.h: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: esd.h: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: esd.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: esd.h: proceeding with the preprocessor's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
(
cat <<\_ASBOX
## ------------------------------------ ##
sed "s/^/$as_me: WARNING: /" >&2
;;
esac
-echo "$as_me:$LINENO: checking for esd.h" >&5
-echo $ECHO_N "checking for esd.h... $ECHO_C" >&6
-if test "${ac_cv_header_esd_h+set}" = set; then
+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
- ac_cv_header_esd_h=$ac_header_preproc
+ eval "$as_ac_Header=$ac_header_preproc"
fi
-echo "$as_me:$LINENO: result: $ac_cv_header_esd_h" >&5
-echo "${ECHO_T}$ac_cv_header_esd_h" >&6
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
fi
-if test $ac_cv_header_esd_h = yes; then
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
- echo "$as_me:$LINENO: checking for esd_close in -lesd" >&5
-echo $ECHO_N "checking for esd_close in -lesd... $ECHO_C" >&6
-if test "${ac_cv_lib_esd_esd_close+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lesd $LIBS"
+ EXTRALIBS_ESD="-lesd"
+
+fi
+
+done
+
+
+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. */
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
-/* 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 esd_close ();
int
main ()
{
-esd_close ();
+struct cdrom_tocentry entry, old_entry;
;
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_esd_esd_close=yes
+ 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
-ac_cv_lib_esd_esd_close=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_esd_esd_close" >&5
-echo "${ECHO_T}$ac_cv_lib_esd_esd_close" >&6
-if test $ac_cv_lib_esd_esd_close = yes; then
-
- ESD_LINK="-lesd"
-
-fi
-
-
+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 "$WXGPE" = 1 ; then
+ cat >>confdefs.h <<_ACEOF
+#define __WXGPE__ $WXGPE
+_ACEOF
+
+fi
+
WXDEBUG=
if test "$wxUSE_DEBUG_INFO" = "yes" ; then
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_STL" = "yes"; then
- cat >>confdefs.h <<\_ACEOF
-#define wxUSE_STL 1
-_ACEOF
-
-fi
-
-if test "$wxUSE_APPLE_IEEE" = "yes"; then
- cat >>confdefs.h <<\_ACEOF
-#define wxUSE_APPLE_IEEE 1
-_ACEOF
-
-fi
-
-if test "$wxUSE_TIMER" = "yes"; then
- cat >>confdefs.h <<\_ACEOF
-#define wxUSE_TIMER 1
-_ACEOF
-
-fi
-
-if test "$wxUSE_WAVE" = "yes"; then
- cat >>confdefs.h <<\_ACEOF
-#define wxUSE_WAVE 1
-_ACEOF
-
-fi
-
-if test "$wxUSE_CMDLINE_PARSER" = "yes"; then
- cat >>confdefs.h <<\_ACEOF
-#define wxUSE_CMDLINE_PARSER 1
-_ACEOF
-
-fi
-
-if test "$wxUSE_STOPWATCH" = "yes"; then
- cat >>confdefs.h <<\_ACEOF
-#define wxUSE_STOPWATCH 1
-_ACEOF
-
-fi
-
-if test "$wxUSE_DATETIME" = "yes"; then
- cat >>confdefs.h <<\_ACEOF
-#define wxUSE_DATETIME 1
-_ACEOF
-
-fi
-
-if test "$wxUSE_FILE" = "yes"; then
- cat >>confdefs.h <<\_ACEOF
-#define wxUSE_FILE 1
-_ACEOF
-
-fi
-
-if test "$wxUSE_FFILE" = "yes"; then
- cat >>confdefs.h <<\_ACEOF
-#define wxUSE_FFILE 1
-_ACEOF
-
-fi
-
-if test "$wxUSE_FILESYSTEM" = "yes"; then
- cat >>confdefs.h <<\_ACEOF
-#define wxUSE_FILESYSTEM 1
-_ACEOF
-
-fi
-
-if test "$wxUSE_FS_ZIP" = "yes"; then
- cat >>confdefs.h <<\_ACEOF
-#define wxUSE_FS_ZIP 1
-_ACEOF
-
-fi
-
-if test "$wxUSE_ZIPSTREAM" = "yes"; then
- cat >>confdefs.h <<\_ACEOF
-#define wxUSE_ZIPSTREAM 1
-_ACEOF
-
-fi
-
-if test "$wxUSE_ON_FATAL_EXCEPTION" = "yes"; then
- cat >>confdefs.h <<\_ACEOF
-#define wxUSE_ON_FATAL_EXCEPTION 1
-_ACEOF
-
-fi
-
-if test "$wxUSE_SNGLINST_CHECKER" = "yes"; then
- cat >>confdefs.h <<\_ACEOF
-#define wxUSE_SNGLINST_CHECKER 1
-_ACEOF
-
-fi
-
-if test "$wxUSE_BUSYINFO" = "yes"; then
- cat >>confdefs.h <<\_ACEOF
-#define wxUSE_BUSYINFO 1
-_ACEOF
-
-fi
-
-if test "$wxUSE_STD_IOSTREAM" = "yes"; then
- cat >>confdefs.h <<\_ACEOF
-#define wxUSE_STD_IOSTREAM 1
-_ACEOF
-
-fi
-
-if test "$wxUSE_TEXTBUFFER" = "yes"; then
- cat >>confdefs.h <<\_ACEOF
-#define wxUSE_TEXTBUFFER 1
-_ACEOF
-
-fi
-
-if test "$wxUSE_TEXTFILE" = "yes"; then
- if test "$wxUSE_FILE" != "yes" -o "$wxUSE_TEXTBUFFER" != "yes" ; then
- { echo "$as_me:$LINENO: WARNING: wxTextFile requires wxFile and wxTextBuffer... disabled" >&5
-echo "$as_me: WARNING: wxTextFile requires wxFile and wxTextBuffer... disabled" >&2;}
- else
- cat >>confdefs.h <<\_ACEOF
-#define wxUSE_TEXTFILE 1
-_ACEOF
-
- fi
-fi
-
-if test "$wxUSE_CONFIG" = "yes" ; then
- if test "$wxUSE_TEXTFILE" != "yes"; then
- { echo "$as_me:$LINENO: WARNING: wxConfig requires wxTextFile... disabled" >&5
-echo "$as_me: WARNING: wxConfig requires wxTextFile... disabled" >&2;}
- else
- cat >>confdefs.h <<\_ACEOF
-#define wxUSE_CONFIG 1
-_ACEOF
-
- SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS config"
- fi
-fi
-
-if test "$wxUSE_INTL" = "yes" ; then
- if test "$wxUSE_FILE" != "yes"; then
- { echo "$as_me:$LINENO: WARNING: I18n code requires wxFile... disabled" >&5
-echo "$as_me: WARNING: I18n code requires wxFile... disabled" >&2;}
- else
- cat >>confdefs.h <<\_ACEOF
-#define wxUSE_INTL 1
-_ACEOF
-
- SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS internat"
- GUIDIST="$GUIDIST INTL_DIST"
- fi
-fi
-
-if test "$wxUSE_LOG" = "yes"; then
- cat >>confdefs.h <<\_ACEOF
-#define wxUSE_LOG 1
-_ACEOF
-
-
- if test "$wxUSE_LOGGUI" = "yes"; then
- cat >>confdefs.h <<\_ACEOF
-#define wxUSE_LOGGUI 1
-_ACEOF
-
- fi
-
- if test "$wxUSE_LOGWINDOW" = "yes"; then
- cat >>confdefs.h <<\_ACEOF
-#define wxUSE_LOGWINDOW 1
-_ACEOF
-
- fi
-
- if test "$wxUSE_LOGDIALOG" = "yes"; then
- cat >>confdefs.h <<\_ACEOF
-#define wxUSE_LOG_DIALOG 1
-_ACEOF
-
- fi
-fi
+if test "$TOOLKIT" != "MSW" -a "$USE_OS2" != 1; then
-if test "$wxUSE_LONGLONG" = "yes"; then
- cat >>confdefs.h <<\_ACEOF
-#define wxUSE_LONGLONG 1
-_ACEOF
-
-fi
-
-if test "$wxUSE_GEOMETRY" = "yes"; then
- cat >>confdefs.h <<\_ACEOF
-#define wxUSE_GEOMETRY 1
-_ACEOF
-
-fi
-
-if test "$wxUSE_DIALUP_MANAGER" = "yes" ; then
- cat >>confdefs.h <<\_ACEOF
-#define wxUSE_DIALUP_MANAGER 1
-_ACEOF
-
- SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS dialup"
-fi
-
-if test "$wxUSE_STREAMS" = "yes" ; then
- cat >>confdefs.h <<\_ACEOF
-#define wxUSE_STREAMS 1
-_ACEOF
-
-fi
-
-
-if test "$wxUSE_DATETIME" = "yes"; then
+ HAVE_DL_FUNCS=0
+ HAVE_SHL_FUNCS=0
+ if test "$wxUSE_DYNAMIC_LOADER" = "yes" -o "$wxUSE_DYNLIB_CLASS" = "yes" ; then
+ if test "$USE_DARWIN" = 1; then
+ HAVE_DL_FUNCS=1
+ else
-for ac_func in strptime
+for ac_func in dlopen
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
echo "$as_me:$LINENO: checking for $ac_func" >&5
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
-fi
-done
-
-
- echo "$as_me:$LINENO: checking for timezone variable in <time.h>" >&5
-echo $ECHO_N "checking for timezone variable in <time.h>... $ECHO_C" >&6
-if test "${wx_cv_var_timezone+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 <time.h>
-
-int
-main ()
-{
-
- int tz;
- tz = timezone;
-
- ;
- return 0;
-}
+ cat >>confdefs.h <<\_ACEOF
+#define HAVE_DLOPEN 1
_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_var_timezone=timezone
+ HAVE_DL_FUNCS=1
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
- 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 <time.h>
-
-int
-main ()
-{
-
- int tz;
- tz = _timezone;
-
- ;
- 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_var_timezone=_timezone
+ echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
+echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
+if test "${ac_cv_lib_dl_dlopen+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
- cat >conftest.$ac_ext <<_ACEOF
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-ldl $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
- #include <time.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 dlopen ();
int
main ()
{
-
- int tz;
- tz = __timezone;
-
+dlopen ();
;
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
+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_objext'
+ { 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
-
- wx_cv_var_timezone=__timezone
-
+ ac_cv_lib_dl_dlopen=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-
- if test "$USE_DOS" = 0 ; then
- { echo "$as_me:$LINENO: WARNING: no timezone variable" >&5
-echo "$as_me: WARNING: no timezone variable" >&2;}
- fi
-
-
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-
-
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-
-
+ac_cv_lib_dl_dlopen=no
fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-
-
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:$LINENO: result: $wx_cv_var_timezone" >&5
-echo "${ECHO_T}$wx_cv_var_timezone" >&6
+echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
+echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
+if test $ac_cv_lib_dl_dlopen = yes; then
- if test "x$wx_cv_var_timezone" != x ; then
- cat >>confdefs.h <<_ACEOF
-#define WX_TIMEZONE $wx_cv_var_timezone
+ cat >>confdefs.h <<\_ACEOF
+#define HAVE_DLOPEN 1
_ACEOF
- fi
+ HAVE_DL_FUNCS=1
+ DL_LINK=" -ldl$DL_LINK"
+
+else
-for ac_func in localtime
+for ac_func in shl_load
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
echo "$as_me:$LINENO: checking for $ac_func" >&5
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
-fi
-done
+ cat >>confdefs.h <<\_ACEOF
+#define HAVE_SHL_LOAD 1
+_ACEOF
+ HAVE_SHL_FUNCS=1
- if test "$ac_cv_func_localtime" = "yes"; then
- echo "$as_me:$LINENO: checking for tm_gmtoff in struct tm" >&5
-echo $ECHO_N "checking for tm_gmtoff in struct tm... $ECHO_C" >&6
-if test "${wx_cv_struct_tm_has_gmtoff+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
else
- cat >conftest.$ac_ext <<_ACEOF
+ echo "$as_me:$LINENO: checking for dld in -lshl_load" >&5
+echo $ECHO_N "checking for dld in -lshl_load... $ECHO_C" >&6
+if test "${ac_cv_lib_shl_load_dld+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lshl_load $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
- #include <time.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 dld ();
int
main ()
{
-
- struct tm tm;
- tm.tm_gmtoff++;
-
+dld ();
;
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
+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_objext'
+ { 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
-
- wx_cv_struct_tm_has_gmtoff=yes
-
+ ac_cv_lib_shl_load_dld=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-wx_cv_struct_tm_has_gmtoff=no
+ac_cv_lib_shl_load_dld=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_shl_load_dld" >&5
+echo "${ECHO_T}$ac_cv_lib_shl_load_dld" >&6
+if test $ac_cv_lib_shl_load_dld = yes; then
+
+ HAVE_SHL_FUNCS=1
+ DL_LINK=" -ldld$DL_LINK"
fi
-rm -f conftest.$ac_objext conftest.$ac_ext
+
fi
-echo "$as_me:$LINENO: result: $wx_cv_struct_tm_has_gmtoff" >&5
-echo "${ECHO_T}$wx_cv_struct_tm_has_gmtoff" >&6
- fi
+done
- if test "$wx_cv_struct_tm_has_gmtoff" = "yes"; then
- cat >>confdefs.h <<\_ACEOF
-#define WX_GMTOFF_IN_TM 1
-_ACEOF
- fi
+fi
+
+fi
+done
-for ac_func in gettimeofday ftime
+ if test "$HAVE_DL_FUNCS" = 1; then
+
+for ac_func in dlerror
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
echo "$as_me:$LINENO: checking for $ac_func" >&5
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
- break
-fi
-done
+ cat >>confdefs.h <<\_ACEOF
+#define HAVE_DLERROR 1
+_ACEOF
+else
- if test "$ac_cv_func_gettimeofday" = "yes"; then
- echo "$as_me:$LINENO: checking whether gettimeofday takes two arguments" >&5
-echo $ECHO_N "checking whether gettimeofday takes two arguments... $ECHO_C" >&6
-if test "${wx_cv_func_gettimeofday_has_2_args+set}" = set; then
+ 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
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
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-ldl $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
- #include <sys/time.h>
- #include <unistd.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 dlerror ();
int
main ()
{
-
- struct timeval tv;
- gettimeofday(&tv, NULL);
-
+dlerror ();
;
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
+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_objext'
+ { 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
- wx_cv_func_gettimeofday_has_2_args=yes
+ ac_cv_lib_dl_dlerror=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h. */
+ac_cv_lib_dl_dlerror=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_dl_dlerror" >&5
+echo "${ECHO_T}$ac_cv_lib_dl_dlerror" >&6
+if test $ac_cv_lib_dl_dlerror = yes; then
+ cat >>confdefs.h <<\_ACEOF
+#define HAVE_DLERROR 1
_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
- #include <sys/time.h>
- #include <unistd.h>
+fi
-int
-main ()
-{
- struct timeval tv;
- gettimeofday(&tv);
- ;
- 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_gettimeofday_has_2_args=no
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+fi
+done
+ fi
+ fi
- { echo "$as_me:$LINENO: WARNING: failed to determine number of gettimeofday() arguments" >&5
-echo "$as_me: WARNING: failed to determine number of gettimeofday() arguments" >&2;}
- wx_cv_func_gettimeofday_has_2_args=unknown
+ if test "$HAVE_DL_FUNCS" = 0; then
+ if test "$HAVE_SHL_FUNCS" = 0; then
+ if test "$USE_UNIX" = 1; then
+ { echo "$as_me:$LINENO: WARNING: Missing dynamic loading support, several features will be disabled" >&5
+echo "$as_me: WARNING: Missing dynamic loading support, several features will be disabled" >&2;}
+ wxUSE_DYNAMIC_LOADER=no
+ wxUSE_DYNLIB_CLASS=no
+ else
+ { echo "$as_me:$LINENO: WARNING: Assuming wxLibrary class works on this platform" >&5
+echo "$as_me: WARNING: Assuming wxLibrary class works on this platform" >&2;}
+ fi
+ fi
+ fi
+ fi
+fi
+if test "$wxUSE_DYNAMIC_LOADER" = "yes" ; then
+ cat >>confdefs.h <<\_ACEOF
+#define wxUSE_DYNAMIC_LOADER 1
+_ACEOF
fi
-rm -f conftest.$ac_objext conftest.$ac_ext
+if test "$wxUSE_DYNLIB_CLASS" = "yes" ; then
+ cat >>confdefs.h <<\_ACEOF
+#define wxUSE_DYNLIB_CLASS 1
+_ACEOF
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_func_gettimeofday_has_2_args" >&5
-echo "${ECHO_T}$wx_cv_func_gettimeofday_has_2_args" >&6
- if test "$wx_cv_func_gettimeofday_has_2_args" != "yes"; then
- cat >>confdefs.h <<\_ACEOF
-#define WX_GETTIMEOFDAY_NO_TZ 1
+if test "$wxUSE_PLUGINS" = "yes" ; then
+ if test "$wxUSE_SHARED" = "no" ; then
+ { echo "$as_me:$LINENO: WARNING: plugins supported only in shared build, disabling" >&5
+echo "$as_me: WARNING: plugins supported only in shared build, disabling" >&2;}
+ wxUSE_PLUGINS=no
+ fi
+ if test "$wxUSE_MONOLITHIC" = "yes" ; then
+ { echo "$as_me:$LINENO: WARNING: plugins not supported monolithic build, disabling" >&5
+echo "$as_me: WARNING: plugins not supported monolithic build, disabling" >&2;}
+ wxUSE_PLUGINS=no
+ fi
+ if test "$wxUSE_DYNLIB_CLASS" = "no" ; then
+ { echo "$as_me:$LINENO: WARNING: plugins require wxDynamicLibrary, disabling" >&5
+echo "$as_me: WARNING: plugins require wxDynamicLibrary, disabling" >&2;}
+ wxUSE_PLUGINS=no
+ fi
+ if test "$wxUSE_PLUGINS" = "yes" ; then
+ cat >>confdefs.h <<\_ACEOF
+#define wxUSE_PLUGINS 1
_ACEOF
- fi
fi
+fi
+
+
+if test "$wxUSE_STL" = "yes"; then
+ cat >>confdefs.h <<\_ACEOF
+#define wxUSE_STL 1
+_ACEOF
- SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS typetest"
fi
+if test "$wxUSE_APPLE_IEEE" = "yes"; then
+ cat >>confdefs.h <<\_ACEOF
+#define wxUSE_APPLE_IEEE 1
+_ACEOF
-if test "$wxUSE_SOCKETS" = "yes"; then
- if test "$wxUSE_MGL" = "1"; then
- { echo "$as_me:$LINENO: WARNING: wxSocket not yet supported under MGL... disabled" >&5
-echo "$as_me: WARNING: wxSocket not yet supported under MGL... disabled" >&2;}
- wxUSE_SOCKETS="no"
- fi
- if test "$wxUSE_COCOA" = "1"; then
- { echo "$as_me:$LINENO: WARNING: wxSocket not yet supported under Cocoa... disabled" >&5
-echo "$as_me: WARNING: wxSocket not yet supported under Cocoa... disabled" >&2;}
- wxUSE_SOCKETS="no"
- fi
fi
-if test "$wxUSE_SOCKETS" = "yes"; then
- if test "$TOOLKIT" != "MSW"; then
- echo "$as_me:$LINENO: checking for socket" >&5
-echo $ECHO_N "checking for socket... $ECHO_C" >&6
-if test "${ac_cv_func_socket+set}" = set; then
+if test "$wxUSE_TIMER" = "yes"; then
+ cat >>confdefs.h <<\_ACEOF
+#define wxUSE_TIMER 1
+_ACEOF
+
+fi
+
+WITH_PLUGIN_SDL=0
+if test "$wxUSE_SOUND" = "yes"; then
+ if test "$USE_UNIX" = "1" ; then
+
+for ac_header in sys/soundcard.h
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+ 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
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
else
- cat >conftest.$ac_ext <<_ACEOF
+ # Is the header compilable?
+echo "$as_me:$LINENO: checking $ac_header usability" >&5
+echo $ECHO_N "checking $ac_header 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. */
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char socket (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-/* 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 socket ();
-/* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
-#if defined (__stub_socket) || defined (__stub___socket)
-choke me
-#else
-char (*f) () = socket;
-#endif
-#ifdef __cplusplus
-}
-#endif
-
-int
-main ()
-{
-return f != socket;
- ;
- return 0;
-}
+$ac_includes_default
+#include <$ac_header>
_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_func_socket=yes
+ ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_func_socket=no
-fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ac_header_compiler=no
fi
-echo "$as_me:$LINENO: result: $ac_cv_func_socket" >&5
-echo "${ECHO_T}$ac_cv_func_socket" >&6
-if test $ac_cv_func_socket = yes; then
- :
-else
- 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
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lsocket $LIBS"
+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 $ac_header presence" >&5
+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
cat >conftest.$ac_ext <<_ACEOF
#line $LINENO "configure"
/* confdefs.h. */
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 socket ();
-int
-main ()
-{
-socket ();
- ;
- return 0;
+#include <$ac_header>
+_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: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: $ac_header: 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: $ac_header: present but cannot be compiled" >&5
+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: $ac_header: 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 $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
+ eval "$as_ac_Header=$ac_header_preproc"
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+
+fi
+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
+
+
+ if test "$wxUSE_LIBSDL" != "no"; then
+
+# Check whether --with-sdl-prefix or --without-sdl-prefix was given.
+if test "${with_sdl_prefix+set}" = set; then
+ withval="$with_sdl_prefix"
+ sdl_prefix="$withval"
+else
+ sdl_prefix=""
+fi;
+
+# Check whether --with-sdl-exec-prefix or --without-sdl-exec-prefix was given.
+if test "${with_sdl_exec_prefix+set}" = set; then
+ withval="$with_sdl_exec_prefix"
+ sdl_exec_prefix="$withval"
+else
+ sdl_exec_prefix=""
+fi;
+# Check whether --enable-sdltest or --disable-sdltest was given.
+if test "${enable_sdltest+set}" = set; then
+ enableval="$enable_sdltest"
+
+else
+ enable_sdltest=yes
+fi;
+
+ if test x$sdl_exec_prefix != x ; then
+ sdl_args="$sdl_args --exec-prefix=$sdl_exec_prefix"
+ if test x${SDL_CONFIG+set} != xset ; then
+ SDL_CONFIG=$sdl_exec_prefix/bin/sdl-config
+ fi
+ fi
+ if test x$sdl_prefix != x ; then
+ sdl_args="$sdl_args --prefix=$sdl_prefix"
+ if test x${SDL_CONFIG+set} != xset ; then
+ SDL_CONFIG=$sdl_prefix/bin/sdl-config
+ fi
+ fi
+
+
+ PATH="$prefix/bin:$prefix/usr/bin:$PATH"
+ # Extract the first word of "sdl-config", so it can be a program name with args.
+set dummy sdl-config; 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_path_SDL_CONFIG+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ case $SDL_CONFIG in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_SDL_CONFIG="$SDL_CONFIG" # Let the user override the test with a path.
+ ;;
+ *)
+ 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_path_SDL_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+
+ test -z "$ac_cv_path_SDL_CONFIG" && ac_cv_path_SDL_CONFIG="no"
+ ;;
+esac
+fi
+SDL_CONFIG=$ac_cv_path_SDL_CONFIG
+
+if test -n "$SDL_CONFIG"; then
+ echo "$as_me:$LINENO: result: $SDL_CONFIG" >&5
+echo "${ECHO_T}$SDL_CONFIG" >&6
+else
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+ min_sdl_version=1.2.0
+ echo "$as_me:$LINENO: checking for SDL - version >= $min_sdl_version" >&5
+echo $ECHO_N "checking for SDL - version >= $min_sdl_version... $ECHO_C" >&6
+ no_sdl=""
+ if test "$SDL_CONFIG" = "no" ; then
+ no_sdl=yes
+ else
+ SDL_CFLAGS=`$SDL_CONFIG $sdlconf_args --cflags`
+ SDL_LIBS=`$SDL_CONFIG $sdlconf_args --libs`
+
+ sdl_major_version=`$SDL_CONFIG $sdl_args --version | \
+ sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
+ sdl_minor_version=`$SDL_CONFIG $sdl_args --version | \
+ sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'`
+ sdl_micro_version=`$SDL_CONFIG $sdl_config_args --version | \
+ sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'`
+ if test "x$enable_sdltest" = "xyes" ; then
+ ac_save_CFLAGS="$CFLAGS"
+ ac_save_LIBS="$LIBS"
+ CFLAGS="$CFLAGS $SDL_CFLAGS"
+ LIBS="$LIBS $SDL_LIBS"
+ rm -f conf.sdltest
+ if test "$cross_compiling" = yes; then
+ echo $ac_n "cross compiling; assumed OK... $ac_c"
+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 <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include "SDL.h"
+
+char*
+my_strdup (char *str)
+{
+ char *new_str;
+
+ if (str)
+ {
+ new_str = (char *)malloc ((strlen (str) + 1) * sizeof(char));
+ strcpy (new_str, str);
+ }
+ else
+ new_str = NULL;
+
+ return new_str;
+}
+
+int main (int argc, char *argv[])
+{
+ int major, minor, micro;
+ char *tmp_version;
+
+ /* This hangs on some systems (?)
+ system ("touch conf.sdltest");
+ */
+ { FILE *fp = fopen("conf.sdltest", "a"); if ( fp ) fclose(fp); }
+
+ /* HP/UX 9 (%@#!) writes to sscanf strings */
+ tmp_version = my_strdup("$min_sdl_version");
+ if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) {
+ printf("%s, bad version string\n", "$min_sdl_version");
+ exit(1);
+ }
+
+ if (($sdl_major_version > major) ||
+ (($sdl_major_version == major) && ($sdl_minor_version > minor)) ||
+ (($sdl_major_version == major) && ($sdl_minor_version == minor) && ($sdl_micro_version >= micro)))
+ {
+ return 0;
+ }
+ else
+ {
+ printf("\n*** 'sdl-config --version' returned %d.%d.%d, but the minimum version\n", $sdl_major_version, $sdl_minor_version, $sdl_micro_version);
+ printf("*** of SDL required is %d.%d.%d. If sdl-config is correct, then it is\n", major, minor, micro);
+ printf("*** best to upgrade to the required version.\n");
+ printf("*** If sdl-config was wrong, set the environment variable SDL_CONFIG\n");
+ printf("*** to point to the correct copy of sdl-config, and remove the file\n");
+ printf("*** config.cache before re-running configure\n");
+ return 1;
+ }
+}
+
+
+_ACEOF
+rm -f 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='./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
+ :
+else
+ echo "$as_me: program exited with status $ac_status" >&5
+echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+( exit $ac_status )
+no_sdl=yes
+fi
+rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+fi
+ CFLAGS="$ac_save_CFLAGS"
+ LIBS="$ac_save_LIBS"
+ fi
+ fi
+ if test "x$no_sdl" = x ; then
+ echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+
+ EXTRALIBS_SDL="$SDL_LIBS"
+ CXXFLAGS="$CXXFLAGS $SDL_CFLAGS"
+ cat >>confdefs.h <<\_ACEOF
+#define wxUSE_LIBSDL 1
+_ACEOF
+
+
+ else
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+ if test "$SDL_CONFIG" = "no" ; then
+ echo "*** The sdl-config script installed by SDL could not be found"
+ echo "*** If SDL was installed in PREFIX, make sure PREFIX/bin is in"
+ echo "*** your path, or set the SDL_CONFIG environment variable to the"
+ echo "*** full path to sdl-config."
+ else
+ if test -f conf.sdltest ; then
+ :
+ else
+ echo "*** Could not run SDL test program, checking why..."
+ CFLAGS="$CFLAGS $SDL_CFLAGS"
+ LIBS="$LIBS $SDL_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. */
+
+#include <stdio.h>
+#include "SDL.h"
+
+int main(int argc, char *argv[])
+{ return 0; }
+#undef main
+#define main K_and_R_C_main
+
+int
+main ()
+{
+ return 0;
+ ;
+ return 0;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- ac_cv_lib_socket_socket=yes
+ echo "*** The test program compiled, but did not run. This usually means"
+ echo "*** that the run-time linker is not finding SDL or finding the wrong"
+ echo "*** version of SDL. If it is not finding SDL, you'll need to set your"
+ echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
+ echo "*** to the installed location Also, make sure you have run ldconfig if that"
+ echo "*** is required on your system"
+ echo "***"
+ echo "*** If you have an old version installed, it is best to remove it, although"
+ echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_socket_socket=no
+ echo "*** The test program failed to compile or link. See the file config.log for the"
+ echo "*** exact error that occured. This usually means SDL was incorrectly installed"
+ echo "*** or that you have moved SDL since it was installed. In the latter case, you"
+ echo "*** may want to edit the sdl-config script: $SDL_CONFIG"
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
+ CFLAGS="$ac_save_CFLAGS"
+ LIBS="$ac_save_LIBS"
+ fi
+ fi
+ SDL_CFLAGS=""
+ SDL_LIBS=""
+ wxUSE_LIBSDL="no"
+ fi
+
+
+ rm -f conf.sdltest
+
+ if test "$wxUSE_LIBSDL" = "yes" -a "$wxUSE_PLUGINS" = "yes" ; then
+ WITH_PLUGIN_SDL=1
+ fi
+ fi
+ fi
+
+ cat >>confdefs.h <<\_ACEOF
+#define wxUSE_SOUND 1
+_ACEOF
+
+ SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS sound"
fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_socket_socket" >&5
-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
-else
- { 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
+if test "$wxUSE_CMDLINE_PARSER" = "yes"; then
+ cat >>confdefs.h <<\_ACEOF
+#define wxUSE_CMDLINE_PARSER 1
+_ACEOF
+
+fi
+
+if test "$wxUSE_STOPWATCH" = "yes"; then
+ cat >>confdefs.h <<\_ACEOF
+#define wxUSE_STOPWATCH 1
+_ACEOF
+
+fi
+
+if test "$wxUSE_DATETIME" = "yes"; then
+ cat >>confdefs.h <<\_ACEOF
+#define wxUSE_DATETIME 1
+_ACEOF
+
+fi
+
+if test "$wxUSE_FILE" = "yes"; then
+ cat >>confdefs.h <<\_ACEOF
+#define wxUSE_FILE 1
+_ACEOF
+
+fi
+
+if test "$wxUSE_FFILE" = "yes"; then
+ cat >>confdefs.h <<\_ACEOF
+#define wxUSE_FFILE 1
+_ACEOF
+
+fi
+
+if test "$wxUSE_FILESYSTEM" = "yes"; then
+ cat >>confdefs.h <<\_ACEOF
+#define wxUSE_FILESYSTEM 1
+_ACEOF
+
+fi
+if test "$wxUSE_FS_ZIP" = "yes"; then
+ cat >>confdefs.h <<\_ACEOF
+#define wxUSE_FS_ZIP 1
+_ACEOF
+
+fi
+
+if test "$wxUSE_ZIPSTREAM" = "yes"; then
+ cat >>confdefs.h <<\_ACEOF
+#define wxUSE_ZIPSTREAM 1
+_ACEOF
+
+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
+_ACEOF
+
+fi
+
+if test "$wxUSE_SNGLINST_CHECKER" = "yes"; then
+ cat >>confdefs.h <<\_ACEOF
+#define wxUSE_SNGLINST_CHECKER 1
+_ACEOF
+
+fi
+
+if test "$wxUSE_BUSYINFO" = "yes"; then
+ cat >>confdefs.h <<\_ACEOF
+#define wxUSE_BUSYINFO 1
+_ACEOF
+
+fi
+
+if test "$wxUSE_STD_IOSTREAM" = "yes"; then
+ cat >>confdefs.h <<\_ACEOF
+#define wxUSE_STD_IOSTREAM 1
+_ACEOF
+
+fi
+
+if test "$wxUSE_TEXTBUFFER" = "yes"; then
+ cat >>confdefs.h <<\_ACEOF
+#define wxUSE_TEXTBUFFER 1
+_ACEOF
fi
+if test "$wxUSE_TEXTFILE" = "yes"; then
+ if test "$wxUSE_FILE" != "yes" -o "$wxUSE_TEXTBUFFER" != "yes" ; then
+ { echo "$as_me:$LINENO: WARNING: wxTextFile requires wxFile and wxTextBuffer... disabled" >&5
+echo "$as_me: WARNING: wxTextFile requires wxFile and wxTextBuffer... disabled" >&2;}
+ else
+ cat >>confdefs.h <<\_ACEOF
+#define wxUSE_TEXTFILE 1
+_ACEOF
+
+ fi
+fi
+
+if test "$wxUSE_CONFIG" = "yes" ; then
+ if test "$wxUSE_TEXTFILE" != "yes"; then
+ { echo "$as_me:$LINENO: WARNING: wxConfig requires wxTextFile... disabled" >&5
+echo "$as_me: WARNING: wxConfig requires wxTextFile... disabled" >&2;}
+ else
+ cat >>confdefs.h <<\_ACEOF
+#define wxUSE_CONFIG 1
+_ACEOF
+ SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS config"
+ fi
fi
+if test "$wxUSE_INTL" = "yes" ; then
+ if test "$wxUSE_FILE" != "yes"; then
+ { echo "$as_me:$LINENO: WARNING: I18n code requires wxFile... disabled" >&5
+echo "$as_me: WARNING: I18n code requires wxFile... disabled" >&2;}
+ else
+ cat >>confdefs.h <<\_ACEOF
+#define wxUSE_INTL 1
+_ACEOF
+
+ SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS internat"
+ GUIDIST="$GUIDIST INTL_DIST"
+ fi
+fi
+
+if test "$wxUSE_LOG" = "yes"; then
+ cat >>confdefs.h <<\_ACEOF
+#define wxUSE_LOG 1
+_ACEOF
+
+
+ if test "$wxUSE_LOGGUI" = "yes"; then
+ cat >>confdefs.h <<\_ACEOF
+#define wxUSE_LOGGUI 1
+_ACEOF
+
+ fi
+
+ if test "$wxUSE_LOGWINDOW" = "yes"; then
+ cat >>confdefs.h <<\_ACEOF
+#define wxUSE_LOGWINDOW 1
+_ACEOF
+
+ fi
+
+ if test "$wxUSE_LOGDIALOG" = "yes"; then
+ cat >>confdefs.h <<\_ACEOF
+#define wxUSE_LOG_DIALOG 1
+_ACEOF
+
fi
fi
-if test "$wxUSE_SOCKETS" = "yes" ; then
- if test "$TOOLKIT" != "MSW"; then
- echo "$as_me:$LINENO: checking what is the type of the third argument of getsockname" >&5
-echo $ECHO_N "checking what is the type of the third argument of getsockname... $ECHO_C" >&6
-if test "${wx_cv_type_getsockname3+set}" = set; then
+if test "$wxUSE_LONGLONG" = "yes"; then
+ cat >>confdefs.h <<\_ACEOF
+#define wxUSE_LONGLONG 1
+_ACEOF
+
+fi
+
+if test "$wxUSE_GEOMETRY" = "yes"; then
+ cat >>confdefs.h <<\_ACEOF
+#define wxUSE_GEOMETRY 1
+_ACEOF
+
+fi
+
+if test "$wxUSE_DIALUP_MANAGER" = "yes" ; then
+ cat >>confdefs.h <<\_ACEOF
+#define wxUSE_DIALUP_MANAGER 1
+_ACEOF
+
+ SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS dialup"
+fi
+
+if test "$wxUSE_STREAMS" = "yes" ; then
+ cat >>confdefs.h <<\_ACEOF
+#define wxUSE_STREAMS 1
+_ACEOF
+
+fi
+
+
+if test "$wxUSE_DATETIME" = "yes"; then
+
+for ac_func in strptime
+do
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+if eval "test \"\${$as_ac_var+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. */
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char $ac_func (); below.
+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+ <limits.h> exists even on freestanding compilers. */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+/* 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 $ac_func ();
+/* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+choke me
+#else
+char (*f) () = $ac_func;
+#endif
+#ifdef __cplusplus
+}
+#endif
- cat >conftest.$ac_ext <<_ACEOF
+int
+main ()
+{
+return f != $ac_func;
+ ;
+ 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
+ eval "$as_ac_var=yes"
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+eval "$as_ac_var=no"
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+done
+
+
+ echo "$as_me:$LINENO: checking for timezone variable in <time.h>" >&5
+echo $ECHO_N "checking for timezone variable in <time.h>... $ECHO_C" >&6
+if test "${wx_cv_var_timezone+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+
+ cat >conftest.$ac_ext <<_ACEOF
#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
- #include <sys/types.h>
- #include <sys/socket.h>
+ #include <time.h>
int
main ()
{
- socklen_t len;
- getsockname(0, 0, &len);
+ int tz;
+ tz = timezone;
;
return 0;
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- wx_cv_type_getsockname3=socklen_t
+
+ wx_cv_var_timezone=timezone
+
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
- CFLAGS_OLD="$CFLAGS"
- if test "$GCC" = yes ; then
- CFLAGS="$CFLAGS -Werror"
- fi
-
- 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 <sys/types.h>
- #include <sys/socket.h>
+ #include <time.h>
int
main ()
{
- size_t len;
- getsockname(0, 0, &len);
+ int tz;
+ tz = _timezone;
;
return 0;
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- wx_cv_type_getsockname3=size_t
+
+ wx_cv_var_timezone=_timezone
+
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-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 <sys/types.h>
- #include <sys/socket.h>
+ #include <time.h>
int
main ()
{
- int len;
- getsockname(0, 0, &len);
+ int tz;
+ tz = __timezone;
;
return 0;
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- wx_cv_type_getsockname3=int
+
+ wx_cv_var_timezone=__timezone
+
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-wx_cv_type_getsockname3=unknown
-
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
- CFLAGS="$CFLAGS_OLD"
+ if test "$USE_DOS" = 0 ; then
+ { echo "$as_me:$LINENO: WARNING: no timezone variable" >&5
+echo "$as_me: WARNING: no timezone variable" >&2;}
+ fi
fi
rm -f conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $wx_cv_type_getsockname3" >&5
-echo "${ECHO_T}$wx_cv_type_getsockname3" >&6
-
- if test "$wx_cv_type_getsockname3" = "unknown"; then
- wxUSE_SOCKETS=no
- { echo "$as_me:$LINENO: WARNING: Couldn't find socklen_t synonym for this system" >&5
-echo "$as_me: WARNING: Couldn't find socklen_t synonym for this system" >&2;}
- else
- cat >>confdefs.h <<_ACEOF
-#define SOCKLEN_T $wx_cv_type_getsockname3
-_ACEOF
- fi
- fi
fi
+rm -f conftest.$ac_objext conftest.$ac_ext
-if test "$wxUSE_SOCKETS" = "yes" ; then
- cat >>confdefs.h <<\_ACEOF
-#define wxUSE_SOCKETS 1
-_ACEOF
- SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS sockets"
-fi
-
-if test "$wxUSE_PROTOCOL" = "yes"; then
- if test "$wxUSE_SOCKETS" != "yes"; then
- { echo "$as_me:$LINENO: WARNING: Protocol classes require sockets... disabled" >&5
-echo "$as_me: WARNING: Protocol classes require sockets... disabled" >&2;}
- wxUSE_PROTOCOL=no
- fi
fi
+rm -f conftest.$ac_objext conftest.$ac_ext
-if test "$wxUSE_PROTOCOL" = "yes"; then
- cat >>confdefs.h <<\_ACEOF
-#define wxUSE_PROTOCOL 1
-_ACEOF
-
-
- if test "$wxUSE_PROTOCOL_HTTP" = "yes"; then
- cat >>confdefs.h <<\_ACEOF
-#define wxUSE_PROTOCOL_HTTP 1
-_ACEOF
-
- fi
- if test "$wxUSE_PROTOCOL_FTP" = "yes"; then
- cat >>confdefs.h <<\_ACEOF
-#define wxUSE_PROTOCOL_FTP 1
-_ACEOF
- fi
- if test "$wxUSE_PROTOCOL_FILE" = "yes"; then
- cat >>confdefs.h <<\_ACEOF
-#define wxUSE_PROTOCOL_FILE 1
-_ACEOF
-
- fi
-else
- if test "$wxUSE_FS_INET" = "yes"; then
- { echo "$as_me:$LINENO: WARNING: HTTP filesystem require protocol classes... disabled" >&5
-echo "$as_me: WARNING: HTTP filesystem require protocol classes... disabled" >&2;}
- wxUSE_FS_INET="no"
- fi
fi
+echo "$as_me:$LINENO: result: $wx_cv_var_timezone" >&5
+echo "${ECHO_T}$wx_cv_var_timezone" >&6
-if test "$wxUSE_URL" = "yes"; then
- if test "$wxUSE_PROTOCOL" != "yes"; then
- { echo "$as_me:$LINENO: WARNING: wxURL class requires wxProtocol... disabled" >&5
-echo "$as_me: WARNING: wxURL class requires wxProtocol... disabled" >&2;}
- wxUSE_URL=no
- fi
- if test "$wxUSE_URL" = "yes"; then
- cat >>confdefs.h <<\_ACEOF
-#define wxUSE_URL 1
+ if test "x$wx_cv_var_timezone" != x ; then
+ cat >>confdefs.h <<_ACEOF
+#define WX_TIMEZONE $wx_cv_var_timezone
_ACEOF
fi
-fi
-
-if test "$wxUSE_FS_INET" = "yes"; then
- cat >>confdefs.h <<\_ACEOF
-#define wxUSE_FS_INET 1
-_ACEOF
-
-fi
-if test "$wxUSE_GUI" = "yes"; then
-
- if test "$TOOLKIT" = "MAC" -o "$TOOLKIT" = "COCOA"; then
- { echo "$as_me:$LINENO: WARNING: Joystick not yet supported under Mac OS X... disabled" >&5
-echo "$as_me: WARNING: Joystick not yet supported under Mac OS X... disabled" >&2;}
- wxUSE_JOYSTICK=no
- fi
- if test "$TOOLKIT" = "MOTIF"; then
- { echo "$as_me:$LINENO: WARNING: Joystick not yet supported under Motif... disabled" >&5
-echo "$as_me: WARNING: Joystick not yet supported under Motif... disabled" >&2;}
- wxUSE_JOYSTICK=no
- fi
- if test "$TOOLKIT" = "X11"; then
- { echo "$as_me:$LINENO: WARNING: Joystick not yet supported under X11... disabled" >&5
-echo "$as_me: WARNING: Joystick not yet supported under X11... disabled" >&2;}
- wxUSE_JOYSTICK=no
- fi
-
- if test "$TOOLKIT" != "MSW"; then
- if test "$wxUSE_JOYSTICK" = "yes"; then
-
-for ac_header in linux/joystick.h
+for ac_func in localtime
do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
- 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
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+if eval "test \"\${$as_ac_var+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
else
- # Is the header compilable?
-echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
+ 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 <$ac_header>
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char $ac_func (); below.
+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+ <limits.h> exists even on freestanding compilers. */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+/* 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 $ac_func ();
+/* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+choke me
+#else
+char (*f) () = $ac_func;
+#endif
+#ifdef __cplusplus
+}
+#endif
+
+int
+main ()
+{
+return f != $ac_func;
+ ;
+ return 0;
+}
_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
+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_objext'
+ { 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_header_compiler=yes
+ eval "$as_ac_var=yes"
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_header_compiler=no
+eval "$as_ac_var=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
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
-# Is the header present?
-echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
+fi
+done
+
+
+ if test "$ac_cv_func_localtime" = "yes"; then
+ echo "$as_me:$LINENO: checking for tm_gmtoff in struct tm" >&5
+echo $ECHO_N "checking for tm_gmtoff in struct tm... $ECHO_C" >&6
+if test "${wx_cv_struct_tm_has_gmtoff+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 <$ac_header>
+
+ #include <time.h>
+
+int
+main ()
+{
+
+ struct tm tm;
+ tm.tm_gmtoff++;
+
+ ;
+ return 0;
+}
_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+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=$?
- 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
+ (exit $ac_status); }; }; then
+
+ wx_cv_struct_tm_has_gmtoff=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: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: 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: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: 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 $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
- eval "$as_ac_Header=$ac_header_preproc"
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+wx_cv_struct_tm_has_gmtoff=no
fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
+rm -f conftest.$ac_objext conftest.$ac_ext
fi
-
-done
-
- if test "$ac_cv_header_linux_joystick_h" != "yes"; then
- wxUSE_JOYSTICK=no
- { echo "$as_me:$LINENO: WARNING: Joystick not supported by this system... disabled" >&5
-echo "$as_me: WARNING: Joystick not supported by this system... disabled" >&2;}
- fi
- fi
+echo "$as_me:$LINENO: result: $wx_cv_struct_tm_has_gmtoff" >&5
+echo "${ECHO_T}$wx_cv_struct_tm_has_gmtoff" >&6
fi
- if test "$wxUSE_JOYSTICK" = "yes"; then
+ if test "$wx_cv_struct_tm_has_gmtoff" = "yes"; then
cat >>confdefs.h <<\_ACEOF
-#define wxUSE_JOYSTICK 1
+#define WX_GMTOFF_IN_TM 1
_ACEOF
- SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS joytest"
fi
-fi
-
-if test "$TOOLKIT" != "MSW"; then
- HAVE_DL_FUNCS=0
- HAVE_SHL_FUNCS=0
- if test "$wxUSE_DYNAMIC_LOADER" = "yes" -o "$wxUSE_DYNLIB_CLASS" = "yes" ; then
- if test "$USE_DARWIN" = 1; then
- HAVE_DL_FUNCS=1
- else
-for ac_func in dlopen
+for ac_func in gettimeofday ftime
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
echo "$as_me:$LINENO: checking for $ac_func" >&5
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
+ break
+fi
+done
- cat >>confdefs.h <<\_ACEOF
-#define HAVE_DLOPEN 1
+
+ if test "$ac_cv_func_gettimeofday" = "yes"; then
+ echo "$as_me:$LINENO: checking whether gettimeofday takes two arguments" >&5
+echo $ECHO_N "checking whether gettimeofday takes two arguments... $ECHO_C" >&6
+if test "${wx_cv_func_gettimeofday_has_2_args+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. */
- HAVE_DL_FUNCS=1
+ #include <sys/time.h>
+ #include <unistd.h>
-else
+int
+main ()
+{
- echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
-if test "${ac_cv_lib_dl_dlopen+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ struct timeval tv;
+ gettimeofday(&tv, NULL);
+
+ ;
+ 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_gettimeofday_has_2_args=yes
else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldl $LIBS"
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
cat >conftest.$ac_ext <<_ACEOF
#line $LINENO "configure"
/* confdefs.h. */
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 dlopen ();
+ #include <sys/time.h>
+ #include <unistd.h>
+
int
main ()
{
-dlopen ();
+
+ struct timeval tv;
+ gettimeofday(&tv);
+
;
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_dl_dlopen=yes
+ wx_cv_func_gettimeofday_has_2_args=no
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_dl_dlopen=no
+
+ { echo "$as_me:$LINENO: WARNING: failed to determine number of gettimeofday() arguments" >&5
+echo "$as_me: WARNING: failed to determine number of gettimeofday() arguments" >&2;}
+ wx_cv_func_gettimeofday_has_2_args=unknown
+
+
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
+rm -f conftest.$ac_objext conftest.$ac_ext
+
fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
-if test $ac_cv_lib_dl_dlopen = yes; then
+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
- cat >>confdefs.h <<\_ACEOF
-#define HAVE_DLOPEN 1
+
+fi
+echo "$as_me:$LINENO: result: $wx_cv_func_gettimeofday_has_2_args" >&5
+echo "${ECHO_T}$wx_cv_func_gettimeofday_has_2_args" >&6
+
+ if test "$wx_cv_func_gettimeofday_has_2_args" != "yes"; then
+ cat >>confdefs.h <<\_ACEOF
+#define WX_GETTIMEOFDAY_NO_TZ 1
_ACEOF
- HAVE_DL_FUNCS=1
- DL_LINK=" -ldl$DL_LINK"
+ fi
+ fi
-else
+ SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS typetest"
+fi
-for ac_func in shl_load
-do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$as_ac_var+set}\" = set"; then
+if test "$wxUSE_SOCKETS" = "yes"; then
+ if test "$wxUSE_MGL" = "1"; then
+ { echo "$as_me:$LINENO: WARNING: wxSocket not yet supported under MGL... disabled" >&5
+echo "$as_me: WARNING: wxSocket not yet supported under MGL... disabled" >&2;}
+ wxUSE_SOCKETS="no"
+ fi
+fi
+
+if test "$wxUSE_SOCKETS" = "yes"; then
+ if test "$TOOLKIT" != "MSW"; then
+ echo "$as_me:$LINENO: checking for socket" >&5
+echo $ECHO_N "checking for socket... $ECHO_C" >&6
+if test "${ac_cv_func_socket+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func (); below.
+ which can conflict with char socket (); below.
Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
<limits.h> exists even on freestanding compilers. */
#ifdef __STDC__
#endif
/* We use char because int might match the return type of a gcc2
builtin and then its argument prototype would still apply. */
-char $ac_func ();
+char socket ();
/* The GNU C library defines this for functions which it implements
to always fail with ENOSYS. Some functions are actually named
something starting with __ and the normal name is an alias. */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+#if defined (__stub_socket) || defined (__stub___socket)
choke me
#else
-char (*f) () = $ac_func;
+char (*f) () = socket;
#endif
#ifdef __cplusplus
}
int
main ()
{
-return f != $ac_func;
+return f != socket;
;
return 0;
}
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- eval "$as_ac_var=yes"
+ ac_cv_func_socket=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-eval "$as_ac_var=no"
+ac_cv_func_socket=no
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-if test `eval echo '${'$as_ac_var'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-
- cat >>confdefs.h <<\_ACEOF
-#define HAVE_SHL_LOAD 1
-_ACEOF
-
- HAVE_SHL_FUNCS=1
-
+echo "$as_me:$LINENO: result: $ac_cv_func_socket" >&5
+echo "${ECHO_T}$ac_cv_func_socket" >&6
+if test $ac_cv_func_socket = yes; then
+ :
else
- echo "$as_me:$LINENO: checking for dld in -lshl_load" >&5
-echo $ECHO_N "checking for dld in -lshl_load... $ECHO_C" >&6
-if test "${ac_cv_lib_shl_load_dld+set}" = set; then
+ 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
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lshl_load $LIBS"
+LIBS="-lsocket $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 dld ();
+char socket ();
int
main ()
{
-dld ();
+socket ();
;
return 0;
}
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- ac_cv_lib_shl_load_dld=yes
+ ac_cv_lib_socket_socket=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_shl_load_dld=no
+ac_cv_lib_socket_socket=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_shl_load_dld" >&5
-echo "${ECHO_T}$ac_cv_lib_shl_load_dld" >&6
-if test $ac_cv_lib_shl_load_dld = yes; then
+echo "$as_me:$LINENO: result: $ac_cv_lib_socket_socket" >&5
+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
+else
- HAVE_SHL_FUNCS=1
- DL_LINK=" -ldld$DL_LINK"
+ { 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
+
+
+fi
+
+
+
+fi
+
+ fi
+fi
+
+if test "$wxUSE_SOCKETS" = "yes" ; then
+ if test "$TOOLKIT" != "MSW"; then
+ echo "$as_me:$LINENO: checking what is the type of the third argument of getsockname" >&5
+echo $ECHO_N "checking what is the type of the third argument of getsockname... $ECHO_C" >&6
+if test "${wx_cv_type_getsockname3+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 <sys/types.h>
+ #include <sys/socket.h>
+
+int
+main ()
+{
+
+ socklen_t len;
+ getsockname(0, 0, &len);
+
+ ;
+ 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_type_getsockname3=socklen_t
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+ CFLAGS_OLD="$CFLAGS"
+ if test "$GCC" = yes ; then
+ CFLAGS="$CFLAGS -Werror"
+ fi
+
+ 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 <sys/types.h>
+ #include <sys/socket.h>
+
+int
+main ()
+{
+
+ size_t len;
+ getsockname(0, 0, &len);
+
+ ;
+ 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_type_getsockname3=size_t
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+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 <sys/types.h>
+ #include <sys/socket.h>
+
+int
+main ()
+{
+
+ int len;
+ getsockname(0, 0, &len);
+
+ ;
+ 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_type_getsockname3=int
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+wx_cv_type_getsockname3=unknown
+
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+
+ CFLAGS="$CFLAGS_OLD"
+
+
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+
+fi
+echo "$as_me:$LINENO: result: $wx_cv_type_getsockname3" >&5
+echo "${ECHO_T}$wx_cv_type_getsockname3" >&6
+
+ if test "$wx_cv_type_getsockname3" = "unknown"; then
+ wxUSE_SOCKETS=no
+ { echo "$as_me:$LINENO: WARNING: Couldn't find socklen_t synonym for this system" >&5
+echo "$as_me: WARNING: Couldn't find socklen_t synonym for this system" >&2;}
+ else
+ cat >>confdefs.h <<_ACEOF
+#define SOCKLEN_T $wx_cv_type_getsockname3
+_ACEOF
+
+ fi
+ fi
+fi
+
+if test "$wxUSE_SOCKETS" = "yes" ; then
+ cat >>confdefs.h <<\_ACEOF
+#define wxUSE_SOCKETS 1
+_ACEOF
+
+ SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS sockets"
+fi
+
+if test "$wxUSE_PROTOCOL" = "yes"; then
+ if test "$wxUSE_SOCKETS" != "yes"; then
+ { echo "$as_me:$LINENO: WARNING: Protocol classes require sockets... disabled" >&5
+echo "$as_me: WARNING: Protocol classes require sockets... disabled" >&2;}
+ wxUSE_PROTOCOL=no
+ fi
+fi
+
+if test "$wxUSE_PROTOCOL" = "yes"; then
+ cat >>confdefs.h <<\_ACEOF
+#define wxUSE_PROTOCOL 1
+_ACEOF
+
+
+ if test "$wxUSE_PROTOCOL_HTTP" = "yes"; then
+ cat >>confdefs.h <<\_ACEOF
+#define wxUSE_PROTOCOL_HTTP 1
+_ACEOF
+
+ fi
+ if test "$wxUSE_PROTOCOL_FTP" = "yes"; then
+ cat >>confdefs.h <<\_ACEOF
+#define wxUSE_PROTOCOL_FTP 1
+_ACEOF
+
+ fi
+ if test "$wxUSE_PROTOCOL_FILE" = "yes"; then
+ cat >>confdefs.h <<\_ACEOF
+#define wxUSE_PROTOCOL_FILE 1
+_ACEOF
+ fi
+else
+ if test "$wxUSE_FS_INET" = "yes"; then
+ { echo "$as_me:$LINENO: WARNING: HTTP filesystem require protocol classes... disabled" >&5
+echo "$as_me: WARNING: HTTP filesystem require protocol classes... disabled" >&2;}
+ wxUSE_FS_INET="no"
+ fi
fi
+if test "$wxUSE_URL" = "yes"; then
+ if test "$wxUSE_PROTOCOL" != "yes"; then
+ { echo "$as_me:$LINENO: WARNING: wxURL class requires wxProtocol... disabled" >&5
+echo "$as_me: WARNING: wxURL class requires wxProtocol... disabled" >&2;}
+ wxUSE_URL=no
+ fi
+ if test "$wxUSE_URL" = "yes"; then
+ cat >>confdefs.h <<\_ACEOF
+#define wxUSE_URL 1
+_ACEOF
+ fi
fi
-done
+if test "$wxUSE_FS_INET" = "yes"; then
+ cat >>confdefs.h <<\_ACEOF
+#define wxUSE_FS_INET 1
+_ACEOF
fi
-fi
-done
+if test "$wxUSE_GUI" = "yes"; then
+ if test "$TOOLKIT" = "MAC" -o "$TOOLKIT" = "COCOA"; then
+ { echo "$as_me:$LINENO: WARNING: Joystick not yet supported under Mac OS X... disabled" >&5
+echo "$as_me: WARNING: Joystick not yet supported under Mac OS X... disabled" >&2;}
+ wxUSE_JOYSTICK=no
+ fi
- if test "$HAVE_DL_FUNCS" = 1; then
+ if test "$TOOLKIT" != "MSW"; then
+ if test "$wxUSE_JOYSTICK" = "yes"; then
-for ac_func in dlerror
+for ac_header in linux/joystick.h
do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$as_ac_var+set}\" = set"; then
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+ 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
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
else
- cat >conftest.$ac_ext <<_ACEOF
+ # Is the header compilable?
+echo "$as_me:$LINENO: checking $ac_header usability" >&5
+echo $ECHO_N "checking $ac_header 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. */
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-/* 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 $ac_func ();
-/* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-choke me
-#else
-char (*f) () = $ac_func;
-#endif
-#ifdef __cplusplus
-}
-#endif
-
-int
-main ()
-{
-return f != $ac_func;
- ;
- return 0;
-}
+$ac_includes_default
+#include <$ac_header>
_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
- eval "$as_ac_var=yes"
+ ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-eval "$as_ac_var=no"
-fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ac_header_compiler=no
fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-if test `eval echo '${'$as_ac_var'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
- cat >>confdefs.h <<\_ACEOF
-#define HAVE_DLERROR 1
-_ACEOF
+rm -f conftest.$ac_objext conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6
-else
- 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
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldl $LIBS"
+# Is the header present?
+echo "$as_me:$LINENO: checking $ac_header presence" >&5
+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
cat >conftest.$ac_ext <<_ACEOF
#line $LINENO "configure"
/* confdefs.h. */
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 dlerror ();
-int
-main ()
-{
-dlerror ();
- ;
- return 0;
-}
+#include <$ac_header>
_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
+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); }; }; then
- ac_cv_lib_dl_dlerror=yes
+ (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_cv_lib_dl_dlerror=no
+ ac_header_preproc=no
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
+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: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: $ac_header: 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: $ac_header: present but cannot be compiled" >&5
+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: $ac_header: 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 $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
+ eval "$as_ac_Header=$ac_header_preproc"
fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlerror" >&5
-echo "${ECHO_T}$ac_cv_lib_dl_dlerror" >&6
-if test $ac_cv_lib_dl_dlerror = yes; then
- cat >>confdefs.h <<\_ACEOF
-#define HAVE_DLERROR 1
-_ACEOF
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
fi
+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
+done
- if test "$HAVE_DL_FUNCS" = 0; then
- if test "$HAVE_SHL_FUNCS" = 0; then
- if test "$USE_UNIX" = 1; then
- { echo "$as_me:$LINENO: WARNING: Missing dynamic loading support, several features will be disabled" >&5
-echo "$as_me: WARNING: Missing dynamic loading support, several features will be disabled" >&2;}
- wxUSE_DYNAMIC_LOADER=no
- wxUSE_DYNLIB_CLASS=no
- else
- { echo "$as_me:$LINENO: WARNING: Assuming wxLibrary class works on this platform" >&5
-echo "$as_me: WARNING: Assuming wxLibrary class works on this platform" >&2;}
- fi
+ if test "$ac_cv_header_linux_joystick_h" != "yes"; then
+ wxUSE_JOYSTICK=no
+ { echo "$as_me:$LINENO: WARNING: Joystick not supported by this system... disabled" >&5
+echo "$as_me: WARNING: Joystick not supported by this system... disabled" >&2;}
fi
fi
fi
-fi
-
-if test "$wxUSE_DYNAMIC_LOADER" = "yes" ; then
- cat >>confdefs.h <<\_ACEOF
-#define wxUSE_DYNAMIC_LOADER 1
-_ACEOF
-elif test "$wxUSE_DYNLIB_CLASS" = "yes" ; then
- cat >>confdefs.h <<\_ACEOF
-#define wxUSE_DYNLIB_CLASS 1
+ if test "$wxUSE_JOYSTICK" = "yes"; then
+ cat >>confdefs.h <<\_ACEOF
+#define wxUSE_JOYSTICK 1
_ACEOF
+ SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS joytest"
+ fi
fi
+
+
if test "$wxUSE_FONTMAP" = "yes" ; then
cat >>confdefs.h <<\_ACEOF
#define wxUSE_FONTMAP 1
_ACEOF
- if test "$wxUSE_MSW" != 1; then
+ if test "$USE_WIN32" != 1; then
wxUSE_UNICODE_MSLU=no
fi
- if test "$wxUSE_MSW" = 1 -a "$wxUSE_UNICODE_MSLU" = "yes"; then
+ if test "$USE_WIN32" = 1 -a "$wxUSE_UNICODE_MSLU" = "yes"; then
echo "$as_me:$LINENO: checking for main in -lunicows" >&5
echo $ECHO_N "checking for main in -lunicows... $ECHO_C" >&6
if test "${ac_cv_lib_unicows_main+set}" = set; then
fi
-if test "$wxUSE_MSW" = 1 -a \( "$wxUSE_DATAOBJ" = "yes" \
+if test "$USE_WIN32" = 1 -a \( "$wxUSE_DATAOBJ" = "yes" \
-o "$wxUSE_CLIPBOARD" = "yes" \
-o "$wxUSE_OLE" = "yes" \
-o "$wxUSE_DRAG_AND_DROP" = "yes" \) ; then
ALL_OBJECTS="$ALL_OBJECTS \$(OLEOBJS)"
LIBS=" -lrpcrt4 -loleaut32 -lole32 -luuid$LIBS"
- cat >>confdefs.h <<\_ACEOF
+ if test "$wxUSE_OLE" = "yes" ; then
+ cat >>confdefs.h <<\_ACEOF
#define wxUSE_OLE 1
_ACEOF
-
+ fi
fi
- cat >>confdefs.h <<\_ACEOF
+ if test "$wxUSE_DATAOBJ" = "yes" ; then
+ cat >>confdefs.h <<\_ACEOF
#define wxUSE_DATAOBJ 1
_ACEOF
+ fi
else
{ echo "$as_me:$LINENO: WARNING: Some features disabled because OLE headers not found" >&5
echo "$as_me: WARNING: Some features disabled because OLE headers not found" >&2;}
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
fi
if test "$wxUSE_TOGGLEBTN" = "yes"; then
- if test "$wxUSE_MAC" = 1 -o "$wxUSE_COCOA" = 1 ; then
+ if test "$wxUSE_COCOA" = 1 ; then
{ echo "$as_me:$LINENO: WARNING: Toggle button not yet supported under Mac OS X... disabled" >&5
echo "$as_me: WARNING: Toggle button not yet supported under Mac OS X... disabled" >&2;}
wxUSE_TOGGLEBTN=no
{ 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"; 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_BASE_LIBS="net base"
+CORE_GUI_LIBS="adv core"
+
+if test "$wxUSE_XML" = "yes" ; then
+ CORE_BASE_LIBS="xml $CORE_BASE_LIBS"
+fi
+if test "$wxUSE_ODBC" != "no" ; then
+ CORE_BASE_LIBS="odbc $CORE_BASE_LIBS"
+ CORE_GUI_LIBS="dbgrid $CORE_GUI_LIBS"
+fi
+if test "$wxUSE_HTML" = "yes" ; then
+ CORE_GUI_LIBS="html $CORE_GUI_LIBS"
+fi
+
+if test "$wxUSE_GUI" != "yes"; then
+ CORE_GUI_LIBS=""
+fi
+
+
+
+
+
+
+
if test "$wxUSE_MAC" = 1 ; then
LDFLAGS="$LDFLAGS -framework Carbon -framework System"
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS artprov controls dialogs \
drawing dynamic erase event exec font image \
- minimal propsize rotate shaped widgets"
+ minimal propsize rotate shaped widgets render"
if test "$wxUSE_MONOLITHIC" != "yes"; then
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS console"
INCLUDES="-I\${top_builddir}lib/wx/include/${TOOLCHAIN_NAME} \
--I\${top_srcdir}/include \
-$REGEX_INCLUDE $ZLIB_INCLUDE $PNG_INCLUDE $JPEG_INCLUDE $TIFF_INCLUDE \
-$TOOLKIT_INCLUDE"
+-I\${top_srcdir}/include $TOOLKIT_INCLUDE"
if test "$GXX" = yes ; then
CXXWARNINGS="-Wall"
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'`
fi
WXCONFIG_EXTRALIBS="$LIBS"
if test "$wxUSE_REGEX" = "builtin" ; then
- wxconfig_3rdparty="$wxconfig_3rdparty regex"
+ wxconfig_3rdparty="$wxconfig_3rdparty regex${lib_unicode_suffix}"
fi
if test "$wxUSE_EXPAT" = "builtin" ; then
wxconfig_3rdparty="$wxconfig_3rdparty expat"
if test "$wxUSE_ZLIB" = "builtin" ; then
wxconfig_3rdparty="$wxconfig_3rdparty zlib"
fi
+if test "$wxUSE_ODBC" = "builtin" ; then
+ wxconfig_3rdparty="$wxconfig_3rdparty odbc"
+fi
for i in $wxconfig_3rdparty ; do
WXCONFIG_EXTRALIBS="$WXCONFIG_EXTRALIBS -lwx${i}${lib_debug_suffix}${HOST_SUFFIX}"
MONOLITHIC=0
fi
+if test $wxUSE_PLUGINS = "yes" ; then
+ USE_PLUGINS=1
+else
+ USE_PLUGINS=0
+fi
+
+if test $wxUSE_ODBC != "no" ; then
+ USE_ODBC=1
+else
+ USE_ODBC=0
+fi
+
if test $wxUSE_OFFICIAL_BUILD = "yes" ; then
OFFICIAL_BUILD=1
else
-TOOLKIT_LOWERCASE=`echo $TOOLKIT | tr [A-Z] [a-z]`
+
+
+
+
+
+TOOLKIT_LOWERCASE=`echo $TOOLKIT | tr "[A-Z]" "[a-z]"`
+
+ if test "x$BAKEFILE_HOST" = "x"; then
+ BAKEFILE_HOST="${host}"
+ fi
+
if test "x$BAKEFILE_CHECK_BASICS" != "xno"; then
if test -n "$ac_tool_prefix"; then
- 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
+ case ${BAKEFILE_HOST} in
*-hp-hpux* )
INSTALL_DIR="mkdir"
;;
LDFLAGS_GUI=
- case ${host} in
+ case ${BAKEFILE_HOST} in
*-*-cygwin* | *-*-mingw32* )
LDFLAGS_GUI="-Wl,--subsystem,windows -mwindows"
esac
PLATFORM_MSDOS=0
PLATFORM_MAC=0
PLATFORM_MACOSX=0
+ PLATFORM_OS2=0
+
+ if test "x$BAKEFILE_FORCE_PLATFORM" = "x"; then
+ case "${BAKEFILE_HOST}" in
+ *-*-cygwin* | *-*-mingw32* )
+ PLATFORM_WIN32=1
+ ;;
+ *-pc-msdosdjgpp )
+ PLATFORM_MSDOS=1
+ ;;
+ *-pc-os2_emx | *-pc-os2-emx )
+ PLATFORM_OS2=1
+ ;;
+ powerpc-*-darwin* )
+ PLATFORM_MAC=1
+ PLATFORM_MACOSX=1
+ ;;
+ * )
+ PLATFORM_UNIX=1
+ ;;
+ esac
+ else
+ case "$BAKEFILE_FORCE_PLATFORM" in
+ win32 )
+ PLATFORM_WIN32=1
+ ;;
+ msdos )
+ PLATFORM_MSDOS=1
+ ;;
+ os2 )
+ PLATFORM_OS2=1
+ ;;
+ darwin )
+ PLATFORM_MAC=1
+ PLATFORM_MACOSX=1
+ ;;
+ unix )
+ PLATFORM_UNIX=1
+ ;;
+ * )
+ { { echo "$as_me:$LINENO: error: Unknown platform: $BAKEFILE_FORCE_PLATFORM" >&5
+echo "$as_me: error: Unknown platform: $BAKEFILE_FORCE_PLATFORM" >&2;}
+ { (exit 1); exit 1; }; }
+ ;;
+ esac
+ fi
- case "${host}" in
- *-*-cygwin* | *-*-mingw32* )
- PLATFORM_WIN32=1
- ;;
- *-pc-msdosdjgpp | *-pc-os2_emx | *-pc-os2-emx )
- PLATFORM_MSDOS=1
- ;;
- powerpc-*-darwin* )
- PLATFORM_MAC=1
- PLATFORM_MACOSX=1
- ;;
- * )
- PLATFORM_UNIX=1
- ;;
- esac
SO_SUFFIX="so"
+ SO_SUFFIX_MODULE="so"
EXEEXT=""
+ LIBPREFIX=lib
DLLPREFIX=lib
+ DLLPREFIX_MODULE=
- case "${host}" in
+ case "${BAKEFILE_HOST}" in
*-hp-hpux* )
SO_SUFFIX="sl"
+ SO_SUFFIX_MODULE="sl"
;;
*-*-aix* )
SO_SUFFIX="a"
+ SO_SUFFIX_MODULE="a"
;;
*-*-cygwin* | *-*-mingw32* )
SO_SUFFIX="dll"
+ SO_SUFFIX_MODULE="dll"
+ EXEEXT=".exe"
+ DLLPREFIX=""
+ ;;
+ *-pc-msdosdjgpp )
EXEEXT=".exe"
DLLPREFIX=""
;;
- *-pc-msdosdjgpp | *-pc-os2_emx | *-pc-os2-emx )
+ *-pc-os2_emx | *-pc-os2-emx )
EXEEXT=".exe"
DLLPREFIX=""
+ LIBPREFIX=""
;;
powerpc-*-darwin* )
SO_SUFFIX="dylib"
+ SO_SUFFIX_MODULE="bundle"
;;
esac
+
+
+
SHARED_LD_CC="\$(CC) -shared -o"
SHARED_LD_CXX="\$(CXX) -shared -o"
PIC_FLAG="-fPIC"
fi
- case "${host}" in
+ case "${BAKEFILE_HOST}" in
*-hp-hpux* )
if test "x$GCC" = "xyes"; then
SHARED_LD_CC="${CC} -shared ${PIC_FLAG} -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
verbose=0
args=""
objects=""
+linking_flag="-dynamiclib"
while test \${#} -gt 0; do
case \${1} in
shift
;;
- -l*|-L*|-flat_namespace)
+ -l*|-L*|-flat_namespace|-headerpad_max_install_names)
# collect these options
args="\${args} \${1}"
;;
- -dynamiclib)
- # skip these options
+ -dynamiclib|-bundle)
+ linking_flag="\${1}"
;;
-*)
# Link the shared library from the single module created
#
if test \${verbose} = 1; then
- echo "cc -dynamiclib master.\$\$.o \${args}"
+ echo "cc \${linking_flag} master.\$\$.o \${args}"
fi
-c++ -dynamiclib master.\$\$.o \${args}
+c++ \${linking_flag} master.\$\$.o \${args}
status=\$?
if test \${status} != 0; then
exit \${status}
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 -undefined suppress -flat_namespace -o"
- SHARED_LD_CXX="$SHARED_LD_CC"
PIC_FLAG="-dynamic -fPIC"
- ;;
+ ;;
*-*-aix* )
if test "x$GCC" != "xyes"; then
*-*-sunos4* | \
*-*-osf* | \
*-*-dgux5* | \
+ *-pc-os2_emx | *-pc-os2-emx | \
*-*-sysv5* )
;;
*)
- { { echo "$as_me:$LINENO: error: unknown system type $host." >&5
-echo "$as_me: error: unknown system type $host." >&2;}
+ { { echo "$as_me:$LINENO: error: unknown system type $BAKEFILE_HOST." >&5
+echo "$as_me: error: unknown system type $BAKEFILE_HOST." >&2;}
{ (exit 1); exit 1; }; }
esac
+ if test "x$SHARED_LD_MODULE_CC" = "x" ; then
+ SHARED_LD_MODULE_CC="$SHARED_LD_CC"
+ fi
+ if test "x$SHARED_LD_MODULE_CXX" = "x" ; then
+ SHARED_LD_MODULE_CXX="$SHARED_LD_CXX"
+ fi
+
+
+
USE_MACVERSION=0
SONAME_FLAG=
- case "${host}" in
+ case "${BAKEFILE_HOST}" in
*-*-linux* )
SONAME_FLAG="-Wl,-soname,"
USE_SOVERSION=1
if test "x$GCC" = "xyes"; then
DEPSMODE=gcc
DEPS_TRACKING=1
- case "${host}" in
+ case "${BAKEFILE_HOST}" in
powerpc-*-darwin* )
DEPSFLAG_GCC="-no-cpp-precomp -MMD"
;;
cat <<EOF >bk-deps
#!/bin/sh
-# This script is part of Bakefile (http://bakefile.sf.net) autoconf script.
-# It is used to track C/C++ files dependencies in portable way.
+# This script is part of Bakefile (http://bakefile.sourceforge.net) autoconf
+# script. It is used to track C/C++ files dependencies in portable way.
#
# Permission is given to use this file in any way.
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
RESCOMP=
SETFILE=
- case ${host} in
+ case ${BAKEFILE_HOST} in
*-*-cygwin* | *-*-mingw32* )
if test "$build" != "$host" ; then
RESCOMP=$host_alias-windres
+
+
+
+ # Check whether --enable-precomp-headers or --disable-precomp-headers was given.
+if test "${enable_precomp_headers+set}" = set; then
+ enableval="$enable_precomp_headers"
+ bk_use_pch="$enableval"
+fi;
+
+ GCC_PCH=0
+
+ if test "x$bk_use_pch" = "x" -o "x$bk_use_pch" = "xyes" ; then
+ if test "x$GCC" = "xyes"; then
+ echo "$as_me:$LINENO: checking if the compiler supports precompiled headers" >&5
+echo $ECHO_N "checking if the compiler supports precompiled headers... $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. */
+
+int
+main ()
+{
+
+ #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
+
+ ;
+ 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
+ CPPFLAGS="-fpch-deps $CPPFLAGS"
+ GCC_PCH=1
+
+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
+ if test $GCC_PCH = 1 ; then
+ cat <<EOF >bk-make-pch
+#!/bin/sh
+
+# This script is part of Bakefile (http://bakefile.sourceforge.net) autoconf
+# script. It is used to generated precompiled headers.
+#
+# Permission is given to use this file in any way.
+
+outfile="\${1}"
+header="\${2}"
+shift
+shift
+
+compiler=
+headerfile=
+while test \${#} -gt 0; do
+ case "\${1}" in
+ -I* )
+ incdir=\`echo \${1} | sed -e 's/-I\(.*\)/\1/g'\`
+ if test "x\${headerfile}" = "x" -a -f "\${incdir}/\${header}" ; then
+ headerfile="\${incdir}/\${header}"
+ fi
+ ;;
+ esac
+ compiler="\${compiler} \${1}"
+ shift
+done
+
+if test "x\${headerfile}" = "x" ; then
+ echo "error: can't find header \${header} in include paths" >2
+else
+ if test -f \${outfile} ; then
+ rm -f \${outfile}
+ else
+ mkdir -p \`dirname \${outfile}\`
+ fi
+ depsfile=".deps/\`basename \${outfile}\`.d"
+ mkdir -p .deps
+ # can do this because gcc is >= 3.4:
+ \${compiler} -o \${outfile} -MMD -MF "\${depsfile}" "\${headerfile}"
+ exit \${?}
+fi
+EOF
+ chmod +x bk-make-pch
+ fi
+ fi
+ fi
+
+
+
+
+
COND_BUILD_DEBUG="#"
if test "x$BUILD" = "xdebug" ; then
COND_BUILD_DEBUG=""
COND_BUILD_DEBUG_DEBUG_INFO_DEFAULT=""
fi
+ COND_BUILD_DEBUG_UNICODE_0="#"
+ if test "x$BUILD" = "xdebug" -a "x$UNICODE" = "x0" ; then
+ COND_BUILD_DEBUG_UNICODE_0=""
+ fi
+
+ COND_BUILD_DEBUG_UNICODE_1="#"
+ if test "x$BUILD" = "xdebug" -a "x$UNICODE" = "x1" ; then
+ COND_BUILD_DEBUG_UNICODE_1=""
+ fi
+
COND_BUILD_RELEASE="#"
if test "x$BUILD" = "xrelease" ; then
COND_BUILD_RELEASE=""
COND_BUILD_RELEASE_DEBUG_INFO_DEFAULT=""
fi
+ COND_BUILD_RELEASE_UNICODE_0="#"
+ if test "x$BUILD" = "xrelease" -a "x$UNICODE" = "x0" ; then
+ COND_BUILD_RELEASE_UNICODE_0=""
+ fi
+
+ COND_BUILD_RELEASE_UNICODE_1="#"
+ if test "x$BUILD" = "xrelease" -a "x$UNICODE" = "x1" ; then
+ COND_BUILD_RELEASE_UNICODE_1=""
+ fi
+
COND_DEBUG_FLAG_1="#"
if test "x$DEBUG_FLAG" = "x1" ; then
COND_DEBUG_FLAG_1=""
COND_DEPS_TRACKING_1=""
fi
+ COND_GCC_PCH_1="#"
+ if test "x$GCC_PCH" = "x1" ; then
+ COND_GCC_PCH_1=""
+ fi
+
COND_MONOLITHIC_0="#"
if test "x$MONOLITHIC" = "x0" ; then
COND_MONOLITHIC_0=""
COND_MONOLITHIC_0_SHARED_0_USE_GUI_1=""
fi
+ COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1="#"
+ if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x0" -a "x$USE_GUI" = "x1" -a "x$USE_ODBC" = "x1" ; then
+ COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1=""
+ fi
+
COND_MONOLITHIC_0_SHARED_0_USE_HTML_1="#"
if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x0" -a "x$USE_HTML" = "x1" ; then
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_GUI_1=""
fi
+ COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1="#"
+ if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x1" -a "x$USE_GUI" = "x1" -a "x$USE_ODBC" = "x1" ; then
+ COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1=""
+ fi
+
COND_MONOLITHIC_0_SHARED_1_USE_HTML_1="#"
if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x1" -a "x$USE_HTML" = "x1" ; then
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_0_USE_ODBC_1="#"
+ if test "x$MONOLITHIC" = "x0" -a "x$USE_ODBC" = "x1" ; then
+ COND_MONOLITHIC_0_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=""
fi
+ COND_PLATFORM_MAC_1="#"
+ if test "x$PLATFORM_MAC" = "x1" ; then
+ 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=""
+ fi
+
COND_PLATFORM_UNIX_1="#"
if test "x$PLATFORM_UNIX" = "x1" ; then
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_UNIX_1_USE_PLUGINS_0="#"
+ if test "x$PLATFORM_UNIX" = "x1" -a "x$USE_PLUGINS" = "x0" ; then
+ COND_PLATFORM_UNIX_1_USE_PLUGINS_0=""
+ fi
+
COND_PLATFORM_WIN32_0="#"
if test "x$PLATFORM_WIN32" = "x0" ; then
COND_PLATFORM_WIN32_0=""
COND_PLATFORM_WIN32_1=""
fi
+ COND_SHARED_0="#"
+ if test "x$SHARED" = "x0" ; then
+ COND_SHARED_0=""
+ fi
+
COND_SHARED_0_USE_GUI_1_USE_OPENGL_1="#"
if test "x$SHARED" = "x0" -a "x$USE_GUI" = "x1" -a "x$USE_OPENGL" = "x1" ; then
COND_SHARED_0_USE_GUI_1_USE_OPENGL_1=""
fi
+ COND_SHARED_0_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN="#"
+ if test "x$SHARED" = "x0" -a "x$USE_GUI" = "x1" -a "x$wxUSE_LIBJPEG" = "xbuiltin" ; then
+ COND_SHARED_0_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN=""
+ fi
+
+ COND_SHARED_0_USE_GUI_1_WXUSE_LIBPNG_BUILTIN="#"
+ if test "x$SHARED" = "x0" -a "x$USE_GUI" = "x1" -a "x$wxUSE_LIBPNG" = "xbuiltin" ; then
+ COND_SHARED_0_USE_GUI_1_WXUSE_LIBPNG_BUILTIN=""
+ fi
+
+ COND_SHARED_0_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN="#"
+ if test "x$SHARED" = "x0" -a "x$USE_GUI" = "x1" -a "x$wxUSE_LIBTIFF" = "xbuiltin" ; then
+ COND_SHARED_0_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN=""
+ fi
+
+ COND_SHARED_0_WXUSE_EXPAT_BUILTIN="#"
+ if test "x$SHARED" = "x0" -a "x$wxUSE_EXPAT" = "xbuiltin" ; then
+ COND_SHARED_0_WXUSE_EXPAT_BUILTIN=""
+ fi
+
+ COND_SHARED_0_WXUSE_ODBC_BUILTIN="#"
+ if test "x$SHARED" = "x0" -a "x$wxUSE_ODBC" = "xbuiltin" ; then
+ COND_SHARED_0_WXUSE_ODBC_BUILTIN=""
+ fi
+
+ COND_SHARED_0_WXUSE_REGEX_BUILTIN="#"
+ if test "x$SHARED" = "x0" -a "x$wxUSE_REGEX" = "xbuiltin" ; then
+ COND_SHARED_0_WXUSE_REGEX_BUILTIN=""
+ fi
+
+ COND_SHARED_0_WXUSE_ZLIB_BUILTIN="#"
+ if test "x$SHARED" = "x0" -a "x$wxUSE_ZLIB" = "xbuiltin" ; then
+ COND_SHARED_0_WXUSE_ZLIB_BUILTIN=""
+ fi
+
+ COND_SHARED_1="#"
+ if test "x$SHARED" = "x1" ; then
+ COND_SHARED_1=""
+ fi
+
COND_SHARED_1_USE_GUI_1_USE_OPENGL_1="#"
if test "x$SHARED" = "x1" -a "x$USE_GUI" = "x1" -a "x$USE_OPENGL" = "x1" ; then
COND_SHARED_1_USE_GUI_1_USE_OPENGL_1=""
COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0=""
fi
- COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_1="#"
- if test "x$TOOLKIT" = "xGTK" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x1" ; then
- COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_1=""
- fi
-
COND_TOOLKIT_MAC="#"
if test "x$TOOLKIT" = "xMAC" ; then
COND_TOOLKIT_MAC=""
fi
+ COND_TOOLKIT_MAC_USE_GUI_1="#"
+ if test "x$TOOLKIT" = "xMAC" -a "x$USE_GUI" = "x1" ; then
+ COND_TOOLKIT_MAC_USE_GUI_1=""
+ fi
+
COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0="#"
if test "x$TOOLKIT" = "xMAC" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then
COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0=""
COND_TOOLKIT_MGL_USE_GUI_1=""
fi
- COND_TOOLKIT_MGL_USE_GUI_1_WXUNIV_1="#"
- if test "x$TOOLKIT" = "xMGL" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x1" ; then
- COND_TOOLKIT_MGL_USE_GUI_1_WXUNIV_1=""
- fi
-
COND_TOOLKIT_MOTIF="#"
if test "x$TOOLKIT" = "xMOTIF" ; then
COND_TOOLKIT_MOTIF=""
COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0=""
fi
- COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_1="#"
- if test "x$TOOLKIT" = "xMSW" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x1" ; then
- COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_1=""
+ COND_TOOLKIT_PM="#"
+ if test "x$TOOLKIT" = "xPM" ; then
+ COND_TOOLKIT_PM=""
fi
- COND_TOOLKIT_OS2="#"
- if test "x$TOOLKIT" = "xOS2" ; then
- COND_TOOLKIT_OS2=""
+ 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_TOOLKIT_X11_USE_GUI_1=""
fi
- COND_TOOLKIT_X11_USE_GUI_1_WXUNIV_1="#"
- if test "x$TOOLKIT" = "xX11" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x1" ; then
- COND_TOOLKIT_X11_USE_GUI_1_WXUNIV_1=""
- fi
-
COND_UNICODE_1="#"
if test "x$UNICODE" = "x1" ; then
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_PLUGINS_0="#"
+ if test "x$USE_PLUGINS" = "x0" ; then
+ COND_USE_PLUGINS_0=""
+ fi
+
COND_USE_SOSYMLINKS_1="#"
if test "x$USE_SOSYMLINKS" = "x1" ; then
COND_USE_SOSYMLINKS_1=""
COND_USE_SOVERSOLARIS_1=""
fi
+ COND_WITH_PLUGIN_SDL_1="#"
+ if test "x$WITH_PLUGIN_SDL" = "x1" ; then
+ COND_WITH_PLUGIN_SDL_1=""
+ fi
+
+ COND_WITH_SDL_1="#"
+ if test "x$WITH_SDL" = "x1" ; then
+ COND_WITH_SDL_1=""
+ fi
+
COND_WXUNIV_1="#"
if test "x$WXUNIV" = "x1" ; then
COND_WXUNIV_1=""
COND_WXUSE_ZLIB_BUILTIN=""
fi
- COND_PLATFORM_MAC_1="#"
- if test "x$PLATFORM_MAC" = "x1" ; then
- COND_PLATFORM_MAC_1=""
- fi
-
- COND_SHARED_1="#"
- if test "x$SHARED" = "x1" ; then
- COND_SHARED_1=""
- fi
-
- COND_SHARED_0="#"
- if test "x$SHARED" = "x0" ; then
- COND_SHARED_0=""
- fi
+if test $GCC_PCH = 1 ; then
+ CODE_GEN_FLAGS="-DWX_PRECOMP -DNO_GCC_PRAGMA $CODE_GEN_FLAGS"
+ CPPFLAGS="-DWX_PRECOMP -DNO_GCC_PRAGMA $CPPFLAGS"
+else
+ case "${host}" in
+ powerpc-*-darwin* )
+ CODE_GEN_FLAGS="-DNO_GCC_PRAGMA $CODE_GEN_FLAGS"
+ CPPFLAGS="-DNO_GCC_PRAGMA $CPPFLAGS"
+ ;;
+ esac
+fi
SAMPLES_SUBDIRS="`echo $SAMPLES_SUBDIRS | tr -s ' ' | tr ' ' '\n' | sort | uniq | tr '\n' ' '| tr -d '\r'`"
-
-
if test -d ${srcdir}/${subdir} ; then
if test "$wxUSE_GUI" = "yes"; then
if test ${subdir} = "samples"; then
- for sample in `echo $SAMPLES_SUBDIRS`; do
+ makefiles="samples/Makefile.in $makefiles"
+ for sample in `echo $SAMPLES_SUBDIRS`; do
if test -d $srcdir/samples/$sample; then
makefiles="samples/$sample/Makefile.in $makefiles"
fi
else makefiles=`(cd $srcdir ; find $subdir -name Makefile.in)`
fi
else if test ${subdir} = "samples"; then
- makefiles="samples/console/Makefile.in"
+ 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,@DEREZ@,$DEREZ,;t t
s,@SETFILE@,$SETFILE,;t t
s,@LIBICONV@,$LIBICONV,;t t
+s,@EXTRALIBS_ESD@,$EXTRALIBS_ESD,;t t
+s,@SDL_CONFIG@,$SDL_CONFIG,;t t
+s,@SDL_CFLAGS@,$SDL_CFLAGS,;t t
+s,@SDL_LIBS@,$SDL_LIBS,;t t
+s,@CORE_BASE_LIBS@,$CORE_BASE_LIBS,;t t
+s,@CORE_GUI_LIBS@,$CORE_GUI_LIBS,;t t
s,@wxUSE_ZLIB@,$wxUSE_ZLIB,;t t
s,@wxUSE_REGEX@,$wxUSE_REGEX,;t t
s,@wxUSE_EXPAT@,$wxUSE_EXPAT,;t t
s,@OFFICIAL_BUILD@,$OFFICIAL_BUILD,;t t
s,@WXUNIV@,$WXUNIV,;t t
s,@MONOLITHIC@,$MONOLITHIC,;t t
+s,@USE_PLUGINS@,$USE_PLUGINS,;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,@EXTRALIBS_SDL@,$EXTRALIBS_SDL,;t t
+s,@WITH_PLUGIN_SDL@,$WITH_PLUGIN_SDL,;t t
s,@UNICODE@,$UNICODE,;t t
s,@BUILD@,$BUILD,;t t
s,@DEBUG_INFO@,$DEBUG_INFO,;t t
s,@TOOLKIT_LOWERCASE@,$TOOLKIT_LOWERCASE,;t t
s,@TOOLKIT_VERSION@,$TOOLKIT_VERSION,;t t
s,@SAMPLES_RPATH_FLAG@,$SAMPLES_RPATH_FLAG,;t t
+s,@SAMPLES_RPATH_POSTLINK@,$SAMPLES_RPATH_POSTLINK,;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,@SHARED_LD_CC@,$SHARED_LD_CC,;t t
s,@SHARED_LD_CXX@,$SHARED_LD_CXX,;t t
+s,@SHARED_LD_MODULE_CC@,$SHARED_LD_MODULE_CC,;t t
+s,@SHARED_LD_MODULE_CXX@,$SHARED_LD_MODULE_CXX,;t t
s,@PIC_FLAG@,$PIC_FLAG,;t t
s,@USE_SOVERSION@,$USE_SOVERSION,;t t
s,@USE_SOVERLINUX@,$USE_SOVERLINUX,;t t
s,@USE_SOSYMLINKS@,$USE_SOSYMLINKS,;t t
s,@SONAME_FLAG@,$SONAME_FLAG,;t t
s,@DEPS_TRACKING@,$DEPS_TRACKING,;t t
+s,@GCC_PCH@,$GCC_PCH,;t t
s,@COND_BUILD_DEBUG@,$COND_BUILD_DEBUG,;t t
s,@COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT@,$COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT,;t t
s,@COND_BUILD_DEBUG_DEBUG_INFO_DEFAULT@,$COND_BUILD_DEBUG_DEBUG_INFO_DEFAULT,;t t
+s,@COND_BUILD_DEBUG_UNICODE_0@,$COND_BUILD_DEBUG_UNICODE_0,;t t
+s,@COND_BUILD_DEBUG_UNICODE_1@,$COND_BUILD_DEBUG_UNICODE_1,;t t
s,@COND_BUILD_RELEASE@,$COND_BUILD_RELEASE,;t t
s,@COND_BUILD_RELEASE_DEBUG_INFO_DEFAULT@,$COND_BUILD_RELEASE_DEBUG_INFO_DEFAULT,;t t
+s,@COND_BUILD_RELEASE_UNICODE_0@,$COND_BUILD_RELEASE_UNICODE_0,;t t
+s,@COND_BUILD_RELEASE_UNICODE_1@,$COND_BUILD_RELEASE_UNICODE_1,;t t
s,@COND_DEBUG_FLAG_1@,$COND_DEBUG_FLAG_1,;t t
s,@COND_DEBUG_INFO_0@,$COND_DEBUG_INFO_0,;t t
s,@COND_DEBUG_INFO_1@,$COND_DEBUG_INFO_1,;t t
s,@COND_DEPS_TRACKING_0@,$COND_DEPS_TRACKING_0,;t t
s,@COND_DEPS_TRACKING_1@,$COND_DEPS_TRACKING_1,;t t
+s,@COND_GCC_PCH_1@,$COND_GCC_PCH_1,;t t
s,@COND_MONOLITHIC_0@,$COND_MONOLITHIC_0,;t t
s,@COND_MONOLITHIC_0_SHARED_0@,$COND_MONOLITHIC_0_SHARED_0,;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_0_USE_ODBC_1@,$COND_MONOLITHIC_0_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_UNIX_1_USE_PLUGINS_0@,$COND_PLATFORM_UNIX_1_USE_PLUGINS_0,;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_SHARED_0_USE_GUI_1_USE_OPENGL_1@,$COND_SHARED_0_USE_GUI_1_USE_OPENGL_1,;t t
+s,@COND_SHARED_0_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@,$COND_SHARED_0_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN,;t t
+s,@COND_SHARED_0_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@,$COND_SHARED_0_USE_GUI_1_WXUSE_LIBPNG_BUILTIN,;t t
+s,@COND_SHARED_0_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@,$COND_SHARED_0_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN,;t t
+s,@COND_SHARED_0_WXUSE_EXPAT_BUILTIN@,$COND_SHARED_0_WXUSE_EXPAT_BUILTIN,;t t
+s,@COND_SHARED_0_WXUSE_ODBC_BUILTIN@,$COND_SHARED_0_WXUSE_ODBC_BUILTIN,;t t
+s,@COND_SHARED_0_WXUSE_REGEX_BUILTIN@,$COND_SHARED_0_WXUSE_REGEX_BUILTIN,;t t
+s,@COND_SHARED_0_WXUSE_ZLIB_BUILTIN@,$COND_SHARED_0_WXUSE_ZLIB_BUILTIN,;t t
+s,@COND_SHARED_1@,$COND_SHARED_1,;t t
s,@COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@,$COND_SHARED_1_USE_GUI_1_USE_OPENGL_1,;t t
s,@COND_TOOLKIT_COCOA@,$COND_TOOLKIT_COCOA,;t t
s,@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@,$COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0,;t t
s,@COND_TOOLKIT_GTK@,$COND_TOOLKIT_GTK,;t t
s,@COND_TOOLKIT_GTK_USE_GUI_1@,$COND_TOOLKIT_GTK_USE_GUI_1,;t t
s,@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@,$COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0,;t t
-s,@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_1@,$COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_1,;t t
s,@COND_TOOLKIT_MAC@,$COND_TOOLKIT_MAC,;t t
+s,@COND_TOOLKIT_MAC_USE_GUI_1@,$COND_TOOLKIT_MAC_USE_GUI_1,;t t
s,@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@,$COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0,;t t
s,@COND_TOOLKIT_MGL@,$COND_TOOLKIT_MGL,;t t
s,@COND_TOOLKIT_MGL_USE_GUI_1@,$COND_TOOLKIT_MGL_USE_GUI_1,;t t
-s,@COND_TOOLKIT_MGL_USE_GUI_1_WXUNIV_1@,$COND_TOOLKIT_MGL_USE_GUI_1_WXUNIV_1,;t t
s,@COND_TOOLKIT_MOTIF@,$COND_TOOLKIT_MOTIF,;t t
s,@COND_TOOLKIT_MOTIF_USE_GUI_1@,$COND_TOOLKIT_MOTIF_USE_GUI_1,;t t
s,@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@,$COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_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_MSW_USE_GUI_1_WXUNIV_1@,$COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_1,;t t
-s,@COND_TOOLKIT_OS2@,$COND_TOOLKIT_OS2,;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_TOOLKIT_X11_USE_GUI_1_WXUNIV_1@,$COND_TOOLKIT_X11_USE_GUI_1_WXUNIV_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_PLUGINS_0@,$COND_USE_PLUGINS_0,;t t
s,@COND_USE_SOSYMLINKS_1@,$COND_USE_SOSYMLINKS_1,;t t
s,@COND_USE_SOVERLINUX_1@,$COND_USE_SOVERLINUX_1,;t t
s,@COND_USE_SOVERSION_0@,$COND_USE_SOVERSION_0,;t t
s,@COND_USE_SOVERSOLARIS_1@,$COND_USE_SOVERSOLARIS_1,;t t
+s,@COND_WITH_PLUGIN_SDL_1@,$COND_WITH_PLUGIN_SDL_1,;t t
+s,@COND_WITH_SDL_1@,$COND_WITH_SDL_1,;t t
s,@COND_WXUNIV_1@,$COND_WXUNIV_1,;t t
s,@COND_WXUSE_EXPAT_BUILTIN@,$COND_WXUSE_EXPAT_BUILTIN,;t t
s,@COND_WXUSE_LIBJPEG_BUILTIN@,$COND_WXUSE_LIBJPEG_BUILTIN,;t t
s,@COND_WXUSE_ODBC_BUILTIN@,$COND_WXUSE_ODBC_BUILTIN,;t t
s,@COND_WXUSE_REGEX_BUILTIN@,$COND_WXUSE_REGEX_BUILTIN,;t t
s,@COND_WXUSE_ZLIB_BUILTIN@,$COND_WXUSE_ZLIB_BUILTIN,;t t
-s,@COND_PLATFORM_MAC_1@,$COND_PLATFORM_MAC_1,;t t
-s,@COND_SHARED_1@,$COND_SHARED_1,;t t
-s,@COND_SHARED_0@,$COND_SHARED_0,;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,@RESPROGRAMOBJ@,$RESPROGRAMOBJ,;t t
s,@WX_RESOURCES_MACOSX_ASCII@,$WX_RESOURCES_MACOSX_ASCII,;t t
s,@WX_RESOURCES_MACOSX_DATA@,$WX_RESOURCES_MACOSX_DATA,;t t
-s,@MACOSX_BUNDLE@,$MACOSX_BUNDLE,;t t
s,@LIBWXMACRES@,$LIBWXMACRES,;t t
s,@MACRESCOMP@,$MACRESCOMP,;t t
s,@MACSETFILE@,$MACSETFILE,;t t
s,@MACRESWXCONFIG@,$MACRESWXCONFIG,;t t
s,@GCC@,$GCC,;t t
+s,@GCC_SEARCHES_USR_LOCAL_INCLUDE@,$GCC_SEARCHES_USR_LOCAL_INCLUDE,;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
-s,@ESD_LINK@,$ESD_LINK,;t t
s,@LIBOBJS@,$LIBOBJS,;t t
s,@LTLIBOBJS@,$LTLIBOBJS,;t t
CEOF
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 " sdl ${wxUSE_LIBSDL}"
echo ""
projects / wxWidgets.git / blobdiff