AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

don't link wxBase against GUI libraries

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21712 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík 2003-07-06 18:55:09 +00:00
parent fa10c70ceb
commit c74dc1630d
5 changed files with 45 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
build/bakefiles/common.bkl
View File

@ -221,7 +221,8 @@
<include>$(INC_REGEX)</include> <include>$(INC_REGEX)</include>
</template> </template>
<template id="wx_append"> <!-- for both GUI and wxBase libs/samples: -->
<template id="wx_append_base">
<!-- link against builtin 3rd party libs, if needed: --> <!-- link against builtin 3rd party libs, if needed: -->
<sys-lib>$(LIB_TIFF)</sys-lib> <sys-lib>$(LIB_TIFF)</sys-lib>
<sys-lib>$(LIB_JPEG)</sys-lib> <sys-lib>$(LIB_JPEG)</sys-lib>
@ -258,6 +259,11 @@
</if> </if>
</template> </template>
<!-- for GUI libs/samples: -->
<template id="wx_append" template="wx_append_base">
<ldlibs>$(EXTRALIBS_GUI)</ldlibs>
</template>
<template id="wx_lib_b" template="wx,anylib"> <template id="wx_lib_b" template="wx,anylib">
<set var="WXLIBNAME">$(wxwin.mkLibName(wxid))</set> <set var="WXLIBNAME">$(wxwin.mkLibName(wxid))</set>
<libname>$(WXLIBNAME)</libname> <libname>$(WXLIBNAME)</libname>
@ -282,6 +288,7 @@
</template> </template>
<template id="wx_lib" template="wx_lib_b"/> <template id="wx_lib" template="wx_lib_b"/>
<template id="wx_base_lib" template="wx_lib_b"/>
<template id="wx_dll" template="wx_dll_b" template_append="wx_append"> <template id="wx_dll" template="wx_dll_b" template_append="wx_append">
<depends>wxtiff</depends> <depends>wxtiff</depends>
<depends>wxjpeg</depends> <depends>wxjpeg</depends>
@ -290,6 +297,11 @@
<depends cond="FORMAT=='autoconf'">wxodbc</depends> <depends cond="FORMAT=='autoconf'">wxodbc</depends>
<depends>wxregex</depends> <depends>wxregex</depends>
</template> </template>
<template id="wx_base_dll" template="wx_dll_b"
template_append="wx_append_base">
<depends>wxzlib</depends>
<depends>wxregex</depends>
</template>
<!-- =============================================================== --> <!-- =============================================================== -->
<!-- Support for wxWindows samples and contrib: --> <!-- Support for wxWindows samples and contrib: -->

2
build/bakefiles/config.bkl
View File

@ -82,6 +82,7 @@
<option name="TOOLKIT_LOWERCASE"/> <option name="TOOLKIT_LOWERCASE"/>
<option name="TOOLKIT_VERSION"/> <option name="TOOLKIT_VERSION"/>
<option name="EXTRALIBS"/> <option name="EXTRALIBS"/>
<option name="EXTRALIBS_GUI"/>
<option name="SAMPLES_RPATH_FLAG"/> <option name="SAMPLES_RPATH_FLAG"/>
<set var="TOP_SRCDIR">$(top_srcdir)/</set> <set var="TOP_SRCDIR">$(top_srcdir)/</set>
</if> </if>
@ -99,6 +100,7 @@
<set var="TOOLKIT_VERSION"/> <set var="TOOLKIT_VERSION"/>
<set var="SAMPLES_RPATH_FLAG"/> <set var="SAMPLES_RPATH_FLAG"/>
<set var="EXTRALIBS"/> <set var="EXTRALIBS"/>
<set var="EXTRALIBS_GUI"/>
<set var="EXTRACFLAGS"/> <set var="EXTRACFLAGS"/>
<set var="SRCDIR"> <set var="SRCDIR">

26
configure vendored
View File

@ -311,7 +311,7 @@ ac_includes_default="\
# include <unistd.h> # include <unistd.h>
#endif" #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 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 AIX_CXX_LD SHARED_LD_CC SHARED_LD_CXX PIC_FLAG USE_SOVERSION USE_SOVERLINUX USE_SOVERSOLARIS USE_MACVERSION USE_SOSYMLINKS SONAME_FLAG DEPS_TRACKING COND_BUILD_DEBUG COND_BUILD_RELEASE 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_1 COND_MONOLITHIC_0_SHARED_1_USE_GUI_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_USE_SOVERSION_1 COND_PLATFORM_UNIX_1 COND_PLATFORM_WIN32_0 COND_PLATFORM_WIN32_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_SOSYMLINKS_1 COND_USE_SOVERLINUX_1 COND_USE_SOVERSION_0 COND_USE_SOVERSOLARIS_1 COND_WXUNIV_1 COND_WXUSE_LIBJPEG_BUILTIN COND_WXUSE_LIBPNG_BUILTIN COND_WXUSE_LIBTIFF_BUILTIN COND_WXUSE_ODBC_BUILTIN COND_WXUSE_REGEX_BUILTIN COND_WXUSE_ZLIB_BUILTIN COND_PLATFORM_MAC_1 COND_SHARED_1 COND_SHARED_0 LEX_STEM PATH_IFS WX_MAJOR_VERSION_NUMBER WX_MINOR_VERSION_NUMBER WX_RELEASE_NUMBER WX_LIBRARY_NAME_STATIC WX_LIBRARY_NAME_SHARED WX_LIBRARY_BASENAME 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 RESCOMP DEREZ SETFILE LIBICONV wxUSE_ZLIB wxUSE_REGEX wxUSE_ODBC wxUSE_LIBJPEG wxUSE_LIBPNG wxUSE_LIBTIFF VENDOR OFFICIAL_BUILD WXUNIV MONOLITHIC EXTRALIBS EXTRALIBS_GUI 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 AIX_CXX_LD SHARED_LD_CC SHARED_LD_CXX PIC_FLAG USE_SOVERSION USE_SOVERLINUX USE_SOVERSOLARIS USE_MACVERSION USE_SOSYMLINKS SONAME_FLAG DEPS_TRACKING COND_BUILD_DEBUG COND_BUILD_RELEASE 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_1 COND_MONOLITHIC_0_SHARED_1_USE_GUI_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_USE_SOVERSION_1 COND_PLATFORM_UNIX_1 COND_PLATFORM_WIN32_0 COND_PLATFORM_WIN32_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_SOSYMLINKS_1 COND_USE_SOVERLINUX_1 COND_USE_SOVERSION_0 COND_USE_SOVERSOLARIS_1 COND_WXUNIV_1 COND_WXUSE_LIBJPEG_BUILTIN COND_WXUSE_LIBPNG_BUILTIN COND_WXUSE_LIBTIFF_BUILTIN COND_WXUSE_ODBC_BUILTIN COND_WXUSE_REGEX_BUILTIN COND_WXUSE_ZLIB_BUILTIN COND_PLATFORM_MAC_1 COND_SHARED_1 COND_SHARED_0 LEX_STEM PATH_IFS WX_MAJOR_VERSION_NUMBER WX_MINOR_VERSION_NUMBER WX_RELEASE_NUMBER WX_LIBRARY_NAME_STATIC WX_LIBRARY_NAME_SHARED WX_LIBRARY_BASENAME 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='' ac_subst_files=''
# Initialize some variables set by options. # Initialize some variables set by options.
@ -20490,7 +20490,7 @@ echo "${ECHO_T}$PANGOFT2_LIBS" >&6
if test $succeeded = yes; then if test $succeeded = yes; then
CXXFLAGS="$CXXFLAGS $PANGOFT2_CFLAGS" CXXFLAGS="$CXXFLAGS $PANGOFT2_CFLAGS"
LIBS="$LIBS $PANGOFT2_LIBS" GUI_TK_LIBRARY="$GUI_TK_LIBRARY $PANGOFT2_LIBS"
else else
@ -20598,7 +20598,7 @@ done
fi fi
TOOLKIT_INCLUDE="$wx_cv_cflags_gtk" 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 AFMINSTALL=afminstall
TOOLKIT=GTK TOOLKIT=GTK
@ -22253,7 +22253,7 @@ echo "${ECHO_T}$PANGOX_LIBS" >&6
if test $succeeded = yes; then if test $succeeded = yes; then
CXXFLAGS="$CXXFLAGS $PANGOX_CFLAGS" CXXFLAGS="$CXXFLAGS $PANGOX_CFLAGS"
LIBS="$LIBS $PANGOX_LIBS" GUI_TK_LIBRARY="$GUI_TK_LIBRARY $PANGOX_LIBS"
else else
@ -22357,7 +22357,7 @@ echo "${ECHO_T}$PANGOFT2_LIBS" >&6
if test $succeeded = yes; then if test $succeeded = yes; then
CXXFLAGS="$CXXFLAGS $PANGOFT2_CFLAGS" CXXFLAGS="$CXXFLAGS $PANGOFT2_CFLAGS"
LIBS="$LIBS $PANGOFT2_LIBS" GUI_TK_LIBRARY="$GUI_TK_LIBRARY $PANGOFT2_LIBS"
else else
@ -22461,7 +22461,7 @@ echo "${ECHO_T}$PANGOXFT_LIBS" >&6
if test $succeeded = yes; then if test $succeeded = yes; then
CXXFLAGS="$CXXFLAGS $PANGOXFT_CFLAGS" CXXFLAGS="$CXXFLAGS $PANGOXFT_CFLAGS"
LIBS="$LIBS $PANGOXFT_LIBS" GUI_TK_LIBRARY="$GUI_TK_LIBRARY $PANGOXFT_LIBS"
else else
@ -32642,7 +32642,7 @@ if test "$wxUSE_HTML" = "yes"; then
#define wxUSE_HTML 1 #define wxUSE_HTML 1
_ACEOF _ACEOF
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS html htlbox" SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS html html/about html/help html/helpview html/printing html/test html/virtual html/widget html/zip htlbox"
fi fi
if test "$wxUSE_VALIDATORS" = "yes"; then if test "$wxUSE_VALIDATORS" = "yes"; then
@ -33225,8 +33225,6 @@ fi
if test "$wxUSE_GUI" = "yes"; then if test "$wxUSE_GUI" = "yes"; then
LIBS="$GUI_TK_LIBRARY $PNG_LINK $JPEG_LINK $TIFF_LINK $LIBS"
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS artprov controls dialogs \ SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS artprov controls dialogs \
drawing dynamic erase event exec font image \ drawing dynamic erase event exec font image \
@ -33254,7 +33252,13 @@ EXTRA_CFLAGS="$WXDEBUG $WXODBCFLAG $PROFILE $OPTIMISE"
CPPFLAGS=`echo $INCLUDES $CPPFLAGS | sed 's/ \\+/ /g'` CPPFLAGS=`echo $INCLUDES $CPPFLAGS | sed 's/ \\+/ /g'`
CFLAGS=`echo $CODE_GEN_FLAGS $EXTRA_CFLAGS $CFLAGS $CXXWARNINGS | 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'` CXXFLAGS=`echo $CODE_GEN_FLAGS $CODE_GEN_FLAGS_CXX $EXTRA_CFLAGS $CXXFLAGS $CXXWARNINGS | sed 's/ \+/ /g'`
LIBS=`echo $LIBS | sed 's/ \+/ /g'` LIBS=`echo $LIBS | sed 's/ \+/ /g'`
EXTRALIBS="$LDFLAGS $LDFLAGS_VERSIONING $LIBS $DMALLOC_LIBS"
if test "$wxUSE_GUI" = "yes"; then
EXTRALIBS_GUI=`echo $GUI_TK_LIBRARY $PNG_LINK $JPEG_LINK $TIFF_LINK | sed 's/ \+/ /g'`
fi
LDFLAGS="$LDFLAGS $PROFILE" LDFLAGS="$LDFLAGS $PROFILE"
@ -33277,8 +33281,6 @@ fi
EXTRALIBS="$LDFLAGS $LDFLAGS_VERSIONING $LIBS $DMALLOC_LIBS"
if test $wxUSE_MONOLITHIC = "yes" ; then if test $wxUSE_MONOLITHIC = "yes" ; then
MONOLITHIC=1 MONOLITHIC=1
else else
@ -33296,6 +33298,7 @@ OFFICIAL_BUILD=0
TOOLKIT_LOWERCASE=`echo $TOOLKIT | tr [A-Z] [a-z]` TOOLKIT_LOWERCASE=`echo $TOOLKIT | tr [A-Z] [a-z]`
@ -35374,6 +35377,7 @@ s,@OFFICIAL_BUILD@,$OFFICIAL_BUILD,;t t
s,@WXUNIV@,$WXUNIV,;t t s,@WXUNIV@,$WXUNIV,;t t
s,@MONOLITHIC@,$MONOLITHIC,;t t s,@MONOLITHIC@,$MONOLITHIC,;t t
s,@EXTRALIBS@,$EXTRALIBS,;t t s,@EXTRALIBS@,$EXTRALIBS,;t t
s,@EXTRALIBS_GUI@,$EXTRALIBS_GUI,;t t
s,@UNICODE@,$UNICODE,;t t s,@UNICODE@,$UNICODE,;t t
s,@BUILD@,$BUILD,;t t s,@BUILD@,$BUILD,;t t
s,@SHARED@,$SHARED,;t t s,@SHARED@,$SHARED,;t t

25
configure.in
View File

@ -2228,7 +2228,7 @@ equivalent variable and GTK+ is version 1.2.3 or above.
PKG_CHECK_MODULES(PANGOFT2, pangoft2, PKG_CHECK_MODULES(PANGOFT2, pangoft2,
[ [
CXXFLAGS="$CXXFLAGS $PANGOFT2_CFLAGS" CXXFLAGS="$CXXFLAGS $PANGOFT2_CFLAGS"
LIBS="$LIBS $PANGOFT2_LIBS" GUI_TK_LIBRARY="$GUI_TK_LIBRARY $PANGOFT2_LIBS"
], ],
[ [
AC_MSG_WARN([pangoft2 library not found, library will be compiled without printing support]) AC_MSG_WARN([pangoft2 library not found, library will be compiled without printing support])
@ -2250,7 +2250,7 @@ equivalent variable and GTK+ is version 1.2.3 or above.
fi fi
TOOLKIT_INCLUDE="$wx_cv_cflags_gtk" 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 AFMINSTALL=afminstall
TOOLKIT=GTK TOOLKIT=GTK
@ -2419,7 +2419,7 @@ equivalent variable and GTK+ is version 1.2.3 or above.
PKG_CHECK_MODULES(PANGOX, pangox, PKG_CHECK_MODULES(PANGOX, pangox,
[ [
CXXFLAGS="$CXXFLAGS $PANGOX_CFLAGS" CXXFLAGS="$CXXFLAGS $PANGOX_CFLAGS"
LIBS="$LIBS $PANGOX_LIBS" GUI_TK_LIBRARY="$GUI_TK_LIBRARY $PANGOX_LIBS"
], ],
[ [
AC_MSG_ERROR([pangox library not found, library cannot be compiled in Unicode mode]) AC_MSG_ERROR([pangox library not found, library cannot be compiled in Unicode mode])
@ -2428,7 +2428,7 @@ equivalent variable and GTK+ is version 1.2.3 or above.
PKG_CHECK_MODULES(PANGOFT2, pangoft2, PKG_CHECK_MODULES(PANGOFT2, pangoft2,
[ [
CXXFLAGS="$CXXFLAGS $PANGOFT2_CFLAGS" CXXFLAGS="$CXXFLAGS $PANGOFT2_CFLAGS"
LIBS="$LIBS $PANGOFT2_LIBS" GUI_TK_LIBRARY="$GUI_TK_LIBRARY $PANGOFT2_LIBS"
], ],
[ [
AC_MSG_WARN([pangoft2 library not found, library will be compiled without printing support]) AC_MSG_WARN([pangoft2 library not found, library will be compiled without printing support])
@ -2438,7 +2438,7 @@ equivalent variable and GTK+ is version 1.2.3 or above.
PKG_CHECK_MODULES(PANGOXFT, pangoxft, PKG_CHECK_MODULES(PANGOXFT, pangoxft,
[ [
CXXFLAGS="$CXXFLAGS $PANGOXFT_CFLAGS" CXXFLAGS="$CXXFLAGS $PANGOXFT_CFLAGS"
LIBS="$LIBS $PANGOXFT_LIBS" GUI_TK_LIBRARY="$GUI_TK_LIBRARY $PANGOXFT_LIBS"
], ],
[ [
AC_MSG_WARN([pangoxft library not found, library will be compiled without anti-aliasing support]) AC_MSG_WARN([pangoxft library not found, library will be compiled without anti-aliasing support])
@ -5199,7 +5199,7 @@ fi
if test "$wxUSE_HTML" = "yes"; then if test "$wxUSE_HTML" = "yes"; then
AC_DEFINE(wxUSE_HTML) AC_DEFINE(wxUSE_HTML)
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS html htlbox" SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS html html/about html/help html/helpview html/printing html/test html/virtual html/widget html/zip htlbox"
fi fi
if test "$wxUSE_VALIDATORS" = "yes"; then if test "$wxUSE_VALIDATORS" = "yes"; then
@ -5408,8 +5408,6 @@ fi
if test "$wxUSE_GUI" = "yes"; then if test "$wxUSE_GUI" = "yes"; then
LIBS="$GUI_TK_LIBRARY $PNG_LINK $JPEG_LINK $TIFF_LINK $LIBS"
dnl TODO add checks that these samples will really compile (i.e. all the dnl TODO add checks that these samples will really compile (i.e. all the
dnl library features they need are present) dnl library features they need are present)
@ -5453,8 +5451,14 @@ dnl remove the extra white space from the cc/c++/ld options
CPPFLAGS=`echo $INCLUDES $CPPFLAGS | sed 's/ \\+/ /g'` CPPFLAGS=`echo $INCLUDES $CPPFLAGS | sed 's/ \\+/ /g'`
CFLAGS=`echo $CODE_GEN_FLAGS $EXTRA_CFLAGS $CFLAGS $CXXWARNINGS | 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'` CXXFLAGS=`echo $CODE_GEN_FLAGS $CODE_GEN_FLAGS_CXX $EXTRA_CFLAGS $CXXFLAGS $CXXWARNINGS | sed 's/ \+/ /g'`
LIBS=`echo $LIBS | sed 's/ \+/ /g'`
LIBS=`echo $LIBS | sed 's/ \+/ /g'`
EXTRALIBS="$LDFLAGS $LDFLAGS_VERSIONING $LIBS $DMALLOC_LIBS"
if test "$wxUSE_GUI" = "yes"; then
EXTRALIBS_GUI=`echo $GUI_TK_LIBRARY $PNG_LINK $JPEG_LINK $TIFF_LINK | sed 's/ \+/ /g'`
fi
LDFLAGS="$LDFLAGS $PROFILE" LDFLAGS="$LDFLAGS $PROFILE"
dnl wxGTK does not need TOOLKIT includes in wx-config dnl wxGTK does not need TOOLKIT includes in wx-config
@ -5477,8 +5481,6 @@ AC_SUBST(wxUSE_LIBJPEG)
AC_SUBST(wxUSE_LIBPNG) AC_SUBST(wxUSE_LIBPNG)
AC_SUBST(wxUSE_LIBTIFF) AC_SUBST(wxUSE_LIBTIFF)
EXTRALIBS="$LDFLAGS $LDFLAGS_VERSIONING $LIBS $DMALLOC_LIBS"
if test $wxUSE_MONOLITHIC = "yes" ; then if test $wxUSE_MONOLITHIC = "yes" ; then
MONOLITHIC=1 MONOLITHIC=1
else else
@ -5494,6 +5496,7 @@ AC_SUBST(OFFICIAL_BUILD)
AC_SUBST(WXUNIV) AC_SUBST(WXUNIV)
AC_SUBST(MONOLITHIC) AC_SUBST(MONOLITHIC)
AC_SUBST(EXTRALIBS) AC_SUBST(EXTRALIBS)
AC_SUBST(EXTRALIBS_GUI)
AC_SUBST(UNICODE) AC_SUBST(UNICODE)
AC_SUBST(BUILD) AC_SUBST(BUILD)
AC_SUBST(SHARED) AC_SUBST(SHARED)

2
wx-config.in
View File

@ -166,7 +166,7 @@ while test $# -gt 0; do
fi fi
if test $static_flag = yes ; then if test $static_flag = yes ; then
echo "$libs @LDFLAGS@ @WXCONFIG_RPATH@ @libdir@/@WXCONFIG_LIBS_STATIC@ @LIBS@ @DMALLOC_LIBS@" echo "$libs @LDFLAGS@ @WXCONFIG_RPATH@ @libdir@/@WXCONFIG_LIBS_STATIC@ @EXTRALIBS_GUI@ @LIBS@ @DMALLOC_LIBS@"
else else
echo $libs @LDFLAGS@ @WXCONFIG_RPATH@ @WXCONFIG_LIBS@ @DMALLOC_LIBS@ echo $libs @LDFLAGS@ @WXCONFIG_RPATH@ @WXCONFIG_LIBS@ @DMALLOC_LIBS@
fi fi