X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/01aa5863971918bbbb459ebc159641fe51ca02aa..b3dfbbc91088ab32c3aae4294a3c726fadfc5ccd:/configure diff --git a/configure b/configure index 1ec9d80e8e..0541017e34 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 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_TYPE COND_WXUSE_ZLIB_BUILTIN COND_UNICODE_1 COND_BUILD_DEBUG COND_WXUSE_REGEX_BUILTIN COND_USE_SOSYMLINKS_1 COND_WXUSE_LIBJPEG_BUILTIN COND_WXUSE_LIBPNG_BUILTIN COND_SHARED_1_MONOLITHIC_1 COND_WXUSE_ODBC_BUILTIN COND_TOOLKIT_GTK COND_TOOLKIT_MOTIF COND_TOOLKIT_MSW COND_TOOLKIT_MAC COND_TOOLKIT_COCOA COND_TOOLKIT_OS2 COND_TOOLKIT_X11 COND_TOOLKIT_MGL COND_WXUNIV_1 COND_WXUSE_LIBTIFF_BUILTIN COND_PLATFORM_UNIX_1 COND_PLATFORM_MACOSX_1 COND_PLATFORM_WIN32_1 COND_USE_SOVERSION_1_PLATFORM_MACOSX_0 COND_USE_SOVERSION_1_PLATFORM_MACOSX_1 COND_PLATFORM_WIN32_0 COND_MONOLITHIC_1 COND_MONOLITHIC_0 COND_USE_GUI_1 COND_DEPS_TYPE_GCC COND_USE_GUI_0 COND_USE_GUI_1_WXUNIV_0 COND_USE_GUI_1_WXUNIV_1 COND_SHARED_0_MONOLITHIC_1 COND_USE_SOVERLINUX_1 COND_USE_SOVERSOLARIS_1 COND_PLATFORM_MAC_1 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 SONAME_FLAGS SONAME_FLAGS_GL WX_TARGET_LIBRARY_SONAME 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 VENDOR OFFICIAL_BUILD 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_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0 COND_DEPS_TRACKING_0 COND_DEPS_TRACKING_1 COND_TOOLKIT_MOTIF_USE_GUI_1 COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_COCOA_USE_GUI_1 COND_USE_SOVERSOLARIS_1 COND_MONOLITHIC_1 COND_UNICODE_1 COND_MONOLITHIC_0 COND_TOOLKIT_MGL COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0 COND_WXUSE_ODBC_BUILTIN COND_USE_SOVERSION_0 COND_WXUNIV_1 COND_PLATFORM_UNIX_1 COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0 COND_WXUSE_REGEX_BUILTIN COND_TOOLKIT_MGL_USE_GUI_1_WXUNIV_1 COND_MONOLITHIC_1_SHARED_0 COND_MONOLITHIC_1_SHARED_1 COND_TOOLKIT_X11 COND_OFFICIAL_BUILD_0 COND_TOOLKIT_OS2 COND_TOOLKIT_MGL_USE_GUI_1 COND_WXUSE_ZLIB_BUILTIN COND_TOOLKIT_MOTIF COND_MONOLITHIC_0_SHARED_1 COND_PLATFORM_MACOSX_1_USE_SOVERSION_1 COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_1 COND_MONOLITHIC_0_SHARED_0 COND_USE_GUI_1 COND_USE_GUI_0 COND_TOOLKIT_MSW COND_TOOLKIT_X11_USE_GUI_1 COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0 COND_BUILD_DEBUG COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_1 COND_WXUSE_LIBTIFF_BUILTIN COND_OFFICIAL_BUILD_1 COND_BUILD_RELEASE COND_USE_SOVERLINUX_1 COND_USE_SOSYMLINKS_1 COND_TOOLKIT_COCOA COND_PLATFORM_MACOSX_1 COND_WXUSE_LIBJPEG_BUILTIN COND_WXUSE_LIBPNG_BUILTIN COND_MONOLITHIC_0_SHARED_1_USE_GUI_1 COND_PLATFORM_MACOSX_0_USE_SOVERSION_1 COND_TOOLKIT_X11_USE_GUI_1_WXUNIV_1 COND_USE_GUI_1_WXUNIV_0 COND_USE_GUI_1_WXUNIV_1 COND_TOOLKIT_GTK COND_PLATFORM_WIN32_0 COND_PLATFORM_WIN32_1 COND_TOOLKIT_GTK_USE_GUI_1 COND_TOOLKIT_MAC COND_TOOLKIT_MSW_USE_GUI_1 COND_MONOLITHIC_0_SHARED_0_USE_GUI_1 COND_SHARED_1 COND_PLATFORM_MAC_1 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 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 CODE_GEN_FLAGS CODE_GEN_FLAGS_CXX 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. @@ -866,11 +866,11 @@ Optional Features: --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] --enable-gui use GUI classes + --disable-monolithic don't build wxWindows as single library --enable-universal use wxWindows GUI controls instead of native ones --enable-nanox use NanoX --enable-gtk2 use GTK+ 2.0 if available (EXPERIMENTAL) --enable-shared create shared library code - --enable-soname set the DT_SONAME field in ELF shared libraries --enable-optimise create optimised code --enable-debug same as debug_flag and debug_info --enable-precomp enable use of precompiled headers (Mac OS X/Darwin) @@ -1943,7 +1943,6 @@ if test $DEBUG_CONFIGURE = 1; then DEFAULT_wxUSE_THREADS=yes DEFAULT_wxUSE_SHARED=yes - DEFAULT_wxUSE_SONAME=no DEFAULT_wxUSE_OPTIMISE=no DEFAULT_wxUSE_PROFILE=no DEFAULT_wxUSE_NO_DEPS=no @@ -2108,6 +2107,8 @@ if test $DEBUG_CONFIGURE = 1; then DEFAULT_wxUSE_XPM=no DEFAULT_wxUSE_ICO_CUR=no DEFAULT_wxUSE_ACCESSIBILITY=no + + DEFAULT_wxUSE_MONOLITHIC=yes else DEFAULT_wxUSE_UNIVERSAL=no @@ -2116,7 +2117,6 @@ else DEFAULT_wxUSE_THREADS=yes DEFAULT_wxUSE_SHARED=yes - DEFAULT_wxUSE_SONAME=no DEFAULT_wxUSE_OPTIMISE=yes DEFAULT_wxUSE_PROFILE=no DEFAULT_wxUSE_NO_DEPS=no @@ -2280,6 +2280,8 @@ else DEFAULT_wxUSE_XPM=yes DEFAULT_wxUSE_ICO_CUR=yes DEFAULT_wxUSE_ACCESSIBILITY=no + + DEFAULT_wxUSE_MONOLITHIC=yes fi @@ -2336,6 +2338,47 @@ echo "${ECHO_T}no" >&6 fi + enablestring= + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-monolithic" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-monolithic... $ECHO_C" >&6 + no_cache=0 + # Check whether --enable-monolithic or --disable-monolithic was given. +if test "${enable_monolithic+set}" = set; then + enableval="$enable_monolithic" + + if test "$enableval" = yes; then + ac_cv_use_monolithic='wxUSE_MONOLITHIC=yes' + else + ac_cv_use_monolithic='wxUSE_MONOLITHIC=no' + fi + +else + + LINE=`grep "wxUSE_MONOLITHIC" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_monolithic='wxUSE_MONOLITHIC='$DEFAULT_wxUSE_MONOLITHIC + +fi; + + eval "$ac_cv_use_monolithic" + if test "$no_cache" != 1; then + echo $ac_cv_use_monolithic >> ${wx_arg_cache_file}.tmp + fi + + if test "$wxUSE_MONOLITHIC" = yes; then + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 + fi + + if test "$wxUSE_GUI" = "yes"; then @@ -3006,47 +3049,6 @@ echo "${ECHO_T}no" >&6 fi - enablestring= - echo "$as_me:$LINENO: checking for --${enablestring:-enable}-soname" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-soname... $ECHO_C" >&6 - no_cache=0 - # Check whether --enable-soname or --disable-soname was given. -if test "${enable_soname+set}" = set; then - enableval="$enable_soname" - - if test "$enableval" = yes; then - ac_cv_use_soname='wxUSE_SONAME=yes' - else - ac_cv_use_soname='wxUSE_SONAME=no' - fi - -else - - LINE=`grep "wxUSE_SONAME" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - - ac_cv_use_soname='wxUSE_SONAME='$DEFAULT_wxUSE_SONAME - -fi; - - eval "$ac_cv_use_soname" - if test "$no_cache" != 1; then - echo $ac_cv_use_soname >> ${wx_arg_cache_file}.tmp - fi - - if test "$wxUSE_SONAME" = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 - else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 - fi - - enablestring= echo "$as_me:$LINENO: checking for --${enablestring:-enable}-optimise" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-optimise... $ECHO_C" >&6 @@ -9492,8 +9494,13 @@ echo "${ECHO_T}$toolkit_echo" >&6 fi done else - echo "$as_me:$LINENO: result: base ($host_alias hosted) only" >&5 + if test "x$host_alias" != "x"; then + echo "$as_me:$LINENO: result: base ($host_alias hosted) only" >&5 echo "${ECHO_T}base ($host_alias hosted) only" >&6 + else + echo "$as_me:$LINENO: result: base only" >&5 +echo "${ECHO_T}base only" >&6 + fi fi wants_win32=0 @@ -10402,8 +10409,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then for ac_declaration in \ - ''\ - '#include ' \ + '' \ 'extern "C" void std::exit (int) throw (); using std::exit;' \ 'extern "C" void std::exit (int); using std::exit;' \ 'extern "C" void exit (int) throw ();' \ @@ -10417,8 +10423,8 @@ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include $ac_declaration +#include int main () { @@ -11043,8 +11049,7 @@ else fi fi for ac_declaration in \ - ''\ - '#include ' \ + '' \ 'extern "C" void std::exit (int) throw (); using std::exit;' \ 'extern "C" void std::exit (int); using std::exit;' \ 'extern "C" void exit (int) throw ();' \ @@ -11058,8 +11063,8 @@ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include $ac_declaration +#include int main () { @@ -19366,7 +19371,7 @@ echo "${ECHO_T}$wx_cv_w32api_win32_ie" >&6 CPPFLAGS="$CPPFLAGS -D_WIN32_IE=0x400" fi - LIBS="$LIBS -lwinspool -lwinmm -lshell32 -lcomctl32 -lctl3d32 -ladvapi32 -lwsock32" + LIBS="$LIBS -lwinspool -lwinmm -lshell32 -lcomctl32 -lcomdlg32 -lctl3d32 -ladvapi32 -lwsock32 -lgdi32" if test "$wxUSE_ACCESSIBILITY" = "yes" ; then LIBS="$LIBS -loleacc" @@ -19374,7 +19379,7 @@ echo "${ECHO_T}$wx_cv_w32api_win32_ie" >&6 case "${host}" in *-*-cygwin* ) - LIBS="$LIBS -lkernel32 -luser32 -lgdi32 -lcomdlg32" + LIBS="$LIBS -lkernel32 -luser32" TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D__WIN95__" esac @@ -19415,8 +19420,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 @@ -24861,11 +24864,6 @@ echo "${ECHO_T}$wx_cv_prog_icc" >&6 fi fi - if test "$wxUSE_SONAME" = "yes" ; then - SONAME_FLAGS="-Wl,-soname,${WX_LIBRARY_LINK1}" - SONAME_FLAGS_GL="-Wl,-soname,${WX_LIBRARY_LINK1_GL}" - WX_TARGET_LIBRARY_SONAME="-Wl,-soname,\$(TARGETLIB_LINK1)" - fi SAMPLES_RPATH_FLAG="-Wl,-rpath,\$(top_builddir)lib" ;; @@ -24969,8 +24967,6 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext else SHARED_LD="${CXX} -G -o" PIC_FLAG="-KPIC" - SONAME_FLAGS="-h ${WX_LIBRARY_NAME_SHARED}" - SONAME_FLAGS_GL="-h ${WX_LIBRARY_NAME_SHARED_GL}" SAMPLES_RPATH_FLAG="-R\$(top_builddir)lib" fi ;; @@ -24981,8 +24977,6 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext CXXFLAGS="$CXXFLAGS -fno-common" SHARED_LD="\${top_srcdir}/distrib/mac/shared-ld-sh -undefined suppress -flat_namespace -o" PIC_FLAG="-dynamic -fPIC" - SONAME_FLAGS="-compatibility_version ${WX_RELEASE} -current_version ${WX_VERSION} -install_name \$(libdir)/${WX_LIBRARY_LINK1}" - SONAME_FLAGS_GL="-compatibility_version ${WX_RELEASE} -current_version ${WX_VERSION} -install_name \$(libdir)/${WX_LIBRARY_LINK1_GL}" ;; *-*-aix* ) @@ -33405,6 +33399,10 @@ if test "$wxUSE_GUI" = "yes"; then SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS artprov controls dialogs \ drawing dynamic erase event exec font image \ minimal propsize rotate shaped widgets" + + if test "$wxUSE_MONOLITHIC" != "yes"; then + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS console" + fi else SAMPLES_SUBDIRS="console" fi @@ -33415,6 +33413,19 @@ INCLUDES="-I\${top_builddir}lib/wx/include/${TOOLCHAIN_NAME} \ $REGEX_INCLUDE $ZLIB_INCLUDE $PNG_INCLUDE $JPEG_INCLUDE $TIFF_INCLUDE \ $TOOLKIT_INCLUDE" +if test "$GXX" = yes ; then + CXXWARNINGS="-Wall" + fi + +EXTRA_CFLAGS="$WXDEBUG $WXODBCFLAG $PROFILE $OPTIMISE" + +CPPFLAGS=`echo $INCLUDES $CPPFLAGS | sed 's/ \\+/ /g'` +CFLAGS=`echo $CODE_GEN_FLAGS $EXTRA_CFLAGS $CFLAGS $CXXWARNINGS | sed 's/ \\+/ /g'` +CXXFLAGS=`echo $CODE_GEN_FLAGS $CODE_GEN_FLAGS_CXX $EXTRA_CFLAGS $CXXFLAGS $CXXWARNINGS | sed 's/ \+/ /g'` +LIBS=`echo $LIBS | sed 's/ \+/ /g'` + +LDFLAGS="$LDFLAGS $PROFILE" + if test "$wxUSE_GTK" = 1; then WXCONFIG_INCLUDE= else @@ -33436,7 +33447,16 @@ fi EXTRALIBS="$LDFLAGS $LDFLAGS_VERSIONING $LIBS $DMALLOC_LIBS" -MONOLITHIC=1 +if test $wxUSE_MONOLITHIC = "yes" ; then + MONOLITHIC=1 +else + MONOLITHIC=0 +fi + +VENDOR="custom" +OFFICIAL_BUILD=0 + + @@ -33739,11 +33759,18 @@ 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 echo $ECHO_N "checking if make is GNU make... $ECHO_C" >&6 -if test "${wx_cv_prog_makeisgnu+set}" = set; then +if test "${bakefile_cv_prog_makeisgnu+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -33755,8 +33782,8 @@ else fi fi -echo "$as_me:$LINENO: result: $wx_cv_prog_makeisgnu" >&5 -echo "${ECHO_T}$wx_cv_prog_makeisgnu" >&6 +echo "$as_me:$LINENO: result: $bakefile_cv_prog_makeisgnu" >&5 +echo "${ECHO_T}$bakefile_cv_prog_makeisgnu" >&6 if test "x$bakefile_cv_prog_makeisgnu" = "xyes"; then IF_GNU_MAKE="" @@ -34124,9 +34151,74 @@ echo "$as_me: error: unknown system type $host." >&2;} - DEPS_TYPE=no + echo "$as_me:$LINENO: checking for dependency tracking method" >&5 +echo $ECHO_N "checking for dependency tracking method... $ECHO_C" >&6 + DEPS_TRACKING=0 + if test "x$GCC" = "xyes"; then - DEPS_TYPE=gcc + DEPSMODE=gcc + DEPS_TRACKING=1 + echo "$as_me:$LINENO: result: gcc" >&5 +echo "${ECHO_T}gcc" >&6 + else + echo "$as_me:$LINENO: result: none" >&5 +echo "${ECHO_T}none" >&6 + fi + + if test $DEPS_TRACKING = 1 ; then + cat <bk-deps +#!/bin/sh + +# This script is part of Bakefile (http://bakefile.sf.net) autoconf script. +# It is used to track C/C++ files dependencies in portable way. +# +# Permission is given to use this file in any way. + +DEPSMODE=$DEPSMODE +DEPSDIR=.deps + +mkdir -p \$DEPSDIR + +if test \$DEPSMODE = gcc ; then + \${*} -MMD + status=\${?} + if test \${status} != 0 ; then + exit \${status} + fi + # move created file to the location we want it in: + while test \${#} -gt 0; do + case "\${1}" in + -o ) + shift + objfile=\${1} + ;; + -* ) + ;; + * ) + srcfile=\${1} + ;; + esac + shift + done + depfile=\`basename \$srcfile | sed -e 's/\..*$/.d/g'\` + depobjname=\`echo \$depfile |sed -e 's/\.d/.o/g'\` + 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 "/^\$objfile/! s,\$depobjname:,\$objfile:,g" \$depfile >\${DEPSDIR}/\${objfile}.d + rm -f \$depfile + fi + fi + exit 0 +else + \${*} + exit \${?} +fi +EOF + chmod +x bk-deps fi @@ -34261,213 +34353,328 @@ fi - COND_WXUSE_ZLIB_BUILTIN="#" - if test "x$wxUSE_ZLIB" = "xbuiltin" ; then - COND_WXUSE_ZLIB_BUILTIN= + COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0="#" + if test "x$TOOLKIT" = "xMOTIF" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then + COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0="" + fi + + COND_DEPS_TRACKING_0="#" + if test "x$DEPS_TRACKING" = "x0" ; then + COND_DEPS_TRACKING_0="" + fi + + COND_DEPS_TRACKING_1="#" + if test "x$DEPS_TRACKING" = "x1" ; then + COND_DEPS_TRACKING_1="" + fi + + COND_TOOLKIT_MOTIF_USE_GUI_1="#" + if test "x$TOOLKIT" = "xMOTIF" -a "x$USE_GUI" = "x1" ; then + COND_TOOLKIT_MOTIF_USE_GUI_1="" + fi + + COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0="#" + if test "x$TOOLKIT" = "xMAC" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then + COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0="" + fi + + COND_TOOLKIT_COCOA_USE_GUI_1="#" + if test "x$TOOLKIT" = "xCOCOA" -a "x$USE_GUI" = "x1" ; then + COND_TOOLKIT_COCOA_USE_GUI_1="" + fi + + COND_USE_SOVERSOLARIS_1="#" + if test "x$USE_SOVERSOLARIS" = "x1" ; then + COND_USE_SOVERSOLARIS_1="" + fi + + COND_MONOLITHIC_1="#" + if test "x$MONOLITHIC" = "x1" ; then + COND_MONOLITHIC_1="" fi COND_UNICODE_1="#" if test "x$UNICODE" = "x1" ; then - COND_UNICODE_1= + COND_UNICODE_1="" fi - COND_BUILD_DEBUG="#" - if test "x$BUILD" = "xdebug" ; then - COND_BUILD_DEBUG= + COND_MONOLITHIC_0="#" + if test "x$MONOLITHIC" = "x0" ; then + COND_MONOLITHIC_0="" + fi + + COND_TOOLKIT_MGL="#" + if test "x$TOOLKIT" = "xMGL" ; then + COND_TOOLKIT_MGL="" + fi + + COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0="#" + if test "x$TOOLKIT" = "xCOCOA" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then + COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0="" + fi + + COND_WXUSE_ODBC_BUILTIN="#" + if test "x$wxUSE_ODBC" = "xbuiltin" ; then + COND_WXUSE_ODBC_BUILTIN="" + fi + + COND_USE_SOVERSION_0="#" + if test "x$USE_SOVERSION" = "x0" ; then + COND_USE_SOVERSION_0="" + fi + + COND_WXUNIV_1="#" + if test "x$WXUNIV" = "x1" ; then + COND_WXUNIV_1="" + fi + + COND_PLATFORM_UNIX_1="#" + if test "x$PLATFORM_UNIX" = "x1" ; then + COND_PLATFORM_UNIX_1="" + fi + + COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0="#" + if test "x$TOOLKIT" = "xMSW" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then + COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0="" fi COND_WXUSE_REGEX_BUILTIN="#" if test "x$wxUSE_REGEX" = "xbuiltin" ; then - COND_WXUSE_REGEX_BUILTIN= + COND_WXUSE_REGEX_BUILTIN="" fi - COND_USE_SOSYMLINKS_1="#" - if test "x$USE_SOSYMLINKS" = "x1" ; then - COND_USE_SOSYMLINKS_1= + COND_TOOLKIT_MGL_USE_GUI_1_WXUNIV_1="#" + if test "x$TOOLKIT" = "xMGL" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x1" ; then + COND_TOOLKIT_MGL_USE_GUI_1_WXUNIV_1="" fi - COND_WXUSE_LIBJPEG_BUILTIN="#" - if test "x$wxUSE_LIBJPEG" = "xbuiltin" ; then - COND_WXUSE_LIBJPEG_BUILTIN= + COND_MONOLITHIC_1_SHARED_0="#" + if test "x$MONOLITHIC" = "x1" -a "x$SHARED" = "x0" ; then + COND_MONOLITHIC_1_SHARED_0="" fi - COND_WXUSE_LIBPNG_BUILTIN="#" - if test "x$wxUSE_LIBPNG" = "xbuiltin" ; then - COND_WXUSE_LIBPNG_BUILTIN= + COND_MONOLITHIC_1_SHARED_1="#" + if test "x$MONOLITHIC" = "x1" -a "x$SHARED" = "x1" ; then + COND_MONOLITHIC_1_SHARED_1="" fi - COND_SHARED_1_MONOLITHIC_1="#" - if test "x$SHARED" = "x1" -a \ - "x$MONOLITHIC" = "x1" ; then - COND_SHARED_1_MONOLITHIC_1= + COND_TOOLKIT_X11="#" + if test "x$TOOLKIT" = "xX11" ; then + COND_TOOLKIT_X11="" fi - COND_WXUSE_ODBC_BUILTIN="#" - if test "x$wxUSE_ODBC" = "xbuiltin" ; then - COND_WXUSE_ODBC_BUILTIN= + COND_OFFICIAL_BUILD_0="#" + if test "x$OFFICIAL_BUILD" = "x0" ; then + COND_OFFICIAL_BUILD_0="" fi - COND_TOOLKIT_GTK="#" - if test "x$TOOLKIT" = "xGTK" ; then - COND_TOOLKIT_GTK= + COND_TOOLKIT_OS2="#" + if test "x$TOOLKIT" = "xOS2" ; then + COND_TOOLKIT_OS2="" + fi + + COND_TOOLKIT_MGL_USE_GUI_1="#" + if test "x$TOOLKIT" = "xMGL" -a "x$USE_GUI" = "x1" ; then + COND_TOOLKIT_MGL_USE_GUI_1="" + fi + + COND_WXUSE_ZLIB_BUILTIN="#" + if test "x$wxUSE_ZLIB" = "xbuiltin" ; then + COND_WXUSE_ZLIB_BUILTIN="" fi COND_TOOLKIT_MOTIF="#" if test "x$TOOLKIT" = "xMOTIF" ; then - COND_TOOLKIT_MOTIF= + COND_TOOLKIT_MOTIF="" fi - COND_TOOLKIT_MSW="#" - if test "x$TOOLKIT" = "xMSW" ; then - COND_TOOLKIT_MSW= + COND_MONOLITHIC_0_SHARED_1="#" + if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x1" ; then + COND_MONOLITHIC_0_SHARED_1="" fi - COND_TOOLKIT_MAC="#" - if test "x$TOOLKIT" = "xMAC" ; then - COND_TOOLKIT_MAC= + COND_PLATFORM_MACOSX_1_USE_SOVERSION_1="#" + if test "x$PLATFORM_MACOSX" = "x1" -a "x$USE_SOVERSION" = "x1" ; then + COND_PLATFORM_MACOSX_1_USE_SOVERSION_1="" fi - COND_TOOLKIT_COCOA="#" - if test "x$TOOLKIT" = "xCOCOA" ; then - COND_TOOLKIT_COCOA= + COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0="#" + if test "x$TOOLKIT" = "xGTK" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then + COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0="" fi - COND_TOOLKIT_OS2="#" - if test "x$TOOLKIT" = "xOS2" ; then - COND_TOOLKIT_OS2= + COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_1="#" + if test "x$TOOLKIT" = "xGTK" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x1" ; then + COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_1="" fi - COND_TOOLKIT_X11="#" - if test "x$TOOLKIT" = "xX11" ; then - COND_TOOLKIT_X11= + COND_MONOLITHIC_0_SHARED_0="#" + if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x0" ; then + COND_MONOLITHIC_0_SHARED_0="" fi - COND_TOOLKIT_MGL="#" - if test "x$TOOLKIT" = "xMGL" ; then - COND_TOOLKIT_MGL= + COND_USE_GUI_1="#" + if test "x$USE_GUI" = "x1" ; then + COND_USE_GUI_1="" fi - COND_WXUNIV_1="#" - if test "x$WXUNIV" = "x1" ; then - COND_WXUNIV_1= + COND_USE_GUI_0="#" + if test "x$USE_GUI" = "x0" ; then + COND_USE_GUI_0="" + fi + + COND_TOOLKIT_MSW="#" + if test "x$TOOLKIT" = "xMSW" ; then + COND_TOOLKIT_MSW="" + fi + + COND_TOOLKIT_X11_USE_GUI_1="#" + if test "x$TOOLKIT" = "xX11" -a "x$USE_GUI" = "x1" ; then + COND_TOOLKIT_X11_USE_GUI_1="" + fi + + COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0="#" + if test "x$TOOLKIT" = "xOS2" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then + COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0="" + fi + + COND_BUILD_DEBUG="#" + if test "x$BUILD" = "xdebug" ; then + COND_BUILD_DEBUG="" + fi + + COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_1="#" + if test "x$TOOLKIT" = "xMSW" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x1" ; then + COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_1="" fi COND_WXUSE_LIBTIFF_BUILTIN="#" if test "x$wxUSE_LIBTIFF" = "xbuiltin" ; then - COND_WXUSE_LIBTIFF_BUILTIN= + COND_WXUSE_LIBTIFF_BUILTIN="" fi - COND_PLATFORM_UNIX_1="#" - if test "x$PLATFORM_UNIX" = "x1" ; then - COND_PLATFORM_UNIX_1= + COND_OFFICIAL_BUILD_1="#" + if test "x$OFFICIAL_BUILD" = "x1" ; then + COND_OFFICIAL_BUILD_1="" fi - COND_PLATFORM_MACOSX_1="#" - if test "x$PLATFORM_MACOSX" = "x1" ; then - COND_PLATFORM_MACOSX_1= + COND_BUILD_RELEASE="#" + if test "x$BUILD" = "xrelease" ; then + COND_BUILD_RELEASE="" fi - COND_PLATFORM_WIN32_1="#" - if test "x$PLATFORM_WIN32" = "x1" ; then - COND_PLATFORM_WIN32_1= + COND_USE_SOVERLINUX_1="#" + if test "x$USE_SOVERLINUX" = "x1" ; then + COND_USE_SOVERLINUX_1="" 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= + COND_USE_SOSYMLINKS_1="#" + if test "x$USE_SOSYMLINKS" = "x1" ; then + COND_USE_SOSYMLINKS_1="" fi - COND_USE_SOVERSION_1_PLATFORM_MACOSX_1="#" - if test "x$USE_SOVERSION" = "x1" -a \ - "x$PLATFORM_MACOSX" = "x1" ; then - COND_USE_SOVERSION_1_PLATFORM_MACOSX_1= + COND_TOOLKIT_COCOA="#" + if test "x$TOOLKIT" = "xCOCOA" ; then + COND_TOOLKIT_COCOA="" fi - COND_PLATFORM_WIN32_0="#" - if test "x$PLATFORM_WIN32" = "x0" ; then - COND_PLATFORM_WIN32_0= + COND_PLATFORM_MACOSX_1="#" + if test "x$PLATFORM_MACOSX" = "x1" ; then + COND_PLATFORM_MACOSX_1="" fi - COND_MONOLITHIC_1="#" - if test "x$MONOLITHIC" = "x1" ; then - COND_MONOLITHIC_1= + COND_WXUSE_LIBJPEG_BUILTIN="#" + if test "x$wxUSE_LIBJPEG" = "xbuiltin" ; then + COND_WXUSE_LIBJPEG_BUILTIN="" fi - COND_MONOLITHIC_0="#" - if test "x$MONOLITHIC" = "x0" ; then - COND_MONOLITHIC_0= + COND_WXUSE_LIBPNG_BUILTIN="#" + if test "x$wxUSE_LIBPNG" = "xbuiltin" ; then + COND_WXUSE_LIBPNG_BUILTIN="" fi - COND_USE_GUI_1="#" - if test "x$USE_GUI" = "x1" ; then - COND_USE_GUI_1= + COND_MONOLITHIC_0_SHARED_1_USE_GUI_1="#" + if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x1" -a "x$USE_GUI" = "x1" ; then + COND_MONOLITHIC_0_SHARED_1_USE_GUI_1="" fi - COND_DEPS_TYPE_GCC="#" - if test "x$DEPS_TYPE" = "xgcc" ; then - COND_DEPS_TYPE_GCC= + COND_PLATFORM_MACOSX_0_USE_SOVERSION_1="#" + if test "x$PLATFORM_MACOSX" = "x0" -a "x$USE_SOVERSION" = "x1" ; then + COND_PLATFORM_MACOSX_0_USE_SOVERSION_1="" fi - COND_USE_GUI_0="#" - if test "x$USE_GUI" = "x0" ; then - COND_USE_GUI_0= + COND_TOOLKIT_X11_USE_GUI_1_WXUNIV_1="#" + if test "x$TOOLKIT" = "xX11" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x1" ; then + COND_TOOLKIT_X11_USE_GUI_1_WXUNIV_1="" fi COND_USE_GUI_1_WXUNIV_0="#" - if test "x$USE_GUI" = "x1" -a \ - "x$WXUNIV" = "x0" ; then - COND_USE_GUI_1_WXUNIV_0= + if test "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then + COND_USE_GUI_1_WXUNIV_0="" fi COND_USE_GUI_1_WXUNIV_1="#" - if test "x$USE_GUI" = "x1" -a \ - "x$WXUNIV" = "x1" ; then - COND_USE_GUI_1_WXUNIV_1= + if test "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x1" ; then + COND_USE_GUI_1_WXUNIV_1="" fi - COND_SHARED_0_MONOLITHIC_1="#" - if test "x$SHARED" = "x0" -a \ - "x$MONOLITHIC" = "x1" ; then - COND_SHARED_0_MONOLITHIC_1= + COND_TOOLKIT_GTK="#" + if test "x$TOOLKIT" = "xGTK" ; then + COND_TOOLKIT_GTK="" fi - COND_USE_SOVERLINUX_1="#" - if test "x$USE_SOVERLINUX" = "x1" ; then - COND_USE_SOVERLINUX_1= + COND_PLATFORM_WIN32_0="#" + if test "x$PLATFORM_WIN32" = "x0" ; then + COND_PLATFORM_WIN32_0="" fi - COND_USE_SOVERSOLARIS_1="#" - if test "x$USE_SOVERSOLARIS" = "x1" ; then - COND_USE_SOVERSOLARIS_1= + COND_PLATFORM_WIN32_1="#" + if test "x$PLATFORM_WIN32" = "x1" ; then + COND_PLATFORM_WIN32_1="" fi - COND_PLATFORM_MAC_1="#" - if test "x$PLATFORM_MAC" = "x1" ; then - COND_PLATFORM_MAC_1= + COND_TOOLKIT_GTK_USE_GUI_1="#" + if test "x$TOOLKIT" = "xGTK" -a "x$USE_GUI" = "x1" ; then + COND_TOOLKIT_GTK_USE_GUI_1="" fi + COND_TOOLKIT_MAC="#" + if test "x$TOOLKIT" = "xMAC" ; then + COND_TOOLKIT_MAC="" + fi + COND_TOOLKIT_MSW_USE_GUI_1="#" + if test "x$TOOLKIT" = "xMSW" -a "x$USE_GUI" = "x1" ; then + COND_TOOLKIT_MSW_USE_GUI_1="" + fi + COND_MONOLITHIC_0_SHARED_0_USE_GUI_1="#" + if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x0" -a "x$USE_GUI" = "x1" ; then + COND_MONOLITHIC_0_SHARED_0_USE_GUI_1="" + fi -if test "$GXX" = yes ; then - CXXWARNINGS="-Wall" - fi + COND_SHARED_1="#" + if test "x$SHARED" = "x1" ; then + COND_SHARED_1="" + fi -EXTRA_CFLAGS="$WXDEBUG $WXODBCFLAG $PROFILE $OPTIMISE" + COND_PLATFORM_MAC_1="#" + if test "x$PLATFORM_MAC" = "x1" ; then + COND_PLATFORM_MAC_1="" + fi -CPPFLAGS=`echo $INCLUDES $CPPFLAGS | sed 's/ \\+/ /g'` -CFLAGS=`echo $EXTRA_CFLAGS $CFLAGS $CXXWARNINGS | sed 's/ \\+/ /g'` -CXXFLAGS=`echo $EXTRA_CFLAGS $CXXFLAGS $CXXWARNINGS | sed 's/ \+/ /g'` -LIBS=`echo $LIBS | sed 's/ \+/ /g'` + COND_SHARED_0="#" + if test "x$SHARED" = "x0" ; then + COND_SHARED_0="" + fi -LDFLAGS="$LDFLAGS $PROFILE" -SAMPLES_SUBDIRS="`echo $SAMPLES_SUBDIRS | tr -s ' ' | tr ' ' '\n' | sort | uniq | tr '\n' ' '| tr -d '\r'`" +SAMPLES_SUBDIRS="`echo $SAMPLES_SUBDIRS | tr -s ' ' | tr ' ' '\n' | sort | uniq | tr '\n' ' '| tr -d '\r'`" + @@ -34611,25 +34818,37 @@ fi -if test -d ${srcdir}/samples ; then - ac_config_files="$ac_config_files samples/Makefile samples/access/Makefile samples/artprov/Makefile samples/caret/Makefile samples/calendar/Makefile samples/checklst/Makefile samples/config/Makefile samples/controls/Makefile samples/console/Makefile samples/db/Makefile samples/dialogs/Makefile samples/dialup/Makefile samples/docview/Makefile samples/docvwmdi/Makefile samples/dnd/Makefile samples/dragimag/Makefile samples/drawing/Makefile samples/dynamic/Makefile samples/erase/Makefile samples/event/Makefile samples/exec/Makefile samples/font/Makefile samples/grid/Makefile samples/help/Makefile samples/image/Makefile samples/internat/Makefile samples/ipc/Makefile samples/joytest/Makefile samples/keyboard/Makefile samples/layout/Makefile samples/listctrl/Makefile samples/mdi/Makefile samples/menu/Makefile samples/memcheck/Makefile samples/minifram/Makefile samples/minimal/Makefile samples/mobile/Makefile samples/mobile/wxedit/Makefile samples/mobile/styles/Makefile samples/multimon/Makefile samples/notebook/Makefile samples/oleauto/Makefile samples/ownerdrw/Makefile samples/png/Makefile samples/printing/Makefile samples/propsize/Makefile samples/regtest/Makefile samples/rotate/Makefile samples/sashtest/Makefile samples/shaped/Makefile samples/scroll/Makefile samples/scrollsub/Makefile samples/sockets/Makefile samples/splitter/Makefile samples/statbar/Makefile samples/taskbar/Makefile samples/text/Makefile samples/thread/Makefile samples/toolbar/Makefile samples/treectrl/Makefile samples/typetest/Makefile samples/validate/Makefile samples/widgets/Makefile samples/wizard/Makefile samples/htlbox/Makefile samples/html/Makefile samples/html/about/Makefile samples/html/help/Makefile samples/html/printing/Makefile samples/html/helpview/Makefile samples/html/test/Makefile samples/html/zip/Makefile samples/html/virtual/Makefile samples/html/widget/Makefile samples/opengl/Makefile samples/opengl/cube/Makefile samples/opengl/penguin/Makefile samples/opengl/isosurf/Makefile" - -fi - -if test -d ${srcdir}/demos ; then - ac_config_files="$ac_config_files demos/Makefile demos/bombs/Makefile demos/dbbrowse/Makefile demos/forty/Makefile demos/fractal/Makefile demos/life/Makefile demos/poem/Makefile" - +if test "$wxUSE_GUI" = "yes"; then + SUBDIRS="samples demos utils contrib" +else SUBDIRS="samples utils" fi -if test -d ${srcdir}/utils ; then - ac_config_files="$ac_config_files utils/Makefile utils/makegen/Makefile utils/HelpGen/Makefile utils/HelpGen/src/Makefile utils/tex2rtf/Makefile utils/tex2rtf/src/Makefile utils/hhp2cached/Makefile utils/dialoged/Makefile utils/dialoged/src/Makefile utils/emulator/Makefile utils/emulator/src/Makefile utils/helpview/Makefile utils/helpview/src/Makefile utils/configtool/Makefile utils/configtool/src/Makefile" - -fi +for subdir in `echo $SUBDIRS`; do + if test -d ${srcdir}/${subdir} ; then + if test "$wxUSE_GUI" = "yes"; then + if test ${subdir} = "samples"; then + for sample in `echo $SAMPLES_SUBDIRS`; do + if test -d $srcdir/samples/$sample; then + makefiles="samples/$sample/Makefile.in $makefiles" + fi + done + else makefiles=`(cd $srcdir ; find $subdir -name Makefile.in)` + fi + else if test ${subdir} = "samples"; then + makefiles="samples/console/Makefile.in" + else makefiles="utils/HelpGen/Makefile.in \ + utils/HelpGen/src/Makefile.in \ + utils/makegen/Makefile.in" + fi + fi -if test -d ${srcdir}/contrib ; then - ac_config_files="$ac_config_files contrib/src/Makefile contrib/src/deprecated/Makefile contrib/src/ogl/Makefile contrib/src/mmedia/Makefile contrib/src/stc/Makefile contrib/src/svg/Makefile contrib/src/xrc/Makefile contrib/src/gizmos/Makefile contrib/src/plot/Makefile contrib/src/applet/Makefile contrib/src/fl/Makefile contrib/src/net/Makefile contrib/samples/Makefile contrib/samples/deprecated/Makefile contrib/samples/deprecated/proplist/Makefile contrib/samples/deprecated/resource/Makefile contrib/samples/deprecated/treelay/Makefile contrib/samples/mmedia/Makefile contrib/samples/ogl/Makefile contrib/samples/ogl/ogledit/Makefile contrib/samples/ogl/studio/Makefile contrib/samples/stc/Makefile contrib/samples/svg/Makefile contrib/samples/gizmos/Makefile contrib/samples/gizmos/editlbox/Makefile contrib/samples/gizmos/dynsash/Makefile contrib/samples/gizmos/dynsash_switch/Makefile contrib/samples/gizmos/multicell/Makefile contrib/samples/gizmos/splittree/Makefile contrib/samples/gizmos/led/Makefile contrib/samples/xrc/Makefile contrib/samples/plot/Makefile contrib/samples/applet/Makefile contrib/samples/fl/Makefile contrib/samples/fl/fl_demo1/Makefile contrib/samples/fl/fl_demo2/Makefile contrib/samples/fl/fl_sample1/Makefile contrib/samples/fl/fl_sample2/Makefile contrib/samples/fl/fl_sample3/Makefile contrib/utils/Makefile contrib/utils/wxrc/Makefile contrib/utils/wxrcedit/Makefile contrib/utils/convertrc/Makefile" + for mkin in $makefiles ; do + mk=`echo $mkin | sed 's/Makefile\.in/Makefile/g'` + ac_config_files="$ac_config_files $mk" -fi + done + fi +done cat >confcache <<\_ACEOF @@ -35173,149 +35392,7 @@ do "wx-config" ) CONFIG_FILES="$CONFIG_FILES wx-config" ;; "version-script" ) CONFIG_FILES="$CONFIG_FILES version-script" ;; "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;; - "samples/Makefile" ) CONFIG_FILES="$CONFIG_FILES samples/Makefile" ;; - "samples/access/Makefile" ) CONFIG_FILES="$CONFIG_FILES samples/access/Makefile" ;; - "samples/artprov/Makefile" ) CONFIG_FILES="$CONFIG_FILES samples/artprov/Makefile" ;; - "samples/caret/Makefile" ) CONFIG_FILES="$CONFIG_FILES samples/caret/Makefile" ;; - "samples/calendar/Makefile" ) CONFIG_FILES="$CONFIG_FILES samples/calendar/Makefile" ;; - "samples/checklst/Makefile" ) CONFIG_FILES="$CONFIG_FILES samples/checklst/Makefile" ;; - "samples/config/Makefile" ) CONFIG_FILES="$CONFIG_FILES samples/config/Makefile" ;; - "samples/controls/Makefile" ) CONFIG_FILES="$CONFIG_FILES samples/controls/Makefile" ;; - "samples/console/Makefile" ) CONFIG_FILES="$CONFIG_FILES samples/console/Makefile" ;; - "samples/db/Makefile" ) CONFIG_FILES="$CONFIG_FILES samples/db/Makefile" ;; - "samples/dialogs/Makefile" ) CONFIG_FILES="$CONFIG_FILES samples/dialogs/Makefile" ;; - "samples/dialup/Makefile" ) CONFIG_FILES="$CONFIG_FILES samples/dialup/Makefile" ;; - "samples/docview/Makefile" ) CONFIG_FILES="$CONFIG_FILES samples/docview/Makefile" ;; - "samples/docvwmdi/Makefile" ) CONFIG_FILES="$CONFIG_FILES samples/docvwmdi/Makefile" ;; - "samples/dnd/Makefile" ) CONFIG_FILES="$CONFIG_FILES samples/dnd/Makefile" ;; - "samples/dragimag/Makefile" ) CONFIG_FILES="$CONFIG_FILES samples/dragimag/Makefile" ;; - "samples/drawing/Makefile" ) CONFIG_FILES="$CONFIG_FILES samples/drawing/Makefile" ;; - "samples/dynamic/Makefile" ) CONFIG_FILES="$CONFIG_FILES samples/dynamic/Makefile" ;; - "samples/erase/Makefile" ) CONFIG_FILES="$CONFIG_FILES samples/erase/Makefile" ;; - "samples/event/Makefile" ) CONFIG_FILES="$CONFIG_FILES samples/event/Makefile" ;; - "samples/exec/Makefile" ) CONFIG_FILES="$CONFIG_FILES samples/exec/Makefile" ;; - "samples/font/Makefile" ) CONFIG_FILES="$CONFIG_FILES samples/font/Makefile" ;; - "samples/grid/Makefile" ) CONFIG_FILES="$CONFIG_FILES samples/grid/Makefile" ;; - "samples/help/Makefile" ) CONFIG_FILES="$CONFIG_FILES samples/help/Makefile" ;; - "samples/image/Makefile" ) CONFIG_FILES="$CONFIG_FILES samples/image/Makefile" ;; - "samples/internat/Makefile" ) CONFIG_FILES="$CONFIG_FILES samples/internat/Makefile" ;; - "samples/ipc/Makefile" ) CONFIG_FILES="$CONFIG_FILES samples/ipc/Makefile" ;; - "samples/joytest/Makefile" ) CONFIG_FILES="$CONFIG_FILES samples/joytest/Makefile" ;; - "samples/keyboard/Makefile" ) CONFIG_FILES="$CONFIG_FILES samples/keyboard/Makefile" ;; - "samples/layout/Makefile" ) CONFIG_FILES="$CONFIG_FILES samples/layout/Makefile" ;; - "samples/listctrl/Makefile" ) CONFIG_FILES="$CONFIG_FILES samples/listctrl/Makefile" ;; - "samples/mdi/Makefile" ) CONFIG_FILES="$CONFIG_FILES samples/mdi/Makefile" ;; - "samples/menu/Makefile" ) CONFIG_FILES="$CONFIG_FILES samples/menu/Makefile" ;; - "samples/memcheck/Makefile" ) CONFIG_FILES="$CONFIG_FILES samples/memcheck/Makefile" ;; - "samples/minifram/Makefile" ) CONFIG_FILES="$CONFIG_FILES samples/minifram/Makefile" ;; - "samples/minimal/Makefile" ) CONFIG_FILES="$CONFIG_FILES samples/minimal/Makefile" ;; - "samples/mobile/Makefile" ) CONFIG_FILES="$CONFIG_FILES samples/mobile/Makefile" ;; - "samples/mobile/wxedit/Makefile" ) CONFIG_FILES="$CONFIG_FILES samples/mobile/wxedit/Makefile" ;; - "samples/mobile/styles/Makefile" ) CONFIG_FILES="$CONFIG_FILES samples/mobile/styles/Makefile" ;; - "samples/multimon/Makefile" ) CONFIG_FILES="$CONFIG_FILES samples/multimon/Makefile" ;; - "samples/notebook/Makefile" ) CONFIG_FILES="$CONFIG_FILES samples/notebook/Makefile" ;; - "samples/oleauto/Makefile" ) CONFIG_FILES="$CONFIG_FILES samples/oleauto/Makefile" ;; - "samples/ownerdrw/Makefile" ) CONFIG_FILES="$CONFIG_FILES samples/ownerdrw/Makefile" ;; - "samples/png/Makefile" ) CONFIG_FILES="$CONFIG_FILES samples/png/Makefile" ;; - "samples/printing/Makefile" ) CONFIG_FILES="$CONFIG_FILES samples/printing/Makefile" ;; - "samples/propsize/Makefile" ) CONFIG_FILES="$CONFIG_FILES samples/propsize/Makefile" ;; - "samples/regtest/Makefile" ) CONFIG_FILES="$CONFIG_FILES samples/regtest/Makefile" ;; - "samples/rotate/Makefile" ) CONFIG_FILES="$CONFIG_FILES samples/rotate/Makefile" ;; - "samples/sashtest/Makefile" ) CONFIG_FILES="$CONFIG_FILES samples/sashtest/Makefile" ;; - "samples/shaped/Makefile" ) CONFIG_FILES="$CONFIG_FILES samples/shaped/Makefile" ;; - "samples/scroll/Makefile" ) CONFIG_FILES="$CONFIG_FILES samples/scroll/Makefile" ;; - "samples/scrollsub/Makefile" ) CONFIG_FILES="$CONFIG_FILES samples/scrollsub/Makefile" ;; - "samples/sockets/Makefile" ) CONFIG_FILES="$CONFIG_FILES samples/sockets/Makefile" ;; - "samples/splitter/Makefile" ) CONFIG_FILES="$CONFIG_FILES samples/splitter/Makefile" ;; - "samples/statbar/Makefile" ) CONFIG_FILES="$CONFIG_FILES samples/statbar/Makefile" ;; - "samples/taskbar/Makefile" ) CONFIG_FILES="$CONFIG_FILES samples/taskbar/Makefile" ;; - "samples/text/Makefile" ) CONFIG_FILES="$CONFIG_FILES samples/text/Makefile" ;; - "samples/thread/Makefile" ) CONFIG_FILES="$CONFIG_FILES samples/thread/Makefile" ;; - "samples/toolbar/Makefile" ) CONFIG_FILES="$CONFIG_FILES samples/toolbar/Makefile" ;; - "samples/treectrl/Makefile" ) CONFIG_FILES="$CONFIG_FILES samples/treectrl/Makefile" ;; - "samples/typetest/Makefile" ) CONFIG_FILES="$CONFIG_FILES samples/typetest/Makefile" ;; - "samples/validate/Makefile" ) CONFIG_FILES="$CONFIG_FILES samples/validate/Makefile" ;; - "samples/widgets/Makefile" ) CONFIG_FILES="$CONFIG_FILES samples/widgets/Makefile" ;; - "samples/wizard/Makefile" ) CONFIG_FILES="$CONFIG_FILES samples/wizard/Makefile" ;; - "samples/htlbox/Makefile" ) CONFIG_FILES="$CONFIG_FILES samples/htlbox/Makefile" ;; - "samples/html/Makefile" ) CONFIG_FILES="$CONFIG_FILES samples/html/Makefile" ;; - "samples/html/about/Makefile" ) CONFIG_FILES="$CONFIG_FILES samples/html/about/Makefile" ;; - "samples/html/help/Makefile" ) CONFIG_FILES="$CONFIG_FILES samples/html/help/Makefile" ;; - "samples/html/printing/Makefile" ) CONFIG_FILES="$CONFIG_FILES samples/html/printing/Makefile" ;; - "samples/html/helpview/Makefile" ) CONFIG_FILES="$CONFIG_FILES samples/html/helpview/Makefile" ;; - "samples/html/test/Makefile" ) CONFIG_FILES="$CONFIG_FILES samples/html/test/Makefile" ;; - "samples/html/zip/Makefile" ) CONFIG_FILES="$CONFIG_FILES samples/html/zip/Makefile" ;; - "samples/html/virtual/Makefile" ) CONFIG_FILES="$CONFIG_FILES samples/html/virtual/Makefile" ;; - "samples/html/widget/Makefile" ) CONFIG_FILES="$CONFIG_FILES samples/html/widget/Makefile" ;; - "samples/opengl/Makefile" ) CONFIG_FILES="$CONFIG_FILES samples/opengl/Makefile" ;; - "samples/opengl/cube/Makefile" ) CONFIG_FILES="$CONFIG_FILES samples/opengl/cube/Makefile" ;; - "samples/opengl/penguin/Makefile" ) CONFIG_FILES="$CONFIG_FILES samples/opengl/penguin/Makefile" ;; - "samples/opengl/isosurf/Makefile" ) CONFIG_FILES="$CONFIG_FILES samples/opengl/isosurf/Makefile" ;; - "demos/Makefile" ) CONFIG_FILES="$CONFIG_FILES demos/Makefile" ;; - "demos/bombs/Makefile" ) CONFIG_FILES="$CONFIG_FILES demos/bombs/Makefile" ;; - "demos/dbbrowse/Makefile" ) CONFIG_FILES="$CONFIG_FILES demos/dbbrowse/Makefile" ;; - "demos/forty/Makefile" ) CONFIG_FILES="$CONFIG_FILES demos/forty/Makefile" ;; - "demos/fractal/Makefile" ) CONFIG_FILES="$CONFIG_FILES demos/fractal/Makefile" ;; - "demos/life/Makefile" ) CONFIG_FILES="$CONFIG_FILES demos/life/Makefile" ;; - "demos/poem/Makefile" ) CONFIG_FILES="$CONFIG_FILES demos/poem/Makefile" ;; - "utils/Makefile" ) CONFIG_FILES="$CONFIG_FILES utils/Makefile" ;; - "utils/makegen/Makefile" ) CONFIG_FILES="$CONFIG_FILES utils/makegen/Makefile" ;; - "utils/HelpGen/Makefile" ) CONFIG_FILES="$CONFIG_FILES utils/HelpGen/Makefile" ;; - "utils/HelpGen/src/Makefile" ) CONFIG_FILES="$CONFIG_FILES utils/HelpGen/src/Makefile" ;; - "utils/tex2rtf/Makefile" ) CONFIG_FILES="$CONFIG_FILES utils/tex2rtf/Makefile" ;; - "utils/tex2rtf/src/Makefile" ) CONFIG_FILES="$CONFIG_FILES utils/tex2rtf/src/Makefile" ;; - "utils/hhp2cached/Makefile" ) CONFIG_FILES="$CONFIG_FILES utils/hhp2cached/Makefile" ;; - "utils/dialoged/Makefile" ) CONFIG_FILES="$CONFIG_FILES utils/dialoged/Makefile" ;; - "utils/dialoged/src/Makefile" ) CONFIG_FILES="$CONFIG_FILES utils/dialoged/src/Makefile" ;; - "utils/emulator/Makefile" ) CONFIG_FILES="$CONFIG_FILES utils/emulator/Makefile" ;; - "utils/emulator/src/Makefile" ) CONFIG_FILES="$CONFIG_FILES utils/emulator/src/Makefile" ;; - "utils/helpview/Makefile" ) CONFIG_FILES="$CONFIG_FILES utils/helpview/Makefile" ;; - "utils/helpview/src/Makefile" ) CONFIG_FILES="$CONFIG_FILES utils/helpview/src/Makefile" ;; - "utils/configtool/Makefile" ) CONFIG_FILES="$CONFIG_FILES utils/configtool/Makefile" ;; - "utils/configtool/src/Makefile" ) CONFIG_FILES="$CONFIG_FILES utils/configtool/src/Makefile" ;; - "contrib/src/Makefile" ) CONFIG_FILES="$CONFIG_FILES contrib/src/Makefile" ;; - "contrib/src/deprecated/Makefile" ) CONFIG_FILES="$CONFIG_FILES contrib/src/deprecated/Makefile" ;; - "contrib/src/ogl/Makefile" ) CONFIG_FILES="$CONFIG_FILES contrib/src/ogl/Makefile" ;; - "contrib/src/mmedia/Makefile" ) CONFIG_FILES="$CONFIG_FILES contrib/src/mmedia/Makefile" ;; - "contrib/src/stc/Makefile" ) CONFIG_FILES="$CONFIG_FILES contrib/src/stc/Makefile" ;; - "contrib/src/svg/Makefile" ) CONFIG_FILES="$CONFIG_FILES contrib/src/svg/Makefile" ;; - "contrib/src/xrc/Makefile" ) CONFIG_FILES="$CONFIG_FILES contrib/src/xrc/Makefile" ;; - "contrib/src/gizmos/Makefile" ) CONFIG_FILES="$CONFIG_FILES contrib/src/gizmos/Makefile" ;; - "contrib/src/plot/Makefile" ) CONFIG_FILES="$CONFIG_FILES contrib/src/plot/Makefile" ;; - "contrib/src/applet/Makefile" ) CONFIG_FILES="$CONFIG_FILES contrib/src/applet/Makefile" ;; - "contrib/src/fl/Makefile" ) CONFIG_FILES="$CONFIG_FILES contrib/src/fl/Makefile" ;; - "contrib/src/net/Makefile" ) CONFIG_FILES="$CONFIG_FILES contrib/src/net/Makefile" ;; - "contrib/samples/Makefile" ) CONFIG_FILES="$CONFIG_FILES contrib/samples/Makefile" ;; - "contrib/samples/deprecated/Makefile" ) CONFIG_FILES="$CONFIG_FILES contrib/samples/deprecated/Makefile" ;; - "contrib/samples/deprecated/proplist/Makefile" ) CONFIG_FILES="$CONFIG_FILES contrib/samples/deprecated/proplist/Makefile" ;; - "contrib/samples/deprecated/resource/Makefile" ) CONFIG_FILES="$CONFIG_FILES contrib/samples/deprecated/resource/Makefile" ;; - "contrib/samples/deprecated/treelay/Makefile" ) CONFIG_FILES="$CONFIG_FILES contrib/samples/deprecated/treelay/Makefile" ;; - "contrib/samples/mmedia/Makefile" ) CONFIG_FILES="$CONFIG_FILES contrib/samples/mmedia/Makefile" ;; - "contrib/samples/ogl/Makefile" ) CONFIG_FILES="$CONFIG_FILES contrib/samples/ogl/Makefile" ;; - "contrib/samples/ogl/ogledit/Makefile" ) CONFIG_FILES="$CONFIG_FILES contrib/samples/ogl/ogledit/Makefile" ;; - "contrib/samples/ogl/studio/Makefile" ) CONFIG_FILES="$CONFIG_FILES contrib/samples/ogl/studio/Makefile" ;; - "contrib/samples/stc/Makefile" ) CONFIG_FILES="$CONFIG_FILES contrib/samples/stc/Makefile" ;; - "contrib/samples/svg/Makefile" ) CONFIG_FILES="$CONFIG_FILES contrib/samples/svg/Makefile" ;; - "contrib/samples/gizmos/Makefile" ) CONFIG_FILES="$CONFIG_FILES contrib/samples/gizmos/Makefile" ;; - "contrib/samples/gizmos/editlbox/Makefile" ) CONFIG_FILES="$CONFIG_FILES contrib/samples/gizmos/editlbox/Makefile" ;; - "contrib/samples/gizmos/dynsash/Makefile" ) CONFIG_FILES="$CONFIG_FILES contrib/samples/gizmos/dynsash/Makefile" ;; - "contrib/samples/gizmos/dynsash_switch/Makefile" ) CONFIG_FILES="$CONFIG_FILES contrib/samples/gizmos/dynsash_switch/Makefile" ;; - "contrib/samples/gizmos/multicell/Makefile" ) CONFIG_FILES="$CONFIG_FILES contrib/samples/gizmos/multicell/Makefile" ;; - "contrib/samples/gizmos/splittree/Makefile" ) CONFIG_FILES="$CONFIG_FILES contrib/samples/gizmos/splittree/Makefile" ;; - "contrib/samples/gizmos/led/Makefile" ) CONFIG_FILES="$CONFIG_FILES contrib/samples/gizmos/led/Makefile" ;; - "contrib/samples/xrc/Makefile" ) CONFIG_FILES="$CONFIG_FILES contrib/samples/xrc/Makefile" ;; - "contrib/samples/plot/Makefile" ) CONFIG_FILES="$CONFIG_FILES contrib/samples/plot/Makefile" ;; - "contrib/samples/applet/Makefile" ) CONFIG_FILES="$CONFIG_FILES contrib/samples/applet/Makefile" ;; - "contrib/samples/fl/Makefile" ) CONFIG_FILES="$CONFIG_FILES contrib/samples/fl/Makefile" ;; - "contrib/samples/fl/fl_demo1/Makefile" ) CONFIG_FILES="$CONFIG_FILES contrib/samples/fl/fl_demo1/Makefile" ;; - "contrib/samples/fl/fl_demo2/Makefile" ) CONFIG_FILES="$CONFIG_FILES contrib/samples/fl/fl_demo2/Makefile" ;; - "contrib/samples/fl/fl_sample1/Makefile" ) CONFIG_FILES="$CONFIG_FILES contrib/samples/fl/fl_sample1/Makefile" ;; - "contrib/samples/fl/fl_sample2/Makefile" ) CONFIG_FILES="$CONFIG_FILES contrib/samples/fl/fl_sample2/Makefile" ;; - "contrib/samples/fl/fl_sample3/Makefile" ) CONFIG_FILES="$CONFIG_FILES contrib/samples/fl/fl_sample3/Makefile" ;; - "contrib/utils/Makefile" ) CONFIG_FILES="$CONFIG_FILES contrib/utils/Makefile" ;; - "contrib/utils/wxrc/Makefile" ) CONFIG_FILES="$CONFIG_FILES contrib/utils/wxrc/Makefile" ;; - "contrib/utils/wxrcedit/Makefile" ) CONFIG_FILES="$CONFIG_FILES contrib/utils/wxrcedit/Makefile" ;; - "contrib/utils/convertrc/Makefile" ) CONFIG_FILES="$CONFIG_FILES contrib/utils/convertrc/Makefile" ;; + "$mk" ) CONFIG_FILES="$CONFIG_FILES $mk" ;; "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;; "setup.h" ) CONFIG_HEADERS="$CONFIG_HEADERS setup.h" ;; *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 @@ -35466,6 +35543,8 @@ s,@wxUSE_ODBC@,$wxUSE_ODBC,;t t s,@wxUSE_LIBJPEG@,$wxUSE_LIBJPEG,;t t s,@wxUSE_LIBPNG@,$wxUSE_LIBPNG,;t t s,@wxUSE_LIBTIFF@,$wxUSE_LIBTIFF,;t t +s,@VENDOR@,$VENDOR,;t t +s,@OFFICIAL_BUILD@,$OFFICIAL_BUILD,;t t s,@WXUNIV@,$WXUNIV,;t t s,@MONOLITHIC@,$MONOLITHIC,;t t s,@EXTRALIBS@,$EXTRALIBS,;t t @@ -35478,6 +35557,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 @@ -35494,43 +35574,70 @@ s,@USE_SOVERSOLARIS@,$USE_SOVERSOLARIS,;t t s,@USE_MACVERSION@,$USE_MACVERSION,;t t s,@USE_SOSYMLINKS@,$USE_SOSYMLINKS,;t t s,@SONAME_FLAG@,$SONAME_FLAG,;t t -s,@DEPS_TYPE@,$DEPS_TYPE,;t t -s,@COND_WXUSE_ZLIB_BUILTIN@,$COND_WXUSE_ZLIB_BUILTIN,;t t +s,@DEPS_TRACKING@,$DEPS_TRACKING,;t t +s,@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@,$COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0,;t t +s,@COND_DEPS_TRACKING_0@,$COND_DEPS_TRACKING_0,;t t +s,@COND_DEPS_TRACKING_1@,$COND_DEPS_TRACKING_1,;t t +s,@COND_TOOLKIT_MOTIF_USE_GUI_1@,$COND_TOOLKIT_MOTIF_USE_GUI_1,;t t +s,@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@,$COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0,;t t +s,@COND_TOOLKIT_COCOA_USE_GUI_1@,$COND_TOOLKIT_COCOA_USE_GUI_1,;t t +s,@COND_USE_SOVERSOLARIS_1@,$COND_USE_SOVERSOLARIS_1,;t t +s,@COND_MONOLITHIC_1@,$COND_MONOLITHIC_1,;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_USE_SOSYMLINKS_1@,$COND_USE_SOSYMLINKS_1,;t t -s,@COND_WXUSE_LIBJPEG_BUILTIN@,$COND_WXUSE_LIBJPEG_BUILTIN,;t t -s,@COND_WXUSE_LIBPNG_BUILTIN@,$COND_WXUSE_LIBPNG_BUILTIN,;t t -s,@COND_SHARED_1_MONOLITHIC_1@,$COND_SHARED_1_MONOLITHIC_1,;t t -s,@COND_WXUSE_ODBC_BUILTIN@,$COND_WXUSE_ODBC_BUILTIN,;t t -s,@COND_TOOLKIT_GTK@,$COND_TOOLKIT_GTK,;t t -s,@COND_TOOLKIT_MOTIF@,$COND_TOOLKIT_MOTIF,;t t -s,@COND_TOOLKIT_MSW@,$COND_TOOLKIT_MSW,;t t -s,@COND_TOOLKIT_MAC@,$COND_TOOLKIT_MAC,;t t -s,@COND_TOOLKIT_COCOA@,$COND_TOOLKIT_COCOA,;t t -s,@COND_TOOLKIT_OS2@,$COND_TOOLKIT_OS2,;t t -s,@COND_TOOLKIT_X11@,$COND_TOOLKIT_X11,;t t +s,@COND_MONOLITHIC_0@,$COND_MONOLITHIC_0,;t t s,@COND_TOOLKIT_MGL@,$COND_TOOLKIT_MGL,;t t +s,@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@,$COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0,;t t +s,@COND_WXUSE_ODBC_BUILTIN@,$COND_WXUSE_ODBC_BUILTIN,;t t +s,@COND_USE_SOVERSION_0@,$COND_USE_SOVERSION_0,;t t s,@COND_WXUNIV_1@,$COND_WXUNIV_1,;t t -s,@COND_WXUSE_LIBTIFF_BUILTIN@,$COND_WXUSE_LIBTIFF_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_PLATFORM_WIN32_1@,$COND_PLATFORM_WIN32_1,;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_0@,$COND_PLATFORM_WIN32_0,;t t -s,@COND_MONOLITHIC_1@,$COND_MONOLITHIC_1,;t t -s,@COND_MONOLITHIC_0@,$COND_MONOLITHIC_0,;t t +s,@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@,$COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0,;t t +s,@COND_WXUSE_REGEX_BUILTIN@,$COND_WXUSE_REGEX_BUILTIN,;t t +s,@COND_TOOLKIT_MGL_USE_GUI_1_WXUNIV_1@,$COND_TOOLKIT_MGL_USE_GUI_1_WXUNIV_1,;t t +s,@COND_MONOLITHIC_1_SHARED_0@,$COND_MONOLITHIC_1_SHARED_0,;t t +s,@COND_MONOLITHIC_1_SHARED_1@,$COND_MONOLITHIC_1_SHARED_1,;t t +s,@COND_TOOLKIT_X11@,$COND_TOOLKIT_X11,;t t +s,@COND_OFFICIAL_BUILD_0@,$COND_OFFICIAL_BUILD_0,;t t +s,@COND_TOOLKIT_OS2@,$COND_TOOLKIT_OS2,;t t +s,@COND_TOOLKIT_MGL_USE_GUI_1@,$COND_TOOLKIT_MGL_USE_GUI_1,;t t +s,@COND_WXUSE_ZLIB_BUILTIN@,$COND_WXUSE_ZLIB_BUILTIN,;t t +s,@COND_TOOLKIT_MOTIF@,$COND_TOOLKIT_MOTIF,;t t +s,@COND_MONOLITHIC_0_SHARED_1@,$COND_MONOLITHIC_0_SHARED_1,;t t +s,@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@,$COND_PLATFORM_MACOSX_1_USE_SOVERSION_1,;t t +s,@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0@,$COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0,;t t +s,@COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_1@,$COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_1,;t t +s,@COND_MONOLITHIC_0_SHARED_0@,$COND_MONOLITHIC_0_SHARED_0,;t t s,@COND_USE_GUI_1@,$COND_USE_GUI_1,;t t -s,@COND_DEPS_TYPE_GCC@,$COND_DEPS_TYPE_GCC,;t t s,@COND_USE_GUI_0@,$COND_USE_GUI_0,;t t +s,@COND_TOOLKIT_MSW@,$COND_TOOLKIT_MSW,;t t +s,@COND_TOOLKIT_X11_USE_GUI_1@,$COND_TOOLKIT_X11_USE_GUI_1,;t t +s,@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@,$COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0,;t t +s,@COND_BUILD_DEBUG@,$COND_BUILD_DEBUG,;t t +s,@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_1@,$COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_1,;t t +s,@COND_WXUSE_LIBTIFF_BUILTIN@,$COND_WXUSE_LIBTIFF_BUILTIN,;t t +s,@COND_OFFICIAL_BUILD_1@,$COND_OFFICIAL_BUILD_1,;t t +s,@COND_BUILD_RELEASE@,$COND_BUILD_RELEASE,;t t +s,@COND_USE_SOVERLINUX_1@,$COND_USE_SOVERLINUX_1,;t t +s,@COND_USE_SOSYMLINKS_1@,$COND_USE_SOSYMLINKS_1,;t t +s,@COND_TOOLKIT_COCOA@,$COND_TOOLKIT_COCOA,;t t +s,@COND_PLATFORM_MACOSX_1@,$COND_PLATFORM_MACOSX_1,;t t +s,@COND_WXUSE_LIBJPEG_BUILTIN@,$COND_WXUSE_LIBJPEG_BUILTIN,;t t +s,@COND_WXUSE_LIBPNG_BUILTIN@,$COND_WXUSE_LIBPNG_BUILTIN,;t t +s,@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@,$COND_MONOLITHIC_0_SHARED_1_USE_GUI_1,;t t +s,@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@,$COND_PLATFORM_MACOSX_0_USE_SOVERSION_1,;t t +s,@COND_TOOLKIT_X11_USE_GUI_1_WXUNIV_1@,$COND_TOOLKIT_X11_USE_GUI_1_WXUNIV_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_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_TOOLKIT_GTK@,$COND_TOOLKIT_GTK,;t t +s,@COND_PLATFORM_WIN32_0@,$COND_PLATFORM_WIN32_0,;t t +s,@COND_PLATFORM_WIN32_1@,$COND_PLATFORM_WIN32_1,;t t +s,@COND_TOOLKIT_GTK_USE_GUI_1@,$COND_TOOLKIT_GTK_USE_GUI_1,;t t +s,@COND_TOOLKIT_MAC@,$COND_TOOLKIT_MAC,;t t +s,@COND_TOOLKIT_MSW_USE_GUI_1@,$COND_TOOLKIT_MSW_USE_GUI_1,;t t +s,@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@,$COND_MONOLITHIC_0_SHARED_0_USE_GUI_1,;t t +s,@COND_SHARED_1@,$COND_SHARED_1,;t t s,@COND_PLATFORM_MAC_1@,$COND_PLATFORM_MAC_1,;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 @@ -35552,11 +35659,6 @@ s,@WX_LIBRARY_LINK2_GL@,$WX_LIBRARY_LINK2_GL,;t t s,@WX_ALL@,$WX_ALL,;t t s,@WX_ALL_INSTALLED@,$WX_ALL_INSTALLED,;t t s,@SHARED_LD@,$SHARED_LD,;t t -s,@CODE_GEN_FLAGS@,$CODE_GEN_FLAGS,;t t -s,@CODE_GEN_FLAGS_CXX@,$CODE_GEN_FLAGS_CXX,;t t -s,@SONAME_FLAGS@,$SONAME_FLAGS,;t t -s,@SONAME_FLAGS_GL@,$SONAME_FLAGS_GL,;t t -s,@WX_TARGET_LIBRARY_SONAME@,$WX_TARGET_LIBRARY_SONAME,;t t s,@WX_TARGET_LIBRARY_TYPE@,$WX_TARGET_LIBRARY_TYPE,;t t s,@STATIC_FLAG@,$STATIC_FLAG,;t t s,@WXDEBUG_DEFINE@,$WXDEBUG_DEFINE,;t t @@ -35578,6 +35680,8 @@ s,@WXCONFIG_LIBS_STATIC_GL@,$WXCONFIG_LIBS_STATIC_GL,;t t s,@WXCONFIG_INCLUDE@,$WXCONFIG_INCLUDE,;t t s,@WXCONFIG_RPATH@,$WXCONFIG_RPATH,;t t s,@WX_LARGEFILE_FLAGS@,$WX_LARGEFILE_FLAGS,;t t +s,@CODE_GEN_FLAGS@,$CODE_GEN_FLAGS,;t t +s,@CODE_GEN_FLAGS_CXX@,$CODE_GEN_FLAGS_CXX,;t t s,@ALL_OBJECTS@,$ALL_OBJECTS,;t t s,@ALL_HEADERS@,$ALL_HEADERS,;t t s,@ALL_SOURCES@,$ALL_SOURCES,;t t @@ -36157,6 +36261,7 @@ echo echo "Configured wxWindows ${WX_VERSION} for \`${host}'" echo "" echo " Which GUI toolkit should wxWindows use? ${TOOLKIT:-base only}" +echo " Should wxWindows be compiled into single library? ${wxUSE_MONOLITHIC:-yes}" echo " Should wxWindows be compiled in debug mode? ${wxUSE_DEBUG:-no}" echo " Should wxWindows be linked as a shared library? ${wxUSE_SHARED:-no}"