upstream fixes in bakefile's handling of mutually exclusive targets with same name

[wxWidgets.git] / configure

diff --git a/configure b/configure
index 06641117f839cf57a3094471a97e01e400737a11..90bc097270a0fe004a86567da4077fccd5545cd7 100755 (executable)
--- a/configure
+++ b/configure
@@ -34335,67 +34335,67 @@ fi
 
     COND_UNICODE_1="#"
     if test "x$UNICODE" = "x1" ; then
-        COND_UNICODE_1=
+        COND_UNICODE_1=""
     fi
 
     COND_BUILD_DEBUG="#"
     if test "x$BUILD" = "xdebug" ; then
-        COND_BUILD_DEBUG=
+        COND_BUILD_DEBUG=""
     fi
 
     COND_WXUSE_REGEX_BUILTIN="#"
     if test "x$wxUSE_REGEX" = "xbuiltin" ; then
-        COND_WXUSE_REGEX_BUILTIN=
+        COND_WXUSE_REGEX_BUILTIN=""
     fi
 
     COND_DEPS_TRACKING_1="#"
     if test "x$DEPS_TRACKING" = "x1" ; then
-        COND_DEPS_TRACKING_1=
+        COND_DEPS_TRACKING_1=""
     fi
 
     COND_DEPS_TRACKING_0="#"
     if test "x$DEPS_TRACKING" = "x0" ; then
-        COND_DEPS_TRACKING_0=
+        COND_DEPS_TRACKING_0=""
     fi
 
     COND_PLATFORM_UNIX_1="#"
     if test "x$PLATFORM_UNIX" = "x1" ; then
-        COND_PLATFORM_UNIX_1=
+        COND_PLATFORM_UNIX_1=""
     fi
 
     COND_PLATFORM_WIN32_1="#"
     if test "x$PLATFORM_WIN32" = "x1" ; then
-        COND_PLATFORM_WIN32_1=
+        COND_PLATFORM_WIN32_1=""
     fi
 
     COND_WXUSE_LIBPNG_BUILTIN="#"
     if test "x$wxUSE_LIBPNG" = "xbuiltin" ; then
-        COND_WXUSE_LIBPNG_BUILTIN=
+        COND_WXUSE_LIBPNG_BUILTIN=""
     fi
 
     COND_BUILD_RELEASE="#"
     if test "x$BUILD" = "xrelease" ; then
-        COND_BUILD_RELEASE=
+        COND_BUILD_RELEASE=""
     fi
 
     COND_WXUSE_LIBTIFF_BUILTIN="#"
     if test "x$wxUSE_LIBTIFF" = "xbuiltin" ; then
-        COND_WXUSE_LIBTIFF_BUILTIN=
+        COND_WXUSE_LIBTIFF_BUILTIN=""
     fi
 
     COND_WXUSE_LIBJPEG_BUILTIN="#"
     if test "x$wxUSE_LIBJPEG" = "xbuiltin" ; then
-        COND_WXUSE_LIBJPEG_BUILTIN=
+        COND_WXUSE_LIBJPEG_BUILTIN=""
     fi
 
     COND_WXUNIV_1="#"
     if test "x$WXUNIV" = "x1" ; then
-        COND_WXUNIV_1=
+        COND_WXUNIV_1=""
     fi
 
     COND_WXUSE_ZLIB_BUILTIN="#"
     if test "x$wxUSE_ZLIB" = "xbuiltin" ; then
-        COND_WXUSE_ZLIB_BUILTIN=
+        COND_WXUSE_ZLIB_BUILTIN=""
     fi
 
     COND_PLATFORM_MAC_1="#"
@@ -34405,37 +34405,37 @@ fi
 
     COND_WXUSE_ODBC_BUILTIN="#"
     if test "x$wxUSE_ODBC" = "xbuiltin" ; then
-        COND_WXUSE_ODBC_BUILTIN=
+        COND_WXUSE_ODBC_BUILTIN=""
     fi
 
     COND_TOOLKIT_MAC="#"
     if test "x$TOOLKIT" = "xMAC" ; then
-        COND_TOOLKIT_MAC=
+        COND_TOOLKIT_MAC=""
     fi
 
     COND_MONOLITHIC_0="#"
     if test "x$MONOLITHIC" = "x0" ; then
-        COND_MONOLITHIC_0=
+        COND_MONOLITHIC_0=""
     fi
 
     COND_PLATFORM_WIN32_0="#"
     if test "x$PLATFORM_WIN32" = "x0" ; then
-        COND_PLATFORM_WIN32_0=
+        COND_PLATFORM_WIN32_0=""
     fi
 
     COND_MONOLITHIC_1="#"
     if test "x$MONOLITHIC" = "x1" ; then
-        COND_MONOLITHIC_1=
+        COND_MONOLITHIC_1=""
     fi
 
     COND_USE_GUI_0="#"
     if test "x$USE_GUI" = "x0" ; then
-        COND_USE_GUI_0=
+        COND_USE_GUI_0=""
     fi
 
     COND_USE_GUI_1="#"
     if test "x$USE_GUI" = "x1" ; then
-        COND_USE_GUI_1=
+        COND_USE_GUI_1=""
     fi
 
     COND_SHARED_1="#"
@@ -34444,125 +34444,113 @@ fi
     fi
 
     COND_SHARED_1_MONOLITHIC_0="#"
-    if test "x$SHARED" = "x1" -a \
-            "x$MONOLITHIC" = "x0" ; then
-        COND_SHARED_1_MONOLITHIC_0=
+    if test "x$SHARED" = "x1" -a "x$MONOLITHIC" = "x0" ; then
+        COND_SHARED_1_MONOLITHIC_0=""
     fi
 
     COND_USE_SOVERLINUX_1="#"
     if test "x$USE_SOVERLINUX" = "x1" ; then
-        COND_USE_SOVERLINUX_1=
+        COND_USE_SOVERLINUX_1=""
     fi
 
     COND_USE_SOVERSOLARIS_1="#"
     if test "x$USE_SOVERSOLARIS" = "x1" ; then
-        COND_USE_SOVERSOLARIS_1=
+        COND_USE_SOVERSOLARIS_1=""
     fi
 
     COND_USE_SOSYMLINKS_1="#"
     if test "x$USE_SOSYMLINKS" = "x1" ; then
-        COND_USE_SOSYMLINKS_1=
+        COND_USE_SOSYMLINKS_1=""
     fi
 
     COND_TOOLKIT_X11="#"
     if test "x$TOOLKIT" = "xX11" ; then
-        COND_TOOLKIT_X11=
+        COND_TOOLKIT_X11=""
     fi
 
     COND_TOOLKIT_MGL="#"
     if test "x$TOOLKIT" = "xMGL" ; then
-        COND_TOOLKIT_MGL=
+        COND_TOOLKIT_MGL=""
     fi
 
     COND_TOOLKIT_GTK="#"
     if test "x$TOOLKIT" = "xGTK" ; then
-        COND_TOOLKIT_GTK=
+        COND_TOOLKIT_GTK=""
     fi
 
     COND_TOOLKIT_MSW="#"
     if test "x$TOOLKIT" = "xMSW" ; then
-        COND_TOOLKIT_MSW=
+        COND_TOOLKIT_MSW=""
     fi
 
     COND_USE_SOVERSION_1_PLATFORM_MACOSX_0="#"
-    if test "x$USE_SOVERSION" = "x1" -a \
-            "x$PLATFORM_MACOSX" = "x0" ; then
-        COND_USE_SOVERSION_1_PLATFORM_MACOSX_0=
+    if test "x$USE_SOVERSION" = "x1" -a "x$PLATFORM_MACOSX" = "x0" ; then
+        COND_USE_SOVERSION_1_PLATFORM_MACOSX_0=""
     fi
 
     COND_USE_SOVERSION_1_PLATFORM_MACOSX_1="#"
-    if test "x$USE_SOVERSION" = "x1" -a \
-            "x$PLATFORM_MACOSX" = "x1" ; then
-        COND_USE_SOVERSION_1_PLATFORM_MACOSX_1=
+    if test "x$USE_SOVERSION" = "x1" -a "x$PLATFORM_MACOSX" = "x1" ; then
+        COND_USE_SOVERSION_1_PLATFORM_MACOSX_1=""
     fi
 
     COND_USE_SOVERSION_0="#"
     if test "x$USE_SOVERSION" = "x0" ; then
-        COND_USE_SOVERSION_0=
+        COND_USE_SOVERSION_0=""
     fi
 
     COND_SHARED_0_USE_GUI_1_MONOLITHIC_0="#"
-    if test "x$SHARED" = "x0" -a \
-            "x$USE_GUI" = "x1" -a \
-            "x$MONOLITHIC" = "x0" ; then
-        COND_SHARED_0_USE_GUI_1_MONOLITHIC_0=
+    if test "x$SHARED" = "x0" -a "x$USE_GUI" = "x1" -a "x$MONOLITHIC" = "x0" ; then
+        COND_SHARED_0_USE_GUI_1_MONOLITHIC_0=""
     fi
 
     COND_PLATFORM_MACOSX_1="#"
     if test "x$PLATFORM_MACOSX" = "x1" ; then
-        COND_PLATFORM_MACOSX_1=
+        COND_PLATFORM_MACOSX_1=""
     fi
 
     COND_SHARED_1_USE_GUI_1_MONOLITHIC_0="#"
-    if test "x$SHARED" = "x1" -a \
-            "x$USE_GUI" = "x1" -a \
-            "x$MONOLITHIC" = "x0" ; then
-        COND_SHARED_1_USE_GUI_1_MONOLITHIC_0=
+    if test "x$SHARED" = "x1" -a "x$USE_GUI" = "x1" -a "x$MONOLITHIC" = "x0" ; then
+        COND_SHARED_1_USE_GUI_1_MONOLITHIC_0=""
     fi
 
     COND_TOOLKIT_MOTIF="#"
     if test "x$TOOLKIT" = "xMOTIF" ; then
-        COND_TOOLKIT_MOTIF=
+        COND_TOOLKIT_MOTIF=""
     fi
 
     COND_TOOLKIT_COCOA="#"
     if test "x$TOOLKIT" = "xCOCOA" ; then
-        COND_TOOLKIT_COCOA=
+        COND_TOOLKIT_COCOA=""
     fi
 
     COND_TOOLKIT_OS2="#"
     if test "x$TOOLKIT" = "xOS2" ; then
-        COND_TOOLKIT_OS2=
+        COND_TOOLKIT_OS2=""
     fi
 
     COND_SHARED_1_MONOLITHIC_1="#"
-    if test "x$SHARED" = "x1" -a \
-            "x$MONOLITHIC" = "x1" ; then
-        COND_SHARED_1_MONOLITHIC_1=
+    if test "x$SHARED" = "x1" -a "x$MONOLITHIC" = "x1" ; then
+        COND_SHARED_1_MONOLITHIC_1=""
     fi
 
     COND_SHARED_0_MONOLITHIC_1="#"
-    if test "x$SHARED" = "x0" -a \
-            "x$MONOLITHIC" = "x1" ; then
-        COND_SHARED_0_MONOLITHIC_1=
+    if test "x$SHARED" = "x0" -a "x$MONOLITHIC" = "x1" ; then
+        COND_SHARED_0_MONOLITHIC_1=""
     fi
 
     COND_USE_GUI_1_WXUNIV_0="#"
-    if test "x$USE_GUI" = "x1" -a \
-            "x$WXUNIV" = "x0" ; then
-        COND_USE_GUI_1_WXUNIV_0=
+    if test "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then
+        COND_USE_GUI_1_WXUNIV_0=""
     fi
 
     COND_USE_GUI_1_WXUNIV_1="#"
-    if test "x$USE_GUI" = "x1" -a \
-            "x$WXUNIV" = "x1" ; then
-        COND_USE_GUI_1_WXUNIV_1=
+    if test "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x1" ; then
+        COND_USE_GUI_1_WXUNIV_1=""
     fi
 
     COND_SHARED_0_MONOLITHIC_0="#"
-    if test "x$SHARED" = "x0" -a \
-            "x$MONOLITHIC" = "x0" ; then
-        COND_SHARED_0_MONOLITHIC_0=
+    if test "x$SHARED" = "x0" -a "x$MONOLITHIC" = "x0" ; then
+        COND_SHARED_0_MONOLITHIC_0=""
     fi
 
     COND_SHARED_0="#"