X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f0290fcacd37cb12733e5b26e8b5e94a12043681..169948a05ff0707ecddc12f9e26d2a0a994fa0ae:/configure diff --git a/configure b/configure index befe56f927..22108e48a4 100755 --- a/configure +++ b/configure @@ -311,7 +311,8 @@ ac_includes_default="\ # include #endif" -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 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 AIX_CXX_LD RESCOMP DEREZ SETFILE LIBICONV wxUSE_ZLIB wxUSE_REGEX wxUSE_ODBC wxUSE_LIBJPEG wxUSE_LIBPNG wxUSE_LIBTIFF VENDOR OFFICIAL_BUILD WXUNIV MONOLITHIC EXTRALIBS UNICODE BUILD SHARED TOOLKIT_LOWERCASE TOOLKIT_VERSION SAMPLES_RPATH_FLAG SET_MAKE MAKE_SET INSTALL_DIR LDFLAGS_GUI PLATFORM_UNIX PLATFORM_WIN32 PLATFORM_MSDOS PLATFORM_MAC PLATFORM_MACOSX SO_SUFFIX DLLPREFIX SHARED_LD_CC SHARED_LD_CXX PIC_FLAG USE_SOVERSION USE_SOVERLINUX USE_SOVERSOLARIS USE_MACVERSION USE_SOSYMLINKS SONAME_FLAG DEPS_TRACKING COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_1 COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0 COND_PLATFORM_MACOSX_1_USE_GUI_1 COND_PLATFORM_MACOSX_1_USE_GUI_0 COND_DEPS_TRACKING_0 COND_DEPS_TRACKING_1 COND_TOOLKIT_MOTIF_USE_GUI_1 COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_1 COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_COCOA_USE_GUI_1 COND_USE_SOVERSOLARIS_1 COND_MONOLITHIC_1 COND_UNICODE_1 COND_MONOLITHIC_0 COND_TOOLKIT_MGL COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_X11_USE_GUI_1_WXUNIV_0 COND_WXUSE_ODBC_BUILTIN COND_USE_SOVERSION_0 COND_WXUNIV_1 COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_1 COND_PLATFORM_UNIX_1 COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0 COND_WXUSE_REGEX_BUILTIN COND_TOOLKIT_MGL_USE_GUI_1_WXUNIV_1 COND_MONOLITHIC_1_SHARED_0 COND_MONOLITHIC_1_SHARED_1 COND_PLATFORM_UNIX_1_USE_GUI_0 COND_PLATFORM_UNIX_1_USE_GUI_1 COND_TOOLKIT_X11 COND_OFFICIAL_BUILD_0 COND_TOOLKIT_OS2 COND_TOOLKIT_MGL_USE_GUI_1 COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_1 COND_WXUSE_ZLIB_BUILTIN COND_TOOLKIT_MOTIF COND_MONOLITHIC_0_SHARED_1 COND_PLATFORM_MACOSX_1_USE_SOVERSION_1 COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_1 COND_MONOLITHIC_0_SHARED_0 COND_USE_GUI_1 COND_USE_GUI_0 COND_USE_GUI_0_USE_GUI_1 COND_TOOLKIT_MSW COND_TOOLKIT_X11_USE_GUI_1 COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0 COND_BUILD_DEBUG COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_1 COND_WXUSE_LIBTIFF_BUILTIN COND_OFFICIAL_BUILD_1 COND_BUILD_RELEASE COND_TOOLKIT_MGL_USE_GUI_1_WXUNIV_0 COND_USE_SOVERLINUX_1 COND_USE_SOSYMLINKS_1 COND_TOOLKIT_COCOA COND_PLATFORM_MACOSX_1 COND_WXUSE_LIBJPEG_BUILTIN COND_WXUSE_LIBPNG_BUILTIN COND_MONOLITHIC_0_SHARED_1_USE_GUI_1 COND_PLATFORM_MACOSX_0_USE_SOVERSION_1 COND_TOOLKIT_X11_USE_GUI_1_WXUNIV_1 COND_USE_GUI_1_WXUNIV_0 COND_USE_GUI_1_WXUNIV_1 COND_TOOLKIT_GTK COND_PLATFORM_WIN32_1_USE_GUI_0 COND_PLATFORM_WIN32_1_USE_GUI_1 COND_PLATFORM_WIN32_0 COND_PLATFORM_WIN32_1 COND_TOOLKIT_GTK_USE_GUI_1 COND_TOOLKIT_MAC COND_TOOLKIT_MSW_USE_GUI_1 COND_MONOLITHIC_0_SHARED_0_USE_GUI_1 COND_SHARED_1 COND_PLATFORM_MAC_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 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_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_subdirs_all="$ac_subdirs_all src/expat" +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP CXX CXXFLAGS ac_ct_CXX RANLIB ac_ct_RANLIB AR INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA STRIP IF_GNU_MAKE YACC LEX LEXLIB LEX_OUTPUT_ROOT LN_S CXXCPP subdirs PKG_CONFIG GTK_CFLAGS GTK_LIBS GTK_CONFIG PANGOFT2_CFLAGS PANGOFT2_LIBS X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS PANGOX_CFLAGS PANGOX_LIBS PANGOXFT_CFLAGS PANGOXFT_LIBS RESCOMP DEREZ SETFILE LIBICONV EXTRALIBS_ESD CORE_BASE_LIBS CORE_GUI_LIBS wxUSE_ZLIB wxUSE_REGEX wxUSE_EXPAT wxUSE_ODBC wxUSE_LIBJPEG wxUSE_LIBPNG wxUSE_LIBTIFF VENDOR OFFICIAL_BUILD WXUNIV MONOLITHIC EXTRALIBS EXTRALIBS_XML EXTRALIBS_ODBC EXTRALIBS_GUI EXTRALIBS_OPENGL UNICODE BUILD DEBUG_INFO DEBUG_FLAG SHARED TOOLKIT_LOWERCASE TOOLKIT_VERSION SAMPLES_RPATH_FLAG HOST_SUFFIX SET_MAKE MAKE_SET INSTALL_DIR LDFLAGS_GUI PLATFORM_UNIX PLATFORM_WIN32 PLATFORM_MSDOS PLATFORM_MAC PLATFORM_MACOSX SO_SUFFIX SO_SUFFIX_MODULE DLLPREFIX DLLPREFIX_MODULE AIX_CXX_LD SHARED_LD_CC SHARED_LD_CXX SHARED_LD_MODULE_CC SHARED_LD_MODULE_CXX PIC_FLAG USE_SOVERSION USE_SOVERLINUX USE_SOVERSOLARIS USE_MACVERSION USE_SOSYMLINKS SONAME_FLAG DEPS_TRACKING 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 COND_TOOLKIT_MAC_USE_GUI_1 COND_TOOLKIT_OS2_USE_GUI_1 COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1 COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1 LEX_STEM PATH_IFS WX_MAJOR_VERSION_NUMBER WX_MINOR_VERSION_NUMBER WX_RELEASE_NUMBER WX_LIBRARY_NAME_STATIC WX_LIBRARY_NAME_SHARED WX_LIBRARY_BASENAME_NOGUI WX_LIBRARY_BASENAME_GUI WX_LIBRARY_IMPORTLIB WX_TARGET_LIBRARY WX_LIBRARY_LINK1 WX_LIBRARY_LINK2 PROGRAM_EXT WX_LIBRARY_NAME_STATIC_GL WX_LIBRARY_NAME_SHARED_GL WX_TARGET_LIBRARY_GL WX_LIBRARY_LINK1_GL WX_LIBRARY_LINK2_GL WX_ALL WX_ALL_INSTALLED SHARED_LD WX_TARGET_LIBRARY_TYPE STATIC_FLAG WXDEBUG_DEFINE USE_GUI AFMINSTALL WIN32INSTALL TOOLKIT TOOLKIT_DIR TOOLKIT_VPATH TOOLCHAIN_NAME TOOLCHAIN_DEFS TOOLCHAIN_DLL_DEFS top_builddir_wxconfig cross_compiling WXCONFIG_EXTRALIBS WXCONFIG_LIBS WXCONFIG_LIBS_GL WXCONFIG_LIBS_STATIC WXCONFIG_LIBS_STATIC_GL WXCONFIG_INCLUDE WXCONFIG_RPATH WX_LARGEFILE_FLAGS CODE_GEN_FLAGS CODE_GEN_FLAGS_CXX ALL_OBJECTS ALL_HEADERS ALL_SOURCES GUIDIST PORT_FILES DISTDIR SAMPLES_SUBDIRS LDFLAGS_GL LDFLAGS_VERSIONING LDFLAGS_EXE OPENGL_LIBS DMALLOC_LIBS WX_VERSION_TAG RESFLAGS RESPROGRAMOBJ WX_RESOURCES_MACOSX_ASCII WX_RESOURCES_MACOSX_DATA MACOSX_BUNDLE LIBWXMACRES MACRESCOMP MACSETFILE MACRESWXCONFIG GCC DLLTOOL AS NM LD MAKEINFO INSTALL_LIBRARY LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -873,7 +874,7 @@ Optional Features: --enable-shared create shared library code --enable-optimise create optimised code --enable-debug same as debug_flag and debug_info - --enable-precomp enable use of precompiled headers (Mac OS X/Darwin) + --enable-stl use STL for containers --enable-debug_flag set __WXDEBUG__ flag (recommended for developers!) --enable-debug_info create code with debugging information --enable-debug_gdb create code with extra GDB debugging information @@ -1023,6 +1024,8 @@ Optional Features: --enable-pnm use pnm images (PNM file format) --enable-xpm use xpm images (XPM file format) --enable-icocur use Windows ICO and CUR formats + --enable-official_build official build of wxWindows (win32 DLL only) + --enable-vendor=VENDOR vendor name (win32 DLL only) --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 @@ -1048,6 +1051,7 @@ Optional Packages: --with-regex enable support for wxRegEx class --with-zlib use zlib for LZW compression --with-odbc use the IODBC and wxODBC classes + --with-expat enable XML support using expat parser --with-gtk-prefix=PFX Prefix where GTK is installed (optional) --with-gtk-exec-prefix=PFX Exec prefix where GTK is installed (optional) --with-x use the X Window System @@ -1937,6 +1941,7 @@ esac DEBUG_CONFIGURE=0 if test $DEBUG_CONFIGURE = 1; then DEFAULT_wxUSE_UNIVERSAL=no + DEFAULT_wxUSE_STL=no DEFAULT_wxUSE_NANOX=no @@ -1955,7 +1960,6 @@ if test $DEBUG_CONFIGURE = 1; then DEFAULT_wxUSE_MEM_TRACING=no DEFAULT_wxUSE_DEBUG_CONTEXT=no DEFAULT_wxUSE_DMALLOC=no - DEFAULT_wxUSE_PRECOMP=no DEFAULT_wxUSE_APPLE_IEEE=no DEFAULT_wxUSE_LOG=yes @@ -1967,6 +1971,8 @@ if test $DEBUG_CONFIGURE = 1; then DEFAULT_wxUSE_CONTROLS=no DEFAULT_wxUSE_REGEX=no + DEFAULT_wxUSE_XML=no + DEFAULT_wxUSE_EXPAT=no DEFAULT_wxUSE_ZLIB=no DEFAULT_wxUSE_LIBPNG=no DEFAULT_wxUSE_LIBJPEG=no @@ -2109,8 +2115,10 @@ if test $DEBUG_CONFIGURE = 1; then DEFAULT_wxUSE_ACCESSIBILITY=no DEFAULT_wxUSE_MONOLITHIC=yes + DEFAULT_wxUSE_OFFICIAL_BUILD=no else DEFAULT_wxUSE_UNIVERSAL=no + DEFAULT_wxUSE_STL=no DEFAULT_wxUSE_NANOX=no @@ -2129,7 +2137,6 @@ else DEFAULT_wxUSE_MEM_TRACING=no DEFAULT_wxUSE_DEBUG_CONTEXT=no DEFAULT_wxUSE_DMALLOC=no - DEFAULT_wxUSE_PRECOMP=no DEFAULT_wxUSE_APPLE_IEEE=yes DEFAULT_wxUSE_LOG=yes @@ -2140,6 +2147,8 @@ else DEFAULT_wxUSE_GUI=yes DEFAULT_wxUSE_REGEX=yes + DEFAULT_wxUSE_XML=yes + DEFAULT_wxUSE_EXPAT=yes DEFAULT_wxUSE_ZLIB=yes DEFAULT_wxUSE_LIBPNG=yes DEFAULT_wxUSE_LIBJPEG=yes @@ -2282,6 +2291,7 @@ else DEFAULT_wxUSE_ACCESSIBILITY=no DEFAULT_wxUSE_MONOLITHIC=yes + DEFAULT_wxUSE_OFFICIAL_BUILD=no fi @@ -3006,6 +3016,65 @@ echo "$as_me: error: Invalid value for --with-odbc: should be yes, no, sys, or b fi + echo "$as_me:$LINENO: checking for --with-expat" >&5 +echo $ECHO_N "checking for --with-expat... $ECHO_C" >&6 + no_cache=0 + +# Check whether --with-expat or --without-expat was given. +if test "${with_expat+set}" = set; then + withval="$with_expat" + + if test "$withval" = yes; then + ac_cv_use_expat='wxUSE_EXPAT=yes' + elif test "$withval" = no; then + ac_cv_use_expat='wxUSE_EXPAT=no' + elif test "$withval" = sys; then + ac_cv_use_expat='wxUSE_EXPAT=sys' + elif test "$withval" = builtin; then + ac_cv_use_expat='wxUSE_EXPAT=builtin' + else + { { echo "$as_me:$LINENO: error: Invalid value for --with-expat: should be yes, no, sys, or builtin" >&5 +echo "$as_me: error: Invalid value for --with-expat: should be yes, no, sys, or builtin" >&2;} + { (exit 1); exit 1; }; } + fi + +else + + LINE=`grep "wxUSE_EXPAT" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_expat='wxUSE_EXPAT='$DEFAULT_wxUSE_EXPAT + +fi; + + eval "$ac_cv_use_expat" + if test "$no_cache" != 1; then + echo $ac_cv_use_expat >> ${wx_arg_cache_file}.tmp + fi + + if test "$wxUSE_EXPAT" = yes; then + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + elif test "$wxUSE_EXPAT" = no; then + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 + elif test "$wxUSE_EXPAT" = sys; then + echo "$as_me:$LINENO: result: system version" >&5 +echo "${ECHO_T}system version" >&6 + elif test "$wxUSE_EXPAT" = 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-expat: should be yes, no, sys, or builtin" >&5 +echo "$as_me: error: Invalid value for --with-expat: should be yes, no, sys, or builtin" >&2;} + { (exit 1); exit 1; }; } + fi + + enablestring= @@ -3131,40 +3200,39 @@ echo "${ECHO_T}no" >&6 fi - enablestring= - echo "$as_me:$LINENO: checking for --${enablestring:-enable}-precomp" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-precomp... $ECHO_C" >&6 + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-stl" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-stl... $ECHO_C" >&6 no_cache=0 - # Check whether --enable-precomp or --disable-precomp was given. -if test "${enable_precomp+set}" = set; then - enableval="$enable_precomp" + # Check whether --enable-stl or --disable-stl was given. +if test "${enable_stl+set}" = set; then + enableval="$enable_stl" if test "$enableval" = yes; then - ac_cv_use_precomp='wxUSE_PRECOMP=yes' + ac_cv_use_stl='wxUSE_STL=yes' else - ac_cv_use_precomp='wxUSE_PRECOMP=no' + ac_cv_use_stl='wxUSE_STL=no' fi else - LINE=`grep "wxUSE_PRECOMP" ${wx_arg_cache_file}` + LINE=`grep "wxUSE_STL" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_precomp='wxUSE_PRECOMP='$DEFAULT_wxUSE_PRECOMP + ac_cv_use_stl='wxUSE_STL='$DEFAULT_wxUSE_STL fi; - eval "$ac_cv_use_precomp" + eval "$ac_cv_use_stl" if test "$no_cache" != 1; then - echo $ac_cv_use_precomp >> ${wx_arg_cache_file}.tmp + echo $ac_cv_use_stl >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_PRECOMP" = yes; then + if test "$wxUSE_STL" = yes; then echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6 else @@ -3176,9 +3244,11 @@ echo "${ECHO_T}no" >&6 if test "$wxUSE_DEBUG" = "yes"; then DEFAULT_wxUSE_DEBUG_FLAG=yes DEFAULT_wxUSE_DEBUG_INFO=yes + BUILD=debug elif test "$wxUSE_DEBUG" = "no"; then DEFAULT_wxUSE_DEBUG_FLAG=no DEFAULT_wxUSE_DEBUG_INFO=no + BUILD=release fi @@ -6495,31 +6565,13 @@ fi ## FIXME: This is a blatant hack if test "x$wxUSE_COCOA" != "x" -a "$wxUSE_COCOA" != "0" ; then wxUSE_PRINTING_ARCHITECTURE=no - wxUSE_HELP=no - wxUSE_CLIPBOARD=no wxUSE_DRAG_AND_DROP=no - wxUSE_DATAOBJ=no # Generic notebook requires tab dialog DEFAULT_wxUSE_TABDIALOG=yes DEFAULT_wxUSE_TOOLBAR_NATIVE=no - DEFAULT_wxUSE_GAUGE=no DEFAULT_wxUSE_SCROLLBAR=no - DEFAULT_wxUSE_COMBOBOX=no - DEFAULT_wxUSE_CALCTRL=no - DEFAULT_wxUSE_SPINBTN=no - DEFAULT_wxUSE_SPINCTRL=no DEFAULT_wxUSE_TOOLTIPS=no DEFAULT_wxUSE_DRAGIMAGE=no - DEFAULT_wxUSE_FINDREPLDLG=no - DEFAULT_wxUSE_FONTDLG=no - DEFAULT_wxUSE_GRID=no - DEFAULT_wxUSE_NUMBERDLG=no - DEFAULT_wxUSE_PROGRESSDLG=no - DEFAULT_wxUSE_SASH=no - DEFAULT_wxUSE_SPLITTER=no - DEFAULT_wxUSE_WIZARDDLG=no - DEFAULT_wxUSE_SPLITTER=no - DEFAULT_wxUSE_STARTUP_TIPS=no fi @@ -9401,6 +9453,57 @@ echo "${ECHO_T}no" >&6 fi + + + enablestring= + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-official_build" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-official_build... $ECHO_C" >&6 + no_cache=0 + # Check whether --enable-official_build or --disable-official_build was given. +if test "${enable_official_build+set}" = set; then + enableval="$enable_official_build" + + if test "$enableval" = yes; then + ac_cv_use_official_build='wxUSE_OFFICIAL_BUILD=yes' + else + ac_cv_use_official_build='wxUSE_OFFICIAL_BUILD=no' + fi + +else + + LINE=`grep "wxUSE_OFFICIAL_BUILD" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_official_build='wxUSE_OFFICIAL_BUILD='$DEFAULT_wxUSE_OFFICIAL_BUILD + +fi; + + eval "$ac_cv_use_official_build" + if test "$no_cache" != 1; then + echo $ac_cv_use_official_build >> ${wx_arg_cache_file}.tmp + fi + + if test "$wxUSE_OFFICIAL_BUILD" = 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 + +# Check whether --enable-vendor or --disable-vendor was given. +if test "${enable_vendor+set}" = set; then + enableval="$enable_vendor" + VENDOR="$enableval" +fi; +if test "x$VENDOR" = "x"; then + VENDOR="custom" +fi + case "${host}" in *-pc-os2_emx | *-pc-os2-emx ) PATH_IFS=';' @@ -17608,6 +17711,170 @@ _ACEOF fi +if test "$wxUSE_STL" = "yes"; then + 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 basic STL functionality" >&5 +echo $ECHO_N "checking for basic STL functionality... $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 + #include + #include + #include + #include +int +main () +{ +std::vector moo; + std::list foo; + std::vector::iterator it = + std::find_if(moo.begin(), moo.end(), + std::bind2nd(std::less(), 3)); + ; + 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 +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: error: Basic STL functionality missing" >&5 +echo "$as_me: error: Basic STL functionality missing" >&2;} + { (exit 1); exit 1; }; } +fi +rm -f conftest.$ac_objext conftest.$ac_ext + + echo "$as_me:$LINENO: checking for std::wstring in " >&5 +echo $ECHO_N "checking for std::wstring in ... $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 +int +main () +{ +std::wstring foo; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + cat >>confdefs.h <<\_ACEOF +#define HAVE_STD_WSTRING 1 +_ACEOF + +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi +rm -f conftest.$ac_objext conftest.$ac_ext + + echo "$as_me:$LINENO: checking for compliant std::string::compare" >&5 +echo $ECHO_N "checking for compliant std::string::compare... $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 +int +main () +{ +std::string foo, bar; + foo.compare(bar); + foo.compare(1, 1, bar); + foo.compare(1, 1, bar, 1, 1); + foo.compare(""); + foo.compare(1, 1, ""); + foo.compare(1, 1, "", 2); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + cat >>confdefs.h <<\_ACEOF +#define HAVE_STD_STRING_COMPARE 1 +_ACEOF + +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi +rm -f conftest.$ac_objext conftest.$ac_ext + + 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 + SEARCH_INCLUDE="\ /usr/local/include \ @@ -19019,168 +19286,30 @@ echo "$as_me: WARNING: system tiff library not found, will use built-in instead" fi -AFMINSTALL= -WIN32INSTALL= - -TOOLKIT= -TOOLKIT_INCLUDE= -WIDGET_SET= - -if test "$USE_WIN32" = 1 ; then - -for ac_header in w32api.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 $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. */ -$ac_includes_default -#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 - 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 $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> +if test "$wxUSE_EXPAT" != "no"; then + wxUSE_XML=1 + cat >>confdefs.h <<\_ACEOF +#define wxUSE_EXPAT 1 _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 + cat >>confdefs.h <<\_ACEOF +#define wxUSE_XML 1 _ACEOF -fi -done - - if test "${ac_cv_header_windows_h+set}" = set; then - echo "$as_me:$LINENO: checking for windows.h" >&5 -echo $ECHO_N "checking for windows.h... $ECHO_C" >&6 -if test "${ac_cv_header_windows_h+set}" = set; then + if test "$wxUSE_EXPAT" = "sys" -o "$wxUSE_EXPAT" = "yes" ; then + if test "${ac_cv_header_expat_h+set}" = set; then + echo "$as_me:$LINENO: checking for expat.h" >&5 +echo $ECHO_N "checking for expat.h... $ECHO_C" >&6 +if test "${ac_cv_header_expat_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -echo "$as_me:$LINENO: result: $ac_cv_header_windows_h" >&5 -echo "${ECHO_T}$ac_cv_header_windows_h" >&6 +echo "$as_me:$LINENO: result: $ac_cv_header_expat_h" >&5 +echo "${ECHO_T}$ac_cv_header_expat_h" >&6 else # Is the header compilable? -echo "$as_me:$LINENO: checking windows.h usability" >&5 -echo $ECHO_N "checking windows.h usability... $ECHO_C" >&6 +echo "$as_me:$LINENO: checking expat.h usability" >&5 +echo $ECHO_N "checking expat.h usability... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" /* confdefs.h. */ @@ -19189,7 +19318,7 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default -#include +#include _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 @@ -19215,8 +19344,8 @@ 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 windows.h presence" >&5 -echo $ECHO_N "checking windows.h presence... $ECHO_C" >&6 +echo "$as_me:$LINENO: checking expat.h presence" >&5 +echo $ECHO_N "checking expat.h presence... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" /* confdefs.h. */ @@ -19224,7 +19353,7 @@ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include +#include _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 @@ -19257,10 +19386,10 @@ 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: windows.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: windows.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: windows.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: windows.h: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: expat.h: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: expat.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: expat.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: expat.h: proceeding with the preprocessor's result" >&2;} ( cat <<\_ASBOX ## ------------------------------------ ## @@ -19271,12 +19400,12 @@ _ASBOX sed "s/^/$as_me: WARNING: /" >&2 ;; no:yes ) - { echo "$as_me:$LINENO: WARNING: windows.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: windows.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: windows.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: windows.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: windows.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: windows.h: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: expat.h: present but cannot be compiled" >&5 +echo "$as_me: WARNING: expat.h: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: expat.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: expat.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: expat.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: expat.h: proceeding with the preprocessor's result" >&2;} ( cat <<\_ASBOX ## ------------------------------------ ## @@ -19287,60 +19416,204 @@ _ASBOX sed "s/^/$as_me: WARNING: /" >&2 ;; esac -echo "$as_me:$LINENO: checking for windows.h" >&5 -echo $ECHO_N "checking for windows.h... $ECHO_C" >&6 -if test "${ac_cv_header_windows_h+set}" = set; then +echo "$as_me:$LINENO: checking for expat.h" >&5 +echo $ECHO_N "checking for expat.h... $ECHO_C" >&6 +if test "${ac_cv_header_expat_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_cv_header_windows_h=$ac_header_preproc + ac_cv_header_expat_h=$ac_header_preproc fi -echo "$as_me:$LINENO: result: $ac_cv_header_windows_h" >&5 -echo "${ECHO_T}$ac_cv_header_windows_h" >&6 +echo "$as_me:$LINENO: result: $ac_cv_header_expat_h" >&5 +echo "${ECHO_T}$ac_cv_header_expat_h" >&6 fi -if test $ac_cv_header_windows_h = yes; then - : -else - - { { echo "$as_me:$LINENO: error: please set CFLAGS to contain the location of windows.h" >&5 -echo "$as_me: error: please set CFLAGS to contain the location of windows.h" >&2;} - { (exit 1); exit 1; }; } - +if test $ac_cv_header_expat_h = yes; then + found_expat_h=1 fi - - echo "$as_me:$LINENO: checking if w32api has good enough MSIE support" >&5 -echo $ECHO_N "checking if w32api has good enough MSIE support... $ECHO_C" >&6 -if test "${wx_cv_w32api_win32_ie+set}" = set; then + if test "x$found_expat_h" = "x1"; then + echo "$as_me:$LINENO: checking if expat.h is valid C++ header" >&5 +echo $ECHO_N "checking if expat.h is valid C++ header... $ECHO_C" >&6 +if test "${wx_cv_expat_is_not_broken+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF + + + 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 +#include int main () { - #define wxCHECK_W32API_VERSION( major, minor ) \ - ( defined( __W32API_MAJOR_VERSION ) && defined( __W32API_MINOR_VERSION ) \ - && ( ( __W32API_MAJOR_VERSION > (major) ) \ - || ( __W32API_MAJOR_VERSION == (major) && __W32API_MINOR_VERSION >= (minor)))) + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + wx_cv_expat_is_not_broken=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +wx_cv_expat_is_not_broken=no - #if !wxCHECK_W32API_VERSION(1,1) - #error You need w32api 1.1 or newer - #endif +fi +rm -f conftest.$ac_objext conftest.$ac_ext + ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + +fi +echo "$as_me:$LINENO: result: $wx_cv_expat_is_not_broken" >&5 +echo "${ECHO_T}$wx_cv_expat_is_not_broken" >&6 + if test "$wx_cv_expat_is_not_broken" = "yes" ; then + echo "$as_me:$LINENO: checking for XML_ParserCreate in -lexpat" >&5 +echo $ECHO_N "checking for XML_ParserCreate in -lexpat... $ECHO_C" >&6 +if test "${ac_cv_lib_expat_XML_ParserCreate+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lexpat $LIBS" +cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char XML_ParserCreate (); +int +main () +{ +XML_ParserCreate (); ; return 0; } _ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_expat_XML_ParserCreate=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_lib_expat_XML_ParserCreate=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:$LINENO: result: $ac_cv_lib_expat_XML_ParserCreate" >&5 +echo "${ECHO_T}$ac_cv_lib_expat_XML_ParserCreate" >&6 +if test $ac_cv_lib_expat_XML_ParserCreate = yes; then + EXPAT_LINK=" -lexpat" +fi + + fi + fi + if test "x$EXPAT_LINK" = "x" ; then + if test "$wxUSE_EXPAT" = "sys" ; then + { { echo "$as_me:$LINENO: error: system expat library not found! Use --with-expat=builtin to use built-in version" >&5 +echo "$as_me: error: system expat library not found! Use --with-expat=builtin to use built-in version" >&2;} + { (exit 1); exit 1; }; } + else + { echo "$as_me:$LINENO: WARNING: system expat library not found, will use built-in instead" >&5 +echo "$as_me: WARNING: system expat library not found, will use built-in instead" >&2;} + wxUSE_EXPAT=builtin + fi + else + wxUSE_EXPAT=sys + fi + fi + if test "$wxUSE_EXPAT" = "builtin" ; then + + +subdirs="$subdirs src/expat" + + fi +fi + + + +AFMINSTALL= +WIN32INSTALL= + +TOOLKIT= +TOOLKIT_INCLUDE= +WIDGET_SET= + +if test "$USE_WIN32" = 1 ; then + +for ac_header in w32api.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 $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. */ +$ac_includes_default +#include <$ac_header> +_ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 @@ -19353,27 +19626,252 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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 - wx_cv_w32api_win32_ie=yes +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 $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 - wx_cv_w32api_win32_ie=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 +fi + +done + + if test "${ac_cv_header_windows_h+set}" = set; then + echo "$as_me:$LINENO: checking for windows.h" >&5 +echo $ECHO_N "checking for windows.h... $ECHO_C" >&6 +if test "${ac_cv_header_windows_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +echo "$as_me:$LINENO: result: $ac_cv_header_windows_h" >&5 +echo "${ECHO_T}$ac_cv_header_windows_h" >&6 +else + # Is the header compilable? +echo "$as_me:$LINENO: checking windows.h usability" >&5 +echo $ECHO_N "checking windows.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 +_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 windows.h presence" >&5 +echo $ECHO_N "checking windows.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 +_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 -echo "$as_me:$LINENO: result: $wx_cv_w32api_win32_ie" >&5 -echo "${ECHO_T}$wx_cv_w32api_win32_ie" >&6 - if test "$wx_cv_w32api_win32_ie" = "yes" ; then - CPPFLAGS="$CPPFLAGS -D_WIN32_IE=0x400" - 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: windows.h: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: windows.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: windows.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: windows.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: windows.h: present but cannot be compiled" >&5 +echo "$as_me: WARNING: windows.h: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: windows.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: windows.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: windows.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: windows.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 windows.h" >&5 +echo $ECHO_N "checking for windows.h... $ECHO_C" >&6 +if test "${ac_cv_header_windows_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_cv_header_windows_h=$ac_header_preproc +fi +echo "$as_me:$LINENO: result: $ac_cv_header_windows_h" >&5 +echo "${ECHO_T}$ac_cv_header_windows_h" >&6 + +fi +if test $ac_cv_header_windows_h = yes; then + : +else + + { { echo "$as_me:$LINENO: error: please set CFLAGS to contain the location of windows.h" >&5 +echo "$as_me: error: please set CFLAGS to contain the location of windows.h" >&2;} + { (exit 1); exit 1; }; } + +fi + - LIBS="$LIBS -lwinspool -lwinmm -lshell32 -lcomctl32 -lctl3d32 -ladvapi32 -lwsock32 -lgdi32" + + LIBS="$LIBS -lwinspool -lwinmm -lshell32 -lcomctl32 -lcomdlg32 -lctl3d32 -ladvapi32 -lwsock32 -lgdi32" if test "$wxUSE_ACCESSIBILITY" = "yes" ; then LIBS="$LIBS -loleacc" @@ -19381,7 +19879,7 @@ echo "${ECHO_T}$wx_cv_w32api_win32_ie" >&6 case "${host}" in *-*-cygwin* ) - LIBS="$LIBS -lkernel32 -luser32 -lcomdlg32" + LIBS="$LIBS -lkernel32 -luser32" TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D__WIN95__" esac @@ -19402,14 +19900,6 @@ _ACEOF WIN32INSTALL=win32install fi -if test "$USE_DARWIN" = 1; then - if test "$wxUSE_PRECOMP" = "yes"; then - CPPFLAGS="$CPPFLAGS -cpp-precomp" - else - CPPFLAGS="$CPPFLAGS -no-cpp-precomp" - fi -fi - if test "$wxUSE_GUI" = "yes"; then USE_GUI=1 @@ -20490,7 +20980,7 @@ echo "${ECHO_T}$PANGOFT2_LIBS" >&6 if test $succeeded = yes; then CXXFLAGS="$CXXFLAGS $PANGOFT2_CFLAGS" - LIBS="$LIBS $PANGOFT2_LIBS" + GUI_TK_LIBRARY="$GUI_TK_LIBRARY $PANGOFT2_LIBS" else @@ -20598,7 +21088,7 @@ done fi TOOLKIT_INCLUDE="$wx_cv_cflags_gtk" - GUI_TK_LIBRARY="$wx_cv_libs_gtk" + GUI_TK_LIBRARY="$wx_cv_libs_gtk $GUI_TK_LIBRARY" AFMINSTALL=afminstall TOOLKIT=GTK @@ -22253,7 +22743,7 @@ echo "${ECHO_T}$PANGOX_LIBS" >&6 if test $succeeded = yes; then CXXFLAGS="$CXXFLAGS $PANGOX_CFLAGS" - LIBS="$LIBS $PANGOX_LIBS" + GUI_TK_LIBRARY="$GUI_TK_LIBRARY $PANGOX_LIBS" else @@ -22357,7 +22847,7 @@ echo "${ECHO_T}$PANGOFT2_LIBS" >&6 if test $succeeded = yes; then CXXFLAGS="$CXXFLAGS $PANGOFT2_CFLAGS" - LIBS="$LIBS $PANGOFT2_LIBS" + GUI_TK_LIBRARY="$GUI_TK_LIBRARY $PANGOFT2_LIBS" else @@ -22461,7 +22951,7 @@ echo "${ECHO_T}$PANGOXFT_LIBS" >&6 if test $succeeded = yes; then CXXFLAGS="$CXXFLAGS $PANGOXFT_CFLAGS" - LIBS="$LIBS $PANGOXFT_LIBS" + GUI_TK_LIBRARY="$GUI_TK_LIBRARY $PANGOXFT_LIBS" else @@ -23964,6 +24454,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext TOOLKIT_VPATH="\${top_srcdir}/src/mac${PATH_IFS}\${top_srcdir}/src/mac/morefilex" TOOLKIT=MAC GUIDIST=MACX_DIST + WXBASEPORT="_carbon" fi if test "$wxUSE_COCOA" = 1; then @@ -24062,19 +24553,9 @@ IODBC_C_SRC="" 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" -o "$wxUSE_ODBC" = "yes" ; then - - if test "$wxUSE_ODBC" = "sys" ; 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 @@ -24202,16 +24683,20 @@ fi 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 iodbc in -lSQLAllocEnv" >&5 +echo $ECHO_N "checking for iodbc in -lSQLAllocEnv... $ECHO_C" >&6 +if test "${ac_cv_lib_SQLAllocEnv_iodbc+set}" = set; then echo $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="-lSQLAllocEnv $LIBS" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" /* confdefs.h. */ @@ -24226,11 +24711,11 @@ 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 (); +char iodbc (); int main () { -SQLAllocEnv (); +iodbc (); ; return 0; } @@ -24247,17 +24732,30 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_search_SQLAllocEnv="none required" + ac_cv_lib_SQLAllocEnv_iodbc=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 +ac_cv_lib_SQLAllocEnv_iodbc=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_SQLAllocEnv_iodbc" >&5 +echo "${ECHO_T}$ac_cv_lib_SQLAllocEnv_iodbc" >&6 +if test $ac_cv_lib_SQLAllocEnv_iodbc = yes; then + ODBC_LINK=" -liodbc" +else + + echo "$as_me:$LINENO: checking for unixodbc in -lSQLAllocEnv" >&5 +echo $ECHO_N "checking for unixodbc in -lSQLAllocEnv... $ECHO_C" >&6 +if test "${ac_cv_lib_SQLAllocEnv_unixodbc+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lSQLAllocEnv $LIBS" +cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" /* confdefs.h. */ _ACEOF @@ -24271,11 +24769,11 @@ 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 (); +char unixodbc (); int main () { -SQLAllocEnv (); +unixodbc (); ; return 0; } @@ -24292,38 +24790,110 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_search_SQLAllocEnv="-l$ac_lib" -break + ac_cv_lib_SQLAllocEnv_unixodbc=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 +ac_cv_lib_SQLAllocEnv_unixodbc=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_SQLAllocEnv_unixodbc" >&5 +echo "${ECHO_T}$ac_cv_lib_SQLAllocEnv_unixodbc" >&6 +if test $ac_cv_lib_SQLAllocEnv_unixodbc = yes; then + ODBC_LINK=" -lunixodbc" +else + + echo "$as_me:$LINENO: checking for odbc in -lSQLAllocEnv" >&5 +echo $ECHO_N "checking for odbc in -lSQLAllocEnv... $ECHO_C" >&6 +if test "${ac_cv_lib_SQLAllocEnv_odbc+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lSQLAllocEnv $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 odbc (); +int +main () +{ +odbc (); + ; + 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_SQLAllocEnv_odbc=yes else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_lib_SQLAllocEnv_odbc=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:$LINENO: result: $ac_cv_lib_SQLAllocEnv_odbc" >&5 +echo "${ECHO_T}$ac_cv_lib_SQLAllocEnv_odbc" >&6 +if test $ac_cv_lib_SQLAllocEnv_odbc = yes; then + 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 + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS db" + + WXODBCFLAG="-D_IODBC_" + fi fi if test "$wxUSE_REGEX" = "builtin" ; then @@ -24334,6 +24904,7 @@ if test "$wxUSE_ZLIB" = "builtin" ; then fi +USE_OPENGL=0 if test "$wxUSE_OPENGL" = "yes"; then if test "$wxUSE_MAC" = 1 -o "$wxUSE_COCOA" = "1"; then OPENGL_LIBS="-framework OpenGL -framework AGL" @@ -24354,7 +24925,6 @@ for ac_dir in $SEARCH_INCLUDE /usr/include; 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="" @@ -24369,7 +24939,6 @@ echo "${ECHO_T}found in $ac_find_includes" >&6 fi CPPFLAGS="$CPPFLAGS$ac_path_to_include" - set +x fi if test "${ac_cv_header_GL_gl_h+set}" = set; then @@ -24567,7 +25136,7 @@ echo "${ECHO_T}yes" >&6 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 @@ -24616,6 +25185,7 @@ echo "$as_me: error: OpenGL libraries not available" >&2;} fi if test "$wxUSE_OPENGL" = "yes"; then + USE_OPENGL=1 cat >>confdefs.h <<\_ACEOF #define wxUSE_OPENGL 1 _ACEOF @@ -24644,13 +25214,18 @@ if test "$wxUSE_UNICODE" = "yes"; then fi lib_debug_suffix= -BUILD=release +DEBUG_FLAG=0 if test "$wxUSE_DEBUG_FLAG" = "yes"; then lib_debug_suffix=d - BUILD=debug + DEBUG_FLAG=1 +fi + +DEBUG_INFO=0 +if test "$wxUSE_DEBUG_INFO" = "yes"; then + DEBUG_INFO=1 fi -WX_VERSION_TAG=`echo WX${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}_${WX_RELEASE} | tr "[a-z]" "[A-Z]"` +WX_VERSION_TAG=`echo WX${lib_unicode_suffix}${lib_debug_suffix}_${WX_RELEASE} | tr "[a-z]" "[A-Z]"` TOOLCHAIN_NAME="${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}-${WX_RELEASE}" TOOLCHAIN_NAME_GL="${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}_gl-${WX_RELEASE}" @@ -24658,11 +25233,13 @@ TOOLCHAIN_NAME_GL="${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_unicode_su if test "$cross_compiling" = "yes"; then TOOLCHAIN_NAME="${TOOLCHAIN_NAME}-${host_alias}" TOOLCHAIN_NAME_GL="${TOOLCHAIN_NAME_GL}-${host_alias}" + HOST_SUFFIX="-${host_alias}" fi WX_LIBRARY="wx_${TOOLCHAIN_NAME}" WX_LIBRARY_GL="wx_${TOOLCHAIN_NAME_GL}" -WX_LIBRARY_BASENAME="wx_${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}" +WX_LIBRARY_BASENAME_NOGUI="wx_base${WXBASEPORT}${lib_unicode_suffix}${lib_debug_suffix}" +WX_LIBRARY_BASENAME_GUI="wx_${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}" WX_LIBRARY_NAME_SHARED="lib${WX_LIBRARY}.${SO_SUFFIX}.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}" WX_LIBRARY_NAME_SHARED_GL="lib${WX_LIBRARY_GL}.${SO_SUFFIX}.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}" @@ -24674,18 +25251,8 @@ WX_LIBRARY_LINK2_GL="lib${WX_LIBRARY_GL}.${SO_SUFFIX}" case "${host}" in *-*-cygwin* | *-*-mingw32* ) - - - - if test "$cross_compiling" != "yes" -a "$TOOLKIT_DIR" = "msw"; then - WX_LIBRARY="wxmsw${WX_MSW_VERSION}${lib_unicode_suffix}${lib_debug_suffix}" - WX_LIBRARY_GL="wxmsw_gl${WX_MSW_VERSION}${lib_unicode_suffix}${lib_debug_suffix}" - WX_LIBRARY_NAME_SHARED="${WX_LIBRARY}.${SO_SUFFIX}" - WX_LIBRARY_NAME_SHARED_GL="${WX_LIBRARY_GL}.${SO_SUFFIX}" - else - WX_LIBRARY_NAME_SHARED="lib${WX_LIBRARY}.${SO_SUFFIX}" - WX_LIBRARY_NAME_SHARED_GL="lib${WX_LIBRARY_GL}.${SO_SUFFIX}" - fi + WX_LIBRARY_NAME_SHARED="lib${WX_LIBRARY}.${SO_SUFFIX}" + WX_LIBRARY_NAME_SHARED_GL="lib${WX_LIBRARY_GL}.${SO_SUFFIX}" ;; *-*-darwin* ) @@ -24733,19 +25300,6 @@ SHARED=0 if test "$wxUSE_SHARED" = "yes"; then SHARED=1 - if test "$wxUSE_OPENGL" = "yes"; then - WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS CREATE_INSTALLED_LINKS_GL" - WX_ALL="\$(build_libdir)/${WX_LIBRARY_LINK1} \$(build_libdir)/${WX_LIBRARY_LINK1_GL}" - else - WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS" - WX_ALL="\$(build_libdir)/${WX_LIBRARY_LINK1}" - fi - - if test "$GCC" = "yes"; then - PIC_FLAG="-fPIC" - fi - - found_versioning=no @@ -24787,85 +25341,8 @@ echo "${ECHO_T}$wx_cv_version_script" >&6 fi - SHARED_LD="${CXX} -shared -o" - case "${host}" in - *-hp-hpux* ) - if test "$GCC" = "yes"; then - SHARED_LD="${CXX} -shared ${PIC_FLAG} -o" - else - LDFLAGS="$LDFLAGS -L/usr/lib" - - SHARED_LD="${CXX} -b -o" - PIC_FLAG="+Z" - fi - - if test "$wxUSE_OPENGL" = "yes"; then - WX_ALL_INSTALLED="preinstall_gl" - WX_ALL="\$(build_libdir)/${WX_LIBRARY_NAME_SHARED} \$(build_libdir)/${WX_LIBRARY_NAME_SHARED_GL}" - else - WX_ALL="\$(build_libdir)/${WX_LIBRARY_NAME_SHARED}" - fi - ;; - *-*-linux* | *-*-gnu* ) - if test "$GCC" != "yes"; then - echo "$as_me:$LINENO: checking for Intel compiler" >&5 -echo $ECHO_N "checking for Intel compiler... $ECHO_C" >&6 -if test "${wx_cv_prog_icc+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 () -{ - - #ifndef __INTEL_COMPILER - #error Not icc - #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_prog_icc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -wx_cv_prog_icc=no - -fi -rm -f conftest.$ac_objext conftest.$ac_ext - -fi -echo "$as_me:$LINENO: result: $wx_cv_prog_icc" >&5 -echo "${ECHO_T}$wx_cv_prog_icc" >&6 - if test "$wx_cv_prog_icc" = "yes"; then - PIC_FLAG="-KPIC" - fi - fi - SAMPLES_RPATH_FLAG="-Wl,-rpath,\$(top_builddir)lib" ;; @@ -24972,95 +25449,6 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext SAMPLES_RPATH_FLAG="-R\$(top_builddir)lib" fi ;; - - *-*-darwin* ) - TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -DWXMAKINGDLL" - CFLAGS="$CFLAGS -fno-common" - CXXFLAGS="$CXXFLAGS -fno-common" - SHARED_LD="\${top_srcdir}/distrib/mac/shared-ld-sh -undefined suppress -flat_namespace -o" - PIC_FLAG="-dynamic -fPIC" - ;; - - *-*-aix* ) - if test "$GCC" != "yes"; then - # Extract the first word of "makeC++SharedLib", so it can be a program name with args. -set dummy makeC++SharedLib; 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_AIX_CXX_LD+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$AIX_CXX_LD"; then - ac_cv_prog_AIX_CXX_LD="$AIX_CXX_LD" # 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_AIX_CXX_LD="makeC++SharedLib" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - - test -z "$ac_cv_prog_AIX_CXX_LD" && ac_cv_prog_AIX_CXX_LD="/usr/lpp/xlC/bin/makeC++SharedLib" -fi -fi -AIX_CXX_LD=$ac_cv_prog_AIX_CXX_LD -if test -n "$AIX_CXX_LD"; then - echo "$as_me:$LINENO: result: $AIX_CXX_LD" >&5 -echo "${ECHO_T}$AIX_CXX_LD" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - - SHARED_LD="$(AIX_CXX_LD) -p 0 -o" - fi - ;; - - *-*-cygwin* | *-*-mingw32* ) - WX_LIBRARY_IMPORTLIB="${WX_LIBRARY_NAME_SHARED}.a" - - SHARED_LD="${CXX} -shared -Wl,--out-implib,lib/${WX_LIBRARY_IMPORTLIB} -o" - TOOLCHAIN_DLL_DEFS="${TOOLCHAIN_DLL_DEFS} -DWXUSINGDLL=1" - - PIC_FLAG="-UWXUSINGDLL -DWXMAKINGDLL=1 -D_DLL=1 -D_WINDLL=1" - - WX_ALL="\$(build_libdir)/${WX_LIBRARY_NAME_SHARED}" - WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS" - - if test "$wxUSE_OPENGL" = "yes"; then - LIBS="${LIBS} ${OPENGL_LIBS}" - fi - ;; - - *-*-beos* ) - SHARED_LD="${LD} -shared -o" - ;; - - *-*-irix* ) - if test "$GCC" != "yes"; then - PIC_FLAG="-KPIC" - fi - ;; - - *-*-freebsd* | *-*-openbsd* | *-*-netbsd* | \ - *-*-sunos4* | \ - *-*-osf* | \ - *-*-dgux5* | \ - *-*-sysv5* ) - ;; - - *) - { { echo "$as_me:$LINENO: error: unknown system type $host." >&5 -echo "$as_me: error: unknown system type $host." >&2;} - { (exit 1); exit 1; }; } esac if test "x$WX_TARGET_LIBRARY" = "x"; then @@ -28317,19 +28705,79 @@ 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 +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: $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 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. */ @@ -28338,7 +28786,7 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default -#include +#include <$ac_header> _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 @@ -28364,8 +28812,8 @@ 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 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. */ @@ -28373,7 +28821,7 @@ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include +#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 @@ -28406,10 +28854,10 @@ 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: 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 ## ------------------------------------ ## @@ -28420,12 +28868,12 @@ _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 ## ------------------------------------ ## @@ -28436,78 +28884,27 @@ _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 - - 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. */ +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 _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 + EXTRALIBS_ESD="-lesd" -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 +done fi @@ -29871,12 +30268,6 @@ if test "$GCC" = "yes" ; then if test "$wxUSE_PERMISSIVE" = "yes" ; then CODE_GEN_FLAGS="$CODE_GEN_FLAGS -fpermissive" fi - if test "$USE_WIN32" = 1 ; then - # I'm not even really sure what this was ever added to solve, - # but someone added it for mingw native builds, so I guess - # they had a reason, right?? - CODE_GEN_FLAGS="$CODE_GEN_FLAGS -fno-pcc-struct-return" - fi case "${host}" in powerpc*-*-aix* ) @@ -29956,6 +30347,13 @@ _ACEOF 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 @@ -30019,13 +30417,6 @@ _ACEOF fi -if test "$wxUSE_FS_INET" = "yes"; then - cat >>confdefs.h <<\_ACEOF -#define wxUSE_FS_INET 1 -_ACEOF - -fi - if test "$wxUSE_FS_ZIP" = "yes"; then cat >>confdefs.h <<\_ACEOF #define wxUSE_FS_ZIP 1 @@ -30785,6 +31176,11 @@ if test "$wxUSE_SOCKETS" = "yes"; then 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 @@ -31107,6 +31503,67 @@ _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 + +if test "$wxUSE_FS_INET" = "yes"; then + cat >>confdefs.h <<\_ACEOF +#define wxUSE_FS_INET 1 +_ACEOF + +fi + if test "$wxUSE_GUI" = "yes"; then @@ -31114,19 +31571,9 @@ if test "$wxUSE_GUI" = "yes"; 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 "$TOOLKIT" != "MSW"; then if test "$wxUSE_JOYSTICK" = "yes"; then for ac_header in linux/joystick.h @@ -31786,7 +32233,8 @@ if test "$wxUSE_DYNAMIC_LOADER" = "yes" ; then #define wxUSE_DYNAMIC_LOADER 1 _ACEOF -elif test "$wxUSE_DYNLIB_CLASS" = "yes" ; then +fi +if test "$wxUSE_DYNLIB_CLASS" = "yes" ; then cat >>confdefs.h <<\_ACEOF #define wxUSE_DYNLIB_CLASS 1 _ACEOF @@ -31915,15 +32363,11 @@ _ACEOF fi if test "$wxUSE_MDI_ARCHITECTURE" = "yes"; then - - - if test "$wxUSE_MDI_ARCHITECTURE" = "yes"; then - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\_ACEOF #define wxUSE_MDI_ARCHITECTURE 1 _ACEOF - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS mdi" - fi + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS mdi" fi if test "$wxUSE_DOC_VIEW_ARCHITECTURE" = "yes" ; then @@ -32745,60 +33189,13 @@ if test "$wxUSE_SYSTEM_OPTIONS" = "yes"; then #define wxUSE_SYSTEM_OPTIONS 1 _ACEOF -if test "$TOOLKIT" = "MSW"; then +if test "$TOOLKIT" = "MSW" -o "$TOOLKIT" = "GTK" -o "$TOOLKIT" = "X11" -o \ + "$TOOLKIT" = "MOTIF"; then SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS taskbar" fi 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 - - 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 - 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 - if test "$wxUSE_MINIFRAME" = "yes"; then cat >>confdefs.h <<\_ACEOF #define wxUSE_MINIFRAME 1 @@ -32807,12 +33204,14 @@ _ACEOF SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS minifram" fi +USE_HTML=0 if test "$wxUSE_HTML" = "yes"; then cat >>confdefs.h <<\_ACEOF #define wxUSE_HTML 1 _ACEOF - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS html htlbox" + 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_VALIDATORS" = "yes"; then @@ -33020,6 +33419,26 @@ top_builddir_wxconfig=`pwd` +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_MAC" = 1 ; then LDFLAGS="$LDFLAGS -framework Carbon -framework System" @@ -33395,8 +33814,6 @@ fi if test "$wxUSE_GUI" = "yes"; then - LIBS="$GUI_TK_LIBRARY $PNG_LINK $JPEG_LINK $TIFF_LINK $LIBS" - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS artprov controls dialogs \ drawing dynamic erase event exec font image \ @@ -33421,10 +33838,21 @@ if test "$GXX" = yes ; then EXTRA_CFLAGS="$WXDEBUG $WXODBCFLAG $PROFILE $OPTIMISE" -CPPFLAGS=`echo $INCLUDES $CPPFLAGS | sed 's/ \\+/ /g'` +CPPFLAGS=`echo $WXDEBUG_DEFINE $INCLUDES $CPPFLAGS | sed 's/ \\+/ /g'` CFLAGS=`echo $CODE_GEN_FLAGS $EXTRA_CFLAGS $CFLAGS $CXXWARNINGS | sed 's/ \\+/ /g'` CXXFLAGS=`echo $CODE_GEN_FLAGS $CODE_GEN_FLAGS_CXX $EXTRA_CFLAGS $CXXFLAGS $CXXWARNINGS | sed 's/ \+/ /g'` + + LIBS=`echo $LIBS | sed 's/ \+/ /g'` +EXTRALIBS="$LDFLAGS $LDFLAGS_VERSIONING $LIBS $DMALLOC_LIBS" +EXTRALIBS_XML="$EXPAT_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 +if test "$wxUSE_OPENGL" = "yes"; then + EXTRALIBS_OPENGL="$LDFLAGS_GL $OPENGL_LIBS" +fi LDFLAGS="$LDFLAGS $PROFILE" @@ -33434,6 +33862,38 @@ else WXCONFIG_INCLUDE="$TOOLKIT_INCLUDE" fi +WXCONFIG_EXTRALIBS="$LIBS" + +if test "$wxUSE_REGEX" = "builtin" ; then + wxconfig_3rdparty="$wxconfig_3rdparty regex" +fi +if test "$wxUSE_EXPAT" = "builtin" ; then + wxconfig_3rdparty="$wxconfig_3rdparty expat" +fi +if test "$wxUSE_ODBC" = "builtin" ; then + wxconfig_3rdparty="$wxconfig_3rdparty odbc" +fi +if test "$wxUSE_LIBTIFF" = "builtin" ; then + wxconfig_3rdparty="$wxconfig_3rdparty tiff" +fi +if test "$wxUSE_LIBJPEG" = "builtin" ; then + wxconfig_3rdparty="$wxconfig_3rdparty jpeg" +fi +if test "$wxUSE_LIBPNG" = "builtin" ; then + wxconfig_3rdparty="$wxconfig_3rdparty png" +fi +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}" +done + + if test "x$wxUSE_UNIVERSAL" = "xyes" ; then WXUNIV=1 else @@ -33447,7 +33907,6 @@ fi -EXTRALIBS="$LDFLAGS $LDFLAGS_VERSIONING $LIBS $DMALLOC_LIBS" if test $wxUSE_MONOLITHIC = "yes" ; then MONOLITHIC=1 @@ -33455,8 +33914,25 @@ else MONOLITHIC=0 fi -VENDOR="custom" -OFFICIAL_BUILD=0 +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 + OFFICIAL_BUILD=0 +fi + + + + + + + + @@ -33472,6 +33948,7 @@ TOOLKIT_LOWERCASE=`echo $TOOLKIT | tr [A-Z] [a-z]` + if test "x$BAKEFILE_CHECK_BASICS" != "xno"; then if test -n "$ac_tool_prefix"; then @@ -33825,18 +34302,23 @@ echo "${ECHO_T}$bakefile_cv_prog_makeisgnu" >&6 SO_SUFFIX="so" + SO_SUFFIX_MODULE="so" EXEEXT="" DLLPREFIX=lib + DLLPREFIX_MODULE= case "${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="" ;; @@ -33846,6 +34328,7 @@ echo "${ECHO_T}$bakefile_cv_prog_makeisgnu" >&6 ;; powerpc-*-darwin* ) SO_SUFFIX="dylib" + SO_SUFFIX_MODULE="bundle" ;; esac @@ -33854,6 +34337,8 @@ echo "${ECHO_T}$bakefile_cv_prog_makeisgnu" >&6 + + SHARED_LD_CC="\$(CC) -shared -o" SHARED_LD_CXX="\$(CXX) -shared -o" @@ -33960,6 +34445,7 @@ echo "${ECHO_T}$bakefile_cv_prog_icc" >&6 verbose=0 args="" objects="" +linking_flag="-dynamiclib" while test \${#} -gt 0; do case \${1} in @@ -33979,8 +34465,8 @@ while test \${#} -gt 0; do args="\${args} \${1}" ;; - -dynamiclib) - # skip these options + -dynamiclib|-bundle) + linking_flag="\${1}" ;; -*) @@ -33988,7 +34474,7 @@ while test \${#} -gt 0; do exit 1 ;; - *.o | *.a) + *.o | *.a | *.dylib) # collect object files objects="\${objects} \${1}" ;; @@ -34018,9 +34504,9 @@ fi # 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} @@ -34035,8 +34521,10 @@ exit 0 EOF chmod +x shared-ld-sh - SHARED_LD_CC="`pwd`/shared-ld-sh -undefined suppress -flat_namespace -o" + SHARED_LD_CC="`pwd`/shared-ld-sh -dynamiclib -undefined suppress -flat_namespace -o" + SHARED_LD_MODULE_CC="`pwd`/shared-ld-sh -bundle -undefined suppress -flat_namespace -o" SHARED_LD_CXX="$SHARED_LD_CC" + SHARED_LD_MODULE_CXX="$SHARED_LD_MODULE_CC" PIC_FLAG="-dynamic -fPIC" ;; @@ -34111,6 +34599,15 @@ echo "$as_me: error: unknown system type $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_CC="$SHARED_LD_CXX" + fi + + + @@ -34160,6 +34657,14 @@ echo $ECHO_N "checking for dependency tracking method... $ECHO_C" >&6 if test "x$GCC" = "xyes"; then DEPSMODE=gcc DEPS_TRACKING=1 + case "${host}" in + powerpc-*-darwin* ) + DEPSFLAG_GCC="-no-cpp-precomp -MMD" + ;; + * ) + DEPSFLAG_GCC="-MMD" + ;; + esac echo "$as_me:$LINENO: result: gcc" >&5 echo "${ECHO_T}gcc" >&6 else @@ -34178,11 +34683,12 @@ echo "${ECHO_T}none" >&6 DEPSMODE=$DEPSMODE DEPSDIR=.deps +DEPSFLAG_GCC="$DEPSFLAG_GCC" mkdir -p \$DEPSDIR if test \$DEPSMODE = gcc ; then - \${*} -MMD + \${*} \${DEPSFLAG_GCC} status=\${?} if test \${status} != 0 ; then exit \${status} @@ -34210,7 +34716,7 @@ if test \$DEPSMODE = gcc ; then else depfile=\`basename \$objfile | sed -e 's/\..*$/.d/g'\` if test -f \$depfile ; then - sed -e "s,\$depobjname:,\$objfile:,g" \$depfile >\${DEPSDIR}/\${objfile}.d + sed -e "/^\$objfile/! s,\$depobjname:,\$objfile:,g" \$depfile >\${DEPSDIR}/\${objfile}.d rm -f \$depfile fi fi @@ -34355,24 +34861,44 @@ fi - COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_1="#" - if test "x$TOOLKIT" = "xMOTIF" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x1" ; then - COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_1="" + COND_BUILD_DEBUG="#" + if test "x$BUILD" = "xdebug" ; then + COND_BUILD_DEBUG="" fi - COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0="#" - if test "x$TOOLKIT" = "xMOTIF" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then - COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0="" + COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT="#" + if test "x$BUILD" = "xdebug" -a "x$DEBUG_FLAG" = "xdefault" ; then + COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT="" + fi + + COND_BUILD_DEBUG_DEBUG_INFO_DEFAULT="#" + if test "x$BUILD" = "xdebug" -a "x$DEBUG_INFO" = "xdefault" ; then + COND_BUILD_DEBUG_DEBUG_INFO_DEFAULT="" + fi + + COND_BUILD_RELEASE="#" + if test "x$BUILD" = "xrelease" ; then + COND_BUILD_RELEASE="" + fi + + COND_BUILD_RELEASE_DEBUG_INFO_DEFAULT="#" + if test "x$BUILD" = "xrelease" -a "x$DEBUG_INFO" = "xdefault" ; then + COND_BUILD_RELEASE_DEBUG_INFO_DEFAULT="" + fi + + COND_DEBUG_FLAG_1="#" + if test "x$DEBUG_FLAG" = "x1" ; then + COND_DEBUG_FLAG_1="" 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="" + COND_DEBUG_INFO_0="#" + if test "x$DEBUG_INFO" = "x0" ; then + COND_DEBUG_INFO_0="" fi - COND_PLATFORM_MACOSX_1_USE_GUI_0="#" - if test "x$PLATFORM_MACOSX" = "x1" -a "x$USE_GUI" = "x0" ; then - COND_PLATFORM_MACOSX_1_USE_GUI_0="" + COND_DEBUG_INFO_1="#" + if test "x$DEBUG_INFO" = "x1" ; then + COND_DEBUG_INFO_1="" fi COND_DEPS_TRACKING_0="#" @@ -34385,29 +34911,39 @@ fi COND_DEPS_TRACKING_1="" fi - COND_TOOLKIT_MOTIF_USE_GUI_1="#" - if test "x$TOOLKIT" = "xMOTIF" -a "x$USE_GUI" = "x1" ; then - COND_TOOLKIT_MOTIF_USE_GUI_1="" + COND_MONOLITHIC_0="#" + if test "x$MONOLITHIC" = "x0" ; then + COND_MONOLITHIC_0="" fi - COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_1="#" - if test "x$TOOLKIT" = "xMAC" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x1" ; then - COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_1="" + COND_MONOLITHIC_0_SHARED_0="#" + if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x0" ; then + COND_MONOLITHIC_0_SHARED_0="" 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_MONOLITHIC_0_SHARED_0_USE_GUI_1="#" + if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x0" -a "x$USE_GUI" = "x1" ; then + COND_MONOLITHIC_0_SHARED_0_USE_GUI_1="" fi - COND_TOOLKIT_COCOA_USE_GUI_1="#" - if test "x$TOOLKIT" = "xCOCOA" -a "x$USE_GUI" = "x1" ; then - COND_TOOLKIT_COCOA_USE_GUI_1="" + 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_USE_SOVERSOLARIS_1="#" - if test "x$USE_SOVERSOLARIS" = "x1" ; then - COND_USE_SOVERSOLARIS_1="" + COND_MONOLITHIC_0_SHARED_1="#" + if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x1" ; then + COND_MONOLITHIC_0_SHARED_1="" + fi + + COND_MONOLITHIC_0_SHARED_1_USE_GUI_1="#" + if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x1" -a "x$USE_GUI" = "x1" ; then + COND_MONOLITHIC_0_SHARED_1_USE_GUI_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_1="#" @@ -34415,49 +34951,54 @@ fi COND_MONOLITHIC_1="" fi - COND_UNICODE_1="#" - if test "x$UNICODE" = "x1" ; then - COND_UNICODE_1="" + COND_MONOLITHIC_1_SHARED_0="#" + if test "x$MONOLITHIC" = "x1" -a "x$SHARED" = "x0" ; then + COND_MONOLITHIC_1_SHARED_0="" fi - COND_MONOLITHIC_0="#" - if test "x$MONOLITHIC" = "x0" ; then - COND_MONOLITHIC_0="" + COND_MONOLITHIC_1_SHARED_1="#" + if test "x$MONOLITHIC" = "x1" -a "x$SHARED" = "x1" ; then + COND_MONOLITHIC_1_SHARED_1="" fi - COND_TOOLKIT_MGL="#" - if test "x$TOOLKIT" = "xMGL" ; then - COND_TOOLKIT_MGL="" + COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1="#" + if test "x$OFFICIAL_BUILD" = "x0" -a "x$PLATFORM_WIN32" = "x1" ; then + COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1="" fi - COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0="#" - if test "x$TOOLKIT" = "xCOCOA" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then - COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0="" + COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1="#" + if test "x$OFFICIAL_BUILD" = "x1" -a "x$PLATFORM_WIN32" = "x1" ; then + COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1="" fi - COND_TOOLKIT_X11_USE_GUI_1_WXUNIV_0="#" - if test "x$TOOLKIT" = "xX11" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then - COND_TOOLKIT_X11_USE_GUI_1_WXUNIV_0="" + COND_PLATFORM_MACOSX_0_USE_SOVERSION_1="#" + if test "x$PLATFORM_MACOSX" = "x0" -a "x$USE_SOVERSION" = "x1" ; then + COND_PLATFORM_MACOSX_0_USE_SOVERSION_1="" fi - COND_WXUSE_ODBC_BUILTIN="#" - if test "x$wxUSE_ODBC" = "xbuiltin" ; then - COND_WXUSE_ODBC_BUILTIN="" + COND_PLATFORM_MACOSX_1="#" + if test "x$PLATFORM_MACOSX" = "x1" ; then + COND_PLATFORM_MACOSX_1="" fi - COND_USE_SOVERSION_0="#" - if test "x$USE_SOVERSION" = "x0" ; then - COND_USE_SOVERSION_0="" + COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA="#" + if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xCOCOA" ; then + COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA="" fi - COND_WXUNIV_1="#" - if test "x$WXUNIV" = "x1" ; then - COND_WXUNIV_1="" + COND_PLATFORM_MACOSX_1_TOOLKIT_GTK="#" + if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xGTK" ; then + COND_PLATFORM_MACOSX_1_TOOLKIT_GTK="" + fi + + COND_PLATFORM_MACOSX_1_TOOLKIT_MAC="#" + if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xMAC" ; then + COND_PLATFORM_MACOSX_1_TOOLKIT_MAC="" fi - COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_1="#" - if test "x$TOOLKIT" = "xOS2" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x1" ; then - COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_1="" + 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_UNIX_1="#" @@ -34465,54 +35006,69 @@ fi COND_PLATFORM_UNIX_1="" fi - COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0="#" - if test "x$TOOLKIT" = "xMSW" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then - COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0="" + COND_PLATFORM_WIN32_0="#" + if test "x$PLATFORM_WIN32" = "x0" ; then + COND_PLATFORM_WIN32_0="" fi - COND_WXUSE_REGEX_BUILTIN="#" - if test "x$wxUSE_REGEX" = "xbuiltin" ; then - COND_WXUSE_REGEX_BUILTIN="" + COND_PLATFORM_WIN32_1="#" + if test "x$PLATFORM_WIN32" = "x1" ; then + COND_PLATFORM_WIN32_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="" + 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_MONOLITHIC_1_SHARED_0="#" - if test "x$MONOLITHIC" = "x1" -a "x$SHARED" = "x0" ; then - COND_MONOLITHIC_1_SHARED_0="" + 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="" fi - COND_MONOLITHIC_1_SHARED_1="#" - if test "x$MONOLITHIC" = "x1" -a "x$SHARED" = "x1" ; then - COND_MONOLITHIC_1_SHARED_1="" + COND_TOOLKIT_COCOA="#" + if test "x$TOOLKIT" = "xCOCOA" ; then + COND_TOOLKIT_COCOA="" fi - COND_PLATFORM_UNIX_1_USE_GUI_0="#" - if test "x$PLATFORM_UNIX" = "x1" -a "x$USE_GUI" = "x0" ; then - COND_PLATFORM_UNIX_1_USE_GUI_0="" + COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0="#" + if test "x$TOOLKIT" = "xCOCOA" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then + COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0="" 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="" + COND_TOOLKIT_GTK="#" + if test "x$TOOLKIT" = "xGTK" ; then + COND_TOOLKIT_GTK="" fi - COND_TOOLKIT_X11="#" - if test "x$TOOLKIT" = "xX11" ; then - COND_TOOLKIT_X11="" + COND_TOOLKIT_GTK_USE_GUI_1="#" + if test "x$TOOLKIT" = "xGTK" -a "x$USE_GUI" = "x1" ; then + COND_TOOLKIT_GTK_USE_GUI_1="" fi - COND_OFFICIAL_BUILD_0="#" - if test "x$OFFICIAL_BUILD" = "x0" ; then - COND_OFFICIAL_BUILD_0="" + COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0="#" + if test "x$TOOLKIT" = "xGTK" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then + COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0="" fi - COND_TOOLKIT_OS2="#" - if test "x$TOOLKIT" = "xOS2" ; then - COND_TOOLKIT_OS2="" + 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_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="" + fi + + COND_TOOLKIT_MGL="#" + if test "x$TOOLKIT" = "xMGL" ; then + COND_TOOLKIT_MGL="" fi COND_TOOLKIT_MGL_USE_GUI_1="#" @@ -34520,14 +35076,9 @@ fi COND_TOOLKIT_MGL_USE_GUI_1="" fi - COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_1="#" - if test "x$TOOLKIT" = "xCOCOA" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x1" ; then - COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_1="" - fi - - COND_WXUSE_ZLIB_BUILTIN="#" - if test "x$wxUSE_ZLIB" = "xbuiltin" ; then - COND_WXUSE_ZLIB_BUILTIN="" + 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="#" @@ -34535,49 +35086,49 @@ fi COND_TOOLKIT_MOTIF="" fi - COND_MONOLITHIC_0_SHARED_1="#" - if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x1" ; then - COND_MONOLITHIC_0_SHARED_1="" + COND_TOOLKIT_MOTIF_USE_GUI_1="#" + if test "x$TOOLKIT" = "xMOTIF" -a "x$USE_GUI" = "x1" ; then + COND_TOOLKIT_MOTIF_USE_GUI_1="" fi - COND_PLATFORM_MACOSX_1_USE_SOVERSION_1="#" - if test "x$PLATFORM_MACOSX" = "x1" -a "x$USE_SOVERSION" = "x1" ; then - COND_PLATFORM_MACOSX_1_USE_SOVERSION_1="" + COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0="#" + if test "x$TOOLKIT" = "xMOTIF" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then + COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0="" fi - COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0="#" - if test "x$TOOLKIT" = "xGTK" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then - COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0="" + COND_TOOLKIT_MSW="#" + if test "x$TOOLKIT" = "xMSW" ; then + COND_TOOLKIT_MSW="" 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="" + COND_TOOLKIT_MSW_USE_GUI_1="#" + if test "x$TOOLKIT" = "xMSW" -a "x$USE_GUI" = "x1" ; then + COND_TOOLKIT_MSW_USE_GUI_1="" fi - COND_MONOLITHIC_0_SHARED_0="#" - if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x0" ; then - COND_MONOLITHIC_0_SHARED_0="" + COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0="#" + if test "x$TOOLKIT" = "xMSW" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then + COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0="" fi - COND_USE_GUI_1="#" - if test "x$USE_GUI" = "x1" ; then - COND_USE_GUI_1="" + 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="" fi - COND_USE_GUI_0="#" - if test "x$USE_GUI" = "x0" ; then - COND_USE_GUI_0="" + COND_TOOLKIT_OS2="#" + if test "x$TOOLKIT" = "xOS2" ; then + COND_TOOLKIT_OS2="" fi - COND_USE_GUI_0_USE_GUI_1="#" - if test "x$USE_GUI" = "x0" -a "x$USE_GUI" = "x1" ; then - COND_USE_GUI_0_USE_GUI_1="" + 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="" fi - COND_TOOLKIT_MSW="#" - if test "x$TOOLKIT" = "xMSW" ; then - COND_TOOLKIT_MSW="" + COND_TOOLKIT_X11="#" + if test "x$TOOLKIT" = "xX11" ; then + COND_TOOLKIT_X11="" fi COND_TOOLKIT_X11_USE_GUI_1="#" @@ -34585,44 +35136,49 @@ fi COND_TOOLKIT_X11_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_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_BUILD_DEBUG="#" - if test "x$BUILD" = "xdebug" ; then - COND_BUILD_DEBUG="" + COND_UNICODE_1="#" + if test "x$UNICODE" = "x1" ; then + COND_UNICODE_1="" 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_USE_GUI_0="#" + if test "x$USE_GUI" = "x0" ; then + COND_USE_GUI_0="" fi - COND_WXUSE_LIBTIFF_BUILTIN="#" - if test "x$wxUSE_LIBTIFF" = "xbuiltin" ; then - COND_WXUSE_LIBTIFF_BUILTIN="" + COND_USE_GUI_1="#" + if test "x$USE_GUI" = "x1" ; then + COND_USE_GUI_1="" fi - COND_OFFICIAL_BUILD_1="#" - if test "x$OFFICIAL_BUILD" = "x1" ; then - COND_OFFICIAL_BUILD_1="" + COND_USE_GUI_1_WXUNIV_0="#" + if test "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then + COND_USE_GUI_1_WXUNIV_0="" fi - COND_BUILD_RELEASE="#" - if test "x$BUILD" = "xrelease" ; then - COND_BUILD_RELEASE="" + COND_USE_GUI_1_WXUNIV_1="#" + if test "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x1" ; then + COND_USE_GUI_1_WXUNIV_1="" fi - COND_TOOLKIT_MGL_USE_GUI_1_WXUNIV_0="#" - if test "x$TOOLKIT" = "xMGL" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then - COND_TOOLKIT_MGL_USE_GUI_1_WXUNIV_0="" + COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN="#" + if test "x$USE_GUI" = "x1" -a "x$wxUSE_LIBJPEG" = "xbuiltin" ; then + COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN="" fi - COND_USE_SOVERLINUX_1="#" - if test "x$USE_SOVERLINUX" = "x1" ; then - COND_USE_SOVERLINUX_1="" + COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN="#" + if test "x$USE_GUI" = "x1" -a "x$wxUSE_LIBPNG" = "xbuiltin" ; then + COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN="" + fi + + COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN="#" + if test "x$USE_GUI" = "x1" -a "x$wxUSE_LIBTIFF" = "xbuiltin" ; then + COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN="" fi COND_USE_SOSYMLINKS_1="#" @@ -34630,109 +35186,94 @@ fi COND_USE_SOSYMLINKS_1="" fi - COND_TOOLKIT_COCOA="#" - if test "x$TOOLKIT" = "xCOCOA" ; then - COND_TOOLKIT_COCOA="" - fi - - COND_PLATFORM_MACOSX_1="#" - if test "x$PLATFORM_MACOSX" = "x1" ; then - COND_PLATFORM_MACOSX_1="" - fi - - COND_WXUSE_LIBJPEG_BUILTIN="#" - if test "x$wxUSE_LIBJPEG" = "xbuiltin" ; then - COND_WXUSE_LIBJPEG_BUILTIN="" - fi - - COND_WXUSE_LIBPNG_BUILTIN="#" - if test "x$wxUSE_LIBPNG" = "xbuiltin" ; then - COND_WXUSE_LIBPNG_BUILTIN="" + COND_USE_SOVERLINUX_1="#" + if test "x$USE_SOVERLINUX" = "x1" ; then + COND_USE_SOVERLINUX_1="" fi - COND_MONOLITHIC_0_SHARED_1_USE_GUI_1="#" - if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x1" -a "x$USE_GUI" = "x1" ; then - COND_MONOLITHIC_0_SHARED_1_USE_GUI_1="" + COND_USE_SOVERSION_0="#" + if test "x$USE_SOVERSION" = "x0" ; then + COND_USE_SOVERSION_0="" fi - COND_PLATFORM_MACOSX_0_USE_SOVERSION_1="#" - if test "x$PLATFORM_MACOSX" = "x0" -a "x$USE_SOVERSION" = "x1" ; then - COND_PLATFORM_MACOSX_0_USE_SOVERSION_1="" + COND_USE_SOVERSOLARIS_1="#" + if test "x$USE_SOVERSOLARIS" = "x1" ; then + COND_USE_SOVERSOLARIS_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="" + COND_WXUNIV_1="#" + if test "x$WXUNIV" = "x1" ; then + COND_WXUNIV_1="" fi - COND_USE_GUI_1_WXUNIV_0="#" - if test "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then - COND_USE_GUI_1_WXUNIV_0="" + COND_WXUSE_EXPAT_BUILTIN="#" + if test "x$wxUSE_EXPAT" = "xbuiltin" ; then + COND_WXUSE_EXPAT_BUILTIN="" fi - COND_USE_GUI_1_WXUNIV_1="#" - if test "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x1" ; then - COND_USE_GUI_1_WXUNIV_1="" + COND_WXUSE_LIBJPEG_BUILTIN="#" + if test "x$wxUSE_LIBJPEG" = "xbuiltin" ; then + COND_WXUSE_LIBJPEG_BUILTIN="" fi - COND_TOOLKIT_GTK="#" - if test "x$TOOLKIT" = "xGTK" ; then - COND_TOOLKIT_GTK="" + COND_WXUSE_LIBPNG_BUILTIN="#" + if test "x$wxUSE_LIBPNG" = "xbuiltin" ; then + COND_WXUSE_LIBPNG_BUILTIN="" fi - COND_PLATFORM_WIN32_1_USE_GUI_0="#" - if test "x$PLATFORM_WIN32" = "x1" -a "x$USE_GUI" = "x0" ; then - COND_PLATFORM_WIN32_1_USE_GUI_0="" + COND_WXUSE_LIBTIFF_BUILTIN="#" + if test "x$wxUSE_LIBTIFF" = "xbuiltin" ; then + COND_WXUSE_LIBTIFF_BUILTIN="" fi - COND_PLATFORM_WIN32_1_USE_GUI_1="#" - if test "x$PLATFORM_WIN32" = "x1" -a "x$USE_GUI" = "x1" ; then - COND_PLATFORM_WIN32_1_USE_GUI_1="" + COND_WXUSE_ODBC_BUILTIN="#" + if test "x$wxUSE_ODBC" = "xbuiltin" ; then + COND_WXUSE_ODBC_BUILTIN="" fi - COND_PLATFORM_WIN32_0="#" - if test "x$PLATFORM_WIN32" = "x0" ; then - COND_PLATFORM_WIN32_0="" + COND_WXUSE_REGEX_BUILTIN="#" + if test "x$wxUSE_REGEX" = "xbuiltin" ; then + COND_WXUSE_REGEX_BUILTIN="" fi - COND_PLATFORM_WIN32_1="#" - if test "x$PLATFORM_WIN32" = "x1" ; then - COND_PLATFORM_WIN32_1="" + COND_WXUSE_ZLIB_BUILTIN="#" + if test "x$wxUSE_ZLIB" = "xbuiltin" ; then + COND_WXUSE_ZLIB_BUILTIN="" fi - COND_TOOLKIT_GTK_USE_GUI_1="#" - if test "x$TOOLKIT" = "xGTK" -a "x$USE_GUI" = "x1" ; then - COND_TOOLKIT_GTK_USE_GUI_1="" + COND_PLATFORM_MAC_1="#" + if test "x$PLATFORM_MAC" = "x1" ; then + COND_PLATFORM_MAC_1="" fi - COND_TOOLKIT_MAC="#" - if test "x$TOOLKIT" = "xMAC" ; then - COND_TOOLKIT_MAC="" + COND_SHARED_1="#" + if test "x$SHARED" = "x1" ; then + COND_SHARED_1="" fi - COND_TOOLKIT_MSW_USE_GUI_1="#" - if test "x$TOOLKIT" = "xMSW" -a "x$USE_GUI" = "x1" ; then - COND_TOOLKIT_MSW_USE_GUI_1="" + COND_SHARED_0="#" + if test "x$SHARED" = "x0" ; then + COND_SHARED_0="" fi - COND_MONOLITHIC_0_SHARED_0_USE_GUI_1="#" - if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x0" -a "x$USE_GUI" = "x1" ; then - COND_MONOLITHIC_0_SHARED_0_USE_GUI_1="" + 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_SHARED_1="#" - if test "x$SHARED" = "x1" ; then - COND_SHARED_1="" + COND_TOOLKIT_OS2_USE_GUI_1="#" + if test "x$TOOLKIT" = "xOS2" -a "x$USE_GUI" = "x1" ; then + COND_TOOLKIT_OS2_USE_GUI_1="" fi - COND_PLATFORM_MAC_1="#" - if test "x$PLATFORM_MAC" = "x1" ; then - COND_PLATFORM_MAC_1="" + 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_SHARED_0="#" - if test "x$SHARED" = "x0" ; then - COND_SHARED_0="" + 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 @@ -35585,6 +36126,7 @@ 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,@PKG_CONFIG@,$PKG_CONFIG,;t t s,@GTK_CFLAGS@,$GTK_CFLAGS,;t t s,@GTK_LIBS@,$GTK_LIBS,;t t @@ -35599,13 +36141,16 @@ s,@PANGOX_CFLAGS@,$PANGOX_CFLAGS,;t t s,@PANGOX_LIBS@,$PANGOX_LIBS,;t t s,@PANGOXFT_CFLAGS@,$PANGOXFT_CFLAGS,;t t s,@PANGOXFT_LIBS@,$PANGOXFT_LIBS,;t t -s,@AIX_CXX_LD@,$AIX_CXX_LD,;t t s,@RESCOMP@,$RESCOMP,;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,@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,@wxUSE_ODBC@,$wxUSE_ODBC,;t t s,@wxUSE_LIBJPEG@,$wxUSE_LIBJPEG,;t t s,@wxUSE_LIBPNG@,$wxUSE_LIBPNG,;t t @@ -35615,12 +36160,19 @@ s,@OFFICIAL_BUILD@,$OFFICIAL_BUILD,;t t s,@WXUNIV@,$WXUNIV,;t t s,@MONOLITHIC@,$MONOLITHIC,;t t s,@EXTRALIBS@,$EXTRALIBS,;t t +s,@EXTRALIBS_XML@,$EXTRALIBS_XML,;t t +s,@EXTRALIBS_ODBC@,$EXTRALIBS_ODBC,;t t +s,@EXTRALIBS_GUI@,$EXTRALIBS_GUI,;t t +s,@EXTRALIBS_OPENGL@,$EXTRALIBS_OPENGL,;t t s,@UNICODE@,$UNICODE,;t t s,@BUILD@,$BUILD,;t t +s,@DEBUG_INFO@,$DEBUG_INFO,;t t +s,@DEBUG_FLAG@,$DEBUG_FLAG,;t t s,@SHARED@,$SHARED,;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,@HOST_SUFFIX@,$HOST_SUFFIX,;t t s,@SET_MAKE@,$SET_MAKE,;t t s,@MAKE_SET@,$MAKE_SET,;t t s,@INSTALL_DIR@,$INSTALL_DIR,;t t @@ -35631,9 +36183,14 @@ s,@PLATFORM_MSDOS@,$PLATFORM_MSDOS,;t t s,@PLATFORM_MAC@,$PLATFORM_MAC,;t t s,@PLATFORM_MACOSX@,$PLATFORM_MACOSX,;t t s,@SO_SUFFIX@,$SO_SUFFIX,;t t +s,@SO_SUFFIX_MODULE@,$SO_SUFFIX_MODULE,;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 @@ -35642,82 +36199,89 @@ s,@USE_MACVERSION@,$USE_MACVERSION,;t t s,@USE_SOSYMLINKS@,$USE_SOSYMLINKS,;t t s,@SONAME_FLAG@,$SONAME_FLAG,;t t s,@DEPS_TRACKING@,$DEPS_TRACKING,;t t -s,@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_1@,$COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_1,;t t -s,@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@,$COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0,;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_GUI_0@,$COND_PLATFORM_MACOSX_1_USE_GUI_0,;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_RELEASE@,$COND_BUILD_RELEASE,;t t +s,@COND_BUILD_RELEASE_DEBUG_INFO_DEFAULT@,$COND_BUILD_RELEASE_DEBUG_INFO_DEFAULT,;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_TOOLKIT_MOTIF_USE_GUI_1@,$COND_TOOLKIT_MOTIF_USE_GUI_1,;t t -s,@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_1@,$COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_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_COCOA_USE_GUI_1@,$COND_TOOLKIT_COCOA_USE_GUI_1,;t t -s,@COND_USE_SOVERSOLARIS_1@,$COND_USE_SOVERSOLARIS_1,;t t -s,@COND_MONOLITHIC_1@,$COND_MONOLITHIC_1,;t t -s,@COND_UNICODE_1@,$COND_UNICODE_1,;t t s,@COND_MONOLITHIC_0@,$COND_MONOLITHIC_0,;t t -s,@COND_TOOLKIT_MGL@,$COND_TOOLKIT_MGL,;t t -s,@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@,$COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0,;t t -s,@COND_TOOLKIT_X11_USE_GUI_1_WXUNIV_0@,$COND_TOOLKIT_X11_USE_GUI_1_WXUNIV_0,;t t -s,@COND_WXUSE_ODBC_BUILTIN@,$COND_WXUSE_ODBC_BUILTIN,;t t -s,@COND_USE_SOVERSION_0@,$COND_USE_SOVERSION_0,;t t -s,@COND_WXUNIV_1@,$COND_WXUNIV_1,;t t -s,@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_1@,$COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_1,;t t -s,@COND_PLATFORM_UNIX_1@,$COND_PLATFORM_UNIX_1,;t t -s,@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@,$COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0,;t t -s,@COND_WXUSE_REGEX_BUILTIN@,$COND_WXUSE_REGEX_BUILTIN,;t t -s,@COND_TOOLKIT_MGL_USE_GUI_1_WXUNIV_1@,$COND_TOOLKIT_MGL_USE_GUI_1_WXUNIV_1,;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_HTML_1@,$COND_MONOLITHIC_0_SHARED_0_USE_HTML_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_HTML_1@,$COND_MONOLITHIC_0_SHARED_1_USE_HTML_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_UNIX_1_USE_GUI_0@,$COND_PLATFORM_UNIX_1_USE_GUI_0,;t t -s,@COND_PLATFORM_UNIX_1_USE_GUI_1@,$COND_PLATFORM_UNIX_1_USE_GUI_1,;t t -s,@COND_TOOLKIT_X11@,$COND_TOOLKIT_X11,;t t -s,@COND_OFFICIAL_BUILD_0@,$COND_OFFICIAL_BUILD_0,;t t -s,@COND_TOOLKIT_OS2@,$COND_TOOLKIT_OS2,;t t -s,@COND_TOOLKIT_MGL_USE_GUI_1@,$COND_TOOLKIT_MGL_USE_GUI_1,;t t -s,@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_1@,$COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_1,;t t -s,@COND_WXUSE_ZLIB_BUILTIN@,$COND_WXUSE_ZLIB_BUILTIN,;t t -s,@COND_TOOLKIT_MOTIF@,$COND_TOOLKIT_MOTIF,;t t -s,@COND_MONOLITHIC_0_SHARED_1@,$COND_MONOLITHIC_0_SHARED_1,;t t +s,@COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1@,$COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1,;t t +s,@COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1@,$COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1,;t t +s,@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@,$COND_PLATFORM_MACOSX_0_USE_SOVERSION_1,;t t +s,@COND_PLATFORM_MACOSX_1@,$COND_PLATFORM_MACOSX_1,;t t +s,@COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA@,$COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA,;t t +s,@COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@,$COND_PLATFORM_MACOSX_1_TOOLKIT_GTK,;t t +s,@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@,$COND_PLATFORM_MACOSX_1_TOOLKIT_MAC,;t t s,@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@,$COND_PLATFORM_MACOSX_1_USE_SOVERSION_1,;t t +s,@COND_PLATFORM_UNIX_1@,$COND_PLATFORM_UNIX_1,;t t +s,@COND_PLATFORM_WIN32_0@,$COND_PLATFORM_WIN32_0,;t t +s,@COND_PLATFORM_WIN32_1@,$COND_PLATFORM_WIN32_1,;t t +s,@COND_SHARED_0_USE_GUI_1_USE_OPENGL_1@,$COND_SHARED_0_USE_GUI_1_USE_OPENGL_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_MONOLITHIC_0_SHARED_0@,$COND_MONOLITHIC_0_SHARED_0,;t t -s,@COND_USE_GUI_1@,$COND_USE_GUI_1,;t t -s,@COND_USE_GUI_0@,$COND_USE_GUI_0,;t t -s,@COND_USE_GUI_0_USE_GUI_1@,$COND_USE_GUI_0_USE_GUI_1,;t t +s,@COND_TOOLKIT_MAC@,$COND_TOOLKIT_MAC,;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_X11_USE_GUI_1@,$COND_TOOLKIT_X11_USE_GUI_1,;t t -s,@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@,$COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0,;t t -s,@COND_BUILD_DEBUG@,$COND_BUILD_DEBUG,;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_WXUSE_LIBTIFF_BUILTIN@,$COND_WXUSE_LIBTIFF_BUILTIN,;t t -s,@COND_OFFICIAL_BUILD_1@,$COND_OFFICIAL_BUILD_1,;t t -s,@COND_BUILD_RELEASE@,$COND_BUILD_RELEASE,;t t -s,@COND_TOOLKIT_MGL_USE_GUI_1_WXUNIV_0@,$COND_TOOLKIT_MGL_USE_GUI_1_WXUNIV_0,;t t -s,@COND_USE_SOVERLINUX_1@,$COND_USE_SOVERLINUX_1,;t t -s,@COND_USE_SOSYMLINKS_1@,$COND_USE_SOSYMLINKS_1,;t t -s,@COND_TOOLKIT_COCOA@,$COND_TOOLKIT_COCOA,;t t -s,@COND_PLATFORM_MACOSX_1@,$COND_PLATFORM_MACOSX_1,;t t -s,@COND_WXUSE_LIBJPEG_BUILTIN@,$COND_WXUSE_LIBJPEG_BUILTIN,;t t -s,@COND_WXUSE_LIBPNG_BUILTIN@,$COND_WXUSE_LIBPNG_BUILTIN,;t t -s,@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@,$COND_MONOLITHIC_0_SHARED_1_USE_GUI_1,;t t -s,@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@,$COND_PLATFORM_MACOSX_0_USE_SOVERSION_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_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_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_WXUNIV_1@,$COND_USE_GUI_1_WXUNIV_1,;t t -s,@COND_TOOLKIT_GTK@,$COND_TOOLKIT_GTK,;t t -s,@COND_PLATFORM_WIN32_1_USE_GUI_0@,$COND_PLATFORM_WIN32_1_USE_GUI_0,;t t -s,@COND_PLATFORM_WIN32_1_USE_GUI_1@,$COND_PLATFORM_WIN32_1_USE_GUI_1,;t t -s,@COND_PLATFORM_WIN32_0@,$COND_PLATFORM_WIN32_0,;t t -s,@COND_PLATFORM_WIN32_1@,$COND_PLATFORM_WIN32_1,;t t -s,@COND_TOOLKIT_GTK_USE_GUI_1@,$COND_TOOLKIT_GTK_USE_GUI_1,;t t -s,@COND_TOOLKIT_MAC@,$COND_TOOLKIT_MAC,;t t -s,@COND_TOOLKIT_MSW_USE_GUI_1@,$COND_TOOLKIT_MSW_USE_GUI_1,;t t -s,@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@,$COND_MONOLITHIC_0_SHARED_0_USE_GUI_1,;t t -s,@COND_SHARED_1@,$COND_SHARED_1,;t t +s,@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@,$COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN,;t t +s,@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@,$COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN,;t t +s,@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@,$COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN,;t t +s,@COND_USE_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_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_LIBPNG_BUILTIN@,$COND_WXUSE_LIBPNG_BUILTIN,;t t +s,@COND_WXUSE_LIBTIFF_BUILTIN@,$COND_WXUSE_LIBTIFF_BUILTIN,;t t +s,@COND_WXUSE_ODBC_BUILTIN@,$COND_WXUSE_ODBC_BUILTIN,;t t +s,@COND_WXUSE_REGEX_BUILTIN@,$COND_WXUSE_REGEX_BUILTIN,;t t +s,@COND_WXUSE_ZLIB_BUILTIN@,$COND_WXUSE_ZLIB_BUILTIN,;t t s,@COND_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,@COND_TOOLKIT_MAC_USE_GUI_1@,$COND_TOOLKIT_MAC_USE_GUI_1,;t t +s,@COND_TOOLKIT_OS2_USE_GUI_1@,$COND_TOOLKIT_OS2_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_1_USE_GUI_1_USE_ODBC_1@,$COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1,;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 @@ -35725,7 +36289,8 @@ s,@WX_MINOR_VERSION_NUMBER@,$WX_MINOR_VERSION_NUMBER,;t t s,@WX_RELEASE_NUMBER@,$WX_RELEASE_NUMBER,;t t s,@WX_LIBRARY_NAME_STATIC@,$WX_LIBRARY_NAME_STATIC,;t t s,@WX_LIBRARY_NAME_SHARED@,$WX_LIBRARY_NAME_SHARED,;t t -s,@WX_LIBRARY_BASENAME@,$WX_LIBRARY_BASENAME,;t t +s,@WX_LIBRARY_BASENAME_NOGUI@,$WX_LIBRARY_BASENAME_NOGUI,;t t +s,@WX_LIBRARY_BASENAME_GUI@,$WX_LIBRARY_BASENAME_GUI,;t t s,@WX_LIBRARY_IMPORTLIB@,$WX_LIBRARY_IMPORTLIB,;t t s,@WX_TARGET_LIBRARY@,$WX_TARGET_LIBRARY,;t t s,@WX_LIBRARY_LINK1@,$WX_LIBRARY_LINK1,;t t @@ -35753,6 +36318,7 @@ s,@TOOLCHAIN_DEFS@,$TOOLCHAIN_DEFS,;t t s,@TOOLCHAIN_DLL_DEFS@,$TOOLCHAIN_DLL_DEFS,;t t s,@top_builddir_wxconfig@,$top_builddir_wxconfig,;t t s,@cross_compiling@,$cross_compiling,;t t +s,@WXCONFIG_EXTRALIBS@,$WXCONFIG_EXTRALIBS,;t t s,@WXCONFIG_LIBS@,$WXCONFIG_LIBS,;t t s,@WXCONFIG_LIBS_GL@,$WXCONFIG_LIBS_GL,;t t s,@WXCONFIG_LIBS_STATIC@,$WXCONFIG_LIBS_STATIC,;t t @@ -35791,7 +36357,6 @@ 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 @@ -36336,6 +36901,150 @@ if test "$no_create" != yes; then $ac_cs_success || { (exit 1); exit 1; } fi +# +# CONFIG_SUBDIRS section. +# +if test "$no_recursion" != yes; then + + # Remove --cache-file and --srcdir arguments so they do not pile up. + ac_sub_configure_args= + ac_prev= + for ac_arg in $ac_configure_args; do + if test -n "$ac_prev"; then + ac_prev= + continue + fi + case $ac_arg in + -cache-file | --cache-file | --cache-fil | --cache-fi \ + | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c) + ac_prev=cache_file ;; + -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \ + | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* \ + | --c=*) + ;; + --config-cache | -C) + ;; + -srcdir | --srcdir | --srcdi | --srcd | --src | --sr) + ac_prev=srcdir ;; + -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*) + ;; + -prefix | --prefix | --prefi | --pref | --pre | --pr | --p) + ac_prev=prefix ;; + -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*) + ;; + *) ac_sub_configure_args="$ac_sub_configure_args $ac_arg" ;; + esac + done + + # Always prepend --prefix to ensure using the same prefix + # in subdir configurations. + ac_sub_configure_args="--prefix=$prefix $ac_sub_configure_args" + + ac_popdir=`pwd` + for ac_dir in : $subdirs; do test "x$ac_dir" = x: && continue + + # Do not complain, so a configure script can configure whichever + # parts of a large source tree are present. + test -d $srcdir/$ac_dir || continue + + { echo "$as_me:$LINENO: configuring in $ac_dir" >&5 +echo "$as_me: configuring in $ac_dir" >&6;} + { if $as_mkdir_p; then + mkdir -p "$ac_dir" + else + as_dir="$ac_dir" + as_dirs= + while test ! -d "$as_dir"; do + as_dirs="$as_dir $as_dirs" + as_dir=`(dirname "$as_dir") 2>/dev/null || +$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$as_dir" : 'X\(//\)[^/]' \| \ + X"$as_dir" : 'X\(//\)$' \| \ + X"$as_dir" : 'X\(/\)' \| \ + . : '\(.\)' 2>/dev/null || +echo X"$as_dir" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } + /^X\(\/\/\)[^/].*/{ s//\1/; q; } + /^X\(\/\/\)$/{ s//\1/; q; } + /^X\(\/\).*/{ s//\1/; q; } + s/.*/./; q'` + done + test ! -n "$as_dirs" || mkdir $as_dirs + fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5 +echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} + { (exit 1); exit 1; }; }; } + + ac_builddir=. + +if test "$ac_dir" != .; then + ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` + # A "../" for each directory in $ac_dir_suffix. + ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'` +else + ac_dir_suffix= ac_top_builddir= +fi + +case $srcdir in + .) # No --srcdir option. We are building in place. + ac_srcdir=. + if test -z "$ac_top_builddir"; then + ac_top_srcdir=. + else + ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'` + fi ;; + [\\/]* | ?:[\\/]* ) # Absolute path. + ac_srcdir=$srcdir$ac_dir_suffix; + ac_top_srcdir=$srcdir ;; + *) # Relative path. + ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix + ac_top_srcdir=$ac_top_builddir$srcdir ;; +esac +# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be +# absolute. +ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd` +ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd` +ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd` +ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd` + + + cd $ac_dir + + # Check for guested configure; otherwise get Cygnus style configure. + if test -f $ac_srcdir/configure.gnu; then + ac_sub_configure="$SHELL '$ac_srcdir/configure.gnu'" + elif test -f $ac_srcdir/configure; then + ac_sub_configure="$SHELL '$ac_srcdir/configure'" + elif test -f $ac_srcdir/configure.in; then + ac_sub_configure=$ac_configure + else + { echo "$as_me:$LINENO: WARNING: no configuration information is in $ac_dir" >&5 +echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2;} + ac_sub_configure= + fi + + # The recursion is here. + if test -n "$ac_sub_configure"; then + # Make the cache file name correct relative to the subdirectory. + case $cache_file in + [\\/]* | ?:[\\/]* ) ac_sub_cache_file=$cache_file ;; + *) # Relative path. + ac_sub_cache_file=$ac_top_builddir$cache_file ;; + esac + + { echo "$as_me:$LINENO: running $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&5 +echo "$as_me: running $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&6;} + # The eval makes quoting arguments work. + eval $ac_sub_configure $ac_sub_configure_args \ + --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir || + { { echo "$as_me:$LINENO: error: $ac_sub_configure failed for $ac_dir" >&5 +echo "$as_me: error: $ac_sub_configure failed for $ac_dir" >&2;} + { (exit 1); exit 1; }; } + fi + + cd $ac_popdir + done +fi + echo echo "Configured wxWindows ${WX_VERSION} for \`${host}'" @@ -36359,6 +37068,7 @@ echo " regex ${wxUSE_REGEX}" echo " tiff ${wxUSE_LIBTIFF-none}" echo " zlib ${wxUSE_ZLIB}" echo " odbc ${wxUSE_ODBC}" +echo " expat ${wxUSE_EXPAT}" echo ""