#! /bin/sh
-# From configure.in Id: configure.in 47255 2007-07-09 10:12:51Z VS .
+# From configure.in Id: configure.in 47282 2007-07-10 01:51:43Z VZ .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.59 for wxWidgets 2.9.0.
#
#endif"
ac_subdirs_all="$ac_subdirs_all src/expat"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os wx_top_builddir CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP CXX CXXFLAGS ac_ct_CXX RANLIB ac_ct_RANLIB AR ac_ct_AR INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA STRIP ac_ct_STRIP WINDRES ac_ct_WINDRES DLLTOOL ac_ct_DLLTOOL IF_GNU_MAKE LN_S subdirs PKG_CONFIG GTK_CFLAGS GTK_LIBS GTK_CONFIG ac_pt_PKG_CONFIG DIRECTFB_CFLAGS DIRECTFB_LIBS X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS PANGOX_CFLAGS PANGOX_LIBS PANGOFT2_CFLAGS PANGOFT2_LIBS PANGOXFT_CFLAGS PANGOXFT_LIBS CFLAGS_VISIBILITY CXXFLAGS_VISIBILITY REZ DEREZ SETFILE LIBICONV SDL_CONFIG SDL_CFLAGS SDL_LIBS LIBGNOMEPRINTUI_CFLAGS LIBGNOMEPRINTUI_LIBS GNOMEVFS_CFLAGS GNOMEVFS_LIBS HILDON_CFLAGS HILDON_LIBS CAIRO_CFLAGS CAIRO_LIBS GST_CFLAGS GST_LIBS CORE_BASE_LIBS CORE_GUI_LIBS wxUSE_ZLIB wxUSE_REGEX wxUSE_EXPAT wxUSE_ODBC wxUSE_LIBJPEG wxUSE_LIBPNG wxUSE_LIBTIFF VENDOR OFFICIAL_BUILD WX_FLAVOUR WX_LIB_FLAVOUR WXUNIV MONOLITHIC USE_PLUGINS CXXWARNINGS EXTRALIBS EXTRALIBS_XML EXTRALIBS_HTML EXTRALIBS_ODBC EXTRALIBS_GUI EXTRALIBS_OPENGL EXTRALIBS_SDL WITH_PLUGIN_SDL EXTRALIBS_GNOMEPRINT EXTRALIBS_GNOMEVFS EXTRALIBS_HILDON UNICODE BUILD DEBUG_INFO DEBUG_FLAG TOOLKIT_LOWERCASE TOOLKIT_VERSION SAMPLES_RPATH_FLAG SAMPLES_RPATH_POSTLINK HOST_SUFFIX CPPUNIT_CFLAGS CPPUNIT_LIBS SET_MAKE MAKE_SET AROPTIONS NM ac_ct_NM INSTALL_DIR LDFLAGS_GUI PLATFORM_UNIX PLATFORM_WIN32 PLATFORM_MSDOS PLATFORM_MAC PLATFORM_MACOS PLATFORM_MACOSX PLATFORM_OS2 PLATFORM_BEOS SO_SUFFIX SO_SUFFIX_MODULE DLLIMP_SUFFIX LIBPREFIX LIBEXT DLLPREFIX DLLPREFIX_MODULE dlldir AIX_CXX_LD SHARED_LD_CC SHARED_LD_CXX SHARED_LD_MODULE_CC SHARED_LD_MODULE_CXX PIC_FLAG WINDOWS_IMPLIB USE_SOVERSION USE_SOVERLINUX USE_SOVERSOLARIS USE_SOVERCYGWIN USE_MACVERSION USE_SOSYMLINKS SONAME_FLAG DEPS_TRACKING BK_DEPS GCC_PCH ICC_PCH BK_MAKE_PCH COND_BUILD_DEBUG COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT COND_BUILD_DEBUG_DEBUG_INFO_DEFAULT COND_BUILD_DEBUG_UNICODE_0 COND_BUILD_DEBUG_UNICODE_1 COND_BUILD_RELEASE COND_BUILD_RELEASE_DEBUG_INFO_DEFAULT COND_BUILD_RELEASE_UNICODE_0 COND_BUILD_RELEASE_UNICODE_1 COND_DEBUG_FLAG_1 COND_DEBUG_INFO_0 COND_DEBUG_INFO_1 COND_DEPS_TRACKING_0 COND_DEPS_TRACKING_1 COND_GCC_PCH_1 COND_ICC_PCH_1 COND_MONOLITHIC_0 COND_MONOLITHIC_0_SHARED_0 COND_MONOLITHIC_0_SHARED_0_USE_AUI_1 COND_MONOLITHIC_0_SHARED_0_USE_GUI_1 COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_HTML_1 COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_MEDIA_1 COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1 COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_QA_1 COND_MONOLITHIC_0_SHARED_0_USE_ODBC_1 COND_MONOLITHIC_0_SHARED_0_USE_RICHTEXT_1 COND_MONOLITHIC_0_SHARED_0_USE_STC_1 COND_MONOLITHIC_0_SHARED_0_USE_XRC_1 COND_MONOLITHIC_0_SHARED_1 COND_MONOLITHIC_0_SHARED_1_USE_AUI_1 COND_MONOLITHIC_0_SHARED_1_USE_GUI_1 COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1 COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1 COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1 COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1 COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1 COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1 COND_MONOLITHIC_0_SHARED_1_USE_STC_1 COND_MONOLITHIC_0_SHARED_1_USE_XRC_1 COND_MONOLITHIC_0_USE_AUI_1 COND_MONOLITHIC_0_USE_GUI_1 COND_MONOLITHIC_0_USE_GUI_1_USE_MEDIA_1 COND_MONOLITHIC_0_USE_GUI_1_USE_ODBC_1 COND_MONOLITHIC_0_USE_HTML_1 COND_MONOLITHIC_0_USE_MEDIA_1 COND_MONOLITHIC_0_USE_ODBC_1 COND_MONOLITHIC_0_USE_QA_1 COND_MONOLITHIC_0_USE_RICHTEXT_1 COND_MONOLITHIC_0_USE_STC_1 COND_MONOLITHIC_0_USE_XRC_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_SOVERCYGWIN_0_USE_SOVERSION_1 COND_PLATFORM_MACOSX_0_USE_SOVERSION_1 COND_PLATFORM_MACOSX_1 COND_PLATFORM_MACOSX_1_TOOLKIT_ COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA COND_PLATFORM_MACOSX_1_TOOLKIT_GTK COND_PLATFORM_MACOSX_1_TOOLKIT_MAC COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1 COND_PLATFORM_MACOSX_1_TOOLKIT_MOTIF COND_PLATFORM_MACOSX_1_TOOLKIT_X11 COND_PLATFORM_MACOSX_1_USE_GUI_1 COND_PLATFORM_MACOSX_1_USE_SOVERSION_1 COND_PLATFORM_MACOS_1 COND_PLATFORM_MAC_1 COND_PLATFORM_MSDOS_0 COND_PLATFORM_MSDOS_1 COND_PLATFORM_OS2_1 COND_PLATFORM_UNIX_0 COND_PLATFORM_UNIX_1 COND_PLATFORM_UNIX_1_TOOLKIT_MGL COND_PLATFORM_UNIX_1_TOOLKIT_MGL_USE_GUI_1 COND_PLATFORM_UNIX_1_USE_GUI_1 COND_PLATFORM_UNIX_1_USE_PLUGINS_0 COND_PLATFORM_WIN32_0 COND_PLATFORM_WIN32_1 COND_SHARED_0 COND_SHARED_0_TOOLKIT_MAC_WXUNIV_0 COND_SHARED_0_TOOLKIT_MSW_WXUNIV_0 COND_SHARED_0_TOOLKIT_PM_WXUNIV_0 COND_SHARED_0_USE_GUI_1_USE_OPENGL_1 COND_SHARED_0_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN COND_SHARED_0_USE_GUI_1_WXUSE_LIBPNG_BUILTIN COND_SHARED_0_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN COND_SHARED_0_USE_STC_1 COND_SHARED_0_USE_XRC_1 COND_SHARED_0_WXUSE_EXPAT_BUILTIN COND_SHARED_0_WXUSE_ODBC_BUILTIN COND_SHARED_0_WXUSE_REGEX_BUILTIN COND_SHARED_0_WXUSE_ZLIB_BUILTIN COND_SHARED_1 COND_SHARED_1_USE_GUI_1_USE_OPENGL_1 COND_SHARED_1_USE_XRC_1 COND_TOOLKIT_ COND_TOOLKIT_COCOA COND_TOOLKIT_COCOA_USE_GUI_1 COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_DFB COND_TOOLKIT_DFB_USE_GUI_1 COND_TOOLKIT_GTK COND_TOOLKIT_GTK_TOOLKIT_VERSION_ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2 COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1 COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1 COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0 COND_TOOLKIT_GTK_USE_GUI_1 COND_TOOLKIT_MAC COND_TOOLKIT_MAC_USE_GUI_1 COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_MGL COND_TOOLKIT_MGL_USE_GUI_1 COND_TOOLKIT_MOTIF COND_TOOLKIT_MOTIF_USE_GUI_1 COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_MSW COND_TOOLKIT_MSW_USE_GUI_1 COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_MSW_WXUNIV_0 COND_TOOLKIT_PM COND_TOOLKIT_PM_USE_GUI_1 COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_WINCE COND_TOOLKIT_WINCE_USE_GUI_1 COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_WINCE_WXUNIV_0 COND_TOOLKIT_X11 COND_TOOLKIT_X11_USE_GUI_1 COND_UNICODE_1 COND_USE_EXCEPTIONS_0 COND_USE_EXCEPTIONS_1 COND_USE_GUI_0 COND_USE_GUI_1 COND_USE_GUI_1_USE_OPENGL_1 COND_USE_GUI_1_WXUNIV_0 COND_USE_GUI_1_WXUNIV_1 COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN COND_USE_ODBC_1 COND_USE_OPENGL_1 COND_USE_PCH_1 COND_USE_PLUGINS_0 COND_USE_RTTI_0 COND_USE_RTTI_1 COND_USE_SOSYMLINKS_1 COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1 COND_USE_SOVERLINUX_1 COND_USE_SOVERSION_0 COND_USE_SOVERSOLARIS_1 COND_USE_STC_1 COND_USE_THREADS_0 COND_USE_THREADS_1 COND_USE_XRC_1 COND_WINDOWS_IMPLIB_1 COND_WITH_PLUGIN_SDL_1 COND_WXUNIV_0 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 SHARED WX_LIBRARY_BASENAME_NOGUI WX_LIBRARY_BASENAME_GUI USE_GUI AFMINSTALL WIN32INSTALL TOOLKIT TOOLKIT_DIR TOOLCHAIN_NAME TOOLCHAIN_FULLNAME cross_compiling WIDGET_SET WX_RELEASE WX_VERSION WX_SUBVERSION WX_CHARTYPE WX_DEBUGTYPE WXCONFIG_CPPFLAGS WXCONFIG_CFLAGS WXCONFIG_CXXFLAGS WXCONFIG_LIBS WXCONFIG_RPATH WXCONFIG_LDFLAGS_GUI WXCONFIG_RESFLAGS EXE_LINKER GUIDIST DISTDIR SAMPLES_SUBDIRS LDFLAGS_GL OPENGL_LIBS DMALLOC_LIBS WX_VERSION_TAG RESCOMP RESFLAGS RESPROGRAMOBJ WX_RESOURCES_MACOSX_ASCII WX_RESOURCES_MACOSX_DATA LIBWXMACRES POSTLINK_COMMAND MACSETFILE GCC CPPUNIT_CONFIG LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os wx_top_builddir CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP CXX CXXFLAGS ac_ct_CXX RANLIB ac_ct_RANLIB AR ac_ct_AR INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA STRIP ac_ct_STRIP WINDRES ac_ct_WINDRES DLLTOOL ac_ct_DLLTOOL IF_GNU_MAKE LN_S subdirs PKG_CONFIG GTK_CFLAGS GTK_LIBS GTK_CONFIG ac_pt_PKG_CONFIG DIRECTFB_CFLAGS DIRECTFB_LIBS X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS PANGOX_CFLAGS PANGOX_LIBS PANGOFT2_CFLAGS PANGOFT2_LIBS PANGOXFT_CFLAGS PANGOXFT_LIBS CFLAGS_VISIBILITY CXXFLAGS_VISIBILITY REZ DEREZ SETFILE LIBICONV SDL_CONFIG SDL_CFLAGS SDL_LIBS LIBGNOMEPRINTUI_CFLAGS LIBGNOMEPRINTUI_LIBS GNOMEVFS_CFLAGS GNOMEVFS_LIBS HILDON_CFLAGS HILDON_LIBS CAIRO_CFLAGS CAIRO_LIBS GST_CFLAGS GST_LIBS ALL_WX_LIBS BUILT_WX_LIBS STD_BASE_LIBS STD_GUI_LIBS wxUSE_ZLIB wxUSE_REGEX wxUSE_EXPAT wxUSE_ODBC wxUSE_LIBJPEG wxUSE_LIBPNG wxUSE_LIBTIFF VENDOR OFFICIAL_BUILD WX_FLAVOUR WX_LIB_FLAVOUR WXUNIV MONOLITHIC USE_PLUGINS CXXWARNINGS EXTRALIBS EXTRALIBS_XML EXTRALIBS_HTML EXTRALIBS_ODBC EXTRALIBS_GUI EXTRALIBS_OPENGL EXTRALIBS_SDL WITH_PLUGIN_SDL EXTRALIBS_GNOMEPRINT EXTRALIBS_GNOMEVFS EXTRALIBS_HILDON UNICODE BUILD DEBUG_INFO DEBUG_FLAG TOOLKIT_LOWERCASE TOOLKIT_VERSION SAMPLES_RPATH_FLAG SAMPLES_RPATH_POSTLINK HOST_SUFFIX CPPUNIT_CFLAGS CPPUNIT_LIBS SET_MAKE MAKE_SET AROPTIONS NM ac_ct_NM INSTALL_DIR LDFLAGS_GUI PLATFORM_UNIX PLATFORM_WIN32 PLATFORM_MSDOS PLATFORM_MAC PLATFORM_MACOS PLATFORM_MACOSX PLATFORM_OS2 PLATFORM_BEOS SO_SUFFIX SO_SUFFIX_MODULE DLLIMP_SUFFIX LIBPREFIX LIBEXT DLLPREFIX DLLPREFIX_MODULE dlldir AIX_CXX_LD SHARED_LD_CC SHARED_LD_CXX SHARED_LD_MODULE_CC SHARED_LD_MODULE_CXX PIC_FLAG WINDOWS_IMPLIB USE_SOVERSION USE_SOVERLINUX USE_SOVERSOLARIS USE_SOVERCYGWIN USE_MACVERSION USE_SOSYMLINKS SONAME_FLAG DEPS_TRACKING BK_DEPS GCC_PCH ICC_PCH BK_MAKE_PCH COND_BUILD_DEBUG COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT COND_BUILD_DEBUG_DEBUG_INFO_DEFAULT COND_BUILD_DEBUG_UNICODE_0 COND_BUILD_DEBUG_UNICODE_1 COND_BUILD_RELEASE COND_BUILD_RELEASE_DEBUG_INFO_DEFAULT COND_BUILD_RELEASE_UNICODE_0 COND_BUILD_RELEASE_UNICODE_1 COND_DEBUG_FLAG_1 COND_DEBUG_INFO_0 COND_DEBUG_INFO_1 COND_DEPS_TRACKING_0 COND_DEPS_TRACKING_1 COND_GCC_PCH_1 COND_ICC_PCH_1 COND_MONOLITHIC_0 COND_MONOLITHIC_0_SHARED_0 COND_MONOLITHIC_0_SHARED_0_USE_AUI_1 COND_MONOLITHIC_0_SHARED_0_USE_GUI_1 COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_HTML_1 COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_MEDIA_1 COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1 COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_QA_1 COND_MONOLITHIC_0_SHARED_0_USE_ODBC_1 COND_MONOLITHIC_0_SHARED_0_USE_RICHTEXT_1 COND_MONOLITHIC_0_SHARED_0_USE_STC_1 COND_MONOLITHIC_0_SHARED_0_USE_XRC_1 COND_MONOLITHIC_0_SHARED_1 COND_MONOLITHIC_0_SHARED_1_USE_AUI_1 COND_MONOLITHIC_0_SHARED_1_USE_GUI_1 COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1 COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1 COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1 COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1 COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1 COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1 COND_MONOLITHIC_0_SHARED_1_USE_STC_1 COND_MONOLITHIC_0_SHARED_1_USE_XRC_1 COND_MONOLITHIC_0_USE_AUI_1 COND_MONOLITHIC_0_USE_GUI_1 COND_MONOLITHIC_0_USE_GUI_1_USE_MEDIA_1 COND_MONOLITHIC_0_USE_GUI_1_USE_ODBC_1 COND_MONOLITHIC_0_USE_HTML_1 COND_MONOLITHIC_0_USE_MEDIA_1 COND_MONOLITHIC_0_USE_ODBC_1 COND_MONOLITHIC_0_USE_QA_1 COND_MONOLITHIC_0_USE_RICHTEXT_1 COND_MONOLITHIC_0_USE_STC_1 COND_MONOLITHIC_0_USE_XRC_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_SOVERCYGWIN_0_USE_SOVERSION_1 COND_PLATFORM_MACOSX_0_USE_SOVERSION_1 COND_PLATFORM_MACOSX_1 COND_PLATFORM_MACOSX_1_TOOLKIT_ COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA COND_PLATFORM_MACOSX_1_TOOLKIT_GTK COND_PLATFORM_MACOSX_1_TOOLKIT_MAC COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1 COND_PLATFORM_MACOSX_1_TOOLKIT_MOTIF COND_PLATFORM_MACOSX_1_TOOLKIT_X11 COND_PLATFORM_MACOSX_1_USE_GUI_1 COND_PLATFORM_MACOSX_1_USE_SOVERSION_1 COND_PLATFORM_MACOS_1 COND_PLATFORM_MAC_1 COND_PLATFORM_MSDOS_0 COND_PLATFORM_MSDOS_1 COND_PLATFORM_OS2_1 COND_PLATFORM_UNIX_0 COND_PLATFORM_UNIX_1 COND_PLATFORM_UNIX_1_TOOLKIT_MGL COND_PLATFORM_UNIX_1_TOOLKIT_MGL_USE_GUI_1 COND_PLATFORM_UNIX_1_USE_GUI_1 COND_PLATFORM_UNIX_1_USE_PLUGINS_0 COND_PLATFORM_WIN32_0 COND_PLATFORM_WIN32_1 COND_SHARED_0 COND_SHARED_0_TOOLKIT_MAC_WXUNIV_0 COND_SHARED_0_TOOLKIT_MSW_WXUNIV_0 COND_SHARED_0_TOOLKIT_PM_WXUNIV_0 COND_SHARED_0_USE_GUI_1_USE_OPENGL_1 COND_SHARED_0_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN COND_SHARED_0_USE_GUI_1_WXUSE_LIBPNG_BUILTIN COND_SHARED_0_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN COND_SHARED_0_USE_STC_1 COND_SHARED_0_USE_XRC_1 COND_SHARED_0_WXUSE_EXPAT_BUILTIN COND_SHARED_0_WXUSE_ODBC_BUILTIN COND_SHARED_0_WXUSE_REGEX_BUILTIN COND_SHARED_0_WXUSE_ZLIB_BUILTIN COND_SHARED_1 COND_SHARED_1_USE_GUI_1_USE_OPENGL_1 COND_SHARED_1_USE_XRC_1 COND_TOOLKIT_ COND_TOOLKIT_COCOA COND_TOOLKIT_COCOA_USE_GUI_1 COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_DFB COND_TOOLKIT_DFB_USE_GUI_1 COND_TOOLKIT_GTK COND_TOOLKIT_GTK_TOOLKIT_VERSION_ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2 COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1 COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1 COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0 COND_TOOLKIT_GTK_USE_GUI_1 COND_TOOLKIT_MAC COND_TOOLKIT_MAC_USE_GUI_1 COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_MGL COND_TOOLKIT_MGL_USE_GUI_1 COND_TOOLKIT_MOTIF COND_TOOLKIT_MOTIF_USE_GUI_1 COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_MSW COND_TOOLKIT_MSW_USE_GUI_1 COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_MSW_WXUNIV_0 COND_TOOLKIT_PM COND_TOOLKIT_PM_USE_GUI_1 COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_WINCE COND_TOOLKIT_WINCE_USE_GUI_1 COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_WINCE_WXUNIV_0 COND_TOOLKIT_X11 COND_TOOLKIT_X11_USE_GUI_1 COND_UNICODE_1 COND_USE_EXCEPTIONS_0 COND_USE_EXCEPTIONS_1 COND_USE_GUI_0 COND_USE_GUI_1 COND_USE_GUI_1_USE_OPENGL_1 COND_USE_GUI_1_WXUNIV_0 COND_USE_GUI_1_WXUNIV_1 COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN COND_USE_ODBC_1 COND_USE_OPENGL_1 COND_USE_PCH_1 COND_USE_PLUGINS_0 COND_USE_RTTI_0 COND_USE_RTTI_1 COND_USE_SOSYMLINKS_1 COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1 COND_USE_SOVERLINUX_1 COND_USE_SOVERSION_0 COND_USE_SOVERSOLARIS_1 COND_USE_STC_1 COND_USE_THREADS_0 COND_USE_THREADS_1 COND_USE_XRC_1 COND_WINDOWS_IMPLIB_1 COND_WITH_PLUGIN_SDL_1 COND_WXUNIV_0 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 SHARED WX_LIBRARY_BASENAME_NOGUI WX_LIBRARY_BASENAME_GUI USE_GUI AFMINSTALL WIN32INSTALL TOOLKIT TOOLKIT_DIR TOOLCHAIN_NAME TOOLCHAIN_FULLNAME cross_compiling WIDGET_SET WX_RELEASE WX_VERSION WX_SUBVERSION WX_CHARTYPE WX_DEBUGTYPE WXCONFIG_CPPFLAGS WXCONFIG_CFLAGS WXCONFIG_CXXFLAGS WXCONFIG_LIBS WXCONFIG_RPATH WXCONFIG_LDFLAGS_GUI WXCONFIG_RESFLAGS EXE_LINKER GUIDIST DISTDIR SAMPLES_SUBDIRS LDFLAGS_GL OPENGL_LIBS DMALLOC_LIBS WX_VERSION_TAG RESCOMP RESFLAGS RESPROGRAMOBJ WX_RESOURCES_MACOSX_ASCII WX_RESOURCES_MACOSX_DATA LIBWXMACRES POSTLINK_COMMAND MACSETFILE GCC CPPUNIT_CONFIG LIBOBJS LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
-CORE_BASE_LIBS="net base"
-CORE_GUI_LIBS="adv core"
+STD_BASE_LIBS="base"
+STD_GUI_LIBS=""
+BUILT_WX_LIBS="base"
+ALL_WX_LIBS="xrc stc gl media dbgrid qa html adv core odbc xml net base"
-if test "$wxUSE_XML" = "yes" ; then
- CORE_BASE_LIBS="xml $CORE_BASE_LIBS"
+if test "$wxUSE_SOCKETS" = "yes" ; then
+ STD_BASE_LIBS="net $STD_BASE_LIBS"
+ BUILT_WX_LIBS="net $BUILT_WX_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_DEBUGREPORT" = "yes" ; then
- CORE_GUI_LIBS="qa $CORE_GUI_LIBS"
+ BUILT_WX_LIBS="odbc $BUILT_WX_LIBS"
fi
-if test "$wxUSE_XRC" = "yes" ; then
- CORE_GUI_LIBS="xrc $CORE_GUI_LIBS"
-fi
-if test "$wxUSE_AUI" = "yes" ; then
- CORE_GUI_LIBS="aui $CORE_GUI_LIBS"
-fi
-if test "$wxUSE_STC" = "yes" ; then
- CORE_GUI_LIBS="stc $CORE_GUI_LIBS"
+if test "$wxUSE_XML" = "yes" ; then
+ STD_BASE_LIBS="xml $STD_BASE_LIBS"
+ BUILT_WX_LIBS="xml $BUILT_WX_LIBS"
fi
-if test "$wxUSE_GUI" != "yes"; then
- CORE_GUI_LIBS=""
+if test "$wxUSE_GUI" = "yes"; then
+ STD_GUI_LIBS="adv core"
+
+ if test "$wxUSE_DEBUGREPORT" = "yes" ; then
+ STD_GUI_LIBS="qa $STD_GUI_LIBS"
+ BUILT_WX_LIBS="qa $BUILT_WX_LIBS"
+ fi
+ if test "$wxUSE_ODBC" != "no" ; then
+ BUILT_WX_LIBS="dbgrid $BUILT_WX_LIBS"
+ fi
+ if test "$wxUSE_HTML" = "yes" ; then
+ STD_GUI_LIBS="html $STD_GUI_LIBS"
+ BUILT_WX_LIBS="html $BUILT_WX_LIBS"
+ fi
+ if test "$wxUSE_MEDIACTRL" = "yes" ; then
+ BUILT_WX_LIBS="media $BUILT_WX_LIBS"
+ fi
+ if test "$wxUSE_OPENGL" = "yes" ; then
+ BUILT_WX_LIBS="gl $BUILT_WX_LIBS"
+ fi
+ if test "$wxUSE_AUI" = "yes" ; then
+ BUILT_WX_LIBS="aui $BUILT_WX_LIBS"
+ fi
+ if test "$wxUSE_STC" = "yes" ; then
+ BUILT_WX_LIBS="stc $BUILT_WX_LIBS"
+ fi
+ if test "$wxUSE_XRC" = "yes" ; then
+ STD_GUI_LIBS="xrc $STD_GUI_LIBS"
+ BUILT_WX_LIBS="xrc $BUILT_WX_LIBS"
+ fi
fi
+
+
if test "$wxUSE_MAC" = 1 ; then
if test "$wxUSE_SOUND" = "yes" || test "$wxUSE_MEDIACTRL" = "yes"; then
if test "$USE_DARWIN" = 1; then
s,@CAIRO_LIBS@,$CAIRO_LIBS,;t t
s,@GST_CFLAGS@,$GST_CFLAGS,;t t
s,@GST_LIBS@,$GST_LIBS,;t t
-s,@CORE_BASE_LIBS@,$CORE_BASE_LIBS,;t t
-s,@CORE_GUI_LIBS@,$CORE_GUI_LIBS,;t t
+s,@ALL_WX_LIBS@,$ALL_WX_LIBS,;t t
+s,@BUILT_WX_LIBS@,$BUILT_WX_LIBS,;t t
+s,@STD_BASE_LIBS@,$STD_BASE_LIBS,;t t
+s,@STD_GUI_LIBS@,$STD_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
dnl ar command
dnl defines AR with the appropriate command
-dnl
+dnl
dnl For Sun CC AC_BAKEFILE below sets AR to the compiler itself.
if test "x$SUNCXX" != xyes; then
AC_CHECK_TOOL(AR, ar)
dnl check for uname (POSIX) and gethostname (BSD)
WX_CHECK_FUNCS(uname,,,[#include <sys/utsname.h>])
if test "$wx_cv_func_uname" != yes; then
- WX_CHECK_FUNCS(gethostname)
+ WX_CHECK_FUNCS(gethostname)
fi
WX_CHECK_FUNCS(strtok_r, [], [], [#define _REENTRANT])
wx_cv_type_getsockopt5,
[
dnl Note that the rules for compatibility of pointers
- dnl are somewhat different between C and C++, so code
+ dnl are somewhat different between C and C++, so code
dnl that fails in C++ may not even give a warning about
dnl converting between incompatible pointer types in C.
dnl So this test needs to be done in C++ mode.
dnl define variables with all built libraries for wx-config
dnl ---------------------------------------------------------------------------
-CORE_BASE_LIBS="net base"
-CORE_GUI_LIBS="adv core"
+STD_BASE_LIBS="base"
+STD_GUI_LIBS=""
+BUILT_WX_LIBS="base"
+ALL_WX_LIBS="xrc stc gl media dbgrid qa html adv core odbc xml net base"
-if test "$wxUSE_XML" = "yes" ; then
- CORE_BASE_LIBS="xml $CORE_BASE_LIBS"
+if test "$wxUSE_SOCKETS" = "yes" ; then
+ STD_BASE_LIBS="net $STD_BASE_LIBS"
+ BUILT_WX_LIBS="net $BUILT_WX_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_DEBUGREPORT" = "yes" ; then
- CORE_GUI_LIBS="qa $CORE_GUI_LIBS"
-fi
-if test "$wxUSE_XRC" = "yes" ; then
- CORE_GUI_LIBS="xrc $CORE_GUI_LIBS"
-fi
-if test "$wxUSE_AUI" = "yes" ; then
- CORE_GUI_LIBS="aui $CORE_GUI_LIBS"
+ BUILT_WX_LIBS="odbc $BUILT_WX_LIBS"
fi
-if test "$wxUSE_STC" = "yes" ; then
- CORE_GUI_LIBS="stc $CORE_GUI_LIBS"
+if test "$wxUSE_XML" = "yes" ; then
+ STD_BASE_LIBS="xml $STD_BASE_LIBS"
+ BUILT_WX_LIBS="xml $BUILT_WX_LIBS"
fi
-if test "$wxUSE_GUI" != "yes"; then
- CORE_GUI_LIBS=""
+if test "$wxUSE_GUI" = "yes"; then
+ STD_GUI_LIBS="adv core"
+
+ if test "$wxUSE_DEBUGREPORT" = "yes" ; then
+ STD_GUI_LIBS="qa $STD_GUI_LIBS"
+ BUILT_WX_LIBS="qa $BUILT_WX_LIBS"
+ fi
+ if test "$wxUSE_ODBC" != "no" ; then
+ BUILT_WX_LIBS="dbgrid $BUILT_WX_LIBS"
+ fi
+ if test "$wxUSE_HTML" = "yes" ; then
+ STD_GUI_LIBS="html $STD_GUI_LIBS"
+ BUILT_WX_LIBS="html $BUILT_WX_LIBS"
+ fi
+ if test "$wxUSE_MEDIACTRL" = "yes" ; then
+ BUILT_WX_LIBS="media $BUILT_WX_LIBS"
+ fi
+ if test "$wxUSE_OPENGL" = "yes" ; then
+ BUILT_WX_LIBS="gl $BUILT_WX_LIBS"
+ fi
+ if test "$wxUSE_AUI" = "yes" ; then
+ BUILT_WX_LIBS="aui $BUILT_WX_LIBS"
+ fi
+ if test "$wxUSE_STC" = "yes" ; then
+ BUILT_WX_LIBS="stc $BUILT_WX_LIBS"
+ fi
+ if test "$wxUSE_XRC" = "yes" ; then
+ STD_GUI_LIBS="xrc $STD_GUI_LIBS"
+ BUILT_WX_LIBS="xrc $BUILT_WX_LIBS"
+ fi
fi
-AC_SUBST(CORE_BASE_LIBS)
-AC_SUBST(CORE_GUI_LIBS)
+AC_SUBST(ALL_WX_LIBS)
+AC_SUBST(BUILT_WX_LIBS)
+AC_SUBST(STD_BASE_LIBS)
+AC_SUBST(STD_GUI_LIBS)
dnl ---------------------------------------------------------------------------
dnl Output the makefiles and such from the results found above
wx-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--release] [--version-full]
[--list] [--selected-config] [--host=HOST] [--toolkit=TOOLKIT]
- [--universal[=yes|no]] [--unicode[=yes|no]] [--debug[=yes|no]]
- [--static[=yes|no]] [--version[=VERSION]] [--basename] [--cc]
- [--cppflags] [--cflags] [--cxxflags] [--rescomp] [--libs] [--cxx]
- [--ld] [--linkdeps] [--utility=UTIL] [LIB ...]
+ [--universal[=yes|no]] [--unicode[=yes|no]] [--debug[=yes|no]]
+ [--static[=yes|no]] [--version[=VERSION]] [--basename] [--cc]
+ [--cppflags] [--cflags] [--cxxflags] [--rescomp] [--cxx]
+ [--linkdeps] [--ld] [--utility=UTIL]
+ [--libs [LIBS...]] [--optional-libs [LIBS...]]
wx-config returns information about the wxWidgets libraries available on
your system. It may be used to retrieve the information required to build
of UTIL to use with the selected build. The --linkdeps option returns only
static libraries for your makefile link rule dependencies.
- Optional LIB arguments (comma or space separated) may be used to specify
- the wxWidgets libraries that you wish to use. The magic "std" label may
- be used to import all libraries that would be used by default if none were
- specified explicitly, e.g. wx-config --libs core,base.
+ The LIBS arguments (comma or space separated) may be used to specify the
+ wxWidgets libraries that you wish to use. The "std" label may be used to
+ import all libraries that would be used by default if none were specified
+ explicitly, e.g. wx-config --libs core,base. The "all" label may be used
+ to import all libraries that have been compiled which are shown in the
+ list below. The --optional-libs parameter should be followed by a list
+ of libs that should be linked to, but only if they are available.
+
+ Available libraries in this build are : @BUILT_WX_LIBS@
EOF
rescomp
rezflags
libs
+ optional_libs
linkdeps
cc cxx ld
gl_libs"
;;
*)
- # FIXME Surely we can validate the parameters too ...
- input_parameters="${input_parameters:+$input_parameters }$arg"
+ # We validate the parameters later ...
+ if [ "$_name" = "libs" ]
+ then
+ libs_parameters="${libs_parameters:+$libs_parameters }$arg"
+ elif [ "$_name" = "optional_libs" ]
+ then
+ optional_libs_parameters="${optional_libs_parameters:+$optional_libs_parameters }$arg"
+ else
+ # These are unattached args and signify an error
+ input_parameters="${input_parameters:+$input_parameters }$arg"
+ fi
continue
;;
esac
check_yesno_option debug debugtype debug release
check_yesno_option static linkage '-static'
+# Display error for unknown input parameters
+if [ $input_parameters ]; then
+ echo "Extra unknown input parameters : $input_parameters"
+ exit 1
+fi
# Dump everything we just read in debug mode.
if [ -n "$WXDEBUG" ]; then
decho
- decho " input parameters = $input_parameters"
+ decho " input parameters = $input_parameters"
+ decho " libs parameters = $libs_parameters"
+ decho " optional-libs parameters = $optional_libs_parameters"
decho " input options = $input_options"
for i in $input_options; do
decho " $i = `eval echo \"\\\$input_option_$i\"`"
for d in `find_eligible_delegates "$_mask"`; do
decho " ${_fbd_indent} $d"
done
- fi
+ fi
count_delegates "$_mask"
_still_eligible=$?
echo " Specification matches legacy config: $_last_chance"
else
-
+
cat <<-EOF
- No config found to match: $config_spec
- in $wxconfdir
+ No config found to match: $config_spec
+ in $wxconfdir
- Please install the desired library build, or specify a different
- prefix where it may be found. If the library is not installed
- you may call its wx-config directly by specifying its full path.
+ Please install the desired library build, or specify a different
+ prefix where it may be found. If the library is not installed
+ you may call its wx-config directly by specifying its full path.
- EOF
+EOF
fi
--rezflags|--inplace)
_legacy_args="$_legacy_args $arg"
;;
-
+
--static|--static=y*|--static=Y*)
_legacy_args="$_legacy_args --static"
;;
cat 1>&2 <<-EOF
- Warning: No config found to match: $config_spec
- in $wxconfdir
- If you require this configuration, please install the desired
- library build. If this is part of an automated configuration
- test and no other errors occur, you may safely ignore it.
- You may use wx-config --list to see all configs available in
- the default prefix.
+ Warning: No config found to match: $config_spec
+ in $wxconfdir
+ If you require this configuration, please install the desired
+ library build. If this is part of an automated configuration
+ test and no other errors occur, you may safely ignore it.
+ You may use wx-config --list to see all configs available in
+ the default prefix.
- EOF
+EOF
# PIPEDREAM: from here we are actually just a teensy step
# from simply building the missing config for the user
best_delegate=`find_best_delegate`
if [ -n "$best_delegate" ]; then
-
+
if [ -n "$WXDEBUG" ]; then
decho " found a suitable delegate: $best_delegate"
decho "--> $wxconfdir/$best_delegate $*"
echo "@true"
decho "Warning: --rezflags, along with Mac OS classic resource building" \
"is deprecated. You should remove this from your Makefile and" \
- "build .app bundles instead."
+ "build .app bundles instead."
fi
match_field "$f" $_all_ldflags || _all_ldflags="$_all_ldflags $f"
done
- if match_field "$lib" @CORE_BASE_LIBS@ ; then
+ if match_field "$lib" @STD_BASE_LIBS@ ; then
_libname="@WX_LIBRARY_BASENAME_NOGUI@"
else
_libname="@WX_LIBRARY_BASENAME_GUI@"
is_cross && _target="-${target}"
for lib do
- if match_field "$lib" @CORE_BASE_LIBS@ ; then
+ if match_field "$lib" @STD_BASE_LIBS@ ; then
_libname="@WX_LIBRARY_BASENAME_NOGUI@"
else
_libname="@WX_LIBRARY_BASENAME_GUI@"
# Sanity check the list of libs the user provided us, if any.
# --------------------------------------------------------------
-wx_libs=`echo "$input_parameters" | tr ',' ' '`
+wx_libs=`echo "$libs_parameters" | tr ',' ' '`
+wx_optional_libs=`echo "$optional_libs_parameters" | tr ',' ' '`
+
+# Add the --optional-libs, if they've been compiled and aren't already added
+for i in $wx_optional_libs; do
+ if match_field $i @BUILT_WX_LIBS@; then
+ if not match_field $i $wx_libs; then
+ wx_libs="${wx_libs:+$wx_libs }$i"
+ fi
+ fi
+done
[ -z "$WXDEBUG" ] || decho " user supplied libs: '$wx_libs'"
if is_monolithic; then
- # Core libs are already built into the blob.
- for i in std @CORE_GUI_LIBS@ @CORE_BASE_LIBS@; do
- wx_libs=`remove_field $i $wx_libs`
- done
-
- wx_libs="@WXCONFIG_LDFLAGS_GUI@ `lib_flags_for $wx_libs`"
+ # Only add additional info if --libs was specified and not just --optional-libs
+ if [ -n "$output_option_libs" ]; then
+ # Core libs are already built into the blob.
+ for i in std @STD_GUI_LIBS@ @STD_BASE_LIBS@; do
+ wx_libs=`remove_field $i $wx_libs`
+ done
- # We still need the core lib deps for a static build though
- if is_static; then
- link_deps="${libdir}/libwx_@TOOLCHAIN_NAME@.a"
- wx_libs="$wx_libs $link_deps $ldlibs_core $ldlibs_base"
- else
- wx_libs="$wx_libs -lwx_@TOOLCHAIN_NAME@"
- fi
+ wx_libs="@WXCONFIG_LDFLAGS_GUI@ `lib_flags_for $wx_libs`"
- using_gui=yes
+ # We still need the core lib deps for a static build though
+ if is_static; then
+ link_deps="${libdir}/libwx_@TOOLCHAIN_NAME@.a"
+ wx_libs="$wx_libs $link_deps $ldlibs_core $ldlibs_base"
+ else
+ wx_libs="$wx_libs -lwx_@TOOLCHAIN_NAME@"
+ fi
+ using_gui=yes
+ fi
else # MONOLITHIC = 0
- # Import everything by default, expand std if specified, or add base if omitted.
- if [ -z "$wx_libs" ]; then
- wx_libs="@CORE_GUI_LIBS@ @CORE_BASE_LIBS@"
+ # Import core libs by default, expand std if specified, or add base if omitted.
+ if [ -n "$output_option_libs" ] && [ -z "$libs_parameters" ]; then
+ wx_libs="@STD_GUI_LIBS@ @STD_BASE_LIBS@"
+ elif match_field all $wx_libs; then
+ wx_libs="@BUILT_WX_LIBS@"
elif match_field std $wx_libs; then
# Bubble any libs that were already specified to the end
# of the list and ensure static linking order is retained.
wx_libs=`remove_field std $wx_libs`
- for i in @CORE_GUI_LIBS@ @CORE_BASE_LIBS@; do
+ for i in @STD_GUI_LIBS@ @STD_BASE_LIBS@; do
wx_libs="`remove_field $i $wx_libs` $i"
done
elif not match_field base $wx_libs ; then
- wx_libs="$wx_libs base"
+ # Only add base if --libs was specified and not just --optional-libs
+ if [ -n "$output_option_libs" ]; then
+ wx_libs="$wx_libs base"
+ fi
fi
using_gui=no
for i in $wx_libs ; do
- if match_field "$i" @CORE_GUI_LIBS@ ; then
+ if match_field "$i" @STD_GUI_LIBS@ ; then
_guildflags="@WXCONFIG_LDFLAGS_GUI@"
using_gui=yes
break
fi
- match_field "$i" @CORE_BASE_LIBS@ || using_gui=yes
+ match_field "$i" @STD_BASE_LIBS@ || using_gui=yes
done
if is_static; then
[ -z "$output_option_linkdeps" ] || echo $link_deps
if [ -n "$output_option_libs" ]; then
+ # if --libs [--optional-libs] then output the full linker information
is_cross &&
[ "x$libdir" = "x/usr/${target}/lib" ] ||
is_installed || [ -n "$flag_option_no_rpath" ] || _rpath="@WXCONFIG_RPATH@"
echo $_ldflags "@LDFLAGS@" $_rpath $wx_libs "@DMALLOC_LIBS@"
+
+elif [ -n "$output_option_optional_libs" ]; then
+ # if only --optional-libs then output just the libs
+
+ echo $wx_libs
fi
case "@RESCOMP@" in
*windres|wrc)
# Note that with late model windres, we could just insert
- # _include_cppflags here, but use the old notation for now
- # as it is more universally accepted.
+ # _include_cppflags here, but use the old notation for now
+ # as it is more universally accepted.
if is_installed; then
echo "@RESCOMP@ --include-dir" \
"${includedir}/wx-@WX_RELEASE@@WX_FLAVOUR@" \
else
echo "@RESCOMP@ --include-dir ${includedir}" \
"--include-dir ${prefix}/contrib/include" \
- "@WXCONFIG_RESFLAGS@"
+ "@WXCONFIG_RESFLAGS@"
fi
;;
projects / wxWidgets.git / commitdiff
