X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b2e972ec6ce99e30214f547291a2de4079e60615..81345eef3438bf34c4a1b9ed06f7fd2177b31e43:/configure diff --git a/configure b/configure index 757fe63641..48b370c4e9 100755 --- a/configure +++ b/configure @@ -311,7 +311,7 @@ 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_0 COND_DEPS_TRACKING_0 COND_DEPS_TRACKING_1 COND_TOOLKIT_MOTIF_USE_GUI_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_WXUSE_ODBC_BUILTIN COND_USE_SOVERSION_0 COND_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_TOOLKIT_X11 COND_OFFICIAL_BUILD_0 COND_TOOLKIT_OS2 COND_TOOLKIT_MGL_USE_GUI_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_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_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_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 COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1 COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_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 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_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_0 COND_DEPS_TRACKING_0 COND_DEPS_TRACKING_1 COND_TOOLKIT_MOTIF_USE_GUI_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_WXUSE_ODBC_BUILTIN COND_USE_SOVERSION_0 COND_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_TOOLKIT_X11 COND_OFFICIAL_BUILD_0 COND_TOOLKIT_OS2 COND_TOOLKIT_MGL_USE_GUI_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_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_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_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_subst_files='' # Initialize some variables set by options. @@ -34668,16 +34668,6 @@ fi COND_SHARED_0="" fi - 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_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 - @@ -34821,11 +34811,7 @@ fi ac_config_headers="$ac_config_headers setup.h" - ac_config_files="$ac_config_files - wx-config - version-script - Makefile -" + ac_config_files="$ac_config_files wx-config version-script Makefile" ac_config_commands="$ac_config_commands default" @@ -35403,18 +35389,9 @@ for ac_config_target in $ac_config_targets do case "$ac_config_target" in # Handling of arguments. - " -" ) CONFIG_FILES="$CONFIG_FILES -" ;; - "wx-config -" ) CONFIG_FILES="$CONFIG_FILES wx-config -" ;; - "version-script -" ) CONFIG_FILES="$CONFIG_FILES version-script -" ;; - "Makefile -" ) CONFIG_FILES="$CONFIG_FILES Makefile -" ;; + "wx-config" ) CONFIG_FILES="$CONFIG_FILES wx-config" ;; + "version-script" ) CONFIG_FILES="$CONFIG_FILES version-script" ;; + "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;; "$mk" ) CONFIG_FILES="$CONFIG_FILES $mk" ;; "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;; "setup.h" ) CONFIG_HEADERS="$CONFIG_HEADERS setup.h" ;; @@ -35661,8 +35638,6 @@ s,@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@,$COND_MONOLITHIC_0_SHARED_0_USE_GUI_1,; s,@COND_SHARED_1@,$COND_SHARED_1,;t t s,@COND_PLATFORM_MAC_1@,$COND_PLATFORM_MAC_1,;t t s,@COND_SHARED_0@,$COND_SHARED_0,;t t -s,@COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1@,$COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1,;t t -s,@COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1@,$COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_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