bk-deps fixes and win32
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21455 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
6658
Makefile.in
6658
Makefile.in
File diff suppressed because it is too large
Load Diff
19
aclocal.m4
vendored
19
aclocal.m4
vendored
@@ -1506,8 +1506,16 @@ if test \$DEPSMODE = gcc ; then
|
||||
done
|
||||
depfile=\`basename \$srcfile | sed -e 's/\..*$/.d/g'\`
|
||||
depobjname=\`echo \$depfile |sed -e 's/\.d/.o/g'\`
|
||||
sed -e "s,\$depobjname:,\$objfile:,g" \$depfile >\${DEPSDIR}/\${objfile}.d
|
||||
rm -f \$depfile
|
||||
if test -f \$depfile ; then
|
||||
sed -e "s,\$depobjname:,\$objfile:,g" \$depfile >\${DEPSDIR}/\${objfile}.d
|
||||
rm -f \$depfile
|
||||
else
|
||||
depfile=\`basename \$objfile | sed -e 's/\..*$/.d/g'\`
|
||||
if test -f \$depfile ; then
|
||||
sed -e "s,\$depobjname:,\$objfile:,g" \$depfile >\${DEPSDIR}/\${objfile}.d
|
||||
rm -f \$depfile
|
||||
fi
|
||||
fi
|
||||
exit 0
|
||||
else
|
||||
\${*}
|
||||
@@ -1552,6 +1560,13 @@ AC_DEFUN(AC_BAKEFILE_CHECK_BASIC_STUFF,
|
||||
;;
|
||||
esac
|
||||
AC_SUBST(INSTALL_DIR)
|
||||
|
||||
LDFLAGS_GUI=
|
||||
case ${host} in
|
||||
*-*-cygwin* | *-*-mingw32* )
|
||||
LDFLAGS_GUI="-Wl,--subsystem,windows -mwindows"
|
||||
esac
|
||||
AC_SUBST(LDFLAGS_GUI)
|
||||
])
|
||||
|
||||
|
||||
|
||||
288
autoconf_inc.m4
288
autoconf_inc.m4
@@ -4,6 +4,138 @@ dnl Do not modify, all changes will be overwritten!
|
||||
|
||||
dnl Conditions:
|
||||
|
||||
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_DEPS_TRACKING_1 ###
|
||||
COND_DEPS_TRACKING_1="#"
|
||||
if test "x$DEPS_TRACKING" = "x1" ; then
|
||||
COND_DEPS_TRACKING_1=
|
||||
fi
|
||||
AC_SUBST(COND_DEPS_TRACKING_1)
|
||||
dnl ### begin block COND_DEPS_TRACKING_0 ###
|
||||
COND_DEPS_TRACKING_0="#"
|
||||
if test "x$DEPS_TRACKING" = "x0" ; then
|
||||
COND_DEPS_TRACKING_0=
|
||||
fi
|
||||
AC_SUBST(COND_DEPS_TRACKING_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_WIN32_1 ###
|
||||
COND_PLATFORM_WIN32_1="#"
|
||||
if test "x$PLATFORM_WIN32" = "x1" ; then
|
||||
COND_PLATFORM_WIN32_1=
|
||||
fi
|
||||
AC_SUBST(COND_PLATFORM_WIN32_1)
|
||||
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_BUILD_RELEASE ###
|
||||
COND_BUILD_RELEASE="#"
|
||||
if test "x$BUILD" = "xrelease" ; then
|
||||
COND_BUILD_RELEASE=
|
||||
fi
|
||||
AC_SUBST(COND_BUILD_RELEASE)
|
||||
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_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_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_ZLIB_BUILTIN ###
|
||||
COND_WXUSE_ZLIB_BUILTIN="#"
|
||||
if test "x$wxUSE_ZLIB" = "xbuiltin" ; then
|
||||
COND_WXUSE_ZLIB_BUILTIN=
|
||||
fi
|
||||
AC_SUBST(COND_WXUSE_ZLIB_BUILTIN)
|
||||
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_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_MAC ###
|
||||
COND_TOOLKIT_MAC="#"
|
||||
if test "x$TOOLKIT" = "xMAC" ; then
|
||||
COND_TOOLKIT_MAC=
|
||||
fi
|
||||
AC_SUBST(COND_TOOLKIT_MAC)
|
||||
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_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_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 ###
|
||||
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_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_1_MONOLITHIC_0 ###
|
||||
COND_SHARED_1_MONOLITHIC_0="#"
|
||||
if test "x$SHARED" = "x1" -a \
|
||||
@@ -11,36 +143,24 @@ dnl ### begin block COND_SHARED_1_MONOLITHIC_0 ###
|
||||
COND_SHARED_1_MONOLITHIC_0=
|
||||
fi
|
||||
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=
|
||||
dnl ### begin block COND_USE_SOVERLINUX_1 ###
|
||||
COND_USE_SOVERLINUX_1="#"
|
||||
if test "x$USE_SOVERLINUX" = "x1" ; then
|
||||
COND_USE_SOVERLINUX_1=
|
||||
fi
|
||||
AC_SUBST(COND_WXUSE_LIBPNG_BUILTIN)
|
||||
dnl ### begin block COND_WXUSE_ZLIB_BUILTIN ###
|
||||
COND_WXUSE_ZLIB_BUILTIN="#"
|
||||
if test "x$wxUSE_ZLIB" = "xbuiltin" ; then
|
||||
COND_WXUSE_ZLIB_BUILTIN=
|
||||
AC_SUBST(COND_USE_SOVERLINUX_1)
|
||||
dnl ### begin block COND_USE_SOVERSOLARIS_1 ###
|
||||
COND_USE_SOVERSOLARIS_1="#"
|
||||
if test "x$USE_SOVERSOLARIS" = "x1" ; then
|
||||
COND_USE_SOVERSOLARIS_1=
|
||||
fi
|
||||
AC_SUBST(COND_WXUSE_ZLIB_BUILTIN)
|
||||
AC_SUBST(COND_USE_SOVERSOLARIS_1)
|
||||
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_X11 ###
|
||||
COND_TOOLKIT_X11="#"
|
||||
if test "x$TOOLKIT" = "xX11" ; then
|
||||
@@ -65,12 +185,6 @@ dnl ### begin block COND_TOOLKIT_MSW ###
|
||||
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_USE_SOVERSION_1_PLATFORM_MACOSX_0 ###
|
||||
COND_USE_SOVERSION_1_PLATFORM_MACOSX_0="#"
|
||||
if test "x$USE_SOVERSION" = "x1" -a \
|
||||
@@ -85,12 +199,12 @@ 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_1 ###
|
||||
COND_PLATFORM_WIN32_1="#"
|
||||
if test "x$PLATFORM_WIN32" = "x1" ; then
|
||||
COND_PLATFORM_WIN32_1=
|
||||
dnl ### begin block COND_USE_SOVERSION_0 ###
|
||||
COND_USE_SOVERSION_0="#"
|
||||
if test "x$USE_SOVERSION" = "x0" ; then
|
||||
COND_USE_SOVERSION_0=
|
||||
fi
|
||||
AC_SUBST(COND_PLATFORM_WIN32_1)
|
||||
AC_SUBST(COND_USE_SOVERSION_0)
|
||||
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 \
|
||||
@@ -99,24 +213,12 @@ dnl ### begin block COND_SHARED_0_USE_GUI_1_MONOLITHIC_0 ###
|
||||
COND_SHARED_0_USE_GUI_1_MONOLITHIC_0=
|
||||
fi
|
||||
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 \
|
||||
@@ -125,18 +227,6 @@ dnl ### begin block COND_SHARED_1_USE_GUI_1_MONOLITHIC_0 ###
|
||||
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_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_TOOLKIT_MOTIF ###
|
||||
COND_TOOLKIT_MOTIF="#"
|
||||
if test "x$TOOLKIT" = "xMOTIF" ; then
|
||||
@@ -155,24 +245,6 @@ dnl ### begin block COND_TOOLKIT_OS2 ###
|
||||
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_SHARED_1_MONOLITHIC_1 ###
|
||||
COND_SHARED_1_MONOLITHIC_1="#"
|
||||
if test "x$SHARED" = "x1" -a \
|
||||
@@ -187,18 +259,6 @@ dnl ### begin block COND_SHARED_0_MONOLITHIC_1 ###
|
||||
COND_SHARED_0_MONOLITHIC_1=
|
||||
fi
|
||||
AC_SUBST(COND_SHARED_0_MONOLITHIC_1)
|
||||
dnl ### begin block COND_USE_SOVERLINUX_1 ###
|
||||
COND_USE_SOVERLINUX_1="#"
|
||||
if test "x$USE_SOVERLINUX" = "x1" ; then
|
||||
COND_USE_SOVERLINUX_1=
|
||||
fi
|
||||
AC_SUBST(COND_USE_SOVERLINUX_1)
|
||||
dnl ### begin block COND_USE_SOVERSOLARIS_1 ###
|
||||
COND_USE_SOVERSOLARIS_1="#"
|
||||
if test "x$USE_SOVERSOLARIS" = "x1" ; then
|
||||
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 \
|
||||
@@ -213,24 +273,6 @@ 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_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 \
|
||||
@@ -238,45 +280,9 @@ dnl ### begin block COND_SHARED_0_MONOLITHIC_0 ###
|
||||
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_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)
|
||||
dnl ### begin block COND_DEPS_TRACKING_1 ###
|
||||
COND_DEPS_TRACKING_1="#"
|
||||
if test "x$DEPS_TRACKING" = "x1" ; then
|
||||
COND_DEPS_TRACKING_1=
|
||||
fi
|
||||
AC_SUBST(COND_DEPS_TRACKING_1)
|
||||
dnl ### begin block COND_DEPS_TRACKING_0 ###
|
||||
COND_DEPS_TRACKING_0="#"
|
||||
if test "x$DEPS_TRACKING" = "x0" ; then
|
||||
COND_DEPS_TRACKING_0=
|
||||
fi
|
||||
AC_SUBST(COND_DEPS_TRACKING_0)
|
||||
|
||||
292
configure
vendored
292
configure
vendored
@@ -311,7 +311,7 @@ ac_includes_default="\
|
||||
# include <unistd.h>
|
||||
#endif"
|
||||
|
||||
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP CXX CXXFLAGS ac_ct_CXX RANLIB ac_ct_RANLIB AR INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA STRIP IF_GNU_MAKE YACC LEX LEXLIB LEX_OUTPUT_ROOT LN_S CXXCPP PKG_CONFIG GTK_CFLAGS GTK_LIBS GTK_CONFIG PANGOFT2_CFLAGS PANGOFT2_LIBS X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS PANGOX_CFLAGS PANGOX_LIBS PANGOXFT_CFLAGS PANGOXFT_LIBS AIX_CXX_LD RESCOMP DEREZ SETFILE LIBICONV wxUSE_ZLIB wxUSE_REGEX wxUSE_ODBC wxUSE_LIBJPEG wxUSE_LIBPNG wxUSE_LIBTIFF WXUNIV MONOLITHIC EXTRALIBS UNICODE BUILD SHARED TOOLKIT_LOWERCASE TOOLKIT_VERSION SAMPLES_RPATH_FLAG SET_MAKE MAKE_SET INSTALL_DIR PLATFORM_UNIX PLATFORM_WIN32 PLATFORM_MSDOS PLATFORM_MAC PLATFORM_MACOSX SO_SUFFIX DLLPREFIX SHARED_LD_CC SHARED_LD_CXX PIC_FLAG USE_SOVERSION USE_SOVERLINUX USE_SOVERSOLARIS USE_MACVERSION USE_SOSYMLINKS SONAME_FLAG DEPS_TRACKING COND_SHARED_1_MONOLITHIC_0 COND_WXUSE_LIBPNG_BUILTIN COND_WXUSE_ZLIB_BUILTIN COND_USE_SOSYMLINKS_1 COND_USE_GUI_1 COND_WXUSE_ODBC_BUILTIN COND_TOOLKIT_X11 COND_TOOLKIT_MGL COND_TOOLKIT_GTK COND_TOOLKIT_MSW COND_TOOLKIT_MAC COND_USE_SOVERSION_1_PLATFORM_MACOSX_0 COND_USE_SOVERSION_1_PLATFORM_MACOSX_1 COND_PLATFORM_WIN32_1 COND_SHARED_0_USE_GUI_1_MONOLITHIC_0 COND_PLATFORM_UNIX_1 COND_PLATFORM_MACOSX_1 COND_WXUSE_LIBTIFF_BUILTIN COND_SHARED_1_USE_GUI_1_MONOLITHIC_0 COND_MONOLITHIC_0 COND_WXUSE_REGEX_BUILTIN COND_TOOLKIT_MOTIF COND_TOOLKIT_COCOA COND_TOOLKIT_OS2 COND_WXUNIV_1 COND_WXUSE_LIBJPEG_BUILTIN COND_USE_GUI_0 COND_SHARED_1_MONOLITHIC_1 COND_SHARED_0_MONOLITHIC_1 COND_USE_SOVERLINUX_1 COND_USE_SOVERSOLARIS_1 COND_USE_GUI_1_WXUNIV_0 COND_USE_GUI_1_WXUNIV_1 COND_UNICODE_1 COND_PLATFORM_WIN32_0 COND_MONOLITHIC_1 COND_SHARED_0_MONOLITHIC_0 COND_BUILD_DEBUG COND_DEPS_TYPE_GCC COND_PLATFORM_MAC_1 COND_SHARED_1 COND_SHARED_0 COND_DEPS_TRACKING_1 COND_DEPS_TRACKING_0 LEX_STEM PATH_IFS WX_MAJOR_VERSION_NUMBER WX_MINOR_VERSION_NUMBER WX_RELEASE_NUMBER WX_LIBRARY_NAME_STATIC WX_LIBRARY_NAME_SHARED WX_LIBRARY_BASENAME WX_LIBRARY_IMPORTLIB WX_TARGET_LIBRARY WX_LIBRARY_LINK1 WX_LIBRARY_LINK2 PROGRAM_EXT WX_LIBRARY_NAME_STATIC_GL WX_LIBRARY_NAME_SHARED_GL WX_TARGET_LIBRARY_GL WX_LIBRARY_LINK1_GL WX_LIBRARY_LINK2_GL WX_ALL WX_ALL_INSTALLED SHARED_LD CODE_GEN_FLAGS CODE_GEN_FLAGS_CXX WX_TARGET_LIBRARY_TYPE STATIC_FLAG WXDEBUG_DEFINE USE_GUI AFMINSTALL WIN32INSTALL TOOLKIT TOOLKIT_DIR TOOLKIT_VPATH TOOLCHAIN_NAME TOOLCHAIN_DEFS TOOLCHAIN_DLL_DEFS top_builddir_wxconfig cross_compiling WXCONFIG_LIBS WXCONFIG_LIBS_GL WXCONFIG_LIBS_STATIC WXCONFIG_LIBS_STATIC_GL WXCONFIG_INCLUDE WXCONFIG_RPATH WX_LARGEFILE_FLAGS ALL_OBJECTS ALL_HEADERS ALL_SOURCES GUIDIST PORT_FILES DISTDIR SAMPLES_SUBDIRS LDFLAGS_GL LDFLAGS_VERSIONING LDFLAGS_EXE OPENGL_LIBS DMALLOC_LIBS WX_VERSION_TAG RESFLAGS RESPROGRAMOBJ WX_RESOURCES_MACOSX_ASCII WX_RESOURCES_MACOSX_DATA MACOSX_BUNDLE LIBWXMACRES MACRESCOMP MACSETFILE MACRESWXCONFIG GCC DLLTOOL AS NM LD MAKEINFO INSTALL_LIBRARY ESD_LINK LIBOBJS LTLIBOBJS'
|
||||
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP CXX CXXFLAGS ac_ct_CXX RANLIB ac_ct_RANLIB AR INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA STRIP IF_GNU_MAKE YACC LEX LEXLIB LEX_OUTPUT_ROOT LN_S CXXCPP PKG_CONFIG GTK_CFLAGS GTK_LIBS GTK_CONFIG PANGOFT2_CFLAGS PANGOFT2_LIBS X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS PANGOX_CFLAGS PANGOX_LIBS PANGOXFT_CFLAGS PANGOXFT_LIBS AIX_CXX_LD RESCOMP DEREZ SETFILE LIBICONV wxUSE_ZLIB wxUSE_REGEX wxUSE_ODBC wxUSE_LIBJPEG wxUSE_LIBPNG wxUSE_LIBTIFF WXUNIV MONOLITHIC EXTRALIBS UNICODE BUILD SHARED TOOLKIT_LOWERCASE TOOLKIT_VERSION SAMPLES_RPATH_FLAG SET_MAKE MAKE_SET INSTALL_DIR LDFLAGS_GUI PLATFORM_UNIX PLATFORM_WIN32 PLATFORM_MSDOS PLATFORM_MAC PLATFORM_MACOSX SO_SUFFIX DLLPREFIX SHARED_LD_CC SHARED_LD_CXX PIC_FLAG USE_SOVERSION USE_SOVERLINUX USE_SOVERSOLARIS USE_MACVERSION USE_SOSYMLINKS SONAME_FLAG DEPS_TRACKING COND_UNICODE_1 COND_BUILD_DEBUG COND_WXUSE_REGEX_BUILTIN COND_DEPS_TRACKING_1 COND_DEPS_TRACKING_0 COND_PLATFORM_UNIX_1 COND_PLATFORM_WIN32_1 COND_WXUSE_LIBPNG_BUILTIN COND_BUILD_RELEASE COND_WXUSE_LIBTIFF_BUILTIN COND_WXUSE_LIBJPEG_BUILTIN COND_WXUNIV_1 COND_WXUSE_ZLIB_BUILTIN COND_PLATFORM_MAC_1 COND_WXUSE_ODBC_BUILTIN COND_TOOLKIT_MAC COND_MONOLITHIC_0 COND_PLATFORM_WIN32_0 COND_MONOLITHIC_1 COND_USE_GUI_0 COND_USE_GUI_1 COND_SHARED_1 COND_SHARED_1_MONOLITHIC_0 COND_USE_SOVERLINUX_1 COND_USE_SOVERSOLARIS_1 COND_USE_SOSYMLINKS_1 COND_TOOLKIT_X11 COND_TOOLKIT_MGL COND_TOOLKIT_GTK COND_TOOLKIT_MSW COND_USE_SOVERSION_1_PLATFORM_MACOSX_0 COND_USE_SOVERSION_1_PLATFORM_MACOSX_1 COND_USE_SOVERSION_0 COND_SHARED_0_USE_GUI_1_MONOLITHIC_0 COND_PLATFORM_MACOSX_1 COND_SHARED_1_USE_GUI_1_MONOLITHIC_0 COND_TOOLKIT_MOTIF COND_TOOLKIT_COCOA COND_TOOLKIT_OS2 COND_SHARED_1_MONOLITHIC_1 COND_SHARED_0_MONOLITHIC_1 COND_USE_GUI_1_WXUNIV_0 COND_USE_GUI_1_WXUNIV_1 COND_SHARED_0_MONOLITHIC_0 COND_SHARED_0 LEX_STEM PATH_IFS WX_MAJOR_VERSION_NUMBER WX_MINOR_VERSION_NUMBER WX_RELEASE_NUMBER WX_LIBRARY_NAME_STATIC WX_LIBRARY_NAME_SHARED WX_LIBRARY_BASENAME WX_LIBRARY_IMPORTLIB WX_TARGET_LIBRARY WX_LIBRARY_LINK1 WX_LIBRARY_LINK2 PROGRAM_EXT WX_LIBRARY_NAME_STATIC_GL WX_LIBRARY_NAME_SHARED_GL WX_TARGET_LIBRARY_GL WX_LIBRARY_LINK1_GL WX_LIBRARY_LINK2_GL WX_ALL WX_ALL_INSTALLED SHARED_LD CODE_GEN_FLAGS CODE_GEN_FLAGS_CXX WX_TARGET_LIBRARY_TYPE STATIC_FLAG WXDEBUG_DEFINE USE_GUI AFMINSTALL WIN32INSTALL TOOLKIT TOOLKIT_DIR TOOLKIT_VPATH TOOLCHAIN_NAME TOOLCHAIN_DEFS TOOLCHAIN_DLL_DEFS top_builddir_wxconfig cross_compiling WXCONFIG_LIBS WXCONFIG_LIBS_GL WXCONFIG_LIBS_STATIC WXCONFIG_LIBS_STATIC_GL WXCONFIG_INCLUDE WXCONFIG_RPATH WX_LARGEFILE_FLAGS ALL_OBJECTS ALL_HEADERS ALL_SOURCES GUIDIST PORT_FILES DISTDIR SAMPLES_SUBDIRS LDFLAGS_GL LDFLAGS_VERSIONING LDFLAGS_EXE OPENGL_LIBS DMALLOC_LIBS WX_VERSION_TAG RESFLAGS RESPROGRAMOBJ WX_RESOURCES_MACOSX_ASCII WX_RESOURCES_MACOSX_DATA MACOSX_BUNDLE LIBWXMACRES MACRESCOMP MACSETFILE MACRESWXCONFIG GCC DLLTOOL AS NM LD MAKEINFO INSTALL_LIBRARY ESD_LINK LIBOBJS LTLIBOBJS'
|
||||
ac_subst_files=''
|
||||
|
||||
# Initialize some variables set by options.
|
||||
@@ -19417,8 +19417,6 @@ if test "$wxUSE_GUI" = "yes"; then
|
||||
if test "$wxUSE_MSW" = 1 ; then
|
||||
TOOLKIT=MSW
|
||||
GUIDIST=MSW_DIST
|
||||
|
||||
LDFLAGS="$LDFLAGS -Wl,--subsystem,windows -mwindows"
|
||||
fi
|
||||
|
||||
if test "$wxUSE_GTK" = 1; then
|
||||
@@ -33736,6 +33734,13 @@ fi
|
||||
esac
|
||||
|
||||
|
||||
LDFLAGS_GUI=
|
||||
case ${host} in
|
||||
*-*-cygwin* | *-*-mingw32* )
|
||||
LDFLAGS_GUI="-Wl,--subsystem,windows -mwindows"
|
||||
esac
|
||||
|
||||
|
||||
fi
|
||||
|
||||
echo "$as_me:$LINENO: checking if make is GNU make" >&5
|
||||
@@ -34172,8 +34177,16 @@ if test \$DEPSMODE = gcc ; then
|
||||
done
|
||||
depfile=\`basename \$srcfile | sed -e 's/\..*$/.d/g'\`
|
||||
depobjname=\`echo \$depfile |sed -e 's/\.d/.o/g'\`
|
||||
sed -e "s,\$depobjname:,\$objfile:,g" \$depfile >\${DEPSDIR}/\${objfile}.d
|
||||
rm -f \$depfile
|
||||
if test -f \$depfile ; then
|
||||
sed -e "s,\$depobjname:,\$objfile:,g" \$depfile >\${DEPSDIR}/\${objfile}.d
|
||||
rm -f \$depfile
|
||||
else
|
||||
depfile=\`basename \$objfile | sed -e 's/\..*$/.d/g'\`
|
||||
if test -f \$depfile ; then
|
||||
sed -e "s,\$depobjname:,\$objfile:,g" \$depfile >\${DEPSDIR}/\${objfile}.d
|
||||
rm -f \$depfile
|
||||
fi
|
||||
fi
|
||||
exit 0
|
||||
else
|
||||
\${*}
|
||||
@@ -34315,10 +34328,39 @@ fi
|
||||
|
||||
|
||||
|
||||
COND_SHARED_1_MONOLITHIC_0="#"
|
||||
if test "x$SHARED" = "x1" -a \
|
||||
"x$MONOLITHIC" = "x0" ; then
|
||||
COND_SHARED_1_MONOLITHIC_0=
|
||||
COND_UNICODE_1="#"
|
||||
if test "x$UNICODE" = "x1" ; then
|
||||
COND_UNICODE_1=
|
||||
fi
|
||||
|
||||
COND_BUILD_DEBUG="#"
|
||||
if test "x$BUILD" = "xdebug" ; then
|
||||
COND_BUILD_DEBUG=
|
||||
fi
|
||||
|
||||
COND_WXUSE_REGEX_BUILTIN="#"
|
||||
if test "x$wxUSE_REGEX" = "xbuiltin" ; then
|
||||
COND_WXUSE_REGEX_BUILTIN=
|
||||
fi
|
||||
|
||||
COND_DEPS_TRACKING_1="#"
|
||||
if test "x$DEPS_TRACKING" = "x1" ; then
|
||||
COND_DEPS_TRACKING_1=
|
||||
fi
|
||||
|
||||
COND_DEPS_TRACKING_0="#"
|
||||
if test "x$DEPS_TRACKING" = "x0" ; then
|
||||
COND_DEPS_TRACKING_0=
|
||||
fi
|
||||
|
||||
COND_PLATFORM_UNIX_1="#"
|
||||
if test "x$PLATFORM_UNIX" = "x1" ; then
|
||||
COND_PLATFORM_UNIX_1=
|
||||
fi
|
||||
|
||||
COND_PLATFORM_WIN32_1="#"
|
||||
if test "x$PLATFORM_WIN32" = "x1" ; then
|
||||
COND_PLATFORM_WIN32_1=
|
||||
fi
|
||||
|
||||
COND_WXUSE_LIBPNG_BUILTIN="#"
|
||||
@@ -34326,14 +34368,64 @@ fi
|
||||
COND_WXUSE_LIBPNG_BUILTIN=
|
||||
fi
|
||||
|
||||
COND_BUILD_RELEASE="#"
|
||||
if test "x$BUILD" = "xrelease" ; then
|
||||
COND_BUILD_RELEASE=
|
||||
fi
|
||||
|
||||
COND_WXUSE_LIBTIFF_BUILTIN="#"
|
||||
if test "x$wxUSE_LIBTIFF" = "xbuiltin" ; then
|
||||
COND_WXUSE_LIBTIFF_BUILTIN=
|
||||
fi
|
||||
|
||||
COND_WXUSE_LIBJPEG_BUILTIN="#"
|
||||
if test "x$wxUSE_LIBJPEG" = "xbuiltin" ; then
|
||||
COND_WXUSE_LIBJPEG_BUILTIN=
|
||||
fi
|
||||
|
||||
COND_WXUNIV_1="#"
|
||||
if test "x$WXUNIV" = "x1" ; then
|
||||
COND_WXUNIV_1=
|
||||
fi
|
||||
|
||||
COND_WXUSE_ZLIB_BUILTIN="#"
|
||||
if test "x$wxUSE_ZLIB" = "xbuiltin" ; then
|
||||
COND_WXUSE_ZLIB_BUILTIN=
|
||||
fi
|
||||
|
||||
COND_USE_SOSYMLINKS_1="#"
|
||||
if test "x$USE_SOSYMLINKS" = "x1" ; then
|
||||
COND_USE_SOSYMLINKS_1=
|
||||
COND_PLATFORM_MAC_1="#"
|
||||
if test "x$PLATFORM_MAC" = "x1" ; then
|
||||
COND_PLATFORM_MAC_1=
|
||||
fi
|
||||
|
||||
COND_WXUSE_ODBC_BUILTIN="#"
|
||||
if test "x$wxUSE_ODBC" = "xbuiltin" ; then
|
||||
COND_WXUSE_ODBC_BUILTIN=
|
||||
fi
|
||||
|
||||
COND_TOOLKIT_MAC="#"
|
||||
if test "x$TOOLKIT" = "xMAC" ; then
|
||||
COND_TOOLKIT_MAC=
|
||||
fi
|
||||
|
||||
COND_MONOLITHIC_0="#"
|
||||
if test "x$MONOLITHIC" = "x0" ; then
|
||||
COND_MONOLITHIC_0=
|
||||
fi
|
||||
|
||||
COND_PLATFORM_WIN32_0="#"
|
||||
if test "x$PLATFORM_WIN32" = "x0" ; then
|
||||
COND_PLATFORM_WIN32_0=
|
||||
fi
|
||||
|
||||
COND_MONOLITHIC_1="#"
|
||||
if test "x$MONOLITHIC" = "x1" ; then
|
||||
COND_MONOLITHIC_1=
|
||||
fi
|
||||
|
||||
COND_USE_GUI_0="#"
|
||||
if test "x$USE_GUI" = "x0" ; then
|
||||
COND_USE_GUI_0=
|
||||
fi
|
||||
|
||||
COND_USE_GUI_1="#"
|
||||
@@ -34341,9 +34433,30 @@ fi
|
||||
COND_USE_GUI_1=
|
||||
fi
|
||||
|
||||
COND_WXUSE_ODBC_BUILTIN="#"
|
||||
if test "x$wxUSE_ODBC" = "xbuiltin" ; then
|
||||
COND_WXUSE_ODBC_BUILTIN=
|
||||
COND_SHARED_1="#"
|
||||
if test "x$SHARED" = "x1" ; then
|
||||
COND_SHARED_1=
|
||||
fi
|
||||
|
||||
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=
|
||||
fi
|
||||
|
||||
COND_USE_SOVERSOLARIS_1="#"
|
||||
if test "x$USE_SOVERSOLARIS" = "x1" ; then
|
||||
COND_USE_SOVERSOLARIS_1=
|
||||
fi
|
||||
|
||||
COND_USE_SOSYMLINKS_1="#"
|
||||
if test "x$USE_SOSYMLINKS" = "x1" ; then
|
||||
COND_USE_SOSYMLINKS_1=
|
||||
fi
|
||||
|
||||
COND_TOOLKIT_X11="#"
|
||||
@@ -34366,11 +34479,6 @@ fi
|
||||
COND_TOOLKIT_MSW=
|
||||
fi
|
||||
|
||||
COND_TOOLKIT_MAC="#"
|
||||
if test "x$TOOLKIT" = "xMAC" ; then
|
||||
COND_TOOLKIT_MAC=
|
||||
fi
|
||||
|
||||
COND_USE_SOVERSION_1_PLATFORM_MACOSX_0="#"
|
||||
if test "x$USE_SOVERSION" = "x1" -a \
|
||||
"x$PLATFORM_MACOSX" = "x0" ; then
|
||||
@@ -34383,9 +34491,9 @@ fi
|
||||
COND_USE_SOVERSION_1_PLATFORM_MACOSX_1=
|
||||
fi
|
||||
|
||||
COND_PLATFORM_WIN32_1="#"
|
||||
if test "x$PLATFORM_WIN32" = "x1" ; then
|
||||
COND_PLATFORM_WIN32_1=
|
||||
COND_USE_SOVERSION_0="#"
|
||||
if test "x$USE_SOVERSION" = "x0" ; then
|
||||
COND_USE_SOVERSION_0=
|
||||
fi
|
||||
|
||||
COND_SHARED_0_USE_GUI_1_MONOLITHIC_0="#"
|
||||
@@ -34395,21 +34503,11 @@ fi
|
||||
COND_SHARED_0_USE_GUI_1_MONOLITHIC_0=
|
||||
fi
|
||||
|
||||
COND_PLATFORM_UNIX_1="#"
|
||||
if test "x$PLATFORM_UNIX" = "x1" ; then
|
||||
COND_PLATFORM_UNIX_1=
|
||||
fi
|
||||
|
||||
COND_PLATFORM_MACOSX_1="#"
|
||||
if test "x$PLATFORM_MACOSX" = "x1" ; then
|
||||
COND_PLATFORM_MACOSX_1=
|
||||
fi
|
||||
|
||||
COND_WXUSE_LIBTIFF_BUILTIN="#"
|
||||
if test "x$wxUSE_LIBTIFF" = "xbuiltin" ; then
|
||||
COND_WXUSE_LIBTIFF_BUILTIN=
|
||||
fi
|
||||
|
||||
COND_SHARED_1_USE_GUI_1_MONOLITHIC_0="#"
|
||||
if test "x$SHARED" = "x1" -a \
|
||||
"x$USE_GUI" = "x1" -a \
|
||||
@@ -34417,16 +34515,6 @@ fi
|
||||
COND_SHARED_1_USE_GUI_1_MONOLITHIC_0=
|
||||
fi
|
||||
|
||||
COND_MONOLITHIC_0="#"
|
||||
if test "x$MONOLITHIC" = "x0" ; then
|
||||
COND_MONOLITHIC_0=
|
||||
fi
|
||||
|
||||
COND_WXUSE_REGEX_BUILTIN="#"
|
||||
if test "x$wxUSE_REGEX" = "xbuiltin" ; then
|
||||
COND_WXUSE_REGEX_BUILTIN=
|
||||
fi
|
||||
|
||||
COND_TOOLKIT_MOTIF="#"
|
||||
if test "x$TOOLKIT" = "xMOTIF" ; then
|
||||
COND_TOOLKIT_MOTIF=
|
||||
@@ -34442,21 +34530,6 @@ fi
|
||||
COND_TOOLKIT_OS2=
|
||||
fi
|
||||
|
||||
COND_WXUNIV_1="#"
|
||||
if test "x$WXUNIV" = "x1" ; then
|
||||
COND_WXUNIV_1=
|
||||
fi
|
||||
|
||||
COND_WXUSE_LIBJPEG_BUILTIN="#"
|
||||
if test "x$wxUSE_LIBJPEG" = "xbuiltin" ; then
|
||||
COND_WXUSE_LIBJPEG_BUILTIN=
|
||||
fi
|
||||
|
||||
COND_USE_GUI_0="#"
|
||||
if test "x$USE_GUI" = "x0" ; then
|
||||
COND_USE_GUI_0=
|
||||
fi
|
||||
|
||||
COND_SHARED_1_MONOLITHIC_1="#"
|
||||
if test "x$SHARED" = "x1" -a \
|
||||
"x$MONOLITHIC" = "x1" ; then
|
||||
@@ -34469,16 +34542,6 @@ fi
|
||||
COND_SHARED_0_MONOLITHIC_1=
|
||||
fi
|
||||
|
||||
COND_USE_SOVERLINUX_1="#"
|
||||
if test "x$USE_SOVERLINUX" = "x1" ; then
|
||||
COND_USE_SOVERLINUX_1=
|
||||
fi
|
||||
|
||||
COND_USE_SOVERSOLARIS_1="#"
|
||||
if test "x$USE_SOVERSOLARIS" = "x1" ; then
|
||||
COND_USE_SOVERSOLARIS_1=
|
||||
fi
|
||||
|
||||
COND_USE_GUI_1_WXUNIV_0="#"
|
||||
if test "x$USE_GUI" = "x1" -a \
|
||||
"x$WXUNIV" = "x0" ; then
|
||||
@@ -34491,62 +34554,17 @@ fi
|
||||
COND_USE_GUI_1_WXUNIV_1=
|
||||
fi
|
||||
|
||||
COND_UNICODE_1="#"
|
||||
if test "x$UNICODE" = "x1" ; then
|
||||
COND_UNICODE_1=
|
||||
fi
|
||||
|
||||
COND_PLATFORM_WIN32_0="#"
|
||||
if test "x$PLATFORM_WIN32" = "x0" ; then
|
||||
COND_PLATFORM_WIN32_0=
|
||||
fi
|
||||
|
||||
COND_MONOLITHIC_1="#"
|
||||
if test "x$MONOLITHIC" = "x1" ; then
|
||||
COND_MONOLITHIC_1=
|
||||
fi
|
||||
|
||||
COND_SHARED_0_MONOLITHIC_0="#"
|
||||
if test "x$SHARED" = "x0" -a \
|
||||
"x$MONOLITHIC" = "x0" ; then
|
||||
COND_SHARED_0_MONOLITHIC_0=
|
||||
fi
|
||||
|
||||
COND_BUILD_DEBUG="#"
|
||||
if test "x$BUILD" = "xdebug" ; then
|
||||
COND_BUILD_DEBUG=
|
||||
fi
|
||||
|
||||
COND_DEPS_TYPE_GCC="#"
|
||||
if test "x$DEPS_TYPE" = "xgcc" ; then
|
||||
COND_DEPS_TYPE_GCC=
|
||||
fi
|
||||
|
||||
COND_PLATFORM_MAC_1="#"
|
||||
if test "x$PLATFORM_MAC" = "x1" ; then
|
||||
COND_PLATFORM_MAC_1=
|
||||
fi
|
||||
|
||||
COND_SHARED_1="#"
|
||||
if test "x$SHARED" = "x1" ; then
|
||||
COND_SHARED_1=
|
||||
fi
|
||||
|
||||
COND_SHARED_0="#"
|
||||
if test "x$SHARED" = "x0" ; then
|
||||
COND_SHARED_0=
|
||||
fi
|
||||
|
||||
COND_DEPS_TRACKING_1="#"
|
||||
if test "x$DEPS_TRACKING" = "x1" ; then
|
||||
COND_DEPS_TRACKING_1=
|
||||
fi
|
||||
|
||||
COND_DEPS_TRACKING_0="#"
|
||||
if test "x$DEPS_TRACKING" = "x0" ; then
|
||||
COND_DEPS_TRACKING_0=
|
||||
fi
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -35424,6 +35442,7 @@ s,@SAMPLES_RPATH_FLAG@,$SAMPLES_RPATH_FLAG,;t t
|
||||
s,@SET_MAKE@,$SET_MAKE,;t t
|
||||
s,@MAKE_SET@,$MAKE_SET,;t t
|
||||
s,@INSTALL_DIR@,$INSTALL_DIR,;t t
|
||||
s,@LDFLAGS_GUI@,$LDFLAGS_GUI,;t t
|
||||
s,@PLATFORM_UNIX@,$PLATFORM_UNIX,;t t
|
||||
s,@PLATFORM_WIN32@,$PLATFORM_WIN32,;t t
|
||||
s,@PLATFORM_MSDOS@,$PLATFORM_MSDOS,;t t
|
||||
@@ -35441,50 +35460,51 @@ s,@USE_MACVERSION@,$USE_MACVERSION,;t t
|
||||
s,@USE_SOSYMLINKS@,$USE_SOSYMLINKS,;t t
|
||||
s,@SONAME_FLAG@,$SONAME_FLAG,;t t
|
||||
s,@DEPS_TRACKING@,$DEPS_TRACKING,;t t
|
||||
s,@COND_SHARED_1_MONOLITHIC_0@,$COND_SHARED_1_MONOLITHIC_0,;t t
|
||||
s,@COND_UNICODE_1@,$COND_UNICODE_1,;t t
|
||||
s,@COND_BUILD_DEBUG@,$COND_BUILD_DEBUG,;t t
|
||||
s,@COND_WXUSE_REGEX_BUILTIN@,$COND_WXUSE_REGEX_BUILTIN,;t t
|
||||
s,@COND_DEPS_TRACKING_1@,$COND_DEPS_TRACKING_1,;t t
|
||||
s,@COND_DEPS_TRACKING_0@,$COND_DEPS_TRACKING_0,;t t
|
||||
s,@COND_PLATFORM_UNIX_1@,$COND_PLATFORM_UNIX_1,;t t
|
||||
s,@COND_PLATFORM_WIN32_1@,$COND_PLATFORM_WIN32_1,;t t
|
||||
s,@COND_WXUSE_LIBPNG_BUILTIN@,$COND_WXUSE_LIBPNG_BUILTIN,;t t
|
||||
s,@COND_BUILD_RELEASE@,$COND_BUILD_RELEASE,;t t
|
||||
s,@COND_WXUSE_LIBTIFF_BUILTIN@,$COND_WXUSE_LIBTIFF_BUILTIN,;t t
|
||||
s,@COND_WXUSE_LIBJPEG_BUILTIN@,$COND_WXUSE_LIBJPEG_BUILTIN,;t t
|
||||
s,@COND_WXUNIV_1@,$COND_WXUNIV_1,;t t
|
||||
s,@COND_WXUSE_ZLIB_BUILTIN@,$COND_WXUSE_ZLIB_BUILTIN,;t t
|
||||
s,@COND_USE_SOSYMLINKS_1@,$COND_USE_SOSYMLINKS_1,;t t
|
||||
s,@COND_USE_GUI_1@,$COND_USE_GUI_1,;t t
|
||||
s,@COND_PLATFORM_MAC_1@,$COND_PLATFORM_MAC_1,;t t
|
||||
s,@COND_WXUSE_ODBC_BUILTIN@,$COND_WXUSE_ODBC_BUILTIN,;t t
|
||||
s,@COND_TOOLKIT_MAC@,$COND_TOOLKIT_MAC,;t t
|
||||
s,@COND_MONOLITHIC_0@,$COND_MONOLITHIC_0,;t t
|
||||
s,@COND_PLATFORM_WIN32_0@,$COND_PLATFORM_WIN32_0,;t t
|
||||
s,@COND_MONOLITHIC_1@,$COND_MONOLITHIC_1,;t t
|
||||
s,@COND_USE_GUI_0@,$COND_USE_GUI_0,;t t
|
||||
s,@COND_USE_GUI_1@,$COND_USE_GUI_1,;t t
|
||||
s,@COND_SHARED_1@,$COND_SHARED_1,;t t
|
||||
s,@COND_SHARED_1_MONOLITHIC_0@,$COND_SHARED_1_MONOLITHIC_0,;t t
|
||||
s,@COND_USE_SOVERLINUX_1@,$COND_USE_SOVERLINUX_1,;t t
|
||||
s,@COND_USE_SOVERSOLARIS_1@,$COND_USE_SOVERSOLARIS_1,;t t
|
||||
s,@COND_USE_SOSYMLINKS_1@,$COND_USE_SOSYMLINKS_1,;t t
|
||||
s,@COND_TOOLKIT_X11@,$COND_TOOLKIT_X11,;t t
|
||||
s,@COND_TOOLKIT_MGL@,$COND_TOOLKIT_MGL,;t t
|
||||
s,@COND_TOOLKIT_GTK@,$COND_TOOLKIT_GTK,;t t
|
||||
s,@COND_TOOLKIT_MSW@,$COND_TOOLKIT_MSW,;t t
|
||||
s,@COND_TOOLKIT_MAC@,$COND_TOOLKIT_MAC,;t t
|
||||
s,@COND_USE_SOVERSION_1_PLATFORM_MACOSX_0@,$COND_USE_SOVERSION_1_PLATFORM_MACOSX_0,;t t
|
||||
s,@COND_USE_SOVERSION_1_PLATFORM_MACOSX_1@,$COND_USE_SOVERSION_1_PLATFORM_MACOSX_1,;t t
|
||||
s,@COND_PLATFORM_WIN32_1@,$COND_PLATFORM_WIN32_1,;t t
|
||||
s,@COND_USE_SOVERSION_0@,$COND_USE_SOVERSION_0,;t t
|
||||
s,@COND_SHARED_0_USE_GUI_1_MONOLITHIC_0@,$COND_SHARED_0_USE_GUI_1_MONOLITHIC_0,;t t
|
||||
s,@COND_PLATFORM_UNIX_1@,$COND_PLATFORM_UNIX_1,;t t
|
||||
s,@COND_PLATFORM_MACOSX_1@,$COND_PLATFORM_MACOSX_1,;t t
|
||||
s,@COND_WXUSE_LIBTIFF_BUILTIN@,$COND_WXUSE_LIBTIFF_BUILTIN,;t t
|
||||
s,@COND_SHARED_1_USE_GUI_1_MONOLITHIC_0@,$COND_SHARED_1_USE_GUI_1_MONOLITHIC_0,;t t
|
||||
s,@COND_MONOLITHIC_0@,$COND_MONOLITHIC_0,;t t
|
||||
s,@COND_WXUSE_REGEX_BUILTIN@,$COND_WXUSE_REGEX_BUILTIN,;t t
|
||||
s,@COND_TOOLKIT_MOTIF@,$COND_TOOLKIT_MOTIF,;t t
|
||||
s,@COND_TOOLKIT_COCOA@,$COND_TOOLKIT_COCOA,;t t
|
||||
s,@COND_TOOLKIT_OS2@,$COND_TOOLKIT_OS2,;t t
|
||||
s,@COND_WXUNIV_1@,$COND_WXUNIV_1,;t t
|
||||
s,@COND_WXUSE_LIBJPEG_BUILTIN@,$COND_WXUSE_LIBJPEG_BUILTIN,;t t
|
||||
s,@COND_USE_GUI_0@,$COND_USE_GUI_0,;t t
|
||||
s,@COND_SHARED_1_MONOLITHIC_1@,$COND_SHARED_1_MONOLITHIC_1,;t t
|
||||
s,@COND_SHARED_0_MONOLITHIC_1@,$COND_SHARED_0_MONOLITHIC_1,;t t
|
||||
s,@COND_USE_SOVERLINUX_1@,$COND_USE_SOVERLINUX_1,;t t
|
||||
s,@COND_USE_SOVERSOLARIS_1@,$COND_USE_SOVERSOLARIS_1,;t t
|
||||
s,@COND_USE_GUI_1_WXUNIV_0@,$COND_USE_GUI_1_WXUNIV_0,;t t
|
||||
s,@COND_USE_GUI_1_WXUNIV_1@,$COND_USE_GUI_1_WXUNIV_1,;t t
|
||||
s,@COND_UNICODE_1@,$COND_UNICODE_1,;t t
|
||||
s,@COND_PLATFORM_WIN32_0@,$COND_PLATFORM_WIN32_0,;t t
|
||||
s,@COND_MONOLITHIC_1@,$COND_MONOLITHIC_1,;t t
|
||||
s,@COND_SHARED_0_MONOLITHIC_0@,$COND_SHARED_0_MONOLITHIC_0,;t t
|
||||
s,@COND_BUILD_DEBUG@,$COND_BUILD_DEBUG,;t t
|
||||
s,@COND_DEPS_TYPE_GCC@,$COND_DEPS_TYPE_GCC,;t t
|
||||
s,@COND_PLATFORM_MAC_1@,$COND_PLATFORM_MAC_1,;t t
|
||||
s,@COND_SHARED_1@,$COND_SHARED_1,;t t
|
||||
s,@COND_SHARED_0@,$COND_SHARED_0,;t t
|
||||
s,@COND_DEPS_TRACKING_1@,$COND_DEPS_TRACKING_1,;t t
|
||||
s,@COND_DEPS_TRACKING_0@,$COND_DEPS_TRACKING_0,;t t
|
||||
s,@LEX_STEM@,$LEX_STEM,;t t
|
||||
s,@PATH_IFS@,$PATH_IFS,;t t
|
||||
s,@WX_MAJOR_VERSION_NUMBER@,$WX_MAJOR_VERSION_NUMBER,;t t
|
||||
|
||||
@@ -2150,10 +2150,6 @@ if test "$wxUSE_GUI" = "yes"; then
|
||||
if test "$wxUSE_MSW" = 1 ; then
|
||||
TOOLKIT=MSW
|
||||
GUIDIST=MSW_DIST
|
||||
|
||||
dnl -mwindows causes a heap of other default gui libs to be linked in.
|
||||
dnl All platforms need this, except maybe cygwin
|
||||
LDFLAGS="$LDFLAGS -Wl,--subsystem,windows -mwindows"
|
||||
fi
|
||||
|
||||
if test "$wxUSE_GTK" = 1; then
|
||||
|
||||
Reference in New Issue
Block a user