Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove mentions of contrib

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53919 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2008-06-01 22:39:57 +00:00
parent efce184b1d
commit aa1c09fe1c
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
wx-config.in
View File

@@ -1194,7 +1194,7 @@ fi
if is_installed; then if is_installed; then
_include_cppflags="-I${includedir}/wx-@WX_RELEASE@@WX_FLAVOUR@" _include_cppflags="-I${includedir}/wx-@WX_RELEASE@@WX_FLAVOUR@"
else else
_include_cppflags="-I${includedir} -I${prefix}/contrib/include" _include_cppflags="-I${includedir}"
fi fi
_cppflags=`echo "-I${libdir}/wx/include/@TOOLCHAIN_FULLNAME@" $_include_cppflags "@WXCONFIG_CPPFLAGS@" $_gui_cppflags` _cppflags=`echo "-I${libdir}/wx/include/@TOOLCHAIN_FULLNAME@" $_include_cppflags "@WXCONFIG_CPPFLAGS@" $_gui_cppflags`
@@ -1271,7 +1271,6 @@ if [ -n "$output_option_rescomp" ]; then
"@WXCONFIG_RESFLAGS@" "@WXCONFIG_RESFLAGS@"
else else
echo "@RESCOMP@ --include-dir ${includedir}" \ echo "@RESCOMP@ --include-dir ${includedir}" \
"--include-dir ${prefix}/contrib/include" \
"@WXCONFIG_RESFLAGS@" "@WXCONFIG_RESFLAGS@"
fi fi
;; ;;

6
wxwin.m4
View File

@@ -152,9 +152,9 @@ dnl to use. Set WX_CONFIG_PATH to specify the full path to wx-config - in this
dnl case the macro won't even waste time on tests for its existence. dnl case the macro won't even waste time on tests for its existence.
dnl dnl
dnl Optional WX-LIBS argument contains comma- or space-separated list of dnl Optional WX-LIBS argument contains comma- or space-separated list of
dnl wxWidgets libraries to link against (it may include contrib libraries). If dnl wxWidgets libraries to link against. If it is not specified then WX_LIBS
dnl it is not specified then WX_LIBS and WX_LIBS_STATIC will contain flags to dnl and WX_LIBS_STATIC will contain flags to link with all of the core
dnl link with all of the core wxWidgets libraries. dnl wxWidgets libraries.
dnl dnl
dnl Optional ADDITIONAL-WX-CONFIG-FLAGS argument is appended to wx-config dnl Optional ADDITIONAL-WX-CONFIG-FLAGS argument is appended to wx-config
dnl invocation command in present. It can be used to fine-tune lookup of dnl invocation command in present. It can be used to fine-tune lookup of