Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21482 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2003-06-28 14:14:22 +00:00
parent 5ab5f2a3dc
commit c7dfb5bb48
3 changed files with 5396 additions and 5409 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10573
Makefile.in
View File

File diff suppressed because it is too large Load Diff

116
autoconf_inc.m4
View File

@@ -7,79 +7,79 @@ dnl Do not modify, all changes will be overwritten!
dnl ### begin block COND_UNICODE_1 ### dnl ### begin block COND_UNICODE_1 ###
COND_UNICODE_1="#" COND_UNICODE_1="#"
if test "x$UNICODE" = "x1" ; then if test "x$UNICODE" = "x1" ; then
COND_UNICODE_1= COND_UNICODE_1=""
fi fi
AC_SUBST(COND_UNICODE_1) AC_SUBST(COND_UNICODE_1)
dnl ### begin block COND_BUILD_DEBUG ### dnl ### begin block COND_BUILD_DEBUG ###
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) AC_SUBST(COND_BUILD_DEBUG)
dnl ### begin block COND_WXUSE_REGEX_BUILTIN ### dnl ### begin block COND_WXUSE_REGEX_BUILTIN ###
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) AC_SUBST(COND_WXUSE_REGEX_BUILTIN)
dnl ### begin block COND_DEPS_TRACKING_1 ### dnl ### begin block COND_DEPS_TRACKING_1 ###
COND_DEPS_TRACKING_1="#" COND_DEPS_TRACKING_1="#"
if test "x$DEPS_TRACKING" = "x1" ; then if test "x$DEPS_TRACKING" = "x1" ; then
COND_DEPS_TRACKING_1= COND_DEPS_TRACKING_1=""
fi fi
AC_SUBST(COND_DEPS_TRACKING_1) AC_SUBST(COND_DEPS_TRACKING_1)
dnl ### begin block COND_DEPS_TRACKING_0 ### dnl ### begin block COND_DEPS_TRACKING_0 ###
COND_DEPS_TRACKING_0="#" COND_DEPS_TRACKING_0="#"
if test "x$DEPS_TRACKING" = "x0" ; then if test "x$DEPS_TRACKING" = "x0" ; then
COND_DEPS_TRACKING_0= COND_DEPS_TRACKING_0=""
fi fi
AC_SUBST(COND_DEPS_TRACKING_0) AC_SUBST(COND_DEPS_TRACKING_0)
dnl ### begin block COND_PLATFORM_UNIX_1 ### dnl ### begin block COND_PLATFORM_UNIX_1 ###
COND_PLATFORM_UNIX_1="#" COND_PLATFORM_UNIX_1="#"
if test "x$PLATFORM_UNIX" = "x1" ; then if test "x$PLATFORM_UNIX" = "x1" ; then
COND_PLATFORM_UNIX_1= COND_PLATFORM_UNIX_1=""
fi fi
AC_SUBST(COND_PLATFORM_UNIX_1) AC_SUBST(COND_PLATFORM_UNIX_1)
dnl ### begin block COND_PLATFORM_WIN32_1 ### dnl ### begin block COND_PLATFORM_WIN32_1 ###
COND_PLATFORM_WIN32_1="#" COND_PLATFORM_WIN32_1="#"
if test "x$PLATFORM_WIN32" = "x1" ; then if test "x$PLATFORM_WIN32" = "x1" ; then
COND_PLATFORM_WIN32_1= COND_PLATFORM_WIN32_1=""
fi fi
AC_SUBST(COND_PLATFORM_WIN32_1) AC_SUBST(COND_PLATFORM_WIN32_1)
dnl ### begin block COND_WXUSE_LIBPNG_BUILTIN ### dnl ### begin block COND_WXUSE_LIBPNG_BUILTIN ###
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) AC_SUBST(COND_WXUSE_LIBPNG_BUILTIN)
dnl ### begin block COND_BUILD_RELEASE ### dnl ### begin block COND_BUILD_RELEASE ###
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_WXUSE_LIBTIFF_BUILTIN ### dnl ### begin block COND_WXUSE_LIBTIFF_BUILTIN ###
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) AC_SUBST(COND_WXUSE_LIBTIFF_BUILTIN)
dnl ### begin block COND_WXUSE_LIBJPEG_BUILTIN ### dnl ### begin block COND_WXUSE_LIBJPEG_BUILTIN ###
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) AC_SUBST(COND_WXUSE_LIBJPEG_BUILTIN)
dnl ### begin block COND_WXUNIV_1 ### dnl ### begin block COND_WXUNIV_1 ###
COND_WXUNIV_1="#" COND_WXUNIV_1="#"
if test "x$WXUNIV" = "x1" ; then if test "x$WXUNIV" = "x1" ; then
COND_WXUNIV_1= COND_WXUNIV_1=""
fi fi
AC_SUBST(COND_WXUNIV_1) AC_SUBST(COND_WXUNIV_1)
dnl ### begin block COND_WXUSE_ZLIB_BUILTIN ### dnl ### begin block COND_WXUSE_ZLIB_BUILTIN ###
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 ### dnl ### begin block COND_PLATFORM_MAC_1 ###
@@ -91,43 +91,43 @@ dnl ### begin block COND_PLATFORM_MAC_1 ###
dnl ### begin block COND_WXUSE_ODBC_BUILTIN ### dnl ### begin block COND_WXUSE_ODBC_BUILTIN ###
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) AC_SUBST(COND_WXUSE_ODBC_BUILTIN)
dnl ### begin block COND_TOOLKIT_MAC ### dnl ### begin block COND_TOOLKIT_MAC ###
COND_TOOLKIT_MAC="#" COND_TOOLKIT_MAC="#"
if test "x$TOOLKIT" = "xMAC" ; then if test "x$TOOLKIT" = "xMAC" ; then
COND_TOOLKIT_MAC= COND_TOOLKIT_MAC=""
fi fi
AC_SUBST(COND_TOOLKIT_MAC) AC_SUBST(COND_TOOLKIT_MAC)
dnl ### begin block COND_MONOLITHIC_0 ### dnl ### begin block COND_MONOLITHIC_0 ###
COND_MONOLITHIC_0="#" COND_MONOLITHIC_0="#"
if test "x$MONOLITHIC" = "x0" ; then if test "x$MONOLITHIC" = "x0" ; then
COND_MONOLITHIC_0= COND_MONOLITHIC_0=""
fi fi
AC_SUBST(COND_MONOLITHIC_0) AC_SUBST(COND_MONOLITHIC_0)
dnl ### begin block COND_PLATFORM_WIN32_0 ### dnl ### begin block COND_PLATFORM_WIN32_0 ###
COND_PLATFORM_WIN32_0="#" COND_PLATFORM_WIN32_0="#"
if test "x$PLATFORM_WIN32" = "x0" ; then if test "x$PLATFORM_WIN32" = "x0" ; then
COND_PLATFORM_WIN32_0= COND_PLATFORM_WIN32_0=""
fi fi
AC_SUBST(COND_PLATFORM_WIN32_0) AC_SUBST(COND_PLATFORM_WIN32_0)
dnl ### begin block COND_MONOLITHIC_1 ### dnl ### begin block COND_MONOLITHIC_1 ###
COND_MONOLITHIC_1="#" COND_MONOLITHIC_1="#"
if test "x$MONOLITHIC" = "x1" ; then if test "x$MONOLITHIC" = "x1" ; then
COND_MONOLITHIC_1= COND_MONOLITHIC_1=""
fi fi
AC_SUBST(COND_MONOLITHIC_1) AC_SUBST(COND_MONOLITHIC_1)
dnl ### begin block COND_USE_GUI_0 ### dnl ### begin block COND_USE_GUI_0 ###
COND_USE_GUI_0="#" COND_USE_GUI_0="#"
if test "x$USE_GUI" = "x0" ; then if test "x$USE_GUI" = "x0" ; then
COND_USE_GUI_0= COND_USE_GUI_0=""
fi fi
AC_SUBST(COND_USE_GUI_0) AC_SUBST(COND_USE_GUI_0)
dnl ### begin block COND_USE_GUI_1 ### dnl ### begin block COND_USE_GUI_1 ###
COND_USE_GUI_1="#" COND_USE_GUI_1="#"
if test "x$USE_GUI" = "x1" ; then if test "x$USE_GUI" = "x1" ; then
COND_USE_GUI_1= COND_USE_GUI_1=""
fi fi
AC_SUBST(COND_USE_GUI_1) AC_SUBST(COND_USE_GUI_1)
dnl ### begin block COND_SHARED_1 ### dnl ### begin block COND_SHARED_1 ###
@@ -138,146 +138,134 @@ dnl ### begin block COND_SHARED_1 ###
AC_SUBST(COND_SHARED_1) AC_SUBST(COND_SHARED_1)
dnl ### begin block COND_SHARED_1_MONOLITHIC_0 ### dnl ### begin block COND_SHARED_1_MONOLITHIC_0 ###
COND_SHARED_1_MONOLITHIC_0="#" COND_SHARED_1_MONOLITHIC_0="#"
if test "x$SHARED" = "x1" -a \ if test "x$SHARED" = "x1" -a "x$MONOLITHIC" = "x0" ; then
"x$MONOLITHIC" = "x0" ; then COND_SHARED_1_MONOLITHIC_0=""
COND_SHARED_1_MONOLITHIC_0=
fi fi
AC_SUBST(COND_SHARED_1_MONOLITHIC_0) AC_SUBST(COND_SHARED_1_MONOLITHIC_0)
dnl ### begin block COND_USE_SOVERLINUX_1 ### dnl ### begin block COND_USE_SOVERLINUX_1 ###
COND_USE_SOVERLINUX_1="#" COND_USE_SOVERLINUX_1="#"
if test "x$USE_SOVERLINUX" = "x1" ; then if test "x$USE_SOVERLINUX" = "x1" ; then
COND_USE_SOVERLINUX_1= COND_USE_SOVERLINUX_1=""
fi fi
AC_SUBST(COND_USE_SOVERLINUX_1) AC_SUBST(COND_USE_SOVERLINUX_1)
dnl ### begin block COND_USE_SOVERSOLARIS_1 ### dnl ### begin block COND_USE_SOVERSOLARIS_1 ###
COND_USE_SOVERSOLARIS_1="#" COND_USE_SOVERSOLARIS_1="#"
if test "x$USE_SOVERSOLARIS" = "x1" ; then if test "x$USE_SOVERSOLARIS" = "x1" ; then
COND_USE_SOVERSOLARIS_1= COND_USE_SOVERSOLARIS_1=""
fi fi
AC_SUBST(COND_USE_SOVERSOLARIS_1) AC_SUBST(COND_USE_SOVERSOLARIS_1)
dnl ### begin block COND_USE_SOSYMLINKS_1 ### dnl ### begin block COND_USE_SOSYMLINKS_1 ###
COND_USE_SOSYMLINKS_1="#" COND_USE_SOSYMLINKS_1="#"
if test "x$USE_SOSYMLINKS" = "x1" ; then if test "x$USE_SOSYMLINKS" = "x1" ; then
COND_USE_SOSYMLINKS_1= COND_USE_SOSYMLINKS_1=""
fi fi
AC_SUBST(COND_USE_SOSYMLINKS_1) AC_SUBST(COND_USE_SOSYMLINKS_1)
dnl ### begin block COND_TOOLKIT_X11 ### dnl ### begin block COND_TOOLKIT_X11 ###
COND_TOOLKIT_X11="#" COND_TOOLKIT_X11="#"
if test "x$TOOLKIT" = "xX11" ; then if test "x$TOOLKIT" = "xX11" ; then
COND_TOOLKIT_X11= COND_TOOLKIT_X11=""
fi fi
AC_SUBST(COND_TOOLKIT_X11) AC_SUBST(COND_TOOLKIT_X11)
dnl ### begin block COND_TOOLKIT_MGL ### dnl ### begin block COND_TOOLKIT_MGL ###
COND_TOOLKIT_MGL="#" COND_TOOLKIT_MGL="#"
if test "x$TOOLKIT" = "xMGL" ; then if test "x$TOOLKIT" = "xMGL" ; then
COND_TOOLKIT_MGL= COND_TOOLKIT_MGL=""
fi fi
AC_SUBST(COND_TOOLKIT_MGL) AC_SUBST(COND_TOOLKIT_MGL)
dnl ### begin block COND_TOOLKIT_GTK ### dnl ### begin block COND_TOOLKIT_GTK ###
COND_TOOLKIT_GTK="#" COND_TOOLKIT_GTK="#"
if test "x$TOOLKIT" = "xGTK" ; then if test "x$TOOLKIT" = "xGTK" ; then
COND_TOOLKIT_GTK= COND_TOOLKIT_GTK=""
fi fi
AC_SUBST(COND_TOOLKIT_GTK) AC_SUBST(COND_TOOLKIT_GTK)
dnl ### begin block COND_TOOLKIT_MSW ### dnl ### begin block COND_TOOLKIT_MSW ###
COND_TOOLKIT_MSW="#" COND_TOOLKIT_MSW="#"
if test "x$TOOLKIT" = "xMSW" ; then if test "x$TOOLKIT" = "xMSW" ; then
COND_TOOLKIT_MSW= COND_TOOLKIT_MSW=""
fi fi
AC_SUBST(COND_TOOLKIT_MSW) AC_SUBST(COND_TOOLKIT_MSW)
dnl ### begin block COND_USE_SOVERSION_1_PLATFORM_MACOSX_0 ### dnl ### begin block COND_USE_SOVERSION_1_PLATFORM_MACOSX_0 ###
COND_USE_SOVERSION_1_PLATFORM_MACOSX_0="#" COND_USE_SOVERSION_1_PLATFORM_MACOSX_0="#"
if test "x$USE_SOVERSION" = "x1" -a \ if test "x$USE_SOVERSION" = "x1" -a "x$PLATFORM_MACOSX" = "x0" ; then
"x$PLATFORM_MACOSX" = "x0" ; then COND_USE_SOVERSION_1_PLATFORM_MACOSX_0=""
COND_USE_SOVERSION_1_PLATFORM_MACOSX_0=
fi fi
AC_SUBST(COND_USE_SOVERSION_1_PLATFORM_MACOSX_0) AC_SUBST(COND_USE_SOVERSION_1_PLATFORM_MACOSX_0)
dnl ### begin block COND_USE_SOVERSION_1_PLATFORM_MACOSX_1 ### dnl ### begin block COND_USE_SOVERSION_1_PLATFORM_MACOSX_1 ###
COND_USE_SOVERSION_1_PLATFORM_MACOSX_1="#" COND_USE_SOVERSION_1_PLATFORM_MACOSX_1="#"
if test "x$USE_SOVERSION" = "x1" -a \ if test "x$USE_SOVERSION" = "x1" -a "x$PLATFORM_MACOSX" = "x1" ; then
"x$PLATFORM_MACOSX" = "x1" ; then COND_USE_SOVERSION_1_PLATFORM_MACOSX_1=""
COND_USE_SOVERSION_1_PLATFORM_MACOSX_1=
fi fi
AC_SUBST(COND_USE_SOVERSION_1_PLATFORM_MACOSX_1) AC_SUBST(COND_USE_SOVERSION_1_PLATFORM_MACOSX_1)
dnl ### begin block COND_USE_SOVERSION_0 ### dnl ### begin block COND_USE_SOVERSION_0 ###
COND_USE_SOVERSION_0="#" COND_USE_SOVERSION_0="#"
if test "x$USE_SOVERSION" = "x0" ; then if test "x$USE_SOVERSION" = "x0" ; then
COND_USE_SOVERSION_0= COND_USE_SOVERSION_0=""
fi fi
AC_SUBST(COND_USE_SOVERSION_0) AC_SUBST(COND_USE_SOVERSION_0)
dnl ### begin block COND_SHARED_0_USE_GUI_1_MONOLITHIC_0 ### dnl ### begin block COND_SHARED_0_USE_GUI_1_MONOLITHIC_0 ###
COND_SHARED_0_USE_GUI_1_MONOLITHIC_0="#" COND_SHARED_0_USE_GUI_1_MONOLITHIC_0="#"
if test "x$SHARED" = "x0" -a \ if test "x$SHARED" = "x0" -a "x$USE_GUI" = "x1" -a "x$MONOLITHIC" = "x0" ; then
"x$USE_GUI" = "x1" -a \ COND_SHARED_0_USE_GUI_1_MONOLITHIC_0=""
"x$MONOLITHIC" = "x0" ; then
COND_SHARED_0_USE_GUI_1_MONOLITHIC_0=
fi fi
AC_SUBST(COND_SHARED_0_USE_GUI_1_MONOLITHIC_0) AC_SUBST(COND_SHARED_0_USE_GUI_1_MONOLITHIC_0)
dnl ### begin block COND_PLATFORM_MACOSX_1 ### dnl ### begin block COND_PLATFORM_MACOSX_1 ###
COND_PLATFORM_MACOSX_1="#" COND_PLATFORM_MACOSX_1="#"
if test "x$PLATFORM_MACOSX" = "x1" ; then if test "x$PLATFORM_MACOSX" = "x1" ; then
COND_PLATFORM_MACOSX_1= COND_PLATFORM_MACOSX_1=""
fi fi
AC_SUBST(COND_PLATFORM_MACOSX_1) AC_SUBST(COND_PLATFORM_MACOSX_1)
dnl ### begin block COND_SHARED_1_USE_GUI_1_MONOLITHIC_0 ### dnl ### begin block COND_SHARED_1_USE_GUI_1_MONOLITHIC_0 ###
COND_SHARED_1_USE_GUI_1_MONOLITHIC_0="#" COND_SHARED_1_USE_GUI_1_MONOLITHIC_0="#"
if test "x$SHARED" = "x1" -a \ if test "x$SHARED" = "x1" -a "x$USE_GUI" = "x1" -a "x$MONOLITHIC" = "x0" ; then
"x$USE_GUI" = "x1" -a \ COND_SHARED_1_USE_GUI_1_MONOLITHIC_0=""
"x$MONOLITHIC" = "x0" ; then
COND_SHARED_1_USE_GUI_1_MONOLITHIC_0=
fi fi
AC_SUBST(COND_SHARED_1_USE_GUI_1_MONOLITHIC_0) AC_SUBST(COND_SHARED_1_USE_GUI_1_MONOLITHIC_0)
dnl ### begin block COND_TOOLKIT_MOTIF ### dnl ### begin block COND_TOOLKIT_MOTIF ###
COND_TOOLKIT_MOTIF="#" COND_TOOLKIT_MOTIF="#"
if test "x$TOOLKIT" = "xMOTIF" ; then if test "x$TOOLKIT" = "xMOTIF" ; then
COND_TOOLKIT_MOTIF= COND_TOOLKIT_MOTIF=""
fi fi
AC_SUBST(COND_TOOLKIT_MOTIF) AC_SUBST(COND_TOOLKIT_MOTIF)
dnl ### begin block COND_TOOLKIT_COCOA ### dnl ### begin block COND_TOOLKIT_COCOA ###
COND_TOOLKIT_COCOA="#" COND_TOOLKIT_COCOA="#"
if test "x$TOOLKIT" = "xCOCOA" ; then if test "x$TOOLKIT" = "xCOCOA" ; then
COND_TOOLKIT_COCOA= COND_TOOLKIT_COCOA=""
fi fi
AC_SUBST(COND_TOOLKIT_COCOA) AC_SUBST(COND_TOOLKIT_COCOA)
dnl ### begin block COND_TOOLKIT_OS2 ### dnl ### begin block COND_TOOLKIT_OS2 ###
COND_TOOLKIT_OS2="#" COND_TOOLKIT_OS2="#"
if test "x$TOOLKIT" = "xOS2" ; then if test "x$TOOLKIT" = "xOS2" ; then
COND_TOOLKIT_OS2= COND_TOOLKIT_OS2=""
fi fi
AC_SUBST(COND_TOOLKIT_OS2) AC_SUBST(COND_TOOLKIT_OS2)
dnl ### begin block COND_SHARED_1_MONOLITHIC_1 ### dnl ### begin block COND_SHARED_1_MONOLITHIC_1 ###
COND_SHARED_1_MONOLITHIC_1="#" COND_SHARED_1_MONOLITHIC_1="#"
if test "x$SHARED" = "x1" -a \ if test "x$SHARED" = "x1" -a "x$MONOLITHIC" = "x1" ; then
"x$MONOLITHIC" = "x1" ; then COND_SHARED_1_MONOLITHIC_1=""
COND_SHARED_1_MONOLITHIC_1=
fi fi
AC_SUBST(COND_SHARED_1_MONOLITHIC_1) AC_SUBST(COND_SHARED_1_MONOLITHIC_1)
dnl ### begin block COND_SHARED_0_MONOLITHIC_1 ### dnl ### begin block COND_SHARED_0_MONOLITHIC_1 ###
COND_SHARED_0_MONOLITHIC_1="#" COND_SHARED_0_MONOLITHIC_1="#"
if test "x$SHARED" = "x0" -a \ if test "x$SHARED" = "x0" -a "x$MONOLITHIC" = "x1" ; then
"x$MONOLITHIC" = "x1" ; then COND_SHARED_0_MONOLITHIC_1=""
COND_SHARED_0_MONOLITHIC_1=
fi fi
AC_SUBST(COND_SHARED_0_MONOLITHIC_1) AC_SUBST(COND_SHARED_0_MONOLITHIC_1)
dnl ### begin block COND_USE_GUI_1_WXUNIV_0 ### dnl ### begin block COND_USE_GUI_1_WXUNIV_0 ###
COND_USE_GUI_1_WXUNIV_0="#" COND_USE_GUI_1_WXUNIV_0="#"
if test "x$USE_GUI" = "x1" -a \ if test "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then
"x$WXUNIV" = "x0" ; then COND_USE_GUI_1_WXUNIV_0=""
COND_USE_GUI_1_WXUNIV_0=
fi fi
AC_SUBST(COND_USE_GUI_1_WXUNIV_0) AC_SUBST(COND_USE_GUI_1_WXUNIV_0)
dnl ### begin block COND_USE_GUI_1_WXUNIV_1 ### dnl ### begin block COND_USE_GUI_1_WXUNIV_1 ###
COND_USE_GUI_1_WXUNIV_1="#" COND_USE_GUI_1_WXUNIV_1="#"
if test "x$USE_GUI" = "x1" -a \ if test "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x1" ; then
"x$WXUNIV" = "x1" ; then COND_USE_GUI_1_WXUNIV_1=""
COND_USE_GUI_1_WXUNIV_1=
fi fi
AC_SUBST(COND_USE_GUI_1_WXUNIV_1) AC_SUBST(COND_USE_GUI_1_WXUNIV_1)
dnl ### begin block COND_SHARED_0_MONOLITHIC_0 ### dnl ### begin block COND_SHARED_0_MONOLITHIC_0 ###
COND_SHARED_0_MONOLITHIC_0="#" COND_SHARED_0_MONOLITHIC_0="#"
if test "x$SHARED" = "x0" -a \ if test "x$SHARED" = "x0" -a "x$MONOLITHIC" = "x0" ; then
"x$MONOLITHIC" = "x0" ; then COND_SHARED_0_MONOLITHIC_0=""
COND_SHARED_0_MONOLITHIC_0=
fi fi
AC_SUBST(COND_SHARED_0_MONOLITHIC_0) AC_SUBST(COND_SHARED_0_MONOLITHIC_0)
dnl ### begin block COND_SHARED_0 ### dnl ### begin block COND_SHARED_0 ###

116
configure vendored
View File

@@ -34335,67 +34335,67 @@ fi
COND_UNICODE_1="#" COND_UNICODE_1="#"
if test "x$UNICODE" = "x1" ; then if test "x$UNICODE" = "x1" ; then
COND_UNICODE_1= COND_UNICODE_1=""
fi fi
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
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
COND_DEPS_TRACKING_1="#" COND_DEPS_TRACKING_1="#"
if test "x$DEPS_TRACKING" = "x1" ; then if test "x$DEPS_TRACKING" = "x1" ; then
COND_DEPS_TRACKING_1= COND_DEPS_TRACKING_1=""
fi fi
COND_DEPS_TRACKING_0="#" COND_DEPS_TRACKING_0="#"
if test "x$DEPS_TRACKING" = "x0" ; then if test "x$DEPS_TRACKING" = "x0" ; then
COND_DEPS_TRACKING_0= COND_DEPS_TRACKING_0=""
fi fi
COND_PLATFORM_UNIX_1="#" COND_PLATFORM_UNIX_1="#"
if test "x$PLATFORM_UNIX" = "x1" ; then if test "x$PLATFORM_UNIX" = "x1" ; then
COND_PLATFORM_UNIX_1= COND_PLATFORM_UNIX_1=""
fi fi
COND_PLATFORM_WIN32_1="#" COND_PLATFORM_WIN32_1="#"
if test "x$PLATFORM_WIN32" = "x1" ; then if test "x$PLATFORM_WIN32" = "x1" ; then
COND_PLATFORM_WIN32_1= COND_PLATFORM_WIN32_1=""
fi fi
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
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
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
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
COND_WXUNIV_1="#" COND_WXUNIV_1="#"
if test "x$WXUNIV" = "x1" ; then if test "x$WXUNIV" = "x1" ; then
COND_WXUNIV_1= COND_WXUNIV_1=""
fi fi
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
COND_PLATFORM_MAC_1="#" COND_PLATFORM_MAC_1="#"
@@ -34405,37 +34405,37 @@ fi
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
COND_TOOLKIT_MAC="#" COND_TOOLKIT_MAC="#"
if test "x$TOOLKIT" = "xMAC" ; then if test "x$TOOLKIT" = "xMAC" ; then
COND_TOOLKIT_MAC= COND_TOOLKIT_MAC=""
fi fi
COND_MONOLITHIC_0="#" COND_MONOLITHIC_0="#"
if test "x$MONOLITHIC" = "x0" ; then if test "x$MONOLITHIC" = "x0" ; then
COND_MONOLITHIC_0= COND_MONOLITHIC_0=""
fi fi
COND_PLATFORM_WIN32_0="#" COND_PLATFORM_WIN32_0="#"
if test "x$PLATFORM_WIN32" = "x0" ; then if test "x$PLATFORM_WIN32" = "x0" ; then
COND_PLATFORM_WIN32_0= COND_PLATFORM_WIN32_0=""
fi fi
COND_MONOLITHIC_1="#" COND_MONOLITHIC_1="#"
if test "x$MONOLITHIC" = "x1" ; then if test "x$MONOLITHIC" = "x1" ; then
COND_MONOLITHIC_1= COND_MONOLITHIC_1=""
fi fi
COND_USE_GUI_0="#" COND_USE_GUI_0="#"
if test "x$USE_GUI" = "x0" ; then if test "x$USE_GUI" = "x0" ; then
COND_USE_GUI_0= COND_USE_GUI_0=""
fi fi
COND_USE_GUI_1="#" COND_USE_GUI_1="#"
if test "x$USE_GUI" = "x1" ; then if test "x$USE_GUI" = "x1" ; then
COND_USE_GUI_1= COND_USE_GUI_1=""
fi fi
COND_SHARED_1="#" COND_SHARED_1="#"
@@ -34444,125 +34444,113 @@ fi
fi fi
COND_SHARED_1_MONOLITHIC_0="#" COND_SHARED_1_MONOLITHIC_0="#"
if test "x$SHARED" = "x1" -a \ if test "x$SHARED" = "x1" -a "x$MONOLITHIC" = "x0" ; then
"x$MONOLITHIC" = "x0" ; then COND_SHARED_1_MONOLITHIC_0=""
COND_SHARED_1_MONOLITHIC_0=
fi fi
COND_USE_SOVERLINUX_1="#" COND_USE_SOVERLINUX_1="#"
if test "x$USE_SOVERLINUX" = "x1" ; then if test "x$USE_SOVERLINUX" = "x1" ; then
COND_USE_SOVERLINUX_1= COND_USE_SOVERLINUX_1=""
fi fi
COND_USE_SOVERSOLARIS_1="#" COND_USE_SOVERSOLARIS_1="#"
if test "x$USE_SOVERSOLARIS" = "x1" ; then if test "x$USE_SOVERSOLARIS" = "x1" ; then
COND_USE_SOVERSOLARIS_1= COND_USE_SOVERSOLARIS_1=""
fi fi
COND_USE_SOSYMLINKS_1="#" COND_USE_SOSYMLINKS_1="#"
if test "x$USE_SOSYMLINKS" = "x1" ; then if test "x$USE_SOSYMLINKS" = "x1" ; then
COND_USE_SOSYMLINKS_1= COND_USE_SOSYMLINKS_1=""
fi fi
COND_TOOLKIT_X11="#" COND_TOOLKIT_X11="#"
if test "x$TOOLKIT" = "xX11" ; then if test "x$TOOLKIT" = "xX11" ; then
COND_TOOLKIT_X11= COND_TOOLKIT_X11=""
fi fi
COND_TOOLKIT_MGL="#" COND_TOOLKIT_MGL="#"
if test "x$TOOLKIT" = "xMGL" ; then if test "x$TOOLKIT" = "xMGL" ; then
COND_TOOLKIT_MGL= COND_TOOLKIT_MGL=""
fi fi
COND_TOOLKIT_GTK="#" COND_TOOLKIT_GTK="#"
if test "x$TOOLKIT" = "xGTK" ; then if test "x$TOOLKIT" = "xGTK" ; then
COND_TOOLKIT_GTK= COND_TOOLKIT_GTK=""
fi fi
COND_TOOLKIT_MSW="#" COND_TOOLKIT_MSW="#"
if test "x$TOOLKIT" = "xMSW" ; then if test "x$TOOLKIT" = "xMSW" ; then
COND_TOOLKIT_MSW= COND_TOOLKIT_MSW=""
fi fi
COND_USE_SOVERSION_1_PLATFORM_MACOSX_0="#" COND_USE_SOVERSION_1_PLATFORM_MACOSX_0="#"
if test "x$USE_SOVERSION" = "x1" -a \ if test "x$USE_SOVERSION" = "x1" -a "x$PLATFORM_MACOSX" = "x0" ; then
"x$PLATFORM_MACOSX" = "x0" ; then COND_USE_SOVERSION_1_PLATFORM_MACOSX_0=""
COND_USE_SOVERSION_1_PLATFORM_MACOSX_0=
fi fi
COND_USE_SOVERSION_1_PLATFORM_MACOSX_1="#" COND_USE_SOVERSION_1_PLATFORM_MACOSX_1="#"
if test "x$USE_SOVERSION" = "x1" -a \ if test "x$USE_SOVERSION" = "x1" -a "x$PLATFORM_MACOSX" = "x1" ; then
"x$PLATFORM_MACOSX" = "x1" ; then COND_USE_SOVERSION_1_PLATFORM_MACOSX_1=""
COND_USE_SOVERSION_1_PLATFORM_MACOSX_1=
fi fi
COND_USE_SOVERSION_0="#" COND_USE_SOVERSION_0="#"
if test "x$USE_SOVERSION" = "x0" ; then if test "x$USE_SOVERSION" = "x0" ; then
COND_USE_SOVERSION_0= COND_USE_SOVERSION_0=""
fi fi
COND_SHARED_0_USE_GUI_1_MONOLITHIC_0="#" COND_SHARED_0_USE_GUI_1_MONOLITHIC_0="#"
if test "x$SHARED" = "x0" -a \ if test "x$SHARED" = "x0" -a "x$USE_GUI" = "x1" -a "x$MONOLITHIC" = "x0" ; then
"x$USE_GUI" = "x1" -a \ COND_SHARED_0_USE_GUI_1_MONOLITHIC_0=""
"x$MONOLITHIC" = "x0" ; then
COND_SHARED_0_USE_GUI_1_MONOLITHIC_0=
fi fi
COND_PLATFORM_MACOSX_1="#" COND_PLATFORM_MACOSX_1="#"
if test "x$PLATFORM_MACOSX" = "x1" ; then if test "x$PLATFORM_MACOSX" = "x1" ; then
COND_PLATFORM_MACOSX_1= COND_PLATFORM_MACOSX_1=""
fi fi
COND_SHARED_1_USE_GUI_1_MONOLITHIC_0="#" COND_SHARED_1_USE_GUI_1_MONOLITHIC_0="#"
if test "x$SHARED" = "x1" -a \ if test "x$SHARED" = "x1" -a "x$USE_GUI" = "x1" -a "x$MONOLITHIC" = "x0" ; then
"x$USE_GUI" = "x1" -a \ COND_SHARED_1_USE_GUI_1_MONOLITHIC_0=""
"x$MONOLITHIC" = "x0" ; then
COND_SHARED_1_USE_GUI_1_MONOLITHIC_0=
fi fi
COND_TOOLKIT_MOTIF="#" COND_TOOLKIT_MOTIF="#"
if test "x$TOOLKIT" = "xMOTIF" ; then if test "x$TOOLKIT" = "xMOTIF" ; then
COND_TOOLKIT_MOTIF= COND_TOOLKIT_MOTIF=""
fi fi
COND_TOOLKIT_COCOA="#" COND_TOOLKIT_COCOA="#"
if test "x$TOOLKIT" = "xCOCOA" ; then if test "x$TOOLKIT" = "xCOCOA" ; then
COND_TOOLKIT_COCOA= COND_TOOLKIT_COCOA=""
fi fi
COND_TOOLKIT_OS2="#" COND_TOOLKIT_OS2="#"
if test "x$TOOLKIT" = "xOS2" ; then if test "x$TOOLKIT" = "xOS2" ; then
COND_TOOLKIT_OS2= COND_TOOLKIT_OS2=""
fi fi
COND_SHARED_1_MONOLITHIC_1="#" COND_SHARED_1_MONOLITHIC_1="#"
if test "x$SHARED" = "x1" -a \ if test "x$SHARED" = "x1" -a "x$MONOLITHIC" = "x1" ; then
"x$MONOLITHIC" = "x1" ; then COND_SHARED_1_MONOLITHIC_1=""
COND_SHARED_1_MONOLITHIC_1=
fi fi
COND_SHARED_0_MONOLITHIC_1="#" COND_SHARED_0_MONOLITHIC_1="#"
if test "x$SHARED" = "x0" -a \ if test "x$SHARED" = "x0" -a "x$MONOLITHIC" = "x1" ; then
"x$MONOLITHIC" = "x1" ; then COND_SHARED_0_MONOLITHIC_1=""
COND_SHARED_0_MONOLITHIC_1=
fi fi
COND_USE_GUI_1_WXUNIV_0="#" COND_USE_GUI_1_WXUNIV_0="#"
if test "x$USE_GUI" = "x1" -a \ if test "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then
"x$WXUNIV" = "x0" ; then COND_USE_GUI_1_WXUNIV_0=""
COND_USE_GUI_1_WXUNIV_0=
fi fi
COND_USE_GUI_1_WXUNIV_1="#" COND_USE_GUI_1_WXUNIV_1="#"
if test "x$USE_GUI" = "x1" -a \ if test "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x1" ; then
"x$WXUNIV" = "x1" ; then COND_USE_GUI_1_WXUNIV_1=""
COND_USE_GUI_1_WXUNIV_1=
fi fi
COND_SHARED_0_MONOLITHIC_0="#" COND_SHARED_0_MONOLITHIC_0="#"
if test "x$SHARED" = "x0" -a \ if test "x$SHARED" = "x0" -a "x$MONOLITHIC" = "x0" ; then
"x$MONOLITHIC" = "x0" ; then COND_SHARED_0_MONOLITHIC_0=""
COND_SHARED_0_MONOLITHIC_0=
fi fi
COND_SHARED_0="#" COND_SHARED_0="#"