# include <unistd.h>
#endif"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP CXX CXXFLAGS ac_ct_CXX RANLIB ac_ct_RANLIB AR INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA STRIP IF_GNU_MAKE YACC LEX LEXLIB LEX_OUTPUT_ROOT LN_S CXXCPP PKG_CONFIG GTK_CFLAGS GTK_LIBS GTK_CONFIG PANGOFT2_CFLAGS PANGOFT2_LIBS X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS PANGOX_CFLAGS PANGOX_LIBS PANGOXFT_CFLAGS PANGOXFT_LIBS AIX_CXX_LD RESCOMP DEREZ SETFILE LIBICONV wxUSE_ZLIB wxUSE_REGEX wxUSE_ODBC wxUSE_LIBJPEG wxUSE_LIBPNG wxUSE_LIBTIFF 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 COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1 COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_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 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_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 RESCOMP DEREZ SETFILE LIBICONV wxUSE_ZLIB wxUSE_REGEX wxUSE_ODBC wxUSE_LIBJPEG wxUSE_LIBPNG wxUSE_LIBTIFF VENDOR OFFICIAL_BUILD WXUNIV MONOLITHIC EXTRALIBS EXTRALIBS_GUI EXTRALIBS_OPENGL UNICODE BUILD SHARED TOOLKIT_LOWERCASE TOOLKIT_VERSION SAMPLES_RPATH_FLAG HOST_SUFFIX SET_MAKE MAKE_SET INSTALL_DIR LDFLAGS_GUI PLATFORM_UNIX PLATFORM_WIN32 PLATFORM_MSDOS PLATFORM_MAC PLATFORM_MACOSX SO_SUFFIX DLLPREFIX AIX_CXX_LD SHARED_LD_CC SHARED_LD_CXX PIC_FLAG USE_SOVERSION USE_SOVERLINUX USE_SOVERSOLARIS USE_MACVERSION USE_SOSYMLINKS SONAME_FLAG DEPS_TRACKING COND_BUILD_DEBUG COND_BUILD_RELEASE COND_DEPS_TRACKING_0 COND_DEPS_TRACKING_1 COND_MONOLITHIC_0 COND_MONOLITHIC_0_SHARED_0 COND_MONOLITHIC_0_SHARED_0_USE_GUI_1 COND_MONOLITHIC_0_SHARED_1 COND_MONOLITHIC_0_SHARED_1_USE_GUI_1 COND_MONOLITHIC_1 COND_MONOLITHIC_1_SHARED_0 COND_MONOLITHIC_1_SHARED_1 COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1 COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1 COND_PLATFORM_MACOSX_0_USE_SOVERSION_1 COND_PLATFORM_MACOSX_1 COND_PLATFORM_MACOSX_1_USE_SOVERSION_1 COND_PLATFORM_UNIX_1 COND_PLATFORM_WIN32_0 COND_PLATFORM_WIN32_1 COND_TOOLKIT_COCOA COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_GTK COND_TOOLKIT_GTK_USE_GUI_1 COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_1 COND_TOOLKIT_MAC COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_MGL COND_TOOLKIT_MGL_USE_GUI_1 COND_TOOLKIT_MGL_USE_GUI_1_WXUNIV_1 COND_TOOLKIT_MOTIF COND_TOOLKIT_MOTIF_USE_GUI_1 COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_MSW COND_TOOLKIT_MSW_USE_GUI_1 COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_1 COND_TOOLKIT_OS2 COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_X11 COND_TOOLKIT_X11_USE_GUI_1 COND_TOOLKIT_X11_USE_GUI_1_WXUNIV_1 COND_UNICODE_1 COND_USE_GUI_0 COND_USE_GUI_1 COND_USE_GUI_1_WXUNIV_0 COND_USE_GUI_1_WXUNIV_1 COND_USE_SOSYMLINKS_1 COND_USE_SOVERLINUX_1 COND_USE_SOVERSION_0 COND_USE_SOVERSOLARIS_1 COND_WXUNIV_1 COND_WXUSE_LIBJPEG_BUILTIN COND_WXUSE_LIBPNG_BUILTIN COND_WXUSE_LIBTIFF_BUILTIN COND_WXUSE_ODBC_BUILTIN COND_WXUSE_REGEX_BUILTIN COND_WXUSE_ZLIB_BUILTIN COND_PLATFORM_MAC_1 COND_SHARED_1 COND_SHARED_0 COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA COND_PLATFORM_MACOSX_1_TOOLKIT_GTK COND_PLATFORM_MACOSX_1_TOOLKIT_MAC COND_MONOLITHIC_0_SHARED_0_USE_HTML_1 COND_MONOLITHIC_0_SHARED_1_USE_HTML_1 COND_SHARED_0_USE_GUI_1_USE_OPENGL_1 COND_SHARED_1_USE_GUI_1_USE_OPENGL_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 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.
--enable-shared create shared library code
--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)
+ --enable-stl use STL for containers
--enable-debug_flag set __WXDEBUG__ flag (recommended for developers!)
--enable-debug_info create code with debugging information
--enable-debug_gdb create code with extra GDB debugging information
DEBUG_CONFIGURE=0
if test $DEBUG_CONFIGURE = 1; then
DEFAULT_wxUSE_UNIVERSAL=no
+ DEFAULT_wxUSE_STL=no
DEFAULT_wxUSE_NANOX=no
DEFAULT_wxUSE_MEM_TRACING=no
DEFAULT_wxUSE_DEBUG_CONTEXT=no
DEFAULT_wxUSE_DMALLOC=no
- DEFAULT_wxUSE_PRECOMP=no
DEFAULT_wxUSE_APPLE_IEEE=no
DEFAULT_wxUSE_LOG=yes
DEFAULT_wxUSE_MONOLITHIC=yes
else
DEFAULT_wxUSE_UNIVERSAL=no
+ DEFAULT_wxUSE_STL=no
DEFAULT_wxUSE_NANOX=no
DEFAULT_wxUSE_MEM_TRACING=no
DEFAULT_wxUSE_DEBUG_CONTEXT=no
DEFAULT_wxUSE_DMALLOC=no
- DEFAULT_wxUSE_PRECOMP=no
DEFAULT_wxUSE_APPLE_IEEE=yes
DEFAULT_wxUSE_LOG=yes
fi
-
enablestring=
- echo "$as_me:$LINENO: checking for --${enablestring:-enable}-precomp" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-precomp... $ECHO_C" >&6
+ echo "$as_me:$LINENO: checking for --${enablestring:-enable}-stl" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-stl... $ECHO_C" >&6
no_cache=0
- # Check whether --enable-precomp or --disable-precomp was given.
-if test "${enable_precomp+set}" = set; then
- enableval="$enable_precomp"
+ # Check whether --enable-stl or --disable-stl was given.
+if test "${enable_stl+set}" = set; then
+ enableval="$enable_stl"
if test "$enableval" = yes; then
- ac_cv_use_precomp='wxUSE_PRECOMP=yes'
+ ac_cv_use_stl='wxUSE_STL=yes'
else
- ac_cv_use_precomp='wxUSE_PRECOMP=no'
+ ac_cv_use_stl='wxUSE_STL=no'
fi
else
- LINE=`grep "wxUSE_PRECOMP" ${wx_arg_cache_file}`
+ LINE=`grep "wxUSE_STL" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
eval "DEFAULT_$LINE"
else
no_cache=1
fi
- ac_cv_use_precomp='wxUSE_PRECOMP='$DEFAULT_wxUSE_PRECOMP
+ ac_cv_use_stl='wxUSE_STL='$DEFAULT_wxUSE_STL
fi;
- eval "$ac_cv_use_precomp"
+ eval "$ac_cv_use_stl"
if test "$no_cache" != 1; then
- echo $ac_cv_use_precomp >> ${wx_arg_cache_file}.tmp
+ echo $ac_cv_use_stl >> ${wx_arg_cache_file}.tmp
fi
- if test "$wxUSE_PRECOMP" = yes; then
+ if test "$wxUSE_STL" = yes; then
echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6
else
## FIXME: This is a blatant hack
if test "x$wxUSE_COCOA" != "x" -a "$wxUSE_COCOA" != "0" ; then
wxUSE_PRINTING_ARCHITECTURE=no
- wxUSE_HELP=no
wxUSE_CLIPBOARD=no
wxUSE_DRAG_AND_DROP=no
wxUSE_DATAOBJ=no
# Generic notebook requires tab dialog
DEFAULT_wxUSE_TABDIALOG=yes
DEFAULT_wxUSE_TOOLBAR_NATIVE=no
- DEFAULT_wxUSE_GAUGE=no
DEFAULT_wxUSE_SCROLLBAR=no
- DEFAULT_wxUSE_COMBOBOX=no
- DEFAULT_wxUSE_CALCTRL=no
- DEFAULT_wxUSE_SPINBTN=no
- DEFAULT_wxUSE_SPINCTRL=no
DEFAULT_wxUSE_TOOLTIPS=no
DEFAULT_wxUSE_DRAGIMAGE=no
- DEFAULT_wxUSE_FINDREPLDLG=no
- DEFAULT_wxUSE_FONTDLG=no
- DEFAULT_wxUSE_GRID=no
- DEFAULT_wxUSE_NUMBERDLG=no
- DEFAULT_wxUSE_PROGRESSDLG=no
- DEFAULT_wxUSE_SASH=no
- DEFAULT_wxUSE_SPLITTER=no
- DEFAULT_wxUSE_WIZARDDLG=no
- DEFAULT_wxUSE_SPLITTER=no
- DEFAULT_wxUSE_STARTUP_TIPS=no
fi
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
for ac_declaration in \
- '' \
+ ''\
+ '#include <stdlib.h>' \
'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 ();' \
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-$ac_declaration
#include <stdlib.h>
+$ac_declaration
int
main ()
{
fi
fi
for ac_declaration in \
- '' \
+ ''\
+ '#include <stdlib.h>' \
'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 ();' \
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-$ac_declaration
#include <stdlib.h>
+$ac_declaration
int
main ()
{
- echo "$as_me:$LINENO: checking if w32api has good enough MSIE support" >&5
-echo $ECHO_N "checking if w32api has good enough MSIE support... $ECHO_C" >&6
-if test "${wx_cv_w32api_win32_ie+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
- cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <w32api.h>
-int
-main ()
-{
-
- #define wxCHECK_W32API_VERSION( major, minor ) \
- ( defined( __W32API_MAJOR_VERSION ) && defined( __W32API_MINOR_VERSION ) \
- && ( ( __W32API_MAJOR_VERSION > (major) ) \
- || ( __W32API_MAJOR_VERSION == (major) && __W32API_MINOR_VERSION >= (minor))))
-
- #if !wxCHECK_W32API_VERSION(1,1)
- #error You need w32api 1.1 or newer
- #endif
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-
- wx_cv_w32api_win32_ie=yes
-
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
- wx_cv_w32api_win32_ie=no
-
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-
-fi
-echo "$as_me:$LINENO: result: $wx_cv_w32api_win32_ie" >&5
-echo "${ECHO_T}$wx_cv_w32api_win32_ie" >&6
- if test "$wx_cv_w32api_win32_ie" = "yes" ; then
- CPPFLAGS="$CPPFLAGS -D_WIN32_IE=0x400"
- fi
-
- LIBS="$LIBS -lwinspool -lwinmm -lshell32 -lcomctl32 -lctl3d32 -ladvapi32 -lwsock32 -lgdi32"
+ LIBS="$LIBS -lwinspool -lwinmm -lshell32 -lcomctl32 -lcomdlg32 -lctl3d32 -ladvapi32 -lwsock32 -lgdi32"
if test "$wxUSE_ACCESSIBILITY" = "yes" ; then
LIBS="$LIBS -loleacc"
case "${host}" in
*-*-cygwin* )
- LIBS="$LIBS -lkernel32 -luser32 -lcomdlg32"
+ LIBS="$LIBS -lkernel32 -luser32"
TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D__WIN95__"
esac
WIN32INSTALL=win32install
fi
-if test "$USE_DARWIN" = 1; then
- if test "$wxUSE_PRECOMP" = "yes"; then
- CPPFLAGS="$CPPFLAGS -cpp-precomp"
- else
- CPPFLAGS="$CPPFLAGS -no-cpp-precomp"
- fi
-fi
-
if test "$wxUSE_GUI" = "yes"; then
USE_GUI=1
if test $succeeded = yes; then
CXXFLAGS="$CXXFLAGS $PANGOFT2_CFLAGS"
- LIBS="$LIBS $PANGOFT2_LIBS"
+ GUI_TK_LIBRARY="$GUI_TK_LIBRARY $PANGOFT2_LIBS"
else
fi
TOOLKIT_INCLUDE="$wx_cv_cflags_gtk"
- GUI_TK_LIBRARY="$wx_cv_libs_gtk"
+ GUI_TK_LIBRARY="$wx_cv_libs_gtk $GUI_TK_LIBRARY"
AFMINSTALL=afminstall
TOOLKIT=GTK
if test $succeeded = yes; then
CXXFLAGS="$CXXFLAGS $PANGOX_CFLAGS"
- LIBS="$LIBS $PANGOX_LIBS"
+ GUI_TK_LIBRARY="$GUI_TK_LIBRARY $PANGOX_LIBS"
else
if test $succeeded = yes; then
CXXFLAGS="$CXXFLAGS $PANGOFT2_CFLAGS"
- LIBS="$LIBS $PANGOFT2_LIBS"
+ GUI_TK_LIBRARY="$GUI_TK_LIBRARY $PANGOFT2_LIBS"
else
if test $succeeded = yes; then
CXXFLAGS="$CXXFLAGS $PANGOXFT_CFLAGS"
- LIBS="$LIBS $PANGOXFT_LIBS"
+ GUI_TK_LIBRARY="$GUI_TK_LIBRARY $PANGOXFT_LIBS"
else
fi
+USE_OPENGL=0
if test "$wxUSE_OPENGL" = "yes"; then
if test "$wxUSE_MAC" = 1 -o "$wxUSE_COCOA" = "1"; then
OPENGL_LIBS="-framework OpenGL -framework AGL"
fi
if test "$wxUSE_OPENGL" = "yes"; then
+ USE_OPENGL=1
cat >>confdefs.h <<\_ACEOF
#define wxUSE_OPENGL 1
_ACEOF
if test "$cross_compiling" = "yes"; then
TOOLCHAIN_NAME="${TOOLCHAIN_NAME}-${host_alias}"
TOOLCHAIN_NAME_GL="${TOOLCHAIN_NAME_GL}-${host_alias}"
+ HOST_SUFFIX="-${host_alias}"
fi
WX_LIBRARY="wx_${TOOLCHAIN_NAME}"
case "${host}" in
*-*-cygwin* | *-*-mingw32* )
-
-
-
- if test "$cross_compiling" != "yes" -a "$TOOLKIT_DIR" = "msw"; then
- WX_LIBRARY="wxmsw${WX_MSW_VERSION}${lib_unicode_suffix}${lib_debug_suffix}"
- WX_LIBRARY_GL="wxmsw_gl${WX_MSW_VERSION}${lib_unicode_suffix}${lib_debug_suffix}"
- WX_LIBRARY_NAME_SHARED="${WX_LIBRARY}.${SO_SUFFIX}"
- WX_LIBRARY_NAME_SHARED_GL="${WX_LIBRARY_GL}.${SO_SUFFIX}"
- else
- WX_LIBRARY_NAME_SHARED="lib${WX_LIBRARY}.${SO_SUFFIX}"
- WX_LIBRARY_NAME_SHARED_GL="lib${WX_LIBRARY_GL}.${SO_SUFFIX}"
- fi
+ WX_LIBRARY_NAME_SHARED="lib${WX_LIBRARY}.${SO_SUFFIX}"
+ WX_LIBRARY_NAME_SHARED_GL="lib${WX_LIBRARY_GL}.${SO_SUFFIX}"
;;
*-*-darwin* )
if test "$wxUSE_SHARED" = "yes"; then
SHARED=1
- if test "$wxUSE_OPENGL" = "yes"; then
- WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS CREATE_INSTALLED_LINKS_GL"
- WX_ALL="\$(build_libdir)/${WX_LIBRARY_LINK1} \$(build_libdir)/${WX_LIBRARY_LINK1_GL}"
- else
- WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS"
- WX_ALL="\$(build_libdir)/${WX_LIBRARY_LINK1}"
- fi
-
- if test "$GCC" = "yes"; then
- PIC_FLAG="-fPIC"
- fi
-
-
found_versioning=no
fi
- SHARED_LD="${CXX} -shared -o"
-
case "${host}" in
- *-hp-hpux* )
- if test "$GCC" = "yes"; then
- SHARED_LD="${CXX} -shared ${PIC_FLAG} -o"
- else
- LDFLAGS="$LDFLAGS -L/usr/lib"
-
- SHARED_LD="${CXX} -b -o"
- PIC_FLAG="+Z"
- fi
-
- if test "$wxUSE_OPENGL" = "yes"; then
- WX_ALL_INSTALLED="preinstall_gl"
- WX_ALL="\$(build_libdir)/${WX_LIBRARY_NAME_SHARED} \$(build_libdir)/${WX_LIBRARY_NAME_SHARED_GL}"
- else
- WX_ALL="\$(build_libdir)/${WX_LIBRARY_NAME_SHARED}"
- fi
- ;;
-
*-*-linux* | *-*-gnu* )
- if test "$GCC" != "yes"; then
- echo "$as_me:$LINENO: checking for Intel compiler" >&5
-echo $ECHO_N "checking for Intel compiler... $ECHO_C" >&6
-if test "${wx_cv_prog_icc+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
- cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-int
-main ()
-{
-
- #ifndef __INTEL_COMPILER
- #error Not icc
- #endif
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- wx_cv_prog_icc=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-wx_cv_prog_icc=no
-
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-
-fi
-echo "$as_me:$LINENO: result: $wx_cv_prog_icc" >&5
-echo "${ECHO_T}$wx_cv_prog_icc" >&6
- if test "$wx_cv_prog_icc" = "yes"; then
- PIC_FLAG="-KPIC"
- fi
- fi
-
SAMPLES_RPATH_FLAG="-Wl,-rpath,\$(top_builddir)lib"
;;
SAMPLES_RPATH_FLAG="-R\$(top_builddir)lib"
fi
;;
-
- *-*-darwin* )
- TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -DWXMAKINGDLL"
- CFLAGS="$CFLAGS -fno-common"
- CXXFLAGS="$CXXFLAGS -fno-common"
- SHARED_LD="\${top_srcdir}/distrib/mac/shared-ld-sh -undefined suppress -flat_namespace -o"
- PIC_FLAG="-dynamic -fPIC"
- ;;
-
- *-*-aix* )
- if test "$GCC" != "yes"; then
- # Extract the first word of "makeC++SharedLib", so it can be a program name with args.
-set dummy makeC++SharedLib; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_AIX_CXX_LD+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- if test -n "$AIX_CXX_LD"; then
- ac_cv_prog_AIX_CXX_LD="$AIX_CXX_LD" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_prog_AIX_CXX_LD="makeC++SharedLib"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-
- test -z "$ac_cv_prog_AIX_CXX_LD" && ac_cv_prog_AIX_CXX_LD="/usr/lpp/xlC/bin/makeC++SharedLib"
-fi
-fi
-AIX_CXX_LD=$ac_cv_prog_AIX_CXX_LD
-if test -n "$AIX_CXX_LD"; then
- echo "$as_me:$LINENO: result: $AIX_CXX_LD" >&5
-echo "${ECHO_T}$AIX_CXX_LD" >&6
-else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-
- SHARED_LD="$(AIX_CXX_LD) -p 0 -o"
- fi
- ;;
-
- *-*-cygwin* | *-*-mingw32* )
- WX_LIBRARY_IMPORTLIB="${WX_LIBRARY_NAME_SHARED}.a"
-
- SHARED_LD="${CXX} -shared -Wl,--out-implib,lib/${WX_LIBRARY_IMPORTLIB} -o"
- TOOLCHAIN_DLL_DEFS="${TOOLCHAIN_DLL_DEFS} -DWXUSINGDLL=1"
-
- PIC_FLAG="-UWXUSINGDLL -DWXMAKINGDLL=1 -D_DLL=1 -D_WINDLL=1"
-
- WX_ALL="\$(build_libdir)/${WX_LIBRARY_NAME_SHARED}"
- WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS"
-
- if test "$wxUSE_OPENGL" = "yes"; then
- LIBS="${LIBS} ${OPENGL_LIBS}"
- fi
- ;;
-
- *-*-beos* )
- SHARED_LD="${LD} -shared -o"
- ;;
-
- *-*-irix* )
- if test "$GCC" != "yes"; then
- PIC_FLAG="-KPIC"
- fi
- ;;
-
- *-*-freebsd* | *-*-openbsd* | *-*-netbsd* | \
- *-*-sunos4* | \
- *-*-osf* | \
- *-*-dgux5* | \
- *-*-sysv5* )
- ;;
-
- *)
- { { echo "$as_me:$LINENO: error: unknown system type $host." >&5
-echo "$as_me: error: unknown system type $host." >&2;}
- { (exit 1); exit 1; }; }
esac
if test "x$WX_TARGET_LIBRARY" = "x"; then
if test "$wxUSE_PERMISSIVE" = "yes" ; then
CODE_GEN_FLAGS="$CODE_GEN_FLAGS -fpermissive"
fi
- if test "$USE_WIN32" = 1 ; then
- # I'm not even really sure what this was ever added to solve,
- # but someone added it for mingw native builds, so I guess
- # they had a reason, right??
- CODE_GEN_FLAGS="$CODE_GEN_FLAGS -fno-pcc-struct-return"
- fi
case "${host}" in
powerpc*-*-aix* )
fi
+if test "$wxUSE_STL" = "yes"; then
+ cat >>confdefs.h <<\_ACEOF
+#define wxUSE_STL 1
+_ACEOF
+
+fi
+
if test "$wxUSE_APPLE_IEEE" = "yes"; then
cat >>confdefs.h <<\_ACEOF
#define wxUSE_APPLE_IEEE 1
fi
-if test "$wxUSE_FS_INET" = "yes"; then
- cat >>confdefs.h <<\_ACEOF
-#define wxUSE_FS_INET 1
-_ACEOF
-
-fi
-
if test "$wxUSE_FS_ZIP" = "yes"; then
cat >>confdefs.h <<\_ACEOF
#define wxUSE_FS_ZIP 1
echo "$as_me: WARNING: wxSocket not yet supported under MGL... disabled" >&2;}
wxUSE_SOCKETS="no"
fi
+ if test "$wxUSE_COCOA" = "1"; then
+ { echo "$as_me:$LINENO: WARNING: wxSocket not yet supported under Cocoa... disabled" >&5
+echo "$as_me: WARNING: wxSocket not yet supported under Cocoa... disabled" >&2;}
+ wxUSE_SOCKETS="no"
+ fi
fi
if test "$wxUSE_SOCKETS" = "yes"; then
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS sockets"
fi
+if test "$wxUSE_PROTOCOL" = "yes"; then
+ if test "$wxUSE_SOCKETS" != "yes"; then
+ { echo "$as_me:$LINENO: WARNING: Protocol classes require sockets... disabled" >&5
+echo "$as_me: WARNING: Protocol classes require sockets... disabled" >&2;}
+ wxUSE_PROTOCOL=no
+ fi
+fi
+
+if test "$wxUSE_PROTOCOL" = "yes"; then
+ cat >>confdefs.h <<\_ACEOF
+#define wxUSE_PROTOCOL 1
+_ACEOF
+
+
+ if test "$wxUSE_PROTOCOL_HTTP" = "yes"; then
+ cat >>confdefs.h <<\_ACEOF
+#define wxUSE_PROTOCOL_HTTP 1
+_ACEOF
+
+ fi
+ if test "$wxUSE_PROTOCOL_FTP" = "yes"; then
+ cat >>confdefs.h <<\_ACEOF
+#define wxUSE_PROTOCOL_FTP 1
+_ACEOF
+
+ fi
+ if test "$wxUSE_PROTOCOL_FILE" = "yes"; then
+ cat >>confdefs.h <<\_ACEOF
+#define wxUSE_PROTOCOL_FILE 1
+_ACEOF
+
+ fi
+else
+ if test "$wxUSE_FS_INET" = "yes"; then
+ { echo "$as_me:$LINENO: WARNING: HTTP filesystem require protocol classes... disabled" >&5
+echo "$as_me: WARNING: HTTP filesystem require protocol classes... disabled" >&2;}
+ wxUSE_FS_INET="no"
+ fi
+fi
+
+if test "$wxUSE_URL" = "yes"; then
+ if test "$wxUSE_PROTOCOL" != "yes"; then
+ { echo "$as_me:$LINENO: WARNING: wxURL class requires wxProtocol... disabled" >&5
+echo "$as_me: WARNING: wxURL class requires wxProtocol... disabled" >&2;}
+ wxUSE_URL=no
+ fi
+ if test "$wxUSE_URL" = "yes"; then
+ cat >>confdefs.h <<\_ACEOF
+#define wxUSE_URL 1
+_ACEOF
+
+ fi
+fi
+
+if test "$wxUSE_FS_INET" = "yes"; then
+ cat >>confdefs.h <<\_ACEOF
+#define wxUSE_FS_INET 1
+_ACEOF
+
+fi
+
if test "$wxUSE_GUI" = "yes"; then
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS layout"
fi
+if test "$wxUSE_MDI_ARCHITECTURE" = "yes"; then
+ if test "$wxUSE_COCOA" = "1"; then
+ { echo "$as_me:$LINENO: WARNING: MDI not yet supported under Cocoa... disabled" >&5
+echo "$as_me: WARNING: MDI not yet supported under Cocoa... disabled" >&2;}
+ fi
+fi
+
if test "$wxUSE_MDI_ARCHITECTURE" = "yes"; then
fi
-if test "$wxUSE_PROTOCOL" = "yes"; then
- if test "$wxUSE_SOCKETS" != "yes"; then
- { echo "$as_me:$LINENO: WARNING: Protocol classes require sockets... disabled" >&5
-echo "$as_me: WARNING: Protocol classes require sockets... disabled" >&2;}
- wxUSE_PROTOCOL=no
- fi
-
- if test "$wxUSE_PROTOCOL" = "yes"; then
- cat >>confdefs.h <<\_ACEOF
-#define wxUSE_PROTOCOL 1
-_ACEOF
-
-
- if test "$wxUSE_PROTOCOL_HTTP" = "yes"; then
- cat >>confdefs.h <<\_ACEOF
-#define wxUSE_PROTOCOL_HTTP 1
-_ACEOF
-
- fi
- if test "$wxUSE_PROTOCOL_FTP" = "yes"; then
- cat >>confdefs.h <<\_ACEOF
-#define wxUSE_PROTOCOL_FTP 1
-_ACEOF
-
- fi
- if test "$wxUSE_PROTOCOL_FILE" = "yes"; then
- cat >>confdefs.h <<\_ACEOF
-#define wxUSE_PROTOCOL_FILE 1
-_ACEOF
-
- fi
- fi
-fi
-
-if test "$wxUSE_URL" = "yes"; then
- if test "$wxUSE_PROTOCOL" != "yes"; then
- { echo "$as_me:$LINENO: WARNING: wxURL class requires wxProtocol... disabled" >&5
-echo "$as_me: WARNING: wxURL class requires wxProtocol... disabled" >&2;}
- wxUSE_URL=no
- fi
- if test "$wxUSE_URL" = "yes"; then
- cat >>confdefs.h <<\_ACEOF
-#define wxUSE_URL 1
-_ACEOF
-
- fi
-fi
-
if test "$wxUSE_MINIFRAME" = "yes"; then
cat >>confdefs.h <<\_ACEOF
#define wxUSE_MINIFRAME 1
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS minifram"
fi
+USE_HTML=0
if test "$wxUSE_HTML" = "yes"; then
cat >>confdefs.h <<\_ACEOF
#define wxUSE_HTML 1
_ACEOF
- SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS html htlbox"
+ USE_HTML=1
+ SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS html html/about html/help html/helpview html/printing html/test html/virtual html/widget html/zip htlbox"
fi
if test "$wxUSE_VALIDATORS" = "yes"; then
if test "$wxUSE_GUI" = "yes"; then
- LIBS="$GUI_TK_LIBRARY $PNG_LINK $JPEG_LINK $TIFF_LINK $LIBS"
-
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS artprov controls dialogs \
drawing dynamic erase event exec font image \
EXTRA_CFLAGS="$WXDEBUG $WXODBCFLAG $PROFILE $OPTIMISE"
-CPPFLAGS=`echo $INCLUDES $CPPFLAGS | sed 's/ \\+/ /g'`
+CPPFLAGS=`echo $WXDEBUG_DEFINE $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'`
+EXTRALIBS="$LDFLAGS $LDFLAGS_VERSIONING $LIBS $DMALLOC_LIBS"
+if test "$wxUSE_GUI" = "yes"; then
+ EXTRALIBS_GUI=`echo $GUI_TK_LIBRARY $PNG_LINK $JPEG_LINK $TIFF_LINK | sed 's/ \+/ /g'`
+fi
+if test "$wxUSE_OPENGL" = "yes"; then
+ EXTRALIBS_OPENGL="$LDFLAGS_GL $OPENGL_LIBS"
+fi
LDFLAGS="$LDFLAGS $PROFILE"
-EXTRALIBS="$LDFLAGS $LDFLAGS_VERSIONING $LIBS $DMALLOC_LIBS"
-
if test $wxUSE_MONOLITHIC = "yes" ; then
MONOLITHIC=1
else
+
+
TOOLKIT_LOWERCASE=`echo $TOOLKIT | tr [A-Z] [a-z]`
+
if test "x$BAKEFILE_CHECK_BASICS" != "xno"; then
if test -n "$ac_tool_prefix"; then
exit 1
;;
- *.o | *.a)
+ *.o | *.a | *.dylib)
# collect object files
objects="\${objects} \${1}"
;;
if test "x$GCC" = "xyes"; then
DEPSMODE=gcc
DEPS_TRACKING=1
+ case "${host}" in
+ powerpc-*-darwin* )
+ DEPSFLAG_GCC="-no-cpp-precomp -MMD"
+ ;;
+ * )
+ DEPSFLAG_GCC="-MMD"
+ ;;
+ esac
echo "$as_me:$LINENO: result: gcc" >&5
echo "${ECHO_T}gcc" >&6
else
DEPSMODE=$DEPSMODE
DEPSDIR=.deps
+DEPSFLAG_GCC="$DEPSFLAG_GCC"
mkdir -p \$DEPSDIR
if test \$DEPSMODE = gcc ; then
- \${*} -MMD
+ \${*} \${DEPSFLAG_GCC}
status=\${?}
if test \${status} != 0 ; then
exit \${status}
- 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=""
+ 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_DEPS_TRACKING_0="#"
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=""
+ COND_MONOLITHIC_0="#"
+ if test "x$MONOLITHIC" = "x0" ; then
+ COND_MONOLITHIC_0=""
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=""
+ COND_MONOLITHIC_0_SHARED_0="#"
+ if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x0" ; then
+ COND_MONOLITHIC_0_SHARED_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=""
+ 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
- COND_USE_SOVERSOLARIS_1="#"
- if test "x$USE_SOVERSOLARIS" = "x1" ; then
- COND_USE_SOVERSOLARIS_1=""
+ COND_MONOLITHIC_0_SHARED_1="#"
+ if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x1" ; then
+ COND_MONOLITHIC_0_SHARED_1=""
+ fi
+
+ 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_MONOLITHIC_1="#"
COND_MONOLITHIC_1=""
fi
- COND_UNICODE_1="#"
- if test "x$UNICODE" = "x1" ; then
- COND_UNICODE_1=""
+ COND_MONOLITHIC_1_SHARED_0="#"
+ if test "x$MONOLITHIC" = "x1" -a "x$SHARED" = "x0" ; then
+ COND_MONOLITHIC_1_SHARED_0=""
fi
- COND_MONOLITHIC_0="#"
- if test "x$MONOLITHIC" = "x0" ; then
- COND_MONOLITHIC_0=""
+ COND_MONOLITHIC_1_SHARED_1="#"
+ if test "x$MONOLITHIC" = "x1" -a "x$SHARED" = "x1" ; then
+ COND_MONOLITHIC_1_SHARED_1=""
fi
- COND_TOOLKIT_MGL="#"
- if test "x$TOOLKIT" = "xMGL" ; then
- COND_TOOLKIT_MGL=""
+ COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1="#"
+ if test "x$OFFICIAL_BUILD" = "x0" -a "x$PLATFORM_WIN32" = "x1" ; then
+ COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1=""
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=""
+ COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1="#"
+ if test "x$OFFICIAL_BUILD" = "x1" -a "x$PLATFORM_WIN32" = "x1" ; then
+ COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1=""
fi
- COND_WXUSE_ODBC_BUILTIN="#"
- if test "x$wxUSE_ODBC" = "xbuiltin" ; then
- COND_WXUSE_ODBC_BUILTIN=""
+ 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_SOVERSION_0="#"
- if test "x$USE_SOVERSION" = "x0" ; then
- COND_USE_SOVERSION_0=""
+ COND_PLATFORM_MACOSX_1="#"
+ if test "x$PLATFORM_MACOSX" = "x1" ; then
+ COND_PLATFORM_MACOSX_1=""
fi
- COND_WXUNIV_1="#"
- if test "x$WXUNIV" = "x1" ; then
- COND_WXUNIV_1=""
+ 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_PLATFORM_UNIX_1="#"
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=""
+ COND_PLATFORM_WIN32_0="#"
+ if test "x$PLATFORM_WIN32" = "x0" ; then
+ COND_PLATFORM_WIN32_0=""
fi
- COND_WXUSE_REGEX_BUILTIN="#"
- if test "x$wxUSE_REGEX" = "xbuiltin" ; then
- COND_WXUSE_REGEX_BUILTIN=""
+ COND_PLATFORM_WIN32_1="#"
+ if test "x$PLATFORM_WIN32" = "x1" ; then
+ COND_PLATFORM_WIN32_1=""
fi
- 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=""
+ COND_TOOLKIT_COCOA="#"
+ if test "x$TOOLKIT" = "xCOCOA" ; then
+ COND_TOOLKIT_COCOA=""
fi
- COND_MONOLITHIC_1_SHARED_0="#"
- if test "x$MONOLITHIC" = "x1" -a "x$SHARED" = "x0" ; then
- COND_MONOLITHIC_1_SHARED_0=""
+ 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_MONOLITHIC_1_SHARED_1="#"
- if test "x$MONOLITHIC" = "x1" -a "x$SHARED" = "x1" ; then
- COND_MONOLITHIC_1_SHARED_1=""
+ COND_TOOLKIT_GTK="#"
+ if test "x$TOOLKIT" = "xGTK" ; then
+ COND_TOOLKIT_GTK=""
fi
- COND_TOOLKIT_X11="#"
- if test "x$TOOLKIT" = "xX11" ; then
- COND_TOOLKIT_X11=""
+ 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_OFFICIAL_BUILD_0="#"
- if test "x$OFFICIAL_BUILD" = "x0" ; then
- COND_OFFICIAL_BUILD_0=""
+ 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_MAC="#"
+ if test "x$TOOLKIT" = "xMAC" ; then
+ COND_TOOLKIT_MAC=""
+ 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_MGL="#"
+ if test "x$TOOLKIT" = "xMGL" ; then
+ COND_TOOLKIT_MGL=""
fi
COND_TOOLKIT_MGL_USE_GUI_1="#"
COND_TOOLKIT_MGL_USE_GUI_1=""
fi
- COND_WXUSE_ZLIB_BUILTIN="#"
- if test "x$wxUSE_ZLIB" = "xbuiltin" ; then
- COND_WXUSE_ZLIB_BUILTIN=""
+ 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_TOOLKIT_MOTIF="#"
COND_TOOLKIT_MOTIF=""
fi
- COND_MONOLITHIC_0_SHARED_1="#"
- if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x1" ; then
- COND_MONOLITHIC_0_SHARED_1=""
+ 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_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=""
+ 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_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=""
+ COND_TOOLKIT_MSW="#"
+ if test "x$TOOLKIT" = "xMSW" ; then
+ COND_TOOLKIT_MSW=""
fi
- 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=""
+ 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="#"
- if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x0" ; then
- COND_MONOLITHIC_0_SHARED_0=""
+ 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_USE_GUI_1="#"
- if test "x$USE_GUI" = "x1" ; then
- COND_USE_GUI_1=""
+ 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_USE_GUI_0="#"
- if test "x$USE_GUI" = "x0" ; then
- COND_USE_GUI_0=""
+ COND_TOOLKIT_OS2="#"
+ if test "x$TOOLKIT" = "xOS2" ; then
+ COND_TOOLKIT_OS2=""
fi
- COND_TOOLKIT_MSW="#"
- if test "x$TOOLKIT" = "xMSW" ; then
- COND_TOOLKIT_MSW=""
+ 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_TOOLKIT_X11="#"
+ if test "x$TOOLKIT" = "xX11" ; then
+ COND_TOOLKIT_X11=""
fi
COND_TOOLKIT_X11_USE_GUI_1="#"
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=""
+ 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_BUILD_DEBUG="#"
- if test "x$BUILD" = "xdebug" ; then
- COND_BUILD_DEBUG=""
+ COND_UNICODE_1="#"
+ if test "x$UNICODE" = "x1" ; then
+ COND_UNICODE_1=""
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=""
+ COND_USE_GUI_0="#"
+ if test "x$USE_GUI" = "x0" ; then
+ COND_USE_GUI_0=""
fi
- COND_WXUSE_LIBTIFF_BUILTIN="#"
- if test "x$wxUSE_LIBTIFF" = "xbuiltin" ; then
- COND_WXUSE_LIBTIFF_BUILTIN=""
+ COND_USE_GUI_1="#"
+ if test "x$USE_GUI" = "x1" ; then
+ COND_USE_GUI_1=""
fi
- COND_OFFICIAL_BUILD_1="#"
- if test "x$OFFICIAL_BUILD" = "x1" ; then
- COND_OFFICIAL_BUILD_1=""
+ 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_BUILD_RELEASE="#"
- if test "x$BUILD" = "xrelease" ; then
- COND_BUILD_RELEASE=""
+ 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_USE_SOSYMLINKS_1="#"
+ if test "x$USE_SOSYMLINKS" = "x1" ; then
+ COND_USE_SOSYMLINKS_1=""
fi
COND_USE_SOVERLINUX_1="#"
COND_USE_SOVERLINUX_1=""
fi
- COND_USE_SOSYMLINKS_1="#"
- if test "x$USE_SOSYMLINKS" = "x1" ; then
- COND_USE_SOSYMLINKS_1=""
+ COND_USE_SOVERSION_0="#"
+ if test "x$USE_SOVERSION" = "x0" ; then
+ COND_USE_SOVERSION_0=""
fi
- COND_TOOLKIT_COCOA="#"
- if test "x$TOOLKIT" = "xCOCOA" ; then
- COND_TOOLKIT_COCOA=""
+ COND_USE_SOVERSOLARIS_1="#"
+ if test "x$USE_SOVERSOLARIS" = "x1" ; then
+ COND_USE_SOVERSOLARIS_1=""
fi
- COND_PLATFORM_MACOSX_1="#"
- if test "x$PLATFORM_MACOSX" = "x1" ; then
- COND_PLATFORM_MACOSX_1=""
+ COND_WXUNIV_1="#"
+ if test "x$WXUNIV" = "x1" ; then
+ COND_WXUNIV_1=""
fi
COND_WXUSE_LIBJPEG_BUILTIN="#"
COND_WXUSE_LIBPNG_BUILTIN=""
fi
- 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_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_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=""
+ COND_WXUSE_LIBTIFF_BUILTIN="#"
+ if test "x$wxUSE_LIBTIFF" = "xbuiltin" ; then
+ COND_WXUSE_LIBTIFF_BUILTIN=""
fi
- COND_USE_GUI_1_WXUNIV_1="#"
- if test "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x1" ; then
- COND_USE_GUI_1_WXUNIV_1=""
+ COND_WXUSE_ODBC_BUILTIN="#"
+ if test "x$wxUSE_ODBC" = "xbuiltin" ; then
+ COND_WXUSE_ODBC_BUILTIN=""
fi
- COND_TOOLKIT_GTK="#"
- if test "x$TOOLKIT" = "xGTK" ; then
- COND_TOOLKIT_GTK=""
+ COND_WXUSE_REGEX_BUILTIN="#"
+ if test "x$wxUSE_REGEX" = "xbuiltin" ; then
+ COND_WXUSE_REGEX_BUILTIN=""
fi
- COND_PLATFORM_WIN32_0="#"
- if test "x$PLATFORM_WIN32" = "x0" ; then
- COND_PLATFORM_WIN32_0=""
+ COND_WXUSE_ZLIB_BUILTIN="#"
+ if test "x$wxUSE_ZLIB" = "xbuiltin" ; then
+ COND_WXUSE_ZLIB_BUILTIN=""
fi
- COND_PLATFORM_WIN32_1="#"
- if test "x$PLATFORM_WIN32" = "x1" ; then
- COND_PLATFORM_WIN32_1=""
+ COND_PLATFORM_MAC_1="#"
+ if test "x$PLATFORM_MAC" = "x1" ; then
+ COND_PLATFORM_MAC_1=""
fi
- COND_TOOLKIT_GTK_USE_GUI_1="#"
- if test "x$TOOLKIT" = "xGTK" -a "x$USE_GUI" = "x1" ; then
- COND_TOOLKIT_GTK_USE_GUI_1=""
+ COND_SHARED_1="#"
+ if test "x$SHARED" = "x1" ; then
+ COND_SHARED_1=""
fi
- COND_TOOLKIT_MAC="#"
- if test "x$TOOLKIT" = "xMAC" ; then
- COND_TOOLKIT_MAC=""
+ COND_SHARED_0="#"
+ if test "x$SHARED" = "x0" ; then
+ COND_SHARED_0=""
fi
- COND_TOOLKIT_MSW_USE_GUI_1="#"
- if test "x$TOOLKIT" = "xMSW" -a "x$USE_GUI" = "x1" ; then
- COND_TOOLKIT_MSW_USE_GUI_1=""
+ COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA="#"
+ if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xCOCOA" ; then
+ COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA=""
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=""
+ COND_PLATFORM_MACOSX_1_TOOLKIT_GTK="#"
+ if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xGTK" ; then
+ COND_PLATFORM_MACOSX_1_TOOLKIT_GTK=""
fi
- COND_SHARED_1="#"
- if test "x$SHARED" = "x1" ; then
- COND_SHARED_1=""
+ COND_PLATFORM_MACOSX_1_TOOLKIT_MAC="#"
+ if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xMAC" ; then
+ COND_PLATFORM_MACOSX_1_TOOLKIT_MAC=""
fi
- COND_PLATFORM_MAC_1="#"
- if test "x$PLATFORM_MAC" = "x1" ; then
- COND_PLATFORM_MAC_1=""
+ COND_MONOLITHIC_0_SHARED_0_USE_HTML_1="#"
+ if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x0" -a "x$USE_HTML" = "x1" ; then
+ COND_MONOLITHIC_0_SHARED_0_USE_HTML_1=""
fi
- COND_SHARED_0="#"
- if test "x$SHARED" = "x0" ; then
- COND_SHARED_0=""
+ COND_MONOLITHIC_0_SHARED_1_USE_HTML_1="#"
+ if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x1" -a "x$USE_HTML" = "x1" ; then
+ COND_MONOLITHIC_0_SHARED_1_USE_HTML_1=""
fi
- COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1="#"
- if test "x$OFFICIAL_BUILD" = "x1" -a "x$PLATFORM_WIN32" = "x1" ; then
- COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1=""
+ COND_SHARED_0_USE_GUI_1_USE_OPENGL_1="#"
+ if test "x$SHARED" = "x0" -a "x$USE_GUI" = "x1" -a "x$USE_OPENGL" = "x1" ; then
+ COND_SHARED_0_USE_GUI_1_USE_OPENGL_1=""
fi
- COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1="#"
- if test "x$OFFICIAL_BUILD" = "x0" -a "x$PLATFORM_WIN32" = "x1" ; then
- COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1=""
+ COND_SHARED_1_USE_GUI_1_USE_OPENGL_1="#"
+ if test "x$SHARED" = "x1" -a "x$USE_GUI" = "x1" -a "x$USE_OPENGL" = "x1" ; then
+ COND_SHARED_1_USE_GUI_1_USE_OPENGL_1=""
fi
ac_config_headers="$ac_config_headers setup.h"
- ac_config_files="$ac_config_files
- wx-config
- version-script
- Makefile
-"
+ ac_config_files="$ac_config_files wx-config version-script Makefile"
ac_config_commands="$ac_config_commands default"
do
case "$ac_config_target" in
# Handling of arguments.
- "
-" ) CONFIG_FILES="$CONFIG_FILES
-" ;;
- "wx-config
-" ) CONFIG_FILES="$CONFIG_FILES wx-config
-" ;;
- "version-script
-" ) CONFIG_FILES="$CONFIG_FILES version-script
-" ;;
- "Makefile
-" ) CONFIG_FILES="$CONFIG_FILES Makefile
-" ;;
+ "wx-config" ) CONFIG_FILES="$CONFIG_FILES wx-config" ;;
+ "version-script" ) CONFIG_FILES="$CONFIG_FILES version-script" ;;
+ "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
"$mk" ) CONFIG_FILES="$CONFIG_FILES $mk" ;;
"default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
"setup.h" ) CONFIG_HEADERS="$CONFIG_HEADERS setup.h" ;;
s,@PANGOX_LIBS@,$PANGOX_LIBS,;t t
s,@PANGOXFT_CFLAGS@,$PANGOXFT_CFLAGS,;t t
s,@PANGOXFT_LIBS@,$PANGOXFT_LIBS,;t t
-s,@AIX_CXX_LD@,$AIX_CXX_LD,;t t
s,@RESCOMP@,$RESCOMP,;t t
s,@DEREZ@,$DEREZ,;t t
s,@SETFILE@,$SETFILE,;t t
s,@WXUNIV@,$WXUNIV,;t t
s,@MONOLITHIC@,$MONOLITHIC,;t t
s,@EXTRALIBS@,$EXTRALIBS,;t t
+s,@EXTRALIBS_GUI@,$EXTRALIBS_GUI,;t t
+s,@EXTRALIBS_OPENGL@,$EXTRALIBS_OPENGL,;t t
s,@UNICODE@,$UNICODE,;t t
s,@BUILD@,$BUILD,;t t
s,@SHARED@,$SHARED,;t t
s,@TOOLKIT_LOWERCASE@,$TOOLKIT_LOWERCASE,;t t
s,@TOOLKIT_VERSION@,$TOOLKIT_VERSION,;t t
s,@SAMPLES_RPATH_FLAG@,$SAMPLES_RPATH_FLAG,;t t
+s,@HOST_SUFFIX@,$HOST_SUFFIX,;t t
s,@SET_MAKE@,$SET_MAKE,;t t
s,@MAKE_SET@,$MAKE_SET,;t t
s,@INSTALL_DIR@,$INSTALL_DIR,;t t
s,@PLATFORM_MACOSX@,$PLATFORM_MACOSX,;t t
s,@SO_SUFFIX@,$SO_SUFFIX,;t t
s,@DLLPREFIX@,$DLLPREFIX,;t t
+s,@AIX_CXX_LD@,$AIX_CXX_LD,;t t
s,@SHARED_LD_CC@,$SHARED_LD_CC,;t t
s,@SHARED_LD_CXX@,$SHARED_LD_CXX,;t t
s,@PIC_FLAG@,$PIC_FLAG,;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_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@,$COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0,;t t
+s,@COND_BUILD_DEBUG@,$COND_BUILD_DEBUG,;t t
+s,@COND_BUILD_RELEASE@,$COND_BUILD_RELEASE,;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_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_PLATFORM_UNIX_1@,$COND_PLATFORM_UNIX_1,;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_0_SHARED_0@,$COND_MONOLITHIC_0_SHARED_0,;t t
+s,@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@,$COND_MONOLITHIC_0_SHARED_0_USE_GUI_1,;t t
+s,@COND_MONOLITHIC_0_SHARED_1@,$COND_MONOLITHIC_0_SHARED_1,;t t
+s,@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@,$COND_MONOLITHIC_0_SHARED_1_USE_GUI_1,;t t
+s,@COND_MONOLITHIC_1@,$COND_MONOLITHIC_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_OFFICIAL_BUILD_0_PLATFORM_WIN32_1@,$COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1,;t t
+s,@COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1@,$COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1,;t t
+s,@COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@,$COND_PLATFORM_MACOSX_0_USE_SOVERSION_1,;t t
+s,@COND_PLATFORM_MACOSX_1@,$COND_PLATFORM_MACOSX_1,;t t
s,@COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@,$COND_PLATFORM_MACOSX_1_USE_SOVERSION_1,;t t
+s,@COND_PLATFORM_UNIX_1@,$COND_PLATFORM_UNIX_1,;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_COCOA@,$COND_TOOLKIT_COCOA,;t t
+s,@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@,$COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0,;t t
+s,@COND_TOOLKIT_GTK@,$COND_TOOLKIT_GTK,;t t
+s,@COND_TOOLKIT_GTK_USE_GUI_1@,$COND_TOOLKIT_GTK_USE_GUI_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_USE_GUI_0@,$COND_USE_GUI_0,;t t
+s,@COND_TOOLKIT_MAC@,$COND_TOOLKIT_MAC,;t t
+s,@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@,$COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0,;t t
+s,@COND_TOOLKIT_MGL@,$COND_TOOLKIT_MGL,;t t
+s,@COND_TOOLKIT_MGL_USE_GUI_1@,$COND_TOOLKIT_MGL_USE_GUI_1,;t t
+s,@COND_TOOLKIT_MGL_USE_GUI_1_WXUNIV_1@,$COND_TOOLKIT_MGL_USE_GUI_1_WXUNIV_1,;t t
+s,@COND_TOOLKIT_MOTIF@,$COND_TOOLKIT_MOTIF,;t t
+s,@COND_TOOLKIT_MOTIF_USE_GUI_1@,$COND_TOOLKIT_MOTIF_USE_GUI_1,;t t
+s,@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@,$COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_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@,$COND_TOOLKIT_MSW_USE_GUI_1,;t t
+s,@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@,$COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0,;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_OS2@,$COND_TOOLKIT_OS2,;t t
+s,@COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0@,$COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0,;t t
+s,@COND_TOOLKIT_X11@,$COND_TOOLKIT_X11,;t t
+s,@COND_TOOLKIT_X11_USE_GUI_1@,$COND_TOOLKIT_X11_USE_GUI_1,;t t
s,@COND_TOOLKIT_X11_USE_GUI_1_WXUNIV_1@,$COND_TOOLKIT_X11_USE_GUI_1_WXUNIV_1,;t t
+s,@COND_UNICODE_1@,$COND_UNICODE_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_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_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_USE_SOSYMLINKS_1@,$COND_USE_SOSYMLINKS_1,;t t
+s,@COND_USE_SOVERLINUX_1@,$COND_USE_SOVERLINUX_1,;t t
+s,@COND_USE_SOVERSION_0@,$COND_USE_SOVERSION_0,;t t
+s,@COND_USE_SOVERSOLARIS_1@,$COND_USE_SOVERSOLARIS_1,;t t
+s,@COND_WXUNIV_1@,$COND_WXUNIV_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_WXUSE_LIBTIFF_BUILTIN@,$COND_WXUSE_LIBTIFF_BUILTIN,;t t
+s,@COND_WXUSE_ODBC_BUILTIN@,$COND_WXUSE_ODBC_BUILTIN,;t t
+s,@COND_WXUSE_REGEX_BUILTIN@,$COND_WXUSE_REGEX_BUILTIN,;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_SHARED_1@,$COND_SHARED_1,;t t
s,@COND_SHARED_0@,$COND_SHARED_0,;t t
-s,@COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1@,$COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1,;t t
-s,@COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1@,$COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1,;t t
+s,@COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA@,$COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA,;t t
+s,@COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@,$COND_PLATFORM_MACOSX_1_TOOLKIT_GTK,;t t
+s,@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@,$COND_PLATFORM_MACOSX_1_TOOLKIT_MAC,;t t
+s,@COND_MONOLITHIC_0_SHARED_0_USE_HTML_1@,$COND_MONOLITHIC_0_SHARED_0_USE_HTML_1,;t t
+s,@COND_MONOLITHIC_0_SHARED_1_USE_HTML_1@,$COND_MONOLITHIC_0_SHARED_1_USE_HTML_1,;t t
+s,@COND_SHARED_0_USE_GUI_1_USE_OPENGL_1@,$COND_SHARED_0_USE_GUI_1_USE_OPENGL_1,;t t
+s,@COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@,$COND_SHARED_1_USE_GUI_1_USE_OPENGL_1,;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
projects / wxWidgets.git / blobdiff