another compilation fix

[wxWidgets.git] / autoconf_inc.m4

diff --git a/autoconf_inc.m4 b/autoconf_inc.m4
index b8e75add6fbf6885e64b3d2782219c92222f8271..e5102bbb80a7ff9a89635101b4623bbfce196593 100644 (file)
--- a/autoconf_inc.m4
+++ b/autoconf_inc.m4
@@ -4,18 +4,18 @@ dnl Do not modify, all changes will be overwritten!
 
     dnl Conditions:
 
 
     dnl Conditions:
 

-dnl ### begin block COND_BUILD_debug ###
-    COND_BUILD_debug="#"
+dnl ### begin block COND_BUILD_DEBUG ###
+    COND_BUILD_DEBUG="#"

     if test "x$BUILD" = "xdebug" ; then
     if test "x$BUILD" = "xdebug" ; then

-        COND_BUILD_debug=""
+        COND_BUILD_DEBUG=""

     fi
     fi

-    AC_SUBST(COND_BUILD_debug)
-dnl ### begin block COND_BUILD_release ###
-    COND_BUILD_release="#"
+    AC_SUBST(COND_BUILD_DEBUG)
+dnl ### begin block COND_BUILD_RELEASE ###
+    COND_BUILD_RELEASE="#"

     if test "x$BUILD" = "xrelease" ; then
     if test "x$BUILD" = "xrelease" ; then

-        COND_BUILD_release=""
+        COND_BUILD_RELEASE=""

     fi
     fi

-    AC_SUBST(COND_BUILD_release)
+    AC_SUBST(COND_BUILD_RELEASE)

 dnl ### begin block COND_DEPS_TRACKING_0 ###
     COND_DEPS_TRACKING_0="#"
     if test "x$DEPS_TRACKING" = "x0" ; then
 dnl ### begin block COND_DEPS_TRACKING_0 ###
     COND_DEPS_TRACKING_0="#"
     if test "x$DEPS_TRACKING" = "x0" ; then


@@ -46,6 +46,12 @@ dnl ### begin block COND_MONOLITHIC_0_SHARED_0_USE_GUI_1 ###
         COND_MONOLITHIC_0_SHARED_0_USE_GUI_1=""
     fi
     AC_SUBST(COND_MONOLITHIC_0_SHARED_0_USE_GUI_1)
         COND_MONOLITHIC_0_SHARED_0_USE_GUI_1=""
     fi
     AC_SUBST(COND_MONOLITHIC_0_SHARED_0_USE_GUI_1)

+dnl ### begin block COND_MONOLITHIC_0_SHARED_0_USE_HTML_1 ###
+    COND_MONOLITHIC_0_SHARED_0_USE_HTML_1="#"
+    if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x0" -a "x$USE_HTML" = "x1" ; then
+        COND_MONOLITHIC_0_SHARED_0_USE_HTML_1=""
+    fi
+    AC_SUBST(COND_MONOLITHIC_0_SHARED_0_USE_HTML_1)

 dnl ### begin block COND_MONOLITHIC_0_SHARED_1 ###
     COND_MONOLITHIC_0_SHARED_1="#"
     if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x1" ; then
 dnl ### begin block COND_MONOLITHIC_0_SHARED_1 ###
     COND_MONOLITHIC_0_SHARED_1="#"
     if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x1" ; then


@@ -58,6 +64,12 @@ dnl ### begin block COND_MONOLITHIC_0_SHARED_1_USE_GUI_1 ###
         COND_MONOLITHIC_0_SHARED_1_USE_GUI_1=""
     fi
     AC_SUBST(COND_MONOLITHIC_0_SHARED_1_USE_GUI_1)
         COND_MONOLITHIC_0_SHARED_1_USE_GUI_1=""
     fi
     AC_SUBST(COND_MONOLITHIC_0_SHARED_1_USE_GUI_1)

+dnl ### begin block COND_MONOLITHIC_0_SHARED_1_USE_HTML_1 ###
+    COND_MONOLITHIC_0_SHARED_1_USE_HTML_1="#"
+    if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x1" -a "x$USE_HTML" = "x1" ; then
+        COND_MONOLITHIC_0_SHARED_1_USE_HTML_1=""
+    fi
+    AC_SUBST(COND_MONOLITHIC_0_SHARED_1_USE_HTML_1)

 dnl ### begin block COND_MONOLITHIC_1 ###
     COND_MONOLITHIC_1="#"
     if test "x$MONOLITHIC" = "x1" ; then
 dnl ### begin block COND_MONOLITHIC_1 ###
     COND_MONOLITHIC_1="#"
     if test "x$MONOLITHIC" = "x1" ; then


@@ -100,6 +112,24 @@ dnl ### begin block COND_PLATFORM_MACOSX_1 ###
         COND_PLATFORM_MACOSX_1=""
     fi
     AC_SUBST(COND_PLATFORM_MACOSX_1)
         COND_PLATFORM_MACOSX_1=""
     fi
     AC_SUBST(COND_PLATFORM_MACOSX_1)

+dnl ### begin block COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA ###
+    COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA="#"
+    if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xCOCOA" ; then
+        COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA=""
+    fi
+    AC_SUBST(COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA)
+dnl ### begin block COND_PLATFORM_MACOSX_1_TOOLKIT_GTK ###
+    COND_PLATFORM_MACOSX_1_TOOLKIT_GTK="#"
+    if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xGTK" ; then
+        COND_PLATFORM_MACOSX_1_TOOLKIT_GTK=""
+    fi
+    AC_SUBST(COND_PLATFORM_MACOSX_1_TOOLKIT_GTK)
+dnl ### begin block COND_PLATFORM_MACOSX_1_TOOLKIT_MAC ###
+    COND_PLATFORM_MACOSX_1_TOOLKIT_MAC="#"
+    if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xMAC" ; then
+        COND_PLATFORM_MACOSX_1_TOOLKIT_MAC=""
+    fi
+    AC_SUBST(COND_PLATFORM_MACOSX_1_TOOLKIT_MAC)

 dnl ### begin block COND_PLATFORM_MACOSX_1_USE_SOVERSION_1 ###
     COND_PLATFORM_MACOSX_1_USE_SOVERSION_1="#"
     if test "x$PLATFORM_MACOSX" = "x1" -a "x$USE_SOVERSION" = "x1" ; then
 dnl ### begin block COND_PLATFORM_MACOSX_1_USE_SOVERSION_1 ###
     COND_PLATFORM_MACOSX_1_USE_SOVERSION_1="#"
     if test "x$PLATFORM_MACOSX" = "x1" -a "x$USE_SOVERSION" = "x1" ; then


@@ -124,6 +154,18 @@ dnl ### begin block COND_PLATFORM_WIN32_1 ###
         COND_PLATFORM_WIN32_1=""
     fi
     AC_SUBST(COND_PLATFORM_WIN32_1)
         COND_PLATFORM_WIN32_1=""
     fi
     AC_SUBST(COND_PLATFORM_WIN32_1)

+dnl ### begin block COND_SHARED_0_USE_GUI_1_USE_OPENGL_1 ###
+    COND_SHARED_0_USE_GUI_1_USE_OPENGL_1="#"
+    if test "x$SHARED" = "x0" -a "x$USE_GUI" = "x1" -a "x$USE_OPENGL" = "x1" ; then
+        COND_SHARED_0_USE_GUI_1_USE_OPENGL_1=""
+    fi
+    AC_SUBST(COND_SHARED_0_USE_GUI_1_USE_OPENGL_1)
+dnl ### begin block COND_SHARED_1_USE_GUI_1_USE_OPENGL_1 ###
+    COND_SHARED_1_USE_GUI_1_USE_OPENGL_1="#"
+    if test "x$SHARED" = "x1" -a "x$USE_GUI" = "x1" -a "x$USE_OPENGL" = "x1" ; then
+        COND_SHARED_1_USE_GUI_1_USE_OPENGL_1=""
+    fi
+    AC_SUBST(COND_SHARED_1_USE_GUI_1_USE_OPENGL_1)

 dnl ### begin block COND_TOOLKIT_COCOA ###
     COND_TOOLKIT_COCOA="#"
     if test "x$TOOLKIT" = "xCOCOA" ; then
 dnl ### begin block COND_TOOLKIT_COCOA ###
     COND_TOOLKIT_COCOA="#"
     if test "x$TOOLKIT" = "xCOCOA" ; then


@@ -322,42 +364,42 @@ dnl ### begin block COND_WXUNIV_1 ###
         COND_WXUNIV_1=""
     fi
     AC_SUBST(COND_WXUNIV_1)
         COND_WXUNIV_1=""
     fi
     AC_SUBST(COND_WXUNIV_1)

-dnl ### begin block COND_WXUSE_LIBJPEG_builtin ###
-    COND_WXUSE_LIBJPEG_builtin="#"
+dnl ### begin block COND_WXUSE_LIBJPEG_BUILTIN ###
+    COND_WXUSE_LIBJPEG_BUILTIN="#"

     if test "x$wxUSE_LIBJPEG" = "xbuiltin" ; then
     if test "x$wxUSE_LIBJPEG" = "xbuiltin" ; then

-        COND_WXUSE_LIBJPEG_builtin=""
+        COND_WXUSE_LIBJPEG_BUILTIN=""

     fi
     fi

-    AC_SUBST(COND_WXUSE_LIBJPEG_builtin)
-dnl ### begin block COND_WXUSE_LIBPNG_builtin ###
-    COND_WXUSE_LIBPNG_builtin="#"
+    AC_SUBST(COND_WXUSE_LIBJPEG_BUILTIN)
+dnl ### begin block COND_WXUSE_LIBPNG_BUILTIN ###
+    COND_WXUSE_LIBPNG_BUILTIN="#"

     if test "x$wxUSE_LIBPNG" = "xbuiltin" ; then
     if test "x$wxUSE_LIBPNG" = "xbuiltin" ; then

-        COND_WXUSE_LIBPNG_builtin=""
+        COND_WXUSE_LIBPNG_BUILTIN=""

     fi
     fi

-    AC_SUBST(COND_WXUSE_LIBPNG_builtin)
-dnl ### begin block COND_WXUSE_LIBTIFF_builtin ###
-    COND_WXUSE_LIBTIFF_builtin="#"
+    AC_SUBST(COND_WXUSE_LIBPNG_BUILTIN)
+dnl ### begin block COND_WXUSE_LIBTIFF_BUILTIN ###
+    COND_WXUSE_LIBTIFF_BUILTIN="#"

     if test "x$wxUSE_LIBTIFF" = "xbuiltin" ; then
     if test "x$wxUSE_LIBTIFF" = "xbuiltin" ; then

-        COND_WXUSE_LIBTIFF_builtin=""
+        COND_WXUSE_LIBTIFF_BUILTIN=""

     fi
     fi

-    AC_SUBST(COND_WXUSE_LIBTIFF_builtin)
-dnl ### begin block COND_WXUSE_ODBC_builtin ###
-    COND_WXUSE_ODBC_builtin="#"
+    AC_SUBST(COND_WXUSE_LIBTIFF_BUILTIN)
+dnl ### begin block COND_WXUSE_ODBC_BUILTIN ###
+    COND_WXUSE_ODBC_BUILTIN="#"

     if test "x$wxUSE_ODBC" = "xbuiltin" ; then
     if test "x$wxUSE_ODBC" = "xbuiltin" ; then

-        COND_WXUSE_ODBC_builtin=""
+        COND_WXUSE_ODBC_BUILTIN=""

     fi
     fi

-    AC_SUBST(COND_WXUSE_ODBC_builtin)
-dnl ### begin block COND_WXUSE_REGEX_builtin ###
-    COND_WXUSE_REGEX_builtin="#"
+    AC_SUBST(COND_WXUSE_ODBC_BUILTIN)
+dnl ### begin block COND_WXUSE_REGEX_BUILTIN ###
+    COND_WXUSE_REGEX_BUILTIN="#"

     if test "x$wxUSE_REGEX" = "xbuiltin" ; then
     if test "x$wxUSE_REGEX" = "xbuiltin" ; then

-        COND_WXUSE_REGEX_builtin=""
+        COND_WXUSE_REGEX_BUILTIN=""

     fi
     fi

-    AC_SUBST(COND_WXUSE_REGEX_builtin)
-dnl ### begin block COND_WXUSE_ZLIB_builtin ###
-    COND_WXUSE_ZLIB_builtin="#"
+    AC_SUBST(COND_WXUSE_REGEX_BUILTIN)
+dnl ### begin block COND_WXUSE_ZLIB_BUILTIN ###
+    COND_WXUSE_ZLIB_BUILTIN="#"

     if test "x$wxUSE_ZLIB" = "xbuiltin" ; then
     if test "x$wxUSE_ZLIB" = "xbuiltin" ; then

-        COND_WXUSE_ZLIB_builtin=""
+        COND_WXUSE_ZLIB_BUILTIN=""

     fi
     fi

-    AC_SUBST(COND_WXUSE_ZLIB_builtin)
+    AC_SUBST(COND_WXUSE_ZLIB_BUILTIN)

 dnl ### begin block COND_PLATFORM_MAC_1 ###
     COND_PLATFORM_MAC_1="#"
     if test "x$PLATFORM_MAC" = "x1" ; then
 dnl ### begin block COND_PLATFORM_MAC_1 ###
     COND_PLATFORM_MAC_1="#"
     if test "x$PLATFORM_MAC" = "x1" ; then


@@ -376,3 +418,9 @@ dnl ### begin block COND_SHARED_0 ###
         COND_SHARED_0=""
     fi
     AC_SUBST(COND_SHARED_0)
         COND_SHARED_0=""
     fi
     AC_SUBST(COND_SHARED_0)

+dnl ### begin block COND_WXUSE_EXPAT_BUILTIN ###
+    COND_WXUSE_EXPAT_BUILTIN="#"
+    if test "x$wxUSE_EXPAT" = "xbuiltin" ; then
+        COND_WXUSE_EXPAT_BUILTIN=""
+    fi
+    AC_SUBST(COND_WXUSE_EXPAT_BUILTIN)