X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/88ac883a0d005437c97a60d8195bd5e4719b1154..9c8849722a71ee7139e035bca5fdb2ae7b0af570:/configure diff --git a/configure b/configure index 090ca2b984..75130071e8 100755 --- a/configure +++ b/configure @@ -1,77 +1,21 @@ #! /bin/sh -# From configure.in Id +# From configure.in Id: configure.in -# Do all the work for Automake. This macro actually does too much -- -# some checks are only needed if your package does certain things. -# But this isn't really a big deal. -# serial 1 -# serial 1 -# -# Check to make sure that the build environment is sane. -# - - - - - - - - - -# serial 29 AM_PROG_LIBTOOL - - -# AM_ENABLE_SHARED - implement the --enable-shared flag -# Usage: AM_ENABLE_SHARED[(DEFAULT)] -# Where DEFAULT is either `yes' or `no'. If omitted, it defaults to -# `yes'. - - -# AM_DISABLE_SHARED - set the default shared flag to --disable-shared - - -# AM_DISABLE_STATIC - set the default static flag to --disable-static - - -# AM_ENABLE_STATIC - implement the --enable-static flag -# Usage: AM_ENABLE_STATIC[(DEFAULT)] -# Where DEFAULT is either `yes' or `no'. If omitted, it defaults to -# `yes'. - - - -# AM_PROG_LD - find the path to the GNU or non-GNU linker - - - - -# AM_PROG_NM - find the path to a BSD-compatible name lister - - -# AM_SYS_NM_PARSE - Check for command ro grab the raw symbol name followed -# by C symbol name from nm. - - -# AM_SYS_LIBTOOL_CYGWIN32 - find tools needed on cygwin32 - - -# AM_SYS_SYMBOL_UNDERSCORE - does the compiler prefix global symbols -# with an underscore? @@ -97,7 +41,7 @@ # Guess values for system-dependent variables and create Makefiles. -# Generated automatically using autoconf version 2.13 +# Generated automatically using autoconf version 2.14 # Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc. # # This configure script is free software; the Free Software Foundation @@ -107,192 +51,210 @@ ac_help= ac_default_prefix=/usr/local # Any additions from configure.in: -ac_help="$ac_help - --with-gtk-prefix=PFX prefix where GTK is installed" -ac_help="$ac_help - --with-gtk-exec-prefix=PFX exec prefix where GTK is installed" ac_help="$ac_help --with-gtk use GTK+" ac_help="$ac_help --with-motif use Motif/Lesstif" +ac_help="$ac_help + --with-wine use WINE" ac_help="$ac_help --with-cygwin use Cygwin for MS-Windows" ac_help="$ac_help --with-mingw use GCC Minimal MS-Windows" ac_help="$ac_help - --with-dmalloc use dmalloc library (www.letters.com/dmalloc)" + --with-gtk-prefix=PFX Prefix where GTK is installed" ac_help="$ac_help - --with-zlib use zlib for LZW compression" + --with-gtk-exec-prefix=PFX Exec prefix where GTK is installed" ac_help="$ac_help - --with-libpng use libpng (PNG image format)" +--with-dmalloc use dmalloc library (www.letters.com/dmalloc)" ac_help="$ac_help - --with-libgif use libgif (GIF file format)" +--with-zlib use zlib for LZW compression" ac_help="$ac_help - --with-libjpeg use libjpeg (JPEG file format)" +--with-libpng use libpng (PNG image format)" ac_help="$ac_help - --with-opengl use OpenGL (or Mesa)" +--with-libgif use libgif (GIF file format)" ac_help="$ac_help - --with-odbc use the IODBC and wxODBC classes" +--with-libjpeg use libjpeg (JPEG file format)" ac_help="$ac_help - --enable-optimise create optimised code" +--with-opengl use OpenGL (or Mesa)" ac_help="$ac_help - --enable-optimize create optimized code" +--with-odbc use the IODBC and wxODBC classes" ac_help="$ac_help - --enable-debug_flag set __WXDEBUG__ flag (recommended for developers!)" +--enable-shared create shared library code" ac_help="$ac_help - --enable-debug_info create code with debugging information" +--enable-optimise create optimised code" ac_help="$ac_help - --enable-debug_gdb create code with extra GDB debugging information" +--enable-debug same as debug_flag and debug_info" ac_help="$ac_help - --enable-debug_cntxt use wxDebugContext" +--enable-debug_flag set __WXDEBUG__ flag (recommended for developers!)" ac_help="$ac_help - --enable-mem_tracing create code with memory tracing" +--enable-debug_info create code with debugging information" ac_help="$ac_help - --enable-profile create code with profiling information" +--enable-debug_gdb create code with extra GDB debugging information" ac_help="$ac_help - --enable-gui use GUI classes" +--enable-debug_cntxt use wxDebugContext" ac_help="$ac_help - --enable-intl use internationalization system" +--enable-mem_tracing create code with memory tracing" ac_help="$ac_help - --enable-config use wxConfig (and derived) classes" +--enable-profile create code with profiling information" ac_help="$ac_help - --enable-sockets use socket/network classes" +--enable-no_rtti create code without RTTI information" ac_help="$ac_help - --enable-ipc use interprocess communication (wxSocket etc.)" +--enable-no_exceptions create code without exceptions information" ac_help="$ac_help - --enable-apple_ieee use the Apple IEEE codec" +--enable-gui use GUI classes" ac_help="$ac_help - --enable-timedate use date/time classes" +--enable-intl use internationalization system" ac_help="$ac_help - --enable-fraction use wxFraction class" +--enable-config use wxConfig (and derived) classes" ac_help="$ac_help - --enable-dynlib use wxLibrary class for DLL loading" +--enable-sockets use socket/network classes" ac_help="$ac_help - --enable-longlong use wxLongLong class" +--enable-ipc use interprocess communication (wxSocket etc.)" ac_help="$ac_help - --enable-log use logging system" +--enable-apple_ieee use the Apple IEEE codec" ac_help="$ac_help - --enable-streams use wxStream etc classes" +--enable-timedate use date/time classes" ac_help="$ac_help - --enable-file use wxFile classes" +--enable-wave use wxWave class" ac_help="$ac_help - --enable-textfile use wxTextFile classes" +--enable-fraction use wxFraction class" ac_help="$ac_help - --enable-unicode compile wxString with Unicode support" +--enable-dynlib use wxLibrary class for DLL loading" ac_help="$ac_help - --enable-wcsrtombs use wcsrtombs instead of buggy (GNU libc1/Linux libc5) wcstombs" +--enable-longlong use wxLongLong class" ac_help="$ac_help - --enable-joystick compile in joystick support (Linux only)" +--enable-log use logging system" ac_help="$ac_help - --enable-threads use threads" +--enable-streams use wxStream etc classes" ac_help="$ac_help - --enable-serial use class serialization" +--enable-file use wxFile classes" ac_help="$ac_help - --enable-docview use document view architecture" +--enable-textfile use wxTextFile classes" ac_help="$ac_help - --enable-help use help (using external browser at present)" +--enable-unicode compile wxString with Unicode support" ac_help="$ac_help - --enable-constraints use layout-constraints system" +--enable-wcsrtombs use wcsrtombs instead of buggy (GNU libc1/Linux libc5) wcstombs" ac_help="$ac_help - --enable-printarch use printing architecture" +--enable-wxprintfv use wxWindows implementation of vprintf()" ac_help="$ac_help - --enable-mdi use multiple document interface architecture" +--enable-joystick compile in joystick support (Linux only)" ac_help="$ac_help - --enable-postscript use wxPostscriptDC device context (default for gtk+)" +--enable-std_iostreams use standard C++ stream classes" ac_help="$ac_help - --enable-prologio use Prolog IO library" +--enable-fs_inet use virtual HTTP/FTP filesystems" ac_help="$ac_help - --enable-resources use wxWindows resources" +--enable-fs_zip use virtual ZIP filesystems" ac_help="$ac_help - --enable-xresources use X resources for save (default for gtk+)" +--enable-zipstream use wxZipInputStream" ac_help="$ac_help - --enable-clipboard use wxClipboard classes" +--enable-threads use threads" ac_help="$ac_help - --enable-dnd use Drag'n'Drop classes" +--enable-serial use class serialization" ac_help="$ac_help - --enable-wxtree make wxTree library" +--enable-docview use document view architecture" ac_help="$ac_help - --enable-controls use all usual controls" +--enable-help use help (using external browser at present)" ac_help="$ac_help - --enable-accel use accelerators" +--enable-constraints use layout-constraints system" ac_help="$ac_help - --enable-caret use wxCaret class" +--enable-printarch use printing architecture" ac_help="$ac_help - --enable-bmpbutton use wxBitmapButton class" +--enable-mdi use multiple document interface architecture" ac_help="$ac_help - --enable-checkbox use wxCheckBox class" +--enable-postscript use wxPostscriptDC device context (default for gtk+)" ac_help="$ac_help - --enable-checklst use wxCheckListBox (listbox with checkboxes) class" +--enable-prologio use Prolog IO library" ac_help="$ac_help - --enable-combobox use wxChoice and wxComboBox classes" +--enable-resources use wxWindows resources" ac_help="$ac_help - --enable-gauge use wxGauge class" +--enable-xresources use X resources for save (default for gtk+)" ac_help="$ac_help - --enable-grid use wxGrid class" +--enable-clipboard use wxClipboard classes" ac_help="$ac_help - --enable-imaglist use wxImageList class" +--enable-dnd use Drag'n'Drop classes" ac_help="$ac_help - --enable-listbox use wxListBox class" +--enable-wxtree make wxTree library" ac_help="$ac_help - --enable-listctrl use wxListCtrl class" +--enable-controls use all usual controls" ac_help="$ac_help - --enable-notebook use wxNotebook class" +--enable-accel use accelerators" ac_help="$ac_help - --enable-radiobox use wxRadioBox class" +--enable-caret use wxCaret class" ac_help="$ac_help - --enable-radiobtn use wxRadioButton class" +--enable-bmpbutton use wxBitmapButton class" ac_help="$ac_help - --enable-sash use wxSashWindow class" +--enable-checkbox use wxCheckBox class" ac_help="$ac_help - --enable-scrollbar use wxScrollBar class and scrollable windows" +--enable-checklst use wxCheckListBox (listbox with checkboxes) class" ac_help="$ac_help - --enable-slider use wxSlider class" +--enable-choice use wxChoice class" ac_help="$ac_help - --enable-spinbtn use wxSpinButton class" +--enable-combobox use wxComboBox classes" ac_help="$ac_help - --enable-splitter use wxSplitterWindow class" +--enable-gauge use wxGauge class" ac_help="$ac_help - --enable-statbmp use wxStaticBitmap class" +--enable-grid use wxGrid class" ac_help="$ac_help - --enable-statbox use wxStaticBox class" +--enable-imaglist use wxImageList class" ac_help="$ac_help - --enable-statline use wxStaticLine class" +--enable-listbox use wxListBox class" ac_help="$ac_help - --enable-statusbar use wxStatusBar class" +--enable-listctrl use wxListCtrl class" ac_help="$ac_help - --enable-tabdialog use wxTabControl class" +--enable-notebook use wxNotebook class" ac_help="$ac_help - --enable-toolbar use wxToolBar class" +--enable-radiobox use wxRadioBox class" ac_help="$ac_help - --enable-treectrl use wxTreeCtrl class" +--enable-radiobtn use wxRadioButton class" ac_help="$ac_help - --enable-commondlg use common dialogs (wxDirDialog, wxProgressDialog, wxTextDialog, ...)" +--enable-sash use wxSashWindow class" ac_help="$ac_help - --enable-miniframe use wxMiniFrame class" +--enable-scrollbar use wxScrollBar class and scrollable windows" ac_help="$ac_help - --enable-tooltips use wxToolTip class" +--enable-slider use wxSlider class" ac_help="$ac_help - --enable-splines use spline drawing code" +--enable-spinbtn use wxSpinButton class" ac_help="$ac_help - --enable-validators use wxValidator and derived classes" +--enable-splitter use wxSplitterWindow class" ac_help="$ac_help - --enable-static[=PKGS] build static libraries [default=no]" +--enable-statbmp use wxStaticBitmap class" ac_help="$ac_help - --enable-shared[=PKGS] build shared libraries [default=yes]" +--enable-statbox use wxStaticBox class" ac_help="$ac_help - --with-gnu-ld assume the C compiler uses GNU ld [default=no]" +--enable-statline use wxStaticLine class" ac_help="$ac_help - --disable-libtool-lock force libtool not to do file locking" +--enable-statusbar use wxStatusBar class" ac_help="$ac_help - --with-x use the X Window System" +--enable-tabdialog use wxTabControl class" +ac_help="$ac_help +--enable-toolbar use wxToolBar class" +ac_help="$ac_help +--enable-treectrl use wxTreeCtrl class" +ac_help="$ac_help +--enable-commondlg use common dialogs (wxDirDialog, wxProgressDialog, wxTextDialog, ...)" +ac_help="$ac_help +--enable-dirdlg use wxDirDialog" ac_help="$ac_help -**--with-gtk-prefix=PFX Prefix where GTK is installed" +--enable-textdlg use wxTextDialog" ac_help="$ac_help -**--with-gtk-exec-prefix=PFX Exec prefix where GTK is installed" +--enable-tipdlg use startup tips" ac_help="$ac_help -**--with-gtk-prefix=PFX Prefix where GTK is installed" +--enable-progressdlg use wxProgressDialog" ac_help="$ac_help -**--with-gtk-exec-prefix=PFX Exec prefix where GTK is installed" +--enable-miniframe use wxMiniFrame class" +ac_help="$ac_help +--enable-html use wxHTML sub-library" +ac_help="$ac_help +--enable-tooltips use wxToolTip class" +ac_help="$ac_help +--enable-splines use spline drawing code" +ac_help="$ac_help +--enable-validators use wxValidator and derived classes" +ac_help="$ac_help +--enable-busyinfo use wxBusyInfo" +ac_help="$ac_help + --with-x use the X Window System" # Initialize some variables set by options. # The variables have the same names as the options, with @@ -615,7 +577,7 @@ EOF verbose=yes ;; -version | --version | --versio | --versi | --vers) - echo "configure generated by autoconf version 2.13" + echo "configure generated by autoconf version 2.14" exit 0 ;; -with-* | --with-*) @@ -824,13 +786,34 @@ ac_config_sub=$ac_aux_dir/config.sub ac_configure=$ac_aux_dir/configure # This should be Cygnus configure. +# Do some error checking and defaulting for the host and target type. +# The inputs are: +# configure --host=HOST --target=TARGET --build=BUILD NONOPT +# +# The rules are: +# 1. You are not allowed to specify --host, --target, and nonopt at the +# same time. +# 2. Host defaults to nonopt. +# 3. If nonopt is not specified, then host defaults to the current host, +# as determined by config.guess. +# 4. Target and build default to nonopt. +# 5. If nonopt is not specified, then target and build default to host. + +# The aliases save the names the user supplied, while $host etc. +# will get canonicalized. +case $host---$target---$nonopt in +NONE---*---* | *---NONE---* | *---*---NONE) ;; +*) { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } ;; +esac + + # Make sure we can run config.sub. if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then : else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } fi echo $ac_n "checking host system type""... $ac_c" 1>&6 -echo "configure:834: checking host system type" >&5 +echo "configure:817: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -850,237 +833,46 @@ host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` echo "$ac_t""$host" 1>&6 -# Find a good install program. We prefer a C program (faster), -# so one script is as good as another. But avoid the broken or -# incompatible versions: -# SysV /etc/install, /usr/sbin/install -# SunOS /usr/etc/install -# IRIX /sbin/install -# AIX /bin/install -# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag -# AFS /usr/afsws/bin/install, which mishandles nonexistent args -# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" -# ./install, which can be erroneously created by make from ./install.sh. -echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:866: checking for a BSD compatible install" >&5 -if test -z "$INSTALL"; then -if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS=":" - for ac_dir in $PATH; do - # Account for people who put trailing slashes in PATH elements. - case "$ac_dir/" in - /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;; - *) - # OSF1 and SCO ODT 3.0 have their own names for install. - # Don't use installbsd from OSF since it installs stuff as root - # by default. - for ac_prog in ginstall scoinst install; do - if test -f $ac_dir/$ac_prog; then - if test $ac_prog = install && - grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then - # AIX install. It has an incompatible calling convention. - : - else - ac_cv_path_install="$ac_dir/$ac_prog -c" - break 2 - fi - fi - done - ;; - esac - done - IFS="$ac_save_IFS" - -fi - if test "${ac_cv_path_install+set}" = set; then - INSTALL="$ac_cv_path_install" - else - # As a last resort, use the slow shell script. We don't cache a - # path for INSTALL within a source directory, because that will - # break other packages using the cache if that directory is - # removed, or if the path is relative. - INSTALL="$ac_install_sh" - fi -fi -echo "$ac_t""$INSTALL" 1>&6 - -# Use test -z because SunOS4 sh mishandles braces in ${var-val}. -# It thinks the first close brace ends the variable substitution. -test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' - -test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' - -test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' - -echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6 -echo "configure:919: checking whether build environment is sane" >&5 -# Just in case -sleep 1 -echo timestamp > conftestfile -# Do `set' in a subshell so we don't clobber the current shell's -# arguments. Must try -L first in case configure is actually a -# symlink; some systems play weird games with the mod time of symlinks -# (eg FreeBSD returns the mod time of the symlink's containing -# directory). -if ( - set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null` - if test "$*" = "X"; then - # -L didn't work. - set X `ls -t $srcdir/configure conftestfile` - fi - if test "$*" != "X $srcdir/configure conftestfile" \ - && test "$*" != "X conftestfile $srcdir/configure"; then - - # If neither matched, then we have a broken ls. This can happen - # if, for instance, CONFIG_SHELL is bash and it inherits a - # broken ls alias from the environment. This has actually - # happened. Such a system could not be considered "sane". - { echo "configure: error: ls -t appears to fail. Make sure there is not a broken -alias in your environment" 1>&2; exit 1; } - fi - - test "$2" = conftestfile - ) -then - # Ok. - : -else - { echo "configure: error: newly created file is older than distributed files! -Check your system clock" 1>&2; exit 1; } -fi -rm -f conftest* -echo "$ac_t""yes" 1>&6 -if test "$program_transform_name" = s,x,x,; then - program_transform_name= -else - # Double any \ or $. echo might interpret backslashes. - cat <<\EOF_SED > conftestsed -s,\\,\\\\,g; s,\$,$$,g -EOF_SED - program_transform_name="`echo $program_transform_name|sed -f conftestsed`" - rm -f conftestsed -fi -test "$program_prefix" != NONE && - program_transform_name="s,^,${program_prefix},; $program_transform_name" -# Use a double $ so make ignores it. -test "$program_suffix" != NONE && - program_transform_name="s,\$\$,${program_suffix},; $program_transform_name" - -# sed with no file args requires a program. -test "$program_transform_name" = "" && program_transform_name="s,x,x," - -echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:976: checking whether ${MAKE-make} sets \${MAKE}" >&5 -set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftestmake <<\EOF -all: - @echo 'ac_maketemp="${MAKE}"' -EOF -# GNU make sometimes prints "make[1]: Entering...", which would confuse us. -eval `${MAKE-make} -f conftestmake 2>/dev/null | grep temp=` -if test -n "$ac_maketemp"; then - eval ac_cv_prog_make_${ac_make}_set=yes -else - eval ac_cv_prog_make_${ac_make}_set=no -fi -rm -f conftestmake -fi -if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then - echo "$ac_t""yes" 1>&6 - SET_MAKE= -else - echo "$ac_t""no" 1>&6 - SET_MAKE="MAKE=${MAKE-make}" -fi - - -PACKAGE=wxWindows - -VERSION=2.1.0 - -if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then - { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; } -fi -cat >> confdefs.h <> confdefs.h <&6 +echo "configure:838: checking target system type" >&5 +target_alias=$target +case "$target_alias" in +NONE) + case $nonopt in + NONE) target_alias=$host_alias ;; + *) target_alias=$nonopt ;; + esac ;; +esac -missing_dir=`cd $ac_aux_dir && pwd` -echo $ac_n "checking for working aclocal""... $ac_c" 1>&6 -echo "configure:1022: checking for working aclocal" >&5 -# Run test in a subshell; some versions of sh will print an error if -# an executable is not found, even if stderr is redirected. -# Redirect stdin to placate older versions of autoconf. Sigh. -if (aclocal --version) < /dev/null > /dev/null 2>&1; then - ACLOCAL=aclocal - echo "$ac_t""found" 1>&6 -else - ACLOCAL="$missing_dir/missing aclocal" - echo "$ac_t""missing" 1>&6 -fi +target=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $target_alias` +target_cpu=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` +target_vendor=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` +target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` +echo "$ac_t""$target" 1>&6 -echo $ac_n "checking for working autoconf""... $ac_c" 1>&6 -echo "configure:1035: checking for working autoconf" >&5 -# Run test in a subshell; some versions of sh will print an error if -# an executable is not found, even if stderr is redirected. -# Redirect stdin to placate older versions of autoconf. Sigh. -if (autoconf --version) < /dev/null > /dev/null 2>&1; then - AUTOCONF=autoconf - echo "$ac_t""found" 1>&6 -else - AUTOCONF="$missing_dir/missing autoconf" - echo "$ac_t""missing" 1>&6 -fi +echo $ac_n "checking build system type""... $ac_c" 1>&6 +echo "configure:856: checking build system type" >&5 -echo $ac_n "checking for working automake""... $ac_c" 1>&6 -echo "configure:1048: checking for working automake" >&5 -# Run test in a subshell; some versions of sh will print an error if -# an executable is not found, even if stderr is redirected. -# Redirect stdin to placate older versions of autoconf. Sigh. -if (automake --version) < /dev/null > /dev/null 2>&1; then - AUTOMAKE=automake - echo "$ac_t""found" 1>&6 -else - AUTOMAKE="$missing_dir/missing automake" - echo "$ac_t""missing" 1>&6 -fi +build_alias=$build +case "$build_alias" in +NONE) + case $nonopt in + NONE) build_alias=$host_alias ;; + *) build_alias=$nonopt ;; + esac ;; +esac -echo $ac_n "checking for working autoheader""... $ac_c" 1>&6 -echo "configure:1061: checking for working autoheader" >&5 -# Run test in a subshell; some versions of sh will print an error if -# an executable is not found, even if stderr is redirected. -# Redirect stdin to placate older versions of autoconf. Sigh. -if (autoheader --version) < /dev/null > /dev/null 2>&1; then - AUTOHEADER=autoheader - echo "$ac_t""found" 1>&6 -else - AUTOHEADER="$missing_dir/missing autoheader" - echo "$ac_t""missing" 1>&6 -fi +build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias` +build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` +build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` +build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` +echo "$ac_t""$build" 1>&6 -echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6 -echo "configure:1074: checking for working makeinfo" >&5 -# Run test in a subshell; some versions of sh will print an error if -# an executable is not found, even if stderr is redirected. -# Redirect stdin to placate older versions of autoconf. Sigh. -if (makeinfo --version) < /dev/null > /dev/null 2>&1; then - MAKEINFO=makeinfo - echo "$ac_t""found" 1>&6 -else - MAKEINFO="$missing_dir/missing makeinfo" - echo "$ac_t""missing" 1>&6 -fi +test "$host_alias" != "$target_alias" && + test "$program_prefix$program_suffix$program_transform_name" = \ + NONENONEs,x,x, && + program_prefix=${target_alias}- @@ -1088,8 +880,15 @@ WX_MAJOR_VERSION_NUMBER=2 WX_MINOR_VERSION_NUMBER=1 WX_RELEASE_NUMBER=0 -LIBOBJS= -LIBOBJS="$LIBOBJS common/extended.o" +WX_INTERFACE_AGE=0 +WX_BINARY_AGE=0 + +WX_VERSION=$WX_MAJOR_VERSION_NUMBER.$WX_MINOR_VERSION_NUMBER.$WX_RELEASE_NUMBER + +WX_RELEASE=$WX_MAJOR_VERSION_NUMBER.$WX_MINOR_VERSION_NUMBER +WX_CURRENT=`expr $WX_RELEASE_NUMBER - $WX_INTERFACE_AGE` +WX_REVISION=$WX_INTERFACE_AGE +WX_AGE=`expr $WX_BINARY_AGE - $WX_INTERFACE_AGE` USE_UNIX=1 @@ -1109,17 +908,25 @@ USE_FREEBSD= USE_VMS= USE_ULTRIX= USE_CYGWIN= -USE_MINGW32= +USE_MINGW= USE_DATA_GENERAL= +ALL_TOOLKITS="CYGWIN GTK MINGW MOTIF WINE" + DEFAULT_wxUSE_GTK=0 DEFAULT_wxUSE_MOTIF=0 DEFAULT_wxUSE_MSW=0 +DEFAULT_wxUSE_WINE=0 + +DEFAULT_DEFAULT_wxUSE_GTK=0 +DEFAULT_DEFAULT_wxUSE_MOTIF=0 +DEFAULT_DEFAULT_wxUSE_MSW=0 +DEFAULT_DEFAULT_wxUSE_WINE=0 case "${host}" in *-hp-hpux* ) USE_HPUX=1 - DEFAULT_wxUSE_MOTIF=1 + DEFAULT_DEFAULT_wxUSE_MOTIF=1 cat >> confdefs.h <<\EOF #define __HPUX__ 1 EOF @@ -1139,7 +946,7 @@ EOF EOF fi - DEFAULT_wxUSE_GTK=1 + DEFAULT_DEFAULT_wxUSE_GTK=1 ;; *-*-irix5* | *-*-irix6* ) USE_SGI=1 @@ -1152,7 +959,7 @@ EOF #define __SVR4__ 1 EOF - DEFAULT_wxUSE_MOTIF=1 + DEFAULT_DEFAULT_wxUSE_MOTIF=1 ;; *-*-solaris2* ) USE_SUN=1 @@ -1170,7 +977,7 @@ EOF #define __SVR4__ 1 EOF - DEFAULT_wxUSE_MOTIF=1 + DEFAULT_DEFAULT_wxUSE_MOTIF=1 ;; *-*-sunos4* ) USE_SUN=1 @@ -1188,7 +995,7 @@ EOF #define __BSD__ 1 EOF - DEFAULT_wxUSE_MOTIF=1 + DEFAULT_DEFAULT_wxUSE_MOTIF=1 ;; *-*-freebsd* | *-*-netbsd*) USE_BSD=1 @@ -1201,7 +1008,7 @@ EOF #define __BSD__ 1 EOF - DEFAULT_wxUSE_GTK=1 + DEFAULT_DEFAULT_wxUSE_GTK=1 ;; *-*-osf* ) USE_ALPHA=1 @@ -1214,7 +1021,7 @@ EOF #define __OSF__ 1 EOF - DEFAULT_wxUSE_MOTIF=1 + DEFAULT_DEFAULT_wxUSE_MOTIF=1 ;; *-*-dgux5* ) USE_ALPHA=1 @@ -1227,7 +1034,7 @@ EOF #define __SVR4__ 1 EOF - DEFAULT_wxUSE_MOTIF=1 + DEFAULT_DEFAULT_wxUSE_MOTIF=1 ;; *-*-sysv5* ) USE_SYSV=1 @@ -1240,7 +1047,7 @@ EOF #define __SVR4__ 1 EOF - DEFAULT_wxUSE_MOTIF=1 + DEFAULT_DEFAULT_wxUSE_MOTIF=1 ;; *-*-aix* ) USE_AIX=1 @@ -1258,10 +1065,67 @@ EOF #define __SVR4__ 1 EOF - DEFAULT_wxUSE_MOTIF=1 + DEFAULT_DEFAULT_wxUSE_MOTIF=1 + ;; + + *-*-cygwin32* ) + USE_UNIX=0 + cat >> confdefs.h <<\EOF +#define __WIN32__ 1 +EOF + + cat >> confdefs.h <<\EOF +#define __WIN95__ 1 +EOF + + cat >> confdefs.h <<\EOF +#define __WINDOWS__ 1 +EOF + + cat >> confdefs.h <<\EOF +#define __GNUWIN32__ 1 +EOF + + cat >> confdefs.h <<\EOF +#define WINVER 0x0400 +EOF + + DEFAULT_DEFAULT_wxUSE_MSW=1 + ;; + *-*-mingw32* ) + USE_UNIX=0 + cat >> confdefs.h <<\EOF +#define __WIN32__ 1 +EOF + + cat >> confdefs.h <<\EOF +#define __WIN95__ 1 +EOF + + cat >> confdefs.h <<\EOF +#define __WINDOWS__ 1 +EOF + + cat >> confdefs.h <<\EOF +#define __GNUWIN32__ 1 +EOF + + cat >> confdefs.h <<\EOF +#define WINVER 0x0400 +EOF + + DEFAULT_DEFAULT_wxUSE_MSW=1 + ;; + + *-pc-os2_emx ) + cat >> confdefs.h <<\EOF +#define __EMX__ 1 +EOF + ;; + *) - { echo "configure: error: unknown system type $(host)." 1>&2; exit 1; } + { echo "configure: error: unknown system type ${host}." 1>&2; exit 1; } esac if test "$USE_UNIX" = 1 ; then @@ -1270,11 +1134,13 @@ if test "$USE_UNIX" = 1 ; then #define __UNIX__ 1 EOF + SRC_SUBDIRS="$SRC_SUBDIRS unix" + INCLUDE_SUBDIRS="$INCLUDE_SUBDIRS unix" fi if test "$USE_LINUX" = 1; then echo $ac_n "checking for gettext in -lc""... $ac_c" 1>&6 -echo "configure:1278: checking for gettext in -lc" >&5 +echo "configure:1144: checking for gettext in -lc" >&5 ac_lib_var=`echo c'_'gettext | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1282,7 +1148,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lc $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1163: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1318,24 +1184,30 @@ fi fi -cat >> confdefs.h <<\EOF -#define __UNIX__ 1 -EOF - + wx_arg_cache_file="configarg.cache" + echo "loading argument cache $wx_arg_cache_file" + rm -f ${wx_arg_cache_file}.tmp + touch ${wx_arg_cache_file}.tmp + touch ${wx_arg_cache_file} + DEBUG_CONFIGURE=0 if test $DEBUG_CONFIGURE = 1; then DEFAULT_wxUSE_THREADS=yes - DEFAULT_wxUSE_OPTIMISE=no + DEFAULT_wxUSE_SHARED=yes + DEFAULT_wxUSE_OPTIMISE=yes DEFAULT_wxUSE_PROFILE=no + DEFAULT_wxUSE_NO_RTTI=no + DEFAULT_wxUSE_NO_EXCEPTIONS=no DEFAULT_wxUSE_DEBUG_FLAG=yes DEFAULT_wxUSE_DEBUG_INFO=yes DEFAULT_wxUSE_DEBUG_GDB=yes DEFAULT_wxUSE_MEM_TRACING=no + DEFAULT_wxUSE_DEBUG_CONTEXT=no DEFAULT_wxUSE_DMALLOC=no DEFAULT_wxUSE_APPLE_IEEE=no @@ -1349,9 +1221,11 @@ if test $DEBUG_CONFIGURE = 1; then DEFAULT_wxUSE_LIBJPEG=no DEFAULT_wxUSE_ODBC=no + DEFAULT_wxUSE_STD_IOSTREAM=no DEFAULT_wxUSE_FILE=no DEFAULT_wxUSE_TEXTFILE=no DEFAULT_wxUSE_TIMEDATE=no + DEFAULT_wxUSE_WAVE=no DEFAULT_wxUSE_INTL=no DEFAULT_wxUSE_CONFIG=no DEFAULT_wxUSE_STREAMS=no @@ -1384,7 +1258,16 @@ if test $DEBUG_CONFIGURE = 1; then DEFAULT_wxUSE_METAFILE=no DEFAULT_wxUSE_COMMONDLGS=no + DEFAULT_wxUSE_DIRDLG=no + DEFAULT_wxUSE_TEXTDLG=no + DEFAULT_wxUSE_STARTUP_TIPS=no + DEFAULT_wxUSE_PROGRESSDLG=no DEFAULT_wxUSE_MINIFRAME=no + DEFAULT_wxUSE_HTML=no + DEFAULT_wxUSE_FS_INET=no + DEFAULT_wxUSE_FS_ZIP=no + DEFAULT_wxUSE_BUSYINFO=no + DEFAULT_wxUSE_ZIPSTREAM=no DEFAULT_wxUSE_VALIDATORS=yes DEFAULT_wxUSE_ACCEL=no @@ -1392,6 +1275,7 @@ if test $DEBUG_CONFIGURE = 1; then DEFAULT_wxUSE_BMPBUTTON=no DEFAULT_wxUSE_CHECKBOX=no DEFAULT_wxUSE_CHECKLST=no + DEFAULT_wxUSE_CHOICE=yes DEFAULT_wxUSE_COMBOBOX=no DEFAULT_wxUSE_GAUGE=no DEFAULT_wxUSE_GRID=no @@ -1401,7 +1285,7 @@ if test $DEBUG_CONFIGURE = 1; then DEFAULT_wxUSE_NOTEBOOK=no DEFAULT_wxUSE_RADIOBOX=no DEFAULT_wxUSE_RADIOBTN=no - DEFAULT_wxUSE_SASHWINDOW=no + DEFAULT_wxUSE_SASH=no DEFAULT_wxUSE_SCROLLBAR=no DEFAULT_wxUSE_SLIDER=no DEFAULT_wxUSE_SPINBTN=no @@ -1419,12 +1303,16 @@ if test $DEBUG_CONFIGURE = 1; then else DEFAULT_wxUSE_THREADS=yes + DEFAULT_wxUSE_SHARED=yes DEFAULT_wxUSE_OPTIMISE=yes DEFAULT_wxUSE_PROFILE=no + DEFAULT_wxUSE_NO_RTTI=no + DEFAULT_wxUSE_NO_EXCEPTIONS=no DEFAULT_wxUSE_DEBUG_FLAG=no DEFAULT_wxUSE_DEBUG_INFO=no DEFAULT_wxUSE_DEBUG_GDB=no DEFAULT_wxUSE_MEM_TRACING=no + DEFAULT_wxUSE_DEBUG_CONTEXT=no DEFAULT_wxUSE_DMALLOC=no DEFAULT_wxUSE_APPLE_IEEE=yes @@ -1438,9 +1326,11 @@ else DEFAULT_wxUSE_LIBJPEG=yes DEFAULT_wxUSE_ODBC=no + DEFAULT_wxUSE_STD_IOSTREAM=no DEFAULT_wxUSE_FILE=yes DEFAULT_wxUSE_TEXTFILE=yes DEFAULT_wxUSE_TIMEDATE=yes + DEFAULT_wxUSE_WAVE=no DEFAULT_wxUSE_INTL=yes DEFAULT_wxUSE_CONFIG=yes DEFAULT_wxUSE_STREAMS=yes @@ -1473,7 +1363,16 @@ else DEFAULT_wxUSE_METAFILE=yes DEFAULT_wxUSE_COMMONDLGS=yes + DEFAULT_wxUSE_DIRDLG=yes + DEFAULT_wxUSE_TEXTDLG=yes + DEFAULT_wxUSE_STARTUP_TIPS=yes + DEFAULT_wxUSE_PROGRESSDLG=yes DEFAULT_wxUSE_MINIFRAME=yes + DEFAULT_wxUSE_HTML=yes + DEFAULT_wxUSE_FS_INET=yes + DEFAULT_wxUSE_FS_ZIP=yes + DEFAULT_wxUSE_BUSYINFO=yes + DEFAULT_wxUSE_ZIPSTREAM=yes DEFAULT_wxUSE_VALIDATORS=yes DEFAULT_wxUSE_ACCEL=yes @@ -1481,6 +1380,7 @@ else DEFAULT_wxUSE_BMPBUTTON=yes DEFAULT_wxUSE_CHECKBOX=yes DEFAULT_wxUSE_CHECKLST=yes + DEFAULT_wxUSE_CHOICE=yes DEFAULT_wxUSE_COMBOBOX=yes DEFAULT_wxUSE_GAUGE=yes DEFAULT_wxUSE_GRID=yes @@ -1490,7 +1390,7 @@ else DEFAULT_wxUSE_NOTEBOOK=yes DEFAULT_wxUSE_RADIOBOX=yes DEFAULT_wxUSE_RADIOBTN=yes - DEFAULT_wxUSE_SASHWINDOW=yes + DEFAULT_wxUSE_SASH=yes DEFAULT_wxUSE_SCROLLBAR=yes DEFAULT_wxUSE_SLIDER=yes DEFAULT_wxUSE_SPINBTN=yes @@ -1509,449 +1409,2277 @@ fi -# Check whether --with-gtk-prefix or --without-gtk-prefix was given. -if test "${with_gtk_prefix+set}" = set; then - withval="$with_gtk_prefix" - gtk_config_prefix="$withval" -else - gtk_config_prefix="" -fi - -# Check whether --with-gtk-exec-prefix or --without-gtk-exec-prefix was given. -if test "${with_gtk_exec_prefix+set}" = set; then - withval="$with_gtk_exec_prefix" - gtk_config_exec_prefix="$withval" -else - gtk_config_exec_prefix="" -fi +for toolkit in `echo $ALL_TOOLKITS`; do + LINE=`grep "wxUSE_$toolkit" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + has_toolkit_in_cache=1 + eval "DEFAULT_$LINE" + eval "CACHE_$toolkit=1" + fi +done # Check whether --with-gtk or --without-gtk was given. if test "${with_gtk+set}" = set; then withval="$with_gtk" - wxUSE_GTK="$withval" -else - wxUSE_GTK=0 + wxUSE_GTK="$withval" CACHE_GTK=1 TOOLKIT_GIVEN=1 fi # Check whether --with-motif or --without-motif was given. if test "${with_motif+set}" = set; then withval="$with_motif" - wxUSE_MOTIF="$withval" -else - wxUSE_MOTIF=0 + wxUSE_MOTIF="$withval" CACHE_MOTIF=1 TOOLKIT_GIVEN=1 +fi + +# Check whether --with-wine or --without-wine was given. +if test "${with_wine+set}" = set; then + withval="$with_wine" + wxUSE_WINE="$withval" CACHE_WINE=1 TOOLKIT_GIVEN=1 fi # Check whether --with-cygwin or --without-cygwin was given. if test "${with_cygwin+set}" = set; then withval="$with_cygwin" - wxUSE_CYGWIN="$withval" -else - wxUSE_CYGWIN=0 + wxUSE_CYGWIN="$withval" CACHE_CYGWIN=1 TOOLKIT_GIVEN=1 fi # Check whether --with-mingw or --without-mingw was given. if test "${with_mingw+set}" = set; then withval="$with_mingw" - wxUSE_MINGW="$withval" + wxUSE_MINGW="$withval" CACHE_MINGW=1 TOOLKIT_GIVEN=1 +fi + + +# Check whether --with-gtk-prefix or --without-gtk-prefix was given. +if test "${with_gtk_prefix+set}" = set; then + withval="$with_gtk_prefix" + gtk_config_prefix="$withval" +else + gtk_config_prefix="" +fi + +# Check whether --with-gtk-exec-prefix or --without-gtk-exec-prefix was given. +if test "${with_gtk_exec_prefix+set}" = set; then + withval="$with_gtk_exec_prefix" + gtk_config_exec_prefix="$withval" else - wxUSE_MINGW=0 + gtk_config_exec_prefix="" fi -# Check whether --with-dmalloc or --without-dmalloc was given. + + echo $ac_n "checking "for --with-dmalloc"""... $ac_c" 1>&6 +echo "configure:1472: checking "for --with-dmalloc"" >&5 + no_cache=0 + # Check whether --with-dmalloc or --without-dmalloc was given. if test "${with_dmalloc+set}" = set; then withval="$with_dmalloc" - wxUSE_DMALLOC="$withval" + + if test "$withval" = yes; then + ac_cv_use_dmalloc='wxUSE_DMALLOC=yes' + else + ac_cv_use_dmalloc='wxUSE_DMALLOC=no' + fi + else - wxUSE_DMALLOC=$DEFAULT_wxUSE_DMALLOC + + LINE=`grep "wxUSE_DMALLOC" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_dmalloc='wxUSE_DMALLOC='$DEFAULT_wxUSE_DMALLOC + fi -# Check whether --with-zlib or --without-zlib was given. + + eval "$ac_cv_use_dmalloc" + if test "$no_cache" != 1; then + echo $ac_cv_use_dmalloc >> ${wx_arg_cache_file}.tmp + fi + + if test "$wxUSE_DMALLOC" = yes; then + echo "$ac_t""yes" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + + + echo $ac_n "checking "for --with-zlib"""... $ac_c" 1>&6 +echo "configure:1511: checking "for --with-zlib"" >&5 + no_cache=0 + # Check whether --with-zlib or --without-zlib was given. if test "${with_zlib+set}" = set; then withval="$with_zlib" - wxUSE_ZLIB="$withval" + + if test "$withval" = yes; then + ac_cv_use_zlib='wxUSE_ZLIB=yes' + else + ac_cv_use_zlib='wxUSE_ZLIB=no' + fi + else - wxUSE_ZLIB=$DEFAULT_wxUSE_ZLIB + + LINE=`grep "wxUSE_ZLIB" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_zlib='wxUSE_ZLIB='$DEFAULT_wxUSE_ZLIB + fi -# Check whether --with-libpng or --without-libpng was given. + + eval "$ac_cv_use_zlib" + if test "$no_cache" != 1; then + echo $ac_cv_use_zlib >> ${wx_arg_cache_file}.tmp + fi + + if test "$wxUSE_ZLIB" = yes; then + echo "$ac_t""yes" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + + + echo $ac_n "checking "for --with-libpng"""... $ac_c" 1>&6 +echo "configure:1550: checking "for --with-libpng"" >&5 + no_cache=0 + # Check whether --with-libpng or --without-libpng was given. if test "${with_libpng+set}" = set; then withval="$with_libpng" - wxUSE_LIBPNG="$withval" + + if test "$withval" = yes; then + ac_cv_use_libpng='wxUSE_LIBPNG=yes' + else + ac_cv_use_libpng='wxUSE_LIBPNG=no' + fi + else - wxUSE_LIBPNG=$DEFAULT_wxUSE_LIBPNG + + LINE=`grep "wxUSE_LIBPNG" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_libpng='wxUSE_LIBPNG='$DEFAULT_wxUSE_LIBPNG + fi -# Check whether --with-libgif or --without-libgif was given. + + eval "$ac_cv_use_libpng" + if test "$no_cache" != 1; then + echo $ac_cv_use_libpng >> ${wx_arg_cache_file}.tmp + fi + + if test "$wxUSE_LIBPNG" = yes; then + echo "$ac_t""yes" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + + + echo $ac_n "checking "for --with-libgif"""... $ac_c" 1>&6 +echo "configure:1589: checking "for --with-libgif"" >&5 + no_cache=0 + # Check whether --with-libgif or --without-libgif was given. if test "${with_libgif+set}" = set; then withval="$with_libgif" - wxUSE_LIBGIF="${withval}" + + if test "$withval" = yes; then + ac_cv_use_libgif='wxUSE_LIBGIF=yes' + else + ac_cv_use_libgif='wxUSE_LIBGIF=no' + fi + else - wxUSE_LIBGIF=$DEFAULT_wxUSE_LIBGIF + + LINE=`grep "wxUSE_LIBGIF" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_libgif='wxUSE_LIBGIF='$DEFAULT_wxUSE_LIBGIF + fi -# Check whether --with-libjpeg or --without-libjpeg was given. + + eval "$ac_cv_use_libgif" + if test "$no_cache" != 1; then + echo $ac_cv_use_libgif >> ${wx_arg_cache_file}.tmp + fi + + if test "$wxUSE_LIBGIF" = yes; then + echo "$ac_t""yes" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + + + echo $ac_n "checking "for --with-libjpeg"""... $ac_c" 1>&6 +echo "configure:1628: checking "for --with-libjpeg"" >&5 + no_cache=0 + # Check whether --with-libjpeg or --without-libjpeg was given. if test "${with_libjpeg+set}" = set; then withval="$with_libjpeg" - wxUSE_LIBJPEG="${withval}" + + if test "$withval" = yes; then + ac_cv_use_libjpeg='wxUSE_LIBJPEG=yes' + else + ac_cv_use_libjpeg='wxUSE_LIBJPEG=no' + fi + else - wxUSE_LIBJPEG=$DEFAULT_wxUSE_LIBJPEG + + LINE=`grep "wxUSE_LIBJPEG" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_libjpeg='wxUSE_LIBJPEG='$DEFAULT_wxUSE_LIBJPEG + fi -# Check whether --with-opengl or --without-opengl was given. + + eval "$ac_cv_use_libjpeg" + if test "$no_cache" != 1; then + echo $ac_cv_use_libjpeg >> ${wx_arg_cache_file}.tmp + fi + + if test "$wxUSE_LIBJPEG" = yes; then + echo "$ac_t""yes" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + + + echo $ac_n "checking "for --with-opengl"""... $ac_c" 1>&6 +echo "configure:1667: checking "for --with-opengl"" >&5 + no_cache=0 + # Check whether --with-opengl or --without-opengl was given. if test "${with_opengl+set}" = set; then withval="$with_opengl" - wxUSE_OPENGL="$withval" + + if test "$withval" = yes; then + ac_cv_use_opengl='wxUSE_OPENGL=yes' + else + ac_cv_use_opengl='wxUSE_OPENGL=no' + fi + else - wxUSE_OPENGL=$DEFAULT_wxUSE_OPENGL + + LINE=`grep "wxUSE_OPENGL" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_opengl='wxUSE_OPENGL='$DEFAULT_wxUSE_OPENGL + fi -# Check whether --with-odbc or --without-odbc was given. + + eval "$ac_cv_use_opengl" + if test "$no_cache" != 1; then + echo $ac_cv_use_opengl >> ${wx_arg_cache_file}.tmp + fi + + if test "$wxUSE_OPENGL" = yes; then + echo "$ac_t""yes" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + + + echo $ac_n "checking "for --with-odbc"""... $ac_c" 1>&6 +echo "configure:1706: checking "for --with-odbc"" >&5 + no_cache=0 + # Check whether --with-odbc or --without-odbc was given. if test "${with_odbc+set}" = set; then withval="$with_odbc" - wxUSE_ODBC="$withval" + + if test "$withval" = yes; then + ac_cv_use_odbc='wxUSE_ODBC=yes' + else + ac_cv_use_odbc='wxUSE_ODBC=no' + fi + +else + + LINE=`grep "wxUSE_ODBC" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_odbc='wxUSE_ODBC='$DEFAULT_wxUSE_ODBC + +fi + + + eval "$ac_cv_use_odbc" + if test "$no_cache" != 1; then + echo $ac_cv_use_odbc >> ${wx_arg_cache_file}.tmp + fi + + if test "$wxUSE_ODBC" = yes; then + echo "$ac_t""yes" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + + + + + + echo $ac_n "checking "for --enable-shared"""... $ac_c" 1>&6 +echo "configure:1748: checking "for --enable-shared"" >&5 + no_cache=0 + # Check whether --enable-shared or --disable-shared was given. +if test "${enable_shared+set}" = set; then + enableval="$enable_shared" + + if test "$enableval" = yes; then + ac_cv_use_shared='wxUSE_SHARED=yes' + else + ac_cv_use_shared='wxUSE_SHARED=no' + fi + else - wxUSE_ODBC=$DEFAULT_wxUSE_ODBC + + LINE=`grep "wxUSE_SHARED" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_shared='wxUSE_SHARED='$DEFAULT_wxUSE_SHARED + fi + eval "$ac_cv_use_shared" + if test "$no_cache" != 1; then + echo $ac_cv_use_shared >> ${wx_arg_cache_file}.tmp + fi + if test "$wxUSE_SHARED" = yes; then + echo "$ac_t""yes" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + -# Check whether --enable-optimise or --disable-optimise was given. + echo $ac_n "checking "for --enable-optimise"""... $ac_c" 1>&6 +echo "configure:1787: checking "for --enable-optimise"" >&5 + no_cache=0 + # Check whether --enable-optimise or --disable-optimise was given. if test "${enable_optimise+set}" = set; then enableval="$enable_optimise" - wxUSE_OPTIMISE="$enableval" + + if test "$enableval" = yes; then + ac_cv_use_optimise='wxUSE_OPTIMISE=yes' + else + ac_cv_use_optimise='wxUSE_OPTIMISE=no' + fi + else - wxUSE_OPTIMISE=$DEFAULT_wxUSE_OPTIMISE + + LINE=`grep "wxUSE_OPTIMISE" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_optimise='wxUSE_OPTIMISE='$DEFAULT_wxUSE_OPTIMISE + fi -# Check whether --enable-optimize or --disable-optimize was given. -if test "${enable_optimize+set}" = set; then - enableval="$enable_optimize" - wxUSE_OPTIMISE="$enableval" + + eval "$ac_cv_use_optimise" + if test "$no_cache" != 1; then + echo $ac_cv_use_optimise >> ${wx_arg_cache_file}.tmp + fi + + if test "$wxUSE_OPTIMISE" = yes; then + echo "$ac_t""yes" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + + + echo $ac_n "checking "for --enable-debug"""... $ac_c" 1>&6 +echo "configure:1826: checking "for --enable-debug"" >&5 + no_cache=0 + # Check whether --enable-debug or --disable-debug was given. +if test "${enable_debug+set}" = set; then + enableval="$enable_debug" + + if test "$enableval" = yes; then + ac_cv_use_debug='wxUSE_DEBUG=yes' + else + ac_cv_use_debug='wxUSE_DEBUG=no' + fi + else - wxUSE_OPTIMISE=$DEFAULT_wxUSE_OPTIMISE + + LINE=`grep "wxUSE_DEBUG" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_debug='wxUSE_DEBUG='$DEFAULT_wxUSE_DEBUG + +fi + + + eval "$ac_cv_use_debug" + if test "$no_cache" != 1; then + echo $ac_cv_use_debug >> ${wx_arg_cache_file}.tmp + fi + + if test "$wxUSE_DEBUG" = yes; then + echo "$ac_t""yes" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + + +if test "$wxUSE_DEBUG" = "yes"; then + DEFAULT_wxUSE_DEBUG_FLAG=yes + DEFAULT_wxUSE_DEBUG_INFO=yes +elif test "$wxUSE_DEBUG" = "no"; then + DEFAULT_wxUSE_DEBUG_FLAG=no + DEFAULT_wxUSE_DEBUG_INFO=no fi -# Check whether --enable-debug_flag or --disable-debug_flag was given. + + echo $ac_n "checking "for --enable-debug_flag"""... $ac_c" 1>&6 +echo "configure:1874: checking "for --enable-debug_flag"" >&5 + no_cache=0 + # Check whether --enable-debug_flag or --disable-debug_flag was given. if test "${enable_debug_flag+set}" = set; then enableval="$enable_debug_flag" - wxUSE_DEBUG_FLAG="$enableval" + + if test "$enableval" = yes; then + ac_cv_use_debug_flag='wxUSE_DEBUG_FLAG=yes' + else + ac_cv_use_debug_flag='wxUSE_DEBUG_FLAG=no' + fi + else - wxUSE_DEBUG_FLAG=$DEFAULT_wxUSE_DEBUG_FLAG + + LINE=`grep "wxUSE_DEBUG_FLAG" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_debug_flag='wxUSE_DEBUG_FLAG='$DEFAULT_wxUSE_DEBUG_FLAG + fi -# Check whether --enable-debug_info or --disable-debug_info was given. + + eval "$ac_cv_use_debug_flag" + if test "$no_cache" != 1; then + echo $ac_cv_use_debug_flag >> ${wx_arg_cache_file}.tmp + fi + + if test "$wxUSE_DEBUG_FLAG" = yes; then + echo "$ac_t""yes" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + + + echo $ac_n "checking "for --enable-debug_info"""... $ac_c" 1>&6 +echo "configure:1913: checking "for --enable-debug_info"" >&5 + no_cache=0 + # Check whether --enable-debug_info or --disable-debug_info was given. if test "${enable_debug_info+set}" = set; then enableval="$enable_debug_info" - wxUSE_DEBUG_INFO="$enableval" + + if test "$enableval" = yes; then + ac_cv_use_debug_info='wxUSE_DEBUG_INFO=yes' + else + ac_cv_use_debug_info='wxUSE_DEBUG_INFO=no' + fi + else - wxUSE_DEBUG_INFO=$DEFAULT_wxUSE_DEBUG_INFO + + LINE=`grep "wxUSE_DEBUG_INFO" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_debug_info='wxUSE_DEBUG_INFO='$DEFAULT_wxUSE_DEBUG_INFO + fi -# Check whether --enable-debug_gdb or --disable-debug_gdb was given. + + eval "$ac_cv_use_debug_info" + if test "$no_cache" != 1; then + echo $ac_cv_use_debug_info >> ${wx_arg_cache_file}.tmp + fi + + if test "$wxUSE_DEBUG_INFO" = yes; then + echo "$ac_t""yes" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + + + echo $ac_n "checking "for --enable-debug_gdb"""... $ac_c" 1>&6 +echo "configure:1952: checking "for --enable-debug_gdb"" >&5 + no_cache=0 + # Check whether --enable-debug_gdb or --disable-debug_gdb was given. if test "${enable_debug_gdb+set}" = set; then enableval="$enable_debug_gdb" - wxUSE_DEBUG_GDB="$enableval" + + if test "$enableval" = yes; then + ac_cv_use_debug_gdb='wxUSE_DEBUG_GDB=yes' + else + ac_cv_use_debug_gdb='wxUSE_DEBUG_GDB=no' + fi + else - wxUSE_DEBUG_GDB=$DEFAULT_wxUSE_DEBUG_GDB + + LINE=`grep "wxUSE_DEBUG_GDB" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_debug_gdb='wxUSE_DEBUG_GDB='$DEFAULT_wxUSE_DEBUG_GDB + fi -# Check whether --enable-debug_cntxt or --disable-debug_cntxt was given. + + eval "$ac_cv_use_debug_gdb" + if test "$no_cache" != 1; then + echo $ac_cv_use_debug_gdb >> ${wx_arg_cache_file}.tmp + fi + + if test "$wxUSE_DEBUG_GDB" = yes; then + echo "$ac_t""yes" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + + + echo $ac_n "checking "for --enable-debug_cntxt"""... $ac_c" 1>&6 +echo "configure:1991: checking "for --enable-debug_cntxt"" >&5 + no_cache=0 + # Check whether --enable-debug_cntxt or --disable-debug_cntxt was given. if test "${enable_debug_cntxt+set}" = set; then enableval="$enable_debug_cntxt" - cat >> confdefs.h <<\EOF -#define wxUSE_DEBUG_CONTEXT 1 -EOF + + if test "$enableval" = yes; then + ac_cv_use_debug_cntxt='wxUSE_DEBUG_CONTEXT=yes' + else + ac_cv_use_debug_cntxt='wxUSE_DEBUG_CONTEXT=no' + fi + +else + + LINE=`grep "wxUSE_DEBUG_CONTEXT" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + ac_cv_use_debug_cntxt='wxUSE_DEBUG_CONTEXT='$DEFAULT_wxUSE_DEBUG_CONTEXT + fi -# Check whether --enable-mem_tracing or --disable-mem_tracing was given. + + eval "$ac_cv_use_debug_cntxt" + if test "$no_cache" != 1; then + echo $ac_cv_use_debug_cntxt >> ${wx_arg_cache_file}.tmp + fi + + if test "$wxUSE_DEBUG_CONTEXT" = yes; then + echo "$ac_t""yes" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + + + echo $ac_n "checking "for --enable-mem_tracing"""... $ac_c" 1>&6 +echo "configure:2030: checking "for --enable-mem_tracing"" >&5 + no_cache=0 + # Check whether --enable-mem_tracing or --disable-mem_tracing was given. if test "${enable_mem_tracing+set}" = set; then enableval="$enable_mem_tracing" - wxUSE_MEM_TRACING="$enableval" + + if test "$enableval" = yes; then + ac_cv_use_mem_tracing='wxUSE_MEM_TRACING=yes' + else + ac_cv_use_mem_tracing='wxUSE_MEM_TRACING=no' + fi + else - wxUSE_MEM_TRACING=$DEFAULT_wxUSE_MEM_TRACING + + LINE=`grep "wxUSE_MEM_TRACING" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_mem_tracing='wxUSE_MEM_TRACING='$DEFAULT_wxUSE_MEM_TRACING + fi -# Check whether --enable-profile or --disable-profile was given. + + eval "$ac_cv_use_mem_tracing" + if test "$no_cache" != 1; then + echo $ac_cv_use_mem_tracing >> ${wx_arg_cache_file}.tmp + fi + + if test "$wxUSE_MEM_TRACING" = yes; then + echo "$ac_t""yes" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + + + echo $ac_n "checking "for --enable-profile"""... $ac_c" 1>&6 +echo "configure:2069: checking "for --enable-profile"" >&5 + no_cache=0 + # Check whether --enable-profile or --disable-profile was given. if test "${enable_profile+set}" = set; then enableval="$enable_profile" - wxUSE_PROFILE="$enableval" + + if test "$enableval" = yes; then + ac_cv_use_profile='wxUSE_PROFILE=yes' + else + ac_cv_use_profile='wxUSE_PROFILE=no' + fi + +else + + LINE=`grep "wxUSE_PROFILE" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_profile='wxUSE_PROFILE='$DEFAULT_wxUSE_PROFILE + +fi + + + eval "$ac_cv_use_profile" + if test "$no_cache" != 1; then + echo $ac_cv_use_profile >> ${wx_arg_cache_file}.tmp + fi + + if test "$wxUSE_PROFILE" = yes; then + echo "$ac_t""yes" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + + + echo $ac_n "checking "for --enable-no_rtti"""... $ac_c" 1>&6 +echo "configure:2108: checking "for --enable-no_rtti"" >&5 + no_cache=0 + # Check whether --enable-no_rtti or --disable-no_rtti was given. +if test "${enable_no_rtti+set}" = set; then + enableval="$enable_no_rtti" + + if test "$enableval" = yes; then + ac_cv_use_no_rtti='wxUSE_NO_RTTI=yes' + else + ac_cv_use_no_rtti='wxUSE_NO_RTTI=no' + fi + +else + + LINE=`grep "wxUSE_NO_RTTI" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_no_rtti='wxUSE_NO_RTTI='$DEFAULT_wxUSE_NO_RTTI + +fi + + + eval "$ac_cv_use_no_rtti" + if test "$no_cache" != 1; then + echo $ac_cv_use_no_rtti >> ${wx_arg_cache_file}.tmp + fi + + if test "$wxUSE_NO_RTTI" = yes; then + echo "$ac_t""yes" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + + + echo $ac_n "checking "for --enable-no_exceptions"""... $ac_c" 1>&6 +echo "configure:2147: checking "for --enable-no_exceptions"" >&5 + no_cache=0 + # Check whether --enable-no_exceptions or --disable-no_exceptions was given. +if test "${enable_no_exceptions+set}" = set; then + enableval="$enable_no_exceptions" + + if test "$enableval" = yes; then + ac_cv_use_no_exceptions='wxUSE_NO_EXCEPTIONS=yes' + else + ac_cv_use_no_exceptions='wxUSE_NO_EXCEPTIONS=no' + fi + else - wxUSE_PROFILE=$DEFAULT_wxUSE_PROFILE + + LINE=`grep "wxUSE_NO_EXCEPTIONS" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_no_exceptions='wxUSE_NO_EXCEPTIONS='$DEFAULT_wxUSE_NO_EXCEPTIONS + fi + eval "$ac_cv_use_no_exceptions" + if test "$no_cache" != 1; then + echo $ac_cv_use_no_exceptions >> ${wx_arg_cache_file}.tmp + fi + + if test "$wxUSE_NO_EXCEPTIONS" = yes; then + echo "$ac_t""yes" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + + -# Check whether --enable-gui or --disable-gui was given. + + echo $ac_n "checking "for --enable-gui"""... $ac_c" 1>&6 +echo "configure:2188: checking "for --enable-gui"" >&5 + no_cache=0 + # Check whether --enable-gui or --disable-gui was given. if test "${enable_gui+set}" = set; then enableval="$enable_gui" - wxUSE_GUI="$enableval" + + if test "$enableval" = yes; then + ac_cv_use_gui='wxUSE_GUI=yes' + else + ac_cv_use_gui='wxUSE_GUI=no' + fi + else - wxUSE_GUI=$DEFAULT_wxUSE_GUI + + LINE=`grep "wxUSE_GUI" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_gui='wxUSE_GUI='$DEFAULT_wxUSE_GUI + fi + eval "$ac_cv_use_gui" + if test "$no_cache" != 1; then + echo $ac_cv_use_gui >> ${wx_arg_cache_file}.tmp + fi + + if test "$wxUSE_GUI" = yes; then + echo "$ac_t""yes" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + + + -# Check whether --enable-intl or --disable-intl was given. + echo $ac_n "checking "for --enable-intl"""... $ac_c" 1>&6 +echo "configure:2229: checking "for --enable-intl"" >&5 + no_cache=0 + # Check whether --enable-intl or --disable-intl was given. if test "${enable_intl+set}" = set; then enableval="$enable_intl" - wxUSE_INTL="$enableval" + + if test "$enableval" = yes; then + ac_cv_use_intl='wxUSE_INTL=yes' + else + ac_cv_use_intl='wxUSE_INTL=no' + fi + else - wxUSE_INTL=$DEFAULT_wxUSE_INTL + + LINE=`grep "wxUSE_INTL" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_intl='wxUSE_INTL='$DEFAULT_wxUSE_INTL + fi -# Check whether --enable-config or --disable-config was given. + + eval "$ac_cv_use_intl" + if test "$no_cache" != 1; then + echo $ac_cv_use_intl >> ${wx_arg_cache_file}.tmp + fi + + if test "$wxUSE_INTL" = yes; then + echo "$ac_t""yes" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + + + echo $ac_n "checking "for --enable-config"""... $ac_c" 1>&6 +echo "configure:2268: checking "for --enable-config"" >&5 + no_cache=0 + # Check whether --enable-config or --disable-config was given. if test "${enable_config+set}" = set; then enableval="$enable_config" - wxUSE_CONFIG="$enableval" + + if test "$enableval" = yes; then + ac_cv_use_config='wxUSE_CONFIG=yes' + else + ac_cv_use_config='wxUSE_CONFIG=no' + fi + else - wxUSE_CONFIG=$DEFAULT_wxUSE_CONFIG + + LINE=`grep "wxUSE_CONFIG" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_config='wxUSE_CONFIG='$DEFAULT_wxUSE_CONFIG + fi -# Check whether --enable-sockets or --disable-sockets was given. + + eval "$ac_cv_use_config" + if test "$no_cache" != 1; then + echo $ac_cv_use_config >> ${wx_arg_cache_file}.tmp + fi + + if test "$wxUSE_CONFIG" = yes; then + echo "$ac_t""yes" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + + + echo $ac_n "checking "for --enable-sockets"""... $ac_c" 1>&6 +echo "configure:2307: checking "for --enable-sockets"" >&5 + no_cache=0 + # Check whether --enable-sockets or --disable-sockets was given. if test "${enable_sockets+set}" = set; then enableval="$enable_sockets" - wxUSE_SOCKETS="$enableval" + + if test "$enableval" = yes; then + ac_cv_use_sockets='wxUSE_SOCKETS=yes' + else + ac_cv_use_sockets='wxUSE_SOCKETS=no' + fi + else - wxUSE_SOCKETS=$DEFAULT_wxUSE_SOCKETS + + LINE=`grep "wxUSE_SOCKETS" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_sockets='wxUSE_SOCKETS='$DEFAULT_wxUSE_SOCKETS + fi -# Check whether --enable-ipc or --disable-ipc was given. + + eval "$ac_cv_use_sockets" + if test "$no_cache" != 1; then + echo $ac_cv_use_sockets >> ${wx_arg_cache_file}.tmp + fi + + if test "$wxUSE_SOCKETS" = yes; then + echo "$ac_t""yes" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + + + echo $ac_n "checking "for --enable-ipc"""... $ac_c" 1>&6 +echo "configure:2346: checking "for --enable-ipc"" >&5 + no_cache=0 + # Check whether --enable-ipc or --disable-ipc was given. if test "${enable_ipc+set}" = set; then enableval="$enable_ipc" - wxUSE_IPC="$enableval" + + if test "$enableval" = yes; then + ac_cv_use_ipc='wxUSE_IPC=yes' + else + ac_cv_use_ipc='wxUSE_IPC=no' + fi + else - wxUSE_IPC=$DEFAULT_wxUSE_IPC + + LINE=`grep "wxUSE_IPC" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_ipc='wxUSE_IPC='$DEFAULT_wxUSE_IPC + fi -# Check whether --enable-apple_ieee or --disable-apple_ieee was given. + + eval "$ac_cv_use_ipc" + if test "$no_cache" != 1; then + echo $ac_cv_use_ipc >> ${wx_arg_cache_file}.tmp + fi + + if test "$wxUSE_IPC" = yes; then + echo "$ac_t""yes" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + + + echo $ac_n "checking "for --enable-apple_ieee"""... $ac_c" 1>&6 +echo "configure:2385: checking "for --enable-apple_ieee"" >&5 + no_cache=0 + # Check whether --enable-apple_ieee or --disable-apple_ieee was given. if test "${enable_apple_ieee+set}" = set; then enableval="$enable_apple_ieee" - wxUSE_APPLE_IEEE="$enableval" + + if test "$enableval" = yes; then + ac_cv_use_apple_ieee='wxUSE_APPLE_IEEE=yes' + else + ac_cv_use_apple_ieee='wxUSE_APPLE_IEEE=no' + fi + else - wxUSE_APPLE_IEEE=$DEFAULT_wxUSE_APPLE_IEEE + + LINE=`grep "wxUSE_APPLE_IEEE" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_apple_ieee='wxUSE_APPLE_IEEE='$DEFAULT_wxUSE_APPLE_IEEE + fi -# Check whether --enable-timedate or --disable-timedate was given. + + eval "$ac_cv_use_apple_ieee" + if test "$no_cache" != 1; then + echo $ac_cv_use_apple_ieee >> ${wx_arg_cache_file}.tmp + fi + + if test "$wxUSE_APPLE_IEEE" = yes; then + echo "$ac_t""yes" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + + + echo $ac_n "checking "for --enable-timedate"""... $ac_c" 1>&6 +echo "configure:2424: checking "for --enable-timedate"" >&5 + no_cache=0 + # Check whether --enable-timedate or --disable-timedate was given. if test "${enable_timedate+set}" = set; then enableval="$enable_timedate" - wxUSE_TIMEDATE="$enableval" + + if test "$enableval" = yes; then + ac_cv_use_timedate='wxUSE_TIMEDATE=yes' + else + ac_cv_use_timedate='wxUSE_TIMEDATE=no' + fi + +else + + LINE=`grep "wxUSE_TIMEDATE" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_timedate='wxUSE_TIMEDATE='$DEFAULT_wxUSE_TIMEDATE + +fi + + + eval "$ac_cv_use_timedate" + if test "$no_cache" != 1; then + echo $ac_cv_use_timedate >> ${wx_arg_cache_file}.tmp + fi + + if test "$wxUSE_TIMEDATE" = yes; then + echo "$ac_t""yes" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + + + echo $ac_n "checking "for --enable-wave"""... $ac_c" 1>&6 +echo "configure:2463: checking "for --enable-wave"" >&5 + no_cache=0 + # Check whether --enable-wave or --disable-wave was given. +if test "${enable_wave+set}" = set; then + enableval="$enable_wave" + + if test "$enableval" = yes; then + ac_cv_use_wave='wxUSE_WAVE=yes' + else + ac_cv_use_wave='wxUSE_WAVE=no' + fi + else - wxUSE_TIMEDATE=$DEFAULT_wxUSE_TIMEDATE + + LINE=`grep "wxUSE_WAVE" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_wave='wxUSE_WAVE='$DEFAULT_wxUSE_WAVE + fi -# Check whether --enable-fraction or --disable-fraction was given. + + eval "$ac_cv_use_wave" + if test "$no_cache" != 1; then + echo $ac_cv_use_wave >> ${wx_arg_cache_file}.tmp + fi + + if test "$wxUSE_WAVE" = yes; then + echo "$ac_t""yes" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + + + echo $ac_n "checking "for --enable-fraction"""... $ac_c" 1>&6 +echo "configure:2502: checking "for --enable-fraction"" >&5 + no_cache=0 + # Check whether --enable-fraction or --disable-fraction was given. if test "${enable_fraction+set}" = set; then enableval="$enable_fraction" - wxUSE_FRACTION="$enableval" + + if test "$enableval" = yes; then + ac_cv_use_fraction='wxUSE_FRACTION=yes' + else + ac_cv_use_fraction='wxUSE_FRACTION=no' + fi + else - wxUSE_FRACTION=$DEFAULT_wxUSE_FRACTION + + LINE=`grep "wxUSE_FRACTION" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_fraction='wxUSE_FRACTION='$DEFAULT_wxUSE_FRACTION + fi -# Check whether --enable-dynlib or --disable-dynlib was given. + + eval "$ac_cv_use_fraction" + if test "$no_cache" != 1; then + echo $ac_cv_use_fraction >> ${wx_arg_cache_file}.tmp + fi + + if test "$wxUSE_FRACTION" = yes; then + echo "$ac_t""yes" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + + + echo $ac_n "checking "for --enable-dynlib"""... $ac_c" 1>&6 +echo "configure:2541: checking "for --enable-dynlib"" >&5 + no_cache=0 + # Check whether --enable-dynlib or --disable-dynlib was given. if test "${enable_dynlib+set}" = set; then enableval="$enable_dynlib" - wxUSE_DYNLIB_CLASS="$enableval" + + if test "$enableval" = yes; then + ac_cv_use_dynlib='wxUSE_DYNLIB_CLASS=yes' + else + ac_cv_use_dynlib='wxUSE_DYNLIB_CLASS=no' + fi + else - wxUSE_DYNLIB_CLASS=$DEFAULT_wxUSE_DYNLIB_CLASS + + LINE=`grep "wxUSE_DYNLIB_CLASS" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_dynlib='wxUSE_DYNLIB_CLASS='$DEFAULT_wxUSE_DYNLIB_CLASS + fi -# Check whether --enable-longlong or --disable-longlong was given. + + eval "$ac_cv_use_dynlib" + if test "$no_cache" != 1; then + echo $ac_cv_use_dynlib >> ${wx_arg_cache_file}.tmp + fi + + if test "$wxUSE_DYNLIB_CLASS" = yes; then + echo "$ac_t""yes" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + + + echo $ac_n "checking "for --enable-longlong"""... $ac_c" 1>&6 +echo "configure:2580: checking "for --enable-longlong"" >&5 + no_cache=0 + # Check whether --enable-longlong or --disable-longlong was given. if test "${enable_longlong+set}" = set; then enableval="$enable_longlong" - wxUSE_LONGLONG="${enableval}" + + if test "$enableval" = yes; then + ac_cv_use_longlong='wxUSE_LONGLONG=yes' + else + ac_cv_use_longlong='wxUSE_LONGLONG=no' + fi + else - wxUSE_LONGLONG=$DEFAULT_wxUSE_LONGLONG + + LINE=`grep "wxUSE_LONGLONG" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_longlong='wxUSE_LONGLONG='$DEFAULT_wxUSE_LONGLONG + fi -# Check whether --enable-log or --disable-log was given. + + eval "$ac_cv_use_longlong" + if test "$no_cache" != 1; then + echo $ac_cv_use_longlong >> ${wx_arg_cache_file}.tmp + fi + + if test "$wxUSE_LONGLONG" = yes; then + echo "$ac_t""yes" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + + + echo $ac_n "checking "for --enable-log"""... $ac_c" 1>&6 +echo "configure:2619: checking "for --enable-log"" >&5 + no_cache=0 + # Check whether --enable-log or --disable-log was given. if test "${enable_log+set}" = set; then enableval="$enable_log" - wxUSE_LOG="$enableval" + + if test "$enableval" = yes; then + ac_cv_use_log='wxUSE_LOG=yes' + else + ac_cv_use_log='wxUSE_LOG=no' + fi + else - wxUSE_LOG=$DEFAULT_wxUSE_LOG + + LINE=`grep "wxUSE_LOG" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_log='wxUSE_LOG='$DEFAULT_wxUSE_LOG + fi -# Check whether --enable-streams or --disable-streams was given. + + eval "$ac_cv_use_log" + if test "$no_cache" != 1; then + echo $ac_cv_use_log >> ${wx_arg_cache_file}.tmp + fi + + if test "$wxUSE_LOG" = yes; then + echo "$ac_t""yes" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + + + echo $ac_n "checking "for --enable-streams"""... $ac_c" 1>&6 +echo "configure:2658: checking "for --enable-streams"" >&5 + no_cache=0 + # Check whether --enable-streams or --disable-streams was given. if test "${enable_streams+set}" = set; then enableval="$enable_streams" - wxUSE_STREAMS="$enableval" + + if test "$enableval" = yes; then + ac_cv_use_streams='wxUSE_STREAMS=yes' + else + ac_cv_use_streams='wxUSE_STREAMS=no' + fi + else - wxUSE_STREAMS=$DEFAULT_wxUSE_STREAMS -fi + + LINE=`grep "wxUSE_STREAMS" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi -# Check whether --enable-file or --disable-file was given. -if test "${enable_file+set}" = set; then - enableval="$enable_file" - wxUSE_FILE="$enableval" -else - wxUSE_FILE=$DEFAULT_wxUSE_FILE + ac_cv_use_streams='wxUSE_STREAMS='$DEFAULT_wxUSE_STREAMS + fi -# Check whether --enable-textfile or --disable-textfile was given. + + eval "$ac_cv_use_streams" + if test "$no_cache" != 1; then + echo $ac_cv_use_streams >> ${wx_arg_cache_file}.tmp + fi + + if test "$wxUSE_STREAMS" = yes; then + echo "$ac_t""yes" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + + + echo $ac_n "checking "for --enable-file"""... $ac_c" 1>&6 +echo "configure:2697: checking "for --enable-file"" >&5 + no_cache=0 + # Check whether --enable-file or --disable-file was given. +if test "${enable_file+set}" = set; then + enableval="$enable_file" + + if test "$enableval" = yes; then + ac_cv_use_file='wxUSE_FILE=yes' + else + ac_cv_use_file='wxUSE_FILE=no' + fi + +else + + LINE=`grep "wxUSE_FILE" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_file='wxUSE_FILE='$DEFAULT_wxUSE_FILE + +fi + + + eval "$ac_cv_use_file" + if test "$no_cache" != 1; then + echo $ac_cv_use_file >> ${wx_arg_cache_file}.tmp + fi + + if test "$wxUSE_FILE" = yes; then + echo "$ac_t""yes" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + + + echo $ac_n "checking "for --enable-textfile"""... $ac_c" 1>&6 +echo "configure:2736: checking "for --enable-textfile"" >&5 + no_cache=0 + # Check whether --enable-textfile or --disable-textfile was given. if test "${enable_textfile+set}" = set; then enableval="$enable_textfile" - wxUSE_TEXTFILE="$enableval" + + if test "$enableval" = yes; then + ac_cv_use_textfile='wxUSE_TEXTFILE=yes' + else + ac_cv_use_textfile='wxUSE_TEXTFILE=no' + fi + else - wxUSE_TEXTFILE=$DEFAULT_wxUSE_TEXTFILE + + LINE=`grep "wxUSE_TEXTFILE" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_textfile='wxUSE_TEXTFILE='$DEFAULT_wxUSE_TEXTFILE + fi -# Check whether --enable-unicode or --disable-unicode was given. + + eval "$ac_cv_use_textfile" + if test "$no_cache" != 1; then + echo $ac_cv_use_textfile >> ${wx_arg_cache_file}.tmp + fi + + if test "$wxUSE_TEXTFILE" = yes; then + echo "$ac_t""yes" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + + + echo $ac_n "checking "for --enable-unicode"""... $ac_c" 1>&6 +echo "configure:2775: checking "for --enable-unicode"" >&5 + no_cache=0 + # Check whether --enable-unicode or --disable-unicode was given. if test "${enable_unicode+set}" = set; then enableval="$enable_unicode" - wxUSE_UNICODE="$enableval" + + if test "$enableval" = yes; then + ac_cv_use_unicode='wxUSE_UNICODE=yes' + else + ac_cv_use_unicode='wxUSE_UNICODE=no' + fi + else - wxUSE_UNICODE=$DEFAULT_wxUSE_UNICODE + + LINE=`grep "wxUSE_UNICODE" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_unicode='wxUSE_UNICODE='$DEFAULT_wxUSE_UNICODE + fi -# Check whether --enable-wcsrtombs or --disable-wcsrtombs was given. + + eval "$ac_cv_use_unicode" + if test "$no_cache" != 1; then + echo $ac_cv_use_unicode >> ${wx_arg_cache_file}.tmp + fi + + if test "$wxUSE_UNICODE" = yes; then + echo "$ac_t""yes" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + + + echo $ac_n "checking "for --enable-wcsrtombs"""... $ac_c" 1>&6 +echo "configure:2814: checking "for --enable-wcsrtombs"" >&5 + no_cache=0 + # Check whether --enable-wcsrtombs or --disable-wcsrtombs was given. if test "${enable_wcsrtombs+set}" = set; then enableval="$enable_wcsrtombs" - wxUSE_WCSRTOMBS="$enableval" + + if test "$enableval" = yes; then + ac_cv_use_wcsrtombs='wxUSE_WCSRTOMBS=yes' + else + ac_cv_use_wcsrtombs='wxUSE_WCSRTOMBS=no' + fi + +else + + LINE=`grep "wxUSE_WCSRTOMBS" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_wcsrtombs='wxUSE_WCSRTOMBS='$DEFAULT_wxUSE_WCSRTOMBS + +fi + + + eval "$ac_cv_use_wcsrtombs" + if test "$no_cache" != 1; then + echo $ac_cv_use_wcsrtombs >> ${wx_arg_cache_file}.tmp + fi + + if test "$wxUSE_WCSRTOMBS" = yes; then + echo "$ac_t""yes" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + + + echo $ac_n "checking "for --enable-wxprintfv"""... $ac_c" 1>&6 +echo "configure:2853: checking "for --enable-wxprintfv"" >&5 + no_cache=0 + # Check whether --enable-wxprintfv or --disable-wxprintfv was given. +if test "${enable_wxprintfv+set}" = set; then + enableval="$enable_wxprintfv" + + if test "$enableval" = yes; then + ac_cv_use_wxprintfv='wxUSE_EXPERIMENTAL_PRINTF=yes' + else + ac_cv_use_wxprintfv='wxUSE_EXPERIMENTAL_PRINTF=no' + fi + else - wxUSE_WCSRTOMBS=$DEFAULT_wxUSE_WCSRTOMBS + + LINE=`grep "wxUSE_EXPERIMENTAL_PRINTF" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_wxprintfv='wxUSE_EXPERIMENTAL_PRINTF='$DEFAULT_wxUSE_EXPERIMENTAL_PRINTF + fi -# Check whether --enable-joystick or --disable-joystick was given. + + eval "$ac_cv_use_wxprintfv" + if test "$no_cache" != 1; then + echo $ac_cv_use_wxprintfv >> ${wx_arg_cache_file}.tmp + fi + + if test "$wxUSE_EXPERIMENTAL_PRINTF" = yes; then + echo "$ac_t""yes" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + + + echo $ac_n "checking "for --enable-joystick"""... $ac_c" 1>&6 +echo "configure:2892: checking "for --enable-joystick"" >&5 + no_cache=0 + # Check whether --enable-joystick or --disable-joystick was given. if test "${enable_joystick+set}" = set; then enableval="$enable_joystick" - wxUSE_JOYSTICK="$enableval" + + if test "$enableval" = yes; then + ac_cv_use_joystick='wxUSE_JOYSTICK=yes' + else + ac_cv_use_joystick='wxUSE_JOYSTICK=no' + fi + +else + + LINE=`grep "wxUSE_JOYSTICK" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_joystick='wxUSE_JOYSTICK='$DEFAULT_wxUSE_JOYSTICK + +fi + + + eval "$ac_cv_use_joystick" + if test "$no_cache" != 1; then + echo $ac_cv_use_joystick >> ${wx_arg_cache_file}.tmp + fi + + if test "$wxUSE_JOYSTICK" = yes; then + echo "$ac_t""yes" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + + + echo $ac_n "checking "for --enable-std_iostreams"""... $ac_c" 1>&6 +echo "configure:2931: checking "for --enable-std_iostreams"" >&5 + no_cache=0 + # Check whether --enable-std_iostreams or --disable-std_iostreams was given. +if test "${enable_std_iostreams+set}" = set; then + enableval="$enable_std_iostreams" + + if test "$enableval" = yes; then + ac_cv_use_std_iostreams='wxUSE_STD_IOSTREAM=yes' + else + ac_cv_use_std_iostreams='wxUSE_STD_IOSTREAM=no' + fi + +else + + LINE=`grep "wxUSE_STD_IOSTREAM" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_std_iostreams='wxUSE_STD_IOSTREAM='$DEFAULT_wxUSE_STD_IOSTREAM + +fi + + + eval "$ac_cv_use_std_iostreams" + if test "$no_cache" != 1; then + echo $ac_cv_use_std_iostreams >> ${wx_arg_cache_file}.tmp + fi + + if test "$wxUSE_STD_IOSTREAM" = yes; then + echo "$ac_t""yes" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + + + echo $ac_n "checking "for --enable-fs_inet"""... $ac_c" 1>&6 +echo "configure:2970: checking "for --enable-fs_inet"" >&5 + no_cache=0 + # Check whether --enable-fs_inet or --disable-fs_inet was given. +if test "${enable_fs_inet+set}" = set; then + enableval="$enable_fs_inet" + + if test "$enableval" = yes; then + ac_cv_use_fs_inet='wxUSE_FS_INET=yes' + else + ac_cv_use_fs_inet='wxUSE_FS_INET=no' + fi + +else + + LINE=`grep "wxUSE_FS_INET" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_fs_inet='wxUSE_FS_INET='$DEFAULT_wxUSE_FS_INET + +fi + + + eval "$ac_cv_use_fs_inet" + if test "$no_cache" != 1; then + echo $ac_cv_use_fs_inet >> ${wx_arg_cache_file}.tmp + fi + + if test "$wxUSE_FS_INET" = yes; then + echo "$ac_t""yes" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + + + echo $ac_n "checking "for --enable-fs_zip"""... $ac_c" 1>&6 +echo "configure:3009: checking "for --enable-fs_zip"" >&5 + no_cache=0 + # Check whether --enable-fs_zip or --disable-fs_zip was given. +if test "${enable_fs_zip+set}" = set; then + enableval="$enable_fs_zip" + + if test "$enableval" = yes; then + ac_cv_use_fs_zip='wxUSE_FS_ZIP=yes' + else + ac_cv_use_fs_zip='wxUSE_FS_ZIP=no' + fi + +else + + LINE=`grep "wxUSE_FS_ZIP" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_fs_zip='wxUSE_FS_ZIP='$DEFAULT_wxUSE_FS_ZIP + +fi + + + eval "$ac_cv_use_fs_zip" + if test "$no_cache" != 1; then + echo $ac_cv_use_fs_zip >> ${wx_arg_cache_file}.tmp + fi + + if test "$wxUSE_FS_ZIP" = yes; then + echo "$ac_t""yes" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + + + echo $ac_n "checking "for --enable-zipstream"""... $ac_c" 1>&6 +echo "configure:3048: checking "for --enable-zipstream"" >&5 + no_cache=0 + # Check whether --enable-zipstream or --disable-zipstream was given. +if test "${enable_zipstream+set}" = set; then + enableval="$enable_zipstream" + + if test "$enableval" = yes; then + ac_cv_use_zipstream='wxUSE_ZIPSTREAM=yes' + else + ac_cv_use_zipstream='wxUSE_ZIPSTREAM=no' + fi + else - wxUSE_JOYSTICK=$DEFAULT_wxUSE_JOYSTICK + + LINE=`grep "wxUSE_ZIPSTREAM" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_zipstream='wxUSE_ZIPSTREAM='$DEFAULT_wxUSE_ZIPSTREAM + fi + eval "$ac_cv_use_zipstream" + if test "$no_cache" != 1; then + echo $ac_cv_use_zipstream >> ${wx_arg_cache_file}.tmp + fi + + if test "$wxUSE_ZIPSTREAM" = yes; then + echo "$ac_t""yes" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + + + -# Check whether --enable-threads or --disable-threads was given. + echo $ac_n "checking "for --enable-threads"""... $ac_c" 1>&6 +echo "configure:3089: checking "for --enable-threads"" >&5 + no_cache=0 + # Check whether --enable-threads or --disable-threads was given. if test "${enable_threads+set}" = set; then enableval="$enable_threads" - wxUSE_THREADS="${enableval}" + + if test "$enableval" = yes; then + ac_cv_use_threads='wxUSE_THREADS=yes' + else + ac_cv_use_threads='wxUSE_THREADS=no' + fi + else - wxUSE_THREADS=$DEFAULT_wxUSE_THREADS + + LINE=`grep "wxUSE_THREADS" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_threads='wxUSE_THREADS='$DEFAULT_wxUSE_THREADS + fi -# Check whether --enable-serial or --disable-serial was given. + + eval "$ac_cv_use_threads" + if test "$no_cache" != 1; then + echo $ac_cv_use_threads >> ${wx_arg_cache_file}.tmp + fi + + if test "$wxUSE_THREADS" = yes; then + echo "$ac_t""yes" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + + + echo $ac_n "checking "for --enable-serial"""... $ac_c" 1>&6 +echo "configure:3128: checking "for --enable-serial"" >&5 + no_cache=0 + # Check whether --enable-serial or --disable-serial was given. if test "${enable_serial+set}" = set; then enableval="$enable_serial" - wxUSE_SERIAL="${enableval}" + + if test "$enableval" = yes; then + ac_cv_use_serial='wxUSE_SERIAL=yes' + else + ac_cv_use_serial='wxUSE_SERIAL=no' + fi + else - wxUSE_SERIAL=$DEFAULT_wxUSE_SERIAL + + LINE=`grep "wxUSE_SERIAL" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_serial='wxUSE_SERIAL='$DEFAULT_wxUSE_SERIAL + fi + eval "$ac_cv_use_serial" + if test "$no_cache" != 1; then + echo $ac_cv_use_serial >> ${wx_arg_cache_file}.tmp + fi -# Check whether --enable-docview or --disable-docview was given. + if test "$wxUSE_SERIAL" = yes; then + echo "$ac_t""yes" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + + + + + echo $ac_n "checking "for --enable-docview"""... $ac_c" 1>&6 +echo "configure:3169: checking "for --enable-docview"" >&5 + no_cache=0 + # Check whether --enable-docview or --disable-docview was given. if test "${enable_docview+set}" = set; then enableval="$enable_docview" - wxUSE_DOC_VIEW_ARCHITECTURE="$enableval" + + if test "$enableval" = yes; then + ac_cv_use_docview='wxUSE_DOC_VIEW_ARCHITECTURE=yes' + else + ac_cv_use_docview='wxUSE_DOC_VIEW_ARCHITECTURE=no' + fi + else - wxUSE_DOC_VIEW_ARCHITECTURE=$DEFAULT_wxUSE_DOC_VIEW_ARCHITECTURE + + LINE=`grep "wxUSE_DOC_VIEW_ARCHITECTURE" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_docview='wxUSE_DOC_VIEW_ARCHITECTURE='$DEFAULT_wxUSE_DOC_VIEW_ARCHITECTURE + fi -# Check whether --enable-help or --disable-help was given. + + eval "$ac_cv_use_docview" + if test "$no_cache" != 1; then + echo $ac_cv_use_docview >> ${wx_arg_cache_file}.tmp + fi + + if test "$wxUSE_DOC_VIEW_ARCHITECTURE" = yes; then + echo "$ac_t""yes" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + + + echo $ac_n "checking "for --enable-help"""... $ac_c" 1>&6 +echo "configure:3208: checking "for --enable-help"" >&5 + no_cache=0 + # Check whether --enable-help or --disable-help was given. if test "${enable_help+set}" = set; then enableval="$enable_help" - wxUSE_HELP="$enableval" + + if test "$enableval" = yes; then + ac_cv_use_help='wxUSE_HELP=yes' + else + ac_cv_use_help='wxUSE_HELP=no' + fi + else - wxUSE_HELP=$DEFAULT_wxUSE_HELP + + LINE=`grep "wxUSE_HELP" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_help='wxUSE_HELP='$DEFAULT_wxUSE_HELP + fi -# Check whether --enable-constraints or --disable-constraints was given. + + eval "$ac_cv_use_help" + if test "$no_cache" != 1; then + echo $ac_cv_use_help >> ${wx_arg_cache_file}.tmp + fi + + if test "$wxUSE_HELP" = yes; then + echo "$ac_t""yes" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + + + echo $ac_n "checking "for --enable-constraints"""... $ac_c" 1>&6 +echo "configure:3247: checking "for --enable-constraints"" >&5 + no_cache=0 + # Check whether --enable-constraints or --disable-constraints was given. if test "${enable_constraints+set}" = set; then enableval="$enable_constraints" - wxUSE_CONSTRAINTS="$enableval" + + if test "$enableval" = yes; then + ac_cv_use_constraints='wxUSE_CONSTRAINTS=yes' + else + ac_cv_use_constraints='wxUSE_CONSTRAINTS=no' + fi + else - wxUSE_CONSTRAINTS=$DEFAULT_wxUSE_CONSTRAINTS + + LINE=`grep "wxUSE_CONSTRAINTS" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_constraints='wxUSE_CONSTRAINTS='$DEFAULT_wxUSE_CONSTRAINTS + fi -# Check whether --enable-printarch or --disable-printarch was given. + + eval "$ac_cv_use_constraints" + if test "$no_cache" != 1; then + echo $ac_cv_use_constraints >> ${wx_arg_cache_file}.tmp + fi + + if test "$wxUSE_CONSTRAINTS" = yes; then + echo "$ac_t""yes" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + + + echo $ac_n "checking "for --enable-printarch"""... $ac_c" 1>&6 +echo "configure:3286: checking "for --enable-printarch"" >&5 + no_cache=0 + # Check whether --enable-printarch or --disable-printarch was given. if test "${enable_printarch+set}" = set; then enableval="$enable_printarch" - wxUSE_PRINTING_ARCHITECTURE="${enableval}" + + if test "$enableval" = yes; then + ac_cv_use_printarch='wxUSE_PRINTING_ARCHITECTURE=yes' + else + ac_cv_use_printarch='wxUSE_PRINTING_ARCHITECTURE=no' + fi + else - wxUSE_PRINTING_ARCHITECTURE=$DEFAULT_wxUSE_PRINTING_ARCHITECTURE + + LINE=`grep "wxUSE_PRINTING_ARCHITECTURE" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_printarch='wxUSE_PRINTING_ARCHITECTURE='$DEFAULT_wxUSE_PRINTING_ARCHITECTURE + fi -# Check whether --enable-mdi or --disable-mdi was given. + + eval "$ac_cv_use_printarch" + if test "$no_cache" != 1; then + echo $ac_cv_use_printarch >> ${wx_arg_cache_file}.tmp + fi + + if test "$wxUSE_PRINTING_ARCHITECTURE" = yes; then + echo "$ac_t""yes" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + + + echo $ac_n "checking "for --enable-mdi"""... $ac_c" 1>&6 +echo "configure:3325: checking "for --enable-mdi"" >&5 + no_cache=0 + # Check whether --enable-mdi or --disable-mdi was given. if test "${enable_mdi+set}" = set; then enableval="$enable_mdi" - wxUSE_MDI_ARCHITECTURE="${enableval}" + + if test "$enableval" = yes; then + ac_cv_use_mdi='wxUSE_MDI_ARCHITECTURE=yes' + else + ac_cv_use_mdi='wxUSE_MDI_ARCHITECTURE=no' + fi + else - wxUSE_MDI_ARCHITECTURE=$DEFAULT_wxUSE_MDI_ARCHITECTURE + + LINE=`grep "wxUSE_MDI_ARCHITECTURE" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_mdi='wxUSE_MDI_ARCHITECTURE='$DEFAULT_wxUSE_MDI_ARCHITECTURE + fi -# Check whether --enable-postscript or --disable-postscript was given. + eval "$ac_cv_use_mdi" + if test "$no_cache" != 1; then + echo $ac_cv_use_mdi >> ${wx_arg_cache_file}.tmp + fi + + if test "$wxUSE_MDI_ARCHITECTURE" = yes; then + echo "$ac_t""yes" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + + + + echo $ac_n "checking "for --enable-postscript"""... $ac_c" 1>&6 +echo "configure:3365: checking "for --enable-postscript"" >&5 + no_cache=0 + # Check whether --enable-postscript or --disable-postscript was given. if test "${enable_postscript+set}" = set; then enableval="$enable_postscript" - wxUSE_POSTSCRIPT="$enableval" + + if test "$enableval" = yes; then + ac_cv_use_postscript='wxUSE_POSTSCRIPT=yes' + else + ac_cv_use_postscript='wxUSE_POSTSCRIPT=no' + fi + else - wxUSE_POSTSCRIPT=$DEFAULT_wxUSE_POSTSCRIPT + + LINE=`grep "wxUSE_POSTSCRIPT" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_postscript='wxUSE_POSTSCRIPT='$DEFAULT_wxUSE_POSTSCRIPT + fi + eval "$ac_cv_use_postscript" + if test "$no_cache" != 1; then + echo $ac_cv_use_postscript >> ${wx_arg_cache_file}.tmp + fi + + if test "$wxUSE_POSTSCRIPT" = yes; then + echo "$ac_t""yes" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + + + -# Check whether --enable-prologio or --disable-prologio was given. + echo $ac_n "checking "for --enable-prologio"""... $ac_c" 1>&6 +echo "configure:3406: checking "for --enable-prologio"" >&5 + no_cache=0 + # Check whether --enable-prologio or --disable-prologio was given. if test "${enable_prologio+set}" = set; then enableval="$enable_prologio" - wxUSE_PROLOGIO="${enableval}" + + if test "$enableval" = yes; then + ac_cv_use_prologio='wxUSE_PROLOGIO=yes' + else + ac_cv_use_prologio='wxUSE_PROLOGIO=no' + fi + else - wxUSE_PROLOGIO=$DEFAULT_wxUSE_PROLOGIO + + LINE=`grep "wxUSE_PROLOGIO" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_prologio='wxUSE_PROLOGIO='$DEFAULT_wxUSE_PROLOGIO + fi -# Check whether --enable-resources or --disable-resources was given. + + eval "$ac_cv_use_prologio" + if test "$no_cache" != 1; then + echo $ac_cv_use_prologio >> ${wx_arg_cache_file}.tmp + fi + + if test "$wxUSE_PROLOGIO" = yes; then + echo "$ac_t""yes" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + + + echo $ac_n "checking "for --enable-resources"""... $ac_c" 1>&6 +echo "configure:3445: checking "for --enable-resources"" >&5 + no_cache=0 + # Check whether --enable-resources or --disable-resources was given. if test "${enable_resources+set}" = set; then enableval="$enable_resources" - wxUSE_RESOURCES="${enableval}" + + if test "$enableval" = yes; then + ac_cv_use_resources='wxUSE_RESOURCES=yes' + else + ac_cv_use_resources='wxUSE_RESOURCES=no' + fi + else - wxUSE_RESOURCES=$DEFAULT_wxUSE_RESOURCES + + LINE=`grep "wxUSE_RESOURCES" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_resources='wxUSE_RESOURCES='$DEFAULT_wxUSE_RESOURCES + fi -# Check whether --enable-xresources or --disable-xresources was given. + eval "$ac_cv_use_resources" + if test "$no_cache" != 1; then + echo $ac_cv_use_resources >> ${wx_arg_cache_file}.tmp + fi + + if test "$wxUSE_RESOURCES" = yes; then + echo "$ac_t""yes" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + + + + echo $ac_n "checking "for --enable-xresources"""... $ac_c" 1>&6 +echo "configure:3485: checking "for --enable-xresources"" >&5 + no_cache=0 + # Check whether --enable-xresources or --disable-xresources was given. if test "${enable_xresources+set}" = set; then enableval="$enable_xresources" - wxUSE_X_RESOURCES="${enableval}" + + if test "$enableval" = yes; then + ac_cv_use_xresources='wxUSE_X_RESOURCES=yes' + else + ac_cv_use_xresources='wxUSE_X_RESOURCES=no' + fi + else - wxUSE_X_RESOURCES=$DEFAULT_wxUSE_X_RESOURCES + + LINE=`grep "wxUSE_X_RESOURCES" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_xresources='wxUSE_X_RESOURCES='$DEFAULT_wxUSE_X_RESOURCES + fi -# Check whether --enable-clipboard or --disable-clipboard was given. + + eval "$ac_cv_use_xresources" + if test "$no_cache" != 1; then + echo $ac_cv_use_xresources >> ${wx_arg_cache_file}.tmp + fi + + if test "$wxUSE_X_RESOURCES" = yes; then + echo "$ac_t""yes" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + + + + + echo $ac_n "checking "for --enable-clipboard"""... $ac_c" 1>&6 +echo "configure:3526: checking "for --enable-clipboard"" >&5 + no_cache=0 + # Check whether --enable-clipboard or --disable-clipboard was given. if test "${enable_clipboard+set}" = set; then enableval="$enable_clipboard" - wxUSE_CLIPBOARD="${enableval}" + + if test "$enableval" = yes; then + ac_cv_use_clipboard='wxUSE_CLIPBOARD=yes' + else + ac_cv_use_clipboard='wxUSE_CLIPBOARD=no' + fi + else - wxUSE_CLIPBOARD=$DEFAULT_wxUSE_CLIPBOARD + + LINE=`grep "wxUSE_CLIPBOARD" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_clipboard='wxUSE_CLIPBOARD='$DEFAULT_wxUSE_CLIPBOARD + fi -# Check whether --enable-dnd or --disable-dnd was given. + + eval "$ac_cv_use_clipboard" + if test "$no_cache" != 1; then + echo $ac_cv_use_clipboard >> ${wx_arg_cache_file}.tmp + fi + + if test "$wxUSE_CLIPBOARD" = yes; then + echo "$ac_t""yes" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + + + echo $ac_n "checking "for --enable-dnd"""... $ac_c" 1>&6 +echo "configure:3565: checking "for --enable-dnd"" >&5 + no_cache=0 + # Check whether --enable-dnd or --disable-dnd was given. if test "${enable_dnd+set}" = set; then enableval="$enable_dnd" - wxUSE_DRAG_AND_DROP="${enableval}" + + if test "$enableval" = yes; then + ac_cv_use_dnd='wxUSE_DRAG_AND_DROP=yes' + else + ac_cv_use_dnd='wxUSE_DRAG_AND_DROP=no' + fi + else - wxUSE_DRAG_AND_DROP=$DEFAULT_wxUSE_DRAG_AND_DROP + + LINE=`grep "wxUSE_DRAG_AND_DROP" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_dnd='wxUSE_DRAG_AND_DROP='$DEFAULT_wxUSE_DRAG_AND_DROP + fi -# Check whether --enable-wxtree or --disable-wxtree was given. + eval "$ac_cv_use_dnd" + if test "$no_cache" != 1; then + echo $ac_cv_use_dnd >> ${wx_arg_cache_file}.tmp + fi + + if test "$wxUSE_DRAG_AND_DROP" = yes; then + echo "$ac_t""yes" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + + + + echo $ac_n "checking "for --enable-wxtree"""... $ac_c" 1>&6 +echo "configure:3605: checking "for --enable-wxtree"" >&5 + no_cache=0 + # Check whether --enable-wxtree or --disable-wxtree was given. if test "${enable_wxtree+set}" = set; then enableval="$enable_wxtree" - wxUSE_WXTREE="${enableval}" + + if test "$enableval" = yes; then + ac_cv_use_wxtree='wxUSE_WXTREE=yes' + else + ac_cv_use_wxtree='wxUSE_WXTREE=no' + fi + else - wxUSE_WXTREE=$DEFAULT_wxUSE_WXTREE + + LINE=`grep "wxUSE_WXTREE" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_wxtree='wxUSE_WXTREE='$DEFAULT_wxUSE_WXTREE + fi + eval "$ac_cv_use_wxtree" + if test "$no_cache" != 1; then + echo $ac_cv_use_wxtree >> ${wx_arg_cache_file}.tmp + fi + + if test "$wxUSE_WXTREE" = yes; then + echo "$ac_t""yes" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + + + -# Check whether --enable-controls or --disable-controls was given. + echo $ac_n "checking "for --enable-controls"""... $ac_c" 1>&6 +echo "configure:3646: checking "for --enable-controls"" >&5 + no_cache=0 + # Check whether --enable-controls or --disable-controls was given. if test "${enable_controls+set}" = set; then enableval="$enable_controls" - wxUSE_CONTROLS="${enableval}" + + if test "$enableval" = yes; then + ac_cv_use_controls='wxUSE_CONTROLS=yes' + else + ac_cv_use_controls='wxUSE_CONTROLS=no' + fi + +else + + LINE=`grep "wxUSE_CONTROLS" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_controls='wxUSE_CONTROLS='$DEFAULT_wxUSE_CONTROLS + fi + eval "$ac_cv_use_controls" + if test "$no_cache" != 1; then + echo $ac_cv_use_controls >> ${wx_arg_cache_file}.tmp + fi + + if test "$wxUSE_CONTROLS" = yes; then + echo "$ac_t""yes" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + + if test "$wxUSE_CONTROLS" = "yes"; then DEFAULT_wxUSE_ACCEL=yes DEFAULT_wxUSE_CARET=yes @@ -1959,6 +3687,7 @@ if test "$wxUSE_CONTROLS" = "yes"; then DEFAULT_wxUSE_BMPBUTTON=yes DEFAULT_wxUSE_CHECKBOX=yes DEFAULT_wxUSE_CHECKLISTBOX=yes + DEFAULT_wxUSE_CHOICE=yes DEFAULT_wxUSE_GAUGE=yes DEFAULT_wxUSE_GRID=yes DEFAULT_wxUSE_IMAGLIST=yes @@ -1987,6 +3716,7 @@ elif test "$wxUSE_CONTROLS" = "no"; then DEFAULT_wxUSE_BMPBUTTON=no DEFAULT_wxUSE_CHECKBOX=no DEFAULT_wxUSE_CHECKLISTBOX=no + DEFAULT_wxUSE_CHOICE=no DEFAULT_wxUSE_GAUGE=no DEFAULT_wxUSE_GRID=no DEFAULT_wxUSE_IMAGLIST=no @@ -2010,275 +3740,1544 @@ elif test "$wxUSE_CONTROLS" = "no"; then DEFAULT_wxUSE_TREECTRL=no fi -# Check whether --enable-accel or --disable-accel was given. + + echo $ac_n "checking "for --enable-accel"""... $ac_c" 1>&6 +echo "configure:3746: checking "for --enable-accel"" >&5 + no_cache=0 + # Check whether --enable-accel or --disable-accel was given. if test "${enable_accel+set}" = set; then enableval="$enable_accel" - wxUSE_ACCEL="${enableval}" + + if test "$enableval" = yes; then + ac_cv_use_accel='wxUSE_ACCEL=yes' + else + ac_cv_use_accel='wxUSE_ACCEL=no' + fi + else - wxUSE_ACCEL=$DEFAULT_wxUSE_ACCEL + + LINE=`grep "wxUSE_ACCEL" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_accel='wxUSE_ACCEL='$DEFAULT_wxUSE_ACCEL + fi -# Check whether --enable-caret or --disable-caret was given. + + eval "$ac_cv_use_accel" + if test "$no_cache" != 1; then + echo $ac_cv_use_accel >> ${wx_arg_cache_file}.tmp + fi + + if test "$wxUSE_ACCEL" = yes; then + echo "$ac_t""yes" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + + + echo $ac_n "checking "for --enable-caret"""... $ac_c" 1>&6 +echo "configure:3785: checking "for --enable-caret"" >&5 + no_cache=0 + # Check whether --enable-caret or --disable-caret was given. if test "${enable_caret+set}" = set; then enableval="$enable_caret" - wxUSE_CARET="${enableval}" + + if test "$enableval" = yes; then + ac_cv_use_caret='wxUSE_CARET=yes' + else + ac_cv_use_caret='wxUSE_CARET=no' + fi + else - wxUSE_CARET=$DEFAULT_wxUSE_CARET + + LINE=`grep "wxUSE_CARET" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_caret='wxUSE_CARET='$DEFAULT_wxUSE_CARET + fi -# Check whether --enable-bmpbutton or --disable-bmpbutton was given. + + eval "$ac_cv_use_caret" + if test "$no_cache" != 1; then + echo $ac_cv_use_caret >> ${wx_arg_cache_file}.tmp + fi + + if test "$wxUSE_CARET" = yes; then + echo "$ac_t""yes" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + + + echo $ac_n "checking "for --enable-bmpbutton"""... $ac_c" 1>&6 +echo "configure:3824: checking "for --enable-bmpbutton"" >&5 + no_cache=0 + # Check whether --enable-bmpbutton or --disable-bmpbutton was given. if test "${enable_bmpbutton+set}" = set; then enableval="$enable_bmpbutton" - wxUSE_BMPBUTTON="${enableval}" + + if test "$enableval" = yes; then + ac_cv_use_bmpbutton='wxUSE_BMPBUTTON=yes' + else + ac_cv_use_bmpbutton='wxUSE_BMPBUTTON=no' + fi + else - wxUSE_BMPBUTTON=$DEFAULT_wxUSE_BMPBUTTON + + LINE=`grep "wxUSE_BMPBUTTON" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_bmpbutton='wxUSE_BMPBUTTON='$DEFAULT_wxUSE_BMPBUTTON + fi -# Check whether --enable-checkbox or --disable-checkbox was given. + + eval "$ac_cv_use_bmpbutton" + if test "$no_cache" != 1; then + echo $ac_cv_use_bmpbutton >> ${wx_arg_cache_file}.tmp + fi + + if test "$wxUSE_BMPBUTTON" = yes; then + echo "$ac_t""yes" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + + + echo $ac_n "checking "for --enable-checkbox"""... $ac_c" 1>&6 +echo "configure:3863: checking "for --enable-checkbox"" >&5 + no_cache=0 + # Check whether --enable-checkbox or --disable-checkbox was given. if test "${enable_checkbox+set}" = set; then enableval="$enable_checkbox" - wxUSE_CHECKBOX="${enableval}" + + if test "$enableval" = yes; then + ac_cv_use_checkbox='wxUSE_CHECKBOX=yes' + else + ac_cv_use_checkbox='wxUSE_CHECKBOX=no' + fi + else - wxUSE_CHECKBOX=$DEFAULT_wxUSE_CHECKBOX + + LINE=`grep "wxUSE_CHECKBOX" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_checkbox='wxUSE_CHECKBOX='$DEFAULT_wxUSE_CHECKBOX + fi -# Check whether --enable-checklst or --disable-checklst was given. + + eval "$ac_cv_use_checkbox" + if test "$no_cache" != 1; then + echo $ac_cv_use_checkbox >> ${wx_arg_cache_file}.tmp + fi + + if test "$wxUSE_CHECKBOX" = yes; then + echo "$ac_t""yes" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + + + echo $ac_n "checking "for --enable-checklst"""... $ac_c" 1>&6 +echo "configure:3902: checking "for --enable-checklst"" >&5 + no_cache=0 + # Check whether --enable-checklst or --disable-checklst was given. if test "${enable_checklst+set}" = set; then enableval="$enable_checklst" - wxUSE_CHECKLST="${enableval}" + + if test "$enableval" = yes; then + ac_cv_use_checklst='wxUSE_CHECKLST=yes' + else + ac_cv_use_checklst='wxUSE_CHECKLST=no' + fi + +else + + LINE=`grep "wxUSE_CHECKLST" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_checklst='wxUSE_CHECKLST='$DEFAULT_wxUSE_CHECKLST + +fi + + + eval "$ac_cv_use_checklst" + if test "$no_cache" != 1; then + echo $ac_cv_use_checklst >> ${wx_arg_cache_file}.tmp + fi + + if test "$wxUSE_CHECKLST" = yes; then + echo "$ac_t""yes" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + + + echo $ac_n "checking "for --enable-choice"""... $ac_c" 1>&6 +echo "configure:3941: checking "for --enable-choice"" >&5 + no_cache=0 + # Check whether --enable-choice or --disable-choice was given. +if test "${enable_choice+set}" = set; then + enableval="$enable_choice" + + if test "$enableval" = yes; then + ac_cv_use_choice='wxUSE_CHOICE=yes' + else + ac_cv_use_choice='wxUSE_CHOICE=no' + fi + else - wxUSE_CHECKLST=$DEFAULT_wxUSE_CHECKLST + + LINE=`grep "wxUSE_CHOICE" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_choice='wxUSE_CHOICE='$DEFAULT_wxUSE_CHOICE + fi -# Check whether --enable-combobox or --disable-combobox was given. + + eval "$ac_cv_use_choice" + if test "$no_cache" != 1; then + echo $ac_cv_use_choice >> ${wx_arg_cache_file}.tmp + fi + + if test "$wxUSE_CHOICE" = yes; then + echo "$ac_t""yes" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + + + echo $ac_n "checking "for --enable-combobox"""... $ac_c" 1>&6 +echo "configure:3980: checking "for --enable-combobox"" >&5 + no_cache=0 + # Check whether --enable-combobox or --disable-combobox was given. if test "${enable_combobox+set}" = set; then enableval="$enable_combobox" - wxUSE_COMBOBOX="${enableval}" + + if test "$enableval" = yes; then + ac_cv_use_combobox='wxUSE_COMBOBOX=yes' + else + ac_cv_use_combobox='wxUSE_COMBOBOX=no' + fi + else - wxUSE_COMBOBOX=$DEFAULT_wxUSE_COMBOBOX + + LINE=`grep "wxUSE_COMBOBOX" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_combobox='wxUSE_COMBOBOX='$DEFAULT_wxUSE_COMBOBOX + fi -# Check whether --enable-gauge or --disable-gauge was given. + + eval "$ac_cv_use_combobox" + if test "$no_cache" != 1; then + echo $ac_cv_use_combobox >> ${wx_arg_cache_file}.tmp + fi + + if test "$wxUSE_COMBOBOX" = yes; then + echo "$ac_t""yes" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + + + echo $ac_n "checking "for --enable-gauge"""... $ac_c" 1>&6 +echo "configure:4019: checking "for --enable-gauge"" >&5 + no_cache=0 + # Check whether --enable-gauge or --disable-gauge was given. if test "${enable_gauge+set}" = set; then enableval="$enable_gauge" - wxUSE_GAUGE="${enableval}" + + if test "$enableval" = yes; then + ac_cv_use_gauge='wxUSE_GAUGE=yes' + else + ac_cv_use_gauge='wxUSE_GAUGE=no' + fi + else - wxUSE_GAUGE=$DEFAULT_wxUSE_GAUGE -fi + + LINE=`grep "wxUSE_GAUGE" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_gauge='wxUSE_GAUGE='$DEFAULT_wxUSE_GAUGE + +fi + -# Check whether --enable-grid or --disable-grid was given. + eval "$ac_cv_use_gauge" + if test "$no_cache" != 1; then + echo $ac_cv_use_gauge >> ${wx_arg_cache_file}.tmp + fi + + if test "$wxUSE_GAUGE" = yes; then + echo "$ac_t""yes" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + + + echo $ac_n "checking "for --enable-grid"""... $ac_c" 1>&6 +echo "configure:4058: checking "for --enable-grid"" >&5 + no_cache=0 + # Check whether --enable-grid or --disable-grid was given. if test "${enable_grid+set}" = set; then enableval="$enable_grid" - wxUSE_GRID="${enableval}" + + if test "$enableval" = yes; then + ac_cv_use_grid='wxUSE_GRID=yes' + else + ac_cv_use_grid='wxUSE_GRID=no' + fi + else - wxUSE_GRID=$DEFAULT_wxUSE_GRID + + LINE=`grep "wxUSE_GRID" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_grid='wxUSE_GRID='$DEFAULT_wxUSE_GRID + fi -# Check whether --enable-imaglist or --disable-imaglist was given. + + eval "$ac_cv_use_grid" + if test "$no_cache" != 1; then + echo $ac_cv_use_grid >> ${wx_arg_cache_file}.tmp + fi + + if test "$wxUSE_GRID" = yes; then + echo "$ac_t""yes" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + + + echo $ac_n "checking "for --enable-imaglist"""... $ac_c" 1>&6 +echo "configure:4097: checking "for --enable-imaglist"" >&5 + no_cache=0 + # Check whether --enable-imaglist or --disable-imaglist was given. if test "${enable_imaglist+set}" = set; then enableval="$enable_imaglist" - wxUSE_IMAGLIST="${enableval}" + + if test "$enableval" = yes; then + ac_cv_use_imaglist='wxUSE_IMAGLIST=yes' + else + ac_cv_use_imaglist='wxUSE_IMAGLIST=no' + fi + else - wxUSE_IMAGLIST=$DEFAULT_wxUSE_IMAGLIST + + LINE=`grep "wxUSE_IMAGLIST" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_imaglist='wxUSE_IMAGLIST='$DEFAULT_wxUSE_IMAGLIST + fi -# Check whether --enable-listbox or --disable-listbox was given. + + eval "$ac_cv_use_imaglist" + if test "$no_cache" != 1; then + echo $ac_cv_use_imaglist >> ${wx_arg_cache_file}.tmp + fi + + if test "$wxUSE_IMAGLIST" = yes; then + echo "$ac_t""yes" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + + + echo $ac_n "checking "for --enable-listbox"""... $ac_c" 1>&6 +echo "configure:4136: checking "for --enable-listbox"" >&5 + no_cache=0 + # Check whether --enable-listbox or --disable-listbox was given. if test "${enable_listbox+set}" = set; then enableval="$enable_listbox" - wxUSE_LISTBOX="${enableval}" + + if test "$enableval" = yes; then + ac_cv_use_listbox='wxUSE_LISTBOX=yes' + else + ac_cv_use_listbox='wxUSE_LISTBOX=no' + fi + else - wxUSE_LISTBOX=$DEFAULT_wxUSE_LISTBOX + + LINE=`grep "wxUSE_LISTBOX" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_listbox='wxUSE_LISTBOX='$DEFAULT_wxUSE_LISTBOX + fi -# Check whether --enable-listctrl or --disable-listctrl was given. + + eval "$ac_cv_use_listbox" + if test "$no_cache" != 1; then + echo $ac_cv_use_listbox >> ${wx_arg_cache_file}.tmp + fi + + if test "$wxUSE_LISTBOX" = yes; then + echo "$ac_t""yes" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + + + echo $ac_n "checking "for --enable-listctrl"""... $ac_c" 1>&6 +echo "configure:4175: checking "for --enable-listctrl"" >&5 + no_cache=0 + # Check whether --enable-listctrl or --disable-listctrl was given. if test "${enable_listctrl+set}" = set; then enableval="$enable_listctrl" - wxUSE_LISTCTRL="${enableval}" + + if test "$enableval" = yes; then + ac_cv_use_listctrl='wxUSE_LISTCTRL=yes' + else + ac_cv_use_listctrl='wxUSE_LISTCTRL=no' + fi + else - wxUSE_LISTCTRL=$DEFAULT_wxUSE_LISTCTRL + + LINE=`grep "wxUSE_LISTCTRL" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_listctrl='wxUSE_LISTCTRL='$DEFAULT_wxUSE_LISTCTRL + fi -# Check whether --enable-notebook or --disable-notebook was given. + + eval "$ac_cv_use_listctrl" + if test "$no_cache" != 1; then + echo $ac_cv_use_listctrl >> ${wx_arg_cache_file}.tmp + fi + + if test "$wxUSE_LISTCTRL" = yes; then + echo "$ac_t""yes" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + + + echo $ac_n "checking "for --enable-notebook"""... $ac_c" 1>&6 +echo "configure:4214: checking "for --enable-notebook"" >&5 + no_cache=0 + # Check whether --enable-notebook or --disable-notebook was given. if test "${enable_notebook+set}" = set; then enableval="$enable_notebook" - wxUSE_NOTEBOOK="${enableval}" + + if test "$enableval" = yes; then + ac_cv_use_notebook='wxUSE_NOTEBOOK=yes' + else + ac_cv_use_notebook='wxUSE_NOTEBOOK=no' + fi + else - wxUSE_NOTEBOOK=$DEFAULT_wxUSE_NOTEBOOK + + LINE=`grep "wxUSE_NOTEBOOK" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_notebook='wxUSE_NOTEBOOK='$DEFAULT_wxUSE_NOTEBOOK + fi -# Check whether --enable-radiobox or --disable-radiobox was given. + + eval "$ac_cv_use_notebook" + if test "$no_cache" != 1; then + echo $ac_cv_use_notebook >> ${wx_arg_cache_file}.tmp + fi + + if test "$wxUSE_NOTEBOOK" = yes; then + echo "$ac_t""yes" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + + + echo $ac_n "checking "for --enable-radiobox"""... $ac_c" 1>&6 +echo "configure:4253: checking "for --enable-radiobox"" >&5 + no_cache=0 + # Check whether --enable-radiobox or --disable-radiobox was given. if test "${enable_radiobox+set}" = set; then enableval="$enable_radiobox" - wxUSE_RADIOBOX="${enableval}" + + if test "$enableval" = yes; then + ac_cv_use_radiobox='wxUSE_RADIOBOX=yes' + else + ac_cv_use_radiobox='wxUSE_RADIOBOX=no' + fi + else - wxUSE_RADIOBOX=$DEFAULT_wxUSE_RADIOBOX + + LINE=`grep "wxUSE_RADIOBOX" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_radiobox='wxUSE_RADIOBOX='$DEFAULT_wxUSE_RADIOBOX + fi -# Check whether --enable-radiobtn or --disable-radiobtn was given. + + eval "$ac_cv_use_radiobox" + if test "$no_cache" != 1; then + echo $ac_cv_use_radiobox >> ${wx_arg_cache_file}.tmp + fi + + if test "$wxUSE_RADIOBOX" = yes; then + echo "$ac_t""yes" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + + + echo $ac_n "checking "for --enable-radiobtn"""... $ac_c" 1>&6 +echo "configure:4292: checking "for --enable-radiobtn"" >&5 + no_cache=0 + # Check whether --enable-radiobtn or --disable-radiobtn was given. if test "${enable_radiobtn+set}" = set; then enableval="$enable_radiobtn" - wxUSE_RADIOBTN="${enableval}" + + if test "$enableval" = yes; then + ac_cv_use_radiobtn='wxUSE_RADIOBTN=yes' + else + ac_cv_use_radiobtn='wxUSE_RADIOBTN=no' + fi + else - wxUSE_RADIOBTN=$DEFAULT_wxUSE_RADIOBTN + + LINE=`grep "wxUSE_RADIOBTN" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_radiobtn='wxUSE_RADIOBTN='$DEFAULT_wxUSE_RADIOBTN + fi -# Check whether --enable-sash or --disable-sash was given. + + eval "$ac_cv_use_radiobtn" + if test "$no_cache" != 1; then + echo $ac_cv_use_radiobtn >> ${wx_arg_cache_file}.tmp + fi + + if test "$wxUSE_RADIOBTN" = yes; then + echo "$ac_t""yes" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + + + echo $ac_n "checking "for --enable-sash"""... $ac_c" 1>&6 +echo "configure:4331: checking "for --enable-sash"" >&5 + no_cache=0 + # Check whether --enable-sash or --disable-sash was given. if test "${enable_sash+set}" = set; then enableval="$enable_sash" - wxUSE_SASH="${enableval}" + + if test "$enableval" = yes; then + ac_cv_use_sash='wxUSE_SASH=yes' + else + ac_cv_use_sash='wxUSE_SASH=no' + fi + else - wxUSE_SASH=$DEFAULT_wxUSE_SASH + + LINE=`grep "wxUSE_SASH" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_sash='wxUSE_SASH='$DEFAULT_wxUSE_SASH + fi -# Check whether --enable-scrollbar or --disable-scrollbar was given. + + eval "$ac_cv_use_sash" + if test "$no_cache" != 1; then + echo $ac_cv_use_sash >> ${wx_arg_cache_file}.tmp + fi + + if test "$wxUSE_SASH" = yes; then + echo "$ac_t""yes" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + + + echo $ac_n "checking "for --enable-scrollbar"""... $ac_c" 1>&6 +echo "configure:4370: checking "for --enable-scrollbar"" >&5 + no_cache=0 + # Check whether --enable-scrollbar or --disable-scrollbar was given. if test "${enable_scrollbar+set}" = set; then enableval="$enable_scrollbar" - wxUSE_SCROLLBAR="${enableval}" + + if test "$enableval" = yes; then + ac_cv_use_scrollbar='wxUSE_SCROLLBAR=yes' + else + ac_cv_use_scrollbar='wxUSE_SCROLLBAR=no' + fi + else - wxUSE_SCROLLBAR=$DEFAULT_wxUSE_SCROLLBAR + + LINE=`grep "wxUSE_SCROLLBAR" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_scrollbar='wxUSE_SCROLLBAR='$DEFAULT_wxUSE_SCROLLBAR + fi -# Check whether --enable-slider or --disable-slider was given. + + eval "$ac_cv_use_scrollbar" + if test "$no_cache" != 1; then + echo $ac_cv_use_scrollbar >> ${wx_arg_cache_file}.tmp + fi + + if test "$wxUSE_SCROLLBAR" = yes; then + echo "$ac_t""yes" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + + + echo $ac_n "checking "for --enable-slider"""... $ac_c" 1>&6 +echo "configure:4409: checking "for --enable-slider"" >&5 + no_cache=0 + # Check whether --enable-slider or --disable-slider was given. if test "${enable_slider+set}" = set; then enableval="$enable_slider" - wxUSE_SLIDER="${enableval}" + + if test "$enableval" = yes; then + ac_cv_use_slider='wxUSE_SLIDER=yes' + else + ac_cv_use_slider='wxUSE_SLIDER=no' + fi + else - wxUSE_SLIDER=$DEFAULT_wxUSE_SLIDER + + LINE=`grep "wxUSE_SLIDER" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_slider='wxUSE_SLIDER='$DEFAULT_wxUSE_SLIDER + fi -# Check whether --enable-spinbtn or --disable-spinbtn was given. + + eval "$ac_cv_use_slider" + if test "$no_cache" != 1; then + echo $ac_cv_use_slider >> ${wx_arg_cache_file}.tmp + fi + + if test "$wxUSE_SLIDER" = yes; then + echo "$ac_t""yes" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + + + echo $ac_n "checking "for --enable-spinbtn"""... $ac_c" 1>&6 +echo "configure:4448: checking "for --enable-spinbtn"" >&5 + no_cache=0 + # Check whether --enable-spinbtn or --disable-spinbtn was given. if test "${enable_spinbtn+set}" = set; then enableval="$enable_spinbtn" - wxUSE_SPINBTN="${enableval}" + + if test "$enableval" = yes; then + ac_cv_use_spinbtn='wxUSE_SPINBTN=yes' + else + ac_cv_use_spinbtn='wxUSE_SPINBTN=no' + fi + else - wxUSE_SPINBTN=$DEFAULT_wxUSE_SPINBTN + + LINE=`grep "wxUSE_SPINBTN" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_spinbtn='wxUSE_SPINBTN='$DEFAULT_wxUSE_SPINBTN + fi -# Check whether --enable-splitter or --disable-splitter was given. + + eval "$ac_cv_use_spinbtn" + if test "$no_cache" != 1; then + echo $ac_cv_use_spinbtn >> ${wx_arg_cache_file}.tmp + fi + + if test "$wxUSE_SPINBTN" = yes; then + echo "$ac_t""yes" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + + + echo $ac_n "checking "for --enable-splitter"""... $ac_c" 1>&6 +echo "configure:4487: checking "for --enable-splitter"" >&5 + no_cache=0 + # Check whether --enable-splitter or --disable-splitter was given. if test "${enable_splitter+set}" = set; then enableval="$enable_splitter" - wxUSE_SPLITTER="${enableval}" + + if test "$enableval" = yes; then + ac_cv_use_splitter='wxUSE_SPLITTER=yes' + else + ac_cv_use_splitter='wxUSE_SPLITTER=no' + fi + else - wxUSE_SPLITTER=$DEFAULT_wxUSE_SPLITTER + + LINE=`grep "wxUSE_SPLITTER" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_splitter='wxUSE_SPLITTER='$DEFAULT_wxUSE_SPLITTER + fi -# Check whether --enable-statbmp or --disable-statbmp was given. + + eval "$ac_cv_use_splitter" + if test "$no_cache" != 1; then + echo $ac_cv_use_splitter >> ${wx_arg_cache_file}.tmp + fi + + if test "$wxUSE_SPLITTER" = yes; then + echo "$ac_t""yes" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + + + echo $ac_n "checking "for --enable-statbmp"""... $ac_c" 1>&6 +echo "configure:4526: checking "for --enable-statbmp"" >&5 + no_cache=0 + # Check whether --enable-statbmp or --disable-statbmp was given. if test "${enable_statbmp+set}" = set; then enableval="$enable_statbmp" - wxUSE_STATBMP="${enableval}" + + if test "$enableval" = yes; then + ac_cv_use_statbmp='wxUSE_STATBMP=yes' + else + ac_cv_use_statbmp='wxUSE_STATBMP=no' + fi + else - wxUSE_STATBMP=$DEFAULT_wxUSE_STATBMP + + LINE=`grep "wxUSE_STATBMP" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_statbmp='wxUSE_STATBMP='$DEFAULT_wxUSE_STATBMP + fi -# Check whether --enable-statbox or --disable-statbox was given. + + eval "$ac_cv_use_statbmp" + if test "$no_cache" != 1; then + echo $ac_cv_use_statbmp >> ${wx_arg_cache_file}.tmp + fi + + if test "$wxUSE_STATBMP" = yes; then + echo "$ac_t""yes" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + + + echo $ac_n "checking "for --enable-statbox"""... $ac_c" 1>&6 +echo "configure:4565: checking "for --enable-statbox"" >&5 + no_cache=0 + # Check whether --enable-statbox or --disable-statbox was given. if test "${enable_statbox+set}" = set; then enableval="$enable_statbox" - wxUSE_STATBOX="${enableval}" + + if test "$enableval" = yes; then + ac_cv_use_statbox='wxUSE_STATBOX=yes' + else + ac_cv_use_statbox='wxUSE_STATBOX=no' + fi + else - wxUSE_STATBOX=$DEFAULT_wxUSE_STATBOX + + LINE=`grep "wxUSE_STATBOX" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_statbox='wxUSE_STATBOX='$DEFAULT_wxUSE_STATBOX + fi -# Check whether --enable-statline or --disable-statline was given. + + eval "$ac_cv_use_statbox" + if test "$no_cache" != 1; then + echo $ac_cv_use_statbox >> ${wx_arg_cache_file}.tmp + fi + + if test "$wxUSE_STATBOX" = yes; then + echo "$ac_t""yes" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + + + echo $ac_n "checking "for --enable-statline"""... $ac_c" 1>&6 +echo "configure:4604: checking "for --enable-statline"" >&5 + no_cache=0 + # Check whether --enable-statline or --disable-statline was given. if test "${enable_statline+set}" = set; then enableval="$enable_statline" - wxUSE_STATLINE="${enableval}" + + if test "$enableval" = yes; then + ac_cv_use_statline='wxUSE_STATLINE=yes' + else + ac_cv_use_statline='wxUSE_STATLINE=no' + fi + else - wxUSE_STATLINE=$DEFAULT_wxUSE_STATLINE + + LINE=`grep "wxUSE_STATLINE" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_statline='wxUSE_STATLINE='$DEFAULT_wxUSE_STATLINE + fi -# Check whether --enable-statusbar or --disable-statusbar was given. + + eval "$ac_cv_use_statline" + if test "$no_cache" != 1; then + echo $ac_cv_use_statline >> ${wx_arg_cache_file}.tmp + fi + + if test "$wxUSE_STATLINE" = yes; then + echo "$ac_t""yes" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + + + echo $ac_n "checking "for --enable-statusbar"""... $ac_c" 1>&6 +echo "configure:4643: checking "for --enable-statusbar"" >&5 + no_cache=0 + # Check whether --enable-statusbar or --disable-statusbar was given. if test "${enable_statusbar+set}" = set; then enableval="$enable_statusbar" - wxUSE_STATUSBAR="${enableval}" + + if test "$enableval" = yes; then + ac_cv_use_statusbar='wxUSE_STATUSBAR=yes' + else + ac_cv_use_statusbar='wxUSE_STATUSBAR=no' + fi + else - wxUSE_STATUSBAR=$DEFAULT_wxUSE_STATUSBAR + + LINE=`grep "wxUSE_STATUSBAR" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_statusbar='wxUSE_STATUSBAR='$DEFAULT_wxUSE_STATUSBAR + fi -# Check whether --enable-tabdialog or --disable-tabdialog was given. + + eval "$ac_cv_use_statusbar" + if test "$no_cache" != 1; then + echo $ac_cv_use_statusbar >> ${wx_arg_cache_file}.tmp + fi + + if test "$wxUSE_STATUSBAR" = yes; then + echo "$ac_t""yes" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + + + echo $ac_n "checking "for --enable-tabdialog"""... $ac_c" 1>&6 +echo "configure:4682: checking "for --enable-tabdialog"" >&5 + no_cache=0 + # Check whether --enable-tabdialog or --disable-tabdialog was given. if test "${enable_tabdialog+set}" = set; then enableval="$enable_tabdialog" - wxUSE_TABDIALOG="${enableval}" + + if test "$enableval" = yes; then + ac_cv_use_tabdialog='wxUSE_TABDIALOG=yes' + else + ac_cv_use_tabdialog='wxUSE_TABDIALOG=no' + fi + else - wxUSE_TABDIALOG=$DEFAULT_wxUSE_TABDIALOG + + LINE=`grep "wxUSE_TABDIALOG" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_tabdialog='wxUSE_TABDIALOG='$DEFAULT_wxUSE_TABDIALOG + fi -# Check whether --enable-toolbar or --disable-toolbar was given. + + eval "$ac_cv_use_tabdialog" + if test "$no_cache" != 1; then + echo $ac_cv_use_tabdialog >> ${wx_arg_cache_file}.tmp + fi + + if test "$wxUSE_TABDIALOG" = yes; then + echo "$ac_t""yes" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + + + echo $ac_n "checking "for --enable-toolbar"""... $ac_c" 1>&6 +echo "configure:4721: checking "for --enable-toolbar"" >&5 + no_cache=0 + # Check whether --enable-toolbar or --disable-toolbar was given. if test "${enable_toolbar+set}" = set; then enableval="$enable_toolbar" - wxUSE_TOOLBAR="${enableval}" + + if test "$enableval" = yes; then + ac_cv_use_toolbar='wxUSE_TOOLBAR=yes' + else + ac_cv_use_toolbar='wxUSE_TOOLBAR=no' + fi + else - wxUSE_TOOLBAR=$DEFAULT_wxUSE_TOOLBAR + + LINE=`grep "wxUSE_TOOLBAR" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_toolbar='wxUSE_TOOLBAR='$DEFAULT_wxUSE_TOOLBAR + fi -# Check whether --enable-treectrl or --disable-treectrl was given. + + eval "$ac_cv_use_toolbar" + if test "$no_cache" != 1; then + echo $ac_cv_use_toolbar >> ${wx_arg_cache_file}.tmp + fi + + if test "$wxUSE_TOOLBAR" = yes; then + echo "$ac_t""yes" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + + + echo $ac_n "checking "for --enable-treectrl"""... $ac_c" 1>&6 +echo "configure:4760: checking "for --enable-treectrl"" >&5 + no_cache=0 + # Check whether --enable-treectrl or --disable-treectrl was given. if test "${enable_treectrl+set}" = set; then enableval="$enable_treectrl" - wxUSE_TREECTRL="${enableval}" + + if test "$enableval" = yes; then + ac_cv_use_treectrl='wxUSE_TREECTRL=yes' + else + ac_cv_use_treectrl='wxUSE_TREECTRL=no' + fi + else - wxUSE_TREECTRL=$DEFAULT_wxUSE_TREECTRL + + LINE=`grep "wxUSE_TREECTRL" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_treectrl='wxUSE_TREECTRL='$DEFAULT_wxUSE_TREECTRL + fi + eval "$ac_cv_use_treectrl" + if test "$no_cache" != 1; then + echo $ac_cv_use_treectrl >> ${wx_arg_cache_file}.tmp + fi -# Check whether --enable-commondlg or --disable-commondlg was given. + if test "$wxUSE_TREECTRL" = yes; then + echo "$ac_t""yes" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + + + + + echo $ac_n "checking "for --enable-commondlg"""... $ac_c" 1>&6 +echo "configure:4801: checking "for --enable-commondlg"" >&5 + no_cache=0 + # Check whether --enable-commondlg or --disable-commondlg was given. if test "${enable_commondlg+set}" = set; then enableval="$enable_commondlg" - wxUSE_COMMONDLGS="${enableval}" + + if test "$enableval" = yes; then + ac_cv_use_commondlg='wxUSE_COMMONDLGS=yes' + else + ac_cv_use_commondlg='wxUSE_COMMONDLGS=no' + fi + +else + + LINE=`grep "wxUSE_COMMONDLGS" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_commondlg='wxUSE_COMMONDLGS='$DEFAULT_wxUSE_COMMONDLGS + +fi + + + eval "$ac_cv_use_commondlg" + if test "$no_cache" != 1; then + echo $ac_cv_use_commondlg >> ${wx_arg_cache_file}.tmp + fi + + if test "$wxUSE_COMMONDLGS" = yes; then + echo "$ac_t""yes" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + + + echo $ac_n "checking "for --enable-dirdlg"""... $ac_c" 1>&6 +echo "configure:4840: checking "for --enable-dirdlg"" >&5 + no_cache=0 + # Check whether --enable-dirdlg or --disable-dirdlg was given. +if test "${enable_dirdlg+set}" = set; then + enableval="$enable_dirdlg" + + if test "$enableval" = yes; then + ac_cv_use_dirdlg='wxUSE_DIRDLG=yes' + else + ac_cv_use_dirdlg='wxUSE_DIRDLG=no' + fi + +else + + LINE=`grep "wxUSE_DIRDLG" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_dirdlg='wxUSE_DIRDLG='$DEFAULT_wxUSE_DIRDLG + +fi + + + eval "$ac_cv_use_dirdlg" + if test "$no_cache" != 1; then + echo $ac_cv_use_dirdlg >> ${wx_arg_cache_file}.tmp + fi + + if test "$wxUSE_DIRDLG" = yes; then + echo "$ac_t""yes" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + + + echo $ac_n "checking "for --enable-textdlg"""... $ac_c" 1>&6 +echo "configure:4879: checking "for --enable-textdlg"" >&5 + no_cache=0 + # Check whether --enable-textdlg or --disable-textdlg was given. +if test "${enable_textdlg+set}" = set; then + enableval="$enable_textdlg" + + if test "$enableval" = yes; then + ac_cv_use_textdlg='wxUSE_TEXTDLG=yes' + else + ac_cv_use_textdlg='wxUSE_TEXTDLG=no' + fi + +else + + LINE=`grep "wxUSE_TEXTDLG" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_textdlg='wxUSE_TEXTDLG='$DEFAULT_wxUSE_TEXTDLG + +fi + + + eval "$ac_cv_use_textdlg" + if test "$no_cache" != 1; then + echo $ac_cv_use_textdlg >> ${wx_arg_cache_file}.tmp + fi + + if test "$wxUSE_TEXTDLG" = yes; then + echo "$ac_t""yes" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + + + echo $ac_n "checking "for --enable-tipdlg"""... $ac_c" 1>&6 +echo "configure:4918: checking "for --enable-tipdlg"" >&5 + no_cache=0 + # Check whether --enable-tipdlg or --disable-tipdlg was given. +if test "${enable_tipdlg+set}" = set; then + enableval="$enable_tipdlg" + + if test "$enableval" = yes; then + ac_cv_use_tipdlg='wxUSE_STARTUP_TIPS=yes' + else + ac_cv_use_tipdlg='wxUSE_STARTUP_TIPS=no' + fi + +else + + LINE=`grep "wxUSE_STARTUP_TIPS" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_tipdlg='wxUSE_STARTUP_TIPS='$DEFAULT_wxUSE_STARTUP_TIPS + +fi + + + eval "$ac_cv_use_tipdlg" + if test "$no_cache" != 1; then + echo $ac_cv_use_tipdlg >> ${wx_arg_cache_file}.tmp + fi + + if test "$wxUSE_STARTUP_TIPS" = yes; then + echo "$ac_t""yes" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + + + echo $ac_n "checking "for --enable-progressdlg"""... $ac_c" 1>&6 +echo "configure:4957: checking "for --enable-progressdlg"" >&5 + no_cache=0 + # Check whether --enable-progressdlg or --disable-progressdlg was given. +if test "${enable_progressdlg+set}" = set; then + enableval="$enable_progressdlg" + + if test "$enableval" = yes; then + ac_cv_use_progressdlg='wxUSE_PROGRESSDLG=yes' + else + ac_cv_use_progressdlg='wxUSE_PROGRESSDLG=no' + fi + else - wxUSE_COMMONDLGS=$DEFAULT_wxUSE_COMMONDLGS + + LINE=`grep "wxUSE_PROGRESSDLG" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_progressdlg='wxUSE_PROGRESSDLG='$DEFAULT_wxUSE_PROGRESSDLG + fi -# Check whether --enable-miniframe or --disable-miniframe was given. + + eval "$ac_cv_use_progressdlg" + if test "$no_cache" != 1; then + echo $ac_cv_use_progressdlg >> ${wx_arg_cache_file}.tmp + fi + + if test "$wxUSE_PROGRESSDLG" = yes; then + echo "$ac_t""yes" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + + + echo $ac_n "checking "for --enable-miniframe"""... $ac_c" 1>&6 +echo "configure:4996: checking "for --enable-miniframe"" >&5 + no_cache=0 + # Check whether --enable-miniframe or --disable-miniframe was given. if test "${enable_miniframe+set}" = set; then enableval="$enable_miniframe" - wxUSE_MINIFRAME="${enableval}" + + if test "$enableval" = yes; then + ac_cv_use_miniframe='wxUSE_MINIFRAME=yes' + else + ac_cv_use_miniframe='wxUSE_MINIFRAME=no' + fi + +else + + LINE=`grep "wxUSE_MINIFRAME" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_miniframe='wxUSE_MINIFRAME='$DEFAULT_wxUSE_MINIFRAME + +fi + + + eval "$ac_cv_use_miniframe" + if test "$no_cache" != 1; then + echo $ac_cv_use_miniframe >> ${wx_arg_cache_file}.tmp + fi + + if test "$wxUSE_MINIFRAME" = yes; then + echo "$ac_t""yes" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + + + echo $ac_n "checking "for --enable-html"""... $ac_c" 1>&6 +echo "configure:5035: checking "for --enable-html"" >&5 + no_cache=0 + # Check whether --enable-html or --disable-html was given. +if test "${enable_html+set}" = set; then + enableval="$enable_html" + + if test "$enableval" = yes; then + ac_cv_use_html='wxUSE_HTML=yes' + else + ac_cv_use_html='wxUSE_HTML=no' + fi + else - wxUSE_MINIFRAME=$DEFAULT_wxUSE_MINIFRAME + + LINE=`grep "wxUSE_HTML" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_html='wxUSE_HTML='$DEFAULT_wxUSE_HTML + fi -# Check whether --enable-tooltips or --disable-tooltips was given. + + eval "$ac_cv_use_html" + if test "$no_cache" != 1; then + echo $ac_cv_use_html >> ${wx_arg_cache_file}.tmp + fi + + if test "$wxUSE_HTML" = yes; then + echo "$ac_t""yes" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + + + echo $ac_n "checking "for --enable-tooltips"""... $ac_c" 1>&6 +echo "configure:5074: checking "for --enable-tooltips"" >&5 + no_cache=0 + # Check whether --enable-tooltips or --disable-tooltips was given. if test "${enable_tooltips+set}" = set; then enableval="$enable_tooltips" - wxUSE_TOOLTIPS="${enableval}" + + if test "$enableval" = yes; then + ac_cv_use_tooltips='wxUSE_TOOLTIPS=yes' + else + ac_cv_use_tooltips='wxUSE_TOOLTIPS=no' + fi + else - wxUSE_TOOLTIPS=$DEFAULT_wxUSE_TOOLTIPS + + LINE=`grep "wxUSE_TOOLTIPS" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_tooltips='wxUSE_TOOLTIPS='$DEFAULT_wxUSE_TOOLTIPS + fi -# Check whether --enable-splines or --disable-splines was given. + + eval "$ac_cv_use_tooltips" + if test "$no_cache" != 1; then + echo $ac_cv_use_tooltips >> ${wx_arg_cache_file}.tmp + fi + + if test "$wxUSE_TOOLTIPS" = yes; then + echo "$ac_t""yes" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + + + echo $ac_n "checking "for --enable-splines"""... $ac_c" 1>&6 +echo "configure:5113: checking "for --enable-splines"" >&5 + no_cache=0 + # Check whether --enable-splines or --disable-splines was given. if test "${enable_splines+set}" = set; then enableval="$enable_splines" - wxUSE_SPLINES="${enableval}" + + if test "$enableval" = yes; then + ac_cv_use_splines='wxUSE_SPLINES=yes' + else + ac_cv_use_splines='wxUSE_SPLINES=no' + fi + else - wxUSE_SPLINES=$DEFAULT_wxUSE_SPLINES + + LINE=`grep "wxUSE_SPLINES" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_splines='wxUSE_SPLINES='$DEFAULT_wxUSE_SPLINES + fi -# Check whether --enable-validators or --disable-validators was given. + + eval "$ac_cv_use_splines" + if test "$no_cache" != 1; then + echo $ac_cv_use_splines >> ${wx_arg_cache_file}.tmp + fi + + if test "$wxUSE_SPLINES" = yes; then + echo "$ac_t""yes" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + + + echo $ac_n "checking "for --enable-validators"""... $ac_c" 1>&6 +echo "configure:5152: checking "for --enable-validators"" >&5 + no_cache=0 + # Check whether --enable-validators or --disable-validators was given. if test "${enable_validators+set}" = set; then enableval="$enable_validators" - wxUSE_VALIDATORS="${enableval}" + + if test "$enableval" = yes; then + ac_cv_use_validators='wxUSE_VALIDATORS=yes' + else + ac_cv_use_validators='wxUSE_VALIDATORS=no' + fi + +else + + LINE=`grep "wxUSE_VALIDATORS" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_validators='wxUSE_VALIDATORS='$DEFAULT_wxUSE_VALIDATORS + +fi + + + eval "$ac_cv_use_validators" + if test "$no_cache" != 1; then + echo $ac_cv_use_validators >> ${wx_arg_cache_file}.tmp + fi + + if test "$wxUSE_VALIDATORS" = yes; then + echo "$ac_t""yes" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + + + echo $ac_n "checking "for --enable-busyinfo"""... $ac_c" 1>&6 +echo "configure:5191: checking "for --enable-busyinfo"" >&5 + no_cache=0 + # Check whether --enable-busyinfo or --disable-busyinfo was given. +if test "${enable_busyinfo+set}" = set; then + enableval="$enable_busyinfo" + + if test "$enableval" = yes; then + ac_cv_use_busyinfo='wxUSE_BUSYINFO=yes' + else + ac_cv_use_busyinfo='wxUSE_BUSYINFO=no' + fi + else - wxUSE_VALIDATORS=$DEFAULT_wxUSE_VALIDATORS + + LINE=`grep "wxUSE_BUSYINFO" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_busyinfo='wxUSE_BUSYINFO='$DEFAULT_wxUSE_BUSYINFO + fi -NUM_TOOLKITS="$((${wxUSE_GTK:-0}+${wxUSE_MOTIF:-0}+${wxUSE_MSW:-0}))" + eval "$ac_cv_use_busyinfo" + if test "$no_cache" != 1; then + echo $ac_cv_use_busyinfo >> ${wx_arg_cache_file}.tmp + fi + + if test "$wxUSE_BUSYINFO" = yes; then + echo "$ac_t""yes" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + + + + echo "saving argument cache $wx_arg_cache_file" + mv ${wx_arg_cache_file}.tmp ${wx_arg_cache_file} + + + +echo $ac_n "checking for toolkit""... $ac_c" 1>&6 +echo "configure:5236: checking for toolkit" >&5 + +if test "$TOOLKIT_GIVEN" = 1; then + for toolkit in `echo $ALL_TOOLKITS`; do + var=wxUSE_$toolkit + eval "value=\$${var}" + eval "$var=`echo \$value | sed -e "s/yes/1/" -e "s/no/0/"`" + done +else + for toolkit in `echo $ALL_TOOLKITS`; do + if test "$has_toolkit_in_cache" != 1; then + var=DEFAULT_DEFAULT_wxUSE_$toolkit + else + var=DEFAULT_wxUSE_$toolkit + fi + eval "wxUSE_$toolkit=\$${var}" + done +fi + +NUM_TOOLKITS=`expr ${wxUSE_GTK:-0} + ${wxUSE_MOTIF:-0} + ${wxUSE_WINE:-0} + ${wxUSE_MINGW:-0} + ${wxUSE_CYGWIN:-0}` case "$NUM_TOOLKITS" in 1) ;; 0) - if test "$((${DEFAULT_wxUSE_GTK:-0}+${DEFAULT_wxUSE_MOTIF:-0}+${DEFAULT_wxUSE_MSW:-0}))" = 0; then - { echo "configure: error: Please specify a toolkit" 1>&2; exit 1; } - fi - - wxUSE_GTK=$DEFAULT_wxUSE_GTK - wxUSE_MOTIF=$DEFAULT_wxUSE_MOTIF - wxUSE_MSW=$DEFAULT_wxUSE_MSW + { echo "configure: error: Please specify a toolkit - cannot determine the default for ${host}" 1>&2; exit 1; } ;; *) - { echo "configure: error: Please specify at most one toolkit" 1>&2; exit 1; } + { echo "configure: error: Please specify at most one toolkit (may be some are cached?)" 1>&2; exit 1; } esac +for toolkit in `echo $ALL_TOOLKITS`; do + var=wxUSE_$toolkit + eval "value=\$${var}" + if test "x$value" != x; then + cache_var=CACHE_$toolkit + eval "cache=\$${cache_var}" + if test "$cache" = 1; then + echo "$var=$value" >> ${wx_arg_cache_file} + fi + if test "$value" = 1; then + echo "$ac_t""`echo $toolkit | tr A-Z a-z`" 1>&6 + fi + fi +done + cat > confcache <<\EOF # This file is a shell script that caches the results of configure @@ -2329,18 +5328,22 @@ rm -f confcache if eval "test $host != $build"; then - if eval "test $build != NONE"; then - CC="$build-gcc" - CXX="$build-g++" - RANLIB="$build-ranlib" - NM="$build-nm" + if eval "test $host_alias != NONE"; then + CC=$host_alias-gcc + CXX=$host_alias-c++ + AR=$host_alias-ar + RANLIB=$host_alias-ranlib + DLLTOOL=$host_alias-dlltool + LD=$host_alias-ld + NM=$host_alias-nm + STRIP=$host_alias-strip fi fi # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2344: checking for $ac_word" >&5 +echo "configure:5347: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2370,7 +5373,7 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2374: checking for $ac_word" >&5 +echo "configure:5377: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2421,7 +5424,7 @@ fi # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2425: checking for $ac_word" >&5 +echo "configure:5428: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2453,7 +5456,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:2457: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:5460: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -2464,12 +5467,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 2468 "configure" +#line 5471 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:2473: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5476: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -2495,12 +5498,12 @@ if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:2499: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:5502: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:2504: checking whether we are using GNU C" >&5 +echo "configure:5507: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2509,7 +5512,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2513: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:5516: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -2528,7 +5531,7 @@ ac_test_CFLAGS="${CFLAGS+set}" ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:2532: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:5535: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2563,7 +5566,7 @@ fi CFLAGS=`echo "$CFLAGS" | sed 's/-g//g'` echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:2567: checking how to run the C preprocessor" >&5 +echo "configure:5570: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -2578,13 +5581,13 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2588: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5591: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -2595,13 +5598,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2605: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5608: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -2612,13 +5615,13 @@ else rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2622: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5625: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -2645,13 +5648,13 @@ echo "$ac_t""$CPP" 1>&6 if test $ac_cv_prog_gcc = yes; then echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6 -echo "configure:2649: checking whether ${CC-cc} needs -traditional" >&5 +echo "configure:5652: checking whether ${CC-cc} needs -traditional" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_pattern="Autoconf.*'x'" cat > conftest.$ac_ext < Autoconf TIOCGETP @@ -2669,7 +5672,7 @@ rm -f conftest* if test $ac_cv_prog_gcc_traditional = no; then cat > conftest.$ac_ext < Autoconf TCGETA @@ -2705,7 +5708,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2709: checking for $ac_word" >&5 +echo "configure:5712: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2737,7 +5740,7 @@ test -n "$CXX" || CXX="gcc" echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:2741: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 +echo "configure:5744: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 ac_ext=C # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -2748,12 +5751,12 @@ cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext << EOF -#line 2752 "configure" +#line 5755 "configure" #include "confdefs.h" int main(){return(0);} EOF -if { (eval echo configure:2757: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5760: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cxx_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -2779,12 +5782,12 @@ if test $ac_cv_prog_cxx_works = no; then { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:2783: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:5786: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6 cross_compiling=$ac_cv_prog_cxx_cross echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6 -echo "configure:2788: checking whether we are using GNU C++" >&5 +echo "configure:5791: checking whether we are using GNU C++" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2793,7 +5796,7 @@ else yes; #endif EOF -if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:2797: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:5800: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gxx=yes else ac_cv_prog_gxx=no @@ -2812,7 +5815,7 @@ ac_test_CXXFLAGS="${CXXFLAGS+set}" ac_save_CXXFLAGS="$CXXFLAGS" CXXFLAGS= echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6 -echo "configure:2816: checking whether ${CXX-g++} accepts -g" >&5 +echo "configure:5819: checking whether ${CXX-g++} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2845,7 +5848,7 @@ fi echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6 -echo "configure:2849: checking how to run the C++ preprocessor" >&5 +echo "configure:5852: checking how to run the C++ preprocessor" >&5 if test -z "$CXXCPP"; then if eval "test \"`echo '$''{'ac_cv_prog_CXXCPP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2858,12 +5861,12 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross CXXCPP="${CXX-g++} -E" cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2867: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5870: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -2901,7 +5904,7 @@ cross_compiling=$ac_cv_prog_cc_cross # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2905: checking for $ac_word" >&5 +echo "configure:5908: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2932,7 +5935,7 @@ fi # Extract the first word of "ar", so it can be a program name with args. set dummy ar; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2936: checking for $ac_word" >&5 +echo "configure:5939: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2972,7 +5975,7 @@ fi # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:2976: checking for a BSD compatible install" >&5 +echo "configure:5979: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3025,32 +6028,10 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:3030: checking whether ln -s works" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - rm -f conftestdata -if ln -s X conftestdata 2>/dev/null -then - rm -f conftestdata - ac_cv_prog_LN_S="ln -s" -else - ac_cv_prog_LN_S=ln -fi -fi -LN_S="$ac_cv_prog_LN_S" -if test "$ac_cv_prog_LN_S" = "ln -s"; then - echo "$ac_t""yes" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi - - # Extract the first word of "strip", so it can be a program name with args. set dummy strip; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3054: checking for $ac_word" >&5 +echo "configure:6035: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3079,7 +6060,7 @@ fi echo $ac_n "checking "make for VPATH support"""... $ac_c" 1>&6 -echo "configure:3083: checking "make for VPATH support"" >&5 +echo "configure:6064: checking "make for VPATH support"" >&5 cat - << EOF > confMake check : file cp \$? \$@ @@ -3108,7 +6089,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3112: checking for $ac_word" >&5 +echo "configure:6093: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_YACC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3139,46 +6120,10 @@ done test -n "$YACC" || YACC="yacc" -missing_dir=`cd $ac_aux_dir && pwd` -for ac_prog in flex lex -do -# Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3149: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_LEX'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test -n "$LEX"; then - ac_cv_prog_LEX="$LEX" # Let the user override the test. -else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_LEX="$ac_prog" - break - fi - done - IFS="$ac_save_ifs" -fi -fi -LEX="$ac_cv_prog_LEX" -if test -n "$LEX"; then - echo "$ac_t""$LEX" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi - -test -n "$LEX" && break -done -test -n "$LEX" || LEX=""$missing_dir/missing flex"" - # Extract the first word of "flex", so it can be a program name with args. set dummy flex; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3182: checking for $ac_word" >&5 +echo "configure:6127: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LEX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3212,7 +6157,7 @@ then *) ac_lib=l ;; esac echo $ac_n "checking for yywrap in -l$ac_lib""... $ac_c" 1>&6 -echo "configure:3216: checking for yywrap in -l$ac_lib" >&5 +echo "configure:6161: checking for yywrap in -l$ac_lib" >&5 ac_lib_var=`echo $ac_lib'_'yywrap | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3220,7 +6165,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l$ac_lib $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6180: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3253,948 +6198,637 @@ fi fi -echo $ac_n "checking lex output file root""... $ac_c" 1>&6 -echo "configure:3258: checking lex output file root" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_lex_root'+set}'`\" = set"; then + +echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 +echo "configure:6204: checking whether ln -s works" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - # The minimal lex program is just a single line: %%. But some broken lexes -# (Solaris, I think it was) want two %% lines, so accommodate them. -echo '%% -%%' | $LEX -if test -f lex.yy.c; then - ac_cv_prog_lex_root=lex.yy -elif test -f lexyy.c; then - ac_cv_prog_lex_root=lexyy + rm -f conftestdata +if ln -s X conftestdata 2>/dev/null +then + rm -f conftestdata + ac_cv_prog_LN_S="ln -s" else - { echo "configure: error: cannot find output from $LEX; giving up" 1>&2; exit 1; } + ac_cv_prog_LN_S=ln +fi fi +LN_S="$ac_cv_prog_LN_S" +if test "$ac_cv_prog_LN_S" = "ln -s"; then + echo "$ac_t""yes" 1>&6 +else + echo "$ac_t""no" 1>&6 fi -echo "$ac_t""$ac_cv_prog_lex_root" 1>&6 -LEX_OUTPUT_ROOT=$ac_cv_prog_lex_root -echo $ac_n "checking whether yytext is a pointer""... $ac_c" 1>&6 -echo "configure:3279: checking whether yytext is a pointer" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_lex_yytext_pointer'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - # POSIX says lex can declare yytext either as a pointer or an array; the -# default is implementation-dependent. Figure out which it is, since -# not all implementations provide the %pointer and %array declarations. -ac_cv_prog_lex_yytext_pointer=no -echo 'extern char *yytext;' >>$LEX_OUTPUT_ROOT.c -ac_save_LIBS="$LIBS" -LIBS="$LIBS $LEXLIB" -cat > conftest.$ac_ext < confcache <<\EOF +# This file is a shell script that caches the results of configure +# tests run on this system so they can be shared between configure +# scripts and configure runs. It is not useful on other systems. +# If it contains results you don't want to keep, you may remove or edit it. +# +# By default, configure uses ./config.cache as the cache file, +# creating it if it does not exist already. You can give configure +# the --cache-file=FILE option to use a different cache file; that is +# what configure does when it calls configure scripts in +# subdirectories, so they share the cache. +# Giving --cache-file=/dev/null disables caching, for debugging configure. +# config.status only pays attention to the cache file if you give it the +# --recheck option to rerun configure. +# EOF -if { (eval echo configure:3298: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - ac_cv_prog_lex_yytext_pointer=yes +# The following way of writing the cache mishandles newlines in values, +# but we know of no workaround that is simple, portable, and efficient. +# So, don't put newlines in cache variables' values. +# Ultrix sh set writes to stderr and can't be redirected directly, +# and sets the high bit in the cache file unless we assign to the vars. +(set) 2>&1 | + case `(ac_space=' '; set | grep ac_space) 2>&1` in + *ac_space=\ *) + # `set' does not quote correctly, so add quotes (double-quote substitution + # turns \\\\ into \\, and sed turns \\ into \). + sed -n \ + -e "s/'/'\\\\''/g" \ + -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p" + ;; + *) + # `set' quotes correctly as required by POSIX, so do not add quotes. + sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p' + ;; + esac >> confcache +if cmp -s $cache_file confcache; then + : else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 + if test -w $cache_file; then + echo "updating cache $cache_file" + cat confcache > $cache_file + else + echo "not updating unwritable cache $cache_file" + fi fi -rm -f conftest* -LIBS="$ac_save_LIBS" -rm -f "${LEX_OUTPUT_ROOT}.c" +rm -f confcache -fi -echo "$ac_t""$ac_cv_prog_lex_yytext_pointer" 1>&6 -if test $ac_cv_prog_lex_yytext_pointer = yes; then - cat >> confdefs.h <<\EOF -#define YYTEXT_POINTER 1 -EOF -fi +TOOLKIT= +TOOLKIT_INCLUDE= + +GUIOBJS= +COMMONOBJS= +GENERICOBJS= + +GUI_TK_LIBRARY= +GUI_TK_LINK= + +WXGTK12= +WXWINE= -# Check whether --enable-static or --disable-static was given. -if test "${enable_static+set}" = set; then - enableval="$enable_static" - p=${PACKAGE-default} -case "$enableval" in -yes) enable_static=yes ;; -no) enable_static=no ;; -*) - enable_static=no - # Look at the argument we got. We use all the common list separators. - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:," - for pkg in $enableval; do - if test "X$pkg" = "X$p"; then - enable_static=yes +if test "$wxUSE_CYGWIN" = 1 || test "$wxUSE_MINGW" = 1 ; then + echo $ac_n "checking for Windows headers""... $ac_c" 1>&6 +echo "configure:6358: checking for Windows headers" >&5 + +ac_find_includes= +for ac_dir in $SEARCH_INCLUDE; + do + if test -f "$ac_dir/windows.h"; then + ac_find_includes=$ac_dir + break fi done - IFS="$ac_save_ifs" - ;; -esac -else - enable_static=no + + INCLUDE_SUBDIRS="$INCLUDE_SUBDIRS msw" + + LIBS="$LIBS -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -loldnames -lcomctl32 -lctl3d32 -lcrtdll -ladvapi32 -lwsock32" + + if test "$ac_find_includes" != "" ; then + echo "$ac_t""found $ac_find_includes" 1>&6 + TOOLKIT_INCLUDE="$TOOLKIT_INCLUDE -I$ac_find_includes" + else + echo "$ac_t""no" 1>&6 + if test "$cross_compiling" != "yes" ; then + { echo "configure: error: please set CFLAGS to contain the location of windows.h" 1>&2; exit 1; } + fi + fi + + TOOLKIT=MSW + + GUIOBJS=MSW_GUIOBJS + GUIHEADERS=MSW_HEADERS + COMMONOBJS=MSW_COMMONOBJS + GENERICOBJS=MSW_GENERICOBJS + UNIXOBJS= + GUIDIST=MSW_DIST fi -# Check whether --enable-shared or --disable-shared was given. -if test "${enable_shared+set}" = set; then - enableval="$enable_shared" - p=${PACKAGE-default} -case "$enableval" in -yes) enable_shared=yes ;; -no) enable_shared=no ;; -*) - enable_shared=no - # Look at the argument we got. We use all the common list separators. - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:," - for pkg in $enableval; do - if test "X$pkg" = "X$p"; then - enable_shared=yes +if test "$wxUSE_GTK" = 1; then + + if test x$gtk_config_exec_prefix != x ; then + gtk_config_args="$gtk_config_args --exec-prefix=$gtk_config_exec_prefix" + if test x${GTK_CONFIG+set} != xset ; then + GTK_CONFIG=$gtk_config_exec_prefix/bin/gtk-config + fi + fi + if test x$gtk_config_prefix != x ; then + gtk_config_args="$gtk_config_args --prefix=$gtk_config_prefix" + if test x${GTK_CONFIG+set} != xset ; then + GTK_CONFIG=$gtk_config_prefix/bin/gtk-config + fi + fi + + # Extract the first word of "gtk-config", so it can be a program name with args. +set dummy gtk-config; ac_word=$2 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:6411: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_path_GTK_CONFIG'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + case "$GTK_CONFIG" in + /*) + ac_cv_path_GTK_CONFIG="$GTK_CONFIG" # Let the user override the test with a path. + ;; + ?:/*) + ac_cv_path_GTK_CONFIG="$GTK_CONFIG" # Let the user override the test with a dos path. + ;; + *) + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_path_GTK_CONFIG="$ac_dir/$ac_word" + break fi done IFS="$ac_save_ifs" + test -z "$ac_cv_path_GTK_CONFIG" && ac_cv_path_GTK_CONFIG="no" ;; esac +fi +GTK_CONFIG="$ac_cv_path_GTK_CONFIG" +if test -n "$GTK_CONFIG"; then + echo "$ac_t""$GTK_CONFIG" 1>&6 else - enable_shared=yes + echo "$ac_t""no" 1>&6 fi -echo $ac_n "checking build system type""... $ac_c" 1>&6 -echo "configure:3367: checking build system type" >&5 + min_gtk_version=1.2.0 + echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6 +echo "configure:6446: checking for GTK - version >= $min_gtk_version" >&5 + no_gtk="" + if test "$GTK_CONFIG" != "no" ; then + GTK_CFLAGS=`$GTK_CONFIG --cflags` + GTK_LIBS=`$GTK_CONFIG --libs` + ac_save_CFLAGS="$CFLAGS" + ac_save_LIBS="$LIBS" + CFLAGS="$CFLAGS $GTK_CFLAGS" + LIBS="$LIBS $GTK_LIBS" + if test "$cross_compiling" = yes; then + echo $ac_n "cross compiling; assumed OK... $ac_c" +else + cat > conftest.$ac_ext < +#include -build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias` -build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` -build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` -build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` -echo "$ac_t""$build" 1>&6 +int +main () +{ + int major, minor, micro; -# Check whether --with-gnu-ld or --without-gnu-ld was given. -if test "${with_gnu_ld+set}" = set; then - withval="$with_gnu_ld" - test "$withval" = no || with_gnu_ld=yes -else - with_gnu_ld=no -fi - -ac_prog=ld -if test "$ac_cv_prog_gcc" = yes; then - # Check if gcc -print-prog-name=ld gives a path. - echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6 -echo "configure:3396: checking for ld used by GCC" >&5 - ac_prog=`($CC -print-prog-name=ld) 2>&5` - case "$ac_prog" in - # Accept absolute paths. - /* | [A-Za-z]:/*) - # Canonicalize the path of ld - re_direlt='/[^/][^/]*/\.\./' - sub_uncdrive='s%^\([A-Za-z]\):/%//\1/%' - while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do - ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"` - done - case "$host_os" in - cygwin*) - # Convert to a UNC path for cygwin - test -z "$LD" && LD=`echo X$ac_prog | $Xsed -e "$sub_uncdrive"` - ;; - *) - test -z "$LD" && LD="$ac_prog" - ;; - esac - ;; - ## - ## FIXME: The code fails later on if we try to use an $LD with - ## '\\' path separators. - ## - [A-Za-z]:[\\]*) - # Canonicalize the path of ld - re_direlt='\\[^\\][^\\]*\\\.\.\(\\\)' - sub_uncdrive='s%^\([A-Za-z]\):\\%//\1/%' - sub_uncdir='s%\\%/%g' - while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do - ac_prog=`echo $ac_prog| sed "s%$re_direlt%\1%"` - done - case "$host_os" in - cygwin*) - # Convert to a UNC path for cygwin - test -z "$LD" && LD=`echo X$ac_prog | sed -e 's%^X%%' -e "$sub_uncdrive" -e "$sub_uncdir"` - ;; - *) - test -z "$LD" && LD="$ac_prog" - ;; - esac - ;; - "") - # If it fails, then pretend we aren't using GCC. - ac_prog=ld - ;; - *) - # If it is relative, then search for the first ld in PATH. - with_gnu_ld=unknown - ;; - esac -elif test "$with_gnu_ld" = yes; then - echo $ac_n "checking for GNU ld""... $ac_c" 1>&6 -echo "configure:3450: checking for GNU ld" >&5 -else - echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6 -echo "configure:3453: checking for non-GNU ld" >&5 -fi -if eval "test \"`echo '$''{'ac_cv_path_LD'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test -z "$LD"; then - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" - for ac_dir in $PATH; do - test -z "$ac_dir" && ac_dir=. - if test -f "$ac_dir/$ac_prog"; then - ac_cv_path_LD="$ac_dir/$ac_prog" - # Check to see if the program is GNU ld. I'd rather use --version, - # but apparently some GNU ld's only accept -v. - # Break only if it was the GNU/non-GNU ld that we prefer. - if "$ac_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then - test "$with_gnu_ld" != no && break - else - test "$with_gnu_ld" != yes && break - fi - fi - done - IFS="$ac_save_ifs" -else - ac_cv_path_LD="$LD" # Let the user override the test with a path. -fi -fi + if (sscanf("$min_gtk_version", "%d.%d.%d", &major, &minor, µ) != 3) { + printf("%s, bad version string\n", "$min_gtk_version"); + exit(1); + } -LD="$ac_cv_path_LD" -if test -n "$LD"; then - echo "$ac_t""$LD" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi -test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; } + if (gtk_minor_version == 1) return FALSE; -echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6 -echo "configure:3489: checking if the linker ($LD) is GNU ld" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_gnu_ld'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - # I'd rather use --version here, but apparently some GNU ld's only accept -v. -if $LD -v 2>&1 &5; then - ac_cv_prog_gnu_ld=yes + return !((gtk_major_version > major) || + ((gtk_major_version == major) && (gtk_minor_version > minor)) || + ((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro))); +} + +EOF +if { (eval echo configure:6483: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +then + : else - ac_cv_prog_gnu_ld=no + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -fr conftest* + no_gtk=yes fi +rm -fr conftest* fi -echo "$ac_t""$ac_cv_prog_gnu_ld" 1>&6 + CFLAGS="$ac_save_CFLAGS" + LIBS="$ac_save_LIBS" + else + no_gtk=yes + fi + if test "x$no_gtk" = x ; then + echo "$ac_t""yes" 1>&6 + WXGTK12=1 + else + echo "$ac_t""no" 1>&6 + GTK_CFLAGS="" + GTK_LIBS="" + : + fi + + + if test "$WXGTK12" != 1; then + + if test x$gtk_config_exec_prefix != x ; then + gtk_config_args="$gtk_config_args --exec-prefix=$gtk_config_exec_prefix" + if test x${GTK_CONFIG+set} != xset ; then + GTK_CONFIG=$gtk_config_exec_prefix/bin/gtk-config + fi + fi + if test x$gtk_config_prefix != x ; then + gtk_config_args="$gtk_config_args --prefix=$gtk_config_prefix" + if test x${GTK_CONFIG+set} != xset ; then + GTK_CONFIG=$gtk_config_prefix/bin/gtk-config + fi + fi -echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6 -echo "configure:3505: checking for BSD-compatible nm" >&5 -if eval "test \"`echo '$''{'ac_cv_path_NM'+set}'`\" = set"; then + # Extract the first word of "gtk-config", so it can be a program name with args. +set dummy gtk-config; ac_word=$2 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:6530: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_path_GTK_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - if test -n "$NM"; then - # Let the user override the test. - ac_cv_path_NM="$NM" -else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" - for ac_dir in /usr/ucb /usr/ccs/bin $PATH /bin; do + case "$GTK_CONFIG" in + /*) + ac_cv_path_GTK_CONFIG="$GTK_CONFIG" # Let the user override the test with a path. + ;; + ?:/*) + ac_cv_path_GTK_CONFIG="$GTK_CONFIG" # Let the user override the test with a dos path. + ;; + *) + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/nm; then - # Check to see if the nm accepts a BSD-compat flag. - # Adding the `sed 1q' prevents false positives on HP-UX, which says: - # nm: unknown option "B" ignored - if ($ac_dir/nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then - ac_cv_path_NM="$ac_dir/nm -B" - elif ($ac_dir/nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then - ac_cv_path_NM="$ac_dir/nm -p" - else - ac_cv_path_NM="$ac_dir/nm" - fi + if test -f $ac_dir/$ac_word; then + ac_cv_path_GTK_CONFIG="$ac_dir/$ac_word" break fi done IFS="$ac_save_ifs" - test -z "$ac_cv_path_NM" && ac_cv_path_NM=nm -fi -fi - -NM="$ac_cv_path_NM" -echo "$ac_t""$NM" 1>&6 - - -# Check for command to grab the raw symbol name followed by C symbol from nm. -echo $ac_n "checking command to parse $NM output""... $ac_c" 1>&6 -echo "configure:3541: checking command to parse $NM output" >&5 -if eval "test \"`echo '$''{'ac_cv_sys_global_symbol_pipe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - # These are sane defaults that work on at least a few old systems. -# {They come from Ultrix. What could be older than Ultrix?!! ;)} - -# Character class describing NM global symbol codes. -ac_symcode='[BCDEGRSTU]' - -# Regexp to match symbols that can be accessed directly from C. -ac_sympat='\([_A-Za-z][_A-Za-z0-9]*\)' - -# Transform the above into a raw symbol and a C symbol. -ac_symxfrm='\1 \1' - -# Define system-specific variables. -case "$host_os" in -aix*) - ac_symcode='[BCDTU]' - ;; -sunos* | cygwin32* | mingw32*) - ac_sympat='_\([_A-Za-z][_A-Za-z0-9]*\)' - ac_symxfrm='_\1 \1' - ;; -irix*) - # Cannot use undefined symbols on IRIX because inlined functions mess us up. - ac_symcode='[BCDEGRST]' - ;; -solaris*) - ac_symcode='[BDTU]' + test -z "$ac_cv_path_GTK_CONFIG" && ac_cv_path_GTK_CONFIG="no" ;; esac - -# If we're using GNU nm, then use its standard symbol codes. -if $NM -V 2>&1 | egrep '(GNU|with BFD)' > /dev/null; then - ac_symcode='[ABCDGISTUW]' +fi +GTK_CONFIG="$ac_cv_path_GTK_CONFIG" +if test -n "$GTK_CONFIG"; then + echo "$ac_t""$GTK_CONFIG" 1>&6 +else + echo "$ac_t""no" 1>&6 fi -case "$host_os" in -cygwin32* | mingw32*) - # We do not want undefined symbols on cygwin32. The user must - # arrange to define them via -l arguments. - ac_symcode='[ABCDGISTW]' - ;; -esac - -# Write the raw and C identifiers. -ac_cv_sys_global_symbol_pipe="sed -n -e 's/^.* $ac_symcode $ac_sympat$/$ac_symxfrm/p'" - -# Check to see that the pipe works correctly. -ac_pipe_works=no -cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then - # Now try to grab the symbols. - ac_nlist=conftest.nm - if { (eval echo configure:3607: \"$NM conftest.$ac_objext \| $ac_cv_sys_global_symbol_pipe \> $ac_nlist\") 1>&5; (eval $NM conftest.$ac_objext \| $ac_cv_sys_global_symbol_pipe \> $ac_nlist) 2>&5; } && test -s "$ac_nlist"; then - - # Try sorting and uniquifying the output. - if sort "$ac_nlist" | uniq > "$ac_nlist"T; then - mv -f "$ac_nlist"T "$ac_nlist" - ac_wcout=`wc "$ac_nlist" 2>/dev/null` - ac_count=`echo "X$ac_wcout" | sed -e 's,^X,,' -e 's/^[ ]*\([0-9][0-9]*\).*$/\1/'` - (test "$ac_count" -ge 0) 2>/dev/null || ac_count=-1 - else - rm -f "$ac_nlist"T - ac_count=-1 - fi + min_gtk_version=1.0.0 + echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6 +echo "configure:6565: checking for GTK - version >= $min_gtk_version" >&5 + no_gtk="" + if test "$GTK_CONFIG" != "no" ; then + GTK_CFLAGS=`$GTK_CONFIG --cflags` + GTK_LIBS=`$GTK_CONFIG --libs` + ac_save_CFLAGS="$CFLAGS" + ac_save_LIBS="$LIBS" + CFLAGS="$CFLAGS $GTK_CFLAGS" + LIBS="$LIBS $GTK_LIBS" + if test "$cross_compiling" = yes; then + echo $ac_n "cross compiling; assumed OK... $ac_c" +else + cat > conftest.$ac_ext </dev/null; then - if egrep ' nm_test_func$' "$ac_nlist" >/dev/null; then - cat < conftest.c -#ifdef __cplusplus -extern "C" { -#endif +#include +#include -EOF - # Now generate the symbol file. - sed 's/^.* \(.*\)$/extern char \1;/' < "$ac_nlist" >> conftest.c +int +main () +{ + int major, minor, micro; - cat <> conftest.c -#if defined (__STDC__) && __STDC__ -# define __ptr_t void * -#else -# define __ptr_t char * -#endif + if (sscanf("$min_gtk_version", "%d.%d.%d", &major, &minor, µ) != 3) { + printf("%s, bad version string\n", "$min_gtk_version"); + exit(1); + } -/* The number of symbols in dld_preloaded_symbols, -1 if unsorted. */ -int dld_preloaded_symbol_count = $ac_count; + if (gtk_minor_version == 1) return FALSE; -/* The mapping between symbol names and symbols. */ -struct { - char *name; - __ptr_t address; + return !((gtk_major_version > major) || + ((gtk_major_version == major) && (gtk_minor_version > minor)) || + ((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro))); } -dld_preloaded_symbols[] = -{ -EOF - sed 's/^\(.*\) \(.*\)$/ {"\1", (__ptr_t) \&\2},/' < "$ac_nlist" >> conftest.c - cat <<\EOF >> conftest.c - {0, (__ptr_t) 0} -}; -#ifdef __cplusplus -} -#endif EOF - # Now try linking the two files. - mv conftest.$ac_objext conftestm.$ac_objext - ac_save_LIBS="$LIBS" - ac_save_CFLAGS="$CFLAGS" - LIBS="conftestm.$ac_objext" - CFLAGS="$CFLAGS$no_builtin_flag" - if { (eval echo configure:3665: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then - ac_pipe_works=yes - else - echo "configure: failed program was:" >&5 - cat conftest.c >&5 - fi - LIBS="$ac_save_LIBS" - CFLAGS="$ac_save_CFLAGS" - else - echo "cannot find nm_test_func in $ac_nlist" >&5 - fi - else - echo "cannot find nm_test_var in $ac_nlist" >&5 - fi - else - echo "cannot run $ac_cv_sys_global_symbol_pipe" >&5 - fi +if { (eval echo configure:6602: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +then + : else - echo "$progname: failed program was:" >&5 - cat conftest.c >&5 -fi -rm -rf conftest* - -# Do not use the global_symbol_pipe unless it works. -test "$ac_pipe_works" = yes || ac_cv_sys_global_symbol_pipe= - + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -fr conftest* + no_gtk=yes fi - - -ac_result=yes -if test -z "$ac_cv_sys_global_symbol_pipe"; then - ac_result=no +rm -fr conftest* fi -echo "$ac_t""$ac_result" 1>&6 -echo $ac_n "checking for _ prefix in compiled symbols""... $ac_c" 1>&6 -echo "configure:3701: checking for _ prefix in compiled symbols" >&5 -if eval "test \"`echo '$''{'ac_cv_sys_symbol_underscore'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - ac_cv_sys_symbol_underscore=no -cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then - # Now try to grab the symbols. - ac_nlist=conftest.nm - if { (eval echo configure:3713: \"$NM conftest.$ac_objext \| $ac_cv_sys_global_symbol_pipe \> $ac_nlist\") 1>&5; (eval $NM conftest.$ac_objext \| $ac_cv_sys_global_symbol_pipe \> $ac_nlist) 2>&5; } && test -s "$ac_nlist"; then - # See whether the symbols have a leading underscore. - if egrep '^_nm_test_func' "$ac_nlist" >/dev/null; then - ac_cv_sys_symbol_underscore=yes - else - if egrep '^nm_test_func ' "$ac_nlist" >/dev/null; then - : - else - echo "configure: cannot find nm_test_func in $ac_nlist" >&5 - fi - fi + CFLAGS="$ac_save_CFLAGS" + LIBS="$ac_save_LIBS" else - echo "configure: cannot run $ac_cv_sys_global_symbol_pipe" >&5 + no_gtk=yes fi -else - echo "configure: failed program was:" >&5 - cat conftest.c >&5 -fi -rm -rf conftest* - -fi - -echo "$ac_t""$ac_cv_sys_symbol_underscore" 1>&6 -if test x$ac_cv_sys_symbol_underscore = xyes; then - cat >> confdefs.h <<\EOF -#define WITH_SYMBOL_UNDERSCORE 1 -EOF + if test "x$no_gtk" = x ; then + echo "$ac_t""yes" 1>&6 + : + else + echo "$ac_t""no" 1>&6 + GTK_CFLAGS="" + GTK_LIBS="" + { echo "configure: error: Is gtk-config in path and GTK+ is version 1.2.X or 1.0.X?" 1>&2; exit 1; } + fi + + -fi + fi -if test $host != $build; then - ac_tool_prefix=${host_alias}- -else - ac_tool_prefix= + TOOLKIT_INCLUDE="$GTK_CFLAGS" + GUI_TK_LIBRARY="$GTK_LIBS -ldl" + TOOLKIT=GTK + + GUIOBJS=GTK_GUIOBJS + GUIHEADERS=GTK_HEADERS + COMMONOBJS=GTK_COMMONOBJS + GENERICOBJS=GTK_GENERICOBJS + UNIXOBJS=UNIXOBJS + GUIDIST=GTK_DIST fi -# Always use our own libtool. -LIBTOOL='$(SHELL) $(top_builddir)/libtool' - -# Check for any special flags to pass to ltconfig. -libtool_flags= -test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared" -test "$enable_static" = no && libtool_flags="$libtool_flags --disable-static" -test "$silent" = yes && libtool_flags="$libtool_flags --silent" -test "$ac_cv_prog_gcc" = yes && libtool_flags="$libtool_flags --with-gcc" -test "$ac_cv_prog_gnu_ld" = yes && libtool_flags="$libtool_flags --with-gnu-ld" - -# Some flags need to be propagated to the compiler or linker for good -# libtool support. -case "$host" in -*-*-irix6*) - # Find out which ABI we are using. - echo '#line 3765 "configure"' > conftest.$ac_ext - if { (eval echo configure:3766: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - case "`/usr/bin/file conftest.o`" in - *32-bit*) - LD="${LD-ld} -32" - ;; - *N32*) - LD="${LD-ld} -n32" - ;; - *64-bit*) - LD="${LD-ld} -64" - ;; - esac - fi - rm -rf conftest* - ;; - -*-*-sco3.2v5*) - # On SCO OpenServer 5, we need -belf to get full-featured binaries. - SAVE_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS -belf" - echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6 -echo "configure:3787: checking whether the C compiler needs -belf" >&5 -if eval "test \"`echo '$''{'lt_cv_cc_needs_belf'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - lt_cv_cc_needs_belf=yes -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - lt_cv_cc_needs_belf=no -fi -rm -f conftest* -fi - -echo "$ac_t""$lt_cv_cc_needs_belf" 1>&6 - if test x"$lt_cv_cc_needs_belf" != x"yes"; then - # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf - CFLAGS="$SAVE_CFLAGS" - fi - ;; - -*-*-cygwin32*) - # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. -set dummy ${ac_tool_prefix}dlltool; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3822: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test -n "$DLLTOOL"; then - ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. -else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" +if test "$wxUSE_WINE" = 1; then + echo $ac_n "checking for WINE includes""... $ac_c" 1>&6 +echo "configure:6647: checking for WINE includes" >&5 + +ac_find_includes= +for ac_dir in $SEARCH_INCLUDE; + do + if test -f "$ac_dir/windows.h"; then + ac_find_includes=$ac_dir break fi done - IFS="$ac_save_ifs" -fi -fi -DLLTOOL="$ac_cv_prog_DLLTOOL" -if test -n "$DLLTOOL"; then - echo "$ac_t""$DLLTOOL" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi - -if test -z "$ac_cv_prog_DLLTOOL"; then -if test -n "$ac_tool_prefix"; then - # Extract the first word of "dlltool", so it can be a program name with args. -set dummy dlltool; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3854: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test -n "$DLLTOOL"; then - ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. -else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_DLLTOOL="dlltool" - break + if test "$ac_find_includes" != "" ; then + echo "$ac_t""found $ac_find_includes" 1>&6 + TOOLKIT_INCLUDE="$TOOLKIT_INCLUDE -I$ac_find_includes" + else + echo "$ac_t""no" 1>&6 + { echo "configure: error: please set CFLAGS to contain the location of windows.h" 1>&2; exit 1; } fi + + XPM_LINK="" + echo $ac_n "checking for Xpm library""... $ac_c" 1>&6 +echo "configure:6668: checking for Xpm library" >&5 + +ac_find_libraries= +for ac_dir in $SEARCH_LIB; + do + for ac_extension in a so sl; do + if test -f "$ac_dir/libXpm.$ac_extension"; then + ac_find_libraries=$ac_dir + break 2 + fi + done done - IFS="$ac_save_ifs" - test -z "$ac_cv_prog_DLLTOOL" && ac_cv_prog_DLLTOOL="false" -fi -fi -DLLTOOL="$ac_cv_prog_DLLTOOL" -if test -n "$DLLTOOL"; then - echo "$ac_t""$DLLTOOL" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi -else - DLLTOOL="false" -fi -fi + if test "$ac_find_libraries" != "" ; then + GUI_TK_LIBRARY="-L$ac_find_libraries" + XPM_LINK="-lXpm" + cat >> confdefs.h <<\EOF +#define wxHAVE_LIB_XPM 1 +EOF -# Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args. -set dummy ${ac_tool_prefix}as; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3889: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test -n "$AS"; then - ac_cv_prog_AS="$AS" # Let the user override the test. -else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_AS="${ac_tool_prefix}as" - break + echo "$ac_t""found at $ac_find_libraries" 1>&6 + else + echo "$ac_t""no" 1>&6 + echo "configure: warning: library will be compiled without support for images in XPM format" 1>&2 fi + + MESA_LINK="" + echo $ac_n "checking for Mesa library""... $ac_c" 1>&6 +echo "configure:6696: checking for Mesa library" >&5 + +ac_find_libraries= +for ac_dir in $SEARCH_LIB; + do + for ac_extension in a so sl; do + if test -f "$ac_dir/libMesaGL.$ac_extension"; then + ac_find_libraries=$ac_dir + break 2 + fi + done done - IFS="$ac_save_ifs" -fi -fi -AS="$ac_cv_prog_AS" -if test -n "$AS"; then - echo "$ac_t""$AS" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi - -if test -z "$ac_cv_prog_AS"; then -if test -n "$ac_tool_prefix"; then - # Extract the first word of "as", so it can be a program name with args. -set dummy as; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3921: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test -n "$AS"; then - ac_cv_prog_AS="$AS" # Let the user override the test. -else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_AS="as" - break + if test "$ac_find_libraries" != "" ; then + GUI_TK_LIBRARY="$GUI_TK_LIBRARY -L$ac_find_libraries" + MESA_LINK="-lMesaGL" + echo "$ac_t""found at $ac_find_libraries" 1>&6 + else + { echo "configure: error: no" 1>&2; exit 1; } fi - done - IFS="$ac_save_ifs" - test -z "$ac_cv_prog_AS" && ac_cv_prog_AS="false" -fi -fi -AS="$ac_cv_prog_AS" -if test -n "$AS"; then - echo "$ac_t""$AS" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi -else - AS="false" -fi + GUI_TK_LINK="-lwine $MESA_LINK $XPM_LINK -lXxf86dga -lXxf86vm -lSM -lICE -lXext -lXmu -lX11 -lncurses -ldl -lm" + GUI_TK_LIBRARY="$GUI_TK_LIBRARY $GUI_TK_LINK" + WXWINE=1 + TOOLKIT=MSW + + GUIOBJS=MSW_GUIOBJS + GUIHEADERS=MSW_HEADERS + COMMONOBJS=MSW_COMMONOBJS + GENERICOBJS=MSW_GENERICOBJS + UNIXOBJS=UNIXOBJS + GUIDIST=MSW_DIST fi +if test "$wxUSE_MOTIF" = 1; then + # If we find X, set shell vars x_includes and x_libraries to the +# paths, otherwise set no_x=yes. +# Uses ac_ vars as temps to allow command line to override cache and checks. +# --without-x overrides everything else, but does not touch the cache. +echo $ac_n "checking for X""... $ac_c" 1>&6 +echo "configure:6736: checking for X" >&5 - ;; - -esac - -# enable the --disable-libtool-lock switch - -# Check whether --enable-libtool-lock or --disable-libtool-lock was given. -if test "${enable_libtool_lock+set}" = set; then - enableval="$enable_libtool_lock" - need_locks=$enableval -else - need_locks=yes +# Check whether --with-x or --without-x was given. +if test "${with_x+set}" = set; then + withval="$with_x" + : fi - -if test x"$need_locks" = xno; then - libtool_flags="$libtool_flags --disable-lock" +# $have_x is `yes', `no', `disabled', or empty when we do not yet know. +if test "x$with_x" = xno; then + # The user explicitly disabled X. + have_x=disabled +else + if test "x$x_includes" != xNONE && test "x$x_libraries" != xNONE; then + # Both variables are already set. + have_x=yes + else +if eval "test \"`echo '$''{'ac_cv_have_x'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + # One or both of the vars are not set, and there is no cached value. +ac_x_includes=NO ac_x_libraries=NO +rm -fr conftestdir +if mkdir conftestdir; then + cd conftestdir + # Make sure to not put "make" in the Imakefile rules, since we grep it out. + cat > Imakefile <<'EOF' +acfindx: + @echo 'ac_im_incroot="${INCROOT}"; ac_im_usrlibdir="${USRLIBDIR}"; ac_im_libdir="${LIBDIR}"' +EOF + if (xmkmf) >/dev/null 2>/dev/null && test -f Makefile; then + # GNU make sometimes prints "make[1]: Entering...", which would confuse us. + eval `${MAKE-make} acfindx 2>/dev/null | grep -v make` + # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR. + for ac_extension in a so sl; do + if test ! -f $ac_im_usrlibdir/libX11.$ac_extension && + test -f $ac_im_libdir/libX11.$ac_extension; then + ac_im_usrlibdir=$ac_im_libdir; break + fi + done + # Screen out bogus values from the imake configuration. They are + # bogus both because they are the default anyway, and because + # using them would break gcc on systems where it needs fixed includes. + case "$ac_im_incroot" in + /usr/include) ;; + *) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes="$ac_im_incroot" ;; + esac + case "$ac_im_usrlibdir" in + /usr/lib | /lib) ;; + *) test -d "$ac_im_usrlibdir" && ac_x_libraries="$ac_im_usrlibdir" ;; + esac + fi + cd .. + rm -fr conftestdir fi +if test "$ac_x_includes" = NO; then + # Guess where to find include files, by looking for this one X11 .h file. + test -z "$x_direct_test_include" && x_direct_test_include=X11/Intrinsic.h -# Actually configure libtool. ac_aux_dir is where install-sh is found. -CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \ -LD="$LD" NM="$NM" RANLIB="$RANLIB" LN_S="$LN_S" \ -DLLTOOL="$DLLTOOL" AS="$AS" \ -${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \ -$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \ -|| { echo "configure: error: libtool configure failed" 1>&2; exit 1; } - -# Redirect the config.log output again, so that the ltconfig log is not -# clobbered by the next message. -exec 5>>./config.log - - - -SEARCH_INCLUDE="\ - /usr/Motif-1.2/include \ - /usr/Motif-2.1/include \ - \ - /usr/include/Motif1.2 \ - /opt/xpm/include/X11 \ - \ - /usr/Motif1.2/include \ - /usr/dt/include \ - /usr/include/Xm \ - \ + # First, try using that file with no special directory specified. +cat > conftest.$ac_ext < +EOF +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (eval echo configure:6803: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` +if test -z "$ac_err"; then + rm -rf conftest* + # We can compile using X headers with no special include directory. +ac_x_includes= +else + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + # Look for the header file in a standard set of common directories. +# Check X11 before X11Rn because it is often a symlink to the current release. + for ac_dir in \ + /usr/X11/include \ /usr/X11R6/include \ /usr/X11R5/include \ /usr/X11R4/include \ \ - /usr/X11R6/lib \ - /usr/X11R5/lib \ - /usr/X11R4/lib \ - \ + /usr/include/X11 \ /usr/include/X11R6 \ /usr/include/X11R5 \ /usr/include/X11R4 \ \ + /usr/local/X11/include \ /usr/local/X11R6/include \ /usr/local/X11R5/include \ /usr/local/X11R4/include \ \ - /usr/local/include/X11R6 \ - /usr/local/include/X11R5 \ - /usr/local/include/X11R4 \ - \ - /usr/X11/include \ - /usr/include/X11 \ - /usr/local/X11/include \ - /usr/local/include/X11 \ - \ - /usr/X386/include \ - /usr/x386/include \ - /usr/XFree86/include/X11 \ - \ - /usr/include \ - /usr/include/gtk \ - /usr/include/gdk \ - /usr/include/glib \ - /usr/local/include \ - /usr/unsupported/include \ - /usr/athena/include \ - /usr/local/x11r5/include \ - /usr/lpp/Xamples/include \ - \ - /usr/local/include/gtk \ - /usr/local/include/qt \ - /usr/include/qt \ - \ - /usr/openwin/include \ - /usr/openwin/share/include \ - " - -SEARCH_LIB="`echo "$SEARCH_INCLUDE" | sed s/include/lib/g` " - - -cat > confcache <<\EOF -# This file is a shell script that caches the results of configure -# tests run on this system so they can be shared between configure -# scripts and configure runs. It is not useful on other systems. -# If it contains results you don't want to keep, you may remove or edit it. -# -# By default, configure uses ./config.cache as the cache file, -# creating it if it does not exist already. You can give configure -# the --cache-file=FILE option to use a different cache file; that is -# what configure does when it calls configure scripts in -# subdirectories, so they share the cache. -# Giving --cache-file=/dev/null disables caching, for debugging configure. -# config.status only pays attention to the cache file if you give it the -# --recheck option to rerun configure. -# -EOF -# The following way of writing the cache mishandles newlines in values, -# but we know of no workaround that is simple, portable, and efficient. -# So, don't put newlines in cache variables' values. -# Ultrix sh set writes to stderr and can't be redirected directly, -# and sets the high bit in the cache file unless we assign to the vars. -(set) 2>&1 | - case `(ac_space=' '; set | grep ac_space) 2>&1` in - *ac_space=\ *) - # `set' does not quote correctly, so add quotes (double-quote substitution - # turns \\\\ into \\, and sed turns \\ into \). - sed -n \ - -e "s/'/'\\\\''/g" \ - -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p" - ;; - *) - # `set' quotes correctly as required by POSIX, so do not add quotes. - sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p' - ;; - esac >> confcache -if cmp -s $cache_file confcache; then - : -else - if test -w $cache_file; then - echo "updating cache $cache_file" - cat confcache > $cache_file - else - echo "not updating unwritable cache $cache_file" - fi -fi -rm -f confcache - - -# If we find X, set shell vars x_includes and x_libraries to the -# paths, otherwise set no_x=yes. -# Uses ac_ vars as temps to allow command line to override cache and checks. -# --without-x overrides everything else, but does not touch the cache. -echo $ac_n "checking for X""... $ac_c" 1>&6 -echo "configure:4102: checking for X" >&5 - -# Check whether --with-x or --without-x was given. -if test "${with_x+set}" = set; then - withval="$with_x" - : -fi - -# $have_x is `yes', `no', `disabled', or empty when we do not yet know. -if test "x$with_x" = xno; then - # The user explicitly disabled X. - have_x=disabled -else - if test "x$x_includes" != xNONE && test "x$x_libraries" != xNONE; then - # Both variables are already set. - have_x=yes - else -if eval "test \"`echo '$''{'ac_cv_have_x'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - # One or both of the vars are not set, and there is no cached value. -ac_x_includes=NO ac_x_libraries=NO -rm -fr conftestdir -if mkdir conftestdir; then - cd conftestdir - # Make sure to not put "make" in the Imakefile rules, since we grep it out. - cat > Imakefile <<'EOF' -acfindx: - @echo 'ac_im_incroot="${INCROOT}"; ac_im_usrlibdir="${USRLIBDIR}"; ac_im_libdir="${LIBDIR}"' -EOF - if (xmkmf) >/dev/null 2>/dev/null && test -f Makefile; then - # GNU make sometimes prints "make[1]: Entering...", which would confuse us. - eval `${MAKE-make} acfindx 2>/dev/null | grep -v make` - # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR. - for ac_extension in a so sl; do - if test ! -f $ac_im_usrlibdir/libX11.$ac_extension && - test -f $ac_im_libdir/libX11.$ac_extension; then - ac_im_usrlibdir=$ac_im_libdir; break - fi - done - # Screen out bogus values from the imake configuration. They are - # bogus both because they are the default anyway, and because - # using them would break gcc on systems where it needs fixed includes. - case "$ac_im_incroot" in - /usr/include) ;; - *) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes="$ac_im_incroot" ;; - esac - case "$ac_im_usrlibdir" in - /usr/lib | /lib) ;; - *) test -d "$ac_im_usrlibdir" && ac_x_libraries="$ac_im_usrlibdir" ;; - esac - fi - cd .. - rm -fr conftestdir -fi - -if test "$ac_x_includes" = NO; then - # Guess where to find include files, by looking for this one X11 .h file. - test -z "$x_direct_test_include" && x_direct_test_include=X11/Intrinsic.h - - # First, try using that file with no special directory specified. -cat > conftest.$ac_ext < -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4169: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -if test -z "$ac_err"; then - rm -rf conftest* - # We can compile using X headers with no special include directory. -ac_x_includes= -else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - # Look for the header file in a standard set of common directories. -# Check X11 before X11Rn because it is often a symlink to the current release. - for ac_dir in \ - /usr/X11/include \ - /usr/X11R6/include \ - /usr/X11R5/include \ - /usr/X11R4/include \ - \ - /usr/include/X11 \ - /usr/include/X11R6 \ - /usr/include/X11R5 \ - /usr/include/X11R4 \ - \ - /usr/local/X11/include \ - /usr/local/X11R6/include \ - /usr/local/X11R5/include \ - /usr/local/X11R4/include \ - \ - /usr/local/include/X11 \ + /usr/local/include/X11 \ /usr/local/include/X11R6 \ /usr/local/include/X11R5 \ /usr/local/include/X11R4 \ @@ -4234,14 +6868,14 @@ if test "$ac_x_libraries" = NO; then ac_save_LIBS="$LIBS" LIBS="-l$x_direct_test_library $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6879: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* LIBS="$ac_save_LIBS" # We can link X programs with no special library path. @@ -4347,17 +6981,17 @@ else case "`(uname -sr) 2>/dev/null`" in "SunOS 5"*) echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6 -echo "configure:4351: checking whether -R must be followed by a space" >&5 +echo "configure:6985: checking whether -R must be followed by a space" >&5 ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6995: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_R_nospace=yes else @@ -4373,14 +7007,14 @@ rm -f conftest* else LIBS="$ac_xsave_LIBS -R $x_libraries" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7018: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_R_space=yes else @@ -4412,7 +7046,7 @@ rm -f conftest* # libraries were built with DECnet support. And karl@cs.umb.edu says # the Alpha needs dnet_stub (dnet does not exist). echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6 -echo "configure:4416: checking for dnet_ntoa in -ldnet" >&5 +echo "configure:7050: checking for dnet_ntoa in -ldnet" >&5 ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4420,7 +7054,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldnet $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7069: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4453,7 +7087,7 @@ fi if test $ac_cv_lib_dnet_dnet_ntoa = no; then echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6 -echo "configure:4457: checking for dnet_ntoa in -ldnet_stub" >&5 +echo "configure:7091: checking for dnet_ntoa in -ldnet_stub" >&5 ac_lib_var=`echo dnet_stub'_'dnet_ntoa | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4461,7 +7095,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldnet_stub $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7110: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4501,12 +7135,12 @@ fi # The nsl library prevents programs from opening the X display # on Irix 5.2, according to dickey@clark.net. echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6 -echo "configure:4505: checking for gethostbyname" >&5 +echo "configure:7139: checking for gethostbyname" >&5 if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7168: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_gethostbyname=yes" else @@ -4550,7 +7185,7 @@ fi if test $ac_cv_func_gethostbyname = no; then echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 -echo "configure:4554: checking for gethostbyname in -lnsl" >&5 +echo "configure:7189: checking for gethostbyname in -lnsl" >&5 ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4558,7 +7193,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7208: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4599,12 +7234,12 @@ fi # -lsocket must be given before -lnsl if both are needed. # We assume that if connect needs -lnsl, so does gethostbyname. echo $ac_n "checking for connect""... $ac_c" 1>&6 -echo "configure:4603: checking for connect" >&5 +echo "configure:7238: checking for connect" >&5 if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7267: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_connect=yes" else @@ -4648,7 +7284,7 @@ fi if test $ac_cv_func_connect = no; then echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6 -echo "configure:4652: checking for connect in -lsocket" >&5 +echo "configure:7288: checking for connect in -lsocket" >&5 ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4656,7 +7292,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsocket $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7307: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4691,12 +7327,12 @@ fi # gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX. echo $ac_n "checking for remove""... $ac_c" 1>&6 -echo "configure:4695: checking for remove" >&5 +echo "configure:7331: checking for remove" >&5 if eval "test \"`echo '$''{'ac_cv_func_remove'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7360: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_remove=yes" else @@ -4740,7 +7377,7 @@ fi if test $ac_cv_func_remove = no; then echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6 -echo "configure:4744: checking for remove in -lposix" >&5 +echo "configure:7381: checking for remove in -lposix" >&5 ac_lib_var=`echo posix'_'remove | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4748,7 +7385,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lposix $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7400: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4783,12 +7420,12 @@ fi # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. echo $ac_n "checking for shmat""... $ac_c" 1>&6 -echo "configure:4787: checking for shmat" >&5 +echo "configure:7424: checking for shmat" >&5 if eval "test \"`echo '$''{'ac_cv_func_shmat'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7453: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_shmat=yes" else @@ -4832,7 +7470,7 @@ fi if test $ac_cv_func_shmat = no; then echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6 -echo "configure:4836: checking for shmat in -lipc" >&5 +echo "configure:7474: checking for shmat in -lipc" >&5 ac_lib_var=`echo ipc'_'shmat | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4840,7 +7478,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lipc $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7493: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4884,350 +7522,59 @@ fi # libraries we check for below, so use a different variable. # --interran@uluru.Stanford.EDU, kb@cs.umb.edu. echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6 -echo "configure:4888: checking for IceConnectionNumber in -lICE" >&5 -ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - ac_save_LIBS="$LIBS" -LIBS="-lICE $X_EXTRA_LIBS $LIBS" -cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" - -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE" -else - echo "$ac_t""no" 1>&6 -fi - - LDFLAGS="$ac_save_LDFLAGS" - -fi - - -if test "$no_x" = "yes"; then - { echo "configure: error: X11 libraries not found" 1>&2; exit 1; } -fi - -CHECK_INCLUDE="-I/usr/include $X_CFLAGS" -CHECK_LIB="-L/lib -L/usr/lib $X_LIBS" - - -TOOLKIT= -TOOLKIT_DEF= -TOOLKIT_DIR= -TOOLKIT_INCLUDE= - -GUI_TK_LIBRARY= -GUI_TK_LINK= - -WXGTK12= - -if test "$wxUSE_GTK" = 1; then - # Check whether --with-gtk-prefix or --without-gtk-prefix was given. -if test "${with_gtk_prefix+set}" = set; then - withval="$with_gtk_prefix" - gtk_config_prefix="$withval" -else - gtk_config_prefix="" -fi - -# Check whether --with-gtk-exec-prefix or --without-gtk-exec-prefix was given. -if test "${with_gtk_exec_prefix+set}" = set; then - withval="$with_gtk_exec_prefix" - gtk_config_exec_prefix="$withval" -else - gtk_config_exec_prefix="" -fi - - - if test x$gtk_config_exec_prefix != x ; then - gtk_config_args="$gtk_config_args --exec-prefix=$gtk_config_exec_prefix" - if test x${GTK_CONFIG+set} != xset ; then - GTK_CONFIG=$gtk_config_exec_prefix/bin/gtk-config - fi - fi - if test x$gtk_config_prefix != x ; then - gtk_config_args="$gtk_config_args --prefix=$gtk_config_prefix" - if test x${GTK_CONFIG+set} != xset ; then - GTK_CONFIG=$gtk_config_prefix/bin/gtk-config - fi - fi - - # Extract the first word of "gtk-config", so it can be a program name with args. -set dummy gtk-config; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4984: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_path_GTK_CONFIG'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - case "$GTK_CONFIG" in - /*) - ac_cv_path_GTK_CONFIG="$GTK_CONFIG" # Let the user override the test with a path. - ;; - ?:/*) - ac_cv_path_GTK_CONFIG="$GTK_CONFIG" # Let the user override the test with a dos path. - ;; - *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_path_GTK_CONFIG="$ac_dir/$ac_word" - break - fi - done - IFS="$ac_save_ifs" - test -z "$ac_cv_path_GTK_CONFIG" && ac_cv_path_GTK_CONFIG="no" - ;; -esac -fi -GTK_CONFIG="$ac_cv_path_GTK_CONFIG" -if test -n "$GTK_CONFIG"; then - echo "$ac_t""$GTK_CONFIG" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi - - min_gtk_version=1.2.0 - echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6 -echo "configure:5019: checking for GTK - version >= $min_gtk_version" >&5 - no_gtk="" - if test "$GTK_CONFIG" != "no" ; then - GTK_CFLAGS=`$GTK_CONFIG --cflags` - GTK_LIBS=`$GTK_CONFIG --libs` - ac_save_CFLAGS="$CFLAGS" - ac_save_LIBS="$LIBS" - CFLAGS="$CFLAGS $GTK_CFLAGS" - LIBS="$LIBS $GTK_LIBS" - if test "$cross_compiling" = yes; then - echo $ac_n "cross compiling; assumed OK... $ac_c" -else - cat > conftest.$ac_ext < -#include - -int -main () -{ - int major, minor, micro; - - if (sscanf("$min_gtk_version", "%d.%d.%d", &major, &minor, µ) != 3) { - printf("%s, bad version string\n", "$min_gtk_version"); - exit(1); - } - - if (gtk_minor_version == 1) return FALSE; - - return !((gtk_major_version > major) || - ((gtk_major_version == major) && (gtk_minor_version > minor)) || - ((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro))); -} - -EOF -if { (eval echo configure:5056: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then - : -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - no_gtk=yes -fi -rm -fr conftest* -fi - - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - else - no_gtk=yes - fi - if test "x$no_gtk" = x ; then - echo "$ac_t""yes" 1>&6 - WXGTK12=1 - else - echo "$ac_t""no" 1>&6 - GTK_CFLAGS="" - GTK_LIBS="" - : - fi - - - - if test "$WXGTK12" != 1; then - # Check whether --with-gtk-prefix or --without-gtk-prefix was given. -if test "${with_gtk_prefix+set}" = set; then - withval="$with_gtk_prefix" - gtk_config_prefix="$withval" -else - gtk_config_prefix="" -fi - -# Check whether --with-gtk-exec-prefix or --without-gtk-exec-prefix was given. -if test "${with_gtk_exec_prefix+set}" = set; then - withval="$with_gtk_exec_prefix" - gtk_config_exec_prefix="$withval" -else - gtk_config_exec_prefix="" -fi - - - if test x$gtk_config_exec_prefix != x ; then - gtk_config_args="$gtk_config_args --exec-prefix=$gtk_config_exec_prefix" - if test x${GTK_CONFIG+set} != xset ; then - GTK_CONFIG=$gtk_config_exec_prefix/bin/gtk-config - fi - fi - if test x$gtk_config_prefix != x ; then - gtk_config_args="$gtk_config_args --prefix=$gtk_config_prefix" - if test x${GTK_CONFIG+set} != xset ; then - GTK_CONFIG=$gtk_config_prefix/bin/gtk-config - fi - fi - - # Extract the first word of "gtk-config", so it can be a program name with args. -set dummy gtk-config; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:5119: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_path_GTK_CONFIG'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - case "$GTK_CONFIG" in - /*) - ac_cv_path_GTK_CONFIG="$GTK_CONFIG" # Let the user override the test with a path. - ;; - ?:/*) - ac_cv_path_GTK_CONFIG="$GTK_CONFIG" # Let the user override the test with a dos path. - ;; - *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_path_GTK_CONFIG="$ac_dir/$ac_word" - break - fi - done - IFS="$ac_save_ifs" - test -z "$ac_cv_path_GTK_CONFIG" && ac_cv_path_GTK_CONFIG="no" - ;; -esac -fi -GTK_CONFIG="$ac_cv_path_GTK_CONFIG" -if test -n "$GTK_CONFIG"; then - echo "$ac_t""$GTK_CONFIG" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi - - min_gtk_version=1.0.0 - echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6 -echo "configure:5154: checking for GTK - version >= $min_gtk_version" >&5 - no_gtk="" - if test "$GTK_CONFIG" != "no" ; then - GTK_CFLAGS=`$GTK_CONFIG --cflags` - GTK_LIBS=`$GTK_CONFIG --libs` - ac_save_CFLAGS="$CFLAGS" - ac_save_LIBS="$LIBS" - CFLAGS="$CFLAGS $GTK_CFLAGS" - LIBS="$LIBS $GTK_LIBS" - if test "$cross_compiling" = yes; then - echo $ac_n "cross compiling; assumed OK... $ac_c" -else - cat > conftest.$ac_ext < -#include - -int -main () -{ - int major, minor, micro; - - if (sscanf("$min_gtk_version", "%d.%d.%d", &major, &minor, µ) != 3) { - printf("%s, bad version string\n", "$min_gtk_version"); - exit(1); - } - - if (gtk_minor_version == 1) return FALSE; - - return !((gtk_major_version > major) || - ((gtk_major_version == major) && (gtk_minor_version > minor)) || - ((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro))); -} +echo "configure:7526: checking for IceConnectionNumber in -lICE" >&5 +ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + ac_save_LIBS="$LIBS" +LIBS="-lICE $X_EXTRA_LIBS $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then - : +if { (eval echo configure:7545: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -fr conftest* - no_gtk=yes + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" fi -rm -fr conftest* +rm -f conftest* +LIBS="$ac_save_LIBS" + +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE" +else + echo "$ac_t""no" 1>&6 fi - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - else - no_gtk=yes - fi - if test "x$no_gtk" = x ; then - echo "$ac_t""yes" 1>&6 - : - else - echo "$ac_t""no" 1>&6 - GTK_CFLAGS="" - GTK_LIBS="" - { echo "configure: error: Is gtk-config in path and GTK+ is version 1.2.X or 1.0.X?" 1>&2; exit 1; } - fi - - + LDFLAGS="$ac_save_LDFLAGS" - fi +fi - TOOLKIT_INCLUDE="$GTK_CFLAGS" - GUI_TK_LIBRARY="$GTK_LIBS" - TOOLKIT=GTK - LTLIBOBJS="$LTLIBOBJS image.lo utilsgtk.lo win_gtk.lo" -fi + if test "$no_x" = "yes"; then + { echo "configure: error: X11 libraries not found" 1>&2; exit 1; } + fi + + TOOLKIT_INCLUDE="$X_CFLAGS" + GUI_TK_LIBRARY="$X_LIBS" -if test "$wxUSE_MOTIF" = 1; then echo $ac_n "checking for Motif/Lesstif includes""... $ac_c" 1>&6 -echo "configure:5231: checking for Motif/Lesstif includes" >&5 +echo "configure:7578: checking for Motif/Lesstif includes" >&5 ac_find_includes= for ac_dir in $SEARCH_INCLUDE; @@ -5246,7 +7593,7 @@ for ac_dir in $SEARCH_INCLUDE; fi echo $ac_n "checking for Motif/Lesstif library""... $ac_c" 1>&6 -echo "configure:5250: checking for Motif/Lesstif library" >&5 +echo "configure:7597: checking for Motif/Lesstif library" >&5 ac_find_libraries= for ac_dir in $SEARCH_LIB; @@ -5262,7 +7609,7 @@ for ac_dir in $SEARCH_LIB; if test "$ac_find_libraries" != "" ; then ac_path_to_include=$ac_find_includes - echo "$CHECK_INCLUDE" | grep "\-I$ac_find_includes" > /dev/null + echo "$TOOLKIT_INCLUDE" | grep "\-I$ac_find_includes" > /dev/null result=$? if test $result = 0; then ac_path_to_include="" @@ -5271,7 +7618,7 @@ for ac_dir in $SEARCH_LIB; fi - echo "$CHECK_LIB" | grep "\-L$ac_find_libraries" > /dev/null + echo "$GUI_TK_LIBRARY" | grep "\-L$ac_find_libraries" > /dev/null result=$? if test $result = 0; then ac_path_to_link="" @@ -5280,8 +7627,8 @@ for ac_dir in $SEARCH_LIB; fi - CHECK_LINK="$CHECK_LIB $ac_path_to_link" - CHECK_INCLUDE="$CHECK_INCLUDE $ac_path_to_include" + CHECK_LINK="$GUI_TK_LIBRARY $ac_path_to_link" + TOOLKIT_INCLUDE="$TOOLKIT_INCLUDE $ac_path_to_include" echo "$ac_t""found at $ac_find_libraries" 1>&6 else echo "$ac_t""no" 1>&6 @@ -5289,7 +7636,7 @@ for ac_dir in $SEARCH_LIB; fi echo $ac_n "checking for Xt library""... $ac_c" 1>&6 -echo "configure:5293: checking for Xt library" >&5 +echo "configure:7640: checking for Xt library" >&5 ac_find_libraries= for ac_dir in $SEARCH_LIB; @@ -5304,7 +7651,7 @@ for ac_dir in $SEARCH_LIB; if test "$ac_find_libraries" != "" ; then - echo "$CHECK_LIB" | grep "\-L$ac_find_libraries" > /dev/null + echo "$GUI_TK_LIBRARY" | grep "\-L$ac_find_libraries" > /dev/null result=$? if test $result = 0; then ac_path_to_link="" @@ -5312,7 +7659,7 @@ for ac_dir in $SEARCH_LIB; ac_path_to_link="-L$ac_find_libraries" fi - CHECK_LINK="$CHECK_LIB $ac_path_to_link" + CHECK_LINK="$GUI_TK_LIBRARY $ac_path_to_link" echo "$ac_t""found at $ac_find_libraries" 1>&6 else echo "$ac_t""no" 1>&6 @@ -5321,7 +7668,7 @@ for ac_dir in $SEARCH_LIB; XPM_LINK="" echo $ac_n "checking for Xpm library""... $ac_c" 1>&6 -echo "configure:5325: checking for Xpm library" >&5 +echo "configure:7672: checking for Xpm library" >&5 ac_find_libraries= for ac_dir in $SEARCH_LIB; @@ -5336,7 +7683,7 @@ for ac_dir in $SEARCH_LIB; if test "$ac_find_libraries" != "" ; then - echo "$CHECK_LIB" | grep "\-L$ac_find_libraries" > /dev/null + echo "$GUI_TK_LIBRARY" | grep "\-L$ac_find_libraries" > /dev/null result=$? if test $result = 0; then ac_path_to_link="" @@ -5344,7 +7691,7 @@ for ac_dir in $SEARCH_LIB; ac_path_to_link="-L$ac_find_libraries" fi - CHECK_LINK="$CHECK_LIB $ac_path_to_link" + CHECK_LINK="$GUI_TK_LIBRARY $ac_path_to_link" XPM_LINK="-lXpm " cat >> confdefs.h <<\EOF #define wxHAVE_LIB_XPM 1 @@ -5356,33 +7703,139 @@ EOF echo "configure: warning: library will be compiled without support for images in XPM format" 1>&2 fi - GUI_TK_LINK="-lXm $(XPM_LINK)-lXmu -lXt -lX11 -lm" - GUI_TK_LIBRARY="$CHECK_LIB $GUI_TK_LINK" + GUI_TK_LINK="-lXm $XPM_LINK -lXmu -lXt -lX11 -ldl -lm" + GUI_TK_LIBRARY="$GUI_TK_LIBRARY $GUI_TK_LINK" TOOLKIT=MOTIF + + GUIOBJS=MOTIF_GUIOBJS + GUIHEADERS=MOTIF_HEADERS + COMMONOBJS=MOTIF_COMMONOBJS + GENERICOBJS=MOTIF_GENERICOBJS + UNIXOBJS=UNIXOBJS + GUIDIST=MOTIF_DIST fi TOOLKIT_DIR=`echo ${TOOLKIT} | tr "A-Z" "a-z"` -TOOLKIT_DEF=-D__WX${TOOLKIT}__ +TOOLKIT_DEF="-D__WX${TOOLKIT}__" + +WX_LIBRARY="wx_${TOOLKIT_DIR}" + +WX_LIBRARY_NAME="libwx_${TOOLKIT_DIR}.la" + +WX_LIBRARY_NAME_STATIC="libwx_${TOOLKIT_DIR}.a" + +WX_LIBRARY_NAME_SHARED="libwx_${TOOLKIT_DIR}-${WX_RELEASE}.so.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}" + +WX_LIBRARY_LINK1="libwx_${TOOLKIT_DIR}-${WX_RELEASE}.so.${WX_CURRENT}" +WX_LIBRARY_LINK2="libwx_${TOOLKIT_DIR}-${WX_RELEASE}.so" +WX_LIBRARY_LINK3="libwx_${TOOLKIT_DIR}.so" + +SHARED_LD= +PIC_FLAG= +WX_CREATE_LINKS= + +if test "$wxUSE_SHARED" = "yes"; then + WX_TARGET_LIBRARY="${WX_LIBRARY_NAME_SHARED}" -WX_LIBRARY=${TOOLKIT_DIR}2 +case "${host}" in + *-hp-hpux* ) + WX_LIBRARY_NAME_SHARED="libwx_${TOOLKIT_DIR}.sl" + SHARED_LD="${CXX} -b -o" + PIC_FLAG="+Z" + ;; + *-*-linux* ) + SHARED_LD="${CC} -shared -o" + PIC_FLAG="-fPIC" + WX_CREATE_INSTALLED_LINKS="CREATE_INSTALLED_LINKS" + WX_CREATE_LINKS="CREATE_LINKS" + ;; + *-*-irix5* | *-*-irix6* ) + if test "$GCC" = yes ; then + SHARED_LD="${CC} -shared -o" + PIC_FLAG="-fPIC" + else + SHARED_LD="${CXX} -shared -o" + fi + WX_CREATE_INSTALLED_LINKS="CREATE_INSTALLED_LINKS" + WX_CREATE_LINKS="CREATE_LINKS" + ;; + *-*-solaris2* ) + if test "$GCC" = yes ; then + SHARED_LD="${CC} -shared -o" + PIC_FLAG="-fPIC" + else + SHARED_LD="${CXX} -G -o" + PIC_FLAG="PIC" + fi + WX_CREATE_INSTALLED_LINKS="CREATE_INSTALLED_LINKS" + WX_CREATE_LINKS="CREATE_LINKS" + ;; + *-*-sunos4* ) + SHARED_LD="${CC} -shared -o" + PIC_FLAG="-fPIC" + WX_CREATE_INSTALLED_LINKS="CREATE_INSTALLED_LINKS" + WX_CREATE_LINKS="CREATE_LINKS" + ;; + *-*-freebsd* | *-*-netbsd*) + SHARED_LD="${CC} -shared -o" + PIC_FLAG="-fPIC" + WX_CREATE_INSTALLED_LINKS="CREATE_INSTALLED_LINKS" + WX_CREATE_LINKS="CREATE_LINKS" + ;; + *-*-osf* ) + SHARED_LD="${CXX} -shared -o" + PIC_FLAG="-fPIC" + WX_CREATE_INSTALLED_LINKS="CREATE_INSTALLED_LINKS" + WX_CREATE_LINKS="CREATE_LINKS" + ;; + *-*-dgux5* ) + SHARED_LD="${CXX} -shared -o" + PIC_FLAG="-fPIC" + WX_CREATE_INSTALLED_LINKS="CREATE_INSTALLED_LINKS" + WX_CREATE_LINKS="CREATE_LINKS" + ;; + *-*-sysv5* ) + SHARED_LD="${CC} -shared -o" + PIC_FLAG="-fPIC" + WX_CREATE_INSTALLED_LINKS="CREATE_INSTALLED_LINKS" + WX_CREATE_LINKS="CREATE_LINKS" + ;; + *-*-aix* ) + SHARED_LD="/usr/lpp/xlC/bin/makeC++SharedLib -p 0 -o" + ;; + *-*-cygwin32* ) + WX_TARGET_LIBRARY="${WX_LIBRARY_NAME_STATIC}" + ;; + *-*-mingw32* ) + WX_TARGET_LIBRARY="${WX_LIBRARY_NAME_STATIC}" + ;; + *-pc-os2_emx ) + ;; + *) + { echo "configure: error: unknown system type ${host}." 1>&2; exit 1; } +esac + +else + WX_TARGET_LIBRARY="${WX_LIBRARY_NAME_STATIC}" +fi for ac_hdr in strings.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:5376: checking for $ac_hdr" >&5 +echo "configure:7829: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5386: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7839: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -5412,17 +7865,17 @@ for ac_hdr in unistd.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:5416: checking for $ac_hdr" >&5 +echo "configure:7869: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5426: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7879: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -5452,17 +7905,17 @@ for ac_hdr in wchar.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:5456: checking for $ac_hdr" >&5 +echo "configure:7909: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5466: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7919: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -5492,17 +7945,17 @@ for ac_hdr in wcstr.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:5496: checking for $ac_hdr" >&5 +echo "configure:7949: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5506: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7959: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -5532,17 +7985,57 @@ for ac_hdr in fnmatch.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:5536: checking for $ac_hdr" >&5 +echo "configure:7989: checking for $ac_hdr" >&5 +if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext < +EOF +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (eval echo configure:7999: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` +if test -z "$ac_err"; then + rm -rf conftest* + eval "ac_cv_header_$ac_safe=yes" +else + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_header_$ac_safe=no" +fi +rm -f conftest* +fi +if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then + echo "$ac_t""yes" 1>&6 + ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` + cat >> confdefs.h <&6 +fi +done + +for ac_hdr in X11/XKBlib.h +do +ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +echo "configure:8029: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5546: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8039: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -5571,12 +8064,12 @@ done echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:5575: checking for ANSI C header files" >&5 +echo "configure:8068: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -5584,7 +8077,7 @@ else #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5588: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8081: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -5601,7 +8094,7 @@ rm -f conftest* if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -5619,7 +8112,7 @@ fi if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -5640,7 +8133,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -5651,7 +8144,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } EOF -if { (eval echo configure:5655: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:8148: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -5675,12 +8168,12 @@ EOF fi echo $ac_n "checking for mode_t""... $ac_c" 1>&6 -echo "configure:5679: checking for mode_t" >&5 +echo "configure:8172: checking for mode_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_mode_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -5708,12 +8201,12 @@ EOF fi echo $ac_n "checking for off_t""... $ac_c" 1>&6 -echo "configure:5712: checking for off_t" >&5 +echo "configure:8205: checking for off_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -5741,12 +8234,12 @@ EOF fi echo $ac_n "checking for pid_t""... $ac_c" 1>&6 -echo "configure:5745: checking for pid_t" >&5 +echo "configure:8238: checking for pid_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -5774,12 +8267,12 @@ EOF fi echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:5778: checking for size_t" >&5 +echo "configure:8271: checking for size_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -5807,12 +8300,12 @@ EOF fi echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6 -echo "configure:5811: checking for uid_t in sys/types.h" >&5 +echo "configure:8304: checking for uid_t in sys/types.h" >&5 if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF @@ -5844,12 +8337,12 @@ fi echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:5848: checking for working const" >&5 +echo "configure:8341: checking for working const" >&5 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8395: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -5919,21 +8412,21 @@ EOF fi echo $ac_n "checking for inline""... $ac_c" 1>&6 -echo "configure:5923: checking for inline" >&5 +echo "configure:8416: checking for inline" >&5 if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_cv_c_inline=no for ac_kw in inline __inline__ __inline; do cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8430: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_inline=$ac_kw; break else @@ -5959,8 +8452,86 @@ EOF esac +echo $ac_n "checking size of char""... $ac_c" 1>&6 +echo "configure:8457: checking size of char" >&5 +if eval "test \"`echo '$''{'ac_cv_sizeof_char'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test "$cross_compiling" = yes; then + ac_cv_sizeof_char=1 +else + cat > conftest.$ac_ext < +main() +{ + FILE *f=fopen("conftestval", "w"); + if (!f) exit(1); + fprintf(f, "%d\n", sizeof(char)); + exit(0); +} +EOF +if { (eval echo configure:8476: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +then + ac_cv_sizeof_char=`cat conftestval` +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -fr conftest* + ac_cv_sizeof_char=0 +fi +rm -fr conftest* +fi + +fi +echo "$ac_t""$ac_cv_sizeof_char" 1>&6 +cat >> confdefs.h <&6 +echo "configure:8496: checking size of short" >&5 +if eval "test \"`echo '$''{'ac_cv_sizeof_short'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test "$cross_compiling" = yes; then + ac_cv_sizeof_short=2 +else + cat > conftest.$ac_ext < +main() +{ + FILE *f=fopen("conftestval", "w"); + if (!f) exit(1); + fprintf(f, "%d\n", sizeof(short)); + exit(0); +} +EOF +if { (eval echo configure:8515: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +then + ac_cv_sizeof_short=`cat conftestval` +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -fr conftest* + ac_cv_sizeof_short=0 +fi +rm -fr conftest* +fi + +fi +echo "$ac_t""$ac_cv_sizeof_short" 1>&6 +cat >> confdefs.h <&6 -echo "configure:5964: checking size of int *" >&5 +echo "configure:8535: checking size of int *" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_int_p'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5968,7 +8539,7 @@ else ac_cv_sizeof_int_p=4 else cat > conftest.$ac_ext < main() @@ -5979,7 +8550,7 @@ main() exit(0); } EOF -if { (eval echo configure:5983: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:8554: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_int_p=`cat conftestval` else @@ -5999,7 +8570,7 @@ EOF echo $ac_n "checking size of int""... $ac_c" 1>&6 -echo "configure:6003: checking size of int" >&5 +echo "configure:8574: checking size of int" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6007,7 +8578,7 @@ else ac_cv_sizeof_int=4 else cat > conftest.$ac_ext < main() @@ -6018,7 +8589,7 @@ main() exit(0); } EOF -if { (eval echo configure:6022: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:8593: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_int=`cat conftestval` else @@ -6038,7 +8609,7 @@ EOF echo $ac_n "checking size of long""... $ac_c" 1>&6 -echo "configure:6042: checking size of long" >&5 +echo "configure:8613: checking size of long" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6046,7 +8617,7 @@ else ac_cv_sizeof_long=4 else cat > conftest.$ac_ext < main() @@ -6057,7 +8628,7 @@ main() exit(0); } EOF -if { (eval echo configure:6061: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:8632: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_long=`cat conftestval` else @@ -6077,7 +8648,7 @@ EOF echo $ac_n "checking size of long long""... $ac_c" 1>&6 -echo "configure:6081: checking size of long long" >&5 +echo "configure:8652: checking size of long long" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_long_long'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6085,7 +8656,7 @@ else ac_cv_sizeof_long_long=0 else cat > conftest.$ac_ext < main() @@ -6096,7 +8667,7 @@ main() exit(0); } EOF -if { (eval echo configure:6100: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:8671: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_long_long=`cat conftestval` else @@ -6116,6 +8687,100 @@ EOF +echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6 +echo "configure:8692: checking whether byte ordering is bigendian" >&5 +if eval "test \"`echo '$''{'ac_cv_c_bigendian'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + ac_cv_c_bigendian=unknown +# See if sys/param.h defines the BYTE_ORDER macro. +cat > conftest.$ac_ext < +#include +int main() { + +#if !BYTE_ORDER || !BIG_ENDIAN || !LITTLE_ENDIAN + bogus endian macros +#endif +; return 0; } +EOF +if { (eval echo configure:8710: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + # It does; now see whether it defined to BIG_ENDIAN or not. +cat > conftest.$ac_ext < +#include +int main() { + +#if BYTE_ORDER != BIG_ENDIAN + not big endian +#endif +; return 0; } +EOF +if { (eval echo configure:8725: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_c_bigendian=yes +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + ac_cv_c_bigendian=no +fi +rm -f conftest* +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 +fi +rm -f conftest* +if test $ac_cv_c_bigendian = unknown; then +if test "$cross_compiling" = yes; then + ac_cv_c_bigendian=unknown +else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +then + ac_cv_c_bigendian=no +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -fr conftest* + ac_cv_c_bigendian=yes +fi +rm -fr conftest* +fi + +fi +fi + +echo "$ac_t""$ac_cv_c_bigendian" 1>&6 +if test $ac_cv_c_bigendian = unknown; then + echo "configure: warning: Assuming little-endian target machine - this may be overriden by adding the line "ac_cv_c_bigendian=${ac_cv_c_bigendian='yes'}" to config.cache file" 1>&2 +fi +if test $ac_cv_c_bigendian = yes; then + cat >> confdefs.h <<\EOF +#define WORDS_BIGENDIAN 1 +EOF + +fi + + if test "$cross_compiling" = "yes"; then cat >> confdefs.h <<\EOF @@ -6136,17 +8801,17 @@ cross_compiling=$ac_cv_prog_cxx_cross do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:6140: checking for $ac_hdr" >&5 +echo "configure:8805: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6150: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8815: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -6194,7 +8859,7 @@ cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking if C++ compiler supports bool""... $ac_c" 1>&6 -echo "configure:6198: checking if C++ compiler supports bool" >&5 +echo "configure:8863: checking if C++ compiler supports bool" >&5 if eval "test \"`echo '$''{'wx_cv_cpp_bool'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6208,27 +8873,21 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross - if test "$cross_compiling" = yes; then - wx_cv_cpp_bool=no - -else - cat > conftest.$ac_ext < conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then +if { (eval echo configure:8890: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* cat >> confdefs.h <<\EOF #define HAVE_BOOL 1 @@ -6239,12 +8898,13 @@ EOF else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -fr conftest* - wx_cv_cpp_bool=no -fi -rm -fr conftest* + rm -rf conftest* + + wx_cv_cpp_bool=no + + fi - +rm -f conftest* ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -6268,7 +8928,7 @@ EOF echo $ac_n "checking if size_t and int are different types""... $ac_c" 1>&6 -echo "configure:6272: checking if size_t and int are different types" >&5 +echo "configure:8932: checking if size_t and int are different types" >&5 if eval "test \"`echo '$''{'wx_cv_cpp_sizet_not_int'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6287,7 +8947,7 @@ cross_compiling=$ac_cv_prog_cxx_cross else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:8981: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then cat >> confdefs.h <<\EOF #define wxUSE_SIZE_T_STRING_OPERATOR 1 @@ -6347,8 +9007,52 @@ echo "$ac_t""$wx_cv_cpp_sizet_not_int" 1>&6 +echo $ac_n "checking if you need GNU extensions""... $ac_c" 1>&6 +echo "configure:9012: checking if you need GNU extensions" >&5 +if eval "test \"`echo '$''{'wx_cv_gnu_extensions'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + + cat > conftest.$ac_ext < +int main() { + + +#ifndef __GNU_LIBRARY__ + Compile error wanted +#endif + + +; return 0; } +EOF +if { (eval echo configure:9031: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + wx_cv_gnu_extensions=yes +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + wx_cv_gnu_extensions=no +fi +rm -f conftest* + +fi + + +echo "$ac_t""$wx_cv_gnu_extensions" 1>&6 +if test "$wx_cv_gnu_extensions" = "yes"; then + cat >> confdefs.h <&6 -echo "configure:6352: checking for wcslen in -lc" >&5 +echo "configure:9056: checking for wcslen in -lc" >&5 ac_lib_var=`echo c'_'wcslen | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6356,7 +9060,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lc $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9075: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6393,7 +9097,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for wcslen in -lw""... $ac_c" 1>&6 -echo "configure:6397: checking for wcslen in -lw" >&5 +echo "configure:9101: checking for wcslen in -lw" >&5 ac_lib_var=`echo w'_'wcslen | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6401,7 +9105,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lw $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9120: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6443,12 +9147,12 @@ fi echo $ac_n "checking for vprintf""... $ac_c" 1>&6 -echo "configure:6447: checking for vprintf" >&5 +echo "configure:9151: checking for vprintf" >&5 if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9180: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_vprintf=yes" else @@ -6495,12 +9200,12 @@ fi if test "$ac_cv_func_vprintf" != yes; then echo $ac_n "checking for _doprnt""... $ac_c" 1>&6 -echo "configure:6499: checking for _doprnt" >&5 +echo "configure:9204: checking for _doprnt" >&5 if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9233: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func__doprnt=yes" else @@ -6551,12 +9257,12 @@ fi for ac_func in vsnprintf do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:6555: checking for $ac_func" >&5 +echo "configure:9261: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9290: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -6609,15 +9316,93 @@ fi done + +ac_ext=C +# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' +ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' +cross_compiling=$ac_cv_prog_cxx_cross + + +echo $ac_n "checking for vsscanf""... $ac_c" 1>&6 +echo "configure:9330: checking for vsscanf" >&5 +if eval "test \"`echo '$''{'wx_cv_func_vsscanf'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + + if test "$cross_compiling" = yes; then + wx_cv_func_vsscanf=no + +else + cat > conftest.$ac_ext < + #include + + int try_vsscanf(const char *format, ...) + { + va_list ap; + va_start(ap, format); + + vsscanf("17", format, ap); + + va_end(ap); + } + + int main() + { + int i; + try_vsscanf("%d", &i); + return i == 17 ? 0 : 1; + } + +EOF +if { (eval echo configure:9367: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +then + + cat >> confdefs.h <<\EOF +#define HAVE_VSSCANF 1 +EOF + + wx_cv_func_vsscanf=yes + +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -fr conftest* + wx_cv_func_vsscanf=no +fi +rm -fr conftest* +fi + + +fi + +echo "$ac_t""$wx_cv_func_vsscanf" 1>&6 + +ac_ext=c +# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. +ac_cpp='$CPP $CPPFLAGS' +ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' +ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' +cross_compiling=$ac_cv_prog_cc_cross + + for ac_func in vfork do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:6616: checking for $ac_func" >&5 +echo "configure:9401: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9430: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -6669,12 +9455,12 @@ POSIX4_LINK= for ac_func in nanosleep do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:6673: checking for $ac_func" >&5 +echo "configure:9459: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9488: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -6722,7 +9509,7 @@ EOF else echo "$ac_t""no" 1>&6 echo $ac_n "checking for nanosleep in -lposix4""... $ac_c" 1>&6 -echo "configure:6726: checking for nanosleep in -lposix4" >&5 +echo "configure:9513: checking for nanosleep in -lposix4" >&5 ac_lib_var=`echo posix4'_'nanosleep | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6730,7 +9517,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lposix4 $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9532: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6769,12 +9556,12 @@ else for ac_func in usleep do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:6773: checking for $ac_func" >&5 +echo "configure:9560: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9589: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -6836,12 +9624,12 @@ done for ac_func in uname gethostname do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:6840: checking for $ac_func" >&5 +echo "configure:9628: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9657: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -6889,6 +9678,166 @@ fi done +for ac_func in inet_addr +do +echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +echo "configure:9685: checking for $ac_func" >&5 +if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext < +/* Override any gcc2 internal prototype to avoid an error. */ +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char $ac_func(); +char (*f)(); + +int main() { + +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_$ac_func) || defined (__stub___$ac_func) +choke me +#else +f = $ac_func; +#endif + +; return 0; } +EOF +if { (eval echo configure:9714: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_$ac_func=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_func_$ac_func=no" +fi +rm -f conftest* +fi + +if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then + echo "$ac_t""yes" 1>&6 + ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` + cat >> confdefs.h <&6 +fi +done + +for ac_func in inet_aton +do +echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +echo "configure:9741: checking for $ac_func" >&5 +if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext < +/* Override any gcc2 internal prototype to avoid an error. */ +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char $ac_func(); +char (*f)(); + +int main() { + +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_$ac_func) || defined (__stub___$ac_func) +choke me +#else +f = $ac_func; +#endif + +; return 0; } +EOF +if { (eval echo configure:9770: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_$ac_func=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_func_$ac_func=no" +fi +rm -f conftest* +fi + +if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then + echo "$ac_t""yes" 1>&6 + ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` + cat >> confdefs.h <&6 +fi +done + +echo $ac_n "checking for inet_aton in -lresolv""... $ac_c" 1>&6 +echo "configure:9795: checking for inet_aton in -lresolv" >&5 +ac_lib_var=`echo resolv'_'inet_aton | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + ac_save_LIBS="$LIBS" +LIBS="-lresolv $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" +fi +rm -f conftest* +LIBS="$ac_save_LIBS" + +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + ac_tr_lib=HAVE_LIB`echo resolv | sed -e 's/[^a-zA-Z0-9_]/_/g' \ + -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` + cat >> confdefs.h <&6 +fi + + cat > confcache <<\EOF # This file is a shell script that caches the results of configure @@ -6939,14 +9888,23 @@ rm -f confcache +if test "$USE_UNIX" = 1; then + THREADS_LINK="" THREADS_OBJ="" -if test "$wxUSE_THREADS" = "yes"; then - +if test "$wxUSE_THREADS" = "yes" ; then + if test "$wxUSE_WINE" = 1 ; then + echo "configure: warning: Threads are not supported under WINE" 1>&2 + wxUSE_THREADS="no" + fi +fi + +if test "$wxUSE_THREADS" = "yes" ; then + echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6 -echo "configure:6950: checking for pthread_create in -lpthread" >&5 +echo "configure:9908: checking for pthread_create in -lpthread" >&5 ac_lib_var=`echo pthread'_'pthread_create | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6954,7 +9912,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpthread $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9927: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6988,7 +9946,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6 -echo "configure:6992: checking for pthread_create in -lc_r" >&5 +echo "configure:9950: checking for pthread_create in -lc_r" >&5 ac_lib_var=`echo c_r'_'pthread_create | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6996,7 +9954,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lc_r $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9969: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7031,17 +9989,17 @@ else ac_safe=`echo "sys/prctl.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for sys/prctl.h""... $ac_c" 1>&6 -echo "configure:7035: checking for sys/prctl.h" >&5 +echo "configure:9993: checking for sys/prctl.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7045: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10003: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -7070,44 +10028,30 @@ fi fi - if test "$THREADS_LINK" != ""; then - cat >> confdefs.h <<\EOF -#define wxUSE_THREADS 1 -EOF - else + if test -z "$THREADS_OBJ" ; then + wxUSE_THREADS=no echo "configure: warning: No thread support on this system" 1>&2 fi fi -if test -z "$THREADS_OBJ"; then - wxUSE_THREADS=no -fi - -if test "$wxUSE_THREADS" = "yes"; then - CFLAGS="${CFLAGS} -D_REENTRANT" - CXXFLAGS="${CXXFLAGS} -D_REENTRANT" - - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS thread" - EXTRA_VPATH="$EXTRA_VPATH:\$(srcdir)/unix" - LTLIBOBJS="$LTLIBOBJS $THREADS_OBJ" - +if test "$wxUSE_THREADS" = "yes" ; then for ac_hdr in sched.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:7101: checking for $ac_hdr" >&5 +echo "configure:10045: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7111: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10055: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -7135,7 +10079,7 @@ done echo $ac_n "checking for sched_yield in -l$THREADS_LINK""... $ac_c" 1>&6 -echo "configure:7139: checking for sched_yield in -l$THREADS_LINK" >&5 +echo "configure:10083: checking for sched_yield in -l$THREADS_LINK" >&5 ac_lib_var=`echo $THREADS_LINK'_'sched_yield | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7143,7 +10087,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l$THREADS_LINK $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10102: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7176,7 +10120,7 @@ EOF else echo "$ac_t""no" 1>&6 echo $ac_n "checking for sched_yield in -l"posix4"""... $ac_c" 1>&6 -echo "configure:7180: checking for sched_yield in -l"posix4"" >&5 +echo "configure:10124: checking for sched_yield in -l"posix4"" >&5 ac_lib_var=`echo "posix4"'_'sched_yield | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7184,7 +10128,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l"posix4" $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10143: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7225,7 +10169,7 @@ fi echo $ac_n "checking for pthread_attr_getschedpolicy in -l$THREADS_LINK""... $ac_c" 1>&6 -echo "configure:7229: checking for pthread_attr_getschedpolicy in -l$THREADS_LINK" >&5 +echo "configure:10173: checking for pthread_attr_getschedpolicy in -l$THREADS_LINK" >&5 ac_lib_var=`echo $THREADS_LINK'_'pthread_attr_getschedpolicy | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7233,7 +10177,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l$THREADS_LINK $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10192: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7266,7 +10210,7 @@ EOF else echo "$ac_t""no" 1>&6 echo $ac_n "checking for pthread_attr_getschedpolicy in -l"posix4"""... $ac_c" 1>&6 -echo "configure:7270: checking for pthread_attr_getschedpolicy in -l"posix4"" >&5 +echo "configure:10214: checking for pthread_attr_getschedpolicy in -l"posix4"" >&5 ac_lib_var=`echo "posix4"'_'pthread_attr_getschedpolicy | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7274,7 +10218,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l"posix4" $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10233: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7315,7 +10259,7 @@ fi echo $ac_n "checking for pthread_cancel in -l$THREADS_LINK""... $ac_c" 1>&6 -echo "configure:7319: checking for pthread_cancel in -l$THREADS_LINK" >&5 +echo "configure:10263: checking for pthread_cancel in -l$THREADS_LINK" >&5 ac_lib_var=`echo $THREADS_LINK'_'pthread_cancel | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7323,7 +10267,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l$THREADS_LINK $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10282: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7360,13 +10304,13 @@ fi echo $ac_n "checking for pthread_cleanup_push/pop""... $ac_c" 1>&6 -echo "configure:7364: checking for pthread_cleanup_push/pop" >&5 +echo "configure:10308: checking for pthread_cleanup_push/pop" >&5 if eval "test \"`echo '$''{'wx_cv_func_pthread_cleanup_push'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { @@ -7376,7 +10320,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:7380: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:10324: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_func_pthread_cleanup_push=yes @@ -7397,9 +10341,23 @@ rm -f conftest* fi -echo "$ac_t""$wx_cv_func_pthread_cleanup_push" 1>&6 +echo "$ac_t""$wx_cv_func_pthread_cleanup_push" 1>&6 + + THREADS_LINK="-l$THREADS_LINK" +fi + +fi + +if test "$wxUSE_THREADS" = "yes"; then + cat >> confdefs.h <<\EOF +#define wxUSE_THREADS 1 +EOF - THREADS_LINK="-l$THREADS_LINK" + + CFLAGS="${CFLAGS} -D_REENTRANT" + CXXFLAGS="${CXXFLAGS} -D_REENTRANT" + + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS thread" fi if test "$WXGTK12" = 1 ; then @@ -7409,6 +10367,14 @@ EOF fi +if test "$WXWINE" = 1 ; then + TOOLKIT_DEF="${TOOLKIT_DEF} -D__WXWINE__" +fi + +if test "$wxUSE_CYGWIN" = 1 ; then + TOOLKIT_DEF="${TOOLKIT_DEF} -D__WIN95__" +fi + WXDEBUG= if test "$wxUSE_DEBUG_GDB" = "yes" ; then wxUSE_DEBUG_INFO=yes @@ -7421,73 +10387,82 @@ if test "$wxUSE_DEBUG_INFO" = "yes" ; then fi if test "$wxUSE_DEBUG_FLAG" = "yes" ; then - cat >> confdefs.h <<\EOF + cat >> confdefs.h <<\EOF #define WXDEBUG 1 EOF - WXDEBUG_DEFINE="-D__WXDEBUG__" + WXDEBUG_DEFINE="-D__WXDEBUG__" else - WXDEBUG_DEFINE="-DGTK_NO_CHECK_CASTS" + if test "$wxUSE_GTK" = 1 ; then + WXDEBUG_DEFINE="-DGTK_NO_CHECK_CASTS" + fi fi if test "$wxUSE_MEM_TRACING" = "yes" ; then - cat >> confdefs.h <<\EOF + cat >> confdefs.h <<\EOF #define wxUSE_MEMORY_TRACING 1 EOF - cat >> confdefs.h <<\EOF + cat >> confdefs.h <<\EOF #define wxUSE_GLOBAL_MEMORY_OPERATORS 1 EOF - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS memcheck" + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS memcheck" fi if test "$wxUSE_DMALLOC" = "yes" ; then - DMALLOC_LINK="-ldmalloc" + DMALLOC_LINK="-ldmalloc" fi PROFILE= if test "$wxUSE_PROFILE" = "yes" ; then - PROFILE="-pg" + PROFILE="-pg" fi +if test "$GCC" = yes ; then + if test "$wxUSE_NO_RTTI" = "yes" ; then + WXDEBUG_DEFINE="$WXDEBUG_DEFINE -fno-rtti" + fi + if test "$wxUSE_NO_EXCEPTIONS" = "yes" ; then + WXDEBUG_DEFINE="$WXDEBUG_DEFINE -fno-exceptions" + fi +fi + + CXXFLAGS=`echo "${CXXFLAGS}" | sed "s/\-O.//g" ` CFLAGS=`echo "${CFLAGS}" | sed "s/\-O.//g" ` if test "$wxUSE_OPTIMISE" = "no" ; then - OPTIMISE= -else - if test "$GCC" = yes ; then - OPTIMISE="-O2" - case "${host}" in - i586-*-*|i686-*-* ) - OPTIMISE="${OPTIMISE} " - ;; - esac - else - OPTIMISE="-O" - fi + OPTIMISE= +else + if test "$GCC" = yes ; then + OPTIMISE="-O2" + case "${host}" in + i586-*-*|i686-*-* ) + OPTIMISE="${OPTIMISE} " + ;; + esac + else + OPTIMISE="-O" + fi fi +ZLIB_INCLUDE= if test "$wxUSE_ZLIB" = "yes" ; then cat >> confdefs.h <<\EOF #define wxUSE_ZLIB 1 EOF - EXTRA_VPATH="$EXTRA_VPATH:\$(srcdir)/zlib" - LTLIBOBJS="$LTLIBOBJS adler32.lo compress.lo crc32.lo gzio.lo uncompr.lo deflate.lo trees.lo zutil.lo inflate.lo infblock.lo inftrees.lo infcodes.lo infutil.lo inffast.lo" - if eval "test x$wxUSE_STREAMS = x1"; then - LTLIBOBJS="$LTLIBOBJS zstream.lo" - fi + ZLIB_INCLUDE="-I\${top_srcdir}/src/zlib" fi +PNG_INCLUDE= if test "$wxUSE_LIBPNG" = "yes" ; then cat >> confdefs.h <<\EOF #define wxUSE_LIBPNG 1 EOF - LTLIBOBJS="$LTLIBOBJS imagpng.lo png.lo pngset.lo pngget.lo pngrutil.lo pngtrans.lo pngwutil.lo pngread.lo pngrio.lo pngwio.lo pngwrite.lo pngrtran.lo pngwtran.lo pngmem.lo pngerror.lo pngpread.lo" - EXTRA_VPATH="$EXTRA_VPATH:\$(srcdir)/png" + PNG_INCLUDE="-I\${top_srcdir}/src/png" SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS png" fi @@ -7496,42 +10471,31 @@ if test "$wxUSE_LIBGIF" = "yes" ; then #define wxUSE_LIBGIF 1 EOF - LTLIBOBJS="$LTLIBOBJS imaggif.lo" fi +JPEG_INCLUDE= if test "$wxUSE_LIBJPEG" = "yes" ; then cat >> confdefs.h <<\EOF #define wxUSE_LIBJPEG 1 EOF - EXTRA_VPATH="$EXTRA_VPATH:\${srcdir}/jpeg" - LTLIBOBJS="$LTLIBOBJS imagjpeg.lo \ - jcomapi.lo jutils.lo jerror.lo jmemmgr.lo jmemnobs.lo \ - jcapimin.lo jcapistd.lo jctrans.lo jcparam.lo jdatadst.lo \ - jcinit.lo jcmaster.lo jcmarker.lo jcmainct.lo jcprepct.lo \ - jccoefct.lo jccolor.lo jcsample.lo jchuff.lo jcphuff.lo \ - jcdctmgr.lo jfdctfst.lo jfdctflt.lo jfdctint.lo \ - jdapimin.lo jdapistd.lo jdtrans.lo jdatasrc.lo \ - jdmaster.lo jdinput.lo jdmarker.lo jdhuff.lo jdphuff.lo \ - jdmainct.lo jdcoefct.lo jdpostct.lo jddctmgr.lo jidctfst.lo \ - jidctflt.lo jidctint.lo jidctred.lo jdsample.lo jdcolor.lo \ - jquant1.lo jquant2.lo jdmerge.lo" + JPEG_INCLUDE="-I\${top_srcdir}/src/jpeg" fi if test "$wxUSE_OPENGL" = "yes"; then ac_safe=`echo "GL/gl.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for GL/gl.h""... $ac_c" 1>&6 -echo "configure:7525: checking for GL/gl.h" >&5 +echo "configure:10489: checking for GL/gl.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7535: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10499: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -7549,7 +10513,7 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then echo "$ac_t""yes" 1>&6 echo $ac_n "checking for glInitNames in -lGL""... $ac_c" 1>&6 -echo "configure:7553: checking for glInitNames in -lGL" >&5 +echo "configure:10517: checking for glInitNames in -lGL" >&5 ac_lib_var=`echo GL'_'glInitNames | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7557,7 +10521,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lGL wxUSE_OPENGL=0 $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10536: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7595,7 +10559,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for glInitNames in -lMesaGL""... $ac_c" 1>&6 -echo "configure:7599: checking for glInitNames in -lMesaGL" >&5 +echo "configure:10563: checking for glInitNames in -lMesaGL" >&5 ac_lib_var=`echo MesaGL'_'glInitNames | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7603,7 +10567,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lMesaGL $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10582: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7660,14 +10624,7 @@ if test "$wxUSE_GUI" = "yes"; then EOF - LTLIBOBJS="$LTLIBOBJS \ -main.lo app.lo event.lo wincmn.lo window.lo control.lo framecmn.lo frame.lo dialog.lo panelg.lo \ -button.lo stattext.lo textctrl.lo \ -bitmap.lo brush.lo colour.lo cursor.lo data.lo dc.lo dcbase.lo dcclient.lo \ -dcmemory.lo dcscreen.lo font.lo gdicmn.lo gdiobj.lo icon.lo palette.lo pen.lo region.lo \ -menu.lo \ -settings.lo timer.lo msgdlgg.lo" -else + else cat >> confdefs.h <<\EOF #define wxUSE_NOGUI 1 EOF @@ -7680,7 +10637,6 @@ if test "$wxUSE_UNIX" = "yes"; then #define wxUSE_UNIX 1 EOF - LTLIBOBJS="$LTLIBOBJS utilsunx.lo" fi @@ -7689,7 +10645,6 @@ if test "$wxUSE_APPLE_IEEE" = "yes"; then #define wxUSE_APPLE_IEEE 1 EOF - LTLIBOBJS="$LTLIBOBJS extended.lo" fi if test "$wxUSE_TIMEDATE" = "yes"; then @@ -7697,16 +10652,56 @@ if test "$wxUSE_TIMEDATE" = "yes"; then #define wxUSE_TIMEDATE 1 EOF - LTLIBOBJS="$LTLIBOBJS date.lo time.lo" SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS typetest" fi +if test "$wxUSE_WAVE" = "yes"; then + cat >> confdefs.h <<\EOF +#define wxUSE_WAVE 1 +EOF + +fi + if test "$wxUSE_FILE" = "yes"; then cat >> confdefs.h <<\EOF #define wxUSE_FILE 1 EOF - LTLIBOBJS="$LTLIBOBJS file.lo" +fi + +if test "$wxUSE_FS_INET" = "yes"; then + cat >> confdefs.h <<\EOF +#define wxUSE_FS_INET 1 +EOF + +fi + +if test "$wxUSE_FS_ZIP" = "yes"; then + cat >> confdefs.h <<\EOF +#define wxUSE_FS_ZIP 1 +EOF + +fi + +if test "$wxUSE_ZIPSTREAM" = "yes"; then + cat >> confdefs.h <<\EOF +#define wxUSE_ZIPSTREAM 1 +EOF + +fi + +if test "$wxUSE_BUSYINFO" = "yes"; then + cat >> confdefs.h <<\EOF +#define wxUSE_BUSYINFO 1 +EOF + +fi + +if test "$wxUSE_STD_IOSTREAM" = "yes"; then + cat >> confdefs.h <<\EOF +#define wxUSE_STD_IOSTREAM 1 +EOF + fi if test "$wxUSE_TEXTFILE" = "yes"; then @@ -7717,7 +10712,6 @@ if test "$wxUSE_TEXTFILE" = "yes"; then #define wxUSE_TEXTFILE 1 EOF - LTLIBOBJS="$LTLIBOBJS textfile.lo" fi fi @@ -7729,7 +10723,6 @@ if test "$wxUSE_CONFIG" = "yes" ; then #define wxUSE_CONFIG 1 EOF - LTLIBOBJS="$LTLIBOBJS config.lo fileconf.lo" SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS config" fi fi @@ -7742,7 +10735,6 @@ if test "$wxUSE_INTL" = "yes" ; then #define wxUSE_INTL 1 EOF - LTLIBOBJS="$LTLIBOBJS intl.lo" SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS internat" fi fi @@ -7752,7 +10744,6 @@ if test "$wxUSE_LOG" = "yes"; then #define wxUSE_LOG 1 EOF - LTLIBOBJS="$LTLIBOBJS log.lo" fi if test "$wxUSE_LONGLONG" = "yes"; then @@ -7760,7 +10751,6 @@ if test "$wxUSE_LONGLONG" = "yes"; then #define wxUSE_LONGLONG 1 EOF - LTLIBOBJS="$LTLIBOBJS longlong.lo" fi if test "$wxUSE_SOCKETS" = "yes" ; then @@ -7769,10 +10759,10 @@ if test "$wxUSE_SOCKETS" = "yes" ; then #define wxUSE_SOCKETS 1 EOF - LTLIBOBJS="$LTLIBOBJS sckint.lo socket.lo sckaddr.lo protocol.lo http.lo ftp.lo url.lo" SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS wxsocket" + INCLUDE_SUBDIRS="$INCLUDE_SUBDIRS protocol" else - echo "configure: warning: socket classes require --with-threads and won't be compiled without it" 1>&2 + echo "configure: warning: Socket classes require --with-threads and won't be compiled without it" 1>&2 wxUSE_SOCKETS=0 fi fi @@ -7782,10 +10772,6 @@ if test "$wxUSE_STREAMS" = "yes" ; then #define wxUSE_STREAMS 1 EOF - LTLIBOBJS="$LTLIBOBJS stream.lo wfstream.lo datstrm.lo mstream.lo objstrm.lo" - if test "$wxUSE_SOCKETS" = "yes" ; then - LTLIBOBJS="$LTLIBOBJS sckstrm.lo" - fi fi if test "$wxUSE_SERIAL" = "yes" ; then @@ -7806,16 +10792,16 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross echo $ac_n "checking the type of the third argument of getsockname""... $ac_c" 1>&6 -echo "configure:7810: checking the type of the third argument of getsockname" >&5 +echo "configure:10796: checking the type of the third argument of getsockname" >&5 cat > conftest.$ac_ext < int main() { socklen_t len; getsockname(0, NULL, &len); ; return 0; } EOF -if { (eval echo configure:7819: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:10805: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF #define SOCKLEN_T socklen_t @@ -7826,14 +10812,14 @@ else cat conftest.$ac_ext >&5 rm -rf conftest* cat > conftest.$ac_ext < int main() { size_t len; getsockname(0, NULL, &len); ; return 0; } EOF -if { (eval echo configure:7837: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:10823: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF #define SOCKLEN_T size_t @@ -7844,14 +10830,14 @@ else cat conftest.$ac_ext >&5 rm -rf conftest* cat > conftest.$ac_ext < int main() { int len; getsockname(0, NULL, &len); ; return 0; } EOF -if { (eval echo configure:7855: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:10841: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF #define SOCKLEN_T int @@ -7886,17 +10872,17 @@ if test "$wxUSE_JOYSTICK" = 1; then do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:7890: checking for $ac_hdr" >&5 +echo "configure:10876: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7900: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10886: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -7927,7 +10913,6 @@ done #define wxUSE_JOYSTICK 1 EOF - LTLIBOBJS="$LTLIBOBJS joystick.lo" SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS joytest" fi fi @@ -7939,12 +10924,12 @@ if test "$wxUSE_DYNLIB_CLASS" = "yes"; then for ac_func in dlopen do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:7943: checking for $ac_func" >&5 +echo "configure:10928: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10957: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -7992,7 +10978,7 @@ EOF else echo "$ac_t""no" 1>&6 echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 -echo "configure:7996: checking for dlopen in -ldl" >&5 +echo "configure:10982: checking for dlopen in -ldl" >&5 ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -8000,7 +10986,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11001: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -8040,12 +11026,12 @@ done for ac_func in shl_load do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:8044: checking for $ac_func" >&5 +echo "configure:11030: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11059: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -8097,9 +11084,13 @@ done if test "$HAVE_DL_FUNCS" = 0; then - echo "configure: warning: "--with-dynlib and --with-odbc will be disabled due to missing shared library support"" 1>&2 - wxUSE_ODBC=no - wxUSE_DYNLIB_CLASS=no + if test "$USE_UNIX" = 1; then + echo "configure: warning: "--with-dynlib and --with-odbc will be disabled due to missing shared library support"" 1>&2 + wxUSE_ODBC=no + wxUSE_DYNLIB_CLASS=no + else + echo "configure: warning: "Cannot check dynlib requirements on non-Unix platforms. dynlib remains enabled."" 1>&2 + fi fi fi @@ -8108,7 +11099,6 @@ if test "$wxUSE_DYNLIB_CLASS" = "yes" ; then #define wxUSE_DYNLIB_CLASS 1 EOF - LTLIBOBJS="$LTLIBOBJS dynlib.lo" fi @@ -8126,6 +11116,13 @@ EOF fi +if test "$wxUSE_wxUSE_EXPERIMENTAL_PRINTF" = "yes"; then + cat >> confdefs.h <<\EOF +#define wxUSE_EXPERIMENTAL_PRINTF 1 +EOF + +fi + IODBC_C_SRC="" if test "$wxUSE_ODBC" = "yes" ; then @@ -8133,8 +11130,6 @@ if test "$wxUSE_ODBC" = "yes" ; then #define wxUSE_ODBC 1 EOF - EXTRA_VPATH="$EXTRA_VPATH:\$(srcdir)/iodbc" - LTLIBOBJS="$LTLIBOBJS catalog.lo connect.lo dlf.lo dlproc.lo execute.lo fetch.lo hdbc.lo henv.lo herr.lo hstmt.lo info.lo itrace.lo misc.lo prepare.lo result.lo" SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS db" fi @@ -8144,7 +11139,6 @@ if test "$wxUSE_POSTSCRIPT" = "yes" ; then #define wxUSE_POSTSCRIPT 1 EOF - LTLIBOBJS="$LTLIBOBJS printps.lo dcpsg.lo" fi cat >> confdefs.h <<\EOF @@ -8159,81 +11153,73 @@ EOF if test "$wxUSE_CONSTRAINTS" = "yes"; then - cat >> confdefs.h <<\EOF + cat >> confdefs.h <<\EOF #define wxUSE_CONSTRAINTS 1 EOF - - LTLIBOBJS="$LTLIBOBJS layout.lo laywin.lo" - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS layout" + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS layout" fi if test "$wxUSE_MDI_ARCHITECTURE" = "yes"; then - cat >> confdefs.h <<\EOF + cat >> confdefs.h <<\EOF #define wxUSE_MDI_ARCHITECTURE 1 EOF - LTLIBOBJS="$LTLIBOBJS mdi.lo" - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS mdi" + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS mdi" fi if test "$wxUSE_DOC_VIEW_ARCHITECTURE" = "yes" ; then - cat >> confdefs.h <<\EOF + cat >> confdefs.h <<\EOF #define wxUSE_DOC_VIEW_ARCHITECTURE 1 EOF - LTLIBOBJS="$LTLIBOBJS docview.lo" - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS docview" - if test "$wxUSE_MDI_ARCHITECTURE" = "yes"; then - LTLIBOBJS="$LTLIBOBJS docmdi.lo" - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS docvwmdi" - fi + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS docview" + if test "$wxUSE_MDI_ARCHITECTURE" = "yes"; then + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS docvwmdi" + fi fi if test "$wxUSE_HELP" = "yes"; then - cat >> confdefs.h <<\EOF + cat >> confdefs.h <<\EOF #define wxUSE_HELP 1 EOF - LTLIBOBJS="$LTLIBOBJS helpext.lo helphtml.lo helpbase.lo" - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS help" + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS help" fi if test "$wxUSE_PRINTING_ARCHITECTURE" = "yes" ; then - cat >> confdefs.h <<\EOF + if test "$wxUSE_CONSTRAINTS" != "yes"; then + echo "configure: warning: Printing support cannot be used without constraints so it won't be compiled without it" 1>&2 + else + cat >> confdefs.h <<\EOF #define wxUSE_PRINTING_ARCHITECTURE 1 EOF - LTLIBOBJS="$LTLIBOBJS prntbase.lo paper.lo" - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS printing" + fi + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS printing" fi if test "$wxUSE_PROLOGIO" = "yes" ; then - cat >> confdefs.h <<\EOF + cat >> confdefs.h <<\EOF #define wxUSE_PROLOGIO 1 EOF - LTLIBOBJS="$LTLIBOBJS wxexpr.lo parser.lo" fi if test "$wxUSE_RESOURCES" = "yes" ; then - if test "$wxUSE_PROLOGIO" = "yes" ; then - cat >> confdefs.h <<\EOF + if test "$wxUSE_PROLOGIO" = "yes" ; then + cat >> confdefs.h <<\EOF #define wxUSE_RESOURCES 1 EOF - LTLIBOBJS="$LTLIBOBJS resource.lo" - if test "$wxUSE_GTK" = 1; then - LTLIBOBJS="$LTLIBOBJS utilsres.lo" + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS resource" + else + echo "configure: warning: wxWindows ressource system requires PrologIO and can't be compiled without it." 1>&2 fi - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS resource" - else - echo "configure: warning: wxWindows ressource system requires PrologIO and can't be compiled without it." 1>&2 - fi fi if test "$wxUSE_X_RESOURCES" = "yes"; then - cat >> confdefs.h <<\EOF + cat >> confdefs.h <<\EOF #define wxUSE_X_RESOURCES 1 EOF @@ -8241,35 +11227,39 @@ fi if test "$wxUSE_IPC" = "yes"; then - cat >> confdefs.h <<\EOF + cat >> confdefs.h <<\EOF #define wxUSE_IPC 1 EOF - LTLIBOBJS="$LTLIBOBJS ipcbase.lo sckipc.lo" fi if test "$wxUSE_CLIPBOARD" = "yes"; then - cat >> confdefs.h <<\EOF + cat >> confdefs.h <<\EOF #define wxUSE_CLIPBOARD 1 EOF - LTLIBOBJS="$LTLIBOBJS clipbrd.lo dataobj.lo" fi -if test "$wxUSE_DRAG_AND_DROP" = "yes"; then - if test "$WXGTK12" = 1 ; then - cat >> confdefs.h <<\EOF +if test "$wxUSE_DRAG_AND_DROP" = "yes" ; then + if test "$wxUSE_GTK" = 1; then + if test "$WXGTK12" != 1; then + echo "configure: warning: Drag and drop is only supported under GTK+ 1.2" 1>&2 + wxUSE_DRAG_AND_DROP=no + fi + fi + + if test "$wxUSE_MOTIF" = 1; then + echo "configure: warning: Drag and drop is not yet supported under Motif" 1>&2 + wxUSE_DRAG_AND_DROP=no + fi + + if test "$wxUSE_DRAG_AND_DROP" = "yes"; then + cat >> confdefs.h <<\EOF #define wxUSE_DRAG_AND_DROP 1 EOF - LTLIBOBJS="$LTLIBOBJS dnd.lo" - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS dnd" - if test "$wxUSE_CLIPBOARD" != "yes"; then - LTLIBOBJS="$LTLIBOBJS dataobj.lo" + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS dnd" fi - else - echo "configure: warning: drag and drop is only supported under GTK 1.2" 1>&2 - fi fi if test "$wxUSE_SPLINES" = "yes" ; then @@ -8285,7 +11275,6 @@ if test "$wxUSE_ACCEL" = "yes"; then #define wxUSE_ACCEL 1 EOF - LTLIBOBJS="$LTLIBOBJS accel.lo" fi if test "$wxUSE_CARET" = "yes"; then @@ -8293,7 +11282,6 @@ if test "$wxUSE_CARET" = "yes"; then #define wxUSE_CARET 1 EOF - LTLIBOBJS="$LTLIBOBJS caret.lo" SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS caret" fi @@ -8302,7 +11290,13 @@ if test "$wxUSE_COMBOBOX" = "yes"; then #define wxUSE_COMBOBOX 1 EOF - LTLIBOBJS="$LTLIBOBJS choice.lo combobox.lo" +fi + +if test "$wxUSE_CHOICE" = "yes"; then + cat >> confdefs.h <<\EOF +#define wxUSE_CHOICE 1 +EOF + fi if test "$wxUSE_BMPBUTTON" = "yes"; then @@ -8310,7 +11304,6 @@ if test "$wxUSE_BMPBUTTON" = "yes"; then #define wxUSE_BMPBUTTON 1 EOF - LTLIBOBJS="$LTLIBOBJS bmpbuttn.lo" fi if test "$wxUSE_CHECKBOX" = "yes"; then @@ -8318,7 +11311,6 @@ if test "$wxUSE_CHECKBOX" = "yes"; then #define wxUSE_CHECKBOX 1 EOF - LTLIBOBJS="$LTLIBOBJS checkbox.lo" fi if test "$wxUSE_CHECKLST" = "yes"; then @@ -8326,7 +11318,6 @@ if test "$wxUSE_CHECKLST" = "yes"; then #define wxUSE_CHECKLISTBOX 1 EOF - LTLIBOBJS="$LTLIBOBJS checklst.lo" SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS checklst" fi @@ -8335,7 +11326,6 @@ if test "$wxUSE_GAUGE" = "yes"; then #define wxUSE_GAUGE 1 EOF - LTLIBOBJS="$LTLIBOBJS gauge.lo" fi if test "$wxUSE_GRID" = "yes"; then @@ -8343,248 +11333,250 @@ if test "$wxUSE_GRID" = "yes"; then #define wxUSE_GRID 1 EOF - LTLIBOBJS="$LTLIBOBJS gridg.lo" SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS grid" fi if test "$wxUSE_IMAGLIST" = "yes"; then - cat >> confdefs.h <<\EOF + cat >> confdefs.h <<\EOF #define wxUSE_IMAGLIST 1 EOF - LTLIBOBJS="$LTLIBOBJS imaglist.lo" fi if test "$wxUSE_LISTBOX" = "yes"; then - cat >> confdefs.h <<\EOF + cat >> confdefs.h <<\EOF #define wxUSE_LISTBOX 1 EOF - LTLIBOBJS="$LTLIBOBJS listbox.lo" fi if test "$wxUSE_LISTCTRL" = "yes"; then - if test "$wxUSE_IMAGLIST" = "yes"; then - cat >> confdefs.h <<\EOF + if test "$wxUSE_IMAGLIST" = "yes"; then + cat >> confdefs.h <<\EOF #define wxUSE_LISTCTRL 1 EOF - LTLIBOBJS="$LTLIBOBJS listctrl.lo" - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS listctrl" - else - echo "configure: warning: wxListCtrl requires wxImageList and won't be compiled without it" 1>&2 - fi + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS listctrl" + else + echo "configure: warning: wxListCtrl requires wxImageList and won't be compiled without it" 1>&2 + fi fi if test "$wxUSE_NOTEBOOK" = "yes"; then - cat >> confdefs.h <<\EOF + cat >> confdefs.h <<\EOF #define wxUSE_NOTEBOOK 1 EOF - LTLIBOBJS="$LTLIBOBJS notebook.lo" - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS notebook" + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS notebook" fi if test "$wxUSE_RADIOBOX" = "yes"; then - cat >> confdefs.h <<\EOF + cat >> confdefs.h <<\EOF #define wxUSE_RADIOBOX 1 EOF - LTLIBOBJS="$LTLIBOBJS radiobox.lo" fi if test "$wxUSE_RADIOBTN" = "yes"; then - cat >> confdefs.h <<\EOF + cat >> confdefs.h <<\EOF #define wxUSE_RADIOBTN 1 EOF - LTLIBOBJS="$LTLIBOBJS radiobut.lo" fi -if test "wxUSE_SASH" = 1; then - cat >> confdefs.h <<\EOF +if test "$wxUSE_SASH" = "yes"; then + cat >> confdefs.h <<\EOF #define wxUSE_SASH 1 EOF - LTLIBOBJS="$LTLIBOBJS sashwin.lo" - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS sashtest" + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS sashtest" fi if test "$wxUSE_SCROLLBAR" = "yes"; then - cat >> confdefs.h <<\EOF + cat >> confdefs.h <<\EOF #define wxUSE_SCROLLBAR 1 EOF - LTLIBOBJS="$LTLIBOBJS scrolbar.lo scrolwin.lo" - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS scroll" + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS scroll" fi if test "$wxUSE_SLIDER" = "yes"; then - cat >> confdefs.h <<\EOF + cat >> confdefs.h <<\EOF #define wxUSE_SLIDER 1 EOF - LTLIBOBJS="$LTLIBOBJS slider.lo" fi if test "$wxUSE_SPINBTN" = "yes"; then - cat >> confdefs.h <<\EOF + cat >> confdefs.h <<\EOF #define wxUSE_SPINBTN 1 EOF - LTLIBOBJS="$LTLIBOBJS spinbutt.lo" fi if test "$wxUSE_SPLITTER" = "yes"; then - cat >> confdefs.h <<\EOF + cat >> confdefs.h <<\EOF #define wxUSE_SPLITTER 1 EOF - LTLIBOBJS="$LTLIBOBJS splitter.lo" - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS splitter" + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS splitter" fi if test "$wxUSE_STATBMP" = "yes"; then - cat >> confdefs.h <<\EOF + cat >> confdefs.h <<\EOF #define wxUSE_STATBMP 1 EOF - LTLIBOBJS="$LTLIBOBJS statbmp.lo" fi if test "$wxUSE_STATBOX" = "yes"; then - cat >> confdefs.h <<\EOF + cat >> confdefs.h <<\EOF #define wxUSE_STATBOX 1 EOF - LTLIBOBJS="$LTLIBOBJS statbox.lo" fi if test "$wxUSE_STATLINE" = "yes"; then - cat >> confdefs.h <<\EOF + if test "$wxUSE_WINE" = 1 ; then + echo "configure: warning: wxStaticLine is not supported under WINE" 1>&2 + else + if test "$wxUSE_MOTIF" = 1 ; then + echo "configure: warning: wxStaticLine is not supported under Motif" 1>&2 + else + cat >> confdefs.h <<\EOF #define wxUSE_STATLINE 1 EOF - LTLIBOBJS="$LTLIBOBJS statline.lo" + fi + fi fi if test "$wxUSE_STATUSBAR" = "yes"; then - cat >> confdefs.h <<\EOF + cat >> confdefs.h <<\EOF #define wxUSE_STATUSBAR 1 EOF - LTLIBOBJS="$LTLIBOBJS statusbr.lo" fi if test "$wxUSE_TABDIALOG" = "yes"; then - cat >> confdefs.h <<\EOF + cat >> confdefs.h <<\EOF #define wxUSE_TAB_DIALOG 1 EOF - LTLIBOBJS="$LTLIBOBJS tabg.lo" - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS tab" + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS tab" fi if test "$wxUSE_TOOLBAR" = "yes"; then - cat >> confdefs.h <<\EOF + cat >> confdefs.h <<\EOF #define wxUSE_TOOLBAR 1 EOF - LTLIBOBJS="$LTLIBOBJS tbarbase.lo tbargtk.lo" - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS toolbar" + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS toolbar" fi -if test "$wxUSE_TOOLTIPS" = "yes" ; then - if test "$wxUSE_MOTIF" = "yes"; then - echo "configure: warning: tooltips are not supported yet under Motif" 1>&2 +if test "$wxUSE_TOOLTIPS" = "yes"; then + if test "$wxUSE_MOTIF" = 1; then + echo "configure: warning: wxTooltip not supported yet under Motif" 1>&2 else - cat >> confdefs.h <<\EOF + if test "$wxUSE_WINE" = 1; then + echo "configure: warning: wxTooltip not supported under WINE" 1>&2 + else + cat >> confdefs.h <<\EOF #define wxUSE_TOOLTIPS 1 EOF - LTLIBOBJS="$LTLIBOBJS tooltip.lo" + fi fi fi if test "$wxUSE_TREECTRL" = "yes"; then - if test "$wxUSE_IMAGLIST" = "yes"; then - cat >> confdefs.h <<\EOF + if test "$wxUSE_IMAGLIST" = "yes"; then + cat >> confdefs.h <<\EOF #define wxUSE_TREECTRL 1 EOF - LTLIBOBJS="$LTLIBOBJS treectrl.lo" - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS treectrl" - else - echo "configure: warning: wxTreeCtrl requires wxImageList and won't be compiled without it" 1>&2 - fi + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS treectrl" + else + echo "configure: warning: wxTreeCtrl requires wxImageList and won't be compiled without it" 1>&2 + fi fi -if test "$wxUSE_WXTREE" = "yes"; then - cat >> confdefs.h <<\EOF -#define wxUSE_WXTREE 1 -EOF - -fi if test "$wxUSE_METAFILE" = "yes"; then - cat >> confdefs.h <<\EOF + cat >> confdefs.h <<\EOF #define wxUSE_METAFILE 1 EOF - LTLIBOBJS="$LTLIBOBJS metafile.lo" fi -if test "$wxUSE_COMMONDLGS" = "yes"; then - LTLIBOBJS="$LTLIBOBJS progdlgg.lo filedlg.lo fontdlgg.lo" - - if test "$wxUSE_CONSTRAINTS" != "yes"; then - echo "configure: warning: many common dialogs cannot be used without constraints so they won't be compiled without them" 1>&2 - else - cat >> confdefs.h <<\EOF -#define wxUSE_CONSTRAINTS 1 +if test "$wxUSE_DIRDLG" = "yes"; then + if test "$wxUSE_CONSTRAINTS" != "yes"; then + echo "configure: warning: wxDirDialog requires constraints so it won't be compiled without them" 1>&2 + else + if test "$wxUSE_TREECTRL" != "yes"; then + echo "configure: warning: wxDirDialog requires wxTreeCtrl so it won't be compiled without it" 1>&2 + else + cat >> confdefs.h <<\EOF +#define wxUSE_DIRDLG 1 EOF + fi + fi +fi + +if test "$wxUSE_TEXTDLG" = "yes"; then cat >> confdefs.h <<\EOF #define wxUSE_TEXTDLG 1 EOF - LTLIBOBJS="$LTLIBOBJS colrdlgg.lo textdlgg.lo choicdgg.lo" +fi - if test "$wxUSE_TREECTRL" != "yes"; then - echo "configure: warning: wxDirDialog cannot be used without wxTreeCtrl and it won't be compiled without it" 1>&2 +if test "$wxUSE_STARTUP_TIPS" = "yes"; then + if test "$wxUSE_CONSTRAINTS" != "yes"; then + echo "configure: warning: Startup tips requires constraints and won't be compiled without them" 1>&2 else - cat >> confdefs.h <<\EOF -#define wxUSE_DIRDLG 1 + cat >> confdefs.h <<\EOF +#define wxUSE_STARTUP_TIPS 1 EOF - LTLIBOBJS="$LTLIBOBJS dirdlgg.lo" fi - fi +fi - if test "$wxUSE_PRINTING_ARCHITECTURE" = "yes"; then - LTLIBOBJS="$LTLIBOBJS prntdlgg.lo" - else - echo "configure: warning: wxPrintDialog class won't be compiled without printing support" 1>&2 - fi +if test "$wxUSE_PROGRESSDLG" = "yes"; then + if test "$wxUSE_CONSTRAINTS" != "yes"; then + echo "configure: warning: wxProgressDialog requires constraints so it won't be compiled without them" 1>&2 + else + cat >> confdefs.h <<\EOF +#define wxUSE_PROGRESSDLG 1 +EOF + + fi fi if test "$wxUSE_MINIFRAME" = "yes"; then - cat >> confdefs.h <<\EOF + cat >> confdefs.h <<\EOF #define wxUSE_MINIFRAME 1 EOF - LTLIBOBJS="$LTLIBOBJS minifram.lo" - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS minifram" + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS minifram" +fi + +if test "$wxUSE_HTML" = "yes"; then + cat >> confdefs.h <<\EOF +#define wxUSE_HTML 1 +EOF + + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS html" + INCLUDE_SUBDIRS="$INCLUDE_SUBDIRS html" fi if test "$wxUSE_VALIDATORS" = "yes"; then - cat >> confdefs.h <<\EOF + cat >> confdefs.h <<\EOF #define wxUSE_VALIDATORS 1 EOF - LTLIBOBJS="$LTLIBOBJS valgen.lo validate.lo valtext.lo" - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS validate" + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS validate" fi @@ -8592,30 +11584,48 @@ GUILIBS="$GUI_TK_LIBRARY $OPENGL_LINK $LIBPNG_LINK $ZLIB_LINK $TOOLKIT_LINK" EXTRA_LIBS="$LIBS $POSIX4_LINK $WCHAR_LINK $THREADS_LINK $DMALLOC_LINK $GUILIBS" -LIBS="\${top_builddir}/src/libwx_${WX_LIBRARY}.la $EXTRA_LIBS" +LIBS="\${top_builddir}/src/${TOOLKIT_DIR}/${WX_LIBRARY_NAME} $EXTRA_LIBS" -INCLUDES="$TOOLKIT_INCLUDE $ZLIB_INCLUDE $LIBPNG_INCLUDE -I. -I\${top_builddir}/include -I\${top_srcdir}/include" +LD_LIBS="\${top_builddir}/lib/${WX_LIBRARY_NAME_STATIC} $EXTRA_LIBS" -if test "$ac_cv_prog_gcc" = "yes"; then - CXXWARNINGS="-Wall" - fi +INCLUDES="-I. -I\${top_builddir}/include -I\${top_srcdir}/include $ZLIB_INCLUDE $PNG_INCLUDE $JPEG_INCLUDE $TOOLKIT_INCLUDE" + +if test "$GXX" = yes ; then + CXXWARNINGS="-Wall" + fi EXTRA_CFLAGS="$WXDEBUG $PROFILE $OPTIMISE $INCLUDES" +CPPFLAGS="-I\${top_srcdir}/include $CPPFLAGS" CFLAGS="$CFLAGS $EXTRA_CFLAGS" CXXFLAGS="$CXXFLAGS $EXTRA_CFLAGS $CXXWARNINGS" if test "$wxUSE_GUI" = "yes"; then - - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS bombs controls dialogs drawing dynamic \ - forty fractal image wxpoem" + + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS bombs controls dialogs drawing dynamic \ + forty fractal image wxpoem" fi +SAMPLES_SUBDIRS="`echo $SAMPLES_SUBDIRS | tr -s ' ' | tr ' ' '\n' | sort | uniq | tr '\n' ' '`" + + + + + + + + + + + + + + + -LIBTOOL="$LIBTOOL --silent" @@ -8636,14 +11646,12 @@ LIBTOOL="$LIBTOOL --silent" -SETUPH_DIR=include/wx/${TOOLKIT_DIR} -mkdir -p ${SETUPH_DIR} echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:8647: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:11655: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -8670,6 +11678,9 @@ else fi + + + trap '' 1 2 15 cat > confcache <<\EOF # This file is a shell script that caches the results of configure @@ -8760,7 +11771,7 @@ do echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion" exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;; -version | --version | --versio | --versi | --vers | --ver | --ve | --v) - echo "$CONFIG_STATUS generated by autoconf version 2.13" + echo "$CONFIG_STATUS generated by autoconf version 2.14" exit 0 ;; -help | --help | --hel | --he | --h) echo "\$ac_cs_usage"; exit 0 ;; @@ -8772,56 +11783,57 @@ ac_given_srcdir=$srcdir ac_given_INSTALL="$INSTALL" trap 'rm -fr `echo " - Makefile src/Makefile wx-config + wx-config + src/make.env + src/makeprog.env + src/makelib.env + Makefile samples/Makefile samples/bombs/Makefile samples/caret/Makefile samples/checklst/Makefile samples/config/Makefile samples/controls/Makefile - samples/db/Makefile - samples/dialogs/Makefile - samples/dnd/Makefile - samples/docview/Makefile - samples/docvwmdi/Makefile - samples/drawing/Makefile - samples/dynamic/Makefile - samples/forty/Makefile - samples/fractal/Makefile - samples/grid/Makefile - samples/help/Makefile - samples/image/Makefile - samples/internat/Makefile - samples/joytest/Makefile - samples/layout/Makefile - samples/listctrl/Makefile - samples/mdi/Makefile - samples/memcheck/Makefile - samples/mfc/Makefile - samples/minifram/Makefile - samples/minimal/Makefile - samples/nativdlg/Makefile - samples/notebook/Makefile - samples/oleauto/Makefile - samples/ownerdrw/Makefile - samples/png/Makefile + samples/dialogs/Makefile + samples/docview/Makefile + samples/docvwmdi/Makefile + samples/dnd/Makefile + samples/drawing/Makefile + samples/dynamic/Makefile + samples/image/Makefile + samples/layout/Makefile + samples/listctrl/Makefile + samples/mdi/Makefile + samples/minifram/Makefile + samples/minimal/Makefile + samples/notebook/Makefile samples/printing/Makefile samples/proplist/Makefile - samples/regtest/Makefile - samples/resource/Makefile - samples/sashtest/Makefile - samples/scroll/Makefile - samples/splitter/Makefile - samples/tab/Makefile - samples/taskbar/Makefile - samples/thread/Makefile - samples/toolbar/Makefile - samples/treectrl/Makefile - samples/typetest/Makefile - samples/validate/Makefile - samples/wxpoem/Makefile - samples/wxsocket/Makefile - ${SETUPH_DIR}/setup.h:include/wx/unix/setup.h.in" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 + samples/sashtest/Makefile + samples/scroll/Makefile + samples/splitter/Makefile + samples/text/Makefile + samples/thread/Makefile + samples/toolbar/Makefile + samples/treectrl/Makefile + samples/typetest/Makefile + samples/validate/Makefile + samples/wxpoem/Makefile + samples/wxsocket/Makefile + samples/wizard/Makefile + samples/html/Makefile + samples/html/about/Makefile + samples/html/help/Makefile + samples/html/printing/Makefile + samples/html/test/Makefile + samples/html/zip/Makefile + samples/html/virtual/Makefile + samples/html/widget/Makefile + utils/Makefile + utils/wxMMedia2/Makefile + utils/wxMMedia2/lib/Makefile + utils/wxMMedia2/sample/Makefile + setup.h:setup.h.in" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 EOF cat >> $CONFIG_STATUS <> $CONFIG_STATUS <> $CONFIG_STATUS <<\EOF @@ -9085,7 +12108,7 @@ ac_eD='%g' if test "${CONFIG_HEADERS+set}" != set; then EOF cat >> $CONFIG_STATUS <> $CONFIG_STATUS <<\EOF fi @@ -9173,11 +12196,25 @@ fi; done EOF cat >> $CONFIG_STATUS <> $CONFIG_STATUS <<\EOF -test -z "$CONFIG_HEADERS" || echo timestamp > ${SETUPH_DIR}/stamp-h -chmod +x wx-config + + chmod +x wx-config + if test ! -d include; then + mkdir include + fi + if test ! -d include/wx; then + mkdir include/wx + fi + if test ! -d include/wx/${TOOLKIT_DIR}; then + mkdir include/wx/${TOOLKIT_DIR} + fi + cp -f setup.h include/wx/${TOOLKIT_DIR}/setup.h + exit 0 EOF chmod +x $CONFIG_STATUS