From f95cd8fab8c122629b1746d3bf469d9837a63bb2 Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Sat, 28 Jun 2003 15:06:43 +0000 Subject: [PATCH] update git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21486 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- autoconf_inc.m4 | 246 ++++++++++++++++++------------------ configure | 232 ++++++++++++++++------------------ samples/minimal/Makefile.in | 93 +++++++++----- 3 files changed, 293 insertions(+), 278 deletions(-) diff --git a/autoconf_inc.m4 b/autoconf_inc.m4 index e4aa119f99..5b6fd0d4a2 100644 --- a/autoconf_inc.m4 +++ b/autoconf_inc.m4 @@ -4,138 +4,36 @@ 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="" +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_USE_GUI_1) -dnl ### begin block COND_SHARED_1 ### - COND_SHARED_1="#" - if test "x$SHARED" = "x1" ; then - COND_SHARED_1= + 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_SHARED_1) + AC_SUBST(COND_DEPS_TRACKING_0) dnl ### begin block COND_SHARED_1_MONOLITHIC_0 ### COND_SHARED_1_MONOLITHIC_0="#" if test "x$SHARED" = "x1" -a "x$MONOLITHIC" = "x0" ; then @@ -160,6 +58,30 @@ dnl ### begin block COND_USE_SOSYMLINKS_1 ### COND_USE_SOSYMLINKS_1="" fi AC_SUBST(COND_USE_SOSYMLINKS_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_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_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_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_TOOLKIT_X11 ### COND_TOOLKIT_X11="#" if test "x$TOOLKIT" = "xX11" ; then @@ -184,6 +106,12 @@ 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 "x$PLATFORM_MACOSX" = "x0" ; then @@ -202,24 +130,48 @@ dnl ### begin block COND_USE_SOVERSION_0 ### COND_USE_SOVERSION_0="" fi 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 "x$USE_GUI" = "x1" -a "x$MONOLITHIC" = "x0" ; then - COND_SHARED_0_USE_GUI_1_MONOLITHIC_0="" +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_0_USE_GUI_1_MONOLITHIC_0) + AC_SUBST(COND_WXUSE_ZLIB_BUILTIN) +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_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="" +dnl ### begin block COND_MONOLITHIC_0 ### + COND_MONOLITHIC_0="#" + if test "x$MONOLITHIC" = "x0" ; then + COND_MONOLITHIC_0="" fi - AC_SUBST(COND_SHARED_1_USE_GUI_1_MONOLITHIC_0) + 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="" + fi + AC_SUBST(COND_USE_GUI_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_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 @@ -238,18 +190,42 @@ 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_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_SHARED_1_MONOLITHIC_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_SHARED_0_MONOLITHIC_1 ### COND_SHARED_0_MONOLITHIC_1="#" if test "x$SHARED" = "x0" -a "x$MONOLITHIC" = "x1" ; then COND_SHARED_0_MONOLITHIC_1="" fi AC_SUBST(COND_SHARED_0_MONOLITHIC_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_SHARED_0_USE_GUI_1_MONOLITHIC_0) +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_USE_GUI_1_WXUNIV_0 ### COND_USE_GUI_1_WXUNIV_0="#" if test "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then @@ -262,15 +238,39 @@ 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_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_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= + COND_SHARED_0="" fi AC_SUBST(COND_SHARED_0) diff --git a/configure b/configure index 8d2c0724f4..af59bd62f0 100755 --- a/configure +++ b/configure @@ -311,7 +311,7 @@ ac_includes_default="\ # include #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 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_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_PLATFORM_WIN32_1 COND_PLATFORM_WIN32_0 COND_USE_GUI_0 COND_DEPS_TRACKING_1 COND_DEPS_TRACKING_0 COND_SHARED_1_MONOLITHIC_0 COND_USE_SOVERLINUX_1 COND_USE_SOVERSOLARIS_1 COND_USE_SOSYMLINKS_1 COND_BUILD_DEBUG COND_BUILD_RELEASE COND_WXUSE_ODBC_BUILTIN COND_WXUSE_LIBJPEG_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_USE_SOVERSION_0 COND_WXUSE_ZLIB_BUILTIN COND_PLATFORM_UNIX_1 COND_PLATFORM_MACOSX_1 COND_MONOLITHIC_0 COND_USE_GUI_1 COND_WXUSE_LIBTIFF_BUILTIN COND_WXUSE_REGEX_BUILTIN COND_TOOLKIT_MOTIF COND_TOOLKIT_COCOA COND_TOOLKIT_OS2 COND_WXUNIV_1 COND_SHARED_1_MONOLITHIC_1 COND_WXUSE_LIBPNG_BUILTIN COND_SHARED_0_MONOLITHIC_1 COND_SHARED_0_USE_GUI_1_MONOLITHIC_0 COND_SHARED_1_USE_GUI_1_MONOLITHIC_0 COND_USE_GUI_1_WXUNIV_0 COND_USE_GUI_1_WXUNIV_1 COND_UNICODE_1 COND_MONOLITHIC_1 COND_SHARED_0_MONOLITHIC_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. @@ -34333,114 +34333,29 @@ fi - 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="#" - if test "x$wxUSE_LIBPNG" = "xbuiltin" ; then - 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_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="#" - if test "x$USE_GUI" = "x1" ; then - COND_USE_GUI_1="" + COND_DEPS_TRACKING_1="#" + if test "x$DEPS_TRACKING" = "x1" ; then + COND_DEPS_TRACKING_1="" fi - COND_SHARED_1="#" - if test "x$SHARED" = "x1" ; then - COND_SHARED_1= + COND_DEPS_TRACKING_0="#" + if test "x$DEPS_TRACKING" = "x0" ; then + COND_DEPS_TRACKING_0="" fi COND_SHARED_1_MONOLITHIC_0="#" @@ -34463,6 +34378,26 @@ fi COND_USE_SOSYMLINKS_1="" fi + COND_BUILD_DEBUG="#" + if test "x$BUILD" = "xdebug" ; then + COND_BUILD_DEBUG="" + fi + + COND_BUILD_RELEASE="#" + if test "x$BUILD" = "xrelease" ; then + COND_BUILD_RELEASE="" + fi + + COND_WXUSE_ODBC_BUILTIN="#" + if test "x$wxUSE_ODBC" = "xbuiltin" ; then + COND_WXUSE_ODBC_BUILTIN="" + fi + + COND_WXUSE_LIBJPEG_BUILTIN="#" + if test "x$wxUSE_LIBJPEG" = "xbuiltin" ; then + COND_WXUSE_LIBJPEG_BUILTIN="" + fi + COND_TOOLKIT_X11="#" if test "x$TOOLKIT" = "xX11" ; then COND_TOOLKIT_X11="" @@ -34483,6 +34418,11 @@ 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 COND_USE_SOVERSION_1_PLATFORM_MACOSX_0="" @@ -34498,9 +34438,14 @@ fi COND_USE_SOVERSION_0="" fi - 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="" + COND_WXUSE_ZLIB_BUILTIN="#" + if test "x$wxUSE_ZLIB" = "xbuiltin" ; then + COND_WXUSE_ZLIB_BUILTIN="" + fi + + COND_PLATFORM_UNIX_1="#" + if test "x$PLATFORM_UNIX" = "x1" ; then + COND_PLATFORM_UNIX_1="" fi COND_PLATFORM_MACOSX_1="#" @@ -34508,9 +34453,24 @@ fi COND_PLATFORM_MACOSX_1="" fi - 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="" + COND_MONOLITHIC_0="#" + if test "x$MONOLITHIC" = "x0" ; then + COND_MONOLITHIC_0="" + fi + + COND_USE_GUI_1="#" + if test "x$USE_GUI" = "x1" ; then + COND_USE_GUI_1="" + fi + + COND_WXUSE_LIBTIFF_BUILTIN="#" + if test "x$wxUSE_LIBTIFF" = "xbuiltin" ; then + COND_WXUSE_LIBTIFF_BUILTIN="" + fi + + COND_WXUSE_REGEX_BUILTIN="#" + if test "x$wxUSE_REGEX" = "xbuiltin" ; then + COND_WXUSE_REGEX_BUILTIN="" fi COND_TOOLKIT_MOTIF="#" @@ -34528,16 +34488,36 @@ fi COND_TOOLKIT_OS2="" fi + COND_WXUNIV_1="#" + if test "x$WXUNIV" = "x1" ; then + COND_WXUNIV_1="" + fi + COND_SHARED_1_MONOLITHIC_1="#" if test "x$SHARED" = "x1" -a "x$MONOLITHIC" = "x1" ; then COND_SHARED_1_MONOLITHIC_1="" fi + COND_WXUSE_LIBPNG_BUILTIN="#" + if test "x$wxUSE_LIBPNG" = "xbuiltin" ; then + COND_WXUSE_LIBPNG_BUILTIN="" + fi + COND_SHARED_0_MONOLITHIC_1="#" if test "x$SHARED" = "x0" -a "x$MONOLITHIC" = "x1" ; then COND_SHARED_0_MONOLITHIC_1="" fi + 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 + + 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 + COND_USE_GUI_1_WXUNIV_0="#" if test "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then COND_USE_GUI_1_WXUNIV_0="" @@ -34548,16 +34528,21 @@ fi COND_USE_GUI_1_WXUNIV_1="" fi + COND_UNICODE_1="#" + if test "x$UNICODE" = "x1" ; then + COND_UNICODE_1="" + 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_SHARED_0="#" - if test "x$SHARED" = "x0" ; then - COND_SHARED_0= - fi - @@ -35474,51 +35459,48 @@ 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_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_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_DEPS_TRACKING_1@,$COND_DEPS_TRACKING_1,;t t +s,@COND_DEPS_TRACKING_0@,$COND_DEPS_TRACKING_0,;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_BUILD_DEBUG@,$COND_BUILD_DEBUG,;t t +s,@COND_BUILD_RELEASE@,$COND_BUILD_RELEASE,;t t +s,@COND_WXUSE_ODBC_BUILTIN@,$COND_WXUSE_ODBC_BUILTIN,;t t +s,@COND_WXUSE_LIBJPEG_BUILTIN@,$COND_WXUSE_LIBJPEG_BUILTIN,;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_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_WXUSE_ZLIB_BUILTIN@,$COND_WXUSE_ZLIB_BUILTIN,;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_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_USE_GUI_1@,$COND_USE_GUI_1,;t t +s,@COND_WXUSE_LIBTIFF_BUILTIN@,$COND_WXUSE_LIBTIFF_BUILTIN,;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_SHARED_1_MONOLITHIC_1@,$COND_SHARED_1_MONOLITHIC_1,;t t +s,@COND_WXUSE_LIBPNG_BUILTIN@,$COND_WXUSE_LIBPNG_BUILTIN,;t t s,@COND_SHARED_0_MONOLITHIC_1@,$COND_SHARED_0_MONOLITHIC_1,;t t +s,@COND_SHARED_0_USE_GUI_1_MONOLITHIC_0@,$COND_SHARED_0_USE_GUI_1_MONOLITHIC_0,;t t +s,@COND_SHARED_1_USE_GUI_1_MONOLITHIC_0@,$COND_SHARED_1_USE_GUI_1_MONOLITHIC_0,;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_MONOLITHIC_1@,$COND_MONOLITHIC_1,;t t s,@COND_SHARED_0_MONOLITHIC_0@,$COND_SHARED_0_MONOLITHIC_0,;t t -s,@COND_SHARED_0@,$COND_SHARED_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 diff --git a/samples/minimal/Makefile.in b/samples/minimal/Makefile.in index 225a134a0c..104958cab5 100644 --- a/samples/minimal/Makefile.in +++ b/samples/minimal/Makefile.in @@ -32,7 +32,7 @@ CC = @CC@ datadir = @datadir@ PLATFORM_MSDOS = @PLATFORM_MSDOS@ SETFILE = @SETFILE@ -UNICODE = @UNICODE@ +LDFLAGS = @LDFLAGS@ STRIP = @STRIP@ USE_SOVERSOLARIS = @USE_SOVERSOLARIS@ srcdir = @srcdir@ @@ -41,24 +41,26 @@ wxUSE_REGEX = @wxUSE_REGEX@ bindir = @bindir@ PIC_FLAG = @PIC_FLAG@ USE_SOSYMLINKS = @USE_SOSYMLINKS@ -wxUSE_LIBJPEG = @wxUSE_LIBJPEG@ +LDFLAGS_GUI = @LDFLAGS_GUI@ INSTALL_DATA = @INSTALL_DATA@ USE_GUI = @USE_GUI@ PLATFORM_UNIX = @PLATFORM_UNIX@ RANLIB = @RANLIB@ SO_SUFFIX = @SO_SUFFIX@ top_srcdir = @top_srcdir@ +wxUSE_LIBJPEG = @wxUSE_LIBJPEG@ AR = @AR@ BUILD = @BUILD@ PLATFORM_WIN32 = @PLATFORM_WIN32@ USE_MACVERSION = @USE_MACVERSION@ PLATFORM_MACOSX = @PLATFORM_MACOSX@ DEPS_TRACKING = @DEPS_TRACKING@ -TOOLKIT_VERSION = @TOOLKIT_VERSION@ +UNICODE = @UNICODE@ WXUNIV = @WXUNIV@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ CXX = @CXX@ SHARED_LD_CXX = @SHARED_LD_CXX@ +TOOLKIT_VERSION = @TOOLKIT_VERSION@ includedir = @includedir@ LN_S = @LN_S@ CFLAGS = @CFLAGS@ @@ -70,44 +72,74 @@ SHARED_LD_CC = @SHARED_LD_CC@ ### Conditionally set variables: ### -@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = -lwxzlib +@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = -lwxzlib$(WXDEBUGFLAG) @COND_UNICODE_1@WXUNICODEFLAG = u @COND_BUILD_DEBUG@WXDEBUGFLAG = d -@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg -@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX) -@COND_DEPS_TRACKING_0@CXXC = $(CXX) -@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng -@COND_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng -@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc -@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 -@COND_WXUNIV_1@WXUNIVNAME = univ +@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p = -I$(srcdir)/src/jpeg +@COND_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng$(WXDEBUGFLAG) +@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p = -I$(srcdir)/src/zlib +@COND_WXUSE_LIBJPEG_BUILTIN@INC_JPEG = $(srcdir)/src/jpeg @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_WXUSE_ODBC_BUILTIN@LIB_ODBC = wxodbc -@COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc -@COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib -@COND_PLATFORM_MAC_1@__minimal___mac_setfilecmd = $(SETFILE) -a C minimal$(EXEEXT) +@COND_WXUSE_ZLIB_BUILTIN@INC_ZLIB = $(srcdir)/src/zlib +@COND_BUILD_DEBUG@OPTIMIZEFLAG = off +@COND_BUILD_RELEASE@OPTIMIZEFLAG = speed @COND_PLATFORM_WIN32_1@__minimal___win32rc = minimal_rc.o @COND_DEPS_TRACKING_1@CCC = $(top_builddir)./bk-deps $(CC) @COND_DEPS_TRACKING_0@CCC = $(CC) @COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r -@COND_MONOLITHIC_0@WXLIB_BASE = wx$(WXUNICODEFLAG)$(WXDEBUGFLAG)_base-2.5 +@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_1 = --include-dir $(srcdir)/src/zlib @COND_PLATFORM_WIN32_1@DLLIMPEXT = .a @COND_PLATFORM_WIN32_0@DLLIMPEXT = .$(SO_SUFFIX) -@COND_WXUNIV_1@WXUNIV_DEFINE = __WXUNIVERSAL__ +@COND_PLATFORM_MAC_1@__minimal___mac_setfilecmd = $(SETFILE) -a C minimal$(EXEEXT) @COND_MONOLITHIC_1@WXLIB_MONO = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 -@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff -@COND_WXUSE_LIBJPEG_BUILTIN@LIB_JPEG = wxjpeg -@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ -@COND_PLATFORM_MAC_1@__minimal___mac_rezcmd = $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir)/../../include -i $(srcdir) -o minimal$(EXEEXT) $(MACOSX_RESOURCES) mondrian.r -@COND_MONOLITHIC_0@WXLIB_HTML = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html-2.5 +@COND_MONOLITHIC_0@__WXLIB_BASE_p = -lwx$(WXUNICODEFLAG)$(WXDEBUGFLAG)_base-2.5 +@COND_WXUSE_ODBC_BUILTIN@LIB_ODBC = wxodbc$(WXDEBUGFLAG) @COND_MONOLITHIC_1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5 @COND_MONOLITHIC_0@WXLIB_CORE = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL +@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_1 = --include-dir $(srcdir)/src/png +@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_1 = --include-dir $(srcdir)/src/tiff +@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex$(WXDEBUGFLAG) +@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_1 = --include-dir $(srcdir)/src/jpeg +@COND_SHARED_1@DLLFLAG = WXUSINGDLL +@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG) +@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc$(WXDEBUGFLAG) +@COND_WXUSE_REGEX_BUILTIN@INC_REGEX = $(srcdir)/src/regex +@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX) +@COND_DEPS_TRACKING_0@CXXC = $(CXX) +@COND_PLATFORM_UNIX_1@TIFF_PLATFORM_SRC = src/tiff/tif_unix.c +@COND_PLATFORM_MACOSX_1@TIFF_PLATFORM_SRC = src/tiff/tif_unix.c +@COND_PLATFORM_WIN32_1@TIFF_PLATFORM_SRC = src/tiff/tif_win32.c +@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG) +@COND_WXUSE_LIBPNG_BUILTIN@INC_PNG = $(srcdir)/src/png +@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p = -I$(srcdir)/src/odbc +@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_1 = --include-dir $(srcdir)/src/odbc +@COND_WXUNIV_1@WXUNIVNAME = univ +@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5 +@COND_WXUSE_ODBC_BUILTIN@INC_ODBC = $(srcdir)/src/odbc +@COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc +@COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib$(WXDEBUGFLAG) +@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p = -I$(srcdir)/src/regex +@COND_SHARED_1@__DLLFLAG_p_1 = -d WXUSINGDLL +@COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL +@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p = -I$(srcdir)/src/tiff +@COND_WXUSE_LIBTIFF_BUILTIN@INC_TIFF = $(srcdir)/src/tiff +@COND_MONOLITHIC_0@WXLIB_HTML = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html-2.5 +@COND_WXUNIV_1@WXUNIV_DEFINE = __WXUNIVERSAL__ +@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) +@COND_MONOLITHIC_0@WXLIB_BASE = wx$(WXUNICODEFLAG)$(WXDEBUGFLAG)_base-2.5 @COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ -@COND_WXUSE_LIBTIFF_BUILTIN@LIB_TIFF = wxtiff +@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ +@COND_PLATFORM_MAC_1@__minimal___mac_rezcmd = $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include -i $(INC_TIFF) -i $(INC_JPEG) -i $(INC_PNG) -i $(INC_ZLIB) -i $(INC_ODBC) -i $(INC_REGEX) -i $(srcdir) $(__DLLFLAG_p_1) -o minimal$(EXEEXT) $(MACOSX_RESOURCES) mondrian.r +@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_1 = --include-dir $(srcdir)/src/regex +@COND_WXUSE_LIBJPEG_BUILTIN@LIB_JPEG = wxjpeg$(WXDEBUGFLAG) +@COND_WXUSE_LIBTIFF_BUILTIN@LIB_TIFF = wxtiff$(WXDEBUGFLAG) @COND_USE_GUI_0@PORTNAME = base @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) -@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex -@COND_WXUSE_REGEX_BUILTIN@LIB_REGEX = wxregex +@COND_BUILD_DEBUG@DEBUGFLAG = on +@COND_BUILD_RELEASE@DEBUGFLAG = off +@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p = -I$(srcdir)/src/png +@COND_WXUSE_REGEX_BUILTIN@LIB_REGEX = wxregex$(WXDEBUGFLAG) ### Targets: ### @@ -116,23 +148,24 @@ all: minimal$(EXEEXT) install-strip: install clean: - rm -f ./*.o ./.deps/* + rm -rf ./.deps + rm -f -f ./*.o rm -f minimal$(EXEEXT) install: all minimal.o: $(srcdir)/minimal.cpp - $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir)/../../include -I$(srcdir) $(CXXFLAGS) $< + $(CXXC) -c -o $@ $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -I$(srcdir) $(__DLLFLAG_p) $(CXXFLAGS) $< distclean: clean rm -f configure config.cache config.log config.status rm -f bk-deps shared-ld-sh minimal_rc.o: $(srcdir)/minimal.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir)/../../include --include-dir $(srcdir) + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) --include-dir $(srcdir) $(__DLLFLAG_p_2) minimal$(EXEEXT): minimal.o $(__minimal___win32rc) - $(CXX) -o $@ minimal.o $(__minimal___win32rc) -L$(top_builddir)lib $(__WXLIB_MONO_p) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_TIFF_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) + $(CXX) -o $@ minimal.o $(__minimal___win32rc) $(LDFLAGS) -L$(top_builddir)lib $(SAMPLES_RPATH_FLAG) $(LDFLAGS_GUI) $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(EXTRALIBS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__minimal___mac_rezcmd) $(__minimal___mac_setfilecmd) -- 2.45.2