renamed renderer.cpp to ctrlrend.cpp to avoid conflicts with the native renderers

[wxWidgets.git] / autoconf_inc.m4

diff --git a/autoconf_inc.m4 b/autoconf_inc.m4
index 131df53e702ff0d31142ff4f4f9d3aa2b5708945..94c2e9048474008353ac5c4d9c02d10b774bdc81 100644 (file)
--- a/autoconf_inc.m4
+++ b/autoconf_inc.m4
@@ -10,12 +10,48 @@ dnl ### begin block COND_BUILD_DEBUG ###
         COND_BUILD_DEBUG=""
     fi
     AC_SUBST(COND_BUILD_DEBUG)
+dnl ### begin block COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT ###
+    COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT="#"
+    if test "x$BUILD" = "xdebug" -a "x$DEBUG_FLAG" = "xdefault" ; then
+        COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT=""
+    fi
+    AC_SUBST(COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT)
+dnl ### begin block COND_BUILD_DEBUG_DEBUG_INFO_DEFAULT ###
+    COND_BUILD_DEBUG_DEBUG_INFO_DEFAULT="#"
+    if test "x$BUILD" = "xdebug" -a "x$DEBUG_INFO" = "xdefault" ; then
+        COND_BUILD_DEBUG_DEBUG_INFO_DEFAULT=""
+    fi
+    AC_SUBST(COND_BUILD_DEBUG_DEBUG_INFO_DEFAULT)
 dnl ### begin block COND_BUILD_RELEASE ###
     COND_BUILD_RELEASE="#"
     if test "x$BUILD" = "xrelease" ; then
         COND_BUILD_RELEASE=""
     fi
     AC_SUBST(COND_BUILD_RELEASE)
+dnl ### begin block COND_BUILD_RELEASE_DEBUG_INFO_DEFAULT ###
+    COND_BUILD_RELEASE_DEBUG_INFO_DEFAULT="#"
+    if test "x$BUILD" = "xrelease" -a "x$DEBUG_INFO" = "xdefault" ; then
+        COND_BUILD_RELEASE_DEBUG_INFO_DEFAULT=""
+    fi
+    AC_SUBST(COND_BUILD_RELEASE_DEBUG_INFO_DEFAULT)
+dnl ### begin block COND_DEBUG_FLAG_1 ###
+    COND_DEBUG_FLAG_1="#"
+    if test "x$DEBUG_FLAG" = "x1" ; then
+        COND_DEBUG_FLAG_1=""
+    fi
+    AC_SUBST(COND_DEBUG_FLAG_1)
+dnl ### begin block COND_DEBUG_INFO_0 ###
+    COND_DEBUG_INFO_0="#"
+    if test "x$DEBUG_INFO" = "x0" ; then
+        COND_DEBUG_INFO_0=""
+    fi
+    AC_SUBST(COND_DEBUG_INFO_0)
+dnl ### begin block COND_DEBUG_INFO_1 ###
+    COND_DEBUG_INFO_1="#"
+    if test "x$DEBUG_INFO" = "x1" ; then
+        COND_DEBUG_INFO_1=""
+    fi
+    AC_SUBST(COND_DEBUG_INFO_1)
 dnl ### begin block COND_DEPS_TRACKING_0 ###
     COND_DEPS_TRACKING_0="#"
     if test "x$DEPS_TRACKING" = "x0" ; then
@@ -334,6 +370,24 @@ dnl ### begin block COND_USE_GUI_1_WXUNIV_1 ###
         COND_USE_GUI_1_WXUNIV_1=""
     fi
     AC_SUBST(COND_USE_GUI_1_WXUNIV_1)
+dnl ### begin block COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN ###
+    COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN="#"
+    if test "x$USE_GUI" = "x1" -a "x$wxUSE_LIBJPEG" = "xbuiltin" ; then
+        COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN=""
+    fi
+    AC_SUBST(COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN)
+dnl ### begin block COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN ###
+    COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN="#"
+    if test "x$USE_GUI" = "x1" -a "x$wxUSE_LIBPNG" = "xbuiltin" ; then
+        COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN=""
+    fi
+    AC_SUBST(COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN)
+dnl ### begin block COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN ###
+    COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN="#"
+    if test "x$USE_GUI" = "x1" -a "x$wxUSE_LIBTIFF" = "xbuiltin" ; then
+        COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN=""
+    fi
+    AC_SUBST(COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN)
 dnl ### begin block COND_USE_SOSYMLINKS_1 ###
     COND_USE_SOSYMLINKS_1="#"
     if test "x$USE_SOSYMLINKS" = "x1" ; then
@@ -364,6 +418,12 @@ dnl ### begin block COND_WXUNIV_1 ###
         COND_WXUNIV_1=""
     fi
     AC_SUBST(COND_WXUNIV_1)
+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)
 dnl ### begin block COND_WXUSE_LIBJPEG_BUILTIN ###
     COND_WXUSE_LIBJPEG_BUILTIN="#"
     if test "x$wxUSE_LIBJPEG" = "xbuiltin" ; then
@@ -418,27 +478,3 @@ dnl ### begin block 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)
-dnl ### begin block COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN ###
-    COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN="#"
-    if test "x$USE_GUI" = "x1" -a "x$wxUSE_LIBJPEG" = "xbuiltin" ; then
-        COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN=""
-    fi
-    AC_SUBST(COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN)
-dnl ### begin block COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN ###
-    COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN="#"
-    if test "x$USE_GUI" = "x1" -a "x$wxUSE_LIBPNG" = "xbuiltin" ; then
-        COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN=""
-    fi
-    AC_SUBST(COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN)
-dnl ### begin block COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN ###
-    COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN="#"
-    if test "x$USE_GUI" = "x1" -a "x$wxUSE_LIBTIFF" = "xbuiltin" ; then
-        COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN=""
-    fi
-    AC_SUBST(COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN)