From aa1c09fe1c95890a280956332e9dbdb124c105f8 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sun, 1 Jun 2008 22:39:57 +0000 Subject: [PATCH] remove mentions of contrib git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53919 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- wx-config.in | 3 +-- wxwin.m4 | 6 +++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/wx-config.in b/wx-config.in index fa0da10..6347245 100755 --- a/wx-config.in +++ b/wx-config.in @@ -1194,7 +1194,7 @@ fi if is_installed; then _include_cppflags="-I${includedir}/wx-@WX_RELEASE@@WX_FLAVOUR@" else - _include_cppflags="-I${includedir} -I${prefix}/contrib/include" + _include_cppflags="-I${includedir}" fi _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@" else echo "@RESCOMP@ --include-dir ${includedir}" \ - "--include-dir ${prefix}/contrib/include" \ "@WXCONFIG_RESFLAGS@" fi ;; diff --git a/wxwin.m4 b/wxwin.m4 index 09ea01c..9bcad85 100644 --- a/wxwin.m4 +++ b/wxwin.m4 @@ -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 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 it is not specified then WX_LIBS and WX_LIBS_STATIC will contain flags to -dnl link with all of the core wxWidgets libraries. +dnl wxWidgets libraries to link against. If it is not specified then WX_LIBS +dnl and WX_LIBS_STATIC will contain flags to link with all of the core +dnl wxWidgets libraries. dnl 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 -- 2.7.4