regenerated makefiles, with support for multilib build
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21390 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
parent
9747f85dad
commit
4b1e57eb35
316
autoconf_inc.m4
316
autoconf_inc.m4
@ -4,97 +4,43 @@ dnl Do not modify, all changes will be overwritten!
|
||||
|
||||
dnl Conditions:
|
||||
|
||||
dnl ### begin block COND_WXUSE_ZLIB_BUILTIN ###
|
||||
COND_WXUSE_ZLIB_BUILTIN="#"
|
||||
if test "x$wxUSE_ZLIB" = "xbuiltin" ; then
|
||||
COND_WXUSE_ZLIB_BUILTIN=
|
||||
dnl ### begin block COND_SHARED_1_MONOLITHIC_0 ###
|
||||
COND_SHARED_1_MONOLITHIC_0="#"
|
||||
if test "x$SHARED" = "x1" -a \
|
||||
"x$MONOLITHIC" = "x0" ; then
|
||||
COND_SHARED_1_MONOLITHIC_0=
|
||||
fi
|
||||
AC_SUBST(COND_WXUSE_ZLIB_BUILTIN)
|
||||
dnl ### begin block COND_UNICODE_1 ###
|
||||
COND_UNICODE_1="#"
|
||||
if test "x$UNICODE" = "x1" ; then
|
||||
COND_UNICODE_1=
|
||||
fi
|
||||
AC_SUBST(COND_UNICODE_1)
|
||||
dnl ### begin block COND_BUILD_DEBUG ###
|
||||
COND_BUILD_DEBUG="#"
|
||||
if test "x$BUILD" = "xdebug" ; then
|
||||
COND_BUILD_DEBUG=
|
||||
fi
|
||||
AC_SUBST(COND_BUILD_DEBUG)
|
||||
dnl ### begin block COND_WXUSE_REGEX_BUILTIN ###
|
||||
COND_WXUSE_REGEX_BUILTIN="#"
|
||||
if test "x$wxUSE_REGEX" = "xbuiltin" ; then
|
||||
COND_WXUSE_REGEX_BUILTIN=
|
||||
fi
|
||||
AC_SUBST(COND_WXUSE_REGEX_BUILTIN)
|
||||
dnl ### begin block COND_USE_SOSYMLINKS_1 ###
|
||||
COND_USE_SOSYMLINKS_1="#"
|
||||
if test "x$USE_SOSYMLINKS" = "x1" ; then
|
||||
COND_USE_SOSYMLINKS_1=
|
||||
fi
|
||||
AC_SUBST(COND_USE_SOSYMLINKS_1)
|
||||
dnl ### begin block COND_WXUSE_LIBJPEG_BUILTIN ###
|
||||
COND_WXUSE_LIBJPEG_BUILTIN="#"
|
||||
if test "x$wxUSE_LIBJPEG" = "xbuiltin" ; then
|
||||
COND_WXUSE_LIBJPEG_BUILTIN=
|
||||
fi
|
||||
AC_SUBST(COND_WXUSE_LIBJPEG_BUILTIN)
|
||||
AC_SUBST(COND_SHARED_1_MONOLITHIC_0)
|
||||
dnl ### begin block COND_WXUSE_LIBPNG_BUILTIN ###
|
||||
COND_WXUSE_LIBPNG_BUILTIN="#"
|
||||
if test "x$wxUSE_LIBPNG" = "xbuiltin" ; then
|
||||
COND_WXUSE_LIBPNG_BUILTIN=
|
||||
fi
|
||||
AC_SUBST(COND_WXUSE_LIBPNG_BUILTIN)
|
||||
dnl ### begin block COND_SHARED_1_MONOLITHIC_1 ###
|
||||
COND_SHARED_1_MONOLITHIC_1="#"
|
||||
if test "x$SHARED" = "x1" -a \
|
||||
"x$MONOLITHIC" = "x1" ; then
|
||||
COND_SHARED_1_MONOLITHIC_1=
|
||||
dnl ### begin block COND_WXUSE_ZLIB_BUILTIN ###
|
||||
COND_WXUSE_ZLIB_BUILTIN="#"
|
||||
if test "x$wxUSE_ZLIB" = "xbuiltin" ; then
|
||||
COND_WXUSE_ZLIB_BUILTIN=
|
||||
fi
|
||||
AC_SUBST(COND_SHARED_1_MONOLITHIC_1)
|
||||
AC_SUBST(COND_WXUSE_ZLIB_BUILTIN)
|
||||
dnl ### begin block COND_USE_SOSYMLINKS_1 ###
|
||||
COND_USE_SOSYMLINKS_1="#"
|
||||
if test "x$USE_SOSYMLINKS" = "x1" ; then
|
||||
COND_USE_SOSYMLINKS_1=
|
||||
fi
|
||||
AC_SUBST(COND_USE_SOSYMLINKS_1)
|
||||
dnl ### begin block COND_USE_GUI_1 ###
|
||||
COND_USE_GUI_1="#"
|
||||
if test "x$USE_GUI" = "x1" ; then
|
||||
COND_USE_GUI_1=
|
||||
fi
|
||||
AC_SUBST(COND_USE_GUI_1)
|
||||
dnl ### begin block COND_WXUSE_ODBC_BUILTIN ###
|
||||
COND_WXUSE_ODBC_BUILTIN="#"
|
||||
if test "x$wxUSE_ODBC" = "xbuiltin" ; then
|
||||
COND_WXUSE_ODBC_BUILTIN=
|
||||
fi
|
||||
AC_SUBST(COND_WXUSE_ODBC_BUILTIN)
|
||||
dnl ### begin block COND_TOOLKIT_GTK ###
|
||||
COND_TOOLKIT_GTK="#"
|
||||
if test "x$TOOLKIT" = "xGTK" ; then
|
||||
COND_TOOLKIT_GTK=
|
||||
fi
|
||||
AC_SUBST(COND_TOOLKIT_GTK)
|
||||
dnl ### begin block COND_TOOLKIT_MOTIF ###
|
||||
COND_TOOLKIT_MOTIF="#"
|
||||
if test "x$TOOLKIT" = "xMOTIF" ; then
|
||||
COND_TOOLKIT_MOTIF=
|
||||
fi
|
||||
AC_SUBST(COND_TOOLKIT_MOTIF)
|
||||
dnl ### begin block COND_TOOLKIT_MSW ###
|
||||
COND_TOOLKIT_MSW="#"
|
||||
if test "x$TOOLKIT" = "xMSW" ; then
|
||||
COND_TOOLKIT_MSW=
|
||||
fi
|
||||
AC_SUBST(COND_TOOLKIT_MSW)
|
||||
dnl ### begin block COND_TOOLKIT_MAC ###
|
||||
COND_TOOLKIT_MAC="#"
|
||||
if test "x$TOOLKIT" = "xMAC" ; then
|
||||
COND_TOOLKIT_MAC=
|
||||
fi
|
||||
AC_SUBST(COND_TOOLKIT_MAC)
|
||||
dnl ### begin block COND_TOOLKIT_COCOA ###
|
||||
COND_TOOLKIT_COCOA="#"
|
||||
if test "x$TOOLKIT" = "xCOCOA" ; then
|
||||
COND_TOOLKIT_COCOA=
|
||||
fi
|
||||
AC_SUBST(COND_TOOLKIT_COCOA)
|
||||
dnl ### begin block COND_TOOLKIT_OS2 ###
|
||||
COND_TOOLKIT_OS2="#"
|
||||
if test "x$TOOLKIT" = "xOS2" ; then
|
||||
COND_TOOLKIT_OS2=
|
||||
fi
|
||||
AC_SUBST(COND_TOOLKIT_OS2)
|
||||
dnl ### begin block COND_TOOLKIT_X11 ###
|
||||
COND_TOOLKIT_X11="#"
|
||||
if test "x$TOOLKIT" = "xX11" ; then
|
||||
@ -107,36 +53,24 @@ dnl ### begin block COND_TOOLKIT_MGL ###
|
||||
COND_TOOLKIT_MGL=
|
||||
fi
|
||||
AC_SUBST(COND_TOOLKIT_MGL)
|
||||
dnl ### begin block COND_WXUNIV_1 ###
|
||||
COND_WXUNIV_1="#"
|
||||
if test "x$WXUNIV" = "x1" ; then
|
||||
COND_WXUNIV_1=
|
||||
dnl ### begin block COND_TOOLKIT_GTK ###
|
||||
COND_TOOLKIT_GTK="#"
|
||||
if test "x$TOOLKIT" = "xGTK" ; then
|
||||
COND_TOOLKIT_GTK=
|
||||
fi
|
||||
AC_SUBST(COND_WXUNIV_1)
|
||||
dnl ### begin block COND_WXUSE_LIBTIFF_BUILTIN ###
|
||||
COND_WXUSE_LIBTIFF_BUILTIN="#"
|
||||
if test "x$wxUSE_LIBTIFF" = "xbuiltin" ; then
|
||||
COND_WXUSE_LIBTIFF_BUILTIN=
|
||||
AC_SUBST(COND_TOOLKIT_GTK)
|
||||
dnl ### begin block COND_TOOLKIT_MSW ###
|
||||
COND_TOOLKIT_MSW="#"
|
||||
if test "x$TOOLKIT" = "xMSW" ; then
|
||||
COND_TOOLKIT_MSW=
|
||||
fi
|
||||
AC_SUBST(COND_WXUSE_LIBTIFF_BUILTIN)
|
||||
dnl ### begin block COND_PLATFORM_UNIX_1 ###
|
||||
COND_PLATFORM_UNIX_1="#"
|
||||
if test "x$PLATFORM_UNIX" = "x1" ; then
|
||||
COND_PLATFORM_UNIX_1=
|
||||
AC_SUBST(COND_TOOLKIT_MSW)
|
||||
dnl ### begin block COND_TOOLKIT_MAC ###
|
||||
COND_TOOLKIT_MAC="#"
|
||||
if test "x$TOOLKIT" = "xMAC" ; then
|
||||
COND_TOOLKIT_MAC=
|
||||
fi
|
||||
AC_SUBST(COND_PLATFORM_UNIX_1)
|
||||
dnl ### begin block COND_PLATFORM_MACOSX_1 ###
|
||||
COND_PLATFORM_MACOSX_1="#"
|
||||
if test "x$PLATFORM_MACOSX" = "x1" ; then
|
||||
COND_PLATFORM_MACOSX_1=
|
||||
fi
|
||||
AC_SUBST(COND_PLATFORM_MACOSX_1)
|
||||
dnl ### begin block COND_PLATFORM_WIN32_1 ###
|
||||
COND_PLATFORM_WIN32_1="#"
|
||||
if test "x$PLATFORM_WIN32" = "x1" ; then
|
||||
COND_PLATFORM_WIN32_1=
|
||||
fi
|
||||
AC_SUBST(COND_PLATFORM_WIN32_1)
|
||||
AC_SUBST(COND_TOOLKIT_MAC)
|
||||
dnl ### begin block COND_USE_SOVERSION_1_PLATFORM_MACOSX_0 ###
|
||||
COND_USE_SOVERSION_1_PLATFORM_MACOSX_0="#"
|
||||
if test "x$USE_SOVERSION" = "x1" -a \
|
||||
@ -151,56 +85,101 @@ dnl ### begin block COND_USE_SOVERSION_1_PLATFORM_MACOSX_1 ###
|
||||
COND_USE_SOVERSION_1_PLATFORM_MACOSX_1=
|
||||
fi
|
||||
AC_SUBST(COND_USE_SOVERSION_1_PLATFORM_MACOSX_1)
|
||||
dnl ### begin block COND_PLATFORM_WIN32_0 ###
|
||||
COND_PLATFORM_WIN32_0="#"
|
||||
if test "x$PLATFORM_WIN32" = "x0" ; then
|
||||
COND_PLATFORM_WIN32_0=
|
||||
dnl ### begin block COND_PLATFORM_WIN32_1 ###
|
||||
COND_PLATFORM_WIN32_1="#"
|
||||
if test "x$PLATFORM_WIN32" = "x1" ; then
|
||||
COND_PLATFORM_WIN32_1=
|
||||
fi
|
||||
AC_SUBST(COND_PLATFORM_WIN32_0)
|
||||
dnl ### begin block COND_MONOLITHIC_1 ###
|
||||
COND_MONOLITHIC_1="#"
|
||||
if test "x$MONOLITHIC" = "x1" ; then
|
||||
COND_MONOLITHIC_1=
|
||||
AC_SUBST(COND_PLATFORM_WIN32_1)
|
||||
dnl ### begin block COND_SHARED_0_USE_GUI_1_MONOLITHIC_0 ###
|
||||
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
|
||||
AC_SUBST(COND_MONOLITHIC_1)
|
||||
AC_SUBST(COND_SHARED_0_USE_GUI_1_MONOLITHIC_0)
|
||||
dnl ### begin block COND_PLATFORM_UNIX_1 ###
|
||||
COND_PLATFORM_UNIX_1="#"
|
||||
if test "x$PLATFORM_UNIX" = "x1" ; then
|
||||
COND_PLATFORM_UNIX_1=
|
||||
fi
|
||||
AC_SUBST(COND_PLATFORM_UNIX_1)
|
||||
dnl ### begin block COND_PLATFORM_MACOSX_1 ###
|
||||
COND_PLATFORM_MACOSX_1="#"
|
||||
if test "x$PLATFORM_MACOSX" = "x1" ; then
|
||||
COND_PLATFORM_MACOSX_1=
|
||||
fi
|
||||
AC_SUBST(COND_PLATFORM_MACOSX_1)
|
||||
dnl ### begin block COND_WXUSE_LIBTIFF_BUILTIN ###
|
||||
COND_WXUSE_LIBTIFF_BUILTIN="#"
|
||||
if test "x$wxUSE_LIBTIFF" = "xbuiltin" ; then
|
||||
COND_WXUSE_LIBTIFF_BUILTIN=
|
||||
fi
|
||||
AC_SUBST(COND_WXUSE_LIBTIFF_BUILTIN)
|
||||
dnl ### begin block COND_SHARED_1_USE_GUI_1_MONOLITHIC_0 ###
|
||||
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
|
||||
AC_SUBST(COND_SHARED_1_USE_GUI_1_MONOLITHIC_0)
|
||||
dnl ### begin block COND_MONOLITHIC_0 ###
|
||||
COND_MONOLITHIC_0="#"
|
||||
if test "x$MONOLITHIC" = "x0" ; then
|
||||
COND_MONOLITHIC_0=
|
||||
fi
|
||||
AC_SUBST(COND_MONOLITHIC_0)
|
||||
dnl ### begin block COND_USE_GUI_1 ###
|
||||
COND_USE_GUI_1="#"
|
||||
if test "x$USE_GUI" = "x1" ; then
|
||||
COND_USE_GUI_1=
|
||||
dnl ### begin block COND_WXUSE_REGEX_BUILTIN ###
|
||||
COND_WXUSE_REGEX_BUILTIN="#"
|
||||
if test "x$wxUSE_REGEX" = "xbuiltin" ; then
|
||||
COND_WXUSE_REGEX_BUILTIN=
|
||||
fi
|
||||
AC_SUBST(COND_USE_GUI_1)
|
||||
dnl ### begin block COND_DEPS_TYPE_GCC ###
|
||||
COND_DEPS_TYPE_GCC="#"
|
||||
if test "x$DEPS_TYPE" = "xgcc" ; then
|
||||
COND_DEPS_TYPE_GCC=
|
||||
AC_SUBST(COND_WXUSE_REGEX_BUILTIN)
|
||||
dnl ### begin block COND_TOOLKIT_MOTIF ###
|
||||
COND_TOOLKIT_MOTIF="#"
|
||||
if test "x$TOOLKIT" = "xMOTIF" ; then
|
||||
COND_TOOLKIT_MOTIF=
|
||||
fi
|
||||
AC_SUBST(COND_DEPS_TYPE_GCC)
|
||||
AC_SUBST(COND_TOOLKIT_MOTIF)
|
||||
dnl ### begin block COND_TOOLKIT_COCOA ###
|
||||
COND_TOOLKIT_COCOA="#"
|
||||
if test "x$TOOLKIT" = "xCOCOA" ; then
|
||||
COND_TOOLKIT_COCOA=
|
||||
fi
|
||||
AC_SUBST(COND_TOOLKIT_COCOA)
|
||||
dnl ### begin block COND_TOOLKIT_OS2 ###
|
||||
COND_TOOLKIT_OS2="#"
|
||||
if test "x$TOOLKIT" = "xOS2" ; then
|
||||
COND_TOOLKIT_OS2=
|
||||
fi
|
||||
AC_SUBST(COND_TOOLKIT_OS2)
|
||||
dnl ### begin block COND_WXUNIV_1 ###
|
||||
COND_WXUNIV_1="#"
|
||||
if test "x$WXUNIV" = "x1" ; then
|
||||
COND_WXUNIV_1=
|
||||
fi
|
||||
AC_SUBST(COND_WXUNIV_1)
|
||||
dnl ### begin block COND_WXUSE_LIBJPEG_BUILTIN ###
|
||||
COND_WXUSE_LIBJPEG_BUILTIN="#"
|
||||
if test "x$wxUSE_LIBJPEG" = "xbuiltin" ; then
|
||||
COND_WXUSE_LIBJPEG_BUILTIN=
|
||||
fi
|
||||
AC_SUBST(COND_WXUSE_LIBJPEG_BUILTIN)
|
||||
dnl ### begin block COND_USE_GUI_0 ###
|
||||
COND_USE_GUI_0="#"
|
||||
if test "x$USE_GUI" = "x0" ; then
|
||||
COND_USE_GUI_0=
|
||||
fi
|
||||
AC_SUBST(COND_USE_GUI_0)
|
||||
dnl ### begin block COND_USE_GUI_1_WXUNIV_0 ###
|
||||
COND_USE_GUI_1_WXUNIV_0="#"
|
||||
if test "x$USE_GUI" = "x1" -a \
|
||||
"x$WXUNIV" = "x0" ; then
|
||||
COND_USE_GUI_1_WXUNIV_0=
|
||||
dnl ### begin block COND_SHARED_1_MONOLITHIC_1 ###
|
||||
COND_SHARED_1_MONOLITHIC_1="#"
|
||||
if test "x$SHARED" = "x1" -a \
|
||||
"x$MONOLITHIC" = "x1" ; then
|
||||
COND_SHARED_1_MONOLITHIC_1=
|
||||
fi
|
||||
AC_SUBST(COND_USE_GUI_1_WXUNIV_0)
|
||||
dnl ### begin block COND_USE_GUI_1_WXUNIV_1 ###
|
||||
COND_USE_GUI_1_WXUNIV_1="#"
|
||||
if test "x$USE_GUI" = "x1" -a \
|
||||
"x$WXUNIV" = "x1" ; then
|
||||
COND_USE_GUI_1_WXUNIV_1=
|
||||
fi
|
||||
AC_SUBST(COND_USE_GUI_1_WXUNIV_1)
|
||||
AC_SUBST(COND_SHARED_1_MONOLITHIC_1)
|
||||
dnl ### begin block COND_SHARED_0_MONOLITHIC_1 ###
|
||||
COND_SHARED_0_MONOLITHIC_1="#"
|
||||
if test "x$SHARED" = "x0" -a \
|
||||
@ -220,21 +199,72 @@ dnl ### begin block COND_USE_SOVERSOLARIS_1 ###
|
||||
COND_USE_SOVERSOLARIS_1=
|
||||
fi
|
||||
AC_SUBST(COND_USE_SOVERSOLARIS_1)
|
||||
dnl ### begin block COND_USE_GUI_1_WXUNIV_0 ###
|
||||
COND_USE_GUI_1_WXUNIV_0="#"
|
||||
if test "x$USE_GUI" = "x1" -a \
|
||||
"x$WXUNIV" = "x0" ; then
|
||||
COND_USE_GUI_1_WXUNIV_0=
|
||||
fi
|
||||
AC_SUBST(COND_USE_GUI_1_WXUNIV_0)
|
||||
dnl ### begin block COND_USE_GUI_1_WXUNIV_1 ###
|
||||
COND_USE_GUI_1_WXUNIV_1="#"
|
||||
if test "x$USE_GUI" = "x1" -a \
|
||||
"x$WXUNIV" = "x1" ; then
|
||||
COND_USE_GUI_1_WXUNIV_1=
|
||||
fi
|
||||
AC_SUBST(COND_USE_GUI_1_WXUNIV_1)
|
||||
dnl ### begin block COND_UNICODE_1 ###
|
||||
COND_UNICODE_1="#"
|
||||
if test "x$UNICODE" = "x1" ; then
|
||||
COND_UNICODE_1=
|
||||
fi
|
||||
AC_SUBST(COND_UNICODE_1)
|
||||
dnl ### begin block COND_PLATFORM_WIN32_0 ###
|
||||
COND_PLATFORM_WIN32_0="#"
|
||||
if test "x$PLATFORM_WIN32" = "x0" ; then
|
||||
COND_PLATFORM_WIN32_0=
|
||||
fi
|
||||
AC_SUBST(COND_PLATFORM_WIN32_0)
|
||||
dnl ### begin block COND_MONOLITHIC_1 ###
|
||||
COND_MONOLITHIC_1="#"
|
||||
if test "x$MONOLITHIC" = "x1" ; then
|
||||
COND_MONOLITHIC_1=
|
||||
fi
|
||||
AC_SUBST(COND_MONOLITHIC_1)
|
||||
dnl ### begin block COND_SHARED_0_MONOLITHIC_0 ###
|
||||
COND_SHARED_0_MONOLITHIC_0="#"
|
||||
if test "x$SHARED" = "x0" -a \
|
||||
"x$MONOLITHIC" = "x0" ; then
|
||||
COND_SHARED_0_MONOLITHIC_0=
|
||||
fi
|
||||
AC_SUBST(COND_SHARED_0_MONOLITHIC_0)
|
||||
dnl ### begin block COND_BUILD_DEBUG ###
|
||||
COND_BUILD_DEBUG="#"
|
||||
if test "x$BUILD" = "xdebug" ; then
|
||||
COND_BUILD_DEBUG=
|
||||
fi
|
||||
AC_SUBST(COND_BUILD_DEBUG)
|
||||
dnl ### begin block COND_DEPS_TYPE_GCC ###
|
||||
COND_DEPS_TYPE_GCC="#"
|
||||
if test "x$DEPS_TYPE" = "xgcc" ; then
|
||||
COND_DEPS_TYPE_GCC=
|
||||
fi
|
||||
AC_SUBST(COND_DEPS_TYPE_GCC)
|
||||
dnl ### begin block COND_PLATFORM_MAC_1 ###
|
||||
COND_PLATFORM_MAC_1="#"
|
||||
if test "x$PLATFORM_MAC" = "x1" ; then
|
||||
COND_PLATFORM_MAC_1=
|
||||
fi
|
||||
AC_SUBST(COND_PLATFORM_MAC_1)
|
||||
dnl ### begin block COND_SHARED_0 ###
|
||||
COND_SHARED_0="#"
|
||||
if test "x$SHARED" = "x0" ; then
|
||||
COND_SHARED_0=
|
||||
fi
|
||||
AC_SUBST(COND_SHARED_0)
|
||||
dnl ### begin block COND_SHARED_1 ###
|
||||
COND_SHARED_1="#"
|
||||
if test "x$SHARED" = "x1" ; then
|
||||
COND_SHARED_1=
|
||||
fi
|
||||
AC_SUBST(COND_SHARED_1)
|
||||
dnl ### begin block COND_SHARED_0 ###
|
||||
COND_SHARED_0="#"
|
||||
if test "x$SHARED" = "x0" ; then
|
||||
COND_SHARED_0=
|
||||
fi
|
||||
AC_SUBST(COND_SHARED_0)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user