From 29c81ad515d0e09f26162581ea0b5e251e9f5439 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?D=C3=A9vai=20Tam=C3=A1s?= Date: Fri, 29 Jul 2016 14:02:34 +0200 Subject: [PATCH] Allow wxwin.m4 finding and using a base-only library Although "base" is not actually a toolkit, allow both the automatic toolkit detection and the configure flag --with-toolkit=base find and use a base-only library. Closes https://github.com/wxWidgets/wxWidgets/pull/310 --- wxwin.m4 | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/wxwin.m4 b/wxwin.m4 index fd131a1972..77ebaf98cd 100644 --- a/wxwin.m4 +++ b/wxwin.m4 @@ -605,9 +605,9 @@ AC_DEFUN([WX_STANDARD_OPTIONS], if test "$TOOLKIT" != "gtk1" -a "$TOOLKIT" != "gtk2" -a "$TOOLKIT" != "gtk3" -a \ "$TOOLKIT" != "msw" -a "$TOOLKIT" != "motif" -a \ "$TOOLKIT" != "osx_carbon" -a "$TOOLKIT" != "osx_cocoa" -a \ - "$TOOLKIT" != "dfb" -a "$TOOLKIT" != "x11"; then + "$TOOLKIT" != "dfb" -a "$TOOLKIT" != "x11" -a "$TOOLKIT" != "base"; then AC_MSG_ERROR([ - Unrecognized option value (allowed values: auto, gtk1, gtk2, gtk3, msw, motif, osx_carbon, osx_cocoa, dfb, x11) + Unrecognized option value (allowed values: auto, gtk1, gtk2, gtk3, msw, motif, osx_carbon, osx_cocoa, dfb, x11, base) ]) fi @@ -868,6 +868,7 @@ AC_DEFUN([WX_DETECT_STANDARD_OPTION_VALUES], WX_OSXCARBONPORT=$(expr "$WX_SELECTEDCONFIG" : ".*osx_carbon.*") WX_X11PORT=$(expr "$WX_SELECTEDCONFIG" : ".*x11.*") WX_DFBPORT=$(expr "$WX_SELECTEDCONFIG" : ".*dfb.*") + WX_BASEPORT=$(expr "$WX_SELECTEDCONFIG" : ".*base.*") WX_PORT="unknown" if test "$WX_GTKPORT1" != "0"; then WX_PORT="gtk1"; fi @@ -879,6 +880,7 @@ AC_DEFUN([WX_DETECT_STANDARD_OPTION_VALUES], if test "$WX_OSXCARBONPORT" != "0"; then WX_PORT="osx_carbon"; fi if test "$WX_X11PORT" != "0"; then WX_PORT="x11"; fi if test "$WX_DFBPORT" != "0"; then WX_PORT="dfb"; fi + if test "$WX_BASEPORT" != "0"; then WX_PORT="base"; fi dnl NOTE: backward-compatible check for wx2.8; in wx2.9 the mac dnl ports are called 'osx_cocoa' and 'osx_carbon' (see above)