From 2f3584b16931d16d4aab10628a311a6f5b54b9da Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sun, 9 Sep 2007 21:45:58 +0000 Subject: [PATCH] fix bug with mistakenly recognising 'wxdebug' as 'debug' and 'wxshared' as 'shared' (patch 1787101) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48619 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- wxwin.m4 | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/wxwin.m4 b/wxwin.m4 index c538fcc760..dc016082bd 100644 --- a/wxwin.m4 +++ b/wxwin.m4 @@ -572,13 +572,14 @@ AC_DEFUN([WX_STANDARD_OPTIONS], dnl the following lines will expand to WX_ARG_ENABLE_YESNOAUTO calls if and only if dnl the $1 argument contains respectively the debug,unicode or shared options. - ifelse(index([$1], [debug]), [-1],, + dnl be careful here not to set debug flag if only "wxdebug" was specified + ifelse(regexp([$1], [\bdebug]), [-1],, [WX_ARG_ENABLE_YESNOAUTO([debug], [DEBUG], [Build in debug mode], [auto])]) ifelse(index([$1], [unicode]), [-1],, [WX_ARG_ENABLE_YESNOAUTO([unicode], [UNICODE], [Build in Unicode mode], [auto])]) - ifelse(index([$1], [shared]), [-1],, + ifelse(regexp([$1], [\bshared]), [-1],, [WX_ARG_ENABLE_YESNOAUTO([shared], [SHARED], [Build as shared library], [auto])]) dnl WX_ARG_WITH_YESNOAUTO cannot be used for --with-toolkit since it's an option