X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/93a20a27c30efef58d5859bebcad4f7e7da782c1..b37c7e1dcdad16c20d9800d2abaf53cc6b653a64:/configure?ds=sidebyside diff --git a/configure b/configure index b2e4b9071d..d84b6974b2 100755 --- a/configure +++ b/configure @@ -1,148 +1,394 @@ #! /bin/sh -# From configure.in Id: configure.in. -# Guess values for system-dependent variables and create Makefiles. -# Generated by Autoconf 2.50. -# -# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 -# Free Software Foundation, Inc. -# This configure script is free software; the Free Software Foundation -# gives unlimited permission to copy, distribute and modify it. -# Be Bourne compatible -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then - emulate sh - NULLCMD=: -elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then - set -o posix -fi +# From configure.in Id: configure.in -# Name of the executable. -as_me=`echo "$0" |sed 's,.*[\\/],,'` -if expr a : '\(a\)' >/dev/null 2>&1; then - as_expr=expr -else - as_expr=false -fi -rm -f conf$$ conf$$.exe conf$$.file -echo >conf$$.file -if ln -s conf$$.file conf$$ 2>/dev/null; then - # We could just check for DJGPP; but this test a) works b) is more generic - # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04). - if test -f conf$$.exe; then - # Don't use ln at all; we don't have any links - as_ln_s='cp -p' - else - as_ln_s='ln -s' - fi -elif ln conf$$.file conf$$ 2>/dev/null; then - as_ln_s=ln -else - as_ln_s='cp -p' -fi -rm -f conf$$ conf$$.exe conf$$.file -as_executable_p="test -f" -# Support unset when possible. -if (FOO=FOO; unset FOO) >/dev/null 2>&1; then - as_unset=unset -else - as_unset=false -fi -# NLS nuisances. -$as_unset LANG || test "${LANG+set}" != set || { LANG=C; export LANG; } -$as_unset LC_ALL || test "${LC_ALL+set}" != set || { LC_ALL=C; export LC_ALL; } -$as_unset LC_TIME || test "${LC_TIME+set}" != set || { LC_TIME=C; export LC_TIME; } -$as_unset LC_CTYPE || test "${LC_CTYPE+set}" != set || { LC_CTYPE=C; export LC_CTYPE; } -$as_unset LANGUAGE || test "${LANGUAGE+set}" != set || { LANGUAGE=C; export LANGUAGE; } -$as_unset LC_COLLATE || test "${LC_COLLATE+set}" != set || { LC_COLLATE=C; export LC_COLLATE; } -$as_unset LC_NUMERIC || test "${LC_NUMERIC+set}" != set || { LC_NUMERIC=C; export LC_NUMERIC; } -$as_unset LC_MESSAGES || test "${LC_MESSAGES+set}" != set || { LC_MESSAGES=C; export LC_MESSAGES; } - -# IFS -# We need space, tab and new line, in precisely that order. -as_nl=' -' -IFS=" $as_nl" - -# CDPATH. -$as_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=:; export CDPATH; } - -# Name of the host. -# hostname on some systems (SVR3.2, Linux) returns a bogus exit status, -# so uname gets run too. -ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` - -exec 6>&1 -# -# Initializations. -# -ac_default_prefix=/usr/local -cross_compiling=no -subdirs= -MFLAGS= MAKEFLAGS= -SHELL=${CONFIG_SHELL-/bin/sh} -# Maximum number of lines to put in a shell here document. -# This variable seems obsolete. It should probably be removed, and -# only ac_max_sed_lines should be used. -: ${ac_max_here_lines=38} - -# Avoid depending upon Character Ranges. -ac_cr_az='abcdefghijklmnopqrstuvwxyz' -ac_cr_AZ='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -ac_cr_09='0123456789' -ac_cr_alnum=$ac_cr_az$ac_cr_AZ$ac_cr_09 - -# Sed expression to map a string onto a valid sh and CPP variable names. -ac_tr_sh="sed y%*+%pp%;s%[^_$ac_cr_alnum]%_%g" -ac_tr_cpp="sed y%*$ac_cr_az%P$ac_cr_AZ%;s%[^_$ac_cr_alnum]%_%g" - -ac_unique_file="wx-config.in" -# Factoring default headers for most tests. -ac_includes_default="\ -#include -#include -#include -#if STDC_HEADERS -# include -# include -#else -# if HAVE_STDLIB_H -# include -# endif -#endif -#if HAVE_STRING_H -# if !STDC_HEADERS && HAVE_MEMORY_H -# include -# endif -# include -#else -# if HAVE_STRINGS_H -# include -# endif -#endif -#if HAVE_INTTYPES_H -# include -#endif -#if HAVE_UNISTD_H -# include -#endif" -ac_subdirs_all="$ac_subdirs_all demos samples utils contrib" + + + + + + + + + + + + + + + + + + + + + + + + + + +# Configure paths for GTK+ +# Owen Taylor 97-11-3 + + + + + + +# Guess values for system-dependent variables and create Makefiles. +# Generated automatically using autoconf version 2.13 +# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc. +# +# This configure script is free software; the Free Software Foundation +# gives unlimited permission to copy, distribute and modify it. + +# Defaults: +ac_help= +ac_default_prefix=/usr/local +# Any additions from configure.in: +ac_help="$ac_help + --enable-gui use GUI classes" +ac_help="$ac_help + --enable-universal use wxWindows GUI controls instead of native ones" +ac_help="$ac_help + --with-gtk use GTK+" +ac_help="$ac_help + --with-motif use Motif/Lesstif" +ac_help="$ac_help + --with-mac use Mac OS X" +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-pm use OS/2 Presentation Manager" +ac_help="$ac_help + --with-mgl use SciTech MGL" +ac_help="$ac_help + --enable-gtk2 use GTK+ 2.0 if available (EXPERIMENTAL)" +ac_help="$ac_help + --with-libpng use libpng (PNG image format)" +ac_help="$ac_help + --with-libjpeg use libjpeg (JPEG file format)" +ac_help="$ac_help + --with-libtiff use libtiff (TIFF file format)" +ac_help="$ac_help + --with-freetype use freetype (font rasterizer)" +ac_help="$ac_help + --with-opengl use OpenGL (or Mesa)" +ac_help="$ac_help + --with-dmalloc use dmalloc library (www.letters.com/dmalloc)" +ac_help="$ac_help + --with-regex enable support for wxRegEx class" +ac_help="$ac_help + --with-zlib use zlib for LZW compression" +ac_help="$ac_help + --with-odbc use the IODBC and wxODBC classes" +ac_help="$ac_help + --enable-shared create shared library code" +ac_help="$ac_help + --enable-soname set the DT_SONAME field in ELF shared libraries" +ac_help="$ac_help + --enable-optimise create optimised code" +ac_help="$ac_help + --enable-debug same as debug_flag and debug_info" +ac_help="$ac_help + --enable-precomp enable use of precompiled headers (Mac OS X)" +ac_help="$ac_help + --enable-debug_flag set __WXDEBUG__ flag (recommended for developers!)" +ac_help="$ac_help + --enable-debug_info create code with debugging information" +ac_help="$ac_help + --enable-debug_gdb create code with extra GDB debugging information" +ac_help="$ac_help + --enable-debug_cntxt use wxDebugContext" +ac_help="$ac_help + --enable-mem_tracing create code with memory tracing" +ac_help="$ac_help + --enable-profile create code with profiling information" +ac_help="$ac_help + --enable-no_rtti create code without RTTI information" +ac_help="$ac_help + --enable-no_exceptions create code without C++ exceptions handling" +ac_help="$ac_help + --enable-permissive compile code disregarding strict ANSI" +ac_help="$ac_help + --enable-no_deps create code without dependency information" +ac_help="$ac_help + --enable-compat20 enable wxWindows 2.0 compatibility" +ac_help="$ac_help + --enable-compat22 enable wxWindows 2.2 compatibility" +ac_help="$ac_help + --enable-intl use internationalization system" +ac_help="$ac_help + --enable-config use wxConfig (and derived) classes" +ac_help="$ac_help + --enable-sockets use socket/network classes" +ac_help="$ac_help + --enable-ipc use interprocess communication (wxSocket etc.)" +ac_help="$ac_help + --enable-cmdline use wxCmdLineParser class" +ac_help="$ac_help + --enable-datetime use wxDateTime class" +ac_help="$ac_help + --enable-timedate use obsolete wxDate/wxTime classes" +ac_help="$ac_help + --enable-stopwatch use wxStopWatch class" +ac_help="$ac_help + --enable-dialupman use dialup network classes" +ac_help="$ac_help + --enable-apple_ieee use the Apple IEEE codec" +ac_help="$ac_help + --enable-timer use wxTimer class" +ac_help="$ac_help + --enable-wave use wxWave class" +ac_help="$ac_help + --enable-fraction use wxFraction class" +ac_help="$ac_help + --enable-dynlib use wxLibrary class for DLL loading" +ac_help="$ac_help + --enable-longlong use wxLongLong class" +ac_help="$ac_help + --enable-geometry use geometry class" +ac_help="$ac_help + --enable-log use logging system" +ac_help="$ac_help + --enable-streams use wxStream etc classes" +ac_help="$ac_help + --enable-file use wxFile classes" +ac_help="$ac_help + --enable-ffile use wxFFile classes" +ac_help="$ac_help + --enable-textfile use wxTextFile classes" +ac_help="$ac_help + --enable-fontmap use font encodings conversion classes" +ac_help="$ac_help + --enable-unicode compile wxString with Unicode support" +ac_help="$ac_help + --enable-wxprintfv use wxWindows implementation of vprintf()" +ac_help="$ac_help + --enable-std_iostreams use standard C++ stream classes" +ac_help="$ac_help + --enable-filesystem use virtual file systems classes" +ac_help="$ac_help + --enable-fs_inet use virtual HTTP/FTP filesystems" +ac_help="$ac_help + --enable-fs_zip use virtual ZIP filesystems" +ac_help="$ac_help + --enable-zipstream use wxZipInputStream" +ac_help="$ac_help + --enable-catch_segvs catch signals and pass them to wxApp::OnFatalException" +ac_help="$ac_help + --enable-snglinst use wxSingleInstanceChecker class" +ac_help="$ac_help + --enable-mimetypes use wxMimeTypesManager" +ac_help="$ac_help + --enable-sysoptions use wxSystemOptions" +ac_help="$ac_help + --enable-threads use threads" +ac_help="$ac_help + --enable-serial use class serialization" +ac_help="$ac_help + --enable-docview use document view architecture" +ac_help="$ac_help + --enable-help use help subsystem" +ac_help="$ac_help + --enable-mshtmlhelp use MS HTML Help (win32)" +ac_help="$ac_help + --enable-html use wxHTML sub-library" +ac_help="$ac_help + --enable-htmlhelp use wxHTML-based help" +ac_help="$ac_help + --enable-constraints use layout-constraints system" +ac_help="$ac_help + --enable-printarch use printing architecture" +ac_help="$ac_help + --enable-mdi use multiple document interface architecture" +ac_help="$ac_help + --enable-loggui use standard GUI logger" +ac_help="$ac_help + --enable-logwin use wxLogWindow" +ac_help="$ac_help + --enable-postscript use wxPostscriptDC device context (default for gtk+)" +ac_help="$ac_help + --enable-prologio use Prolog IO library" +ac_help="$ac_help + --enable-resources use wxWindows resources" +ac_help="$ac_help + --enable-xresources use X resources for save (default for gtk+)" +ac_help="$ac_help + --enable-clipboard use wxClipboard classes" +ac_help="$ac_help + --enable-dnd use Drag'n'Drop classes" +ac_help="$ac_help + --enable-metafile use win32 metafiles" +ac_help="$ac_help + --enable-treelayout use wxTreeLayout classes" +ac_help="$ac_help + --enable-controls use all usual controls" +ac_help="$ac_help + --enable-accel use accelerators" +ac_help="$ac_help + --enable-button use wxButton class" +ac_help="$ac_help + --enable-bmpbutton use wxBitmapButton class" +ac_help="$ac_help + --enable-calendar use wxCalendarCtrl class" +ac_help="$ac_help + --enable-caret use wxCaret class" +ac_help="$ac_help + --enable-checkbox use wxCheckBox class" +ac_help="$ac_help + --enable-checklst use wxCheckListBox (listbox with checkboxes) class" +ac_help="$ac_help + --enable-choice use wxChoice class" +ac_help="$ac_help + --enable-combobox use wxComboBox classes" +ac_help="$ac_help + --enable-gauge use wxGauge class" +ac_help="$ac_help + --enable-grid use wxGrid class" +ac_help="$ac_help + --enable-newgrid use new wxGrid class" +ac_help="$ac_help + --enable-imaglist use wxImageList class" +ac_help="$ac_help + --enable-listbox use wxListBox class" +ac_help="$ac_help + --enable-listctrl use wxListCtrl class" +ac_help="$ac_help + --enable-notebook use wxNotebook class" +ac_help="$ac_help + --enable-propsheet use wxPropertySheet class" +ac_help="$ac_help + --enable-radiobox use wxRadioBox class" +ac_help="$ac_help + --enable-radiobtn use wxRadioButton class" +ac_help="$ac_help + --enable-sash use wxSashWindow class" +ac_help="$ac_help + --enable-scrollbar use wxScrollBar class and scrollable windows" +ac_help="$ac_help + --enable-slider use wxSlider class" +ac_help="$ac_help + --enable-spinbtn use wxSpinButton class" +ac_help="$ac_help + --enable-spinctrl use wxSpinCtrl class" +ac_help="$ac_help + --enable-splitter use wxSplitterWindow class" +ac_help="$ac_help + --enable-statbmp use wxStaticBitmap class" +ac_help="$ac_help + --enable-statbox use wxStaticBox class" +ac_help="$ac_help + --enable-statline use wxStaticLine class" +ac_help="$ac_help + --enable-stattext use wxStaticText class" +ac_help="$ac_help + --enable-statusbar use wxStatusBar class" +ac_help="$ac_help + --enable-tabdialog use wxTabControl class" +ac_help="$ac_help + --enable-textctrl use wxTextCtrl class" +ac_help="$ac_help + --enable-togglebtn use wxToggleButton class" +ac_help="$ac_help + --enable-toolbar use wxToolBar class" +ac_help="$ac_help + --enable-tbarnative use native wxToolBar class" +ac_help="$ac_help + --enable-tbarsmpl use wxToolBarSimple class" +ac_help="$ac_help + --enable-treectrl use wxTreeCtrl class" +ac_help="$ac_help + --enable-popupwin use wxPopUpWindow class" +ac_help="$ac_help + --enable-commondlg use all common dialogs" +ac_help="$ac_help + --enable-choicedlg use wxChoiceDialog" +ac_help="$ac_help + --enable-coldlg use wxColourDialog" +ac_help="$ac_help + --enable-filedlg use wxFileDialog" +ac_help="$ac_help + --enable-finddlg use wxFindReplaceDialog" +ac_help="$ac_help + --enable-fontdlg use wxFontDialog" +ac_help="$ac_help + --enable-dirdlg use wxDirDialog" +ac_help="$ac_help + --enable-msgdlg use wxMessageDialog" +ac_help="$ac_help + --enable-numberdlg use wxNumberEntryDialog" +ac_help="$ac_help + --enable-splash use wxSplashScreen" +ac_help="$ac_help + --enable-textdlg use wxTextDialog" +ac_help="$ac_help + --enable-tipdlg use startup tips" +ac_help="$ac_help + --enable-progressdlg use wxProgressDialog" +ac_help="$ac_help + --enable-wizarddlg use wxWizard" +ac_help="$ac_help + --enable-menus use wxMenu/wxMenuBar/wxMenuItem classes" +ac_help="$ac_help + --enable-miniframe use wxMiniFrame class" +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 + --enable-joystick use wxJoystick (Linux only)" +ac_help="$ac_help + --enable-metafiles use wxMetaFile (Windows only)" +ac_help="$ac_help + --enable-dragimage use wxDragImage" +ac_help="$ac_help + --enable-palette use wxPalette class" +ac_help="$ac_help + --enable-image use wxImage class" +ac_help="$ac_help + --enable-gif use gif images (GIF file format)" +ac_help="$ac_help + --enable-pcx use pcx images (PCX file format)" +ac_help="$ac_help + --enable-pnm use pnm images (PNM file format)" +ac_help="$ac_help + --enable-xpm use xpm images (XPM file format)" +ac_help="$ac_help + --with-gtk-prefix=PFX Prefix where GTK is installed (optional)" +ac_help="$ac_help + --with-gtk-exec-prefix=PFX Exec prefix where GTK is installed (optional)" +ac_help="$ac_help + --disable-gtktest Do not try to compile and run a test GTK program" +ac_help="$ac_help + --with-x use the X Window System" # Initialize some variables set by options. -ac_init_help= -ac_init_version=false # The variables have the same names as the options, with # dashes changed to underlines. -cache_file=/dev/null +build=NONE +cache_file=./config.cache exec_prefix=NONE +host=NONE no_create= +nonopt=NONE no_recursion= prefix=NONE program_prefix=NONE @@ -151,15 +397,10 @@ program_transform_name=s,x,x, silent= site= srcdir= +target=NONE verbose= x_includes=NONE x_libraries=NONE - -# Installation directory options. -# These are left unexpanded so users can "make install exec_prefix=/foo" -# and all the variables that are supposed to be based on exec_prefix -# by default will actually change. -# Use braces instead of parens because sh, perl, etc. also accept them. bindir='${exec_prefix}/bin' sbindir='${exec_prefix}/sbin' libexecdir='${exec_prefix}/libexec' @@ -173,16 +414,17 @@ oldincludedir='/usr/include' infodir='${prefix}/info' mandir='${prefix}/man' -# Identity of this package. -PACKAGE_NAME= -PACKAGE_TARNAME= -PACKAGE_VERSION= -PACKAGE_STRING= -PACKAGE_BUGREPORT= +# Initialize some other variables. +subdirs= +MFLAGS= MAKEFLAGS= +SHELL=${CONFIG_SHELL-/bin/sh} +# Maximum number of lines to put in a shell here document. +ac_max_here_lines=12 ac_prev= for ac_option do + # If the previous option needs an argument, assign it. if test -n "$ac_prev"; then eval "$ac_prev=\$ac_option" @@ -190,59 +432,59 @@ do continue fi - ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'` + case "$ac_option" in + -*=*) ac_optarg=`echo "$ac_option" | sed 's/[-_a-zA-Z0-9]*=//'` ;; + *) ac_optarg= ;; + esac # Accept the important Cygnus configure options, so we can diagnose typos. - case $ac_option in + case "$ac_option" in -bindir | --bindir | --bindi | --bind | --bin | --bi) ac_prev=bindir ;; -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*) - bindir=$ac_optarg ;; + bindir="$ac_optarg" ;; -build | --build | --buil | --bui | --bu) - ac_prev=build_alias ;; + ac_prev=build ;; -build=* | --build=* | --buil=* | --bui=* | --bu=*) - build_alias=$ac_optarg ;; + build="$ac_optarg" ;; -cache-file | --cache-file | --cache-fil | --cache-fi \ | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c) ac_prev=cache_file ;; -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \ | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*) - cache_file=$ac_optarg ;; - - --config-cache | -C) - cache_file=config.cache ;; + cache_file="$ac_optarg" ;; -datadir | --datadir | --datadi | --datad | --data | --dat | --da) ac_prev=datadir ;; -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \ | --da=*) - datadir=$ac_optarg ;; + datadir="$ac_optarg" ;; -disable-* | --disable-*) - ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'` + ac_feature=`echo $ac_option|sed -e 's/-*disable-//'` # Reject names that are not valid shell variable names. - expr "x$ac_feature" : ".*[^-_$ac_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid feature name: $ac_feature" >&2 - { (exit 1); exit 1; }; } - ac_feature=`echo $ac_feature | sed 's/-/_/g'` - eval "enable_$ac_feature=no" ;; + if test -n "`echo $ac_feature| sed 's/[-a-zA-Z0-9_]//g'`"; then + { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; } + fi + ac_feature=`echo $ac_feature| sed 's/-/_/g'` + eval "enable_${ac_feature}=no" ;; -enable-* | --enable-*) - ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` + ac_feature=`echo $ac_option|sed -e 's/-*enable-//' -e 's/=.*//'` # Reject names that are not valid shell variable names. - expr "x$ac_feature" : ".*[^-_$ac_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid feature name: $ac_feature" >&2 - { (exit 1); exit 1; }; } - ac_feature=`echo $ac_feature | sed 's/-/_/g'` - case $ac_option in - *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;; + if test -n "`echo $ac_feature| sed 's/[-_a-zA-Z0-9]//g'`"; then + { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; } + fi + ac_feature=`echo $ac_feature| sed 's/-/_/g'` + case "$ac_option" in + *=*) ;; *) ac_optarg=yes ;; esac - eval "enable_$ac_feature='$ac_optarg'" ;; + eval "enable_${ac_feature}='$ac_optarg'" ;; -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \ @@ -251,47 +493,95 @@ do -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \ | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \ | --exec=* | --exe=* | --ex=*) - exec_prefix=$ac_optarg ;; + exec_prefix="$ac_optarg" ;; -gas | --gas | --ga | --g) # Obsolete; use --with-gas. with_gas=yes ;; - -help | --help | --hel | --he | -h) - ac_init_help=long ;; - -help=r* | --help=r* | --hel=r* | --he=r* | -hr*) - ac_init_help=recursive ;; - -help=s* | --help=s* | --hel=s* | --he=s* | -hs*) - ac_init_help=short ;; + -help | --help | --hel | --he) + # Omit some internal or obsolete options to make the list less imposing. + # This message is too long to be a string in the A/UX 3.1 sh. + cat << EOF +Usage: configure [options] [host] +Options: [defaults in brackets after descriptions] +Configuration: + --cache-file=FILE cache test results in FILE + --help print this message + --no-create do not create output files + --quiet, --silent do not print \`checking...' messages + --version print the version of autoconf that created configure +Directory and file names: + --prefix=PREFIX install architecture-independent files in PREFIX + [$ac_default_prefix] + --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX + [same as prefix] + --bindir=DIR user executables in DIR [EPREFIX/bin] + --sbindir=DIR system admin executables in DIR [EPREFIX/sbin] + --libexecdir=DIR program executables in DIR [EPREFIX/libexec] + --datadir=DIR read-only architecture-independent data in DIR + [PREFIX/share] + --sysconfdir=DIR read-only single-machine data in DIR [PREFIX/etc] + --sharedstatedir=DIR modifiable architecture-independent data in DIR + [PREFIX/com] + --localstatedir=DIR modifiable single-machine data in DIR [PREFIX/var] + --libdir=DIR object code libraries in DIR [EPREFIX/lib] + --includedir=DIR C header files in DIR [PREFIX/include] + --oldincludedir=DIR C header files for non-gcc in DIR [/usr/include] + --infodir=DIR info documentation in DIR [PREFIX/info] + --mandir=DIR man documentation in DIR [PREFIX/man] + --srcdir=DIR find the sources in DIR [configure dir or ..] + --program-prefix=PREFIX prepend PREFIX to installed program names + --program-suffix=SUFFIX append SUFFIX to installed program names + --program-transform-name=PROGRAM + run sed PROGRAM on installed program names +EOF + cat << EOF +Host type: + --build=BUILD configure for building on BUILD [BUILD=HOST] + --host=HOST configure for HOST [guessed] + --target=TARGET configure for TARGET [TARGET=HOST] +Features and packages: + --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) + --enable-FEATURE[=ARG] include FEATURE [ARG=yes] + --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] + --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) + --x-includes=DIR X include files are in DIR + --x-libraries=DIR X library files are in DIR +EOF + if test -n "$ac_help"; then + echo "--enable and --with options recognized:$ac_help" + fi + exit 0 ;; -host | --host | --hos | --ho) - ac_prev=host_alias ;; + ac_prev=host ;; -host=* | --host=* | --hos=* | --ho=*) - host_alias=$ac_optarg ;; + host="$ac_optarg" ;; -includedir | --includedir | --includedi | --included | --include \ | --includ | --inclu | --incl | --inc) ac_prev=includedir ;; -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \ | --includ=* | --inclu=* | --incl=* | --inc=*) - includedir=$ac_optarg ;; + includedir="$ac_optarg" ;; -infodir | --infodir | --infodi | --infod | --info | --inf) ac_prev=infodir ;; -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*) - infodir=$ac_optarg ;; + infodir="$ac_optarg" ;; -libdir | --libdir | --libdi | --libd) ac_prev=libdir ;; -libdir=* | --libdir=* | --libdi=* | --libd=*) - libdir=$ac_optarg ;; + libdir="$ac_optarg" ;; -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \ | --libexe | --libex | --libe) ac_prev=libexecdir ;; -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \ | --libexe=* | --libex=* | --libe=*) - libexecdir=$ac_optarg ;; + libexecdir="$ac_optarg" ;; -localstatedir | --localstatedir | --localstatedi | --localstated \ | --localstate | --localstat | --localsta | --localst \ @@ -300,12 +590,12 @@ do -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \ | --localstate=* | --localstat=* | --localsta=* | --localst=* \ | --locals=* | --local=* | --loca=* | --loc=* | --lo=*) - localstatedir=$ac_optarg ;; + localstatedir="$ac_optarg" ;; -mandir | --mandir | --mandi | --mand | --man | --ma | --m) ac_prev=mandir ;; -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*) - mandir=$ac_optarg ;; + mandir="$ac_optarg" ;; -nfp | --nfp | --nf) # Obsolete; use --without-fp. @@ -326,26 +616,26 @@ do -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \ | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \ | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*) - oldincludedir=$ac_optarg ;; + oldincludedir="$ac_optarg" ;; -prefix | --prefix | --prefi | --pref | --pre | --pr | --p) ac_prev=prefix ;; -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*) - prefix=$ac_optarg ;; + prefix="$ac_optarg" ;; -program-prefix | --program-prefix | --program-prefi | --program-pref \ | --program-pre | --program-pr | --program-p) ac_prev=program_prefix ;; -program-prefix=* | --program-prefix=* | --program-prefi=* \ | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*) - program_prefix=$ac_optarg ;; + program_prefix="$ac_optarg" ;; -program-suffix | --program-suffix | --program-suffi | --program-suff \ | --program-suf | --program-su | --program-s) ac_prev=program_suffix ;; -program-suffix=* | --program-suffix=* | --program-suffi=* \ | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*) - program_suffix=$ac_optarg ;; + program_suffix="$ac_optarg" ;; -program-transform-name | --program-transform-name \ | --program-transform-nam | --program-transform-na \ @@ -362,7 +652,7 @@ do | --program-transfo=* | --program-transf=* \ | --program-trans=* | --program-tran=* \ | --progr-tra=* | --program-tr=* | --program-t=*) - program_transform_name=$ac_optarg ;; + program_transform_name="$ac_optarg" ;; -q | -quiet | --quiet | --quie | --qui | --qu | --q \ | -silent | --silent | --silen | --sile | --sil) @@ -372,7 +662,7 @@ do ac_prev=sbindir ;; -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ | --sbi=* | --sb=*) - sbindir=$ac_optarg ;; + sbindir="$ac_optarg" ;; -sharedstatedir | --sharedstatedir | --sharedstatedi \ | --sharedstated | --sharedstate | --sharedstat | --sharedsta \ @@ -383,57 +673,58 @@ do | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \ | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \ | --sha=* | --sh=*) - sharedstatedir=$ac_optarg ;; + sharedstatedir="$ac_optarg" ;; -site | --site | --sit) ac_prev=site ;; -site=* | --site=* | --sit=*) - site=$ac_optarg ;; + site="$ac_optarg" ;; -srcdir | --srcdir | --srcdi | --srcd | --src | --sr) ac_prev=srcdir ;; -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*) - srcdir=$ac_optarg ;; + srcdir="$ac_optarg" ;; -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \ | --syscon | --sysco | --sysc | --sys | --sy) ac_prev=sysconfdir ;; -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \ | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*) - sysconfdir=$ac_optarg ;; + sysconfdir="$ac_optarg" ;; -target | --target | --targe | --targ | --tar | --ta | --t) - ac_prev=target_alias ;; + ac_prev=target ;; -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*) - target_alias=$ac_optarg ;; + target="$ac_optarg" ;; -v | -verbose | --verbose | --verbos | --verbo | --verb) verbose=yes ;; - -version | --version | --versio | --versi | --vers | -V) - ac_init_version=: ;; + -version | --version | --versio | --versi | --vers) + echo "configure generated by autoconf version 2.13" + exit 0 ;; -with-* | --with-*) - ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` + ac_package=`echo $ac_option|sed -e 's/-*with-//' -e 's/=.*//'` # Reject names that are not valid shell variable names. - expr "x$ac_package" : ".*[^-_$ac_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid package name: $ac_package" >&2 - { (exit 1); exit 1; }; } + if test -n "`echo $ac_package| sed 's/[-_a-zA-Z0-9]//g'`"; then + { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; } + fi ac_package=`echo $ac_package| sed 's/-/_/g'` - case $ac_option in - *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;; + case "$ac_option" in + *=*) ;; *) ac_optarg=yes ;; esac - eval "with_$ac_package='$ac_optarg'" ;; + eval "with_${ac_package}='$ac_optarg'" ;; -without-* | --without-*) - ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'` + ac_package=`echo $ac_option|sed -e 's/-*without-//'` # Reject names that are not valid shell variable names. - expr "x$ac_package" : ".*[^-_$ac_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid package name: $ac_package" >&2 - { (exit 1); exit 1; }; } - ac_package=`echo $ac_package | sed 's/-/_/g'` - eval "with_$ac_package=no" ;; + if test -n "`echo $ac_package| sed 's/[-a-zA-Z0-9_]//g'`"; then + { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; } + fi + ac_package=`echo $ac_package| sed 's/-/_/g'` + eval "with_${ac_package}=no" ;; --x) # Obsolete; use --with-x. @@ -444,89 +735,98 @@ do ac_prev=x_includes ;; -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \ | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*) - x_includes=$ac_optarg ;; + x_includes="$ac_optarg" ;; -x-libraries | --x-libraries | --x-librarie | --x-librari \ | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l) ac_prev=x_libraries ;; -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \ | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) - x_libraries=$ac_optarg ;; + x_libraries="$ac_optarg" ;; - -*) { echo "$as_me: error: unrecognized option: $ac_option -Try \`$0 --help' for more information." >&2 - { (exit 1); exit 1; }; } + -*) { echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; exit 1; } ;; - *=*) - ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='` - # Reject names that are not valid shell variable names. - expr "x$ac_envvar" : ".*[^_$ac_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid variable name: $ac_envvar" >&2 - { (exit 1); exit 1; }; } - ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` - eval "$ac_envvar='$ac_optarg'" - export $ac_envvar ;; - *) - # FIXME: should be removed in autoconf 3.0. - echo "$as_me: WARNING: you should use --build, --host, --target" >&2 - expr "x$ac_option" : ".*[^-._$ac_cr_alnum]" >/dev/null && - echo "$as_me: WARNING: invalid host type: $ac_option" >&2 - : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option} + if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then + echo "configure: warning: $ac_option: invalid host type" 1>&2 + fi + if test "x$nonopt" != xNONE; then + { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } + fi + nonopt="$ac_option" ;; esac done if test -n "$ac_prev"; then - ac_option=--`echo $ac_prev | sed 's/_/-/g'` - { echo "$as_me: error: missing argument to $ac_option" >&2 - { (exit 1); exit 1; }; } + { echo "configure: error: missing argument to --`echo $ac_prev | sed 's/_/-/g'`" 1>&2; exit 1; } +fi + +trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15 + +# File descriptor usage: +# 0 standard input +# 1 file creation +# 2 errors and warnings +# 3 some systems may open it to /dev/tty +# 4 used on the Kubota Titan +# 6 checking for... messages and results +# 5 compiler messages saved in config.log +if test "$silent" = yes; then + exec 6>/dev/null +else + exec 6>&1 fi +exec 5>./config.log + +echo "\ +This file contains any messages produced by compilers while +running configure, to aid debugging if configure makes a mistake. +" 1>&5 -# Be sure to have absolute paths. -for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \ - localstatedir libdir includedir oldincludedir infodir mandir \ - exec_prefix prefix +# Strip out --no-create and --no-recursion so they do not pile up. +# Also quote any args containing shell metacharacters. +ac_configure_args= +for ac_arg do - eval ac_val=$`echo $ac_var` - case $ac_val in - [\\/$]* | ?:[\\/]* ) ;; - NONE ) ;; - *) { echo "$as_me: error: expected an absolute path for --$ac_var: $ac_val" >&2 - { (exit 1); exit 1; }; };; + case "$ac_arg" in + -no-create | --no-create | --no-creat | --no-crea | --no-cre \ + | --no-cr | --no-c) ;; + -no-recursion | --no-recursion | --no-recursio | --no-recursi \ + | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;; + *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?]*) + ac_configure_args="$ac_configure_args '$ac_arg'" ;; + *) ac_configure_args="$ac_configure_args $ac_arg" ;; esac done -# There might be people who depend on the old broken behavior: `$host' -# used to hold the argument of --host etc. -build=$build_alias -host=$host_alias -target=$target_alias - -# FIXME: should be removed in autoconf 3.0. -if test "x$host_alias" != x; then - if test "x$build_alias" = x; then - cross_compiling=maybe - echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. - If a cross compiler is detected then cross compile mode will be used." >&2 - elif test "x$build_alias" != "x$host_alias"; then - cross_compiling=yes - fi -fi +# NLS nuisances. +# Only set these to C if already set. These must not be set unconditionally +# because not all systems understand e.g. LANG=C (notably SCO). +# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'! +# Non-C LC_CTYPE values break the ctype check. +if test "${LANG+set}" = set; then LANG=C; export LANG; fi +if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi +if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi +if test "${LC_CTYPE+set}" = set; then LC_CTYPE=C; export LC_CTYPE; fi -ac_tool_prefix= -test -n "$host_alias" && ac_tool_prefix=$host_alias- +# confdefs.h avoids OS command line length limits that DEFS can exceed. +rm -rf conftest* confdefs.h +# AIX cpp loses on an empty file, so make sure it contains at least a newline. +echo > confdefs.h -test "$silent" = yes && exec 6>/dev/null +# A filename unique to this package, relative to the directory that +# configure is in, which we can look for to find out if srcdir is correct. +ac_unique_file=wx-config.in # Find the source files, if location was not specified. if test -z "$srcdir"; then ac_srcdir_defaulted=yes # Try the directory containing this script, then its parent. ac_prog=$0 - ac_confdir=`echo "$ac_prog" | sed 's%[\\/][^\\/][^\\/]*$%%'` + ac_confdir=`echo $ac_prog|sed 's%/[^/][^/]*$%%'` test "x$ac_confdir" = "x$ac_prog" && ac_confdir=. srcdir=$ac_confdir if test ! -r $srcdir/$ac_unique_file; then @@ -537,454 +837,13 @@ else fi if test ! -r $srcdir/$ac_unique_file; then if test "$ac_srcdir_defaulted" = yes; then - { echo "$as_me: error: cannot find sources in $ac_confdir or .." >&2 - { (exit 1); exit 1; }; } + { echo "configure: error: can not find sources in $ac_confdir or .." 1>&2; exit 1; } else - { echo "$as_me: error: cannot find sources in $srcdir" >&2 - { (exit 1); exit 1; }; } + { echo "configure: error: can not find sources in $srcdir" 1>&2; exit 1; } fi fi -srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'` -ac_env_build_alias_set=${build_alias+set} -ac_env_build_alias_value=$build_alias -ac_cv_env_build_alias_set=${build_alias+set} -ac_cv_env_build_alias_value=$build_alias -ac_env_host_alias_set=${host_alias+set} -ac_env_host_alias_value=$host_alias -ac_cv_env_host_alias_set=${host_alias+set} -ac_cv_env_host_alias_value=$host_alias -ac_env_target_alias_set=${target_alias+set} -ac_env_target_alias_value=$target_alias -ac_cv_env_target_alias_set=${target_alias+set} -ac_cv_env_target_alias_value=$target_alias -ac_env_CC_set=${CC+set} -ac_env_CC_value=$CC -ac_cv_env_CC_set=${CC+set} -ac_cv_env_CC_value=$CC -ac_env_CFLAGS_set=${CFLAGS+set} -ac_env_CFLAGS_value=$CFLAGS -ac_cv_env_CFLAGS_set=${CFLAGS+set} -ac_cv_env_CFLAGS_value=$CFLAGS -ac_env_LDFLAGS_set=${LDFLAGS+set} -ac_env_LDFLAGS_value=$LDFLAGS -ac_cv_env_LDFLAGS_set=${LDFLAGS+set} -ac_cv_env_LDFLAGS_value=$LDFLAGS -ac_env_CPPFLAGS_set=${CPPFLAGS+set} -ac_env_CPPFLAGS_value=$CPPFLAGS -ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set} -ac_cv_env_CPPFLAGS_value=$CPPFLAGS -ac_env_CPP_set=${CPP+set} -ac_env_CPP_value=$CPP -ac_cv_env_CPP_set=${CPP+set} -ac_cv_env_CPP_value=$CPP -ac_env_CXX_set=${CXX+set} -ac_env_CXX_value=$CXX -ac_cv_env_CXX_set=${CXX+set} -ac_cv_env_CXX_value=$CXX -ac_env_CXXFLAGS_set=${CXXFLAGS+set} -ac_env_CXXFLAGS_value=$CXXFLAGS -ac_cv_env_CXXFLAGS_set=${CXXFLAGS+set} -ac_cv_env_CXXFLAGS_value=$CXXFLAGS -ac_env_CXXCPP_set=${CXXCPP+set} -ac_env_CXXCPP_value=$CXXCPP -ac_cv_env_CXXCPP_set=${CXXCPP+set} -ac_cv_env_CXXCPP_value=$CXXCPP - -# -# Report the --help message. -# -if test "$ac_init_help" = "long"; then - # Omit some internal or obsolete options to make the list less imposing. - # This message is too long to be a string in the A/UX 3.1 sh. - cat < if you have libraries in a - nonstandard directory - CPPFLAGS C/C++ preprocessor flags, e.g. -I if you have - headers in a nonstandard directory - CPP C preprocessor - CXX C++ compiler command - CXXFLAGS C++ compiler flags - CXXCPP C++ preprocessor - -Use these variables to override the choices made by `configure' or to help -it to find libraries and programs with nonstandard names/locations. - -EOF -fi - -if test "$ac_init_help" = "recursive"; then - # If there are subdirs, report their specific --help. - ac_popdir=`pwd` - for ac_subdir in : $ac_subdirs_all; do test "x$ac_subdir" = x: && continue - cd $ac_subdir - # A "../" for each directory in /$ac_subdir. - ac_dots=`echo $ac_subdir | - sed 's,^\./,,;s,[^/]$,&/,;s,[^/]*/,../,g'` - - case $srcdir in - .) # No --srcdir option. We are building in place. - ac_sub_srcdir=$srcdir ;; - [\\/]* | ?:[\\/]* ) # Absolute path. - ac_sub_srcdir=$srcdir/$ac_subdir ;; - *) # Relative path. - ac_sub_srcdir=$ac_dots$srcdir/$ac_subdir ;; - esac - - # Check for guested configure; otherwise get Cygnus style configure. - if test -f $ac_sub_srcdir/configure.gnu; then - echo - $SHELL $ac_sub_srcdir/configure.gnu --help=recursive - elif test -f $ac_sub_srcdir/configure; then - echo - $SHELL $ac_sub_srcdir/configure --help=recursive - elif test -f $ac_sub_srcdir/configure.ac || - test -f $ac_sub_srcdir/configure.in; then - echo - $ac_configure --help - else - echo "$as_me: WARNING: no configuration information is in $ac_subdir" >&2 - fi - cd $ac_popdir - done -fi - -test -n "$ac_init_help" && exit 0 -if $ac_init_version; then - cat <<\EOF - -Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 -Free Software Foundation, Inc. -This configure script is free software; the Free Software Foundation -gives unlimited permission to copy, distribute and modify it. -EOF - exit 0 -fi -exec 5>config.log -cat >&5 </dev/null | sed 1q` -uname -m = `(uname -m) 2>/dev/null || echo unknown` -uname -r = `(uname -r) 2>/dev/null || echo unknown` -uname -s = `(uname -s) 2>/dev/null || echo unknown` -uname -v = `(uname -v) 2>/dev/null || echo unknown` - -/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown` -/bin/uname -X = `(/bin/uname -X) 2>/dev/null || echo unknown` - -/bin/arch = `(/bin/arch) 2>/dev/null || echo unknown` -/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown` -/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown` -hostinfo = `(hostinfo) 2>/dev/null || echo unknown` -/bin/machine = `(/bin/machine) 2>/dev/null || echo unknown` -/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown` -/bin/universe = `(/bin/universe) 2>/dev/null || echo unknown` - -PATH = $PATH - -_ASUNAME -} >&5 - -cat >&5 <\?\"\']*) - ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` - ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'" - ac_sep=" " ;; - *) ac_configure_args="$ac_configure_args$ac_sep$ac_arg" - ac_sep=" " ;; - esac - # Get rid of the leading space. -done - -# When interrupted or exit'd, cleanup temporary files, and complete -# config.log. We remove comments because anyway the quotes in there -# would cause problems or look ugly. -trap 'exit_status=$? - # Save into config.log some information that might help in debugging. - echo >&5 - echo "## ----------------- ##" >&5 - echo "## Cache variables. ##" >&5 - echo "## ----------------- ##" >&5 - echo >&5 - # The following way of writing the cache mishandles newlines in values, -{ - (set) 2>&1 | - case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in - *ac_space=\ *) - sed -n \ - "s/'"'"'/'"'"'\\\\'"'"''"'"'/g; - s/^\\([_$ac_cr_alnum]*_cv_[_$ac_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p" - ;; - *) - sed -n \ - "s/^\\([_$ac_cr_alnum]*_cv_[_$ac_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" - ;; - esac; -} >&5 - sed "/^$/d" confdefs.h >conftest.log - if test -s conftest.log; then - echo >&5 - echo "## ------------ ##" >&5 - echo "## confdefs.h. ##" >&5 - echo "## ------------ ##" >&5 - echo >&5 - cat conftest.log >&5 - fi - (echo; echo) >&5 - test "$ac_signal" != 0 && - echo "$as_me: caught signal $ac_signal" >&5 - echo "$as_me: exit $exit_status" >&5 - rm -rf conftest* confdefs* core core.* *.core conf$$* $ac_clean_files && - exit $exit_status - ' 0 -for ac_signal in 1 2 13 15; do - trap 'ac_status=$?; ac_signal='$ac_signal'; { (exit $ac_status); exit $ac_status; }' $ac_signal -done -ac_signal=0 +srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'` -# confdefs.h avoids OS command line length limits that DEFS can exceed. -rm -rf conftest* confdefs.h -# AIX cpp loses on an empty file, so make sure it contains at least a newline. -echo >confdefs.h - -# Let the site file select an alternate cache file if it wants to. # Prefer explicitly selected file to automatically selected ones. if test -z "$CONFIG_SITE"; then if test "x$prefix" != xNONE; then @@ -995,94 +854,41 @@ if test -z "$CONFIG_SITE"; then fi for ac_site_file in $CONFIG_SITE; do if test -r "$ac_site_file"; then - { echo "$as_me:998: loading site script $ac_site_file" >&5 -echo "$as_me: loading site script $ac_site_file" >&6;} - cat "$ac_site_file" >&5 + echo "loading site script $ac_site_file" . "$ac_site_file" fi done if test -r "$cache_file"; then - # Some versions of bash will fail to source /dev/null (special - # files actually), so we avoid doing that. - if test -f "$cache_file"; then - { echo "$as_me:1009: loading cache $cache_file" >&5 -echo "$as_me: loading cache $cache_file" >&6;} - case $cache_file in - [\\/]* | ?:[\\/]* ) . $cache_file;; - *) . ./$cache_file;; - esac - fi + echo "loading cache $cache_file" + . $cache_file else - { echo "$as_me:1017: creating cache $cache_file" >&5 -echo "$as_me: creating cache $cache_file" >&6;} - >$cache_file -fi - -# Check that the precious variables saved in the cache have kept the same -# value. -ac_suggest_removing_cache=false -for ac_var in `(set) 2>&1 | - sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do - eval ac_old_set=\$ac_cv_env_${ac_var}_set - eval ac_new_set=\$ac_env_${ac_var}_set - eval ac_old_val="\$ac_cv_env_${ac_var}_value" - eval ac_new_val="\$ac_env_${ac_var}_value" - case $ac_old_set,$ac_new_set in - set,) - { echo "$as_me:1033: WARNING: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 -echo "$as_me: WARNING: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} - ac_suggest_removing_cache=: ;; - ,set) - { echo "$as_me:1037: WARNING: \`$ac_var' was not set in the previous run" >&5 -echo "$as_me: WARNING: \`$ac_var' was not set in the previous run" >&2;} - ac_suggest_removing_cache=: ;; - ,);; - *) - if test "x$ac_old_val" != "x$ac_new_val"; then - { echo "$as_me:1043: WARNING: \`$ac_var' has changed since the previous run:" >&5 -echo "$as_me: WARNING: \`$ac_var' has changed since the previous run:" >&2;} - { echo "$as_me:1045: WARNING: former value: $ac_old_val" >&5 -echo "$as_me: WARNING: former value: $ac_old_val" >&2;} - { echo "$as_me:1047: WARNING: current value: $ac_new_val" >&5 -echo "$as_me: WARNING: current value: $ac_new_val" >&2;} - ac_suggest_removing_cache=: - fi;; - esac -done -if $ac_suggest_removing_cache; then - { echo "$as_me:1054: WARNING: changes in the environment can compromise the build" >&5 -echo "$as_me: WARNING: changes in the environment can compromise the build" >&2;} - { echo "$as_me:1056: WARNING: consider removing $cache_file and starting over" >&5 -echo "$as_me: WARNING: consider removing $cache_file and starting over" >&2;} + echo "creating cache $cache_file" + > $cache_file fi 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 -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - -case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in - *c*,-n*) ECHO_N= ECHO_C=' -' ECHO_T=' ' ;; - *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;; - *) ECHO_N= ECHO_C='\c' ECHO_T= ;; -esac -echo "#! $SHELL" >conftest.sh -echo "exit 0" >>conftest.sh -chmod +x conftest.sh -if { (echo "$as_me:1075: PATH=\".;.\"; conftest.sh") >&5 - (PATH=".;."; conftest.sh) 2>&5 - ac_status=$? - echo "$as_me:1078: \$? = $ac_status" >&5 - (exit $ac_status); }; then - ac_path_separator=';' +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 + +ac_exeext= +ac_objext=o +if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then + # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu. + if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then + ac_n= ac_c=' +' ac_t=' ' + else + ac_n=-n ac_c= ac_t= + fi else - ac_path_separator=: + ac_n= ac_c='\c' ac_t= fi -PATH_SEPARATOR="$ac_path_separator" -rm -f conftest.sh + + ac_aux_dir= for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do @@ -1094,112 +900,119 @@ for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do ac_aux_dir=$ac_dir ac_install_sh="$ac_aux_dir/install.sh -c" break - elif test -f $ac_dir/shtool; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/shtool install -c" - break fi done if test -z "$ac_aux_dir"; then - { { echo "$as_me:1104: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5 -echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;} - { (exit 1); exit 1; }; } + { echo "configure: error: can not find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." 1>&2; exit 1; } fi -ac_config_guess="$SHELL $ac_aux_dir/config.guess" -ac_config_sub="$SHELL $ac_aux_dir/config.sub" -ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure. +ac_config_guess=$ac_aux_dir/config.guess +ac_config_sub=$ac_aux_dir/config.sub +ac_configure=$ac_aux_dir/configure # This should be Cygnus configure. -# Make sure we can run config.sub. -$ac_config_sub sun4 >/dev/null 2>&1 || - { { echo "$as_me:1114: error: cannot run $ac_config_sub" >&5 -echo "$as_me: error: cannot run $ac_config_sub" >&2;} - { (exit 1); exit 1; }; } - -echo "$as_me:1118: checking build system type" >&5 -echo $ECHO_N "checking build system type... $ECHO_C" >&6 -if test "${ac_cv_build+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_build_alias=$build_alias -test -z "$ac_cv_build_alias" && - ac_cv_build_alias=`$ac_config_guess` -test -z "$ac_cv_build_alias" && - { { echo "$as_me:1127: error: cannot guess build type; you must specify one" >&5 -echo "$as_me: error: cannot guess build type; you must specify one" >&2;} - { (exit 1); exit 1; }; } -ac_cv_build=`$ac_config_sub $ac_cv_build_alias` || - { { echo "$as_me:1131: error: $ac_config_sub $ac_cv_build_alias failed." >&5 -echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed." >&2;} - { (exit 1); exit 1; }; } - -fi -echo "$as_me:1136: result: $ac_cv_build" >&5 -echo "${ECHO_T}$ac_cv_build" >&6 -build=$ac_cv_build -build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` -build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` -build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` - -echo "$as_me:1143: checking host system type" >&5 -echo $ECHO_N "checking host system type... $ECHO_C" >&6 -if test "${ac_cv_host+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_host_alias=$host_alias -test -z "$ac_cv_host_alias" && - ac_cv_host_alias=$ac_cv_build_alias -ac_cv_host=`$ac_config_sub $ac_cv_host_alias` || - { { echo "$as_me:1152: error: $ac_config_sub $ac_cv_host_alias failed" >&5 -echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;} - { (exit 1); exit 1; }; } - -fi -echo "$as_me:1157: result: $ac_cv_host" >&5 -echo "${ECHO_T}$ac_cv_host" >&6 -host=$ac_cv_host -host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` -host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` -host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` - -echo "$as_me:1164: checking target system type" >&5 -echo $ECHO_N "checking target system type... $ECHO_C" >&6 -if test "${ac_cv_target+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_target_alias=$target_alias -test "x$ac_cv_target_alias" = "x" && - ac_cv_target_alias=$ac_cv_host_alias -ac_cv_target=`$ac_config_sub $ac_cv_target_alias` || - { { echo "$as_me:1173: error: $ac_config_sub $ac_cv_target_alias failed" >&5 -echo "$as_me: error: $ac_config_sub $ac_cv_target_alias failed" >&2;} - { (exit 1); exit 1; }; } - -fi -echo "$as_me:1178: result: $ac_cv_target" >&5 -echo "${ECHO_T}$ac_cv_target" >&6 -target=$ac_cv_target -target_cpu=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` -target_vendor=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` -target_os=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` + +# 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. -test -n "$target_alias" && +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:941: checking host system type" >&5 + +host_alias=$host +case "$host_alias" in +NONE) + case $nonopt in + NONE) + if host_alias=`${CONFIG_SHELL-/bin/sh} $ac_config_guess`; then : + else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; } + fi ;; + *) host_alias=$nonopt ;; + esac ;; +esac + +host=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $host_alias` +host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` +host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` +host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` +echo "$ac_t""$host" 1>&6 + +echo $ac_n "checking target system type""... $ac_c" 1>&6 +echo "configure:962: 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 + +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 build system type""... $ac_c" 1>&6 +echo "configure:980: checking build system type" >&5 + +build_alias=$build +case "$build_alias" in +NONE) + case $nonopt in + NONE) build_alias=$host_alias ;; + *) build_alias=$nonopt ;; + esac ;; +esac + +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 + +test "$host_alias" != "$target_alias" && test "$program_prefix$program_suffix$program_transform_name" = \ NONENONEs,x,x, && program_prefix=${target_alias}- + + WX_MAJOR_VERSION_NUMBER=2 WX_MINOR_VERSION_NUMBER=3 -WX_RELEASE_NUMBER=1 +WX_RELEASE_NUMBER=2 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=0 +WX_CURRENT=1 WX_REVISION=0 WX_AGE=0 + + USE_UNIX=1 USE_WIN32=0 USE_BEOS=0 @@ -1215,8 +1028,10 @@ USE_SUN= USE_SOLARIS= USE_SUNOS= USE_ALPHA= +USE_IA64= USE_OSF= USE_BSD= +USE_DARWIN= USE_FREEBSD= USE_OPENBSD= USE_NETBSD= @@ -1228,45 +1043,56 @@ USE_DATA_GENERAL= NEEDS_D_REENTRANT_FOR_R_FUNCS=0 -ALL_TOOLKITS="CYGWIN GTK MINGW MOTIF MAC WINE PM" +ALL_TOOLKITS="CYGWIN GTK MAC MGL MINGW MOTIF PM WINE" DEFAULT_wxUSE_GTK=0 +DEFAULT_wxUSE_MAC=0 +DEFAULT_wxUSE_MGL=0 DEFAULT_wxUSE_MOTIF=0 DEFAULT_wxUSE_MSW=0 -DEFAULT_wxUSE_MAC=0 -DEFAULT_wxUSE_WINE=0 DEFAULT_wxUSE_PM=0 +DEFAULT_wxUSE_WINE=0 DEFAULT_DEFAULT_wxUSE_GTK=0 +DEFAULT_DEFAULT_wxUSE_MAC=0 +DEFAULT_DEFAULT_wxUSE_MGL=0 DEFAULT_DEFAULT_wxUSE_MOTIF=0 DEFAULT_DEFAULT_wxUSE_MSW=0 -DEFAULT_DEFAULT_wxUSE_MAC=0 -DEFAULT_DEFAULT_wxUSE_WINE=0 DEFAULT_DEFAULT_wxUSE_PM=0 +DEFAULT_DEFAULT_wxUSE_WINE=0 PROGRAM_EXT= +SO_SUFFIX=so case "${host}" in *-hp-hpux* ) USE_HPUX=1 DEFAULT_DEFAULT_wxUSE_MOTIF=1 NEEDS_D_REENTRANT_FOR_R_FUNCS=1 - cat >>confdefs.h <<\EOF + SO_SUFFIX=sl + cat >> confdefs.h <<\EOF #define __HPUX__ 1 EOF ;; *-*-linux* ) USE_LINUX=1 - cat >>confdefs.h <<\EOF + cat >> confdefs.h <<\EOF #define __LINUX__ 1 EOF TMP=`uname -m` if test "x$TMP" = "xalpha"; then USE_ALPHA=1 - cat >>confdefs.h <<\EOF + cat >> confdefs.h <<\EOF #define __ALPHA__ 1 +EOF + + fi + if test "x$TMP" = "xia64"; then + USE_IA64=1 + cat >> confdefs.h <<\EOF +#define __IA64__ 1 EOF fi @@ -1275,11 +1101,11 @@ EOF *-*-irix5* | *-*-irix6* ) USE_SGI=1 USE_SVR4=1 - cat >>confdefs.h <<\EOF + cat >> confdefs.h <<\EOF #define __SGI__ 1 EOF - cat >>confdefs.h <<\EOF + cat >> confdefs.h <<\EOF #define __SVR4__ 1 EOF @@ -1289,15 +1115,15 @@ EOF USE_SUN=1 USE_SOLARIS=1 USE_SVR4=1 - cat >>confdefs.h <<\EOF + cat >> confdefs.h <<\EOF #define __SUN__ 1 EOF - cat >>confdefs.h <<\EOF + cat >> confdefs.h <<\EOF #define __SOLARIS__ 1 EOF - cat >>confdefs.h <<\EOF + cat >> confdefs.h <<\EOF #define __SVR4__ 1 EOF @@ -1308,15 +1134,15 @@ EOF USE_SUN=1 USE_SUNOS=1 USE_BSD=1 - cat >>confdefs.h <<\EOF + cat >> confdefs.h <<\EOF #define __SUN__ 1 EOF - cat >>confdefs.h <<\EOF + cat >> confdefs.h <<\EOF #define __SUNOS__ 1 EOF - cat >>confdefs.h <<\EOF + cat >> confdefs.h <<\EOF #define __BSD__ 1 EOF @@ -1325,11 +1151,11 @@ EOF *-*-freebsd*) USE_BSD=1 USE_FREEBSD=1 - cat >>confdefs.h <<\EOF + cat >> confdefs.h <<\EOF #define __FREEBSD__ 1 EOF - cat >>confdefs.h <<\EOF + cat >> confdefs.h <<\EOF #define __BSD__ 1 EOF @@ -1338,11 +1164,11 @@ EOF *-*-openbsd*) USE_BSD=1 USE_OPENBSD=1 - cat >>confdefs.h <<\EOF + cat >> confdefs.h <<\EOF #define __FREEBSD__ 1 EOF - cat >>confdefs.h <<\EOF + cat >> confdefs.h <<\EOF #define __OPENBSD__ 1 EOF @@ -1351,11 +1177,11 @@ EOF *-*-netbsd*) USE_BSD=1 USE_NETBSD=1 - cat >>confdefs.h <<\EOF + cat >> confdefs.h <<\EOF #define __FREEBSD__ 1 EOF - cat >>confdefs.h <<\EOF + cat >> confdefs.h <<\EOF #define __NETBSD__ 1 EOF @@ -1364,11 +1190,11 @@ EOF *-*-osf* ) USE_ALPHA=1 USE_OSF=1 - cat >>confdefs.h <<\EOF + cat >> confdefs.h <<\EOF #define __ALPHA__ 1 EOF - cat >>confdefs.h <<\EOF + cat >> confdefs.h <<\EOF #define __OSF__ 1 EOF @@ -1378,11 +1204,11 @@ EOF *-*-dgux5* ) USE_ALPHA=1 USE_SVR4=1 - cat >>confdefs.h <<\EOF + cat >> confdefs.h <<\EOF #define __ALPHA__ 1 EOF - cat >>confdefs.h <<\EOF + cat >> confdefs.h <<\EOF #define __SVR4__ 1 EOF @@ -1391,11 +1217,11 @@ EOF *-*-sysv5* ) USE_SYSV=1 USE_SVR4=1 - cat >>confdefs.h <<\EOF + cat >> confdefs.h <<\EOF #define __SYSV__ 1 EOF - cat >>confdefs.h <<\EOF + cat >> confdefs.h <<\EOF #define __SVR4__ 1 EOF @@ -1405,15 +1231,15 @@ EOF USE_AIX=1 USE_SYSV=1 USE_SVR4=1 - cat >>confdefs.h <<\EOF + cat >> confdefs.h <<\EOF #define __AIX__ 1 EOF - cat >>confdefs.h <<\EOF + cat >> confdefs.h <<\EOF #define __SYSV__ 1 EOF - cat >>confdefs.h <<\EOF + cat >> confdefs.h <<\EOF #define __SVR4__ 1 EOF @@ -1423,36 +1249,38 @@ EOF *-*-cygwin* | *-*-mingw32* ) USE_UNIX=0 USE_WIN32=1 - cat >>confdefs.h <<\EOF + SO_SUFFIX=dll + cat >> confdefs.h <<\EOF #define __WIN32__ 1 EOF - cat >>confdefs.h <<\EOF + cat >> confdefs.h <<\EOF #define __WIN95__ 1 EOF - cat >>confdefs.h <<\EOF + cat >> confdefs.h <<\EOF #define __WINDOWS__ 1 EOF - cat >>confdefs.h <<\EOF + cat >> confdefs.h <<\EOF #define __GNUWIN32__ 1 EOF - cat >>confdefs.h <<\EOF + cat >> confdefs.h <<\EOF #define STRICT 1 EOF - cat >>confdefs.h <<\EOF + cat >> confdefs.h <<\EOF #define WINVER 0x0400 EOF PROGRAM_EXT=".exe" + RESCOMP=windres DEFAULT_DEFAULT_wxUSE_MSW=1 ;; - *-pc-os2_emx ) - cat >>confdefs.h <<\EOF + *-pc-os2_emx | *-pc-os2-emx ) + cat >> confdefs.h <<\EOF #define __EMX__ 1 EOF @@ -1460,19 +1288,20 @@ EOF DEFAULT_DEFAULT_wxUSE_PM=1 ;; - *-*-darwin* ) - USE_BSD=1 - USE_MAC=1 - cat >>confdefs.h <<\EOF -#define __MAC__ 1 + powerpc-*-darwin* ) + USE_BSD=1 + USE_DARWIN=1 + SO_SUFFIX=dylib + cat >> confdefs.h <<\EOF +#define __BSD__ 1 EOF - cat >>confdefs.h <<\EOF -#define __BSD__ 1 + cat >> confdefs.h <<\EOF +#define __DARWIN__ 1 EOF - cat >>confdefs.h <<\EOF -#define __UNIX__ 1 + cat >> confdefs.h <<\EOF +#define __POWERPC__ 1 EOF DEFAULT_DEFAULT_wxUSE_MAC=1 @@ -1480,776 +1309,92 @@ EOF *-*-beos* ) USE_BEOS=1 - cat >>confdefs.h <<\EOF + cat >> confdefs.h <<\EOF #define __BEOS__ 1 EOF ;; *) - { { echo "$as_me:1490: error: unknown system type ${host}." >&5 -echo "$as_me: error: unknown system type ${host}." >&2;} - { (exit 1); exit 1; }; } + { echo "configure: error: unknown system type ${host}." 1>&2; exit 1; } esac if test "$USE_UNIX" = 1 ; then wxUSE_UNIX=yes - cat >>confdefs.h <<\EOF + cat >> confdefs.h <<\EOF #define __UNIX__ 1 EOF - SRC_SUBDIRS="$SRC_SUBDIRS unix" - INCLUDE_SUBDIRS="$INCLUDE_SUBDIRS unix" -fi - -if test "$USE_BEOS" = 1; then - SRC_SUBDIRS="$SRC_SUBDIRS be" - INCLUDE_SUBDIRS="$INCLUDE_SUBDIRS be" fi if test "$USE_LINUX" = 1; then - ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu -if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. -set dummy ${ac_tool_prefix}gcc; ac_word=$2 -echo "$as_me:1519: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. + echo $ac_n "checking for glibc 2.1 or later""... $ac_c" 1>&6 +echo "configure:1333: checking for glibc 2.1 or later" >&5 +if eval "test \"`echo '$''{'wx_lib_glibc21'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_CC="${ac_tool_prefix}gcc" -echo "$as_me:1534: found $ac_dir/$ac_word" >&5 -break -done + cat > conftest.$ac_ext < +int main() { -fi -fi -CC=$ac_cv_prog_CC -if test -n "$CC"; then - echo "$as_me:1542: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6 + #if !__GLIBC_PREREQ(2, 1) + #error not glibc2.1 + #endif + +; return 0; } +EOF +if { (eval echo configure:1349: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + + wx_lib_glibc21=yes + else - echo "$as_me:1545: result: no" >&5 -echo "${ECHO_T}no" >&6 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + + wx_lib_glibc21=no + + fi - -fi -if test -z "$ac_cv_prog_CC"; then - ac_ct_CC=$CC - # Extract the first word of "gcc", so it can be a program name with args. -set dummy gcc; ac_word=$2 -echo "$as_me:1554: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$ac_ct_CC"; then - ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. -else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_ac_ct_CC="gcc" -echo "$as_me:1569: found $ac_dir/$ac_word" >&5 -break -done - -fi -fi -ac_ct_CC=$ac_cv_prog_ac_ct_CC -if test -n "$ac_ct_CC"; then - echo "$as_me:1577: result: $ac_ct_CC" >&5 -echo "${ECHO_T}$ac_ct_CC" >&6 -else - echo "$as_me:1580: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - CC=$ac_ct_CC -else - CC="$ac_cv_prog_CC" -fi - -if test -z "$CC"; then - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. -set dummy ${ac_tool_prefix}cc; ac_word=$2 -echo "$as_me:1593: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_CC="${ac_tool_prefix}cc" -echo "$as_me:1608: found $ac_dir/$ac_word" >&5 -break -done - -fi -fi -CC=$ac_cv_prog_CC -if test -n "$CC"; then - echo "$as_me:1616: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6 -else - echo "$as_me:1619: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - -fi -if test -z "$ac_cv_prog_CC"; then - ac_ct_CC=$CC - # Extract the first word of "cc", so it can be a program name with args. -set dummy cc; ac_word=$2 -echo "$as_me:1628: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$ac_ct_CC"; then - ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. -else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_ac_ct_CC="cc" -echo "$as_me:1643: found $ac_dir/$ac_word" >&5 -break -done - -fi -fi -ac_ct_CC=$ac_cv_prog_ac_ct_CC -if test -n "$ac_ct_CC"; then - echo "$as_me:1651: result: $ac_ct_CC" >&5 -echo "${ECHO_T}$ac_ct_CC" >&6 -else - echo "$as_me:1654: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - CC=$ac_ct_CC -else - CC="$ac_cv_prog_CC" -fi - -fi -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 "$as_me:1667: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else - ac_prog_rejected=no - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then - ac_prog_rejected=yes - continue -fi -ac_cv_prog_CC="cc" -echo "$as_me:1687: found $ac_dir/$ac_word" >&5 -break -done - -if test $ac_prog_rejected = yes; then - # We found a bogon in the path, so make sure we never use it. - set dummy $ac_cv_prog_CC - shift - if test $# != 0; then - # We chose a different compiler from the bogus one. - # However, it has the same basename, so the bogon will be chosen - # first if we set CC to just the basename; use the full file name. - shift - set dummy "$ac_dir/$ac_word" ${1+"$@"} - shift - ac_cv_prog_CC="$@" - fi -fi -fi -fi -CC=$ac_cv_prog_CC -if test -n "$CC"; then - echo "$as_me:1709: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6 -else - echo "$as_me:1712: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - -fi -if test -z "$CC"; then - if test -n "$ac_tool_prefix"; then - for ac_prog in cl - do - # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. -set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -echo "$as_me:1723: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_CC="$ac_tool_prefix$ac_prog" -echo "$as_me:1738: found $ac_dir/$ac_word" >&5 -break -done - -fi -fi -CC=$ac_cv_prog_CC -if test -n "$CC"; then - echo "$as_me:1746: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6 -else - echo "$as_me:1749: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - test -n "$CC" && break - done -fi -if test -z "$CC"; then - ac_ct_CC=$CC - for ac_prog in cl -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 "$as_me:1762: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$ac_ct_CC"; then - ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. -else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_ac_ct_CC="$ac_prog" -echo "$as_me:1777: found $ac_dir/$ac_word" >&5 -break -done - -fi -fi -ac_ct_CC=$ac_cv_prog_ac_ct_CC -if test -n "$ac_ct_CC"; then - echo "$as_me:1785: result: $ac_ct_CC" >&5 -echo "${ECHO_T}$ac_ct_CC" >&6 -else - echo "$as_me:1788: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - test -n "$ac_ct_CC" && break -done - - CC=$ac_ct_CC -fi - +rm -f conftest* + fi -test -z "$CC" && { { echo "$as_me:1800: error: no acceptable cc found in \$PATH" >&5 -echo "$as_me: error: no acceptable cc found in \$PATH" >&2;} - { (exit 1); exit 1; }; } - -cat >conftest.$ac_ext <<_ACEOF -#line 1805 "configure" -#include "confdefs.h" - -int -main () -{ +echo "$ac_t""$wx_lib_glibc21" 1>&6 + if test "$wx_lib_glibc21" = "yes"; then + cat >> confdefs.h <<\EOF +#define wxHAVE_GLIBC2 1 +EOF - ; - return 0; -} -_ACEOF -ac_clean_files_save=$ac_clean_files -ac_clean_files="$ac_clean_files a.out a.exe" -# Try to create an executable without -o first, disregard a.out. -# It will help us diagnose broken compiler, and finding out an intuition -# of exeext. -echo "$as_me:1821: checking for C compiler default output" >&5 -echo $ECHO_N "checking for C compiler default output... $ECHO_C" >&6 -ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` -if { (eval echo "$as_me:1824: \"$ac_link_default\"") >&5 - (eval $ac_link_default) 2>&5 - ac_status=$? - echo "$as_me:1827: \$? = $ac_status" >&5 - (exit $ac_status); }; then - for ac_file in `ls a.exe conftest.exe a.* conftest conftest.* 2>/dev/null`; do - case $ac_file in - *.$ac_ext | *.o | *.obj | *.xcoff | *.tds | *.d | *.pdb ) ;; - a.out ) # We found the default executable, but exeext='' is most - # certainly right. - break;; - *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` - export ac_cv_exeext - break;; - * ) break;; - esac -done -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -{ { echo "$as_me:1844: error: C compiler cannot create executables" >&5 -echo "$as_me: error: C compiler cannot create executables" >&2;} - { (exit 77); exit 77; }; } -fi - -ac_exeext=$ac_cv_exeext -echo "$as_me:1850: result: $ac_file" >&5 -echo "${ECHO_T}$ac_file" >&6 - -# Check the compiler produces executables we can run. If not, either -# the compiler is broken, or we cross compile. -echo "$as_me:1855: checking whether the C compiler works" >&5 -echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6 -# FIXME: These cross compiler hacks should be removed for Autoconf 3.0 -# If not cross compiling, check that we can run a simple program. -if test "$cross_compiling" != yes; then - if { ac_try='./$ac_file' - { (eval echo "$as_me:1861: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:1864: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cross_compiling=no - else - if test "$cross_compiling" = maybe; then - cross_compiling=yes - else - { { echo "$as_me:1871: error: cannot run C compiled programs. -If you meant to cross compile, use \`--host'." >&5 -echo "$as_me: error: cannot run C compiled programs. -If you meant to cross compile, use \`--host'." >&2;} - { (exit 1); exit 1; }; } fi - fi -fi -echo "$as_me:1879: result: yes" >&5 -echo "${ECHO_T}yes" >&6 - -rm -f a.out a.exe conftest$ac_cv_exeext -ac_clean_files=$ac_clean_files_save -# Check the compiler produces executables we can run. If not, either -# the compiler is broken, or we cross compile. -echo "$as_me:1886: checking whether we are cross compiling" >&5 -echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6 -echo "$as_me:1888: result: $cross_compiling" >&5 -echo "${ECHO_T}$cross_compiling" >&6 - -echo "$as_me:1891: checking for executable suffix" >&5 -echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6 -if { (eval echo "$as_me:1893: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:1896: \$? = $ac_status" >&5 - (exit $ac_status); }; then - # If both `conftest.exe' and `conftest' are `present' (well, observable) -# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will -# work properly (i.e., refer to `conftest.exe'), while it won't with -# `rm'. -for ac_file in `(ls conftest.exe; ls conftest; ls conftest.*) 2>/dev/null`; do - case $ac_file in - *.$ac_ext | *.o | *.obj | *.xcoff | *.tds | *.d | *.pdb ) ;; - *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` - export ac_cv_exeext - break;; - * ) break;; - esac -done -else - { { echo "$as_me:1912: error: cannot compute EXEEXT: cannot compile and link" >&5 -echo "$as_me: error: cannot compute EXEEXT: cannot compile and link" >&2;} - { (exit 1); exit 1; }; } -fi - -rm -f conftest$ac_cv_exeext -echo "$as_me:1918: result: $ac_cv_exeext" >&5 -echo "${ECHO_T}$ac_cv_exeext" >&6 - -rm -f conftest.$ac_ext -EXEEXT=$ac_cv_exeext -ac_exeext=$EXEEXT -echo "$as_me:1924: checking for object suffix" >&5 -echo $ECHO_N "checking for object suffix... $ECHO_C" >&6 -if test "${ac_cv_objext+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line 1930 "configure" -#include "confdefs.h" - -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.o conftest.obj -if { (eval echo "$as_me:1942: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:1945: \$? = $ac_status" >&5 - (exit $ac_status); }; then - for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do - case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb ) ;; - *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` - break;; - esac -done -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -{ { echo "$as_me:1957: error: cannot compute OBJEXT: cannot compile" >&5 -echo "$as_me: error: cannot compute OBJEXT: cannot compile" >&2;} - { (exit 1); exit 1; }; } -fi - -rm -f conftest.$ac_cv_objext conftest.$ac_ext -fi -echo "$as_me:1964: result: $ac_cv_objext" >&5 -echo "${ECHO_T}$ac_cv_objext" >&6 -OBJEXT=$ac_cv_objext -ac_objext=$OBJEXT -echo "$as_me:1968: checking whether we are using the GNU C compiler" >&5 -echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6 -if test "${ac_cv_c_compiler_gnu+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line 1974 "configure" -#include "confdefs.h" - -int -main () -{ -#ifndef __GNUC__ - choke me -#endif - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:1989: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:1992: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:1995: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:1998: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_compiler_gnu=yes -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_compiler_gnu=no -fi -rm -f conftest.$ac_objext conftest.$ac_ext -ac_cv_c_compiler_gnu=$ac_compiler_gnu - -fi -echo "$as_me:2010: result: $ac_cv_c_compiler_gnu" >&5 -echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6 -GCC=`test $ac_compiler_gnu = yes && echo yes` -ac_test_CFLAGS=${CFLAGS+set} -ac_save_CFLAGS=$CFLAGS -CFLAGS="-g" -echo "$as_me:2016: checking whether $CC accepts -g" >&5 -echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6 -if test "${ac_cv_prog_cc_g+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line 2022 "configure" -#include "confdefs.h" - -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:2034: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:2037: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2040: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:2043: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_prog_cc_g=yes -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_prog_cc_g=no -fi -rm -f conftest.$ac_objext conftest.$ac_ext -fi -echo "$as_me:2053: result: $ac_cv_prog_cc_g" >&5 -echo "${ECHO_T}$ac_cv_prog_cc_g" >&6 -if test "$ac_test_CFLAGS" = set; then - CFLAGS=$ac_save_CFLAGS -elif test $ac_cv_prog_cc_g = yes; then - if test "$GCC" = yes; then - CFLAGS="-g -O2" - else - CFLAGS="-g" - fi -else - if test "$GCC" = yes; then - CFLAGS="-O2" - else - CFLAGS= - fi -fi -# Some people use a C++ compiler to compile C. Since we use `exit', -# in C++ we need to declare it. In case someone uses the same compiler -# for both compiling C and C++ we need to have the C++ compiler decide -# the declaration of exit, since it's the most demanding environment. -cat >conftest.$ac_ext <<_ACEOF -#ifndef __cplusplus - choke me -#endif -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:2080: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:2083: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2086: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:2089: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - for ac_declaration in \ - ''\ - '#include ' \ - 'extern "C" void std::exit (int) throw (); using std::exit;' \ - 'extern "C" void std::exit (int); using std::exit;' \ - 'extern "C" void exit (int) throw ();' \ - 'extern "C" void exit (int);' \ - 'void exit (int);' -do - cat >conftest.$ac_ext <<_ACEOF -#line 2101 "configure" -#include "confdefs.h" -#include -$ac_declaration -int -main () -{ -exit (42); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:2114: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:2117: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2120: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:2123: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - : -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -continue -fi -rm -f conftest.$ac_objext conftest.$ac_ext - cat >conftest.$ac_ext <<_ACEOF -#line 2133 "configure" -#include "confdefs.h" -$ac_declaration -int -main () -{ -exit (42); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:2145: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:2148: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2151: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:2154: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - break -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -fi -rm -f conftest.$ac_objext conftest.$ac_ext -done -echo '#ifdef __cplusplus' >>confdefs.h -echo $ac_declaration >>confdefs.h -echo '#endif' >>confdefs.h - -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 fi -rm -f conftest.$ac_objext conftest.$ac_ext -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - -echo "$as_me:2178: checking for gettext in -lc" >&5 -echo $ECHO_N "checking for gettext in -lc... $ECHO_C" >&6 -if test "${ac_cv_lib_c_gettext+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lc $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 2186 "configure" -#include "confdefs.h" -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char gettext (); -int -main () -{ -gettext (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:2205: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:2208: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:2211: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:2214: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_c_gettext=yes -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_lib_c_gettext=no -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:2225: result: $ac_cv_lib_c_gettext" >&5 -echo "${ECHO_T}$ac_cv_lib_c_gettext" >&6 -if test $ac_cv_lib_c_gettext = yes; then - cat >>confdefs.h <<\EOF -#define wxHAVE_GLIBC2 1 -EOF -fi -fi 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_UNIVERSAL=no + DEFAULT_wxUSE_THREADS=yes DEFAULT_wxUSE_SHARED=yes - DEFAULT_wxUSE_BURNT_NAME=no - DEFAULT_wxUSE_OPTIMISE=yes + DEFAULT_wxUSE_SONAME=no + DEFAULT_wxUSE_OPTIMISE=no DEFAULT_wxUSE_PROFILE=no DEFAULT_wxUSE_NO_DEPS=no - DEFAULT_wxUSE_NO_RTTI=no - DEFAULT_wxUSE_NO_EXCEPTIONS=no + DEFAULT_wxUSE_NO_RTTI=yes + DEFAULT_wxUSE_NO_EXCEPTIONS=yes DEFAULT_wxUSE_PERMISSIVE=no DEFAULT_wxUSE_DEBUG_FLAG=yes DEFAULT_wxUSE_DEBUG_INFO=yes @@ -2257,12 +1402,17 @@ if test $DEBUG_CONFIGURE = 1; then DEFAULT_wxUSE_MEM_TRACING=no DEFAULT_wxUSE_DEBUG_CONTEXT=no DEFAULT_wxUSE_DMALLOC=no + DEFAULT_wxUSE_PRECOMP=yes DEFAULT_wxUSE_APPLE_IEEE=no DEFAULT_wxUSE_LOG=yes + DEFAULT_wxUSE_LOGWINDOW=no + DEFAULT_wxUSE_LOGGUI=no DEFAULT_wxUSE_GUI=yes + DEFAULT_wxUSE_CONTROLS=no + DEFAULT_wxUSE_REGEX=no DEFAULT_wxUSE_ZLIB=no DEFAULT_wxUSE_LIBPNG=no DEFAULT_wxUSE_LIBJPEG=no @@ -2274,12 +1424,18 @@ if test $DEBUG_CONFIGURE = 1; then DEFAULT_wxUSE_ON_FATAL_EXCEPTION=no DEFAULT_wxUSE_SNGLINST_CHECKER=no DEFAULT_wxUSE_STD_IOSTREAM=no + DEFAULT_wxUSE_CMDLINE_PARSER=no + DEFAULT_wxUSE_DATETIME=no + DEFAULT_wxUSE_TIMEDATE=no + DEFAULT_wxUSE_TIMER=no + DEFAULT_wxUSE_STOPWATCH=no DEFAULT_wxUSE_FILE=no + DEFAULT_wxUSE_FFILE=no DEFAULT_wxUSE_TEXTFILE=no - DEFAULT_wxUSE_TIMEDATE=no DEFAULT_wxUSE_WAVE=no DEFAULT_wxUSE_INTL=no DEFAULT_wxUSE_CONFIG=no + DEFAULT_wxUSE_FONTMAP=no DEFAULT_wxUSE_STREAMS=no DEFAULT_wxUSE_SOCKETS=no DEFAULT_wxUSE_DIALUP_MANAGER=no @@ -2297,6 +1453,7 @@ if test $DEBUG_CONFIGURE = 1; then DEFAULT_wxUSE_CLIPBOARD=no DEFAULT_wxUSE_TOOLTIPS=no DEFAULT_wxUSE_DRAG_AND_DROP=no + DEFAULT_wxUSE_DRAGIMAGE=no DEFAULT_wxUSE_SPLINES=no DEFAULT_wxUSE_MDI_ARCHITECTURE=no @@ -2308,14 +1465,29 @@ if test $DEBUG_CONFIGURE = 1; then DEFAULT_wxUSE_CONSTRAINTS=no DEFAULT_wxUSE_IPC=no DEFAULT_wxUSE_HELP=no - DEFAULT_wxUSE_WXTREE=no + DEFAULT_wxUSE_MS_HTML_HELP=no + DEFAULT_wxUSE_WXHTML_HELP=no + DEFAULT_wxUSE_TREELAYOUT=no DEFAULT_wxUSE_METAFILE=no + DEFAULT_wxUSE_MIMETYPE=no + DEFAULT_wxUSE_SYSTEM_OPTIONS=yes DEFAULT_wxUSE_COMMONDLGS=no + DEFAULT_wxUSE_CHOICEDLG=no + DEFAULT_wxUSE_COLOURDLG=no DEFAULT_wxUSE_DIRDLG=no + DEFAULT_wxUSE_FILEDLG=no + DEFAULT_wxUSE_FINDREPLDLG=no + DEFAULT_wxUSE_FONTDLG=no + DEFAULT_wxUSE_MSGDLG=no + DEFAULT_wxUSE_NUMBERDLG=no DEFAULT_wxUSE_TEXTDLG=no + DEFAULT_wxUSE_SPLASH=no DEFAULT_wxUSE_STARTUP_TIPS=no DEFAULT_wxUSE_PROGRESSDLG=no + DEFAULT_wxUSE_WIZARDDLG=no + + DEFAULT_wxUSE_MENUS=no DEFAULT_wxUSE_MINIFRAME=no DEFAULT_wxUSE_HTML=no DEFAULT_wxUSE_FILESYSTEM=no @@ -2323,14 +1495,16 @@ if test $DEBUG_CONFIGURE = 1; then DEFAULT_wxUSE_FS_ZIP=no DEFAULT_wxUSE_BUSYINFO=no DEFAULT_wxUSE_ZIPSTREAM=no - DEFAULT_wxUSE_VALIDATORS=yes + DEFAULT_wxUSE_VALIDATORS=no DEFAULT_wxUSE_ACCEL=no - DEFAULT_wxUSE_CARET=no + DEFAULT_wxUSE_BUTTON=no DEFAULT_wxUSE_BMPBUTTON=no + DEFAULT_wxUSE_CALCTRL=no + DEFAULT_wxUSE_CARET=no DEFAULT_wxUSE_CHECKBOX=no DEFAULT_wxUSE_CHECKLST=no - DEFAULT_wxUSE_CHOICE=yes + DEFAULT_wxUSE_CHOICE=no DEFAULT_wxUSE_COMBOBOX=no DEFAULT_wxUSE_GAUGE=no DEFAULT_wxUSE_GRID=no @@ -2339,6 +1513,7 @@ if test $DEBUG_CONFIGURE = 1; then DEFAULT_wxUSE_LISTBOX=no DEFAULT_wxUSE_LISTCTRL=no DEFAULT_wxUSE_NOTEBOOK=no + DEFAULT_wxUSE_PROPSHEET=no DEFAULT_wxUSE_RADIOBOX=no DEFAULT_wxUSE_RADIOBTN=no DEFAULT_wxUSE_SASH=no @@ -2350,32 +1525,38 @@ if test $DEBUG_CONFIGURE = 1; then DEFAULT_wxUSE_STATBMP=no DEFAULT_wxUSE_STATBOX=no DEFAULT_wxUSE_STATLINE=no + DEFAULT_wxUSE_STATTEXT=no DEFAULT_wxUSE_STATUSBAR=yes DEFAULT_wxUSE_TABDIALOG=no + DEFAULT_wxUSE_TEXTCTRL=no DEFAULT_wxUSE_TOGGLEBTN=no DEFAULT_wxUSE_TOOLBAR=no DEFAULT_wxUSE_TOOLBAR_NATIVE=no DEFAULT_wxUSE_TOOLBAR_SIMPLE=no DEFAULT_wxUSE_TREECTRL=no + DEFAULT_wxUSE_POPUPWIN=no DEFAULT_wxUSE_UNICODE=no DEFAULT_wxUSE_WCSRTOMBS=no + DEFAULT_wxUSE_PALETTE=no DEFAULT_wxUSE_IMAGE=no DEFAULT_wxUSE_GIF=no DEFAULT_wxUSE_PCX=no DEFAULT_wxUSE_PNM=no DEFAULT_wxUSE_XPM=no else + DEFAULT_wxUSE_UNIVERSAL=no + DEFAULT_wxUSE_THREADS=yes DEFAULT_wxUSE_SHARED=yes - DEFAULT_wxUSE_BURNT_NAME=no + DEFAULT_wxUSE_SONAME=no DEFAULT_wxUSE_OPTIMISE=yes DEFAULT_wxUSE_PROFILE=no DEFAULT_wxUSE_NO_DEPS=no - DEFAULT_wxUSE_NO_RTTI=no - DEFAULT_wxUSE_NO_EXCEPTIONS=no + DEFAULT_wxUSE_NO_RTTI=yes + DEFAULT_wxUSE_NO_EXCEPTIONS=yes DEFAULT_wxUSE_PERMISSIVE=no DEFAULT_wxUSE_DEBUG_FLAG=no DEFAULT_wxUSE_DEBUG_INFO=no @@ -2383,12 +1564,16 @@ else DEFAULT_wxUSE_MEM_TRACING=no DEFAULT_wxUSE_DEBUG_CONTEXT=no DEFAULT_wxUSE_DMALLOC=no + DEFAULT_wxUSE_PRECOMP=yes DEFAULT_wxUSE_APPLE_IEEE=yes DEFAULT_wxUSE_LOG=yes + DEFAULT_wxUSE_LOGWINDOW=yes + DEFAULT_wxUSE_LOGGUI=yes DEFAULT_wxUSE_GUI=yes + DEFAULT_wxUSE_REGEX=yes DEFAULT_wxUSE_ZLIB=yes DEFAULT_wxUSE_LIBPNG=yes DEFAULT_wxUSE_LIBJPEG=yes @@ -2400,12 +1585,18 @@ else DEFAULT_wxUSE_ON_FATAL_EXCEPTION=yes DEFAULT_wxUSE_SNGLINST_CHECKER=yes DEFAULT_wxUSE_STD_IOSTREAM=no + DEFAULT_wxUSE_CMDLINE_PARSER=yes + DEFAULT_wxUSE_DATETIME=yes + DEFAULT_wxUSE_TIMEDATE=no + DEFAULT_wxUSE_TIMER=yes + DEFAULT_wxUSE_STOPWATCH=yes DEFAULT_wxUSE_FILE=yes + DEFAULT_wxUSE_FFILE=yes DEFAULT_wxUSE_TEXTFILE=yes - DEFAULT_wxUSE_TIMEDATE=yes DEFAULT_wxUSE_WAVE=no DEFAULT_wxUSE_INTL=yes DEFAULT_wxUSE_CONFIG=yes + DEFAULT_wxUSE_FONTMAP=yes DEFAULT_wxUSE_STREAMS=yes DEFAULT_wxUSE_SOCKETS=yes DEFAULT_wxUSE_DIALUP_MANAGER=yes @@ -2423,6 +1614,7 @@ else DEFAULT_wxUSE_CLIPBOARD=yes DEFAULT_wxUSE_TOOLTIPS=yes DEFAULT_wxUSE_DRAG_AND_DROP=yes + DEFAULT_wxUSE_DRAGIMAGE=yes DEFAULT_wxUSE_SPLINES=yes DEFAULT_wxUSE_MDI_ARCHITECTURE=yes @@ -2434,14 +1626,29 @@ else DEFAULT_wxUSE_CONSTRAINTS=yes DEFAULT_wxUSE_IPC=yes DEFAULT_wxUSE_HELP=yes - DEFAULT_wxUSE_WXTREE=yes + DEFAULT_wxUSE_MS_HTML_HELP=yes + DEFAULT_wxUSE_WXHTML_HELP=yes + DEFAULT_wxUSE_TREELAYOUT=yes DEFAULT_wxUSE_METAFILE=yes + DEFAULT_wxUSE_MIMETYPE=yes + DEFAULT_wxUSE_SYSTEM_OPTIONS=yes DEFAULT_wxUSE_COMMONDLGS=yes + DEFAULT_wxUSE_CHOICEDLG=yes + DEFAULT_wxUSE_COLOURDLG=yes DEFAULT_wxUSE_DIRDLG=yes + DEFAULT_wxUSE_FILEDLG=yes + DEFAULT_wxUSE_FINDREPLDLG=yes + DEFAULT_wxUSE_FONTDLG=yes + DEFAULT_wxUSE_MSGDLG=yes + DEFAULT_wxUSE_NUMBERDLG=yes DEFAULT_wxUSE_TEXTDLG=yes + DEFAULT_wxUSE_SPLASH=yes DEFAULT_wxUSE_STARTUP_TIPS=yes DEFAULT_wxUSE_PROGRESSDLG=yes + DEFAULT_wxUSE_WIZARDDLG=yes + + DEFAULT_wxUSE_MENUS=yes DEFAULT_wxUSE_MINIFRAME=yes DEFAULT_wxUSE_HTML=yes DEFAULT_wxUSE_FILESYSTEM=yes @@ -2452,8 +1659,10 @@ else DEFAULT_wxUSE_VALIDATORS=yes DEFAULT_wxUSE_ACCEL=yes - DEFAULT_wxUSE_CARET=yes + DEFAULT_wxUSE_BUTTON=yes DEFAULT_wxUSE_BMPBUTTON=yes + DEFAULT_wxUSE_CALCTRL=yes + DEFAULT_wxUSE_CARET=yes DEFAULT_wxUSE_CHECKBOX=yes DEFAULT_wxUSE_CHECKLST=yes DEFAULT_wxUSE_CHOICE=yes @@ -2465,6 +1674,7 @@ else DEFAULT_wxUSE_LISTBOX=yes DEFAULT_wxUSE_LISTCTRL=yes DEFAULT_wxUSE_NOTEBOOK=yes + DEFAULT_wxUSE_PROPSHEET=yes DEFAULT_wxUSE_RADIOBOX=yes DEFAULT_wxUSE_RADIOBTN=yes DEFAULT_wxUSE_SASH=yes @@ -2476,17 +1686,21 @@ else DEFAULT_wxUSE_STATBMP=yes DEFAULT_wxUSE_STATBOX=yes DEFAULT_wxUSE_STATLINE=yes + DEFAULT_wxUSE_STATTEXT=yes DEFAULT_wxUSE_STATUSBAR=yes DEFAULT_wxUSE_TABDIALOG=no + DEFAULT_wxUSE_TEXTCTRL=yes DEFAULT_wxUSE_TOGGLEBTN=yes DEFAULT_wxUSE_TOOLBAR=yes DEFAULT_wxUSE_TOOLBAR_NATIVE=yes DEFAULT_wxUSE_TOOLBAR_SIMPLE=yes DEFAULT_wxUSE_TREECTRL=yes + DEFAULT_wxUSE_POPUPWIN=yes DEFAULT_wxUSE_UNICODE=no DEFAULT_wxUSE_WCSRTOMBS=no + DEFAULT_wxUSE_PALETTE=yes DEFAULT_wxUSE_IMAGE=yes DEFAULT_wxUSE_GIF=yes DEFAULT_wxUSE_PCX=yes @@ -2494,6 +1708,8 @@ else DEFAULT_wxUSE_XPM=yes fi + + for toolkit in `echo $ALL_TOOLKITS`; do LINE=`grep "wxUSE_$toolkit" ${wx_arg_cache_file}` if test "x$LINE" != x ; then @@ -2503,21 +1719,23 @@ for toolkit in `echo $ALL_TOOLKITS`; do fi done - echo "$as_me:2506: checking for --enable-gui" >&5 -echo $ECHO_N "checking for --enable-gui... $ECHO_C" >&6 + + + echo $ac_n "checking for --enable-gui""... $ac_c" 1>&6 +echo "configure:1726: 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" - + if test "$enableval" = yes; then ac_cv_use_gui='wxUSE_GUI=yes' else ac_cv_use_gui='wxUSE_GUI=no' fi - + else - + LINE=`grep "wxUSE_GUI" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -2526,8 +1744,9 @@ else fi ac_cv_use_gui='wxUSE_GUI='$DEFAULT_wxUSE_GUI + +fi -fi; eval "$ac_cv_use_gui" if test "$no_cache" != 1; then @@ -2535,95 +1754,133 @@ fi; fi if test "$wxUSE_GUI" = yes; then - echo "$as_me:2538: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + echo "$ac_t""yes" 1>&6 else - echo "$as_me:2541: result: no" >&5 -echo "${ECHO_T}no" >&6 + echo "$ac_t""no" 1>&6 fi + if test "$wxUSE_GUI" = "yes"; then + + echo $ac_n "checking for --enable-universal""... $ac_c" 1>&6 +echo "configure:1768: checking for --enable-universal" >&5 + no_cache=0 + # Check whether --enable-universal or --disable-universal was given. +if test "${enable_universal+set}" = set; then + enableval="$enable_universal" + + if test "$enableval" = yes; then + ac_cv_use_universal='wxUSE_UNIVERSAL=yes' + else + ac_cv_use_universal='wxUSE_UNIVERSAL=no' + fi + +else + + LINE=`grep "wxUSE_UNIVERSAL" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_universal='wxUSE_UNIVERSAL='$DEFAULT_wxUSE_UNIVERSAL + +fi + + + eval "$ac_cv_use_universal" + if test "$no_cache" != 1; then + echo $ac_cv_use_universal >> ${wx_arg_cache_file}.tmp + fi + + if test "$wxUSE_UNIVERSAL" = yes; then + echo "$ac_t""yes" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + # Check whether --with-gtk or --without-gtk was given. if test "${with_gtk+set}" = set; then withval="$with_gtk" wxUSE_GTK="$withval" CACHE_GTK=1 TOOLKIT_GIVEN=1 -fi; +fi # Check whether --with-motif or --without-motif was given. if test "${with_motif+set}" = set; then withval="$with_motif" wxUSE_MOTIF="$withval" CACHE_MOTIF=1 TOOLKIT_GIVEN=1 -fi; +fi # Check whether --with-mac or --without-mac was given. if test "${with_mac+set}" = set; then withval="$with_mac" wxUSE_MAC="$withval" TOOLKIT_GIVEN=1 -fi; +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; +fi # Check whether --with-cygwin or --without-cygwin was given. if test "${with_cygwin+set}" = set; then withval="$with_cygwin" wxUSE_CYGWIN="$withval" CACHE_CYGWIN=1 TOOLKIT_GIVEN=1 -fi; +fi # Check whether --with-mingw or --without-mingw was given. if test "${with_mingw+set}" = set; then withval="$with_mingw" wxUSE_MINGW="$withval" CACHE_MINGW=1 TOOLKIT_GIVEN=1 -fi; +fi # Check whether --with-pm or --without-pm was given. if test "${with_pm+set}" = set; then withval="$with_pm" wxUSE_PM="$withval" CACHE_PM=1 TOOLKIT_GIVEN=1 -fi; +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-mgl or --without-mgl was given. +if test "${with_mgl+set}" = set; then + withval="$with_mgl" + wxUSE_MGL="$withval" CACHE_MGL=1 TOOLKIT_GIVEN=1 +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" + +# Check whether --enable-gtk2 or --disable-gtk2 was given. +if test "${enable_gtk2+set}" = set; then + enableval="$enable_gtk2" + wxUSE_GTK2=1 else - gtk_config_exec_prefix="" -fi; + wxUSE_GTK2=0 +fi - echo "$as_me:2605: checking for --with-libpng" >&5 -echo $ECHO_N "checking for --with-libpng... $ECHO_C" >&6 - no_cache=0 -# Check whether --with-libpng or --without-libpng was given. + + echo $ac_n "checking for --with-libpng""... $ac_c" 1>&6 +echo "configure:1865: 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" - + if test "$withval" = yes; then ac_cv_use_libpng='wxUSE_LIBPNG=yes' elif test "$withval" = no; then ac_cv_use_libpng='wxUSE_LIBPNG=no' elif test "$withval" = sys; then ac_cv_use_libpng='wxUSE_LIBPNG=sys' + elif test "$withval" = builtin; then + ac_cv_use_libpng='wxUSE_LIBPNG=builtin' else - { { echo "$as_me:2620: error: Invalid value for --with-libpng: should be yes, no or sys" >&5 -echo "$as_me: error: Invalid value for --with-libpng: should be yes, no or sys" >&2;} - { (exit 1); exit 1; }; } + { echo "configure: error: Invalid value for --with-libpng: should be yes, no, sys, or builtin" 1>&2; exit 1; } fi - + else - + LINE=`grep "wxUSE_LIBPNG" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -2632,8 +1889,9 @@ else fi ac_cv_use_libpng='wxUSE_LIBPNG='$DEFAULT_wxUSE_LIBPNG + +fi -fi; eval "$ac_cv_use_libpng" if test "$no_cache" != 1; then @@ -2641,42 +1899,39 @@ fi; fi if test "$wxUSE_LIBPNG" = yes; then - echo "$as_me:2644: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + echo "$ac_t""yes" 1>&6 elif test "$wxUSE_LIBPNG" = no; then - echo "$as_me:2647: result: no" >&5 -echo "${ECHO_T}no" >&6 + echo "$ac_t""no" 1>&6 elif test "$wxUSE_LIBPNG" = sys; then - echo "$as_me:2650: result: system version" >&5 -echo "${ECHO_T}system version" >&6 + echo "$ac_t""system version" 1>&6 + elif test "$wxUSE_LIBPNG" = builtin; then + echo "$ac_t""builtin version" 1>&6 else - { { echo "$as_me:2653: error: Invalid value for --with-libpng: should be yes, no or sys" >&5 -echo "$as_me: error: Invalid value for --with-libpng: should be yes, no or sys" >&2;} - { (exit 1); exit 1; }; } + { echo "configure: error: Invalid value for --with-libpng: should be yes, no, sys, or builtin" 1>&2; exit 1; } fi + - echo "$as_me:2658: checking for --with-libjpeg" >&5 -echo $ECHO_N "checking for --with-libjpeg... $ECHO_C" >&6 + echo $ac_n "checking for --with-libjpeg""... $ac_c" 1>&6 +echo "configure:1916: checking for --with-libjpeg" >&5 no_cache=0 - -# Check whether --with-libjpeg or --without-libjpeg was given. + # Check whether --with-libjpeg or --without-libjpeg was given. if test "${with_libjpeg+set}" = set; then withval="$with_libjpeg" - + if test "$withval" = yes; then ac_cv_use_libjpeg='wxUSE_LIBJPEG=yes' elif test "$withval" = no; then ac_cv_use_libjpeg='wxUSE_LIBJPEG=no' elif test "$withval" = sys; then ac_cv_use_libjpeg='wxUSE_LIBJPEG=sys' + elif test "$withval" = builtin; then + ac_cv_use_libjpeg='wxUSE_LIBJPEG=builtin' else - { { echo "$as_me:2673: error: Invalid value for --with-libjpeg: should be yes, no or sys" >&5 -echo "$as_me: error: Invalid value for --with-libjpeg: should be yes, no or sys" >&2;} - { (exit 1); exit 1; }; } + { echo "configure: error: Invalid value for --with-libjpeg: should be yes, no, sys, or builtin" 1>&2; exit 1; } fi - + else - + LINE=`grep "wxUSE_LIBJPEG" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -2685,8 +1940,9 @@ else fi ac_cv_use_libjpeg='wxUSE_LIBJPEG='$DEFAULT_wxUSE_LIBJPEG + +fi -fi; eval "$ac_cv_use_libjpeg" if test "$no_cache" != 1; then @@ -2694,42 +1950,39 @@ fi; fi if test "$wxUSE_LIBJPEG" = yes; then - echo "$as_me:2697: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + echo "$ac_t""yes" 1>&6 elif test "$wxUSE_LIBJPEG" = no; then - echo "$as_me:2700: result: no" >&5 -echo "${ECHO_T}no" >&6 + echo "$ac_t""no" 1>&6 elif test "$wxUSE_LIBJPEG" = sys; then - echo "$as_me:2703: result: system version" >&5 -echo "${ECHO_T}system version" >&6 + echo "$ac_t""system version" 1>&6 + elif test "$wxUSE_LIBJPEG" = builtin; then + echo "$ac_t""builtin version" 1>&6 else - { { echo "$as_me:2706: error: Invalid value for --with-libjpeg: should be yes, no or sys" >&5 -echo "$as_me: error: Invalid value for --with-libjpeg: should be yes, no or sys" >&2;} - { (exit 1); exit 1; }; } + { echo "configure: error: Invalid value for --with-libjpeg: should be yes, no, sys, or builtin" 1>&2; exit 1; } fi + - echo "$as_me:2711: checking for --with-libtiff" >&5 -echo $ECHO_N "checking for --with-libtiff... $ECHO_C" >&6 + echo $ac_n "checking for --with-libtiff""... $ac_c" 1>&6 +echo "configure:1967: checking for --with-libtiff" >&5 no_cache=0 - -# Check whether --with-libtiff or --without-libtiff was given. + # Check whether --with-libtiff or --without-libtiff was given. if test "${with_libtiff+set}" = set; then withval="$with_libtiff" - + if test "$withval" = yes; then ac_cv_use_libtiff='wxUSE_LIBTIFF=yes' elif test "$withval" = no; then ac_cv_use_libtiff='wxUSE_LIBTIFF=no' elif test "$withval" = sys; then ac_cv_use_libtiff='wxUSE_LIBTIFF=sys' + elif test "$withval" = builtin; then + ac_cv_use_libtiff='wxUSE_LIBTIFF=builtin' else - { { echo "$as_me:2726: error: Invalid value for --with-libtiff: should be yes, no or sys" >&5 -echo "$as_me: error: Invalid value for --with-libtiff: should be yes, no or sys" >&2;} - { (exit 1); exit 1; }; } + { echo "configure: error: Invalid value for --with-libtiff: should be yes, no, sys, or builtin" 1>&2; exit 1; } fi - + else - + LINE=`grep "wxUSE_LIBTIFF" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -2738,8 +1991,9 @@ else fi ac_cv_use_libtiff='wxUSE_LIBTIFF='$DEFAULT_wxUSE_LIBTIFF + +fi -fi; eval "$ac_cv_use_libtiff" if test "$no_cache" != 1; then @@ -2747,42 +2001,39 @@ fi; fi if test "$wxUSE_LIBTIFF" = yes; then - echo "$as_me:2750: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + echo "$ac_t""yes" 1>&6 elif test "$wxUSE_LIBTIFF" = no; then - echo "$as_me:2753: result: no" >&5 -echo "${ECHO_T}no" >&6 + echo "$ac_t""no" 1>&6 elif test "$wxUSE_LIBTIFF" = sys; then - echo "$as_me:2756: result: system version" >&5 -echo "${ECHO_T}system version" >&6 + echo "$ac_t""system version" 1>&6 + elif test "$wxUSE_LIBTIFF" = builtin; then + echo "$ac_t""builtin version" 1>&6 else - { { echo "$as_me:2759: error: Invalid value for --with-libtiff: should be yes, no or sys" >&5 -echo "$as_me: error: Invalid value for --with-libtiff: should be yes, no or sys" >&2;} - { (exit 1); exit 1; }; } + { echo "configure: error: Invalid value for --with-libtiff: should be yes, no, sys, or builtin" 1>&2; exit 1; } fi + - echo "$as_me:2764: checking for --with-freetype" >&5 -echo $ECHO_N "checking for --with-freetype... $ECHO_C" >&6 + echo $ac_n "checking for --with-freetype""... $ac_c" 1>&6 +echo "configure:2018: checking for --with-freetype" >&5 no_cache=0 - -# Check whether --with-freetype or --without-freetype was given. + # Check whether --with-freetype or --without-freetype was given. if test "${with_freetype+set}" = set; then withval="$with_freetype" - + if test "$withval" = yes; then ac_cv_use_freetype='wxUSE_FREETYPE=yes' elif test "$withval" = no; then ac_cv_use_freetype='wxUSE_FREETYPE=no' elif test "$withval" = sys; then ac_cv_use_freetype='wxUSE_FREETYPE=sys' + elif test "$withval" = builtin; then + ac_cv_use_freetype='wxUSE_FREETYPE=builtin' else - { { echo "$as_me:2779: error: Invalid value for --with-freetype: should be yes, no or sys" >&5 -echo "$as_me: error: Invalid value for --with-freetype: should be yes, no or sys" >&2;} - { (exit 1); exit 1; }; } + { echo "configure: error: Invalid value for --with-freetype: should be yes, no, sys, or builtin" 1>&2; exit 1; } fi - + else - + LINE=`grep "wxUSE_FREETYPE" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -2791,8 +2042,9 @@ else fi ac_cv_use_freetype='wxUSE_FREETYPE='$DEFAULT_wxUSE_FREETYPE + +fi -fi; eval "$ac_cv_use_freetype" if test "$no_cache" != 1; then @@ -2800,36 +2052,33 @@ fi; fi if test "$wxUSE_FREETYPE" = yes; then - echo "$as_me:2803: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + echo "$ac_t""yes" 1>&6 elif test "$wxUSE_FREETYPE" = no; then - echo "$as_me:2806: result: no" >&5 -echo "${ECHO_T}no" >&6 + echo "$ac_t""no" 1>&6 elif test "$wxUSE_FREETYPE" = sys; then - echo "$as_me:2809: result: system version" >&5 -echo "${ECHO_T}system version" >&6 + echo "$ac_t""system version" 1>&6 + elif test "$wxUSE_FREETYPE" = builtin; then + echo "$ac_t""builtin version" 1>&6 else - { { echo "$as_me:2812: error: Invalid value for --with-freetype: should be yes, no or sys" >&5 -echo "$as_me: error: Invalid value for --with-freetype: should be yes, no or sys" >&2;} - { (exit 1); exit 1; }; } + { echo "configure: error: Invalid value for --with-freetype: should be yes, no, sys, or builtin" 1>&2; exit 1; } fi + - echo "$as_me:2817: checking for --with-opengl" >&5 -echo $ECHO_N "checking for --with-opengl... $ECHO_C" >&6 + echo $ac_n "checking for --with-opengl""... $ac_c" 1>&6 +echo "configure:2069: checking for --with-opengl" >&5 no_cache=0 - -# Check whether --with-opengl or --without-opengl was given. + # Check whether --with-opengl or --without-opengl was given. if test "${with_opengl+set}" = set; then withval="$with_opengl" - + if test "$withval" = yes; then ac_cv_use_opengl='wxUSE_OPENGL=yes' else ac_cv_use_opengl='wxUSE_OPENGL=no' fi - + else - + LINE=`grep "wxUSE_OPENGL" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -2838,8 +2087,9 @@ else fi ac_cv_use_opengl='wxUSE_OPENGL='$DEFAULT_wxUSE_OPENGL + +fi -fi; eval "$ac_cv_use_opengl" if test "$no_cache" != 1; then @@ -2847,31 +2097,30 @@ fi; fi if test "$wxUSE_OPENGL" = yes; then - echo "$as_me:2850: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + echo "$ac_t""yes" 1>&6 else - echo "$as_me:2853: result: no" >&5 -echo "${ECHO_T}no" >&6 + echo "$ac_t""no" 1>&6 fi + fi - echo "$as_me:2859: checking for --with-dmalloc" >&5 -echo $ECHO_N "checking for --with-dmalloc... $ECHO_C" >&6 - no_cache=0 -# Check whether --with-dmalloc or --without-dmalloc was given. + echo $ac_n "checking for --with-dmalloc""... $ac_c" 1>&6 +echo "configure:2111: 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" - + if test "$withval" = yes; then ac_cv_use_dmalloc='wxUSE_DMALLOC=yes' else ac_cv_use_dmalloc='wxUSE_DMALLOC=no' fi - + else - + LINE=`grep "wxUSE_DMALLOC" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -2880,8 +2129,9 @@ else fi ac_cv_use_dmalloc='wxUSE_DMALLOC='$DEFAULT_wxUSE_DMALLOC + +fi -fi; eval "$ac_cv_use_dmalloc" if test "$no_cache" != 1; then @@ -2889,35 +2139,84 @@ fi; fi if test "$wxUSE_DMALLOC" = yes; then - echo "$as_me:2892: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + echo "$ac_t""yes" 1>&6 else - echo "$as_me:2895: result: no" >&5 -echo "${ECHO_T}no" >&6 + echo "$ac_t""no" 1>&6 fi + - echo "$as_me:2899: checking for --with-zlib" >&5 -echo $ECHO_N "checking for --with-zlib... $ECHO_C" >&6 + echo $ac_n "checking for --with-regex""... $ac_c" 1>&6 +echo "configure:2150: checking for --with-regex" >&5 no_cache=0 + # Check whether --with-regex or --without-regex was given. +if test "${with_regex+set}" = set; then + withval="$with_regex" + + if test "$withval" = yes; then + ac_cv_use_regex='wxUSE_REGEX=yes' + elif test "$withval" = no; then + ac_cv_use_regex='wxUSE_REGEX=no' + elif test "$withval" = sys; then + ac_cv_use_regex='wxUSE_REGEX=sys' + elif test "$withval" = builtin; then + ac_cv_use_regex='wxUSE_REGEX=builtin' + else + { echo "configure: error: Invalid value for --with-regex: should be yes, no, sys, or builtin" 1>&2; exit 1; } + fi + +else + + LINE=`grep "wxUSE_REGEX" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_regex='wxUSE_REGEX='$DEFAULT_wxUSE_REGEX + +fi + + + eval "$ac_cv_use_regex" + if test "$no_cache" != 1; then + echo $ac_cv_use_regex >> ${wx_arg_cache_file}.tmp + fi + + if test "$wxUSE_REGEX" = yes; then + echo "$ac_t""yes" 1>&6 + elif test "$wxUSE_REGEX" = no; then + echo "$ac_t""no" 1>&6 + elif test "$wxUSE_REGEX" = sys; then + echo "$ac_t""system version" 1>&6 + elif test "$wxUSE_REGEX" = builtin; then + echo "$ac_t""builtin version" 1>&6 + else + { echo "configure: error: Invalid value for --with-regex: should be yes, no, sys, or builtin" 1>&2; exit 1; } + fi + -# Check whether --with-zlib or --without-zlib was given. + echo $ac_n "checking for --with-zlib""... $ac_c" 1>&6 +echo "configure:2201: 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" - + if test "$withval" = yes; then ac_cv_use_zlib='wxUSE_ZLIB=yes' elif test "$withval" = no; then ac_cv_use_zlib='wxUSE_ZLIB=no' elif test "$withval" = sys; then ac_cv_use_zlib='wxUSE_ZLIB=sys' + elif test "$withval" = builtin; then + ac_cv_use_zlib='wxUSE_ZLIB=builtin' else - { { echo "$as_me:2914: error: Invalid value for --with-zlib: should be yes, no or sys" >&5 -echo "$as_me: error: Invalid value for --with-zlib: should be yes, no or sys" >&2;} - { (exit 1); exit 1; }; } + { echo "configure: error: Invalid value for --with-zlib: should be yes, no, sys, or builtin" 1>&2; exit 1; } fi - + else - + LINE=`grep "wxUSE_ZLIB" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -2926,8 +2225,9 @@ else fi ac_cv_use_zlib='wxUSE_ZLIB='$DEFAULT_wxUSE_ZLIB + +fi -fi; eval "$ac_cv_use_zlib" if test "$no_cache" != 1; then @@ -2935,36 +2235,33 @@ fi; fi if test "$wxUSE_ZLIB" = yes; then - echo "$as_me:2938: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + echo "$ac_t""yes" 1>&6 elif test "$wxUSE_ZLIB" = no; then - echo "$as_me:2941: result: no" >&5 -echo "${ECHO_T}no" >&6 + echo "$ac_t""no" 1>&6 elif test "$wxUSE_ZLIB" = sys; then - echo "$as_me:2944: result: system version" >&5 -echo "${ECHO_T}system version" >&6 + echo "$ac_t""system version" 1>&6 + elif test "$wxUSE_ZLIB" = builtin; then + echo "$ac_t""builtin version" 1>&6 else - { { echo "$as_me:2947: error: Invalid value for --with-zlib: should be yes, no or sys" >&5 -echo "$as_me: error: Invalid value for --with-zlib: should be yes, no or sys" >&2;} - { (exit 1); exit 1; }; } + { echo "configure: error: Invalid value for --with-zlib: should be yes, no, sys, or builtin" 1>&2; exit 1; } fi + - echo "$as_me:2952: checking for --with-odbc" >&5 -echo $ECHO_N "checking for --with-odbc... $ECHO_C" >&6 + echo $ac_n "checking for --with-odbc""... $ac_c" 1>&6 +echo "configure:2252: checking for --with-odbc" >&5 no_cache=0 - -# Check whether --with-odbc or --without-odbc was given. + # Check whether --with-odbc or --without-odbc was given. if test "${with_odbc+set}" = set; then withval="$with_odbc" - + 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" @@ -2973,8 +2270,9 @@ else fi ac_cv_use_odbc='wxUSE_ODBC='$DEFAULT_wxUSE_ODBC + +fi -fi; eval "$ac_cv_use_odbc" if test "$no_cache" != 1; then @@ -2982,28 +2280,29 @@ fi; fi if test "$wxUSE_ODBC" = yes; then - echo "$as_me:2985: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + echo "$ac_t""yes" 1>&6 else - echo "$as_me:2988: result: no" >&5 -echo "${ECHO_T}no" >&6 + echo "$ac_t""no" 1>&6 fi + + + - echo "$as_me:2992: checking for --enable-shared" >&5 -echo $ECHO_N "checking for --enable-shared... $ECHO_C" >&6 + echo $ac_n "checking for --enable-shared""... $ac_c" 1>&6 +echo "configure:2293: 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 - + LINE=`grep "wxUSE_SHARED" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -3012,8 +2311,9 @@ else fi ac_cv_use_shared='wxUSE_SHARED='$DEFAULT_wxUSE_SHARED + +fi -fi; eval "$ac_cv_use_shared" if test "$no_cache" != 1; then @@ -3021,67 +2321,66 @@ fi; fi if test "$wxUSE_SHARED" = yes; then - echo "$as_me:3024: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + echo "$ac_t""yes" 1>&6 else - echo "$as_me:3027: result: no" >&5 -echo "${ECHO_T}no" >&6 + echo "$ac_t""no" 1>&6 fi + - echo "$as_me:3031: checking for --enable-burnt_name" >&5 -echo $ECHO_N "checking for --enable-burnt_name... $ECHO_C" >&6 + echo $ac_n "checking for --enable-soname""... $ac_c" 1>&6 +echo "configure:2332: checking for --enable-soname" >&5 no_cache=0 - # Check whether --enable-burnt_name or --disable-burnt_name was given. -if test "${enable_burnt_name+set}" = set; then - enableval="$enable_burnt_name" - + # Check whether --enable-soname or --disable-soname was given. +if test "${enable_soname+set}" = set; then + enableval="$enable_soname" + if test "$enableval" = yes; then - ac_cv_use_burnt_name='wxUSE_BURNT_NAME=yes' + ac_cv_use_soname='wxUSE_SONAME=yes' else - ac_cv_use_burnt_name='wxUSE_BURNT_NAME=no' + ac_cv_use_soname='wxUSE_SONAME=no' fi - + else - - LINE=`grep "wxUSE_BURNT_NAME" ${wx_arg_cache_file}` + + LINE=`grep "wxUSE_SONAME" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_burnt_name='wxUSE_BURNT_NAME='$DEFAULT_wxUSE_BURNT_NAME + ac_cv_use_soname='wxUSE_SONAME='$DEFAULT_wxUSE_SONAME + +fi -fi; - eval "$ac_cv_use_burnt_name" + eval "$ac_cv_use_soname" if test "$no_cache" != 1; then - echo $ac_cv_use_burnt_name >> ${wx_arg_cache_file}.tmp + echo $ac_cv_use_soname >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_BURNT_NAME" = yes; then - echo "$as_me:3063: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test "$wxUSE_SONAME" = yes; then + echo "$ac_t""yes" 1>&6 else - echo "$as_me:3066: result: no" >&5 -echo "${ECHO_T}no" >&6 + echo "$ac_t""no" 1>&6 fi + - echo "$as_me:3070: checking for --enable-optimise" >&5 -echo $ECHO_N "checking for --enable-optimise... $ECHO_C" >&6 + echo $ac_n "checking for --enable-optimise""... $ac_c" 1>&6 +echo "configure:2371: 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" - + if test "$enableval" = yes; then ac_cv_use_optimise='wxUSE_OPTIMISE=yes' else ac_cv_use_optimise='wxUSE_OPTIMISE=no' fi - + else - + LINE=`grep "wxUSE_OPTIMISE" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -3090,8 +2389,9 @@ else fi ac_cv_use_optimise='wxUSE_OPTIMISE='$DEFAULT_wxUSE_OPTIMISE + +fi -fi; eval "$ac_cv_use_optimise" if test "$no_cache" != 1; then @@ -3099,28 +2399,27 @@ fi; fi if test "$wxUSE_OPTIMISE" = yes; then - echo "$as_me:3102: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + echo "$ac_t""yes" 1>&6 else - echo "$as_me:3105: result: no" >&5 -echo "${ECHO_T}no" >&6 + echo "$ac_t""no" 1>&6 fi + - echo "$as_me:3109: checking for --enable-debug" >&5 -echo $ECHO_N "checking for --enable-debug... $ECHO_C" >&6 + echo $ac_n "checking for --enable-debug""... $ac_c" 1>&6 +echo "configure:2410: 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 - + LINE=`grep "wxUSE_DEBUG" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -3129,8 +2428,9 @@ else fi ac_cv_use_debug='wxUSE_DEBUG='$DEFAULT_wxUSE_DEBUG + +fi -fi; eval "$ac_cv_use_debug" if test "$no_cache" != 1; then @@ -3138,12 +2438,51 @@ fi; fi if test "$wxUSE_DEBUG" = yes; then - echo "$as_me:3141: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + echo "$ac_t""yes" 1>&6 else - echo "$as_me:3144: result: no" >&5 -echo "${ECHO_T}no" >&6 + echo "$ac_t""no" 1>&6 fi + + + + echo $ac_n "checking for --enable-precomp""... $ac_c" 1>&6 +echo "configure:2450: checking for --enable-precomp" >&5 + no_cache=0 + # Check whether --enable-precomp or --disable-precomp was given. +if test "${enable_precomp+set}" = set; then + enableval="$enable_precomp" + + if test "$enableval" = yes; then + ac_cv_use_precomp='wxUSE_PRECOMP=yes' + else + ac_cv_use_precomp='wxUSE_PRECOMP=no' + fi + +else + + LINE=`grep "wxUSE_PRECOMP" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_precomp='wxUSE_PRECOMP='$DEFAULT_wxUSE_PRECOMP + +fi + + + eval "$ac_cv_use_precomp" + if test "$no_cache" != 1; then + echo $ac_cv_use_precomp >> ${wx_arg_cache_file}.tmp + fi + + if test "$wxUSE_PRECOMP" = 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 @@ -3153,21 +2492,22 @@ elif test "$wxUSE_DEBUG" = "no"; then DEFAULT_wxUSE_DEBUG_INFO=no fi - echo "$as_me:3156: checking for --enable-debug_flag" >&5 -echo $ECHO_N "checking for --enable-debug_flag... $ECHO_C" >&6 + + echo $ac_n "checking for --enable-debug_flag""... $ac_c" 1>&6 +echo "configure:2498: 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" - + 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 - + LINE=`grep "wxUSE_DEBUG_FLAG" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -3176,8 +2516,9 @@ else fi ac_cv_use_debug_flag='wxUSE_DEBUG_FLAG='$DEFAULT_wxUSE_DEBUG_FLAG + +fi -fi; eval "$ac_cv_use_debug_flag" if test "$no_cache" != 1; then @@ -3185,28 +2526,27 @@ fi; fi if test "$wxUSE_DEBUG_FLAG" = yes; then - echo "$as_me:3188: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + echo "$ac_t""yes" 1>&6 else - echo "$as_me:3191: result: no" >&5 -echo "${ECHO_T}no" >&6 + echo "$ac_t""no" 1>&6 fi + - echo "$as_me:3195: checking for --enable-debug_info" >&5 -echo $ECHO_N "checking for --enable-debug_info... $ECHO_C" >&6 + echo $ac_n "checking for --enable-debug_info""... $ac_c" 1>&6 +echo "configure:2537: 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" - + 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 - + LINE=`grep "wxUSE_DEBUG_INFO" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -3215,8 +2555,9 @@ else fi ac_cv_use_debug_info='wxUSE_DEBUG_INFO='$DEFAULT_wxUSE_DEBUG_INFO + +fi -fi; eval "$ac_cv_use_debug_info" if test "$no_cache" != 1; then @@ -3224,28 +2565,27 @@ fi; fi if test "$wxUSE_DEBUG_INFO" = yes; then - echo "$as_me:3227: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + echo "$ac_t""yes" 1>&6 else - echo "$as_me:3230: result: no" >&5 -echo "${ECHO_T}no" >&6 + echo "$ac_t""no" 1>&6 fi + - echo "$as_me:3234: checking for --enable-debug_gdb" >&5 -echo $ECHO_N "checking for --enable-debug_gdb... $ECHO_C" >&6 + echo $ac_n "checking for --enable-debug_gdb""... $ac_c" 1>&6 +echo "configure:2576: 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" - + 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 - + LINE=`grep "wxUSE_DEBUG_GDB" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -3254,8 +2594,9 @@ else fi ac_cv_use_debug_gdb='wxUSE_DEBUG_GDB='$DEFAULT_wxUSE_DEBUG_GDB + +fi -fi; eval "$ac_cv_use_debug_gdb" if test "$no_cache" != 1; then @@ -3263,28 +2604,27 @@ fi; fi if test "$wxUSE_DEBUG_GDB" = yes; then - echo "$as_me:3266: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + echo "$ac_t""yes" 1>&6 else - echo "$as_me:3269: result: no" >&5 -echo "${ECHO_T}no" >&6 + echo "$ac_t""no" 1>&6 fi + - echo "$as_me:3273: checking for --enable-debug_cntxt" >&5 -echo $ECHO_N "checking for --enable-debug_cntxt... $ECHO_C" >&6 + echo $ac_n "checking for --enable-debug_cntxt""... $ac_c" 1>&6 +echo "configure:2615: 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" - + 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" @@ -3293,8 +2633,9 @@ else fi ac_cv_use_debug_cntxt='wxUSE_DEBUG_CONTEXT='$DEFAULT_wxUSE_DEBUG_CONTEXT + +fi -fi; eval "$ac_cv_use_debug_cntxt" if test "$no_cache" != 1; then @@ -3302,28 +2643,27 @@ fi; fi if test "$wxUSE_DEBUG_CONTEXT" = yes; then - echo "$as_me:3305: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + echo "$ac_t""yes" 1>&6 else - echo "$as_me:3308: result: no" >&5 -echo "${ECHO_T}no" >&6 + echo "$ac_t""no" 1>&6 fi + - echo "$as_me:3312: checking for --enable-mem_tracing" >&5 -echo $ECHO_N "checking for --enable-mem_tracing... $ECHO_C" >&6 + echo $ac_n "checking for --enable-mem_tracing""... $ac_c" 1>&6 +echo "configure:2654: 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" - + 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 - + LINE=`grep "wxUSE_MEM_TRACING" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -3332,8 +2672,9 @@ else fi ac_cv_use_mem_tracing='wxUSE_MEM_TRACING='$DEFAULT_wxUSE_MEM_TRACING + +fi -fi; eval "$ac_cv_use_mem_tracing" if test "$no_cache" != 1; then @@ -3341,28 +2682,27 @@ fi; fi if test "$wxUSE_MEM_TRACING" = yes; then - echo "$as_me:3344: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + echo "$ac_t""yes" 1>&6 else - echo "$as_me:3347: result: no" >&5 -echo "${ECHO_T}no" >&6 + echo "$ac_t""no" 1>&6 fi + - echo "$as_me:3351: checking for --enable-profile" >&5 -echo $ECHO_N "checking for --enable-profile... $ECHO_C" >&6 + echo $ac_n "checking for --enable-profile""... $ac_c" 1>&6 +echo "configure:2693: 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" - + 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" @@ -3371,8 +2711,9 @@ else fi ac_cv_use_profile='wxUSE_PROFILE='$DEFAULT_wxUSE_PROFILE + +fi -fi; eval "$ac_cv_use_profile" if test "$no_cache" != 1; then @@ -3380,28 +2721,27 @@ fi; fi if test "$wxUSE_PROFILE" = yes; then - echo "$as_me:3383: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + echo "$ac_t""yes" 1>&6 else - echo "$as_me:3386: result: no" >&5 -echo "${ECHO_T}no" >&6 + echo "$ac_t""no" 1>&6 fi + - echo "$as_me:3390: checking for --enable-no_rtti" >&5 -echo $ECHO_N "checking for --enable-no_rtti... $ECHO_C" >&6 + echo $ac_n "checking for --enable-no_rtti""... $ac_c" 1>&6 +echo "configure:2732: 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" @@ -3410,8 +2750,9 @@ else fi ac_cv_use_no_rtti='wxUSE_NO_RTTI='$DEFAULT_wxUSE_NO_RTTI + +fi -fi; eval "$ac_cv_use_no_rtti" if test "$no_cache" != 1; then @@ -3419,28 +2760,27 @@ fi; fi if test "$wxUSE_NO_RTTI" = yes; then - echo "$as_me:3422: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + echo "$ac_t""yes" 1>&6 else - echo "$as_me:3425: result: no" >&5 -echo "${ECHO_T}no" >&6 + echo "$ac_t""no" 1>&6 fi + - echo "$as_me:3429: checking for --enable-no_exceptions" >&5 -echo $ECHO_N "checking for --enable-no_exceptions... $ECHO_C" >&6 + echo $ac_n "checking for --enable-no_exceptions""... $ac_c" 1>&6 +echo "configure:2771: 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 - + LINE=`grep "wxUSE_NO_EXCEPTIONS" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -3449,8 +2789,9 @@ else fi ac_cv_use_no_exceptions='wxUSE_NO_EXCEPTIONS='$DEFAULT_wxUSE_NO_EXCEPTIONS + +fi -fi; eval "$ac_cv_use_no_exceptions" if test "$no_cache" != 1; then @@ -3458,28 +2799,27 @@ fi; fi if test "$wxUSE_NO_EXCEPTIONS" = yes; then - echo "$as_me:3461: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + echo "$ac_t""yes" 1>&6 else - echo "$as_me:3464: result: no" >&5 -echo "${ECHO_T}no" >&6 + echo "$ac_t""no" 1>&6 fi + - echo "$as_me:3468: checking for --enable-permissive" >&5 -echo $ECHO_N "checking for --enable-permissive... $ECHO_C" >&6 + echo $ac_n "checking for --enable-permissive""... $ac_c" 1>&6 +echo "configure:2810: checking for --enable-permissive" >&5 no_cache=0 # Check whether --enable-permissive or --disable-permissive was given. if test "${enable_permissive+set}" = set; then enableval="$enable_permissive" - + if test "$enableval" = yes; then ac_cv_use_permissive='wxUSE_PERMISSIVE=yes' else ac_cv_use_permissive='wxUSE_PERMISSIVE=no' fi - + else - + LINE=`grep "wxUSE_PERMISSIVE" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -3488,8 +2828,9 @@ else fi ac_cv_use_permissive='wxUSE_PERMISSIVE='$DEFAULT_wxUSE_PERMISSIVE + +fi -fi; eval "$ac_cv_use_permissive" if test "$no_cache" != 1; then @@ -3497,28 +2838,27 @@ fi; fi if test "$wxUSE_PERMISSIVE" = yes; then - echo "$as_me:3500: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + echo "$ac_t""yes" 1>&6 else - echo "$as_me:3503: result: no" >&5 -echo "${ECHO_T}no" >&6 + echo "$ac_t""no" 1>&6 fi + - echo "$as_me:3507: checking for --enable-no_deps" >&5 -echo $ECHO_N "checking for --enable-no_deps... $ECHO_C" >&6 + echo $ac_n "checking for --enable-no_deps""... $ac_c" 1>&6 +echo "configure:2849: checking for --enable-no_deps" >&5 no_cache=0 # Check whether --enable-no_deps or --disable-no_deps was given. if test "${enable_no_deps+set}" = set; then enableval="$enable_no_deps" - + if test "$enableval" = yes; then ac_cv_use_no_deps='wxUSE_NO_DEPS=yes' else ac_cv_use_no_deps='wxUSE_NO_DEPS=no' fi - + else - + LINE=`grep "wxUSE_NO_DEPS" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -3527,8 +2867,9 @@ else fi ac_cv_use_no_deps='wxUSE_NO_DEPS='$DEFAULT_wxUSE_NO_DEPS + +fi -fi; eval "$ac_cv_use_no_deps" if test "$no_cache" != 1; then @@ -3536,28 +2877,108 @@ fi; fi if test "$wxUSE_NO_DEPS" = yes; then - echo "$as_me:3539: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + echo "$ac_t""yes" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + + + + echo $ac_n "checking for --enable-compat20""... $ac_c" 1>&6 +echo "configure:2889: checking for --enable-compat20" >&5 + no_cache=0 + # Check whether --enable-compat20 or --disable-compat20 was given. +if test "${enable_compat20+set}" = set; then + enableval="$enable_compat20" + + if test "$enableval" = yes; then + ac_cv_use_compat20='WXWIN_COMPATIBILITY_2=yes' + else + ac_cv_use_compat20='WXWIN_COMPATIBILITY_2=no' + fi + +else + + LINE=`grep "WXWIN_COMPATIBILITY_2" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_compat20='WXWIN_COMPATIBILITY_2='$DEFAULT_WXWIN_COMPATIBILITY_2 + +fi + + + eval "$ac_cv_use_compat20" + if test "$no_cache" != 1; then + echo $ac_cv_use_compat20 >> ${wx_arg_cache_file}.tmp + fi + + if test "$WXWIN_COMPATIBILITY_2" = yes; then + echo "$ac_t""yes" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + + + echo $ac_n "checking for --enable-compat22""... $ac_c" 1>&6 +echo "configure:2928: checking for --enable-compat22" >&5 + no_cache=0 + # Check whether --enable-compat22 or --disable-compat22 was given. +if test "${enable_compat22+set}" = set; then + enableval="$enable_compat22" + + if test "$enableval" = yes; then + ac_cv_use_compat22='WXWIN_COMPATIBILITY_2_2=yes' + else + ac_cv_use_compat22='WXWIN_COMPATIBILITY_2_2=no' + fi + +else + + LINE=`grep "WXWIN_COMPATIBILITY_2_2" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_compat22='WXWIN_COMPATIBILITY_2_2='$DEFAULT_WXWIN_COMPATIBILITY_2_2 + +fi + + + eval "$ac_cv_use_compat22" + if test "$no_cache" != 1; then + echo $ac_cv_use_compat22 >> ${wx_arg_cache_file}.tmp + fi + + if test "$WXWIN_COMPATIBILITY_2_2" = yes; then + echo "$ac_t""yes" 1>&6 else - echo "$as_me:3542: result: no" >&5 -echo "${ECHO_T}no" >&6 + echo "$ac_t""no" 1>&6 fi + + - echo "$as_me:3546: checking for --enable-intl" >&5 -echo $ECHO_N "checking for --enable-intl... $ECHO_C" >&6 + + echo $ac_n "checking for --enable-intl""... $ac_c" 1>&6 +echo "configure:2969: 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" - + if test "$enableval" = yes; then ac_cv_use_intl='wxUSE_INTL=yes' else ac_cv_use_intl='wxUSE_INTL=no' fi - + else - + LINE=`grep "wxUSE_INTL" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -3566,8 +2987,9 @@ else fi ac_cv_use_intl='wxUSE_INTL='$DEFAULT_wxUSE_INTL + +fi -fi; eval "$ac_cv_use_intl" if test "$no_cache" != 1; then @@ -3575,28 +2997,27 @@ fi; fi if test "$wxUSE_INTL" = yes; then - echo "$as_me:3578: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + echo "$ac_t""yes" 1>&6 else - echo "$as_me:3581: result: no" >&5 -echo "${ECHO_T}no" >&6 + echo "$ac_t""no" 1>&6 fi + - echo "$as_me:3585: checking for --enable-config" >&5 -echo $ECHO_N "checking for --enable-config... $ECHO_C" >&6 + echo $ac_n "checking for --enable-config""... $ac_c" 1>&6 +echo "configure:3008: 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" - + if test "$enableval" = yes; then ac_cv_use_config='wxUSE_CONFIG=yes' else ac_cv_use_config='wxUSE_CONFIG=no' fi - + else - + LINE=`grep "wxUSE_CONFIG" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -3605,8 +3026,9 @@ else fi ac_cv_use_config='wxUSE_CONFIG='$DEFAULT_wxUSE_CONFIG + +fi -fi; eval "$ac_cv_use_config" if test "$no_cache" != 1; then @@ -3614,28 +3036,28 @@ fi; fi if test "$wxUSE_CONFIG" = yes; then - echo "$as_me:3617: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + echo "$ac_t""yes" 1>&6 else - echo "$as_me:3620: result: no" >&5 -echo "${ECHO_T}no" >&6 + echo "$ac_t""no" 1>&6 fi + + - echo "$as_me:3624: checking for --enable-sockets" >&5 -echo $ECHO_N "checking for --enable-sockets... $ECHO_C" >&6 + echo $ac_n "checking for --enable-sockets""... $ac_c" 1>&6 +echo "configure:3048: 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" - + if test "$enableval" = yes; then ac_cv_use_sockets='wxUSE_SOCKETS=yes' else ac_cv_use_sockets='wxUSE_SOCKETS=no' fi - + else - + LINE=`grep "wxUSE_SOCKETS" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -3644,8 +3066,9 @@ else fi ac_cv_use_sockets='wxUSE_SOCKETS='$DEFAULT_wxUSE_SOCKETS + +fi -fi; eval "$ac_cv_use_sockets" if test "$no_cache" != 1; then @@ -3653,28 +3076,28 @@ fi; fi if test "$wxUSE_SOCKETS" = yes; then - echo "$as_me:3656: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + echo "$ac_t""yes" 1>&6 else - echo "$as_me:3659: result: no" >&5 -echo "${ECHO_T}no" >&6 + echo "$ac_t""no" 1>&6 fi + - echo "$as_me:3663: checking for --enable-ipc" >&5 -echo $ECHO_N "checking for --enable-ipc... $ECHO_C" >&6 + + echo $ac_n "checking for --enable-ipc""... $ac_c" 1>&6 +echo "configure:3088: 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" - + if test "$enableval" = yes; then ac_cv_use_ipc='wxUSE_IPC=yes' else ac_cv_use_ipc='wxUSE_IPC=no' fi - + else - + LINE=`grep "wxUSE_IPC" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -3683,8 +3106,9 @@ else fi ac_cv_use_ipc='wxUSE_IPC='$DEFAULT_wxUSE_IPC + +fi -fi; eval "$ac_cv_use_ipc" if test "$no_cache" != 1; then @@ -3692,106 +3116,106 @@ fi; fi if test "$wxUSE_IPC" = yes; then - echo "$as_me:3695: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + echo "$ac_t""yes" 1>&6 else - echo "$as_me:3698: result: no" >&5 -echo "${ECHO_T}no" >&6 + echo "$ac_t""no" 1>&6 fi + - echo "$as_me:3702: checking for --enable-dialupman" >&5 -echo $ECHO_N "checking for --enable-dialupman... $ECHO_C" >&6 - no_cache=0 - # Check whether --enable-dialupman or --disable-dialupman was given. -if test "${enable_dialupman+set}" = set; then - enableval="$enable_dialupman" + echo $ac_n "checking for --enable-cmdline""... $ac_c" 1>&6 +echo "configure:3128: checking for --enable-cmdline" >&5 + no_cache=0 + # Check whether --enable-cmdline or --disable-cmdline was given. +if test "${enable_cmdline+set}" = set; then + enableval="$enable_cmdline" + if test "$enableval" = yes; then - ac_cv_use_dialupman='wxUSE_DIALUP_MANAGER=yes' + ac_cv_use_cmdline='wxUSE_CMDLINE_PARSER=yes' else - ac_cv_use_dialupman='wxUSE_DIALUP_MANAGER=no' + ac_cv_use_cmdline='wxUSE_CMDLINE_PARSER=no' fi - + else - - LINE=`grep "wxUSE_DIALUP_MANAGER" ${wx_arg_cache_file}` + + LINE=`grep "wxUSE_CMDLINE_PARSER" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_dialupman='wxUSE_DIALUP_MANAGER='$DEFAULT_wxUSE_DIALUP_MANAGER + ac_cv_use_cmdline='wxUSE_CMDLINE_PARSER='$DEFAULT_wxUSE_CMDLINE_PARSER + +fi -fi; - eval "$ac_cv_use_dialupman" + eval "$ac_cv_use_cmdline" if test "$no_cache" != 1; then - echo $ac_cv_use_dialupman >> ${wx_arg_cache_file}.tmp + echo $ac_cv_use_cmdline >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_DIALUP_MANAGER" = yes; then - echo "$as_me:3734: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test "$wxUSE_CMDLINE_PARSER" = yes; then + echo "$ac_t""yes" 1>&6 else - echo "$as_me:3737: result: no" >&5 -echo "${ECHO_T}no" >&6 + echo "$ac_t""no" 1>&6 fi + - echo "$as_me:3741: checking for --enable-apple_ieee" >&5 -echo $ECHO_N "checking for --enable-apple_ieee... $ECHO_C" >&6 + echo $ac_n "checking for --enable-datetime""... $ac_c" 1>&6 +echo "configure:3167: checking for --enable-datetime" >&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" - + # Check whether --enable-datetime or --disable-datetime was given. +if test "${enable_datetime+set}" = set; then + enableval="$enable_datetime" + if test "$enableval" = yes; then - ac_cv_use_apple_ieee='wxUSE_APPLE_IEEE=yes' + ac_cv_use_datetime='wxUSE_DATETIME=yes' else - ac_cv_use_apple_ieee='wxUSE_APPLE_IEEE=no' + ac_cv_use_datetime='wxUSE_DATETIME=no' fi - + else - - LINE=`grep "wxUSE_APPLE_IEEE" ${wx_arg_cache_file}` + + LINE=`grep "wxUSE_DATETIME" ${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 + ac_cv_use_datetime='wxUSE_DATETIME='$DEFAULT_wxUSE_DATETIME + +fi -fi; - eval "$ac_cv_use_apple_ieee" + eval "$ac_cv_use_datetime" if test "$no_cache" != 1; then - echo $ac_cv_use_apple_ieee >> ${wx_arg_cache_file}.tmp + echo $ac_cv_use_datetime >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_APPLE_IEEE" = yes; then - echo "$as_me:3773: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test "$wxUSE_DATETIME" = yes; then + echo "$ac_t""yes" 1>&6 else - echo "$as_me:3776: result: no" >&5 -echo "${ECHO_T}no" >&6 + echo "$ac_t""no" 1>&6 fi + - echo "$as_me:3780: checking for --enable-timedate" >&5 -echo $ECHO_N "checking for --enable-timedate... $ECHO_C" >&6 + echo $ac_n "checking for --enable-timedate""... $ac_c" 1>&6 +echo "configure:3206: 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" - + 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" @@ -3800,8 +3224,9 @@ else fi ac_cv_use_timedate='wxUSE_TIMEDATE='$DEFAULT_wxUSE_TIMEDATE + +fi -fi; eval "$ac_cv_use_timedate" if test "$no_cache" != 1; then @@ -3809,28 +3234,183 @@ fi; fi if test "$wxUSE_TIMEDATE" = yes; then - echo "$as_me:3812: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + echo "$ac_t""yes" 1>&6 else - echo "$as_me:3815: result: no" >&5 -echo "${ECHO_T}no" >&6 + echo "$ac_t""no" 1>&6 fi + - echo "$as_me:3819: checking for --enable-wave" >&5 -echo $ECHO_N "checking for --enable-wave... $ECHO_C" >&6 + echo $ac_n "checking for --enable-stopwatch""... $ac_c" 1>&6 +echo "configure:3245: checking for --enable-stopwatch" >&5 no_cache=0 - # Check whether --enable-wave or --disable-wave was given. -if test "${enable_wave+set}" = set; then - enableval="$enable_wave" - + # Check whether --enable-stopwatch or --disable-stopwatch was given. +if test "${enable_stopwatch+set}" = set; then + enableval="$enable_stopwatch" + if test "$enableval" = yes; then - ac_cv_use_wave='wxUSE_WAVE=yes' + ac_cv_use_stopwatch='wxUSE_STOPWATCH=yes' else - ac_cv_use_wave='wxUSE_WAVE=no' + ac_cv_use_stopwatch='wxUSE_STOPWATCH=no' + fi + +else + + LINE=`grep "wxUSE_STOPWATCH" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_stopwatch='wxUSE_STOPWATCH='$DEFAULT_wxUSE_STOPWATCH + +fi + + + eval "$ac_cv_use_stopwatch" + if test "$no_cache" != 1; then + echo $ac_cv_use_stopwatch >> ${wx_arg_cache_file}.tmp + fi + + if test "$wxUSE_STOPWATCH" = yes; then + echo "$ac_t""yes" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + + + echo $ac_n "checking for --enable-dialupman""... $ac_c" 1>&6 +echo "configure:3284: checking for --enable-dialupman" >&5 + no_cache=0 + # Check whether --enable-dialupman or --disable-dialupman was given. +if test "${enable_dialupman+set}" = set; then + enableval="$enable_dialupman" + + if test "$enableval" = yes; then + ac_cv_use_dialupman='wxUSE_DIALUP_MANAGER=yes' + else + ac_cv_use_dialupman='wxUSE_DIALUP_MANAGER=no' + fi + +else + + LINE=`grep "wxUSE_DIALUP_MANAGER" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_dialupman='wxUSE_DIALUP_MANAGER='$DEFAULT_wxUSE_DIALUP_MANAGER + +fi + + + eval "$ac_cv_use_dialupman" + if test "$no_cache" != 1; then + echo $ac_cv_use_dialupman >> ${wx_arg_cache_file}.tmp + fi + + if test "$wxUSE_DIALUP_MANAGER" = 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:3323: 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" + + 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 + + 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 + + + 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-timer""... $ac_c" 1>&6 +echo "configure:3362: checking for --enable-timer" >&5 + no_cache=0 + # Check whether --enable-timer or --disable-timer was given. +if test "${enable_timer+set}" = set; then + enableval="$enable_timer" + + if test "$enableval" = yes; then + ac_cv_use_timer='wxUSE_TIMER=yes' + else + ac_cv_use_timer='wxUSE_TIMER=no' + fi + else + + LINE=`grep "wxUSE_TIMER" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_timer='wxUSE_TIMER='$DEFAULT_wxUSE_TIMER + +fi + + eval "$ac_cv_use_timer" + if test "$no_cache" != 1; then + echo $ac_cv_use_timer >> ${wx_arg_cache_file}.tmp + fi + + if test "$wxUSE_TIMER" = 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:3401: 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 + LINE=`grep "wxUSE_WAVE" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -3839,8 +3419,9 @@ else fi ac_cv_use_wave='wxUSE_WAVE='$DEFAULT_wxUSE_WAVE + +fi -fi; eval "$ac_cv_use_wave" if test "$no_cache" != 1; then @@ -3848,28 +3429,27 @@ fi; fi if test "$wxUSE_WAVE" = yes; then - echo "$as_me:3851: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + echo "$ac_t""yes" 1>&6 else - echo "$as_me:3854: result: no" >&5 -echo "${ECHO_T}no" >&6 + echo "$ac_t""no" 1>&6 fi + - echo "$as_me:3858: checking for --enable-fraction" >&5 -echo $ECHO_N "checking for --enable-fraction... $ECHO_C" >&6 + echo $ac_n "checking for --enable-fraction""... $ac_c" 1>&6 +echo "configure:3440: 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" - + if test "$enableval" = yes; then ac_cv_use_fraction='wxUSE_FRACTION=yes' else ac_cv_use_fraction='wxUSE_FRACTION=no' fi - + else - + LINE=`grep "wxUSE_FRACTION" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -3878,8 +3458,9 @@ else fi ac_cv_use_fraction='wxUSE_FRACTION='$DEFAULT_wxUSE_FRACTION + +fi -fi; eval "$ac_cv_use_fraction" if test "$no_cache" != 1; then @@ -3887,28 +3468,27 @@ fi; fi if test "$wxUSE_FRACTION" = yes; then - echo "$as_me:3890: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + echo "$ac_t""yes" 1>&6 else - echo "$as_me:3893: result: no" >&5 -echo "${ECHO_T}no" >&6 + echo "$ac_t""no" 1>&6 fi + - echo "$as_me:3897: checking for --enable-dynlib" >&5 -echo $ECHO_N "checking for --enable-dynlib... $ECHO_C" >&6 + echo $ac_n "checking for --enable-dynlib""... $ac_c" 1>&6 +echo "configure:3479: 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" - + if test "$enableval" = yes; then ac_cv_use_dynlib='wxUSE_DYNLIB_CLASS=yes' else ac_cv_use_dynlib='wxUSE_DYNLIB_CLASS=no' fi - + else - + LINE=`grep "wxUSE_DYNLIB_CLASS" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -3917,8 +3497,9 @@ else fi ac_cv_use_dynlib='wxUSE_DYNLIB_CLASS='$DEFAULT_wxUSE_DYNLIB_CLASS + +fi -fi; eval "$ac_cv_use_dynlib" if test "$no_cache" != 1; then @@ -3926,28 +3507,27 @@ fi; fi if test "$wxUSE_DYNLIB_CLASS" = yes; then - echo "$as_me:3929: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + echo "$ac_t""yes" 1>&6 else - echo "$as_me:3932: result: no" >&5 -echo "${ECHO_T}no" >&6 + echo "$ac_t""no" 1>&6 fi + - echo "$as_me:3936: checking for --enable-longlong" >&5 -echo $ECHO_N "checking for --enable-longlong... $ECHO_C" >&6 + echo $ac_n "checking for --enable-longlong""... $ac_c" 1>&6 +echo "configure:3518: 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" - + if test "$enableval" = yes; then ac_cv_use_longlong='wxUSE_LONGLONG=yes' else ac_cv_use_longlong='wxUSE_LONGLONG=no' fi - + else - + LINE=`grep "wxUSE_LONGLONG" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -3956,8 +3536,9 @@ else fi ac_cv_use_longlong='wxUSE_LONGLONG='$DEFAULT_wxUSE_LONGLONG + +fi -fi; eval "$ac_cv_use_longlong" if test "$no_cache" != 1; then @@ -3965,28 +3546,27 @@ fi; fi if test "$wxUSE_LONGLONG" = yes; then - echo "$as_me:3968: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + echo "$ac_t""yes" 1>&6 else - echo "$as_me:3971: result: no" >&5 -echo "${ECHO_T}no" >&6 + echo "$ac_t""no" 1>&6 fi + - echo "$as_me:3975: checking for --enable-geometry" >&5 -echo $ECHO_N "checking for --enable-geometry... $ECHO_C" >&6 + echo $ac_n "checking for --enable-geometry""... $ac_c" 1>&6 +echo "configure:3557: checking for --enable-geometry" >&5 no_cache=0 # Check whether --enable-geometry or --disable-geometry was given. if test "${enable_geometry+set}" = set; then enableval="$enable_geometry" - + if test "$enableval" = yes; then ac_cv_use_geometry='wxUSE_GEOMETRY=yes' else ac_cv_use_geometry='wxUSE_GEOMETRY=no' fi - + else - + LINE=`grep "wxUSE_GEOMETRY" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -3995,8 +3575,9 @@ else fi ac_cv_use_geometry='wxUSE_GEOMETRY='$DEFAULT_wxUSE_GEOMETRY + +fi -fi; eval "$ac_cv_use_geometry" if test "$no_cache" != 1; then @@ -4004,28 +3585,27 @@ fi; fi if test "$wxUSE_GEOMETRY" = yes; then - echo "$as_me:4007: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + echo "$ac_t""yes" 1>&6 else - echo "$as_me:4010: result: no" >&5 -echo "${ECHO_T}no" >&6 + echo "$ac_t""no" 1>&6 fi + - echo "$as_me:4014: checking for --enable-log" >&5 -echo $ECHO_N "checking for --enable-log... $ECHO_C" >&6 + echo $ac_n "checking for --enable-log""... $ac_c" 1>&6 +echo "configure:3596: 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" - + if test "$enableval" = yes; then ac_cv_use_log='wxUSE_LOG=yes' else ac_cv_use_log='wxUSE_LOG=no' fi - + else - + LINE=`grep "wxUSE_LOG" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -4034,8 +3614,9 @@ else fi ac_cv_use_log='wxUSE_LOG='$DEFAULT_wxUSE_LOG + +fi -fi; eval "$ac_cv_use_log" if test "$no_cache" != 1; then @@ -4043,28 +3624,27 @@ fi; fi if test "$wxUSE_LOG" = yes; then - echo "$as_me:4046: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + echo "$ac_t""yes" 1>&6 else - echo "$as_me:4049: result: no" >&5 -echo "${ECHO_T}no" >&6 + echo "$ac_t""no" 1>&6 fi + - echo "$as_me:4053: checking for --enable-streams" >&5 -echo $ECHO_N "checking for --enable-streams... $ECHO_C" >&6 + echo $ac_n "checking for --enable-streams""... $ac_c" 1>&6 +echo "configure:3635: 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" - + if test "$enableval" = yes; then ac_cv_use_streams='wxUSE_STREAMS=yes' else ac_cv_use_streams='wxUSE_STREAMS=no' fi - + else - + LINE=`grep "wxUSE_STREAMS" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -4073,8 +3653,9 @@ else fi ac_cv_use_streams='wxUSE_STREAMS='$DEFAULT_wxUSE_STREAMS + +fi -fi; eval "$ac_cv_use_streams" if test "$no_cache" != 1; then @@ -4082,28 +3663,27 @@ fi; fi if test "$wxUSE_STREAMS" = yes; then - echo "$as_me:4085: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + echo "$ac_t""yes" 1>&6 else - echo "$as_me:4088: result: no" >&5 -echo "${ECHO_T}no" >&6 + echo "$ac_t""no" 1>&6 fi + - echo "$as_me:4092: checking for --enable-file" >&5 -echo $ECHO_N "checking for --enable-file... $ECHO_C" >&6 + echo $ac_n "checking for --enable-file""... $ac_c" 1>&6 +echo "configure:3674: 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" @@ -4112,8 +3692,9 @@ else fi ac_cv_use_file='wxUSE_FILE='$DEFAULT_wxUSE_FILE + +fi -fi; eval "$ac_cv_use_file" if test "$no_cache" != 1; then @@ -4121,28 +3702,66 @@ fi; fi if test "$wxUSE_FILE" = yes; then - echo "$as_me:4124: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + echo "$ac_t""yes" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + + + echo $ac_n "checking for --enable-ffile""... $ac_c" 1>&6 +echo "configure:3713: checking for --enable-ffile" >&5 + no_cache=0 + # Check whether --enable-ffile or --disable-ffile was given. +if test "${enable_ffile+set}" = set; then + enableval="$enable_ffile" + + if test "$enableval" = yes; then + ac_cv_use_ffile='wxUSE_FFILE=yes' + else + ac_cv_use_ffile='wxUSE_FFILE=no' + fi + +else + + LINE=`grep "wxUSE_FFILE" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_ffile='wxUSE_FFILE='$DEFAULT_wxUSE_FFILE + +fi + + + eval "$ac_cv_use_ffile" + if test "$no_cache" != 1; then + echo $ac_cv_use_ffile >> ${wx_arg_cache_file}.tmp + fi + + if test "$wxUSE_FFILE" = yes; then + echo "$ac_t""yes" 1>&6 else - echo "$as_me:4127: result: no" >&5 -echo "${ECHO_T}no" >&6 + echo "$ac_t""no" 1>&6 fi + - echo "$as_me:4131: checking for --enable-textfile" >&5 -echo $ECHO_N "checking for --enable-textfile... $ECHO_C" >&6 + echo $ac_n "checking for --enable-textfile""... $ac_c" 1>&6 +echo "configure:3752: 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" - + if test "$enableval" = yes; then ac_cv_use_textfile='wxUSE_TEXTFILE=yes' else ac_cv_use_textfile='wxUSE_TEXTFILE=no' fi - + else - + LINE=`grep "wxUSE_TEXTFILE" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -4151,8 +3770,9 @@ else fi ac_cv_use_textfile='wxUSE_TEXTFILE='$DEFAULT_wxUSE_TEXTFILE + +fi -fi; eval "$ac_cv_use_textfile" if test "$no_cache" != 1; then @@ -4160,106 +3780,105 @@ fi; fi if test "$wxUSE_TEXTFILE" = yes; then - echo "$as_me:4163: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + echo "$ac_t""yes" 1>&6 else - echo "$as_me:4166: result: no" >&5 -echo "${ECHO_T}no" >&6 + echo "$ac_t""no" 1>&6 fi + - echo "$as_me:4170: checking for --enable-unicode" >&5 -echo $ECHO_N "checking for --enable-unicode... $ECHO_C" >&6 + echo $ac_n "checking for --enable-fontmap""... $ac_c" 1>&6 +echo "configure:3791: checking for --enable-fontmap" >&5 no_cache=0 - # Check whether --enable-unicode or --disable-unicode was given. -if test "${enable_unicode+set}" = set; then - enableval="$enable_unicode" - + # Check whether --enable-fontmap or --disable-fontmap was given. +if test "${enable_fontmap+set}" = set; then + enableval="$enable_fontmap" + if test "$enableval" = yes; then - ac_cv_use_unicode='wxUSE_UNICODE=yes' + ac_cv_use_fontmap='wxUSE_FONTMAP=yes' else - ac_cv_use_unicode='wxUSE_UNICODE=no' + ac_cv_use_fontmap='wxUSE_FONTMAP=no' fi - + else - - LINE=`grep "wxUSE_UNICODE" ${wx_arg_cache_file}` + + LINE=`grep "wxUSE_FONTMAP" ${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 + ac_cv_use_fontmap='wxUSE_FONTMAP='$DEFAULT_wxUSE_FONTMAP + +fi -fi; - eval "$ac_cv_use_unicode" + eval "$ac_cv_use_fontmap" if test "$no_cache" != 1; then - echo $ac_cv_use_unicode >> ${wx_arg_cache_file}.tmp + echo $ac_cv_use_fontmap >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_UNICODE" = yes; then - echo "$as_me:4202: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test "$wxUSE_FONTMAP" = yes; then + echo "$ac_t""yes" 1>&6 else - echo "$as_me:4205: result: no" >&5 -echo "${ECHO_T}no" >&6 + echo "$ac_t""no" 1>&6 fi + - echo "$as_me:4209: checking for --enable-wcsrtombs" >&5 -echo $ECHO_N "checking for --enable-wcsrtombs... $ECHO_C" >&6 + echo $ac_n "checking for --enable-unicode""... $ac_c" 1>&6 +echo "configure:3830: checking for --enable-unicode" >&5 no_cache=0 - # Check whether --enable-wcsrtombs or --disable-wcsrtombs was given. -if test "${enable_wcsrtombs+set}" = set; then - enableval="$enable_wcsrtombs" - + # Check whether --enable-unicode or --disable-unicode was given. +if test "${enable_unicode+set}" = set; then + enableval="$enable_unicode" + if test "$enableval" = yes; then - ac_cv_use_wcsrtombs='wxUSE_WCSRTOMBS=yes' + ac_cv_use_unicode='wxUSE_UNICODE=yes' else - ac_cv_use_wcsrtombs='wxUSE_WCSRTOMBS=no' + ac_cv_use_unicode='wxUSE_UNICODE=no' fi - + else - - LINE=`grep "wxUSE_WCSRTOMBS" ${wx_arg_cache_file}` + + 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_wcsrtombs='wxUSE_WCSRTOMBS='$DEFAULT_wxUSE_WCSRTOMBS + ac_cv_use_unicode='wxUSE_UNICODE='$DEFAULT_wxUSE_UNICODE + +fi -fi; - eval "$ac_cv_use_wcsrtombs" + eval "$ac_cv_use_unicode" if test "$no_cache" != 1; then - echo $ac_cv_use_wcsrtombs >> ${wx_arg_cache_file}.tmp + echo $ac_cv_use_unicode >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_WCSRTOMBS" = yes; then - echo "$as_me:4241: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test "$wxUSE_UNICODE" = yes; then + echo "$ac_t""yes" 1>&6 else - echo "$as_me:4244: result: no" >&5 -echo "${ECHO_T}no" >&6 + echo "$ac_t""no" 1>&6 fi + - echo "$as_me:4248: checking for --enable-wxprintfv" >&5 -echo $ECHO_N "checking for --enable-wxprintfv... $ECHO_C" >&6 + echo $ac_n "checking for --enable-wxprintfv""... $ac_c" 1>&6 +echo "configure:3869: 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 - + LINE=`grep "wxUSE_EXPERIMENTAL_PRINTF" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -4268,8 +3887,9 @@ else fi ac_cv_use_wxprintfv='wxUSE_EXPERIMENTAL_PRINTF='$DEFAULT_wxUSE_EXPERIMENTAL_PRINTF + +fi -fi; eval "$ac_cv_use_wxprintfv" if test "$no_cache" != 1; then @@ -4277,28 +3897,27 @@ fi; fi if test "$wxUSE_EXPERIMENTAL_PRINTF" = yes; then - echo "$as_me:4280: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + echo "$ac_t""yes" 1>&6 else - echo "$as_me:4283: result: no" >&5 -echo "${ECHO_T}no" >&6 + echo "$ac_t""no" 1>&6 fi + - echo "$as_me:4287: checking for --enable-std_iostreams" >&5 -echo $ECHO_N "checking for --enable-std_iostreams... $ECHO_C" >&6 + echo $ac_n "checking for --enable-std_iostreams""... $ac_c" 1>&6 +echo "configure:3908: 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" @@ -4307,8 +3926,9 @@ else fi ac_cv_use_std_iostreams='wxUSE_STD_IOSTREAM='$DEFAULT_wxUSE_STD_IOSTREAM + +fi -fi; eval "$ac_cv_use_std_iostreams" if test "$no_cache" != 1; then @@ -4316,28 +3936,27 @@ fi; fi if test "$wxUSE_STD_IOSTREAM" = yes; then - echo "$as_me:4319: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + echo "$ac_t""yes" 1>&6 else - echo "$as_me:4322: result: no" >&5 -echo "${ECHO_T}no" >&6 + echo "$ac_t""no" 1>&6 fi + - echo "$as_me:4326: checking for --enable-filesystem" >&5 -echo $ECHO_N "checking for --enable-filesystem... $ECHO_C" >&6 + echo $ac_n "checking for --enable-filesystem""... $ac_c" 1>&6 +echo "configure:3947: checking for --enable-filesystem" >&5 no_cache=0 # Check whether --enable-filesystem or --disable-filesystem was given. if test "${enable_filesystem+set}" = set; then enableval="$enable_filesystem" - + if test "$enableval" = yes; then ac_cv_use_filesystem='wxUSE_FILESYSTEM=yes' else ac_cv_use_filesystem='wxUSE_FILESYSTEM=no' fi - + else - + LINE=`grep "wxUSE_FILESYSTEM" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -4346,8 +3965,9 @@ else fi ac_cv_use_filesystem='wxUSE_FILESYSTEM='$DEFAULT_wxUSE_FILESYSTEM + +fi -fi; eval "$ac_cv_use_filesystem" if test "$no_cache" != 1; then @@ -4355,28 +3975,27 @@ fi; fi if test "$wxUSE_FILESYSTEM" = yes; then - echo "$as_me:4358: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + echo "$ac_t""yes" 1>&6 else - echo "$as_me:4361: result: no" >&5 -echo "${ECHO_T}no" >&6 + echo "$ac_t""no" 1>&6 fi + - echo "$as_me:4365: checking for --enable-fs_inet" >&5 -echo $ECHO_N "checking for --enable-fs_inet... $ECHO_C" >&6 + echo $ac_n "checking for --enable-fs_inet""... $ac_c" 1>&6 +echo "configure:3986: 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" @@ -4385,8 +4004,9 @@ else fi ac_cv_use_fs_inet='wxUSE_FS_INET='$DEFAULT_wxUSE_FS_INET + +fi -fi; eval "$ac_cv_use_fs_inet" if test "$no_cache" != 1; then @@ -4394,28 +4014,27 @@ fi; fi if test "$wxUSE_FS_INET" = yes; then - echo "$as_me:4397: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + echo "$ac_t""yes" 1>&6 else - echo "$as_me:4400: result: no" >&5 -echo "${ECHO_T}no" >&6 + echo "$ac_t""no" 1>&6 fi + - echo "$as_me:4404: checking for --enable-fs_zip" >&5 -echo $ECHO_N "checking for --enable-fs_zip... $ECHO_C" >&6 + echo $ac_n "checking for --enable-fs_zip""... $ac_c" 1>&6 +echo "configure:4025: 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" @@ -4424,8 +4043,9 @@ else fi ac_cv_use_fs_zip='wxUSE_FS_ZIP='$DEFAULT_wxUSE_FS_ZIP + +fi -fi; eval "$ac_cv_use_fs_zip" if test "$no_cache" != 1; then @@ -4433,28 +4053,27 @@ fi; fi if test "$wxUSE_FS_ZIP" = yes; then - echo "$as_me:4436: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + echo "$ac_t""yes" 1>&6 else - echo "$as_me:4439: result: no" >&5 -echo "${ECHO_T}no" >&6 + echo "$ac_t""no" 1>&6 fi + - echo "$as_me:4443: checking for --enable-zipstream" >&5 -echo $ECHO_N "checking for --enable-zipstream... $ECHO_C" >&6 + echo $ac_n "checking for --enable-zipstream""... $ac_c" 1>&6 +echo "configure:4064: 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 - + LINE=`grep "wxUSE_ZIPSTREAM" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -4463,8 +4082,9 @@ else fi ac_cv_use_zipstream='wxUSE_ZIPSTREAM='$DEFAULT_wxUSE_ZIPSTREAM + +fi -fi; eval "$ac_cv_use_zipstream" if test "$no_cache" != 1; then @@ -4472,28 +4092,28 @@ fi; fi if test "$wxUSE_ZIPSTREAM" = yes; then - echo "$as_me:4475: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + echo "$ac_t""yes" 1>&6 else - echo "$as_me:4478: result: no" >&5 -echo "${ECHO_T}no" >&6 + echo "$ac_t""no" 1>&6 fi + - echo "$as_me:4482: checking for --enable-catch_segvs" >&5 -echo $ECHO_N "checking for --enable-catch_segvs... $ECHO_C" >&6 + + echo $ac_n "checking for --enable-catch_segvs""... $ac_c" 1>&6 +echo "configure:4104: checking for --enable-catch_segvs" >&5 no_cache=0 # Check whether --enable-catch_segvs or --disable-catch_segvs was given. if test "${enable_catch_segvs+set}" = set; then enableval="$enable_catch_segvs" - + if test "$enableval" = yes; then ac_cv_use_catch_segvs='wxUSE_ON_FATAL_EXCEPTION=yes' else ac_cv_use_catch_segvs='wxUSE_ON_FATAL_EXCEPTION=no' fi - + else - + LINE=`grep "wxUSE_ON_FATAL_EXCEPTION" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -4502,8 +4122,9 @@ else fi ac_cv_use_catch_segvs='wxUSE_ON_FATAL_EXCEPTION='$DEFAULT_wxUSE_ON_FATAL_EXCEPTION + +fi -fi; eval "$ac_cv_use_catch_segvs" if test "$no_cache" != 1; then @@ -4511,28 +4132,27 @@ fi; fi if test "$wxUSE_ON_FATAL_EXCEPTION" = yes; then - echo "$as_me:4514: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + echo "$ac_t""yes" 1>&6 else - echo "$as_me:4517: result: no" >&5 -echo "${ECHO_T}no" >&6 + echo "$ac_t""no" 1>&6 fi + - echo "$as_me:4521: checking for --enable-snglinst" >&5 -echo $ECHO_N "checking for --enable-snglinst... $ECHO_C" >&6 + echo $ac_n "checking for --enable-snglinst""... $ac_c" 1>&6 +echo "configure:4143: checking for --enable-snglinst" >&5 no_cache=0 # Check whether --enable-snglinst or --disable-snglinst was given. if test "${enable_snglinst+set}" = set; then enableval="$enable_snglinst" - + if test "$enableval" = yes; then ac_cv_use_snglinst='wxUSE_SNGLINST_CHECKER=yes' else ac_cv_use_snglinst='wxUSE_SNGLINST_CHECKER=no' fi - + else - + LINE=`grep "wxUSE_SNGLINST_CHECKER" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -4541,8 +4161,9 @@ else fi ac_cv_use_snglinst='wxUSE_SNGLINST_CHECKER='$DEFAULT_wxUSE_SNGLINST_CHECKER + +fi -fi; eval "$ac_cv_use_snglinst" if test "$no_cache" != 1; then @@ -4550,108 +4171,190 @@ fi; fi if test "$wxUSE_SNGLINST_CHECKER" = yes; then - echo "$as_me:4553: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + echo "$ac_t""yes" 1>&6 else - echo "$as_me:4556: result: no" >&5 -echo "${ECHO_T}no" >&6 + echo "$ac_t""no" 1>&6 fi + - echo "$as_me:4560: checking for --enable-threads" >&5 -echo $ECHO_N "checking for --enable-threads... $ECHO_C" >&6 - no_cache=0 - # Check whether --enable-threads or --disable-threads was given. -if test "${enable_threads+set}" = set; then - enableval="$enable_threads" + echo $ac_n "checking for --enable-mimetype""... $ac_c" 1>&6 +echo "configure:4183: checking for --enable-mimetype" >&5 + no_cache=0 + # Check whether --enable-mimetype or --disable-mimetype was given. +if test "${enable_mimetype+set}" = set; then + enableval="$enable_mimetype" + if test "$enableval" = yes; then - ac_cv_use_threads='wxUSE_THREADS=yes' + ac_cv_use_mimetype='wxUSE_MIMETYPE=yes' else - ac_cv_use_threads='wxUSE_THREADS=no' + ac_cv_use_mimetype='wxUSE_MIMETYPE=no' fi - + else - - LINE=`grep "wxUSE_THREADS" ${wx_arg_cache_file}` + + LINE=`grep "wxUSE_MIMETYPE" ${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 + ac_cv_use_mimetype='wxUSE_MIMETYPE='$DEFAULT_wxUSE_MIMETYPE + +fi -fi; - eval "$ac_cv_use_threads" + eval "$ac_cv_use_mimetype" if test "$no_cache" != 1; then - echo $ac_cv_use_threads >> ${wx_arg_cache_file}.tmp + echo $ac_cv_use_mimetype >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_THREADS" = yes; then - echo "$as_me:4592: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test "$wxUSE_MIMETYPE" = yes; then + echo "$ac_t""yes" 1>&6 else - echo "$as_me:4595: result: no" >&5 -echo "${ECHO_T}no" >&6 + echo "$ac_t""no" 1>&6 fi + - echo "$as_me:4599: checking for --enable-serial" >&5 -echo $ECHO_N "checking for --enable-serial... $ECHO_C" >&6 + echo $ac_n "checking for --enable-system_options""... $ac_c" 1>&6 +echo "configure:4222: checking for --enable-system_options" >&5 no_cache=0 - # Check whether --enable-serial or --disable-serial was given. -if test "${enable_serial+set}" = set; then - enableval="$enable_serial" - + # Check whether --enable-system_options or --disable-system_options was given. +if test "${enable_system_options+set}" = set; then + enableval="$enable_system_options" + if test "$enableval" = yes; then - ac_cv_use_serial='wxUSE_SERIAL=yes' + ac_cv_use_system_options='wxUSE_SYSTEM_OPTIONS=yes' else - ac_cv_use_serial='wxUSE_SERIAL=no' + ac_cv_use_system_options='wxUSE_SYSTEM_OPTIONS=no' fi - + else - - LINE=`grep "wxUSE_SERIAL" ${wx_arg_cache_file}` + + LINE=`grep "wxUSE_SYSTEM_OPTIONS" ${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 + ac_cv_use_system_options='wxUSE_SYSTEM_OPTIONS='$DEFAULT_wxUSE_SYSTEM_OPTIONS + +fi -fi; - eval "$ac_cv_use_serial" + eval "$ac_cv_use_system_options" if test "$no_cache" != 1; then - echo $ac_cv_use_serial >> ${wx_arg_cache_file}.tmp + echo $ac_cv_use_system_options >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_SERIAL" = yes; then - echo "$as_me:4631: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test "$wxUSE_SYSTEM_OPTIONS" = yes; then + echo "$ac_t""yes" 1>&6 else - echo "$as_me:4634: result: no" >&5 -echo "${ECHO_T}no" >&6 + echo "$ac_t""no" 1>&6 fi + -if test "$wxUSE_GUI" = "yes"; then - echo "$as_me:4640: checking for --enable-docview" >&5 -echo $ECHO_N "checking for --enable-docview... $ECHO_C" >&6 - no_cache=0 - # Check whether --enable-docview or --disable-docview was given. -if test "${enable_docview+set}" = set; then - enableval="$enable_docview" - if test "$enableval" = yes; then - ac_cv_use_docview='wxUSE_DOC_VIEW_ARCHITECTURE=yes' - else - ac_cv_use_docview='wxUSE_DOC_VIEW_ARCHITECTURE=no' + echo $ac_n "checking for --enable-threads""... $ac_c" 1>&6 +echo "configure:4263: 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" + + if test "$enableval" = yes; then + ac_cv_use_threads='wxUSE_THREADS=yes' + else + ac_cv_use_threads='wxUSE_THREADS=no' + fi + +else + + 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 + + + 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:4302: 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" + + if test "$enableval" = yes; then + ac_cv_use_serial='wxUSE_SERIAL=yes' + else + ac_cv_use_serial='wxUSE_SERIAL=no' + fi + else + + 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 + + if test "$wxUSE_SERIAL" = yes; then + echo "$ac_t""yes" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + + +if test "$wxUSE_GUI" = "yes"; then + + + + echo $ac_n "checking for --enable-docview""... $ac_c" 1>&6 +echo "configure:4345: 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" + + 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 + LINE=`grep "wxUSE_DOC_VIEW_ARCHITECTURE" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -4660,8 +4363,9 @@ else fi ac_cv_use_docview='wxUSE_DOC_VIEW_ARCHITECTURE='$DEFAULT_wxUSE_DOC_VIEW_ARCHITECTURE + +fi -fi; eval "$ac_cv_use_docview" if test "$no_cache" != 1; then @@ -4669,28 +4373,27 @@ fi; fi if test "$wxUSE_DOC_VIEW_ARCHITECTURE" = yes; then - echo "$as_me:4672: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + echo "$ac_t""yes" 1>&6 else - echo "$as_me:4675: result: no" >&5 -echo "${ECHO_T}no" >&6 + echo "$ac_t""no" 1>&6 fi + - echo "$as_me:4679: checking for --enable-help" >&5 -echo $ECHO_N "checking for --enable-help... $ECHO_C" >&6 + echo $ac_n "checking for --enable-help""... $ac_c" 1>&6 +echo "configure:4384: 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" - + if test "$enableval" = yes; then ac_cv_use_help='wxUSE_HELP=yes' else ac_cv_use_help='wxUSE_HELP=no' fi - + else - + LINE=`grep "wxUSE_HELP" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -4699,8 +4402,9 @@ else fi ac_cv_use_help='wxUSE_HELP='$DEFAULT_wxUSE_HELP + +fi -fi; eval "$ac_cv_use_help" if test "$no_cache" != 1; then @@ -4708,28 +4412,144 @@ fi; fi if test "$wxUSE_HELP" = yes; then - echo "$as_me:4711: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + echo "$ac_t""yes" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + + + echo $ac_n "checking for --enable-mshtmlhelp""... $ac_c" 1>&6 +echo "configure:4423: checking for --enable-mshtmlhelp" >&5 + no_cache=0 + # Check whether --enable-mshtmlhelp or --disable-mshtmlhelp was given. +if test "${enable_mshtmlhelp+set}" = set; then + enableval="$enable_mshtmlhelp" + + if test "$enableval" = yes; then + ac_cv_use_mshtmlhelp='wxUSE_MS_HTML_HELP=yes' + else + ac_cv_use_mshtmlhelp='wxUSE_MS_HTML_HELP=no' + fi + +else + + LINE=`grep "wxUSE_MS_HTML_HELP" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_mshtmlhelp='wxUSE_MS_HTML_HELP='$DEFAULT_wxUSE_MS_HTML_HELP + +fi + + + eval "$ac_cv_use_mshtmlhelp" + if test "$no_cache" != 1; then + echo $ac_cv_use_mshtmlhelp >> ${wx_arg_cache_file}.tmp + fi + + if test "$wxUSE_MS_HTML_HELP" = 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:4462: 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 + + 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 + + + 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-htmlhelp""... $ac_c" 1>&6 +echo "configure:4501: checking for --enable-htmlhelp" >&5 + no_cache=0 + # Check whether --enable-htmlhelp or --disable-htmlhelp was given. +if test "${enable_htmlhelp+set}" = set; then + enableval="$enable_htmlhelp" + + if test "$enableval" = yes; then + ac_cv_use_htmlhelp='wxUSE_WXHTML_HELP=yes' + else + ac_cv_use_htmlhelp='wxUSE_WXHTML_HELP=no' + fi + +else + + LINE=`grep "wxUSE_WXHTML_HELP" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_htmlhelp='wxUSE_WXHTML_HELP='$DEFAULT_wxUSE_WXHTML_HELP + +fi + + + eval "$ac_cv_use_htmlhelp" + if test "$no_cache" != 1; then + echo $ac_cv_use_htmlhelp >> ${wx_arg_cache_file}.tmp + fi + + if test "$wxUSE_WXHTML_HELP" = yes; then + echo "$ac_t""yes" 1>&6 else - echo "$as_me:4714: result: no" >&5 -echo "${ECHO_T}no" >&6 + echo "$ac_t""no" 1>&6 fi + - echo "$as_me:4718: checking for --enable-constraints" >&5 -echo $ECHO_N "checking for --enable-constraints... $ECHO_C" >&6 + echo $ac_n "checking for --enable-constraints""... $ac_c" 1>&6 +echo "configure:4540: 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" - + if test "$enableval" = yes; then ac_cv_use_constraints='wxUSE_CONSTRAINTS=yes' else ac_cv_use_constraints='wxUSE_CONSTRAINTS=no' fi - + else - + LINE=`grep "wxUSE_CONSTRAINTS" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -4738,8 +4558,9 @@ else fi ac_cv_use_constraints='wxUSE_CONSTRAINTS='$DEFAULT_wxUSE_CONSTRAINTS + +fi -fi; eval "$ac_cv_use_constraints" if test "$no_cache" != 1; then @@ -4747,28 +4568,27 @@ fi; fi if test "$wxUSE_CONSTRAINTS" = yes; then - echo "$as_me:4750: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + echo "$ac_t""yes" 1>&6 else - echo "$as_me:4753: result: no" >&5 -echo "${ECHO_T}no" >&6 + echo "$ac_t""no" 1>&6 fi + - echo "$as_me:4757: checking for --enable-printarch" >&5 -echo $ECHO_N "checking for --enable-printarch... $ECHO_C" >&6 + echo $ac_n "checking for --enable-printarch""... $ac_c" 1>&6 +echo "configure:4579: 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" - + if test "$enableval" = yes; then ac_cv_use_printarch='wxUSE_PRINTING_ARCHITECTURE=yes' else ac_cv_use_printarch='wxUSE_PRINTING_ARCHITECTURE=no' fi - + else - + LINE=`grep "wxUSE_PRINTING_ARCHITECTURE" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -4777,8 +4597,9 @@ else fi ac_cv_use_printarch='wxUSE_PRINTING_ARCHITECTURE='$DEFAULT_wxUSE_PRINTING_ARCHITECTURE + +fi -fi; eval "$ac_cv_use_printarch" if test "$no_cache" != 1; then @@ -4786,28 +4607,27 @@ fi; fi if test "$wxUSE_PRINTING_ARCHITECTURE" = yes; then - echo "$as_me:4789: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + echo "$ac_t""yes" 1>&6 else - echo "$as_me:4792: result: no" >&5 -echo "${ECHO_T}no" >&6 + echo "$ac_t""no" 1>&6 fi + - echo "$as_me:4796: checking for --enable-mdi" >&5 -echo $ECHO_N "checking for --enable-mdi... $ECHO_C" >&6 + echo $ac_n "checking for --enable-mdi""... $ac_c" 1>&6 +echo "configure:4618: 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" - + if test "$enableval" = yes; then ac_cv_use_mdi='wxUSE_MDI_ARCHITECTURE=yes' else ac_cv_use_mdi='wxUSE_MDI_ARCHITECTURE=no' fi - + else - + LINE=`grep "wxUSE_MDI_ARCHITECTURE" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -4816,8 +4636,9 @@ else fi ac_cv_use_mdi='wxUSE_MDI_ARCHITECTURE='$DEFAULT_wxUSE_MDI_ARCHITECTURE + +fi -fi; eval "$ac_cv_use_mdi" if test "$no_cache" != 1; then @@ -4825,28 +4646,106 @@ fi; fi if test "$wxUSE_MDI_ARCHITECTURE" = yes; then - echo "$as_me:4828: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + echo "$ac_t""yes" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + + + echo $ac_n "checking for --enable-loggui""... $ac_c" 1>&6 +echo "configure:4657: checking for --enable-loggui" >&5 + no_cache=0 + # Check whether --enable-loggui or --disable-loggui was given. +if test "${enable_loggui+set}" = set; then + enableval="$enable_loggui" + + if test "$enableval" = yes; then + ac_cv_use_loggui='wxUSE_LOGGUI=yes' + else + ac_cv_use_loggui='wxUSE_LOGGUI=no' + fi + +else + + LINE=`grep "wxUSE_LOGGUI" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_loggui='wxUSE_LOGGUI='$DEFAULT_wxUSE_LOGGUI + +fi + + + eval "$ac_cv_use_loggui" + if test "$no_cache" != 1; then + echo $ac_cv_use_loggui >> ${wx_arg_cache_file}.tmp + fi + + if test "$wxUSE_LOGGUI" = yes; then + echo "$ac_t""yes" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + + + echo $ac_n "checking for --enable-logwin""... $ac_c" 1>&6 +echo "configure:4696: checking for --enable-logwin" >&5 + no_cache=0 + # Check whether --enable-logwin or --disable-logwin was given. +if test "${enable_logwin+set}" = set; then + enableval="$enable_logwin" + + if test "$enableval" = yes; then + ac_cv_use_logwin='wxUSE_LOGWINDOW=yes' + else + ac_cv_use_logwin='wxUSE_LOGWINDOW=no' + fi + +else + + LINE=`grep "wxUSE_LOGWINDOW" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_logwin='wxUSE_LOGWINDOW='$DEFAULT_wxUSE_LOGWINDOW + +fi + + + eval "$ac_cv_use_logwin" + if test "$no_cache" != 1; then + echo $ac_cv_use_logwin >> ${wx_arg_cache_file}.tmp + fi + + if test "$wxUSE_LOGWINDOW" = yes; then + echo "$ac_t""yes" 1>&6 else - echo "$as_me:4831: result: no" >&5 -echo "${ECHO_T}no" >&6 + echo "$ac_t""no" 1>&6 fi + - echo "$as_me:4835: checking for --enable-postscript" >&5 -echo $ECHO_N "checking for --enable-postscript... $ECHO_C" >&6 + + echo $ac_n "checking for --enable-postscript""... $ac_c" 1>&6 +echo "configure:4736: 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" - + if test "$enableval" = yes; then ac_cv_use_postscript='wxUSE_POSTSCRIPT=yes' else ac_cv_use_postscript='wxUSE_POSTSCRIPT=no' fi - + else - + LINE=`grep "wxUSE_POSTSCRIPT" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -4855,8 +4754,9 @@ else fi ac_cv_use_postscript='wxUSE_POSTSCRIPT='$DEFAULT_wxUSE_POSTSCRIPT + +fi -fi; eval "$ac_cv_use_postscript" if test "$no_cache" != 1; then @@ -4864,28 +4764,30 @@ fi; fi if test "$wxUSE_POSTSCRIPT" = yes; then - echo "$as_me:4867: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + echo "$ac_t""yes" 1>&6 else - echo "$as_me:4870: result: no" >&5 -echo "${ECHO_T}no" >&6 + echo "$ac_t""no" 1>&6 fi + + - echo "$as_me:4874: checking for --enable-prologio" >&5 -echo $ECHO_N "checking for --enable-prologio... $ECHO_C" >&6 + + + echo $ac_n "checking for --enable-prologio""... $ac_c" 1>&6 +echo "configure:4778: 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" - + if test "$enableval" = yes; then ac_cv_use_prologio='wxUSE_PROLOGIO=yes' else ac_cv_use_prologio='wxUSE_PROLOGIO=no' fi - + else - + LINE=`grep "wxUSE_PROLOGIO" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -4894,8 +4796,9 @@ else fi ac_cv_use_prologio='wxUSE_PROLOGIO='$DEFAULT_wxUSE_PROLOGIO + +fi -fi; eval "$ac_cv_use_prologio" if test "$no_cache" != 1; then @@ -4903,28 +4806,27 @@ fi; fi if test "$wxUSE_PROLOGIO" = yes; then - echo "$as_me:4906: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + echo "$ac_t""yes" 1>&6 else - echo "$as_me:4909: result: no" >&5 -echo "${ECHO_T}no" >&6 + echo "$ac_t""no" 1>&6 fi + - echo "$as_me:4913: checking for --enable-resources" >&5 -echo $ECHO_N "checking for --enable-resources... $ECHO_C" >&6 + echo $ac_n "checking for --enable-resources""... $ac_c" 1>&6 +echo "configure:4817: 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" - + if test "$enableval" = yes; then ac_cv_use_resources='wxUSE_RESOURCES=yes' else ac_cv_use_resources='wxUSE_RESOURCES=no' fi - + else - + LINE=`grep "wxUSE_RESOURCES" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -4933,8 +4835,9 @@ else fi ac_cv_use_resources='wxUSE_RESOURCES='$DEFAULT_wxUSE_RESOURCES + +fi -fi; eval "$ac_cv_use_resources" if test "$no_cache" != 1; then @@ -4942,28 +4845,28 @@ fi; fi if test "$wxUSE_RESOURCES" = yes; then - echo "$as_me:4945: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + echo "$ac_t""yes" 1>&6 else - echo "$as_me:4948: result: no" >&5 -echo "${ECHO_T}no" >&6 + echo "$ac_t""no" 1>&6 fi + - echo "$as_me:4952: checking for --enable-xresources" >&5 -echo $ECHO_N "checking for --enable-xresources... $ECHO_C" >&6 + + echo $ac_n "checking for --enable-xresources""... $ac_c" 1>&6 +echo "configure:4857: 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" - + if test "$enableval" = yes; then ac_cv_use_xresources='wxUSE_X_RESOURCES=yes' else ac_cv_use_xresources='wxUSE_X_RESOURCES=no' fi - + else - + LINE=`grep "wxUSE_X_RESOURCES" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -4972,8 +4875,9 @@ else fi ac_cv_use_xresources='wxUSE_X_RESOURCES='$DEFAULT_wxUSE_X_RESOURCES + +fi -fi; eval "$ac_cv_use_xresources" if test "$no_cache" != 1; then @@ -4981,28 +4885,29 @@ fi; fi if test "$wxUSE_X_RESOURCES" = yes; then - echo "$as_me:4984: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + echo "$ac_t""yes" 1>&6 else - echo "$as_me:4987: result: no" >&5 -echo "${ECHO_T}no" >&6 + echo "$ac_t""no" 1>&6 fi + + - echo "$as_me:4991: checking for --enable-clipboard" >&5 -echo $ECHO_N "checking for --enable-clipboard... $ECHO_C" >&6 + + echo $ac_n "checking for --enable-clipboard""... $ac_c" 1>&6 +echo "configure:4898: 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" - + if test "$enableval" = yes; then ac_cv_use_clipboard='wxUSE_CLIPBOARD=yes' else ac_cv_use_clipboard='wxUSE_CLIPBOARD=no' fi - + else - + LINE=`grep "wxUSE_CLIPBOARD" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -5011,8 +4916,9 @@ else fi ac_cv_use_clipboard='wxUSE_CLIPBOARD='$DEFAULT_wxUSE_CLIPBOARD + +fi -fi; eval "$ac_cv_use_clipboard" if test "$no_cache" != 1; then @@ -5020,28 +4926,27 @@ fi; fi if test "$wxUSE_CLIPBOARD" = yes; then - echo "$as_me:5023: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + echo "$ac_t""yes" 1>&6 else - echo "$as_me:5026: result: no" >&5 -echo "${ECHO_T}no" >&6 + echo "$ac_t""no" 1>&6 fi + - echo "$as_me:5030: checking for --enable-dnd" >&5 -echo $ECHO_N "checking for --enable-dnd... $ECHO_C" >&6 + echo $ac_n "checking for --enable-dnd""... $ac_c" 1>&6 +echo "configure:4937: 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" - + 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 - + LINE=`grep "wxUSE_DRAG_AND_DROP" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -5050,8 +4955,9 @@ else fi ac_cv_use_dnd='wxUSE_DRAG_AND_DROP='$DEFAULT_wxUSE_DRAG_AND_DROP + +fi -fi; eval "$ac_cv_use_dnd" if test "$no_cache" != 1; then @@ -5059,28 +4965,27 @@ fi; fi if test "$wxUSE_DRAG_AND_DROP" = yes; then - echo "$as_me:5062: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + echo "$ac_t""yes" 1>&6 else - echo "$as_me:5065: result: no" >&5 -echo "${ECHO_T}no" >&6 + echo "$ac_t""no" 1>&6 fi + - echo "$as_me:5069: checking for --enable-metafile" >&5 -echo $ECHO_N "checking for --enable-metafile... $ECHO_C" >&6 + echo $ac_n "checking for --enable-metafile""... $ac_c" 1>&6 +echo "configure:4976: checking for --enable-metafile" >&5 no_cache=0 # Check whether --enable-metafile or --disable-metafile was given. if test "${enable_metafile+set}" = set; then enableval="$enable_metafile" - + if test "$enableval" = yes; then ac_cv_use_metafile='wxUSE_METAFILE=yes' else ac_cv_use_metafile='wxUSE_METAFILE=no' fi - + else - + LINE=`grep "wxUSE_METAFILE" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -5089,8 +4994,9 @@ else fi ac_cv_use_metafile='wxUSE_METAFILE='$DEFAULT_wxUSE_METAFILE + +fi -fi; eval "$ac_cv_use_metafile" if test "$no_cache" != 1; then @@ -5098,67 +5004,69 @@ fi; fi if test "$wxUSE_METAFILE" = yes; then - echo "$as_me:5101: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + echo "$ac_t""yes" 1>&6 else - echo "$as_me:5104: result: no" >&5 -echo "${ECHO_T}no" >&6 + echo "$ac_t""no" 1>&6 fi + - echo "$as_me:5108: checking for --enable-wxtree" >&5 -echo $ECHO_N "checking for --enable-wxtree... $ECHO_C" >&6 - no_cache=0 - # Check whether --enable-wxtree or --disable-wxtree was given. -if test "${enable_wxtree+set}" = set; then - enableval="$enable_wxtree" + echo $ac_n "checking for --enable-treelayout""... $ac_c" 1>&6 +echo "configure:5016: checking for --enable-treelayout" >&5 + no_cache=0 + # Check whether --enable-treelayout or --disable-treelayout was given. +if test "${enable_treelayout+set}" = set; then + enableval="$enable_treelayout" + if test "$enableval" = yes; then - ac_cv_use_wxtree='wxUSE_WXTREE=yes' + ac_cv_use_treelayout='wxUSE_TREELAYOUT=yes' else - ac_cv_use_wxtree='wxUSE_WXTREE=no' + ac_cv_use_treelayout='wxUSE_TREELAYOUT=no' fi - + else - - LINE=`grep "wxUSE_WXTREE" ${wx_arg_cache_file}` + + LINE=`grep "wxUSE_TREELAYOUT" ${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 + ac_cv_use_treelayout='wxUSE_TREELAYOUT='$DEFAULT_wxUSE_TREELAYOUT + +fi -fi; - eval "$ac_cv_use_wxtree" + eval "$ac_cv_use_treelayout" if test "$no_cache" != 1; then - echo $ac_cv_use_wxtree >> ${wx_arg_cache_file}.tmp + echo $ac_cv_use_treelayout >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_WXTREE" = yes; then - echo "$as_me:5140: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test "$wxUSE_TREELAYOUT" = yes; then + echo "$ac_t""yes" 1>&6 else - echo "$as_me:5143: result: no" >&5 -echo "${ECHO_T}no" >&6 + echo "$ac_t""no" 1>&6 fi + + + - echo "$as_me:5147: checking for --enable-controls" >&5 -echo $ECHO_N "checking for --enable-controls... $ECHO_C" >&6 + echo $ac_n "checking for --enable-controls""... $ac_c" 1>&6 +echo "configure:5057: 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" - + 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" @@ -5167,8 +5075,9 @@ else fi ac_cv_use_controls='wxUSE_CONTROLS='$DEFAULT_wxUSE_CONTROLS + +fi -fi; eval "$ac_cv_use_controls" if test "$no_cache" != 1; then @@ -5176,18 +5085,19 @@ fi; fi if test "$wxUSE_CONTROLS" = yes; then - echo "$as_me:5179: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + echo "$ac_t""yes" 1>&6 else - echo "$as_me:5182: result: no" >&5 -echo "${ECHO_T}no" >&6 + echo "$ac_t""no" 1>&6 fi + if test "$wxUSE_CONTROLS" = "yes"; then DEFAULT_wxUSE_ACCEL=yes + DEFAULT_wxUSE_BMPBUTTON=yes + DEFAULT_wxUSE_BUTTON=yes + DEFAULT_wxUSE_CALCTRL=no DEFAULT_wxUSE_CARET=yes DEFAULT_wxUSE_COMBOBOX=yes - DEFAULT_wxUSE_BMPBUTTON=yes DEFAULT_wxUSE_CHECKBOX=yes DEFAULT_wxUSE_CHECKLISTBOX=yes DEFAULT_wxUSE_CHOICE=yes @@ -5198,6 +5108,7 @@ if test "$wxUSE_CONTROLS" = "yes"; then DEFAULT_wxUSE_LISTBOX=yes DEFAULT_wxUSE_LISTCTRL=yes DEFAULT_wxUSE_NOTEBOOK=yes + DEFAULT_wxUSE_PROPSHEET=yes DEFAULT_wxUSE_RADIOBOX=yes DEFAULT_wxUSE_RADIOBTN=yes DEFAULT_wxUSE_SASH=yes @@ -5217,11 +5128,14 @@ if test "$wxUSE_CONTROLS" = "yes"; then DEFAULT_wxUSE_TOOLBAR_SIMPLE=yes DEFAULT_wxUSE_TOOLTIPS=yes DEFAULT_wxUSE_TREECTRL=yes + DEFAULT_wxUSE_POPUPWIN=yes elif test "$wxUSE_CONTROLS" = "no"; then DEFAULT_wxUSE_ACCEL=no + DEFAULT_wxUSE_BMPBUTTON=no + DEFAULT_wxUSE_BUTTON=no + DEFAULT_wxUSE_CALCTRL=no DEFAULT_wxUSE_CARET=no DEFAULT_wxUSE_COMBOBOX=no - DEFAULT_wxUSE_BMPBUTTON=no DEFAULT_wxUSE_CHECKBOX=no DEFAULT_wxUSE_CHECKLISTBOX=no DEFAULT_wxUSE_CHOICE=no @@ -5232,6 +5146,7 @@ elif test "$wxUSE_CONTROLS" = "no"; then DEFAULT_wxUSE_LISTBOX=no DEFAULT_wxUSE_LISTCTRL=no DEFAULT_wxUSE_NOTEBOOK=no + DEFAULT_wxUSE_PROPSHEET=no DEFAULT_wxUSE_RADIOBOX=no DEFAULT_wxUSE_RADIOBTN=no DEFAULT_wxUSE_SASH=no @@ -5251,23 +5166,25 @@ elif test "$wxUSE_CONTROLS" = "no"; then DEFAULT_wxUSE_TOOLBAR_SIMPLE=no DEFAULT_wxUSE_TOOLTIPS=no DEFAULT_wxUSE_TREECTRL=no + DEFAULT_wxUSE_POPUPWIN=no fi - echo "$as_me:5256: checking for --enable-accel" >&5 -echo $ECHO_N "checking for --enable-accel... $ECHO_C" >&6 + + echo $ac_n "checking for --enable-accel""... $ac_c" 1>&6 +echo "configure:5175: 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" - + if test "$enableval" = yes; then ac_cv_use_accel='wxUSE_ACCEL=yes' else ac_cv_use_accel='wxUSE_ACCEL=no' fi - + else - + LINE=`grep "wxUSE_ACCEL" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -5276,8 +5193,9 @@ else fi ac_cv_use_accel='wxUSE_ACCEL='$DEFAULT_wxUSE_ACCEL + +fi -fi; eval "$ac_cv_use_accel" if test "$no_cache" != 1; then @@ -5285,67 +5203,66 @@ fi; fi if test "$wxUSE_ACCEL" = yes; then - echo "$as_me:5288: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + echo "$ac_t""yes" 1>&6 else - echo "$as_me:5291: result: no" >&5 -echo "${ECHO_T}no" >&6 + echo "$ac_t""no" 1>&6 fi + - echo "$as_me:5295: checking for --enable-caret" >&5 -echo $ECHO_N "checking for --enable-caret... $ECHO_C" >&6 + echo $ac_n "checking for --enable-button""... $ac_c" 1>&6 +echo "configure:5214: checking for --enable-button" >&5 no_cache=0 - # Check whether --enable-caret or --disable-caret was given. -if test "${enable_caret+set}" = set; then - enableval="$enable_caret" - + # Check whether --enable-button or --disable-button was given. +if test "${enable_button+set}" = set; then + enableval="$enable_button" + if test "$enableval" = yes; then - ac_cv_use_caret='wxUSE_CARET=yes' + ac_cv_use_button='wxUSE_BUTTON=yes' else - ac_cv_use_caret='wxUSE_CARET=no' + ac_cv_use_button='wxUSE_BUTTON=no' fi - + else - - LINE=`grep "wxUSE_CARET" ${wx_arg_cache_file}` + + LINE=`grep "wxUSE_BUTTON" ${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 + ac_cv_use_button='wxUSE_BUTTON='$DEFAULT_wxUSE_BUTTON + +fi -fi; - eval "$ac_cv_use_caret" + eval "$ac_cv_use_button" if test "$no_cache" != 1; then - echo $ac_cv_use_caret >> ${wx_arg_cache_file}.tmp + echo $ac_cv_use_button >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_CARET" = yes; then - echo "$as_me:5327: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test "$wxUSE_BUTTON" = yes; then + echo "$ac_t""yes" 1>&6 else - echo "$as_me:5330: result: no" >&5 -echo "${ECHO_T}no" >&6 + echo "$ac_t""no" 1>&6 fi + - echo "$as_me:5334: checking for --enable-bmpbutton" >&5 -echo $ECHO_N "checking for --enable-bmpbutton... $ECHO_C" >&6 + echo $ac_n "checking for --enable-bmpbutton""... $ac_c" 1>&6 +echo "configure:5253: 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" - + if test "$enableval" = yes; then ac_cv_use_bmpbutton='wxUSE_BMPBUTTON=yes' else ac_cv_use_bmpbutton='wxUSE_BMPBUTTON=no' fi - + else - + LINE=`grep "wxUSE_BMPBUTTON" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -5354,8 +5271,9 @@ else fi ac_cv_use_bmpbutton='wxUSE_BMPBUTTON='$DEFAULT_wxUSE_BMPBUTTON + +fi -fi; eval "$ac_cv_use_bmpbutton" if test "$no_cache" != 1; then @@ -5363,28 +5281,105 @@ fi; fi if test "$wxUSE_BMPBUTTON" = yes; then - echo "$as_me:5366: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + echo "$ac_t""yes" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + + + echo $ac_n "checking for --enable-calendar""... $ac_c" 1>&6 +echo "configure:5292: checking for --enable-calendar" >&5 + no_cache=0 + # Check whether --enable-calendar or --disable-calendar was given. +if test "${enable_calendar+set}" = set; then + enableval="$enable_calendar" + + if test "$enableval" = yes; then + ac_cv_use_calendar='wxUSE_CALCTRL=yes' + else + ac_cv_use_calendar='wxUSE_CALCTRL=no' + fi + +else + + LINE=`grep "wxUSE_CALCTRL" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_calendar='wxUSE_CALCTRL='$DEFAULT_wxUSE_CALCTRL + +fi + + + eval "$ac_cv_use_calendar" + if test "$no_cache" != 1; then + echo $ac_cv_use_calendar >> ${wx_arg_cache_file}.tmp + fi + + if test "$wxUSE_CALCTRL" = 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:5331: 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" + + if test "$enableval" = yes; then + ac_cv_use_caret='wxUSE_CARET=yes' + else + ac_cv_use_caret='wxUSE_CARET=no' + fi + +else + + 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 + + + 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 "$as_me:5369: result: no" >&5 -echo "${ECHO_T}no" >&6 + echo "$ac_t""no" 1>&6 fi + - echo "$as_me:5373: checking for --enable-checkbox" >&5 -echo $ECHO_N "checking for --enable-checkbox... $ECHO_C" >&6 + echo $ac_n "checking for --enable-checkbox""... $ac_c" 1>&6 +echo "configure:5370: 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" - + if test "$enableval" = yes; then ac_cv_use_checkbox='wxUSE_CHECKBOX=yes' else ac_cv_use_checkbox='wxUSE_CHECKBOX=no' fi - + else - + LINE=`grep "wxUSE_CHECKBOX" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -5393,8 +5388,9 @@ else fi ac_cv_use_checkbox='wxUSE_CHECKBOX='$DEFAULT_wxUSE_CHECKBOX + +fi -fi; eval "$ac_cv_use_checkbox" if test "$no_cache" != 1; then @@ -5402,28 +5398,27 @@ fi; fi if test "$wxUSE_CHECKBOX" = yes; then - echo "$as_me:5405: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + echo "$ac_t""yes" 1>&6 else - echo "$as_me:5408: result: no" >&5 -echo "${ECHO_T}no" >&6 + echo "$ac_t""no" 1>&6 fi + - echo "$as_me:5412: checking for --enable-checklst" >&5 -echo $ECHO_N "checking for --enable-checklst... $ECHO_C" >&6 + echo $ac_n "checking for --enable-checklst""... $ac_c" 1>&6 +echo "configure:5409: 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" - + 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" @@ -5432,8 +5427,9 @@ else fi ac_cv_use_checklst='wxUSE_CHECKLST='$DEFAULT_wxUSE_CHECKLST + +fi -fi; eval "$ac_cv_use_checklst" if test "$no_cache" != 1; then @@ -5441,28 +5437,27 @@ fi; fi if test "$wxUSE_CHECKLST" = yes; then - echo "$as_me:5444: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + echo "$ac_t""yes" 1>&6 else - echo "$as_me:5447: result: no" >&5 -echo "${ECHO_T}no" >&6 + echo "$ac_t""no" 1>&6 fi + - echo "$as_me:5451: checking for --enable-choice" >&5 -echo $ECHO_N "checking for --enable-choice... $ECHO_C" >&6 + echo $ac_n "checking for --enable-choice""... $ac_c" 1>&6 +echo "configure:5448: 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 - + LINE=`grep "wxUSE_CHOICE" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -5471,8 +5466,9 @@ else fi ac_cv_use_choice='wxUSE_CHOICE='$DEFAULT_wxUSE_CHOICE + +fi -fi; eval "$ac_cv_use_choice" if test "$no_cache" != 1; then @@ -5480,28 +5476,27 @@ fi; fi if test "$wxUSE_CHOICE" = yes; then - echo "$as_me:5483: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + echo "$ac_t""yes" 1>&6 else - echo "$as_me:5486: result: no" >&5 -echo "${ECHO_T}no" >&6 + echo "$ac_t""no" 1>&6 fi + - echo "$as_me:5490: checking for --enable-combobox" >&5 -echo $ECHO_N "checking for --enable-combobox... $ECHO_C" >&6 + echo $ac_n "checking for --enable-combobox""... $ac_c" 1>&6 +echo "configure:5487: 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" - + if test "$enableval" = yes; then ac_cv_use_combobox='wxUSE_COMBOBOX=yes' else ac_cv_use_combobox='wxUSE_COMBOBOX=no' fi - + else - + LINE=`grep "wxUSE_COMBOBOX" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -5510,8 +5505,9 @@ else fi ac_cv_use_combobox='wxUSE_COMBOBOX='$DEFAULT_wxUSE_COMBOBOX + +fi -fi; eval "$ac_cv_use_combobox" if test "$no_cache" != 1; then @@ -5519,28 +5515,27 @@ fi; fi if test "$wxUSE_COMBOBOX" = yes; then - echo "$as_me:5522: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + echo "$ac_t""yes" 1>&6 else - echo "$as_me:5525: result: no" >&5 -echo "${ECHO_T}no" >&6 + echo "$ac_t""no" 1>&6 fi + - echo "$as_me:5529: checking for --enable-gauge" >&5 -echo $ECHO_N "checking for --enable-gauge... $ECHO_C" >&6 + echo $ac_n "checking for --enable-gauge""... $ac_c" 1>&6 +echo "configure:5526: 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" - + if test "$enableval" = yes; then ac_cv_use_gauge='wxUSE_GAUGE=yes' else ac_cv_use_gauge='wxUSE_GAUGE=no' fi - + else - + LINE=`grep "wxUSE_GAUGE" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -5549,8 +5544,9 @@ else fi ac_cv_use_gauge='wxUSE_GAUGE='$DEFAULT_wxUSE_GAUGE + +fi -fi; eval "$ac_cv_use_gauge" if test "$no_cache" != 1; then @@ -5558,28 +5554,27 @@ fi; fi if test "$wxUSE_GAUGE" = yes; then - echo "$as_me:5561: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + echo "$ac_t""yes" 1>&6 else - echo "$as_me:5564: result: no" >&5 -echo "${ECHO_T}no" >&6 + echo "$ac_t""no" 1>&6 fi + - echo "$as_me:5568: checking for --enable-grid" >&5 -echo $ECHO_N "checking for --enable-grid... $ECHO_C" >&6 + echo $ac_n "checking for --enable-grid""... $ac_c" 1>&6 +echo "configure:5565: 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" - + if test "$enableval" = yes; then ac_cv_use_grid='wxUSE_GRID=yes' else ac_cv_use_grid='wxUSE_GRID=no' fi - + else - + LINE=`grep "wxUSE_GRID" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -5588,8 +5583,9 @@ else fi ac_cv_use_grid='wxUSE_GRID='$DEFAULT_wxUSE_GRID + +fi -fi; eval "$ac_cv_use_grid" if test "$no_cache" != 1; then @@ -5597,28 +5593,27 @@ fi; fi if test "$wxUSE_GRID" = yes; then - echo "$as_me:5600: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + echo "$ac_t""yes" 1>&6 else - echo "$as_me:5603: result: no" >&5 -echo "${ECHO_T}no" >&6 + echo "$ac_t""no" 1>&6 fi + - echo "$as_me:5607: checking for --enable-newgrid" >&5 -echo $ECHO_N "checking for --enable-newgrid... $ECHO_C" >&6 + echo $ac_n "checking for --enable-newgrid""... $ac_c" 1>&6 +echo "configure:5604: checking for --enable-newgrid" >&5 no_cache=0 # Check whether --enable-newgrid or --disable-newgrid was given. if test "${enable_newgrid+set}" = set; then enableval="$enable_newgrid" - + if test "$enableval" = yes; then ac_cv_use_newgrid='wxUSE_NEW_GRID=yes' else ac_cv_use_newgrid='wxUSE_NEW_GRID=no' fi - + else - + LINE=`grep "wxUSE_NEW_GRID" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -5627,8 +5622,9 @@ else fi ac_cv_use_newgrid='wxUSE_NEW_GRID='$DEFAULT_wxUSE_NEW_GRID + +fi -fi; eval "$ac_cv_use_newgrid" if test "$no_cache" != 1; then @@ -5636,28 +5632,27 @@ fi; fi if test "$wxUSE_NEW_GRID" = yes; then - echo "$as_me:5639: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + echo "$ac_t""yes" 1>&6 else - echo "$as_me:5642: result: no" >&5 -echo "${ECHO_T}no" >&6 + echo "$ac_t""no" 1>&6 fi + - echo "$as_me:5646: checking for --enable-imaglist" >&5 -echo $ECHO_N "checking for --enable-imaglist... $ECHO_C" >&6 + echo $ac_n "checking for --enable-imaglist""... $ac_c" 1>&6 +echo "configure:5643: 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" - + if test "$enableval" = yes; then ac_cv_use_imaglist='wxUSE_IMAGLIST=yes' else ac_cv_use_imaglist='wxUSE_IMAGLIST=no' fi - + else - + LINE=`grep "wxUSE_IMAGLIST" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -5666,8 +5661,9 @@ else fi ac_cv_use_imaglist='wxUSE_IMAGLIST='$DEFAULT_wxUSE_IMAGLIST + +fi -fi; eval "$ac_cv_use_imaglist" if test "$no_cache" != 1; then @@ -5675,28 +5671,27 @@ fi; fi if test "$wxUSE_IMAGLIST" = yes; then - echo "$as_me:5678: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + echo "$ac_t""yes" 1>&6 else - echo "$as_me:5681: result: no" >&5 -echo "${ECHO_T}no" >&6 + echo "$ac_t""no" 1>&6 fi + - echo "$as_me:5685: checking for --enable-listbox" >&5 -echo $ECHO_N "checking for --enable-listbox... $ECHO_C" >&6 + echo $ac_n "checking for --enable-listbox""... $ac_c" 1>&6 +echo "configure:5682: 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" - + if test "$enableval" = yes; then ac_cv_use_listbox='wxUSE_LISTBOX=yes' else ac_cv_use_listbox='wxUSE_LISTBOX=no' fi - + else - + LINE=`grep "wxUSE_LISTBOX" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -5705,8 +5700,9 @@ else fi ac_cv_use_listbox='wxUSE_LISTBOX='$DEFAULT_wxUSE_LISTBOX + +fi -fi; eval "$ac_cv_use_listbox" if test "$no_cache" != 1; then @@ -5714,28 +5710,27 @@ fi; fi if test "$wxUSE_LISTBOX" = yes; then - echo "$as_me:5717: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + echo "$ac_t""yes" 1>&6 else - echo "$as_me:5720: result: no" >&5 -echo "${ECHO_T}no" >&6 + echo "$ac_t""no" 1>&6 fi + - echo "$as_me:5724: checking for --enable-listctrl" >&5 -echo $ECHO_N "checking for --enable-listctrl... $ECHO_C" >&6 + echo $ac_n "checking for --enable-listctrl""... $ac_c" 1>&6 +echo "configure:5721: 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" - + if test "$enableval" = yes; then ac_cv_use_listctrl='wxUSE_LISTCTRL=yes' else ac_cv_use_listctrl='wxUSE_LISTCTRL=no' fi - + else - + LINE=`grep "wxUSE_LISTCTRL" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -5744,8 +5739,9 @@ else fi ac_cv_use_listctrl='wxUSE_LISTCTRL='$DEFAULT_wxUSE_LISTCTRL + +fi -fi; eval "$ac_cv_use_listctrl" if test "$no_cache" != 1; then @@ -5753,28 +5749,27 @@ fi; fi if test "$wxUSE_LISTCTRL" = yes; then - echo "$as_me:5756: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + echo "$ac_t""yes" 1>&6 else - echo "$as_me:5759: result: no" >&5 -echo "${ECHO_T}no" >&6 + echo "$ac_t""no" 1>&6 fi + - echo "$as_me:5763: checking for --enable-notebook" >&5 -echo $ECHO_N "checking for --enable-notebook... $ECHO_C" >&6 + echo $ac_n "checking for --enable-notebook""... $ac_c" 1>&6 +echo "configure:5760: 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" - + if test "$enableval" = yes; then ac_cv_use_notebook='wxUSE_NOTEBOOK=yes' else ac_cv_use_notebook='wxUSE_NOTEBOOK=no' fi - + else - + LINE=`grep "wxUSE_NOTEBOOK" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -5783,8 +5778,9 @@ else fi ac_cv_use_notebook='wxUSE_NOTEBOOK='$DEFAULT_wxUSE_NOTEBOOK + +fi -fi; eval "$ac_cv_use_notebook" if test "$no_cache" != 1; then @@ -5792,28 +5788,66 @@ fi; fi if test "$wxUSE_NOTEBOOK" = yes; then - echo "$as_me:5795: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + echo "$ac_t""yes" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + + + echo $ac_n "checking for --enable-propsheet""... $ac_c" 1>&6 +echo "configure:5799: checking for --enable-propsheet" >&5 + no_cache=0 + # Check whether --enable-propsheet or --disable-propsheet was given. +if test "${enable_propsheet+set}" = set; then + enableval="$enable_propsheet" + + if test "$enableval" = yes; then + ac_cv_use_propsheet='wxUSE_PROPSHEET=yes' + else + ac_cv_use_propsheet='wxUSE_PROPSHEET=no' + fi + +else + + LINE=`grep "wxUSE_PROPSHEET" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_propsheet='wxUSE_PROPSHEET='$DEFAULT_wxUSE_PROPSHEET + +fi + + + eval "$ac_cv_use_propsheet" + if test "$no_cache" != 1; then + echo $ac_cv_use_propsheet >> ${wx_arg_cache_file}.tmp + fi + + if test "$wxUSE_PROPSHEET" = yes; then + echo "$ac_t""yes" 1>&6 else - echo "$as_me:5798: result: no" >&5 -echo "${ECHO_T}no" >&6 + echo "$ac_t""no" 1>&6 fi + - echo "$as_me:5802: checking for --enable-radiobox" >&5 -echo $ECHO_N "checking for --enable-radiobox... $ECHO_C" >&6 + echo $ac_n "checking for --enable-radiobox""... $ac_c" 1>&6 +echo "configure:5838: 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" - + if test "$enableval" = yes; then ac_cv_use_radiobox='wxUSE_RADIOBOX=yes' else ac_cv_use_radiobox='wxUSE_RADIOBOX=no' fi - + else - + LINE=`grep "wxUSE_RADIOBOX" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -5822,8 +5856,9 @@ else fi ac_cv_use_radiobox='wxUSE_RADIOBOX='$DEFAULT_wxUSE_RADIOBOX + +fi -fi; eval "$ac_cv_use_radiobox" if test "$no_cache" != 1; then @@ -5831,28 +5866,27 @@ fi; fi if test "$wxUSE_RADIOBOX" = yes; then - echo "$as_me:5834: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + echo "$ac_t""yes" 1>&6 else - echo "$as_me:5837: result: no" >&5 -echo "${ECHO_T}no" >&6 + echo "$ac_t""no" 1>&6 fi + - echo "$as_me:5841: checking for --enable-radiobtn" >&5 -echo $ECHO_N "checking for --enable-radiobtn... $ECHO_C" >&6 + echo $ac_n "checking for --enable-radiobtn""... $ac_c" 1>&6 +echo "configure:5877: 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" - + if test "$enableval" = yes; then ac_cv_use_radiobtn='wxUSE_RADIOBTN=yes' else ac_cv_use_radiobtn='wxUSE_RADIOBTN=no' fi - + else - + LINE=`grep "wxUSE_RADIOBTN" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -5861,8 +5895,9 @@ else fi ac_cv_use_radiobtn='wxUSE_RADIOBTN='$DEFAULT_wxUSE_RADIOBTN + +fi -fi; eval "$ac_cv_use_radiobtn" if test "$no_cache" != 1; then @@ -5870,28 +5905,27 @@ fi; fi if test "$wxUSE_RADIOBTN" = yes; then - echo "$as_me:5873: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + echo "$ac_t""yes" 1>&6 else - echo "$as_me:5876: result: no" >&5 -echo "${ECHO_T}no" >&6 + echo "$ac_t""no" 1>&6 fi + - echo "$as_me:5880: checking for --enable-sash" >&5 -echo $ECHO_N "checking for --enable-sash... $ECHO_C" >&6 + echo $ac_n "checking for --enable-sash""... $ac_c" 1>&6 +echo "configure:5916: 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" - + if test "$enableval" = yes; then ac_cv_use_sash='wxUSE_SASH=yes' else ac_cv_use_sash='wxUSE_SASH=no' fi - + else - + LINE=`grep "wxUSE_SASH" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -5900,8 +5934,9 @@ else fi ac_cv_use_sash='wxUSE_SASH='$DEFAULT_wxUSE_SASH + +fi -fi; eval "$ac_cv_use_sash" if test "$no_cache" != 1; then @@ -5909,28 +5944,27 @@ fi; fi if test "$wxUSE_SASH" = yes; then - echo "$as_me:5912: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + echo "$ac_t""yes" 1>&6 else - echo "$as_me:5915: result: no" >&5 -echo "${ECHO_T}no" >&6 + echo "$ac_t""no" 1>&6 fi + - echo "$as_me:5919: checking for --enable-scrollbar" >&5 -echo $ECHO_N "checking for --enable-scrollbar... $ECHO_C" >&6 + echo $ac_n "checking for --enable-scrollbar""... $ac_c" 1>&6 +echo "configure:5955: 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" - + if test "$enableval" = yes; then ac_cv_use_scrollbar='wxUSE_SCROLLBAR=yes' else ac_cv_use_scrollbar='wxUSE_SCROLLBAR=no' fi - + else - + LINE=`grep "wxUSE_SCROLLBAR" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -5939,8 +5973,9 @@ else fi ac_cv_use_scrollbar='wxUSE_SCROLLBAR='$DEFAULT_wxUSE_SCROLLBAR + +fi -fi; eval "$ac_cv_use_scrollbar" if test "$no_cache" != 1; then @@ -5948,28 +5983,27 @@ fi; fi if test "$wxUSE_SCROLLBAR" = yes; then - echo "$as_me:5951: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + echo "$ac_t""yes" 1>&6 else - echo "$as_me:5954: result: no" >&5 -echo "${ECHO_T}no" >&6 + echo "$ac_t""no" 1>&6 fi + - echo "$as_me:5958: checking for --enable-slider" >&5 -echo $ECHO_N "checking for --enable-slider... $ECHO_C" >&6 + echo $ac_n "checking for --enable-slider""... $ac_c" 1>&6 +echo "configure:5994: 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" - + if test "$enableval" = yes; then ac_cv_use_slider='wxUSE_SLIDER=yes' else ac_cv_use_slider='wxUSE_SLIDER=no' fi - + else - + LINE=`grep "wxUSE_SLIDER" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -5978,8 +6012,9 @@ else fi ac_cv_use_slider='wxUSE_SLIDER='$DEFAULT_wxUSE_SLIDER + +fi -fi; eval "$ac_cv_use_slider" if test "$no_cache" != 1; then @@ -5987,28 +6022,27 @@ fi; fi if test "$wxUSE_SLIDER" = yes; then - echo "$as_me:5990: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + echo "$ac_t""yes" 1>&6 else - echo "$as_me:5993: result: no" >&5 -echo "${ECHO_T}no" >&6 + echo "$ac_t""no" 1>&6 fi + - echo "$as_me:5997: checking for --enable-spinbtn" >&5 -echo $ECHO_N "checking for --enable-spinbtn... $ECHO_C" >&6 + echo $ac_n "checking for --enable-spinbtn""... $ac_c" 1>&6 +echo "configure:6033: 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" - + if test "$enableval" = yes; then ac_cv_use_spinbtn='wxUSE_SPINBTN=yes' else ac_cv_use_spinbtn='wxUSE_SPINBTN=no' fi - + else - + LINE=`grep "wxUSE_SPINBTN" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -6017,8 +6051,9 @@ else fi ac_cv_use_spinbtn='wxUSE_SPINBTN='$DEFAULT_wxUSE_SPINBTN + +fi -fi; eval "$ac_cv_use_spinbtn" if test "$no_cache" != 1; then @@ -6026,28 +6061,27 @@ fi; fi if test "$wxUSE_SPINBTN" = yes; then - echo "$as_me:6029: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + echo "$ac_t""yes" 1>&6 else - echo "$as_me:6032: result: no" >&5 -echo "${ECHO_T}no" >&6 + echo "$ac_t""no" 1>&6 fi + - echo "$as_me:6036: checking for --enable-spinctrl" >&5 -echo $ECHO_N "checking for --enable-spinctrl... $ECHO_C" >&6 + echo $ac_n "checking for --enable-spinctrl""... $ac_c" 1>&6 +echo "configure:6072: checking for --enable-spinctrl" >&5 no_cache=0 # Check whether --enable-spinctrl or --disable-spinctrl was given. if test "${enable_spinctrl+set}" = set; then enableval="$enable_spinctrl" - + if test "$enableval" = yes; then ac_cv_use_spinctrl='wxUSE_SPINCTRL=yes' else ac_cv_use_spinctrl='wxUSE_SPINCTRL=no' fi - + else - + LINE=`grep "wxUSE_SPINCTRL" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -6056,8 +6090,9 @@ else fi ac_cv_use_spinctrl='wxUSE_SPINCTRL='$DEFAULT_wxUSE_SPINCTRL + +fi -fi; eval "$ac_cv_use_spinctrl" if test "$no_cache" != 1; then @@ -6065,28 +6100,27 @@ fi; fi if test "$wxUSE_SPINCTRL" = yes; then - echo "$as_me:6068: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + echo "$ac_t""yes" 1>&6 else - echo "$as_me:6071: result: no" >&5 -echo "${ECHO_T}no" >&6 + echo "$ac_t""no" 1>&6 fi + - echo "$as_me:6075: checking for --enable-splitter" >&5 -echo $ECHO_N "checking for --enable-splitter... $ECHO_C" >&6 + echo $ac_n "checking for --enable-splitter""... $ac_c" 1>&6 +echo "configure:6111: 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" - + if test "$enableval" = yes; then ac_cv_use_splitter='wxUSE_SPLITTER=yes' else ac_cv_use_splitter='wxUSE_SPLITTER=no' fi - + else - + LINE=`grep "wxUSE_SPLITTER" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -6095,8 +6129,9 @@ else fi ac_cv_use_splitter='wxUSE_SPLITTER='$DEFAULT_wxUSE_SPLITTER + +fi -fi; eval "$ac_cv_use_splitter" if test "$no_cache" != 1; then @@ -6104,28 +6139,27 @@ fi; fi if test "$wxUSE_SPLITTER" = yes; then - echo "$as_me:6107: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + echo "$ac_t""yes" 1>&6 else - echo "$as_me:6110: result: no" >&5 -echo "${ECHO_T}no" >&6 + echo "$ac_t""no" 1>&6 fi + - echo "$as_me:6114: checking for --enable-statbmp" >&5 -echo $ECHO_N "checking for --enable-statbmp... $ECHO_C" >&6 + echo $ac_n "checking for --enable-statbmp""... $ac_c" 1>&6 +echo "configure:6150: 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" - + if test "$enableval" = yes; then ac_cv_use_statbmp='wxUSE_STATBMP=yes' else ac_cv_use_statbmp='wxUSE_STATBMP=no' fi - + else - + LINE=`grep "wxUSE_STATBMP" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -6134,8 +6168,9 @@ else fi ac_cv_use_statbmp='wxUSE_STATBMP='$DEFAULT_wxUSE_STATBMP + +fi -fi; eval "$ac_cv_use_statbmp" if test "$no_cache" != 1; then @@ -6143,28 +6178,27 @@ fi; fi if test "$wxUSE_STATBMP" = yes; then - echo "$as_me:6146: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + echo "$ac_t""yes" 1>&6 else - echo "$as_me:6149: result: no" >&5 -echo "${ECHO_T}no" >&6 + echo "$ac_t""no" 1>&6 fi + - echo "$as_me:6153: checking for --enable-statbox" >&5 -echo $ECHO_N "checking for --enable-statbox... $ECHO_C" >&6 + echo $ac_n "checking for --enable-statbox""... $ac_c" 1>&6 +echo "configure:6189: 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" - + if test "$enableval" = yes; then ac_cv_use_statbox='wxUSE_STATBOX=yes' else ac_cv_use_statbox='wxUSE_STATBOX=no' fi - + else - + LINE=`grep "wxUSE_STATBOX" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -6173,8 +6207,9 @@ else fi ac_cv_use_statbox='wxUSE_STATBOX='$DEFAULT_wxUSE_STATBOX + +fi -fi; eval "$ac_cv_use_statbox" if test "$no_cache" != 1; then @@ -6182,28 +6217,27 @@ fi; fi if test "$wxUSE_STATBOX" = yes; then - echo "$as_me:6185: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + echo "$ac_t""yes" 1>&6 else - echo "$as_me:6188: result: no" >&5 -echo "${ECHO_T}no" >&6 + echo "$ac_t""no" 1>&6 fi + - echo "$as_me:6192: checking for --enable-statline" >&5 -echo $ECHO_N "checking for --enable-statline... $ECHO_C" >&6 + echo $ac_n "checking for --enable-statline""... $ac_c" 1>&6 +echo "configure:6228: 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" - + if test "$enableval" = yes; then ac_cv_use_statline='wxUSE_STATLINE=yes' else ac_cv_use_statline='wxUSE_STATLINE=no' fi - + else - + LINE=`grep "wxUSE_STATLINE" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -6212,8 +6246,9 @@ else fi ac_cv_use_statline='wxUSE_STATLINE='$DEFAULT_wxUSE_STATLINE + +fi -fi; eval "$ac_cv_use_statline" if test "$no_cache" != 1; then @@ -6221,28 +6256,66 @@ fi; fi if test "$wxUSE_STATLINE" = yes; then - echo "$as_me:6224: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + echo "$ac_t""yes" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + + + echo $ac_n "checking for --enable-stattext""... $ac_c" 1>&6 +echo "configure:6267: checking for --enable-stattext" >&5 + no_cache=0 + # Check whether --enable-stattext or --disable-stattext was given. +if test "${enable_stattext+set}" = set; then + enableval="$enable_stattext" + + if test "$enableval" = yes; then + ac_cv_use_stattext='wxUSE_STATTEXT=yes' + else + ac_cv_use_stattext='wxUSE_STATTEXT=no' + fi + +else + + LINE=`grep "wxUSE_STATTEXT" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_stattext='wxUSE_STATTEXT='$DEFAULT_wxUSE_STATTEXT + +fi + + + eval "$ac_cv_use_stattext" + if test "$no_cache" != 1; then + echo $ac_cv_use_stattext >> ${wx_arg_cache_file}.tmp + fi + + if test "$wxUSE_STATTEXT" = yes; then + echo "$ac_t""yes" 1>&6 else - echo "$as_me:6227: result: no" >&5 -echo "${ECHO_T}no" >&6 + echo "$ac_t""no" 1>&6 fi + - echo "$as_me:6231: checking for --enable-statusbar" >&5 -echo $ECHO_N "checking for --enable-statusbar... $ECHO_C" >&6 + echo $ac_n "checking for --enable-statusbar""... $ac_c" 1>&6 +echo "configure:6306: 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" - + if test "$enableval" = yes; then ac_cv_use_statusbar='wxUSE_STATUSBAR=yes' else ac_cv_use_statusbar='wxUSE_STATUSBAR=no' fi - + else - + LINE=`grep "wxUSE_STATUSBAR" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -6251,8 +6324,9 @@ else fi ac_cv_use_statusbar='wxUSE_STATUSBAR='$DEFAULT_wxUSE_STATUSBAR + +fi -fi; eval "$ac_cv_use_statusbar" if test "$no_cache" != 1; then @@ -6260,28 +6334,27 @@ fi; fi if test "$wxUSE_STATUSBAR" = yes; then - echo "$as_me:6263: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + echo "$ac_t""yes" 1>&6 else - echo "$as_me:6266: result: no" >&5 -echo "${ECHO_T}no" >&6 + echo "$ac_t""no" 1>&6 fi + - echo "$as_me:6270: checking for --enable-tabdialog" >&5 -echo $ECHO_N "checking for --enable-tabdialog... $ECHO_C" >&6 + echo $ac_n "checking for --enable-tabdialog""... $ac_c" 1>&6 +echo "configure:6345: 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" - + if test "$enableval" = yes; then ac_cv_use_tabdialog='wxUSE_TABDIALOG=yes' else ac_cv_use_tabdialog='wxUSE_TABDIALOG=no' fi - + else - + LINE=`grep "wxUSE_TABDIALOG" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -6290,8 +6363,9 @@ else fi ac_cv_use_tabdialog='wxUSE_TABDIALOG='$DEFAULT_wxUSE_TABDIALOG + +fi -fi; eval "$ac_cv_use_tabdialog" if test "$no_cache" != 1; then @@ -6299,28 +6373,66 @@ fi; fi if test "$wxUSE_TABDIALOG" = yes; then - echo "$as_me:6302: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + echo "$ac_t""yes" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + + + echo $ac_n "checking for --enable-textctrl""... $ac_c" 1>&6 +echo "configure:6384: checking for --enable-textctrl" >&5 + no_cache=0 + # Check whether --enable-textctrl or --disable-textctrl was given. +if test "${enable_textctrl+set}" = set; then + enableval="$enable_textctrl" + + if test "$enableval" = yes; then + ac_cv_use_textctrl='wxUSE_TEXTCTRL=yes' + else + ac_cv_use_textctrl='wxUSE_TEXTCTRL=no' + fi + +else + + LINE=`grep "wxUSE_TEXTCTRL" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_textctrl='wxUSE_TEXTCTRL='$DEFAULT_wxUSE_TEXTCTRL + +fi + + + eval "$ac_cv_use_textctrl" + if test "$no_cache" != 1; then + echo $ac_cv_use_textctrl >> ${wx_arg_cache_file}.tmp + fi + + if test "$wxUSE_TEXTCTRL" = yes; then + echo "$ac_t""yes" 1>&6 else - echo "$as_me:6305: result: no" >&5 -echo "${ECHO_T}no" >&6 + echo "$ac_t""no" 1>&6 fi + - echo "$as_me:6309: checking for --enable-togglebtn" >&5 -echo $ECHO_N "checking for --enable-togglebtn... $ECHO_C" >&6 + echo $ac_n "checking for --enable-togglebtn""... $ac_c" 1>&6 +echo "configure:6423: checking for --enable-togglebtn" >&5 no_cache=0 # Check whether --enable-togglebtn or --disable-togglebtn was given. if test "${enable_togglebtn+set}" = set; then enableval="$enable_togglebtn" - + if test "$enableval" = yes; then ac_cv_use_togglebtn='wxUSE_TOGGLEBTN=yes' else ac_cv_use_togglebtn='wxUSE_TOGGLEBTN=no' fi - + else - + LINE=`grep "wxUSE_TOGGLEBTN" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -6329,8 +6441,9 @@ else fi ac_cv_use_togglebtn='wxUSE_TOGGLEBTN='$DEFAULT_wxUSE_TOGGLEBTN + +fi -fi; eval "$ac_cv_use_togglebtn" if test "$no_cache" != 1; then @@ -6338,28 +6451,27 @@ fi; fi if test "$wxUSE_TOGGLEBTN" = yes; then - echo "$as_me:6341: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + echo "$ac_t""yes" 1>&6 else - echo "$as_me:6344: result: no" >&5 -echo "${ECHO_T}no" >&6 + echo "$ac_t""no" 1>&6 fi + - echo "$as_me:6348: checking for --enable-toolbar" >&5 -echo $ECHO_N "checking for --enable-toolbar... $ECHO_C" >&6 + echo $ac_n "checking for --enable-toolbar""... $ac_c" 1>&6 +echo "configure:6462: 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" - + if test "$enableval" = yes; then ac_cv_use_toolbar='wxUSE_TOOLBAR=yes' else ac_cv_use_toolbar='wxUSE_TOOLBAR=no' fi - + else - + LINE=`grep "wxUSE_TOOLBAR" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -6368,8 +6480,9 @@ else fi ac_cv_use_toolbar='wxUSE_TOOLBAR='$DEFAULT_wxUSE_TOOLBAR + +fi -fi; eval "$ac_cv_use_toolbar" if test "$no_cache" != 1; then @@ -6377,28 +6490,27 @@ fi; fi if test "$wxUSE_TOOLBAR" = yes; then - echo "$as_me:6380: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + echo "$ac_t""yes" 1>&6 else - echo "$as_me:6383: result: no" >&5 -echo "${ECHO_T}no" >&6 + echo "$ac_t""no" 1>&6 fi + - echo "$as_me:6387: checking for --enable-tbarnative" >&5 -echo $ECHO_N "checking for --enable-tbarnative... $ECHO_C" >&6 + echo $ac_n "checking for --enable-tbarnative""... $ac_c" 1>&6 +echo "configure:6501: checking for --enable-tbarnative" >&5 no_cache=0 # Check whether --enable-tbarnative or --disable-tbarnative was given. if test "${enable_tbarnative+set}" = set; then enableval="$enable_tbarnative" - + if test "$enableval" = yes; then ac_cv_use_tbarnative='wxUSE_TOOLBAR_NATIVE=yes' else ac_cv_use_tbarnative='wxUSE_TOOLBAR_NATIVE=no' fi - + else - + LINE=`grep "wxUSE_TOOLBAR_NATIVE" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -6407,8 +6519,9 @@ else fi ac_cv_use_tbarnative='wxUSE_TOOLBAR_NATIVE='$DEFAULT_wxUSE_TOOLBAR_NATIVE + +fi -fi; eval "$ac_cv_use_tbarnative" if test "$no_cache" != 1; then @@ -6416,28 +6529,27 @@ fi; fi if test "$wxUSE_TOOLBAR_NATIVE" = yes; then - echo "$as_me:6419: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + echo "$ac_t""yes" 1>&6 else - echo "$as_me:6422: result: no" >&5 -echo "${ECHO_T}no" >&6 + echo "$ac_t""no" 1>&6 fi + - echo "$as_me:6426: checking for --enable-tbarsmpl" >&5 -echo $ECHO_N "checking for --enable-tbarsmpl... $ECHO_C" >&6 + echo $ac_n "checking for --enable-tbarsmpl""... $ac_c" 1>&6 +echo "configure:6540: checking for --enable-tbarsmpl" >&5 no_cache=0 # Check whether --enable-tbarsmpl or --disable-tbarsmpl was given. if test "${enable_tbarsmpl+set}" = set; then enableval="$enable_tbarsmpl" - + if test "$enableval" = yes; then ac_cv_use_tbarsmpl='wxUSE_TOOLBAR_SIMPLE=yes' else ac_cv_use_tbarsmpl='wxUSE_TOOLBAR_SIMPLE=no' fi - + else - + LINE=`grep "wxUSE_TOOLBAR_SIMPLE" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -6446,8 +6558,9 @@ else fi ac_cv_use_tbarsmpl='wxUSE_TOOLBAR_SIMPLE='$DEFAULT_wxUSE_TOOLBAR_SIMPLE + +fi -fi; eval "$ac_cv_use_tbarsmpl" if test "$no_cache" != 1; then @@ -6455,28 +6568,27 @@ fi; fi if test "$wxUSE_TOOLBAR_SIMPLE" = yes; then - echo "$as_me:6458: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + echo "$ac_t""yes" 1>&6 else - echo "$as_me:6461: result: no" >&5 -echo "${ECHO_T}no" >&6 + echo "$ac_t""no" 1>&6 fi + - echo "$as_me:6465: checking for --enable-treectrl" >&5 -echo $ECHO_N "checking for --enable-treectrl... $ECHO_C" >&6 + echo $ac_n "checking for --enable-treectrl""... $ac_c" 1>&6 +echo "configure:6579: 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" - + if test "$enableval" = yes; then ac_cv_use_treectrl='wxUSE_TREECTRL=yes' else ac_cv_use_treectrl='wxUSE_TREECTRL=no' fi - + else - + LINE=`grep "wxUSE_TREECTRL" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -6485,8 +6597,9 @@ else fi ac_cv_use_treectrl='wxUSE_TREECTRL='$DEFAULT_wxUSE_TREECTRL + +fi -fi; eval "$ac_cv_use_treectrl" if test "$no_cache" != 1; then @@ -6494,2792 +6607,3106 @@ fi; fi if test "$wxUSE_TREECTRL" = yes; then - echo "$as_me:6497: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + echo "$ac_t""yes" 1>&6 else - echo "$as_me:6500: result: no" >&5 -echo "${ECHO_T}no" >&6 + echo "$ac_t""no" 1>&6 fi + - echo "$as_me:6504: checking for --enable-commondlg" >&5 -echo $ECHO_N "checking for --enable-commondlg... $ECHO_C" >&6 + echo $ac_n "checking for --enable-popupwin""... $ac_c" 1>&6 +echo "configure:6618: checking for --enable-popupwin" >&5 no_cache=0 - # Check whether --enable-commondlg or --disable-commondlg was given. -if test "${enable_commondlg+set}" = set; then - enableval="$enable_commondlg" - + # Check whether --enable-popupwin or --disable-popupwin was given. +if test "${enable_popupwin+set}" = set; then + enableval="$enable_popupwin" + if test "$enableval" = yes; then - ac_cv_use_commondlg='wxUSE_COMMONDLGS=yes' + ac_cv_use_popupwin='wxUSE_POPUPWIN=yes' else - ac_cv_use_commondlg='wxUSE_COMMONDLGS=no' + ac_cv_use_popupwin='wxUSE_POPUPWIN=no' fi - + else - - LINE=`grep "wxUSE_COMMONDLGS" ${wx_arg_cache_file}` + + LINE=`grep "wxUSE_POPUPWIN" ${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 + ac_cv_use_popupwin='wxUSE_POPUPWIN='$DEFAULT_wxUSE_POPUPWIN + +fi -fi; - eval "$ac_cv_use_commondlg" + eval "$ac_cv_use_popupwin" if test "$no_cache" != 1; then - echo $ac_cv_use_commondlg >> ${wx_arg_cache_file}.tmp + echo $ac_cv_use_popupwin >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_COMMONDLGS" = yes; then - echo "$as_me:6536: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test "$wxUSE_POPUPWIN" = yes; then + echo "$ac_t""yes" 1>&6 else - echo "$as_me:6539: result: no" >&5 -echo "${ECHO_T}no" >&6 + echo "$ac_t""no" 1>&6 fi + + - echo "$as_me:6543: checking for --enable-dirdlg" >&5 -echo $ECHO_N "checking for --enable-dirdlg... $ECHO_C" >&6 - no_cache=0 - # Check whether --enable-dirdlg or --disable-dirdlg was given. -if test "${enable_dirdlg+set}" = set; then - enableval="$enable_dirdlg" + echo $ac_n "checking for --enable-commondlg""... $ac_c" 1>&6 +echo "configure:6659: 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" + if test "$enableval" = yes; then - ac_cv_use_dirdlg='wxUSE_DIRDLG=yes' + ac_cv_use_commondlg='wxUSE_COMMONDLGS=yes' else - ac_cv_use_dirdlg='wxUSE_DIRDLG=no' + ac_cv_use_commondlg='wxUSE_COMMONDLGS=no' fi - + else - - LINE=`grep "wxUSE_DIRDLG" ${wx_arg_cache_file}` + + 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_dirdlg='wxUSE_DIRDLG='$DEFAULT_wxUSE_DIRDLG + ac_cv_use_commondlg='wxUSE_COMMONDLGS='$DEFAULT_wxUSE_COMMONDLGS + +fi -fi; - eval "$ac_cv_use_dirdlg" + eval "$ac_cv_use_commondlg" if test "$no_cache" != 1; then - echo $ac_cv_use_dirdlg >> ${wx_arg_cache_file}.tmp + echo $ac_cv_use_commondlg >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_DIRDLG" = yes; then - echo "$as_me:6575: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test "$wxUSE_COMMONDLGS" = yes; then + echo "$ac_t""yes" 1>&6 else - echo "$as_me:6578: result: no" >&5 -echo "${ECHO_T}no" >&6 + echo "$ac_t""no" 1>&6 fi + - echo "$as_me:6582: checking for --enable-textdlg" >&5 -echo $ECHO_N "checking for --enable-textdlg... $ECHO_C" >&6 + echo $ac_n "checking for --enable-choicedlg""... $ac_c" 1>&6 +echo "configure:6698: checking for --enable-choicedlg" >&5 no_cache=0 - # Check whether --enable-textdlg or --disable-textdlg was given. -if test "${enable_textdlg+set}" = set; then - enableval="$enable_textdlg" - + # Check whether --enable-choicedlg or --disable-choicedlg was given. +if test "${enable_choicedlg+set}" = set; then + enableval="$enable_choicedlg" + if test "$enableval" = yes; then - ac_cv_use_textdlg='wxUSE_TEXTDLG=yes' + ac_cv_use_choicedlg='wxUSE_CHOICEDLG=yes' else - ac_cv_use_textdlg='wxUSE_TEXTDLG=no' + ac_cv_use_choicedlg='wxUSE_CHOICEDLG=no' fi - + else - - LINE=`grep "wxUSE_TEXTDLG" ${wx_arg_cache_file}` + + LINE=`grep "wxUSE_CHOICEDLG" ${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 + ac_cv_use_choicedlg='wxUSE_CHOICEDLG='$DEFAULT_wxUSE_CHOICEDLG + +fi -fi; - eval "$ac_cv_use_textdlg" + eval "$ac_cv_use_choicedlg" if test "$no_cache" != 1; then - echo $ac_cv_use_textdlg >> ${wx_arg_cache_file}.tmp + echo $ac_cv_use_choicedlg >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_TEXTDLG" = yes; then - echo "$as_me:6614: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test "$wxUSE_CHOICEDLG" = yes; then + echo "$ac_t""yes" 1>&6 else - echo "$as_me:6617: result: no" >&5 -echo "${ECHO_T}no" >&6 + echo "$ac_t""no" 1>&6 fi + - echo "$as_me:6621: checking for --enable-tipdlg" >&5 -echo $ECHO_N "checking for --enable-tipdlg... $ECHO_C" >&6 + echo $ac_n "checking for --enable-coldlg""... $ac_c" 1>&6 +echo "configure:6737: checking for --enable-coldlg" >&5 no_cache=0 - # Check whether --enable-tipdlg or --disable-tipdlg was given. -if test "${enable_tipdlg+set}" = set; then - enableval="$enable_tipdlg" - + # Check whether --enable-coldlg or --disable-coldlg was given. +if test "${enable_coldlg+set}" = set; then + enableval="$enable_coldlg" + if test "$enableval" = yes; then - ac_cv_use_tipdlg='wxUSE_STARTUP_TIPS=yes' + ac_cv_use_coldlg='wxUSE_COLOURDLG=yes' else - ac_cv_use_tipdlg='wxUSE_STARTUP_TIPS=no' + ac_cv_use_coldlg='wxUSE_COLOURDLG=no' fi - + else - - LINE=`grep "wxUSE_STARTUP_TIPS" ${wx_arg_cache_file}` + + LINE=`grep "wxUSE_COLOURDLG" ${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 + ac_cv_use_coldlg='wxUSE_COLOURDLG='$DEFAULT_wxUSE_COLOURDLG + +fi -fi; - eval "$ac_cv_use_tipdlg" + eval "$ac_cv_use_coldlg" if test "$no_cache" != 1; then - echo $ac_cv_use_tipdlg >> ${wx_arg_cache_file}.tmp + echo $ac_cv_use_coldlg >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_STARTUP_TIPS" = yes; then - echo "$as_me:6653: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test "$wxUSE_COLOURDLG" = yes; then + echo "$ac_t""yes" 1>&6 else - echo "$as_me:6656: result: no" >&5 -echo "${ECHO_T}no" >&6 + echo "$ac_t""no" 1>&6 fi + - echo "$as_me:6660: checking for --enable-progressdlg" >&5 -echo $ECHO_N "checking for --enable-progressdlg... $ECHO_C" >&6 + echo $ac_n "checking for --enable-filedlg""... $ac_c" 1>&6 +echo "configure:6776: checking for --enable-filedlg" >&5 no_cache=0 - # Check whether --enable-progressdlg or --disable-progressdlg was given. -if test "${enable_progressdlg+set}" = set; then - enableval="$enable_progressdlg" - + # Check whether --enable-filedlg or --disable-filedlg was given. +if test "${enable_filedlg+set}" = set; then + enableval="$enable_filedlg" + if test "$enableval" = yes; then - ac_cv_use_progressdlg='wxUSE_PROGRESSDLG=yes' + ac_cv_use_filedlg='wxUSE_FILEDLG=yes' else - ac_cv_use_progressdlg='wxUSE_PROGRESSDLG=no' + ac_cv_use_filedlg='wxUSE_FILEDLG=no' fi - + else - - LINE=`grep "wxUSE_PROGRESSDLG" ${wx_arg_cache_file}` + + LINE=`grep "wxUSE_FILEDLG" ${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 + ac_cv_use_filedlg='wxUSE_FILEDLG='$DEFAULT_wxUSE_FILEDLG + +fi -fi; - eval "$ac_cv_use_progressdlg" + eval "$ac_cv_use_filedlg" if test "$no_cache" != 1; then - echo $ac_cv_use_progressdlg >> ${wx_arg_cache_file}.tmp + echo $ac_cv_use_filedlg >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_PROGRESSDLG" = yes; then - echo "$as_me:6692: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test "$wxUSE_FILEDLG" = yes; then + echo "$ac_t""yes" 1>&6 else - echo "$as_me:6695: result: no" >&5 -echo "${ECHO_T}no" >&6 + echo "$ac_t""no" 1>&6 fi + - echo "$as_me:6699: checking for --enable-miniframe" >&5 -echo $ECHO_N "checking for --enable-miniframe... $ECHO_C" >&6 + echo $ac_n "checking for --enable-filedlg""... $ac_c" 1>&6 +echo "configure:6815: checking for --enable-filedlg" >&5 no_cache=0 - # Check whether --enable-miniframe or --disable-miniframe was given. -if test "${enable_miniframe+set}" = set; then - enableval="$enable_miniframe" - + # Check whether --enable-filedlg or --disable-filedlg was given. +if test "${enable_filedlg+set}" = set; then + enableval="$enable_filedlg" + if test "$enableval" = yes; then - ac_cv_use_miniframe='wxUSE_MINIFRAME=yes' + ac_cv_use_filedlg='wxUSE_FINDREPLDLG=yes' else - ac_cv_use_miniframe='wxUSE_MINIFRAME=no' + ac_cv_use_filedlg='wxUSE_FINDREPLDLG=no' fi - + else - - LINE=`grep "wxUSE_MINIFRAME" ${wx_arg_cache_file}` + + LINE=`grep "wxUSE_FINDREPLDLG" ${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 + ac_cv_use_filedlg='wxUSE_FINDREPLDLG='$DEFAULT_wxUSE_FINDREPLDLG + +fi -fi; - eval "$ac_cv_use_miniframe" + eval "$ac_cv_use_filedlg" if test "$no_cache" != 1; then - echo $ac_cv_use_miniframe >> ${wx_arg_cache_file}.tmp + echo $ac_cv_use_filedlg >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_MINIFRAME" = yes; then - echo "$as_me:6731: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test "$wxUSE_FINDREPLDLG" = yes; then + echo "$ac_t""yes" 1>&6 else - echo "$as_me:6734: result: no" >&5 -echo "${ECHO_T}no" >&6 + echo "$ac_t""no" 1>&6 fi + - echo "$as_me:6738: checking for --enable-html" >&5 -echo $ECHO_N "checking for --enable-html... $ECHO_C" >&6 + echo $ac_n "checking for --enable-fontdlg""... $ac_c" 1>&6 +echo "configure:6854: checking for --enable-fontdlg" >&5 no_cache=0 - # Check whether --enable-html or --disable-html was given. -if test "${enable_html+set}" = set; then - enableval="$enable_html" - + # Check whether --enable-fontdlg or --disable-fontdlg was given. +if test "${enable_fontdlg+set}" = set; then + enableval="$enable_fontdlg" + if test "$enableval" = yes; then - ac_cv_use_html='wxUSE_HTML=yes' + ac_cv_use_fontdlg='wxUSE_FONTDLG=yes' else - ac_cv_use_html='wxUSE_HTML=no' + ac_cv_use_fontdlg='wxUSE_FONTDLG=no' fi - + else - - LINE=`grep "wxUSE_HTML" ${wx_arg_cache_file}` + + LINE=`grep "wxUSE_FONTDLG" ${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 + ac_cv_use_fontdlg='wxUSE_FONTDLG='$DEFAULT_wxUSE_FONTDLG + +fi -fi; - eval "$ac_cv_use_html" + eval "$ac_cv_use_fontdlg" if test "$no_cache" != 1; then - echo $ac_cv_use_html >> ${wx_arg_cache_file}.tmp + echo $ac_cv_use_fontdlg >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_HTML" = yes; then - echo "$as_me:6770: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test "$wxUSE_FONTDLG" = yes; then + echo "$ac_t""yes" 1>&6 else - echo "$as_me:6773: result: no" >&5 -echo "${ECHO_T}no" >&6 + echo "$ac_t""no" 1>&6 fi + - echo "$as_me:6777: checking for --enable-tooltips" >&5 -echo $ECHO_N "checking for --enable-tooltips... $ECHO_C" >&6 + echo $ac_n "checking for --enable-dirdlg""... $ac_c" 1>&6 +echo "configure:6893: checking for --enable-dirdlg" >&5 no_cache=0 - # Check whether --enable-tooltips or --disable-tooltips was given. -if test "${enable_tooltips+set}" = set; then - enableval="$enable_tooltips" - + # 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_tooltips='wxUSE_TOOLTIPS=yes' + ac_cv_use_dirdlg='wxUSE_DIRDLG=yes' else - ac_cv_use_tooltips='wxUSE_TOOLTIPS=no' + ac_cv_use_dirdlg='wxUSE_DIRDLG=no' fi - + else - - LINE=`grep "wxUSE_TOOLTIPS" ${wx_arg_cache_file}` + + 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_tooltips='wxUSE_TOOLTIPS='$DEFAULT_wxUSE_TOOLTIPS + ac_cv_use_dirdlg='wxUSE_DIRDLG='$DEFAULT_wxUSE_DIRDLG + +fi -fi; - eval "$ac_cv_use_tooltips" + eval "$ac_cv_use_dirdlg" if test "$no_cache" != 1; then - echo $ac_cv_use_tooltips >> ${wx_arg_cache_file}.tmp + echo $ac_cv_use_dirdlg >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_TOOLTIPS" = yes; then - echo "$as_me:6809: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test "$wxUSE_DIRDLG" = yes; then + echo "$ac_t""yes" 1>&6 else - echo "$as_me:6812: result: no" >&5 -echo "${ECHO_T}no" >&6 + echo "$ac_t""no" 1>&6 fi + - echo "$as_me:6816: checking for --enable-splines" >&5 -echo $ECHO_N "checking for --enable-splines... $ECHO_C" >&6 + echo $ac_n "checking for --enable-msgdlg""... $ac_c" 1>&6 +echo "configure:6932: checking for --enable-msgdlg" >&5 no_cache=0 - # Check whether --enable-splines or --disable-splines was given. -if test "${enable_splines+set}" = set; then - enableval="$enable_splines" - + # Check whether --enable-msgdlg or --disable-msgdlg was given. +if test "${enable_msgdlg+set}" = set; then + enableval="$enable_msgdlg" + if test "$enableval" = yes; then - ac_cv_use_splines='wxUSE_SPLINES=yes' + ac_cv_use_msgdlg='wxUSE_MSGDLG=yes' else - ac_cv_use_splines='wxUSE_SPLINES=no' + ac_cv_use_msgdlg='wxUSE_MSGDLG=no' fi - + else - - LINE=`grep "wxUSE_SPLINES" ${wx_arg_cache_file}` + + LINE=`grep "wxUSE_MSGDLG" ${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 + ac_cv_use_msgdlg='wxUSE_MSGDLG='$DEFAULT_wxUSE_MSGDLG + +fi -fi; - eval "$ac_cv_use_splines" + eval "$ac_cv_use_msgdlg" if test "$no_cache" != 1; then - echo $ac_cv_use_splines >> ${wx_arg_cache_file}.tmp + echo $ac_cv_use_msgdlg >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_SPLINES" = yes; then - echo "$as_me:6848: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test "$wxUSE_MSGDLG" = yes; then + echo "$ac_t""yes" 1>&6 else - echo "$as_me:6851: result: no" >&5 -echo "${ECHO_T}no" >&6 + echo "$ac_t""no" 1>&6 fi + - echo "$as_me:6855: checking for --enable-validators" >&5 -echo $ECHO_N "checking for --enable-validators... $ECHO_C" >&6 + echo $ac_n "checking for --enable-numberdlg""... $ac_c" 1>&6 +echo "configure:6971: checking for --enable-numberdlg" >&5 no_cache=0 - # Check whether --enable-validators or --disable-validators was given. -if test "${enable_validators+set}" = set; then - enableval="$enable_validators" - + # Check whether --enable-numberdlg or --disable-numberdlg was given. +if test "${enable_numberdlg+set}" = set; then + enableval="$enable_numberdlg" + if test "$enableval" = yes; then - ac_cv_use_validators='wxUSE_VALIDATORS=yes' + ac_cv_use_numberdlg='wxUSE_NUMBERDLG=yes' else - ac_cv_use_validators='wxUSE_VALIDATORS=no' + ac_cv_use_numberdlg='wxUSE_NUMBERDLG=no' fi - + else - - LINE=`grep "wxUSE_VALIDATORS" ${wx_arg_cache_file}` + + LINE=`grep "wxUSE_NUMBERDLG" ${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 + ac_cv_use_numberdlg='wxUSE_NUMBERDLG='$DEFAULT_wxUSE_NUMBERDLG + +fi -fi; - eval "$ac_cv_use_validators" + eval "$ac_cv_use_numberdlg" if test "$no_cache" != 1; then - echo $ac_cv_use_validators >> ${wx_arg_cache_file}.tmp + echo $ac_cv_use_numberdlg >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_VALIDATORS" = yes; then - echo "$as_me:6887: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test "$wxUSE_NUMBERDLG" = yes; then + echo "$ac_t""yes" 1>&6 else - echo "$as_me:6890: result: no" >&5 -echo "${ECHO_T}no" >&6 + echo "$ac_t""no" 1>&6 fi + - echo "$as_me:6894: checking for --enable-busyinfo" >&5 -echo $ECHO_N "checking for --enable-busyinfo... $ECHO_C" >&6 + echo $ac_n "checking for --enable-splash""... $ac_c" 1>&6 +echo "configure:7010: checking for --enable-splash" >&5 no_cache=0 - # Check whether --enable-busyinfo or --disable-busyinfo was given. -if test "${enable_busyinfo+set}" = set; then - enableval="$enable_busyinfo" - + # Check whether --enable-splash or --disable-splash was given. +if test "${enable_splash+set}" = set; then + enableval="$enable_splash" + if test "$enableval" = yes; then - ac_cv_use_busyinfo='wxUSE_BUSYINFO=yes' + ac_cv_use_splash='wxUSE_SPLASH=yes' else - ac_cv_use_busyinfo='wxUSE_BUSYINFO=no' + ac_cv_use_splash='wxUSE_SPLASH=no' fi - + else - - LINE=`grep "wxUSE_BUSYINFO" ${wx_arg_cache_file}` + + LINE=`grep "wxUSE_SPLASH" ${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 + ac_cv_use_splash='wxUSE_SPLASH='$DEFAULT_wxUSE_SPLASH + +fi -fi; - eval "$ac_cv_use_busyinfo" + eval "$ac_cv_use_splash" if test "$no_cache" != 1; then - echo $ac_cv_use_busyinfo >> ${wx_arg_cache_file}.tmp + echo $ac_cv_use_splash >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_BUSYINFO" = yes; then - echo "$as_me:6926: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test "$wxUSE_SPLASH" = yes; then + echo "$ac_t""yes" 1>&6 else - echo "$as_me:6929: result: no" >&5 -echo "${ECHO_T}no" >&6 + echo "$ac_t""no" 1>&6 fi + - echo "$as_me:6933: checking for --enable-joystick" >&5 -echo $ECHO_N "checking for --enable-joystick... $ECHO_C" >&6 + echo $ac_n "checking for --enable-textdlg""... $ac_c" 1>&6 +echo "configure:7049: checking for --enable-textdlg" >&5 no_cache=0 - # Check whether --enable-joystick or --disable-joystick was given. -if test "${enable_joystick+set}" = set; then - enableval="$enable_joystick" - + # 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_joystick='wxUSE_JOYSTICK=yes' + ac_cv_use_textdlg='wxUSE_TEXTDLG=yes' else - ac_cv_use_joystick='wxUSE_JOYSTICK=no' + ac_cv_use_textdlg='wxUSE_TEXTDLG=no' fi - + else - - LINE=`grep "wxUSE_JOYSTICK" ${wx_arg_cache_file}` + + 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_joystick='wxUSE_JOYSTICK='$DEFAULT_wxUSE_JOYSTICK + ac_cv_use_textdlg='wxUSE_TEXTDLG='$DEFAULT_wxUSE_TEXTDLG + +fi -fi; - eval "$ac_cv_use_joystick" + eval "$ac_cv_use_textdlg" if test "$no_cache" != 1; then - echo $ac_cv_use_joystick >> ${wx_arg_cache_file}.tmp + echo $ac_cv_use_textdlg >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_JOYSTICK" = yes; then - echo "$as_me:6965: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test "$wxUSE_TEXTDLG" = yes; then + echo "$ac_t""yes" 1>&6 else - echo "$as_me:6968: result: no" >&5 -echo "${ECHO_T}no" >&6 + echo "$ac_t""no" 1>&6 fi + - echo "$as_me:6972: checking for --enable-image" >&5 -echo $ECHO_N "checking for --enable-image... $ECHO_C" >&6 + echo $ac_n "checking for --enable-tipdlg""... $ac_c" 1>&6 +echo "configure:7088: checking for --enable-tipdlg" >&5 no_cache=0 - # Check whether --enable-image or --disable-image was given. -if test "${enable_image+set}" = set; then - enableval="$enable_image" - + # 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_image='wxUSE_IMAGE=yes' + ac_cv_use_tipdlg='wxUSE_STARTUP_TIPS=yes' else - ac_cv_use_image='wxUSE_IMAGE=no' + ac_cv_use_tipdlg='wxUSE_STARTUP_TIPS=no' fi - + else - - LINE=`grep "wxUSE_IMAGE" ${wx_arg_cache_file}` + + 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_image='wxUSE_IMAGE='$DEFAULT_wxUSE_IMAGE + ac_cv_use_tipdlg='wxUSE_STARTUP_TIPS='$DEFAULT_wxUSE_STARTUP_TIPS + +fi -fi; - eval "$ac_cv_use_image" + eval "$ac_cv_use_tipdlg" if test "$no_cache" != 1; then - echo $ac_cv_use_image >> ${wx_arg_cache_file}.tmp + echo $ac_cv_use_tipdlg >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_IMAGE" = yes; then - echo "$as_me:7004: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test "$wxUSE_STARTUP_TIPS" = yes; then + echo "$ac_t""yes" 1>&6 else - echo "$as_me:7007: result: no" >&5 -echo "${ECHO_T}no" >&6 + echo "$ac_t""no" 1>&6 fi + - echo "$as_me:7011: checking for --enable-gif" >&5 -echo $ECHO_N "checking for --enable-gif... $ECHO_C" >&6 + echo $ac_n "checking for --enable-progressdlg""... $ac_c" 1>&6 +echo "configure:7127: checking for --enable-progressdlg" >&5 no_cache=0 - # Check whether --enable-gif or --disable-gif was given. -if test "${enable_gif+set}" = set; then - enableval="$enable_gif" - + # 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_gif='wxUSE_GIF=yes' + ac_cv_use_progressdlg='wxUSE_PROGRESSDLG=yes' else - ac_cv_use_gif='wxUSE_GIF=no' + ac_cv_use_progressdlg='wxUSE_PROGRESSDLG=no' fi - + else - - LINE=`grep "wxUSE_GIF" ${wx_arg_cache_file}` + + 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_gif='wxUSE_GIF='$DEFAULT_wxUSE_GIF + ac_cv_use_progressdlg='wxUSE_PROGRESSDLG='$DEFAULT_wxUSE_PROGRESSDLG + +fi -fi; - eval "$ac_cv_use_gif" + eval "$ac_cv_use_progressdlg" if test "$no_cache" != 1; then - echo $ac_cv_use_gif >> ${wx_arg_cache_file}.tmp + echo $ac_cv_use_progressdlg >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_GIF" = yes; then - echo "$as_me:7043: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test "$wxUSE_PROGRESSDLG" = yes; then + echo "$ac_t""yes" 1>&6 else - echo "$as_me:7046: result: no" >&5 -echo "${ECHO_T}no" >&6 + echo "$ac_t""no" 1>&6 fi + - echo "$as_me:7050: checking for --enable-pcx" >&5 -echo $ECHO_N "checking for --enable-pcx... $ECHO_C" >&6 + echo $ac_n "checking for --enable-wizarddlg""... $ac_c" 1>&6 +echo "configure:7166: checking for --enable-wizarddlg" >&5 no_cache=0 - # Check whether --enable-pcx or --disable-pcx was given. -if test "${enable_pcx+set}" = set; then - enableval="$enable_pcx" - + # Check whether --enable-wizarddlg or --disable-wizarddlg was given. +if test "${enable_wizarddlg+set}" = set; then + enableval="$enable_wizarddlg" + if test "$enableval" = yes; then - ac_cv_use_pcx='wxUSE_PCX=yes' + ac_cv_use_wizarddlg='wxUSE_WIZARDDLG=yes' else - ac_cv_use_pcx='wxUSE_PCX=no' + ac_cv_use_wizarddlg='wxUSE_WIZARDDLG=no' fi - + else - - LINE=`grep "wxUSE_PCX" ${wx_arg_cache_file}` + + LINE=`grep "wxUSE_WIZARDDLG" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_pcx='wxUSE_PCX='$DEFAULT_wxUSE_PCX + ac_cv_use_wizarddlg='wxUSE_WIZARDDLG='$DEFAULT_wxUSE_WIZARDDLG + +fi -fi; - eval "$ac_cv_use_pcx" + eval "$ac_cv_use_wizarddlg" if test "$no_cache" != 1; then - echo $ac_cv_use_pcx >> ${wx_arg_cache_file}.tmp + echo $ac_cv_use_wizarddlg >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_PCX" = yes; then - echo "$as_me:7082: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test "$wxUSE_WIZARDDLG" = yes; then + echo "$ac_t""yes" 1>&6 else - echo "$as_me:7085: result: no" >&5 -echo "${ECHO_T}no" >&6 + echo "$ac_t""no" 1>&6 fi + + - echo "$as_me:7089: checking for --enable-pnm" >&5 -echo $ECHO_N "checking for --enable-pnm... $ECHO_C" >&6 - no_cache=0 - # Check whether --enable-pnm or --disable-pnm was given. -if test "${enable_pnm+set}" = set; then - enableval="$enable_pnm" + echo $ac_n "checking for --enable-menus""... $ac_c" 1>&6 +echo "configure:7207: checking for --enable-menus" >&5 + no_cache=0 + # Check whether --enable-menus or --disable-menus was given. +if test "${enable_menus+set}" = set; then + enableval="$enable_menus" + if test "$enableval" = yes; then - ac_cv_use_pnm='wxUSE_PNM=yes' + ac_cv_use_menus='wxUSE_MENUS=yes' else - ac_cv_use_pnm='wxUSE_PNM=no' + ac_cv_use_menus='wxUSE_MENUS=no' fi - + else - - LINE=`grep "wxUSE_PNM" ${wx_arg_cache_file}` + + LINE=`grep "wxUSE_MENUS" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_pnm='wxUSE_PNM='$DEFAULT_wxUSE_PNM + ac_cv_use_menus='wxUSE_MENUS='$DEFAULT_wxUSE_MENUS + +fi -fi; - eval "$ac_cv_use_pnm" + eval "$ac_cv_use_menus" if test "$no_cache" != 1; then - echo $ac_cv_use_pnm >> ${wx_arg_cache_file}.tmp + echo $ac_cv_use_menus >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_PNM" = yes; then - echo "$as_me:7121: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test "$wxUSE_MENUS" = yes; then + echo "$ac_t""yes" 1>&6 else - echo "$as_me:7124: result: no" >&5 -echo "${ECHO_T}no" >&6 + echo "$ac_t""no" 1>&6 fi + - echo "$as_me:7128: checking for --enable-pnm" >&5 -echo $ECHO_N "checking for --enable-pnm... $ECHO_C" >&6 + echo $ac_n "checking for --enable-miniframe""... $ac_c" 1>&6 +echo "configure:7246: checking for --enable-miniframe" >&5 no_cache=0 - # Check whether --enable-pnm or --disable-pnm was given. -if test "${enable_pnm+set}" = set; then - enableval="$enable_pnm" - + # Check whether --enable-miniframe or --disable-miniframe was given. +if test "${enable_miniframe+set}" = set; then + enableval="$enable_miniframe" + if test "$enableval" = yes; then - ac_cv_use_pnm='wxUSE_XPM=yes' + ac_cv_use_miniframe='wxUSE_MINIFRAME=yes' else - ac_cv_use_pnm='wxUSE_XPM=no' + ac_cv_use_miniframe='wxUSE_MINIFRAME=no' fi - + else - - LINE=`grep "wxUSE_XPM" ${wx_arg_cache_file}` + + 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_pnm='wxUSE_XPM='$DEFAULT_wxUSE_XPM + ac_cv_use_miniframe='wxUSE_MINIFRAME='$DEFAULT_wxUSE_MINIFRAME + +fi -fi; - eval "$ac_cv_use_pnm" + eval "$ac_cv_use_miniframe" if test "$no_cache" != 1; then - echo $ac_cv_use_pnm >> ${wx_arg_cache_file}.tmp + echo $ac_cv_use_miniframe >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_XPM" = yes; then - echo "$as_me:7160: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + if test "$wxUSE_MINIFRAME" = yes; then + echo "$ac_t""yes" 1>&6 else - echo "$as_me:7163: result: no" >&5 -echo "${ECHO_T}no" >&6 + echo "$ac_t""no" 1>&6 fi + -fi + echo $ac_n "checking for --enable-tooltips""... $ac_c" 1>&6 +echo "configure:7285: 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" + + if test "$enableval" = yes; then + ac_cv_use_tooltips='wxUSE_TOOLTIPS=yes' + else + ac_cv_use_tooltips='wxUSE_TOOLTIPS=no' + fi + +else + + LINE=`grep "wxUSE_TOOLTIPS" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi - echo "saving argument cache $wx_arg_cache_file" - mv ${wx_arg_cache_file}.tmp ${wx_arg_cache_file} + ac_cv_use_tooltips='wxUSE_TOOLTIPS='$DEFAULT_wxUSE_TOOLTIPS + +fi -echo "$as_me:7172: checking for toolkit" >&5 -echo $ECHO_N "checking for toolkit... $ECHO_C" >&6 -if test "$wxUSE_GUI" = "yes"; then + eval "$ac_cv_use_tooltips" + if test "$no_cache" != 1; then + echo $ac_cv_use_tooltips >> ${wx_arg_cache_file}.tmp + fi -if test "$USE_BEOS" = 1; then - { { echo "$as_me:7178: error: BeOS GUI is not supported yet, use --disable-gui" >&5 -echo "$as_me: error: BeOS GUI is not supported yet, use --disable-gui" >&2;} - { (exit 1); exit 1; }; } -fi + if test "$wxUSE_TOOLTIPS" = yes; then + echo "$ac_t""yes" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + -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 + echo $ac_n "checking for --enable-splines""... $ac_c" 1>&6 +echo "configure:7324: 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" + + if test "$enableval" = yes; then + ac_cv_use_splines='wxUSE_SPLINES=yes' + else + ac_cv_use_splines='wxUSE_SPLINES=no' + fi + 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 + + LINE=`grep "wxUSE_SPLINES" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi -NUM_TOOLKITS=`expr ${wxUSE_GTK:-0} + ${wxUSE_MOTIF:-0} + ${wxUSE_MAC:-0} + ${wxUSE_WINE:-0} + ${wxUSE_MINGW:-0} + ${wxUSE_CYGWIN:-0}` + ac_cv_use_splines='wxUSE_SPLINES='$DEFAULT_wxUSE_SPLINES + +fi -case "${host}" in - *-pc-os2_emx ) - NUM_TOOLKITS=`expr ${NUM_TOOLKITS} + ${wxUSE_PM:-0}` - # PATH_IFS is autodetected by OS/2's configure (usually ';') - LEX_STEM="lexyy" - ;; - *) - PATH_IFS=':' - LEX_STEM="lex.yy" - ;; -esac -case "$NUM_TOOLKITS" in - 1) - ;; - 0) - { { echo "$as_me:7218: error: Please specify a toolkit - cannot determine the default for ${host}" >&5 -echo "$as_me: error: Please specify a toolkit - cannot determine the default for ${host}" >&2;} - { (exit 1); exit 1; }; } - ;; - *) - { { echo "$as_me:7223: error: Please specify at most one toolkit (may be some are cached?)" >&5 -echo "$as_me: error: Please specify at most one toolkit (may be some are cached?)" >&2;} - { (exit 1); exit 1; }; } -esac + eval "$ac_cv_use_splines" + if test "$no_cache" != 1; then + echo $ac_cv_use_splines >> ${wx_arg_cache_file}.tmp + fi -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 "$as_me:7238: result: \`echo $toolkit | tr [A-Z] [a-z]\`" >&5 -echo "${ECHO_T}\`echo $toolkit | tr [A-Z] [a-z]\`" >&6 - fi - fi -done + 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:7363: 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" + + if test "$enableval" = yes; then + ac_cv_use_validators='wxUSE_VALIDATORS=yes' + else + ac_cv_use_validators='wxUSE_VALIDATORS=no' + fi + else - PATH_IFS=':' - echo "$as_me:7246: result: base only" >&5 -echo "${ECHO_T}base only" >&6 -fi + + LINE=`grep "wxUSE_VALIDATORS" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi -cat >confcache <<\_ACEOF -# 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, see configure's option --config-cache. -# It is not useful on other systems. If it contains results you don't -# want to keep, you may remove or edit it. -# -# config.status only pays attention to the cache file if you give it -# the --recheck option to rerun configure. -# -# `ac_cv_env_foo' variables (set or unset) will be overriden when -# loading this file, other *unset* `ac_cv_foo' will be assigned the -# following values. + ac_cv_use_validators='wxUSE_VALIDATORS='$DEFAULT_wxUSE_VALIDATORS + +fi -_ACEOF -# 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 \ - "s/'/'\\\\''/g; - s/^\\([_$ac_cr_alnum]*_cv_[_$ac_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" - ;; - *) - # `set' quotes correctly as required by POSIX, so do not add quotes. - sed -n \ - "s/^\\([_$ac_cr_alnum]*_cv_[_$ac_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" - ;; - esac; -} | - sed ' - t clear - : clear - s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ - t end - /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ - : end' >>confcache -if cmp -s $cache_file confcache; then :; else - if test -w $cache_file; then - test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file" - cat confcache >$cache_file - else - echo "not updating unwritable cache $cache_file" - fi -fi -rm -f confcache + eval "$ac_cv_use_validators" + if test "$no_cache" != 1; then + echo $ac_cv_use_validators >> ${wx_arg_cache_file}.tmp + fi -if test "$build" != "$host" ; then - CC=$host_alias-gcc - CXX=$host_alias-c++ - AR=$host_alias-ar - RANLIB=$host_alias-ranlib - DLLTOOL=$host_alias-dlltool - RESCOMP=$host_alias-windres - LD=$host_alias-ld - NM=$host_alias-nm - STRIP=$host_alias-strip -fi + if test "$wxUSE_VALIDATORS" = yes; then + echo "$ac_t""yes" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu -if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. -set dummy ${ac_tool_prefix}gcc; ac_word=$2 -echo "$as_me:7325: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. + echo $ac_n "checking for --enable-busyinfo""... $ac_c" 1>&6 +echo "configure:7402: 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 - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_CC="${ac_tool_prefix}gcc" -echo "$as_me:7340: found $ac_dir/$ac_word" >&5 -break -done + + LINE=`grep "wxUSE_BUSYINFO" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi -fi -fi -CC=$ac_cv_prog_CC -if test -n "$CC"; then - echo "$as_me:7348: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6 -else - echo "$as_me:7351: result: no" >&5 -echo "${ECHO_T}no" >&6 + ac_cv_use_busyinfo='wxUSE_BUSYINFO='$DEFAULT_wxUSE_BUSYINFO + fi -fi -if test -z "$ac_cv_prog_CC"; then - ac_ct_CC=$CC - # Extract the first word of "gcc", so it can be a program name with args. -set dummy gcc; ac_word=$2 -echo "$as_me:7360: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$ac_ct_CC"; then - ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. -else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_ac_ct_CC="gcc" -echo "$as_me:7375: found $ac_dir/$ac_word" >&5 -break -done -fi -fi -ac_ct_CC=$ac_cv_prog_ac_ct_CC -if test -n "$ac_ct_CC"; then - echo "$as_me:7383: result: $ac_ct_CC" >&5 -echo "${ECHO_T}$ac_ct_CC" >&6 -else - echo "$as_me:7386: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi + eval "$ac_cv_use_busyinfo" + if test "$no_cache" != 1; then + echo $ac_cv_use_busyinfo >> ${wx_arg_cache_file}.tmp + fi - CC=$ac_ct_CC -else - CC="$ac_cv_prog_CC" -fi + if test "$wxUSE_BUSYINFO" = yes; then + echo "$ac_t""yes" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + -if test -z "$CC"; then - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. -set dummy ${ac_tool_prefix}cc; ac_word=$2 -echo "$as_me:7399: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. + echo $ac_n "checking for --enable-joystick""... $ac_c" 1>&6 +echo "configure:7441: 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" + + if test "$enableval" = yes; then + ac_cv_use_joystick='wxUSE_JOYSTICK=yes' + else + ac_cv_use_joystick='wxUSE_JOYSTICK=no' + fi + else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_CC="${ac_tool_prefix}cc" -echo "$as_me:7414: found $ac_dir/$ac_word" >&5 -break -done + + LINE=`grep "wxUSE_JOYSTICK" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi -fi -fi -CC=$ac_cv_prog_CC -if test -n "$CC"; then - echo "$as_me:7422: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6 -else - echo "$as_me:7425: result: no" >&5 -echo "${ECHO_T}no" >&6 + ac_cv_use_joystick='wxUSE_JOYSTICK='$DEFAULT_wxUSE_JOYSTICK + fi -fi -if test -z "$ac_cv_prog_CC"; then - ac_ct_CC=$CC - # Extract the first word of "cc", so it can be a program name with args. -set dummy cc; ac_word=$2 -echo "$as_me:7434: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$ac_ct_CC"; then - ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. -else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_ac_ct_CC="cc" -echo "$as_me:7449: found $ac_dir/$ac_word" >&5 -break -done -fi -fi -ac_ct_CC=$ac_cv_prog_ac_ct_CC -if test -n "$ac_ct_CC"; then - echo "$as_me:7457: result: $ac_ct_CC" >&5 -echo "${ECHO_T}$ac_ct_CC" >&6 -else - echo "$as_me:7460: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi + eval "$ac_cv_use_joystick" + if test "$no_cache" != 1; then + echo $ac_cv_use_joystick >> ${wx_arg_cache_file}.tmp + fi - CC=$ac_ct_CC + 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-metafile""... $ac_c" 1>&6 +echo "configure:7480: checking for --enable-metafile" >&5 + no_cache=0 + # Check whether --enable-metafile or --disable-metafile was given. +if test "${enable_metafile+set}" = set; then + enableval="$enable_metafile" + + if test "$enableval" = yes; then + ac_cv_use_metafile='wxUSE_METAFILE=yes' + else + ac_cv_use_metafile='wxUSE_METAFILE=no' + fi + else - CC="$ac_cv_prog_CC" -fi + + LINE=`grep "wxUSE_METAFILE" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + ac_cv_use_metafile='wxUSE_METAFILE='$DEFAULT_wxUSE_METAFILE + fi -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 "$as_me:7473: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + + + eval "$ac_cv_use_metafile" + if test "$no_cache" != 1; then + echo $ac_cv_use_metafile >> ${wx_arg_cache_file}.tmp + fi + + if test "$wxUSE_METAFILE" = yes; then + echo "$ac_t""yes" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + + + echo $ac_n "checking for --enable-dragimage""... $ac_c" 1>&6 +echo "configure:7519: checking for --enable-dragimage" >&5 + no_cache=0 + # Check whether --enable-dragimage or --disable-dragimage was given. +if test "${enable_dragimage+set}" = set; then + enableval="$enable_dragimage" + + if test "$enableval" = yes; then + ac_cv_use_dragimage='wxUSE_DRAGIMAGE=yes' + else + ac_cv_use_dragimage='wxUSE_DRAGIMAGE=no' + fi + +else + + LINE=`grep "wxUSE_DRAGIMAGE" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_dragimage='wxUSE_DRAGIMAGE='$DEFAULT_wxUSE_DRAGIMAGE + +fi + + + eval "$ac_cv_use_dragimage" + if test "$no_cache" != 1; then + echo $ac_cv_use_dragimage >> ${wx_arg_cache_file}.tmp + fi + + if test "$wxUSE_DRAGIMAGE" = yes; then + echo "$ac_t""yes" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + + + + + echo $ac_n "checking for --enable-palette""... $ac_c" 1>&6 +echo "configure:7560: checking for --enable-palette" >&5 + no_cache=0 + # Check whether --enable-palette or --disable-palette was given. +if test "${enable_palette+set}" = set; then + enableval="$enable_palette" + + if test "$enableval" = yes; then + ac_cv_use_palette='wxUSE_PALETTE=yes' + else + ac_cv_use_palette='wxUSE_PALETTE=no' + fi + +else + + LINE=`grep "wxUSE_PALETTE" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_palette='wxUSE_PALETTE='$DEFAULT_wxUSE_PALETTE + +fi + + + eval "$ac_cv_use_palette" + if test "$no_cache" != 1; then + echo $ac_cv_use_palette >> ${wx_arg_cache_file}.tmp + fi + + if test "$wxUSE_PALETTE" = yes; then + echo "$ac_t""yes" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + + + echo $ac_n "checking for --enable-image""... $ac_c" 1>&6 +echo "configure:7599: checking for --enable-image" >&5 + no_cache=0 + # Check whether --enable-image or --disable-image was given. +if test "${enable_image+set}" = set; then + enableval="$enable_image" + + if test "$enableval" = yes; then + ac_cv_use_image='wxUSE_IMAGE=yes' + else + ac_cv_use_image='wxUSE_IMAGE=no' + fi + +else + + LINE=`grep "wxUSE_IMAGE" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_image='wxUSE_IMAGE='$DEFAULT_wxUSE_IMAGE + +fi + + + eval "$ac_cv_use_image" + if test "$no_cache" != 1; then + echo $ac_cv_use_image >> ${wx_arg_cache_file}.tmp + fi + + if test "$wxUSE_IMAGE" = yes; then + echo "$ac_t""yes" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + + + echo $ac_n "checking for --enable-gif""... $ac_c" 1>&6 +echo "configure:7638: checking for --enable-gif" >&5 + no_cache=0 + # Check whether --enable-gif or --disable-gif was given. +if test "${enable_gif+set}" = set; then + enableval="$enable_gif" + + if test "$enableval" = yes; then + ac_cv_use_gif='wxUSE_GIF=yes' + else + ac_cv_use_gif='wxUSE_GIF=no' + fi + +else + + LINE=`grep "wxUSE_GIF" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_gif='wxUSE_GIF='$DEFAULT_wxUSE_GIF + +fi + + + eval "$ac_cv_use_gif" + if test "$no_cache" != 1; then + echo $ac_cv_use_gif >> ${wx_arg_cache_file}.tmp + fi + + if test "$wxUSE_GIF" = yes; then + echo "$ac_t""yes" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + + + echo $ac_n "checking for --enable-pcx""... $ac_c" 1>&6 +echo "configure:7677: checking for --enable-pcx" >&5 + no_cache=0 + # Check whether --enable-pcx or --disable-pcx was given. +if test "${enable_pcx+set}" = set; then + enableval="$enable_pcx" + + if test "$enableval" = yes; then + ac_cv_use_pcx='wxUSE_PCX=yes' + else + ac_cv_use_pcx='wxUSE_PCX=no' + fi + +else + + LINE=`grep "wxUSE_PCX" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_pcx='wxUSE_PCX='$DEFAULT_wxUSE_PCX + +fi + + + eval "$ac_cv_use_pcx" + if test "$no_cache" != 1; then + echo $ac_cv_use_pcx >> ${wx_arg_cache_file}.tmp + fi + + if test "$wxUSE_PCX" = yes; then + echo "$ac_t""yes" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + + + echo $ac_n "checking for --enable-pnm""... $ac_c" 1>&6 +echo "configure:7716: checking for --enable-pnm" >&5 + no_cache=0 + # Check whether --enable-pnm or --disable-pnm was given. +if test "${enable_pnm+set}" = set; then + enableval="$enable_pnm" + + if test "$enableval" = yes; then + ac_cv_use_pnm='wxUSE_PNM=yes' + else + ac_cv_use_pnm='wxUSE_PNM=no' + fi + +else + + LINE=`grep "wxUSE_PNM" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_pnm='wxUSE_PNM='$DEFAULT_wxUSE_PNM + +fi + + + eval "$ac_cv_use_pnm" + if test "$no_cache" != 1; then + echo $ac_cv_use_pnm >> ${wx_arg_cache_file}.tmp + fi + + if test "$wxUSE_PNM" = yes; then + echo "$ac_t""yes" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + + + echo $ac_n "checking for --enable-pnm""... $ac_c" 1>&6 +echo "configure:7755: checking for --enable-pnm" >&5 + no_cache=0 + # Check whether --enable-pnm or --disable-pnm was given. +if test "${enable_pnm+set}" = set; then + enableval="$enable_pnm" + + if test "$enableval" = yes; then + ac_cv_use_pnm='wxUSE_XPM=yes' + else + ac_cv_use_pnm='wxUSE_XPM=no' + fi + +else + + LINE=`grep "wxUSE_XPM" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_pnm='wxUSE_XPM='$DEFAULT_wxUSE_XPM + +fi + + + eval "$ac_cv_use_pnm" + if test "$no_cache" != 1; then + echo $ac_cv_use_pnm >> ${wx_arg_cache_file}.tmp + fi + + if test "$wxUSE_XPM" = yes; then + echo "$ac_t""yes" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + + +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:7802: checking for toolkit" >&5 + +if test "$wxUSE_GUI" = "yes"; then + + if test "$USE_BEOS" = 1; then + { echo "configure: error: BeOS GUI is not supported yet, use --disable-gui" 1>&2; exit 1; } + fi + + 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_MAC:-0} \ + + ${wxUSE_WINE:-0} + ${wxUSE_MINGW:-0} + ${wxUSE_CYGWIN:-0} \ + + ${wxUSE_MGL:-0}` + + case "${host}" in + *-pc-os2_emx | *-pc-os2-emx ) + # PATH_IFS is autodetected by OS/2's configure (usually ';') + NUM_TOOLKITS=`expr ${NUM_TOOLKITS} + ${wxUSE_PM:-0}` + LEX_STEM="lexyy" + ;; + *) + PATH_IFS=':' + LEX_STEM="lex.yy" + ;; + esac + + case "$NUM_TOOLKITS" in + 1) + ;; + 0) + { 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 (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 + toolkit_echo=`echo $toolkit | tr [A-Z] [a-z]` + echo "$ac_t""$toolkit_echo" 1>&6 + fi + fi + done +else + PATH_IFS=':' + echo "$ac_t""base ($host_alias hosted) only" 1>&6 +fi + + +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 test "$build" != "$host" ; then + if test "$USE_WIN32" = 1 ; then + CC=$host_alias-gcc + CXX=$host_alias-c++ + AR=$host_alias-ar + RANLIB=$host_alias-ranlib + DLLTOOL=$host_alias-dlltool + RESCOMP=$host_alias-windres + LD=$host_alias-ld + NM=$host_alias-nm + STRIP=$host_alias-strip + else + { echo "configure: error: $build_alias -> $host_alias cross compilation not supported yet." 1>&2; exit 1; } + 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:7941: 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 if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else - ac_prog_rejected=no - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then - ac_prog_rejected=yes - continue -fi -ac_cv_prog_CC="cc" -echo "$as_me:7493: found $ac_dir/$ac_word" >&5 -break -done + 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_CC="gcc" + break + fi + done + IFS="$ac_save_ifs" +fi +fi +CC="$ac_cv_prog_CC" +if test -n "$CC"; then + echo "$ac_t""$CC" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi +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:7971: 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 + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_prog_rejected=no + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then + ac_prog_rejected=yes + continue + fi + ac_cv_prog_CC="cc" + break + fi + done + IFS="$ac_save_ifs" if test $ac_prog_rejected = yes; then # We found a bogon in the path, so make sure we never use it. set dummy $ac_cv_prog_CC shift - if test $# != 0; then + if test $# -gt 0; then # We chose a different compiler from the bogus one. # However, it has the same basename, so the bogon will be chosen # first if we set CC to just the basename; use the full file name. shift - set dummy "$ac_dir/$ac_word" ${1+"$@"} + set dummy "$ac_dir/$ac_word" "$@" shift ac_cv_prog_CC="$@" fi fi fi fi -CC=$ac_cv_prog_CC +CC="$ac_cv_prog_CC" +if test -n "$CC"; then + echo "$ac_t""$CC" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + + if test -z "$CC"; then + case "`uname -s`" in + *win32* | *WIN32*) + # 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:8022: 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 + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # 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_CC="cl" + break + fi + done + IFS="$ac_save_ifs" +fi +fi +CC="$ac_cv_prog_CC" if test -n "$CC"; then - echo "$as_me:7515: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6 + echo "$ac_t""$CC" 1>&6 else - echo "$as_me:7518: result: no" >&5 -echo "${ECHO_T}no" >&6 + echo "$ac_t""no" 1>&6 +fi + ;; + esac + fi + test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; } +fi + +echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 +echo "configure:8054: 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. +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 + +cat > conftest.$ac_ext << EOF + +#line 8065 "configure" +#include "confdefs.h" + +main(){return(0);} +EOF +if { (eval echo configure:8070: \"$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 + ac_cv_prog_cc_cross=no + else + ac_cv_prog_cc_cross=yes + fi +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + ac_cv_prog_cc_works=no +fi +rm -fr conftest* +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 + +echo "$ac_t""$ac_cv_prog_cc_works" 1>&6 +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:8096: 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:8101: 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 + cat > conftest.c <&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then + ac_cv_prog_gcc=yes +else + ac_cv_prog_gcc=no +fi +fi + +echo "$ac_t""$ac_cv_prog_gcc" 1>&6 + +if test $ac_cv_prog_gcc = yes; then + GCC=yes +else + GCC= +fi + +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:8129: 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 + echo 'void f(){}' > conftest.c +if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then + ac_cv_prog_cc_g=yes +else + ac_cv_prog_cc_g=no +fi +rm -f conftest* + +fi + +echo "$ac_t""$ac_cv_prog_cc_g" 1>&6 +if test "$ac_test_CFLAGS" = set; then + CFLAGS="$ac_save_CFLAGS" +elif test $ac_cv_prog_cc_g = yes; then + if test "$GCC" = yes; then + CFLAGS="-g -O2" + else + CFLAGS="-g" + fi +else + if test "$GCC" = yes; then + CFLAGS="-O2" + else + CFLAGS= + fi +fi + + +CFLAGS=`echo "$CFLAGS" | sed 's/-g//g'` + +echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 +echo "configure:8164: checking how to run the C preprocessor" >&5 +# On Suns, sometimes $CPP names a directory. +if test -n "$CPP" && test -d "$CPP"; then + CPP= +fi +if test -z "$CPP"; then +if eval "test \"`echo '$''{'ac_cv_prog_CPP'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + # This must be in double quotes, not single quotes, because CPP may get + # substituted into the Makefile and "${CC-cc}" will confuse make. + CPP="${CC-cc} -E" + # 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:8185: \"$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 + : +else + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + 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:8202: \"$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 + : +else + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + 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:8219: \"$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 + : +else + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + CPP=/lib/cpp +fi +rm -f conftest* +fi +rm -f conftest* +fi +rm -f conftest* + ac_cv_prog_CPP="$CPP" +fi + CPP="$ac_cv_prog_CPP" +else + ac_cv_prog_CPP="$CPP" +fi +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:8245: 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 +EOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + egrep "$ac_pattern" >/dev/null 2>&1; then + rm -rf conftest* + ac_cv_prog_gcc_traditional=yes +else + rm -rf conftest* + ac_cv_prog_gcc_traditional=no +fi +rm -f conftest* + + + if test $ac_cv_prog_gcc_traditional = no; then + cat > conftest.$ac_ext < +Autoconf TCGETA +EOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + egrep "$ac_pattern" >/dev/null 2>&1; then + rm -rf conftest* + ac_cv_prog_gcc_traditional=yes fi +rm -f conftest* + fi fi -if test -z "$CC"; then - if test -n "$ac_tool_prefix"; then - for ac_prog in cl - do - # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. -set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -echo "$as_me:7529: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_CC="$ac_tool_prefix$ac_prog" -echo "$as_me:7544: found $ac_dir/$ac_word" >&5 -break -done -fi -fi -CC=$ac_cv_prog_CC -if test -n "$CC"; then - echo "$as_me:7552: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6 -else - echo "$as_me:7555: result: no" >&5 -echo "${ECHO_T}no" >&6 +echo "$ac_t""$ac_cv_prog_gcc_traditional" 1>&6 + if test $ac_cv_prog_gcc_traditional = yes; then + CC="$CC -traditional" + fi fi - test -n "$CC" && break - done -fi -if test -z "$CC"; then - ac_ct_CC=$CC - for ac_prog in cl + + +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 + + +for ac_prog in $CCC c++ g++ gcc CC cxx cc++ cl do - # Extract the first word of "$ac_prog", so it can be a program name with args. +# Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:7568: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$ac_ct_CC"; then - ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. -else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_ac_ct_CC="$ac_prog" -echo "$as_me:7583: found $ac_dir/$ac_word" >&5 -break -done - +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:8305: 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 + if test -n "$CXX"; then + ac_cv_prog_CXX="$CXX" # 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_CXX="$ac_prog" + break + fi + done + IFS="$ac_save_ifs" fi fi -ac_ct_CC=$ac_cv_prog_ac_ct_CC -if test -n "$ac_ct_CC"; then - echo "$as_me:7591: result: $ac_ct_CC" >&5 -echo "${ECHO_T}$ac_ct_CC" >&6 +CXX="$ac_cv_prog_CXX" +if test -n "$CXX"; then + echo "$ac_t""$CXX" 1>&6 else - echo "$as_me:7594: result: no" >&5 -echo "${ECHO_T}no" >&6 + echo "$ac_t""no" 1>&6 fi - test -n "$ac_ct_CC" && break +test -n "$CXX" && break done +test -n "$CXX" || CXX="gcc" - CC=$ac_ct_CC -fi -fi +echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6 +echo "configure:8337: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 -test -z "$CC" && { { echo "$as_me:7606: error: no acceptable cc found in \$PATH" >&5 -echo "$as_me: error: no acceptable cc found in \$PATH" >&2;} - { (exit 1); exit 1; }; } +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 "$as_me:7610: checking whether we are using the GNU C compiler" >&5 -echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6 -if test "${ac_cv_c_compiler_gnu+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line 7616 "configure" +cat > conftest.$ac_ext << EOF + +#line 8348 "configure" #include "confdefs.h" -int -main () -{ -#ifndef __GNUC__ - choke me +int main(){return(0);} +EOF +if { (eval echo configure:8353: \"$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 + ac_cv_prog_cxx_cross=no + else + ac_cv_prog_cxx_cross=yes + fi +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + ac_cv_prog_cxx_works=no +fi +rm -fr conftest* +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_t""$ac_cv_prog_cxx_works" 1>&6 +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:8379: 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:8384: 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 + cat > conftest.C <&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then + ac_cv_prog_gxx=yes +else + ac_cv_prog_gxx=no +fi +fi - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:7631: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:7634: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:7637: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:7640: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_compiler_gnu=yes -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_compiler_gnu=no -fi -rm -f conftest.$ac_objext conftest.$ac_ext -ac_cv_c_compiler_gnu=$ac_compiler_gnu - -fi -echo "$as_me:7652: result: $ac_cv_c_compiler_gnu" >&5 -echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6 -GCC=`test $ac_compiler_gnu = yes && echo yes` -ac_test_CFLAGS=${CFLAGS+set} -ac_save_CFLAGS=$CFLAGS -CFLAGS="-g" -echo "$as_me:7658: checking whether $CC accepts -g" >&5 -echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6 -if test "${ac_cv_prog_cc_g+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line 7664 "configure" -#include "confdefs.h" +echo "$ac_t""$ac_cv_prog_gxx" 1>&6 -int -main () -{ +if test $ac_cv_prog_gxx = yes; then + GXX=yes +else + GXX= +fi - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:7676: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:7679: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:7682: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:7685: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_prog_cc_g=yes +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:8412: 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 - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_prog_cc_g=no + echo 'void f(){}' > conftest.cc +if test -z "`${CXX-g++} -g -c conftest.cc 2>&1`"; then + ac_cv_prog_cxx_g=yes +else + ac_cv_prog_cxx_g=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest* + fi -echo "$as_me:7695: result: $ac_cv_prog_cc_g" >&5 -echo "${ECHO_T}$ac_cv_prog_cc_g" >&6 -if test "$ac_test_CFLAGS" = set; then - CFLAGS=$ac_save_CFLAGS -elif test $ac_cv_prog_cc_g = yes; then - if test "$GCC" = yes; then - CFLAGS="-g -O2" + +echo "$ac_t""$ac_cv_prog_cxx_g" 1>&6 +if test "$ac_test_CXXFLAGS" = set; then + CXXFLAGS="$ac_save_CXXFLAGS" +elif test $ac_cv_prog_cxx_g = yes; then + if test "$GXX" = yes; then + CXXFLAGS="-g -O2" else - CFLAGS="-g" + CXXFLAGS="-g" fi else - if test "$GCC" = yes; then - CFLAGS="-O2" + if test "$GXX" = yes; then + CXXFLAGS="-O2" else - CFLAGS= + CXXFLAGS= fi fi -# Some people use a C++ compiler to compile C. Since we use `exit', -# in C++ we need to declare it. In case someone uses the same compiler -# for both compiling C and C++ we need to have the C++ compiler decide -# the declaration of exit, since it's the most demanding environment. -cat >conftest.$ac_ext <<_ACEOF -#ifndef __cplusplus - choke me -#endif -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:7722: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:7725: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:7728: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:7731: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - for ac_declaration in \ - ''\ - '#include ' \ - 'extern "C" void std::exit (int) throw (); using std::exit;' \ - 'extern "C" void std::exit (int); using std::exit;' \ - 'extern "C" void exit (int) throw ();' \ - 'extern "C" void exit (int);' \ - 'void exit (int);' -do - cat >conftest.$ac_ext <<_ACEOF -#line 7743 "configure" -#include "confdefs.h" -#include -$ac_declaration -int -main () -{ -exit (42); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:7756: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:7759: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:7762: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:7765: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - : -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -continue -fi -rm -f conftest.$ac_objext conftest.$ac_ext - cat >conftest.$ac_ext <<_ACEOF -#line 7775 "configure" -#include "confdefs.h" -$ac_declaration -int -main () -{ -exit (42); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:7787: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:7790: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:7793: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:7796: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - break -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -fi -rm -f conftest.$ac_objext conftest.$ac_ext -done -echo '#ifdef __cplusplus' >>confdefs.h -echo $ac_declaration >>confdefs.h -echo '#endif' >>confdefs.h -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -fi -rm -f conftest.$ac_objext conftest.$ac_ext -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu -CFLAGS=`echo "$CFLAGS" | sed 's/-g//g'` +CXXFLAGS=`echo "$CXXFLAGS" | sed 's/-g//g'` 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 -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu -echo "$as_me:7827: checking how to run the C preprocessor" >&5 -echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6 -# On Suns, sometimes $CPP names a directory. -if test -n "$CPP" && test -d "$CPP"; then - CPP= +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 + + +# 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:8457: 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 + if test -n "$RANLIB"; then + ac_cv_prog_RANLIB="$RANLIB" # 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_RANLIB="ranlib" + break + fi + done + IFS="$ac_save_ifs" + test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB=":" fi -if test -z "$CPP"; then - if test "${ac_cv_prog_CPP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - # Double quotes because CPP needs to be expanded - for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" - do - # break 2 since there is a loop in there. - ac_preproc_ok=false -for ac_c_preproc_warn_flag in '' yes -do - # Use a header file that comes with gcc, so configuring glibc - # with a fresh cross-compiler works. - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. "Syntax error" is here to catch this case. - cat >conftest.$ac_ext <<_ACEOF -#line 7849 "configure" -#include "confdefs.h" -#include - Syntax error -_ACEOF -if { (eval echo "$as_me:7854: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:7860: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - else - ac_cpp_err= - fi +fi +RANLIB="$ac_cv_prog_RANLIB" +if test -n "$RANLIB"; then + echo "$ac_t""$RANLIB" 1>&6 else - ac_cpp_err=yes + echo "$ac_t""no" 1>&6 fi -if test -z "$ac_cpp_err"; then - : + + +# 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:8488: 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 - echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 - # Broken: fails on valid input. -continue + if test -n "$AR"; then + ac_cv_prog_AR="$AR" # 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_AR="ar" + break + fi + done + IFS="$ac_save_ifs" + test -z "$ac_cv_prog_AR" && ac_cv_prog_AR="ar" +fi +fi +AR="$ac_cv_prog_AR" +if test -n "$AR"; then + echo "$ac_t""$AR" 1>&6 +else + echo "$ac_t""no" 1>&6 fi -rm -f conftest.err conftest.$ac_ext - # OK, works on sane cases. Now check whether non-existent headers - # can be detected and how. - cat >conftest.$ac_ext <<_ACEOF -#line 7883 "configure" -#include "confdefs.h" -#include -_ACEOF -if { (eval echo "$as_me:7887: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:7893: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag + +# 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:8528: 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 - ac_cpp_err= + # 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' + + +# 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:8584: 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 - ac_cpp_err=yes + if test -n "$STRIP"; then + ac_cv_prog_STRIP="$STRIP" # 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_STRIP="strip" + break + fi + done + IFS="$ac_save_ifs" + test -z "$ac_cv_prog_STRIP" && ac_cv_prog_STRIP="true" +fi fi -if test -z "$ac_cpp_err"; then - # Broken: success on invalid input. -continue +STRIP="$ac_cv_prog_STRIP" +if test -n "$STRIP"; then + echo "$ac_t""$STRIP" 1>&6 else - echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 - # Passes both tests. -ac_preproc_ok=: -break + echo "$ac_t""no" 1>&6 fi -rm -f conftest.err conftest.$ac_ext -done -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.err conftest.$ac_ext -if $ac_preproc_ok; then - break 2 -fi - done - ac_cv_prog_CPP=$CPP +echo $ac_n "checking make for VPATH support""... $ac_c" 1>&6 +echo "configure:8613: checking make for VPATH support" >&5 +cat - << EOF > confMake +check : file + cp \$? \$@ + cp \$? final_file +EOF +if test ! -d sub ; then + mkdir sub fi - CPP=$ac_cv_prog_CPP +echo dummy > sub/file +${MAKE-make} -f confMake VPATH=sub 2>&5 > /dev/null +RESULT=$? +rm -f sub/file check final_file confMake +rmdir sub +if test "$RESULT" = 0; then + echo "$ac_t""yes" 1>&6 else - ac_cv_prog_CPP=$CPP + echo "$ac_t""no" 1>&6 + { echo "configure: error: +You need a make-utility that is able to use the variable +VPATH correctly. +If your version of make does not support VPATH correctly, +please install GNU-make (possibly as gmake), and start +configure with the following command: +export MAKE=gmake; ./configure for sh-type shells +setenv MAKE gmake; ./configure for csh-type shells +Also please do remember to use gmake in this case every time +you are trying to compile. +" 1>&2; exit 1; } fi -echo "$as_me:7930: result: $CPP" >&5 -echo "${ECHO_T}$CPP" >&6 -ac_preproc_ok=false -for ac_c_preproc_warn_flag in '' yes + +for ac_prog in 'bison -y' byacc do - # Use a header file that comes with gcc, so configuring glibc - # with a fresh cross-compiler works. - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. "Syntax error" is here to catch this case. - cat >conftest.$ac_ext <<_ACEOF -#line 7940 "configure" -#include "confdefs.h" -#include - Syntax error -_ACEOF -if { (eval echo "$as_me:7945: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:7951: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - else - ac_cpp_err= - fi +# 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:8650: 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 - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - : + if test -n "$YACC"; then + ac_cv_prog_YACC="$YACC" # Let the user override the test. else - echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 - # Broken: fails on valid input. -continue + 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_YACC="$ac_prog" + break + fi + done + IFS="$ac_save_ifs" fi -rm -f conftest.err conftest.$ac_ext - - # OK, works on sane cases. Now check whether non-existent headers - # can be detected and how. - cat >conftest.$ac_ext <<_ACEOF -#line 7974 "configure" -#include "confdefs.h" -#include -_ACEOF -if { (eval echo "$as_me:7978: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:7984: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes fi -if test -z "$ac_cpp_err"; then - # Broken: success on invalid input. -continue +YACC="$ac_cv_prog_YACC" +if test -n "$YACC"; then + echo "$ac_t""$YACC" 1>&6 else - echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 - # Passes both tests. -ac_preproc_ok=: -break + echo "$ac_t""no" 1>&6 fi -rm -f conftest.err conftest.$ac_ext +test -n "$YACC" && break done -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.err conftest.$ac_ext -if $ac_preproc_ok; then - : -else - { { echo "$as_me:8012: error: C preprocessor \"$CPP\" fails sanity check" >&5 -echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;} - { (exit 1); exit 1; }; } -fi +test -n "$YACC" || YACC="yacc" -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu -if test $ac_cv_c_compiler_gnu = yes; then - echo "$as_me:8024: checking whether $CC needs -traditional" >&5 -echo $ECHO_N "checking whether $CC needs -traditional... $ECHO_C" >&6 -if test "${ac_cv_prog_gcc_traditional+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +# 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:8684: 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 - ac_pattern="Autoconf.*'x'" - cat >conftest.$ac_ext <<_ACEOF -#line 8031 "configure" -#include "confdefs.h" -#include -Autoconf TIOCGETP -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "$ac_pattern" >/dev/null 2>&1; then - ac_cv_prog_gcc_traditional=yes + if test -n "$LEX"; then + ac_cv_prog_LEX="$LEX" # Let the user override the test. else - ac_cv_prog_gcc_traditional=no + 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="flex" + break + fi + done + IFS="$ac_save_ifs" + test -z "$ac_cv_prog_LEX" && ac_cv_prog_LEX="lex" +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 -rm -f conftest* - if test $ac_cv_prog_gcc_traditional = no; then - cat >conftest.$ac_ext <<_ACEOF -#line 8046 "configure" +if test -z "$LEXLIB" +then + case "$LEX" in + flex*) ac_lib=fl ;; + *) ac_lib=l ;; + esac + echo $ac_n "checking for yywrap in -l$ac_lib""... $ac_c" 1>&6 +echo "configure:8718: 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 +else + ac_save_LIBS="$LIBS" +LIBS="-l$ac_lib $LIBS" +cat > conftest.$ac_ext < -Autoconf TCGETA -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "$ac_pattern" >/dev/null 2>&1; then - ac_cv_prog_gcc_traditional=yes +/* 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 yywrap(); + +int main() { +yywrap() +; return 0; } +EOF +if { (eval echo configure:8737: \"$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 -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" fi rm -f conftest* +LIBS="$ac_save_LIBS" - fi fi -echo "$as_me:8059: result: $ac_cv_prog_gcc_traditional" >&5 -echo "${ECHO_T}$ac_cv_prog_gcc_traditional" >&6 - if test $ac_cv_prog_gcc_traditional = yes; then - CC="$CC -traditional" - fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + LEXLIB="-l$ac_lib" +else + echo "$ac_t""no" 1>&6 fi -ac_ext=cc -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu +fi -ac_ext=cc -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -if test -n "$ac_tool_prefix"; then - for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl KCC RCC xlC_r xlC - do - # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. -set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -echo "$as_me:8082: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_CXX+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + +echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 +echo "configure:8761: 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 - if test -n "$CXX"; then - ac_cv_prog_CXX="$CXX" # Let the user override the test. + rm -f conftestdata +if ln -s X conftestdata 2>/dev/null +then + rm -f conftestdata + ac_cv_prog_LN_S="ln -s" else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" -echo "$as_me:8097: found $ac_dir/$ac_word" >&5 -break -done - + ac_cv_prog_LN_S=ln fi fi -CXX=$ac_cv_prog_CXX -if test -n "$CXX"; then - echo "$as_me:8105: result: $CXX" >&5 -echo "${ECHO_T}$CXX" >&6 +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 "$as_me:8108: result: no" >&5 -echo "${ECHO_T}no" >&6 + echo "$ac_t""no" 1>&6 fi - test -n "$CXX" && break - done -fi -if test -z "$CXX"; then - ac_ct_CXX=$CXX - for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl KCC RCC xlC_r xlC -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 "$as_me:8121: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$ac_ct_CXX"; then - ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test. -else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_ac_ct_CXX="$ac_prog" -echo "$as_me:8136: found $ac_dir/$ac_word" >&5 -break -done -fi -fi -ac_ct_CXX=$ac_cv_prog_ac_ct_CXX -if test -n "$ac_ct_CXX"; then - echo "$as_me:8144: result: $ac_ct_CXX" >&5 -echo "${ECHO_T}$ac_ct_CXX" >&6 -else - echo "$as_me:8147: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - test -n "$ac_ct_CXX" && break -done -test -n "$ac_ct_CXX" || ac_ct_CXX="g++" +SEARCH_INCLUDE="\ + /usr/local/include \ + \ + /usr/Motif-1.2/include \ + /usr/Motif-2.1/include \ + \ + /usr/include/Motif1.2 \ + /opt/xpm/include/X11 \ + /opt/GBxpm/include/ \ + /opt/GBxpm/X11/include/ \ + \ + /usr/Motif1.2/include \ + /usr/dt/include \ + /usr/openwin/include \ + \ + /usr/include/Xm \ + \ + /usr/X11R6/include \ + /usr/X11R6.4/include \ + /usr/X11R5/include \ + /usr/X11R4/include \ + \ + /usr/include/X11R6 \ + /usr/include/X11R5 \ + /usr/include/X11R4 \ + \ + /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 \ + \ + X:/XFree86/include \ + X:/XFree86/include/X11 \ + \ + /usr/include/gtk \ + /usr/local/include/gtk \ + /usr/include/glib \ + /usr/local/include/glib \ + \ + /usr/include/qt \ + /usr/local/include/qt \ + \ + /usr/include/windows \ + /usr/include/wine \ + /usr/local/include/wine \ + \ + /usr/unsupported/include \ + /usr/athena/include \ + /usr/local/x11r5/include \ + /usr/lpp/Xamples/include \ + \ + /usr/openwin/share/include \ + \ + /usr/include" + +SEARCH_LIB="`echo "$SEARCH_INCLUDE" | sed s/include/lib/g` " - CXX=$ac_ct_CXX -fi -echo "$as_me:8158: checking whether we are using the GNU C++ compiler" >&5 -echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6 -if test "${ac_cv_cxx_compiler_gnu+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +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 - cat >conftest.$ac_ext <<_ACEOF -#line 8164 "configure" -#include "confdefs.h" + 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 -int -main () -{ -#ifndef __GNUC__ - choke me -#endif - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:8179: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:8182: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:8185: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:8188: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_compiler_gnu=yes -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_compiler_gnu=no -fi -rm -f conftest.$ac_objext conftest.$ac_ext -ac_cv_cxx_compiler_gnu=$ac_compiler_gnu - -fi -echo "$as_me:8200: result: $ac_cv_cxx_compiler_gnu" >&5 -echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6 -GXX=`test $ac_compiler_gnu = yes && echo yes` -ac_test_CXXFLAGS=${CXXFLAGS+set} -ac_save_CXXFLAGS=$CXXFLAGS -CXXFLAGS="-g" -echo "$as_me:8206: checking whether $CXX accepts -g" >&5 -echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6 -if test "${ac_cv_prog_cxx_g+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line 8212 "configure" -#include "confdefs.h" -int -main () -{ - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:8224: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:8227: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:8230: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:8233: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_prog_cxx_g=yes +REGEX_INCLUDE= +if test "$wxUSE_REGEX" != "no"; then + cat >> confdefs.h <<\EOF +#define wxUSE_REGEX 1 +EOF + + + if test "$wxUSE_REGEX" = "sys" -o "$wxUSE_REGEX" = "yes" ; then + ac_safe=`echo "regex.h" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for regex.h""... $ac_c" 1>&6 +echo "configure:8913: checking for regex.h" >&5 +if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_prog_cxx_g=no -fi -rm -f conftest.$ac_objext conftest.$ac_ext -fi -echo "$as_me:8243: result: $ac_cv_prog_cxx_g" >&5 -echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6 -if test "$ac_test_CXXFLAGS" = set; then - CXXFLAGS=$ac_save_CXXFLAGS -elif test $ac_cv_prog_cxx_g = yes; then - if test "$GXX" = yes; then - CXXFLAGS="-g -O2" - else - CXXFLAGS="-g" - fi + cat > conftest.$ac_ext < +EOF +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (eval echo configure:8923: \"$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 - if test "$GXX" = yes; then - CXXFLAGS="-O2" - else - CXXFLAGS= - fi + 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 -for ac_declaration in \ - ''\ - '#include ' \ - 'extern "C" void std::exit (int) throw (); using std::exit;' \ - 'extern "C" void std::exit (int); using std::exit;' \ - 'extern "C" void exit (int) throw ();' \ - 'extern "C" void exit (int);' \ - 'void exit (int);' +rm -f conftest* +fi +if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then + echo "$ac_t""yes" 1>&6 + for ac_func in regcomp do - cat >conftest.$ac_ext <<_ACEOF -#line 8270 "configure" -#include "confdefs.h" -#include -$ac_declaration -int -main () -{ -exit (42); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:8283: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:8286: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:8289: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:8292: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - : +echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +echo "configure:8942: 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 - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -continue -fi -rm -f conftest.$ac_objext conftest.$ac_ext - cat >conftest.$ac_ext <<_ACEOF -#line 8302 "configure" + cat > conftest.$ac_ext <&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:8317: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:8320: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:8323: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - break -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -fi -rm -f conftest.$ac_objext conftest.$ac_ext -done -echo '#ifdef __cplusplus' >>confdefs.h -echo $ac_declaration >>confdefs.h -echo '#endif' >>confdefs.h +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func(); below. */ +#include +/* 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(); -ac_ext=cc -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu +int main() { -ac_ext=cc -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -echo "$as_me:8347: checking how to run the C++ preprocessor" >&5 -echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6 -if test -z "$CXXCPP"; then - if test "${ac_cv_prog_CXXCPP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - # Double quotes because CXXCPP needs to be expanded - for CXXCPP in "$CXX -E" "/lib/cpp" - do - # break 2 since there is a loop in there. - ac_preproc_ok=false -for ac_cxx_preproc_warn_flag in '' yes -do - # Use a header file that comes with gcc, so configuring glibc - # with a fresh cross-compiler works. - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. "Syntax error" is here to catch this case. - cat >conftest.$ac_ext <<_ACEOF -#line 8365 "configure" -#include "confdefs.h" -#include - Syntax error -_ACEOF -if { (eval echo "$as_me:8370: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:8376: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_cxx_preproc_warn_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - : +/* 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 +$ac_func(); +#endif + +; return 0; } +EOF +if { (eval echo configure:8970: \"$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 "$as_me: failed program was:" >&5 + echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - # Broken: fails on valid input. -continue + rm -rf conftest* + eval "ac_cv_func_$ac_func=no" +fi +rm -f conftest* fi -rm -f conftest.err conftest.$ac_ext - # OK, works on sane cases. Now check whether non-existent headers - # can be detected and how. - cat >conftest.$ac_ext <<_ACEOF -#line 8399 "configure" -#include "confdefs.h" -#include -_ACEOF -if { (eval echo "$as_me:8403: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:8409: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_cxx_preproc_warn_flag - else - ac_cpp_err= - 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 -if test -z "$ac_cpp_err"; then - # Broken: success on invalid input. -continue +done + else - echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 - # Passes both tests. -ac_preproc_ok=: -break + echo "$ac_t""no" 1>&6 fi -rm -f conftest.err conftest.$ac_ext -done -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.err conftest.$ac_ext -if $ac_preproc_ok; then - break 2 -fi - done - ac_cv_prog_CXXCPP=$CXXCPP + if test "x$ac_cv_func_regcomp" != "xyes"; then + if test "$wxUSE_REGEX" = "sys" ; then + { echo "configure: error: system regex library not found! Use --with-regex to use built-in version" 1>&2; exit 1; } + else + echo "configure: warning: system regex library not found, will compile built-in version instead" 1>&2 + wxUSE_REGEX=builtin + fi + else + wxUSE_REGEX=sys + fi + fi + if test "$wxUSE_REGEX" = "builtin" ; then + REGEX_INCLUDE="-I\${top_srcdir}/src/regex" + fi fi - CXXCPP=$ac_cv_prog_CXXCPP -else - ac_cv_prog_CXXCPP=$CXXCPP -fi -echo "$as_me:8446: result: $CXXCPP" >&5 -echo "${ECHO_T}$CXXCPP" >&6 -ac_preproc_ok=false -for ac_cxx_preproc_warn_flag in '' yes -do - # Use a header file that comes with gcc, so configuring glibc - # with a fresh cross-compiler works. - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. "Syntax error" is here to catch this case. - cat >conftest.$ac_ext <<_ACEOF -#line 8456 "configure" + + +ZLIB_INCLUDE= +ZLIB_LINK= +if test "$wxUSE_ZLIB" != "no" ; then + cat >> confdefs.h <<\EOF +#define wxUSE_ZLIB 1 +EOF + + + if test "$wxUSE_ZLIB" = "sys" -o "$wxUSE_ZLIB" = "yes" ; then + ac_safe=`echo "zlib.h" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for zlib.h""... $ac_c" 1>&6 +echo "configure:9028: checking for zlib.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 < - Syntax error -_ACEOF -if { (eval echo "$as_me:8461: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:8467: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_cxx_preproc_warn_flag - else - ac_cpp_err= - fi +#include +EOF +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (eval echo configure:9038: \"$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 - ac_cpp_err=yes + 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 -if test -z "$ac_cpp_err"; then - : +rm -f conftest* +fi +if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then + echo "$ac_t""yes" 1>&6 + echo $ac_n "checking for deflate in -lz""... $ac_c" 1>&6 +echo "configure:9055: checking for deflate in -lz" >&5 +ac_lib_var=`echo z'_'deflate | 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="-lz $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 "$as_me: failed program was:" >&5 + echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - # Broken: fails on valid input. -continue + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest* +LIBS="$ac_save_LIBS" - # OK, works on sane cases. Now check whether non-existent headers - # can be detected and how. - cat >conftest.$ac_ext <<_ACEOF -#line 8490 "configure" -#include "confdefs.h" -#include -_ACEOF -if { (eval echo "$as_me:8494: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:8500: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_cxx_preproc_warn_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes fi -if test -z "$ac_cpp_err"; then - # Broken: success on invalid input. -continue +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + ZLIB_LINK="-lz" else - echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 - # Passes both tests. -ac_preproc_ok=: -break + echo "$ac_t""no" 1>&6 fi -rm -f conftest.err conftest.$ac_ext -done -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.err conftest.$ac_ext -if $ac_preproc_ok; then - : else - { { echo "$as_me:8528: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5 -echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&2;} - { (exit 1); exit 1; }; } + echo "$ac_t""no" 1>&6 fi -ac_ext=cc -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -CXXFLAGS=`echo "$CXXFLAGS" | sed 's/-g//g'` + if test "x$ZLIB_LINK" = "x" ; then + if test "$wxUSE_ZLIB" = "sys" ; then + { echo "configure: error: system zlib compression library not found! Use --with-zlib=builtin to use built-in version" 1>&2; exit 1; } + else + echo "configure: warning: system zlib compression library not found, will compile built-in version instead" 1>&2 + wxUSE_ZLIB=builtin + fi + else + wxUSE_ZLIB=sys + fi + fi -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - -if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. -set dummy ${ac_tool_prefix}ranlib; ac_word=$2 -echo "$as_me:8550: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_RANLIB+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + if test "$wxUSE_ZLIB" = "builtin" ; then + ZLIB_INCLUDE="-I\${top_srcdir}/src/zlib" + fi +fi + + +PNG_INCLUDE= +PNG_LINK= +if test "$wxUSE_LIBPNG" != "no" ; then + cat >> confdefs.h <<\EOF +#define wxUSE_LIBPNG 1 +EOF + + + if test "$wxUSE_LIBPNG" = "sys" -a "$wxUSE_ZLIB" != "sys" ; then + echo "configure: warning: system png library doesn't work without system zlib, will compile built-in instead" 1>&2 + wxUSE_LIBPNG=builtin + fi + + if test "$wxUSE_LIBPNG" = "sys" -o "$wxUSE_LIBPNG" = "yes" ; then + ac_safe=`echo "png.h" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for png.h""... $ac_c" 1>&6 +echo "configure:9133: checking for png.h" >&5 +if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 else - if test -n "$RANLIB"; then - ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. + cat > conftest.$ac_ext < +EOF +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (eval echo configure:9143: \"$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 - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" -echo "$as_me:8565: found $ac_dir/$ac_word" >&5 -break -done - + 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 -RANLIB=$ac_cv_prog_RANLIB -if test -n "$RANLIB"; then - echo "$as_me:8573: result: $RANLIB" >&5 -echo "${ECHO_T}$RANLIB" >&6 +if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then + echo "$ac_t""yes" 1>&6 + echo $ac_n "checking for png_check_sig in -lpng""... $ac_c" 1>&6 +echo "configure:9160: checking for png_check_sig in -lpng" >&5 +ac_lib_var=`echo png'_'png_check_sig | 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 - echo "$as_me:8576: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi + ac_save_LIBS="$LIBS" +LIBS="-lpng -lz -lm $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 -if test -z "$ac_cv_prog_RANLIB"; then - ac_ct_RANLIB=$RANLIB - # Extract the first word of "ranlib", so it can be a program name with args. -set dummy ranlib; ac_word=$2 -echo "$as_me:8585: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$ac_ct_RANLIB"; then - ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test. -else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_ac_ct_RANLIB="ranlib" -echo "$as_me:8600: found $ac_dir/$ac_word" >&5 -break -done +rm -f conftest* +LIBS="$ac_save_LIBS" - test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":" fi -fi -ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB -if test -n "$ac_ct_RANLIB"; then - echo "$as_me:8609: result: $ac_ct_RANLIB" >&5 -echo "${ECHO_T}$ac_ct_RANLIB" >&6 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + PNG_LINK="-lpng" else - echo "$as_me:8612: result: no" >&5 -echo "${ECHO_T}no" >&6 + echo "$ac_t""no" 1>&6 fi - RANLIB=$ac_ct_RANLIB + else - RANLIB="$ac_cv_prog_RANLIB" + echo "$ac_t""no" 1>&6 fi -# Extract the first word of "ar", so it can be a program name with args. -set dummy ar; ac_word=$2 -echo "$as_me:8623: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_AR+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$AR"; then - ac_cv_prog_AR="$AR" # Let the user override the test. -else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_AR="ar" -echo "$as_me:8638: found $ac_dir/$ac_word" >&5 -break -done - test -z "$ac_cv_prog_AR" && ac_cv_prog_AR="ar" -fi -fi -AR=$ac_cv_prog_AR -if test -n "$AR"; then - echo "$as_me:8647: result: $AR" >&5 -echo "${ECHO_T}$AR" >&6 -else - echo "$as_me:8650: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi + if test "x$PNG_LINK" = "x" ; then + if test "$wxUSE_LIBPNG" = "sys" ; then + { echo "configure: error: system png library not found! Use --with-libpng=builtin to use built-in version" 1>&2; exit 1; } + else + echo "configure: warning: system png library not found, will compile built-in version instead" 1>&2 + wxUSE_LIBPNG=builtin + fi + else + wxUSE_LIBPNG=yes + fi + fi -# 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 -# AmigaOS /C/install, which installs bootblocks on floppy discs -# 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 "$as_me:8666: checking for a BSD compatible install" >&5 -echo $ECHO_N "checking for a BSD compatible install... $ECHO_C" >&6 -if test -z "$INSTALL"; then -if test "${ac_cv_path_install+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_save_IFS=$IFS; IFS=$ac_path_separator - for ac_dir in $PATH; do - IFS=$ac_save_IFS - # Account for people who put trailing slashes in PATH elements. - case $ac_dir/ in - / | ./ | .// | /cC/* \ - | /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 $as_executable_p "$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. - : - elif test $ac_prog = install && - grep pwplus "$ac_dir/$ac_prog" >/dev/null 2>&1; then - # program-specific install script used by HP pwplus--don't use. - : - else - ac_cv_path_install="$ac_dir/$ac_prog -c" - break 2 - fi - fi - done - ;; - esac - done + if test "$wxUSE_LIBPNG" = "builtin" ; then + PNG_INCLUDE="-I\${top_srcdir}/src/png" + fi + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS png" 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 "$as_me:8715: result: $INSTALL" >&5 -echo "${ECHO_T}$INSTALL" >&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}' +JPEG_INCLUDE= +JPEG_LINK= +if test "$wxUSE_LIBJPEG" != "no" ; then + cat >> confdefs.h <<\EOF +#define wxUSE_LIBJPEG 1 +EOF -test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -# Extract the first word of "strip", so it can be a program name with args. -set dummy strip; ac_word=$2 -echo "$as_me:8728: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_STRIP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + if test "$wxUSE_LIBJPEG" = "sys" -o "$wxUSE_LIBJPEG" = "yes" ; then + echo $ac_n "checking for jpeglib.h""... $ac_c" 1>&6 +echo "configure:9235: checking for jpeglib.h" >&5 + if eval "test \"`echo '$''{'ac_cv_header_jpeglib_h'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 else - if test -n "$STRIP"; then - ac_cv_prog_STRIP="$STRIP" # Let the user override the test. -else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_STRIP="strip" -echo "$as_me:8743: found $ac_dir/$ac_word" >&5 -break -done + cat > conftest.$ac_ext < + #include + +int main() { + + +; return 0; } +EOF +if { (eval echo configure:9252: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_header_jpeglib_h=yes +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + ac_cv_header_jpeglib_h=no + fi +rm -f conftest* + fi -STRIP=$ac_cv_prog_STRIP -if test -n "$STRIP"; then - echo "$as_me:8752: result: $STRIP" >&5 -echo "${ECHO_T}$STRIP" >&6 + + echo "$ac_t""$ac_cv_header_jpeglib_h" 1>&6 + + if test "$ac_cv_header_jpeglib_h" = "yes"; then + echo $ac_n "checking for jpeg_read_header in -ljpeg""... $ac_c" 1>&6 +echo "configure:9270: checking for jpeg_read_header in -ljpeg" >&5 +ac_lib_var=`echo jpeg'_'jpeg_read_header | 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 - echo "$as_me:8755: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi + ac_save_LIBS="$LIBS" +LIBS="-ljpeg $LIBS" +cat > conftest.$ac_ext <&5 -echo $ECHO_N "checking make for VPATH support... $ECHO_C" >&6 -cat - << EOF > confMake -check : file - cp \$? \$@ - cp \$? final_file +int main() { +jpeg_read_header() +; return 0; } EOF +if { (eval echo configure:9289: \"$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 -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" +fi +rm -f conftest* +LIBS="$ac_save_LIBS" -if test ! -d sub ; then - mkdir sub fi -echo dummy > sub/file -${MAKE-make} -f confMake VPATH=sub 2>&5 > /dev/null -RESULT=$? -rm -f sub/file check final_file confMake -rmdir sub -if test "$RESULT" = 0; then - echo "$as_me:8776: result: yes" >&5 -echo "${ECHO_T}yes" >&6 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + JPEG_LINK="-ljpeg" else - echo "$as_me:8779: result: no" >&5 -echo "${ECHO_T}no" >&6 - { { echo "$as_me:8781: error: -You need a make-utility that is able to use the variable -VPATH correctly. -If your version of make does not support VPATH correctly, -please install GNU-make (possibly as gmake), and start -configure with the following command: -export MAKE=gmake; ./configure for sh-type shells -setenv MAKE gmake; ./configure for csh-type shells -Also please do remember to use gmake in this case every time -you are trying to compile. -" >&5 -echo "$as_me: error: -You need a make-utility that is able to use the variable -VPATH correctly. -If your version of make does not support VPATH correctly, -please install GNU-make (possibly as gmake), and start -configure with the following command: -export MAKE=gmake; ./configure for sh-type shells -setenv MAKE gmake; ./configure for csh-type shells -Also please do remember to use gmake in this case every time -you are trying to compile. -" >&2;} - { (exit 1); exit 1; }; } + echo "$ac_t""no" 1>&6 fi -for ac_prog in 'bison -y' byacc -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 "$as_me:8810: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_YACC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$YACC"; then - ac_cv_prog_YACC="$YACC" # Let the user override the test. -else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_YACC="$ac_prog" -echo "$as_me:8825: found $ac_dir/$ac_word" >&5 -break -done + fi -fi -fi -YACC=$ac_cv_prog_YACC -if test -n "$YACC"; then - echo "$as_me:8833: result: $YACC" >&5 -echo "${ECHO_T}$YACC" >&6 -else - echo "$as_me:8836: result: no" >&5 -echo "${ECHO_T}no" >&6 + if test "x$JPEG_LINK" = "x" ; then + if test "$wxUSE_LIBJPEG" = "sys" ; then + { echo "configure: error: system jpeg library not found! Use --with-libjpeg=builtin to use built-in version" 1>&2; exit 1; } + else + echo "configure: warning: system jpeg library not found, will compile built-in version instead" 1>&2 + wxUSE_LIBJPEG=builtin + fi + else + wxUSE_LIBJPEG=sys + fi + fi + + if test "$wxUSE_LIBJPEG" = "builtin" ; then + JPEG_INCLUDE="-I\${top_srcdir}/src/jpeg" + fi fi - test -n "$YACC" && break -done -test -n "$YACC" || YACC="yacc" -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 "$as_me:8848: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_LEX+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +TIFF_INCLUDE= +TIFF_LINK= +if test "$wxUSE_LIBTIFF" != "no" ; then + cat >> confdefs.h <<\EOF +#define wxUSE_LIBTIFF 1 +EOF + + + if test "$wxUSE_LIBTIFF" = "sys" -o "$wxUSE_LIBTIFF" = "yes" ; then + ac_safe=`echo "tiffio.h" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for tiffio.h""... $ac_c" 1>&6 +echo "configure:9340: checking for tiffio.h" >&5 +if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+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. + cat > conftest.$ac_ext < +EOF +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (eval echo configure:9350: \"$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 - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_LEX="$ac_prog" -echo "$as_me:8863: found $ac_dir/$ac_word" >&5 -break -done - + 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 -LEX=$ac_cv_prog_LEX -if test -n "$LEX"; then - echo "$as_me:8871: result: $LEX" >&5 -echo "${ECHO_T}$LEX" >&6 +if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then + echo "$ac_t""yes" 1>&6 + echo $ac_n "checking for TIFFError in -ltiff""... $ac_c" 1>&6 +echo "configure:9367: checking for TIFFError in -ltiff" >&5 +ac_lib_var=`echo tiff'_'TIFFError | 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 - echo "$as_me:8874: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - test -n "$LEX" && break -done -test -n "$LEX" || LEX=":" - -if test -z "$LEXLIB" -then - echo "$as_me:8884: checking for yywrap in -lfl" >&5 -echo $ECHO_N "checking for yywrap in -lfl... $ECHO_C" >&6 -if test "${ac_cv_lib_fl_yywrap+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lfl $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 8892 "configure" + ac_save_LIBS="$LIBS" +LIBS="-ltiff -lm $LIBS" +cat > conftest.$ac_ext <&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:8914: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:8917: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:8920: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_fl_yywrap=yes -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_lib_fl_yywrap=no -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:8931: result: $ac_cv_lib_fl_yywrap" >&5 -echo "${ECHO_T}$ac_cv_lib_fl_yywrap" >&6 -if test $ac_cv_lib_fl_yywrap = yes; then - LEXLIB="-lfl" -else - echo "$as_me:8936: checking for yywrap in -ll" >&5 -echo $ECHO_N "checking for yywrap in -ll... $ECHO_C" >&6 -if test "${ac_cv_lib_l_yywrap+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ll $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 8944 "configure" -#include "confdefs.h" + builtin and then its argument prototype would still apply. */ +char TIFFError(); -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char yywrap (); -int -main () -{ -yywrap (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:8963: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:8966: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:8969: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:8972: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_l_yywrap=yes +int main() { +TIFFError() +; return 0; } +EOF +if { (eval echo configure:9386: \"$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 "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_lib_l_yywrap=no -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:8983: result: $ac_cv_lib_l_yywrap" >&5 -echo "${ECHO_T}$ac_cv_lib_l_yywrap" >&6 -if test $ac_cv_lib_l_yywrap = yes; then - LEXLIB="-ll" + 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 + TIFF_LINK="-ltiff" +else + echo "$ac_t""no" 1>&6 fi -if test "x$LEX" != "x:"; then - echo "$as_me:8994: checking lex output file root" >&5 -echo $ECHO_N "checking lex output file root... $ECHO_C" >&6 -if test "${ac_cv_prog_lex_root+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&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 -else - { { echo "$as_me:9008: error: cannot find output from $LEX; giving up" >&5 -echo "$as_me: error: cannot find output from $LEX; giving up" >&2;} - { (exit 1); exit 1; }; } + echo "$ac_t""no" 1>&6 fi + + + if test "x$TIFF_LINK" = "x" ; then + if test "$wxUSE_LIBTIFF" = "sys" ; then + { echo "configure: error: system tiff library not found! Use --with-libtiff=builtin to use built-in version" 1>&2; exit 1; } + else + echo "configure: warning: system tiff library not found, will compile built-in version instead" 1>&2 + wxUSE_LIBTIFF=builtin + fi + else + wxUSE_LIBTIFF=sys + fi + fi + + if test "$wxUSE_LIBTIFF" = "builtin" ; then + TIFF_INCLUDE="-I\${top_srcdir}/src/tiff" + fi fi -echo "$as_me:9013: result: $ac_cv_prog_lex_root" >&5 -echo "${ECHO_T}$ac_cv_prog_lex_root" >&6 -LEX_OUTPUT_ROOT=$ac_cv_prog_lex_root -echo "$as_me:9017: checking whether yytext is a pointer" >&5 -echo $ECHO_N "checking whether yytext is a pointer... $ECHO_C" >&6 -if test "${ac_cv_prog_lex_yytext_pointer+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + +FREETYPE_INCLUDE= +FREETYPE_LINK= +if test "$wxUSE_FREETYPE" != "no" ; then + cat >> confdefs.h <<\EOF +#define wxUSE_FREETYPE 1 +EOF + + + if test "$wxUSE_FREETYPE" = "sys" -o "$wxUSE_FREETYPE" = "yes" ; then + ac_safe=`echo "freetype.h" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for freetype.h""... $ac_c" 1>&6 +echo "configure:9441: checking for freetype.h" >&5 +if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+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 <<_ACEOF -`cat $LEX_OUTPUT_ROOT.c` -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:9033: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:9036: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:9039: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:9042: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_prog_lex_yytext_pointer=yes + cat > conftest.$ac_ext < +EOF +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (eval echo configure:9451: \"$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 "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 + 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.$ac_objext conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_save_LIBS -rm -f "${LEX_OUTPUT_ROOT}.c" - +rm -f conftest* fi -echo "$as_me:9054: result: $ac_cv_prog_lex_yytext_pointer" >&5 -echo "${ECHO_T}$ac_cv_prog_lex_yytext_pointer" >&6 -if test $ac_cv_prog_lex_yytext_pointer = yes; then +if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then + echo "$ac_t""yes" 1>&6 + echo $ac_n "checking for FT_Render_Glyph in -lfreetype""... $ac_c" 1>&6 +echo "configure:9468: checking for FT_Render_Glyph in -lfreetype" >&5 +ac_lib_var=`echo freetype'_'FT_Render_Glyph | 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="-lfreetype -lm $LIBS" +cat > conftest.$ac_ext <>confdefs.h <<\EOF -#define YYTEXT_POINTER 1 +int main() { +FT_Render_Glyph() +; return 0; } EOF - +if { (eval echo configure:9487: \"$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 -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" fi +rm -f conftest* +LIBS="$ac_save_LIBS" fi - -echo "$as_me:9066: checking whether ln -s works" >&5 -echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6 -LN_S=$as_ln_s -if test "$LN_S" = "ln -s"; then - echo "$as_me:9070: result: yes" >&5 -echo "${ECHO_T}yes" >&6 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + FREETYPE_LINK="-lfreetype" else - echo "$as_me:9073: result: no, using $LN_S" >&5 -echo "${ECHO_T}no, using $LN_S" >&6 + echo "$ac_t""no" 1>&6 fi -SEARCH_INCLUDE="\ - /usr/local/include \ - \ - /usr/Motif-1.2/include \ - /usr/Motif-2.1/include \ - \ - /usr/include/Motif1.2 \ - /opt/xpm/include/X11 \ - /opt/GBxpm/include/ \ - /opt/GBxpm/X11/include/ \ - \ - /usr/Motif1.2/include \ - /usr/dt/include \ - /usr/openwin/include \ - \ - /usr/include/Xm \ - \ - /usr/X11R6/include \ - /usr/X11R6.4/include \ - /usr/X11R5/include \ - /usr/X11R4/include \ - \ - /usr/include/X11R6 \ - /usr/include/X11R5 \ - /usr/include/X11R4 \ - \ - /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 \ - \ - X:/XFree86/include \ - X:/XFree86/include/X11 \ - \ - /usr/include/gtk \ - /usr/local/include/gtk \ - /usr/include/glib \ - /usr/local/include/glib \ - \ - /usr/include/qt \ - /usr/local/include/qt \ - \ - /usr/include/windows \ - /usr/include/wine \ - /usr/local/include/wine \ - \ - /usr/unsupported/include \ - /usr/athena/include \ - /usr/local/x11r5/include \ - /usr/lpp/Xamples/include \ - \ - /usr/openwin/share/include \ - \ - /usr/include" - -SEARCH_LIB="`echo "$SEARCH_INCLUDE" | sed s/include/lib/g` " + +else + echo "$ac_t""no" 1>&6 +fi -cat >confcache <<\_ACEOF -# 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, see configure's option --config-cache. -# It is not useful on other systems. If it contains results you don't -# want to keep, you may remove or edit it. -# -# config.status only pays attention to the cache file if you give it -# the --recheck option to rerun configure. -# -# `ac_cv_env_foo' variables (set or unset) will be overriden when -# loading this file, other *unset* `ac_cv_foo' will be assigned the -# following values. -_ACEOF + if test "x$FREETYPE_LINK" = "x" ; then + if test "$wxUSE_FREETYPE" = "sys" ; then + { echo "configure: error: system freetype library not found! Use --with-freetype=builtin to use built-in version" 1>&2; exit 1; } + else + echo "configure: warning: system freetype library not found, will compile built-in version instead" 1>&2 + wxUSE_FREETYPE=builtin + fi + else + wxUSE_FREETYPE=sys + fi + fi -# 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 \ - "s/'/'\\\\''/g; - s/^\\([_$ac_cr_alnum]*_cv_[_$ac_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" - ;; - *) - # `set' quotes correctly as required by POSIX, so do not add quotes. - sed -n \ - "s/^\\([_$ac_cr_alnum]*_cv_[_$ac_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" - ;; - esac; -} | - sed ' - t clear - : clear - s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ - t end - /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ - : end' >>confcache -if cmp -s $cache_file confcache; then :; else - if test -w $cache_file; then - test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file" - cat confcache >$cache_file - else - echo "not updating unwritable cache $cache_file" - fi + if test "$wxUSE_FREETYPE" = "builtin" ; then + FREETYPE_INCLUDE="-I\${top_srcdir}/src/freetype" + fi fi -rm -f confcache - -AFMINSTALL= -if test "$wxUSE_GUI" = "yes"; then -USE_GUI=1 +AFMINSTALL= TOOLKIT= TOOLKIT_INCLUDE= +WIDGET_SET= + +if test "$USE_WIN32" = 1 ; then + for ac_hdr in w32api.h +do +ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +echo "configure:9542: 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:9552: \"$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 + + ac_safe=`echo "windows.h" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for windows.h""... $ac_c" 1>&6 +echo "configure:9580: checking for windows.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:9590: \"$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 + : +else + echo "$ac_t""no" 1>&6 -GUI_TK_LIBRARY= -GUI_TK_LINK= + { echo "configure: error: please set CFLAGS to contain the location of windows.h" 1>&2; exit 1; } + +fi -WXGTK12= -WXGTK127= -WXGTK20= -WXWINE= + echo $ac_n "checking if w32api has good enough MSIE support""... $ac_c" 1>&6 +echo "configure:9616: checking if w32api has good enough MSIE support" >&5 +if eval "test \"`echo '$''{'wx_cv_w32api_win_ie'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + + cat > conftest.$ac_ext < +int main() { + + #define wxCHECK_W32API_VERSION( major, minor ) \ + ( defined( __W32API_MAJOR_VERSION ) && defined( __W32API_MINOR_VERSION ) \ + && ( ( __W32API_MAJOR_VERSION > (major) ) \ + || ( __W32API_MAJOR_VERSION == (major) && __W32API_MINOR_VERSION >= (minor)))) + + #if !wxCHECK_W32API_VERSION(1,1) + #error You need w32api 1.1 or newer + #endif + +; return 0; } +EOF +if { (eval echo configure:9638: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + + wx_cv_w32api_win_ie=yes + CPPFLAGS="$CPPFLAGS -D_WIN_IE=0x400" + +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + + wx_cv_w32api_win_ie=no + +fi +rm -f conftest* + +fi -if test "$wxUSE_CYGWIN" = 1 || test "$wxUSE_MINGW" = 1 ; then - if test "$cross_compiling" = "yes" ; then - { echo "$as_me:9221: WARNING: skipping windows.h check for cross-compilation" >&5 -echo "$as_me: WARNING: skipping windows.h check for cross-compilation" >&2;} - else - echo "$as_me:9224: checking for Windows headers" >&5 -echo $ECHO_N "checking for Windows headers... $ECHO_C" >&6 +echo "$ac_t""$wx_cv_w32api_win_ie" 1>&6 -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 + LIBS="$LIBS -lwinspool -lwinmm -lshell32 -lcomctl32 -lctl3d32 -ladvapi32 -lwsock32" - if test "$ac_find_includes" != "" ; then - echo "$as_me:9237: result: found $ac_find_includes" >&5 -echo "${ECHO_T}found $ac_find_includes" >&6 - TOOLKIT_INCLUDE="$TOOLKIT_INCLUDE -I$ac_find_includes" - else - echo "$as_me:9241: result: no" >&5 -echo "${ECHO_T}no" >&6 - { { echo "$as_me:9243: error: please set CFLAGS to contain the location of windows.h" >&5 -echo "$as_me: error: please set CFLAGS to contain the location of windows.h" >&2;} - { (exit 1); exit 1; }; } - fi + if test "$wxUSE_CYGWIN" = 1; then + LIBS="$LIBS -lkernel32 -luser32 -lgdi32 -lcomdlg32" fi - INCLUDE_SUBDIRS="$INCLUDE_SUBDIRS msw" - LIBS="$LIBS -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lctl3d32 -lcrtdll -ladvapi32 -lwsock32" - if test "$wxUSE_ODBC" = "yes" ; then LIBS="$LIBS -lodbc32 -lole32 -loleaut32" fi - if test "$wxUSE_MINGW" = 1; then + if test "$wxUSE_MINGW" = 1; then LDFLAGS="$LDFLAGS -mwindows" fi - TOOLKIT=MSW - GUIDIST=MSW_DIST + RESFLAGS="--include-dir \$(top_srcdir)/include --include-dir \$(top_srcdir)/\$(program_dir) --define __WIN32__ --define __WIN95__ --define __GNUWIN32__" + RESPROGRAMOBJ="\$(PROGRAM)_resources.o" +fi - RCINCSWITCH="--include-dir" - RCDEFSWITCH="--define" - RCPREPROCESSOR="--preprocessor \"\$(CC) -c -E -xc-header -DRC_INVOKED\"" - RCINPUTSWITCH="-i" - RCOUTPUTSWITCH="-o" - RESFLAGS="$RCPREPROCESSOR $RCINCSWITCH \$(top_srcdir)/include $RCINCSWITCH \$(top_srcdir)/\$(program_dir) $RCDEFSWITCH __WIN32__ $RCDEFSWITCH __WIN95__ $RCDEFSWITCH __GNUWIN32__" +if test "$wxUSE_GUI" = "yes"; then + USE_GUI=1 - RESPROGRAM="\$(RES_PROGRAM)" + GUI_TK_LIBRARY= -fi + WXGTK12= + WXGTK127= + WXGTK20= -if test "$wxUSE_GTK" = 1; then + if test "$wxUSE_CYGWIN" = 1 || test "$wxUSE_MINGW" = 1 ; then + TOOLKIT=MSW + GUIDIST=MSW_DIST + fi + + if test "$wxUSE_GTK" = 1; then + echo $ac_n "checking for GTK+ version""... $ac_c" 1>&6 +echo "configure:9692: checking for GTK+ version" >&5 + + gtk_version_cached=1 + if eval "test \"`echo '$''{'wx_cv_lib_gtk'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + + gtk_version_cached=0 + echo "$ac_t""""" 1>&6 -# Check whether --with-gtk-prefix or --without-gtk-prefix was given. + wx_cv_lib_gtk= + if test "x$wxUSE_GTK2" = "xyes"; 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; +fi # Check whether --with-gtk-exec-prefix or --without-gtk-exec-prefix was given. if test "${with_gtk_exec_prefix+set}" = set; then @@ -9287,16 +9714,18 @@ if test "${with_gtk_exec_prefix+set}" = set; then gtk_config_exec_prefix="$withval" else gtk_config_exec_prefix="" -fi; +fi + # Check whether --enable-gtktest or --disable-gtktest was given. if test "${enable_gtktest+set}" = set; then enableval="$enable_gtktest" - + : else enable_gtktest=yes -fi; +fi + - for module in . gthread + for module in . do case "$module" in gthread) @@ -9320,45 +9749,43 @@ fi; # Extract the first word of "gtk-config-2.0", so it can be a program name with args. set dummy gtk-config-2.0; ac_word=$2 -echo "$as_me:9323: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_path_GTK_CONFIG_2_0+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:9754: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_path_GTK_CONFIG_2_0'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 else - case $GTK_CONFIG_2_0 in - [\\/]* | ?:[\\/]*) + case "$GTK_CONFIG_2_0" in + /*) ac_cv_path_GTK_CONFIG_2_0="$GTK_CONFIG_2_0" # Let the user override the test with a path. ;; + ?:/*) + ac_cv_path_GTK_CONFIG_2_0="$GTK_CONFIG_2_0" # Let the user override the test with a dos path. + ;; *) - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - if $as_executable_p "$ac_dir/$ac_word"; then - ac_cv_path_GTK_CONFIG_2_0="$ac_dir/$ac_word" - echo "$as_me:9340: found $ac_dir/$ac_word" >&5 - break -fi -done - + 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_2_0="$ac_dir/$ac_word" + break + fi + done + IFS="$ac_save_ifs" test -z "$ac_cv_path_GTK_CONFIG_2_0" && ac_cv_path_GTK_CONFIG_2_0="no" ;; esac fi -GTK_CONFIG_2_0=$ac_cv_path_GTK_CONFIG_2_0 - +GTK_CONFIG_2_0="$ac_cv_path_GTK_CONFIG_2_0" if test -n "$GTK_CONFIG_2_0"; then - echo "$as_me:9352: result: $GTK_CONFIG_2_0" >&5 -echo "${ECHO_T}$GTK_CONFIG_2_0" >&6 + echo "$ac_t""$GTK_CONFIG_2_0" 1>&6 else - echo "$as_me:9355: result: no" >&5 -echo "${ECHO_T}no" >&6 + echo "$ac_t""no" 1>&6 fi min_gtk_version=1.3.1 - echo "$as_me:9360: checking for GTK - version >= $min_gtk_version" >&5 -echo $ECHO_N "checking for GTK - version >= $min_gtk_version... $ECHO_C" >&6 + echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6 +echo "configure:9789: checking for GTK - version >= $min_gtk_version" >&5 no_gtk="" if test "$GTK_CONFIG_2_0" = "no" ; then no_gtk=yes @@ -9380,8 +9807,8 @@ echo $ECHO_N "checking for GTK - version >= $min_gtk_version... $ECHO_C" >&6 if test "$cross_compiling" = yes; then echo $ac_n "cross compiling; assumed OK... $ac_c" else - cat >conftest.$ac_ext <<_ACEOF -#line 9384 "configure" + cat > conftest.$ac_ext < @@ -9421,13 +9848,13 @@ main () } #if defined (GTK_MAJOR_VERSION) && defined (GTK_MINOR_VERSION) && defined (GTK_MICRO_VERSION) else if ((gtk_major_version != GTK_MAJOR_VERSION) || - (gtk_minor_version != GTK_MINOR_VERSION) || + (gtk_minor_version != GTK_MINOR_VERSION) || (gtk_micro_version != GTK_MICRO_VERSION)) { printf("*** GTK+ header files (version %d.%d.%d) do not match\n", - GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION); + GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION); printf("*** library (version %d.%d.%d)\n", - gtk_major_version, gtk_minor_version, gtk_micro_version); + gtk_major_version, gtk_minor_version, gtk_micro_version); } #endif /* defined (GTK_MAJOR_VERSION) ... */ else @@ -9443,7 +9870,7 @@ main () printf("\n*** An old version of GTK+ (%d.%d.%d) was found.\n", gtk_major_version, gtk_minor_version, gtk_micro_version); printf("*** You need a version of GTK+ newer than %d.%d.%d. The latest version of\n", - major, minor, micro); + major, minor, micro); printf("*** GTK+ is always available from ftp://ftp.gtk.org.\n"); printf("***\n"); printf("*** If you have already installed a sufficiently new version, this error\n"); @@ -9458,38 +9885,28 @@ main () return 1; } -_ACEOF -rm -f conftest$ac_exeext -if { (eval echo "$as_me:9463: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:9466: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:9468: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:9471: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then +EOF +if { (eval echo configure:9890: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +then : else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -no_gtk=yes + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -fr conftest* + no_gtk=yes fi -rm -f core core.* *.core conftest$ac_exeext conftest.$ac_ext +rm -fr conftest* fi + CFLAGS="$ac_save_CFLAGS" LIBS="$ac_save_LIBS" fi fi if test "x$no_gtk" = x ; then - echo "$as_me:9487: result: yes (version $gtk_config_major_version.$gtk_config_minor_version.$gtk_config_micro_version)" >&5 -echo "${ECHO_T}yes (version $gtk_config_major_version.$gtk_config_minor_version.$gtk_config_micro_version)" >&6 - WXGTK20=1 + echo "$ac_t""yes (version $gtk_config_major_version.$gtk_config_minor_version.$gtk_config_micro_version)" 1>&6 + wx_cv_lib_gtk=2.0 else - echo "$as_me:9491: result: no" >&5 -echo "${ECHO_T}no" >&6 + echo "$ac_t""no" 1>&6 if test "$GTK_CONFIG_2_0" = "no" ; then echo "*** The gtk-config-2.0 script installed by GTK could not be found" echo "*** If GTK was installed in PREFIX, make sure PREFIX/bin is in" @@ -9502,63 +9919,59 @@ echo "${ECHO_T}no" >&6 echo "*** Could not run GTK test program, checking why..." CFLAGS="$CFLAGS $GTK_CFLAGS" LIBS="$LIBS $GTK_LIBS" - cat >conftest.$ac_ext <<_ACEOF -#line 9506 "configure" + cat > conftest.$ac_ext < #include -int -main () -{ - return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:9521: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:9524: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:9527: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:9530: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then +int main() { + return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); +; return 0; } +EOF +if { (eval echo configure:9934: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* echo "*** The test program compiled, but did not run. This usually means" echo "*** that the run-time linker is not finding GTK or finding the wrong" echo "*** version of GTK. If it is not finding GTK, you'll need to set your" echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" echo "*** to the installed location Also, make sure you have run ldconfig if that" echo "*** is required on your system" - echo "***" + echo "***" echo "*** If you have an old version installed, it is best to remove it, although" echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" echo "***" echo "*** If you have a RedHat 5.0 system, you should remove the GTK package that" echo "*** came with the system with the command" echo "***" - echo "*** rpm --erase --nodeps gtk gtk-devel" + echo "*** rpm --erase --nodeps gtk gtk-devel" else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 - echo "*** The test program failed to compile or link. See the file config.log for the" + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + echo "*** The test program failed to compile or link. See the file config.log for the" echo "*** exact error that occured. This usually means GTK was incorrectly installed" echo "*** or that you have moved GTK since it was installed. In the latter case, you" - echo "*** may want to edit the gtk-config-2.0 script: $GTK_CONFIG_2_0" + echo "*** may want to edit the gtk-config-2.0 script: $GTK_CONFIG_2_0" fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest* CFLAGS="$ac_save_CFLAGS" LIBS="$ac_save_LIBS" fi fi GTK_CFLAGS="" GTK_LIBS="" + gthread + fi + + + rm -f conf.gtktest + + fi + if test -z "$wx_cv_lib_gtk"; 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 @@ -9574,45 +9987,43 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext # Extract the first word of "gtk-config", so it can be a program name with args. set dummy gtk-config; ac_word=$2 -echo "$as_me:9577: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_path_GTK_CONFIG+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:9992: 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 - [\\/]* | ?:[\\/]*) + 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. + ;; *) - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - if $as_executable_p "$ac_dir/$ac_word"; then - ac_cv_path_GTK_CONFIG="$ac_dir/$ac_word" - echo "$as_me:9594: found $ac_dir/$ac_word" >&5 - break -fi -done - + 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 - +GTK_CONFIG="$ac_cv_path_GTK_CONFIG" if test -n "$GTK_CONFIG"; then - echo "$as_me:9606: result: $GTK_CONFIG" >&5 -echo "${ECHO_T}$GTK_CONFIG" >&6 + echo "$ac_t""$GTK_CONFIG" 1>&6 else - echo "$as_me:9609: result: no" >&5 -echo "${ECHO_T}no" >&6 + echo "$ac_t""no" 1>&6 fi min_gtk_version=1.2.7 - echo "$as_me:9614: checking for GTK - version >= $min_gtk_version" >&5 -echo $ECHO_N "checking for GTK - version >= $min_gtk_version... $ECHO_C" >&6 + echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6 +echo "configure:10027: checking for GTK - version >= $min_gtk_version" >&5 no_gtk="" if test "$GTK_CONFIG" != "no" ; then GTK_CFLAGS=`$GTK_CONFIG --cflags` @@ -9624,8 +10035,8 @@ echo $ECHO_N "checking for GTK - version >= $min_gtk_version... $ECHO_C" >&6 if test "$cross_compiling" = yes; then echo $ac_n "cross compiling; assumed OK... $ac_c" else - cat >conftest.$ac_ext <<_ACEOF -#line 9628 "configure" + cat > conftest.$ac_ext < @@ -9657,44 +10068,40 @@ main () ((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro))); } -_ACEOF -rm -f conftest$ac_exeext -if { (eval echo "$as_me:9662: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:9665: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:9667: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:9670: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then +EOF +if { (eval echo configure:10073: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +then : else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -no_gtk=yes + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -fr conftest* + no_gtk=yes fi -rm -f core core.* *.core conftest$ac_exeext conftest.$ac_ext +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 "$as_me:9687: result: yes" >&5 -echo "${ECHO_T}yes" >&6 - WXGTK127=1 + echo "$ac_t""yes" 1>&6 + wx_cv_lib_gtk=1.2.7 else - echo "$as_me:9691: result: no" >&5 -echo "${ECHO_T}no" >&6 + echo "$ac_t""no" 1>&6 GTK_CFLAGS="" GTK_LIBS="" : fi + + + + fi + if test -z "$wx_cv_lib_gtk"; 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 @@ -9710,45 +10117,43 @@ echo "${ECHO_T}no" >&6 # Extract the first word of "gtk-config", so it can be a program name with args. set dummy gtk-config; ac_word=$2 -echo "$as_me:9713: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_path_GTK_CONFIG+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:10122: 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 - [\\/]* | ?:[\\/]*) + 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. + ;; *) - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - if $as_executable_p "$ac_dir/$ac_word"; then - ac_cv_path_GTK_CONFIG="$ac_dir/$ac_word" - echo "$as_me:9730: found $ac_dir/$ac_word" >&5 - break -fi -done - + 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 - +GTK_CONFIG="$ac_cv_path_GTK_CONFIG" if test -n "$GTK_CONFIG"; then - echo "$as_me:9742: result: $GTK_CONFIG" >&5 -echo "${ECHO_T}$GTK_CONFIG" >&6 + echo "$ac_t""$GTK_CONFIG" 1>&6 else - echo "$as_me:9745: result: no" >&5 -echo "${ECHO_T}no" >&6 + echo "$ac_t""no" 1>&6 fi min_gtk_version=1.2.3 - echo "$as_me:9750: checking for GTK - version >= $min_gtk_version" >&5 -echo $ECHO_N "checking for GTK - version >= $min_gtk_version... $ECHO_C" >&6 + echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6 +echo "configure:10157: checking for GTK - version >= $min_gtk_version" >&5 no_gtk="" if test "$GTK_CONFIG" != "no" ; then GTK_CFLAGS=`$GTK_CONFIG --cflags` @@ -9760,8 +10165,8 @@ echo $ECHO_N "checking for GTK - version >= $min_gtk_version... $ECHO_C" >&6 if test "$cross_compiling" = yes; then echo $ac_n "cross compiling; assumed OK... $ac_c" else - cat >conftest.$ac_ext <<_ACEOF -#line 9764 "configure" + cat > conftest.$ac_ext < @@ -9793,163 +10198,203 @@ main () ((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro))); } -_ACEOF -rm -f conftest$ac_exeext -if { (eval echo "$as_me:9798: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:9801: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:9803: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:9806: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then +EOF +if { (eval echo configure:10203: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +then : else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -no_gtk=yes + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -fr conftest* + no_gtk=yes fi -rm -f core core.* *.core conftest$ac_exeext conftest.$ac_ext +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 "$as_me:9823: result: yes" >&5 -echo "${ECHO_T}yes" >&6 - WXGTK12=1 + echo "$ac_t""yes" 1>&6 + wx_cv_lib_gtk=1.2.3 else - echo "$as_me:9827: result: no" >&5 -echo "${ECHO_T}no" >&6 + echo "$ac_t""no" 1>&6 GTK_CFLAGS="" GTK_LIBS="" : fi + + - fi + fi - rm -f conf.gtktest + if test -z "$wx_cv_lib_gtk"; then + wx_cv_lib_gtk=none + else + wx_cv_cflags_gtk=$GTK_CFLAGS + wx_cv_libs_gtk=$GTK_LIBS + fi + + +fi - if test "$WXGTK12" != 1 -a "$WXGTK20" != 1; then - { { echo "$as_me:9839: error: - Please check that gtk-config is in path, the directory - where GTK+ libraries are installed (returned by - 'gtk-config --libs' command) is in LD_LIBRARY_PATH or - equivalent variable and GTK+ is version 1.2.3 or above. - " >&5 -echo "$as_me: error: - Please check that gtk-config is in path, the directory - where GTK+ libraries are installed (returned by - 'gtk-config --libs' command) is in LD_LIBRARY_PATH or - equivalent variable and GTK+ is version 1.2.3 or above. - " >&2;} - { (exit 1); exit 1; }; } - fi - TOOLKIT_INCLUDE="$GTK_CFLAGS" + if test "$gtk_version_cached" = 1; then + echo "$ac_t""$wx_cv_lib_gtk" 1>&6 + fi + + case "$wx_cv_lib_gtk" in + 2.0) WXGTK20=1 + ;; + 1.2.7) WXGTK127=1 + WXGTK12=1 + ;; + 1.2.3) WXGTK12=1 + ;; + *) { echo "configure: error: +Please check that gtk-config is in path, the directory +where GTK+ libraries are installed (returned by +'gtk-config --libs' command) is in LD_LIBRARY_PATH or +equivalent variable and GTK+ is version 1.2.3 or above. + " 1>&2; exit 1; } + ;; + esac - GUI_TK_LIBRARY="$GTK_LIBS" + TOOLKIT_INCLUDE="$wx_cv_cflags_gtk" + GUI_TK_LIBRARY="$wx_cv_libs_gtk" - AFMINSTALL=afminstall - TOOLKIT=GTK - GUIDIST=GTK_DIST + AFMINSTALL=afminstall + TOOLKIT=GTK + GUIDIST=GTK_DIST - echo "$as_me:9862: checking for gdk_im_open in -lgdk" >&5 -echo $ECHO_N "checking for gdk_im_open in -lgdk... $ECHO_C" >&6 -if test "${ac_cv_lib_gdk_gdk_im_open+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + echo $ac_n "checking for gdk_im_open in -lgdk""... $ac_c" 1>&6 +echo "configure:10274: checking for gdk_im_open in -lgdk" >&5 +ac_lib_var=`echo gdk'_'gdk_im_open | 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_check_lib_save_LIBS=$LIBS + ac_save_LIBS="$LIBS" LIBS="-lgdk $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 9870 "configure" +cat > conftest.$ac_ext <&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:9892: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:9895: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:9898: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_gdk_gdk_im_open=yes -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_lib_gdk_gdk_im_open=no -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:9909: result: $ac_cv_lib_gdk_gdk_im_open" >&5 -echo "${ECHO_T}$ac_cv_lib_gdk_gdk_im_open" >&6 -if test $ac_cv_lib_gdk_gdk_im_open = yes; then - cat >>confdefs.h <<\EOF -#define HAVE_XIM 1 -EOF + builtin and then its argument prototype would still apply. */ +char gdk_im_open(); +int main() { +gdk_im_open() +; return 0; } +EOF +if { (eval echo configure:10293: \"$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 -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 + cat >> confdefs.h <<\EOF +#define HAVE_XIM 1 +EOF -if test "$wxUSE_WINE" = 1; then - echo "$as_me:9921: checking for WINE includes" >&5 -echo $ECHO_N "checking for WINE includes... $ECHO_C" >&6 +else + echo "$ac_t""no" 1>&6 +fi -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 - if test "$ac_find_includes" != "" ; then - echo "$as_me:9934: result: found $ac_find_includes" >&5 -echo "${ECHO_T}found $ac_find_includes" >&6 - TOOLKIT_INCLUDE="$TOOLKIT_INCLUDE -I$ac_find_includes" - else - echo "$as_me:9938: result: no" >&5 -echo "${ECHO_T}no" >&6 - { { echo "$as_me:9940: error: please set CFLAGS to contain the location of windows.h" >&5 -echo "$as_me: error: please set CFLAGS to contain the location of windows.h" >&2;} - { (exit 1); exit 1; }; } + if test "$wxUSE_MGL" = 1; then + + echo $ac_n "checking for SciTech MGL library""... $ac_c" 1>&6 +echo "configure:10321: checking for SciTech MGL library" >&5 + if test "x$MGL_ROOT" = x ; then + echo "$ac_t""not found" 1>&6 + { echo "configure: error: Cannot find MGL library. Make sure MGL_ROOT is set." 1>&2; exit 1; } + else + echo "$ac_t""$MGL_ROOT" 1>&6 + fi + + mgl_os=linux/gcc/glibc + mgl_lib_type="" + + if test "$wxUSE_DEBUG_FLAG" = yes ; then + if test -f $MGL_ROOT/lib/debug/$mgl_os/libmgl.a ; then + mgl_lib_type=debug + fi + fi + if test "x$mgl_lib_type" = x ; then + if test -f $MGL_ROOT/lib/release/$mgl_os/libmgl.a ; then + mgl_lib_type=release + else + { echo "configure: error: Cannot find MGL libraries, make sure they are compiled." 1>&2; exit 1; } + fi + fi + + TOOLKIT_INCLUDE="-I$MGL_ROOT/include" + GUI_TK_LIBRARY="-L$MGL_ROOT/lib/$mgl_lib_type/$mgl_os -lmgl -lmglcpp -lpm" + + AFMINSTALL=afminstall + TOOLKIT=MGL + GUIDIST=MGL_DIST fi - XPM_LINK="" - echo "$as_me:9946: checking for Xpm library" >&5 -echo $ECHO_N "checking for Xpm library... $ECHO_C" >&6 + if test "$wxUSE_WINE" = 1; then + ac_safe=`echo "windows.h" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for windows.h""... $ac_c" 1>&6 +echo "configure:10356: checking for windows.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:10366: \"$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 + : +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:10393: checking for Xpm library" >&5 + ac_find_libraries= for ac_dir in $SEARCH_LIB; do - for ac_extension in a so sl; do + for ac_extension in a so sl dylib; do if test -f "$ac_dir/libXpm.$ac_extension"; then ac_find_libraries=$ac_dir break 2 @@ -9957,30 +10402,27 @@ for ac_dir in $SEARCH_LIB; done done - if test "$ac_find_libraries" != "" ; then - GUI_TK_LIBRARY="-L$ac_find_libraries" - XPM_LINK="-lXpm" - cat >>confdefs.h <<\EOF + 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 - echo "$as_me:9967: result: found at $ac_find_libraries" >&5 -echo "${ECHO_T}found at $ac_find_libraries" >&6 - else - echo "$as_me:9970: result: no" >&5 -echo "${ECHO_T}no" >&6 - { echo "$as_me:9972: WARNING: library will be compiled without support for images in XPM format" >&5 -echo "$as_me: WARNING: library will be compiled without support for images in XPM format" >&2;} - fi - - MESA_LINK="" - echo "$as_me:9977: checking for Mesa library" >&5 -echo $ECHO_N "checking for Mesa library... $ECHO_C" >&6 + 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:10421: checking for Mesa library" >&5 + ac_find_libraries= for ac_dir in $SEARCH_LIB; do - for ac_extension in a so sl; do + for ac_extension in a so sl dylib; do if test -f "$ac_dir/libMesaGL.$ac_extension"; then ac_find_libraries=$ac_dir break 2 @@ -9988,32 +10430,34 @@ for ac_dir in $SEARCH_LIB; done done - if test "$ac_find_libraries" != "" ; then - GUI_TK_LIBRARY="$GUI_TK_LIBRARY -L$ac_find_libraries" - MESA_LINK="-lMesaGL" - echo "$as_me:9994: result: found at $ac_find_libraries" >&5 -echo "${ECHO_T}found at $ac_find_libraries" >&6 - else - { { echo "$as_me:9997: error: no" >&5 -echo "$as_me: error: no" >&2;} - { (exit 1); exit 1; }; } - fi + 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 - GUI_TK_LINK="-lwine $MESA_LINK $XPM_LINK -lXxf86dga -lXxf86vm -lSM -lICE -lXext -lXmu -lX11 -lncurses" - GUI_TK_LIBRARY="$GUI_TK_LIBRARY $GUI_TK_LINK" - WXWINE=1 - TOOLKIT=MSW - GUIDIST=MSW_DIST -fi + GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lwine $mesa_link $xpm_link -lXxf86dga -lXxf86vm -lSM -lICE -lXext -lXmu -lX11 -lncurses" + TOOLKIT=MSW + GUIDIST=MSW_DIST + TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D__WXWINE__" + fi -echo "$as_me:10009: checking for X" >&5 -echo $ECHO_N "checking for X... $ECHO_C" >&6 + 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:10454: checking for X" >&5 # Check whether --with-x or --without-x was given. if test "${with_x+set}" = set; then withval="$with_x" + : +fi -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. @@ -10023,16 +10467,16 @@ else # Both variables are already set. have_x=yes else - if test "${ac_cv_have_x+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +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 conftest.dir -if mkdir conftest.dir; then - cd conftest.dir +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' + cat > Imakefile <<'EOF' acfindx: @echo 'ac_im_incroot="${INCROOT}"; ac_im_usrlibdir="${USRLIBDIR}"; ac_im_libdir="${LIBDIR}"' EOF @@ -10042,155 +10486,174 @@ EOF # 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 + 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 + case "$ac_im_incroot" in /usr/include) ;; - *) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;; + *) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes="$ac_im_incroot" ;; esac - case $ac_im_usrlibdir in + case "$ac_im_usrlibdir" in /usr/lib | /lib) ;; - *) test -d "$ac_im_usrlibdir" && ac_x_libraries=$ac_im_usrlibdir ;; + *) test -d "$ac_im_usrlibdir" && ac_x_libraries="$ac_im_usrlibdir" ;; esac fi cd .. - rm -fr conftest.dir + rm -fr conftestdir fi -# Standard set of common directories for X headers. -# Check X11 before X11Rn because it is often a symlink to the current release. -ac_x_header_dirs=' -/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/X11R6 -/usr/local/include/X11R5 -/usr/local/include/X11R4 - -/usr/X386/include -/usr/x386/include -/usr/XFree86/include/X11 - -/usr/include -/usr/local/include -/usr/unsupported/include -/usr/athena/include -/usr/local/x11r5/include -/usr/lpp/Xamples/include - -/usr/openwin/include -/usr/openwin/share/include' - -if test "$ac_x_includes" = no; then - # Guess where to find include files, by looking for Intrinsic.h. +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 <<_ACEOF -#line 10106 "configure" +cat > conftest.$ac_ext < -_ACEOF -if { (eval echo "$as_me:10110: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:10116: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then +#include <$x_direct_test_include> +EOF +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (eval echo configure:10521: \"$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 "$as_me: failed program was:" >&5 + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - for ac_dir in $ac_x_header_dirs; do - if test -r "$ac_dir/X11/Intrinsic.h"; then - ac_x_includes=$ac_dir - break - fi -done + 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/X11R6 \ + /usr/local/include/X11R5 \ + /usr/local/include/X11R4 \ + \ + /usr/X386/include \ + /usr/x386/include \ + /usr/XFree86/include/X11 \ + \ + /usr/include \ + /usr/local/include \ + /usr/unsupported/include \ + /usr/athena/include \ + /usr/local/x11r5/include \ + /usr/lpp/Xamples/include \ + \ + /usr/openwin/include \ + /usr/openwin/share/include \ + ; \ + do + if test -r "$ac_dir/$x_direct_test_include"; then + ac_x_includes=$ac_dir + break + fi + done fi -rm -f conftest.err conftest.$ac_ext -fi # $ac_x_includes = no +rm -f conftest* +fi # $ac_x_includes = NO -if test "$ac_x_libraries" = no; then +if test "$ac_x_libraries" = NO; then # Check for the libraries. + + test -z "$x_direct_test_library" && x_direct_test_library=Xt + test -z "$x_direct_test_function" && x_direct_test_function=XtMalloc + # See if we find them without any special options. # Don't add to $LIBS permanently. - ac_save_LIBS=$LIBS - LIBS="-lXt $LIBS" - cat >conftest.$ac_ext <<_ACEOF -#line 10149 "configure" + ac_save_LIBS="$LIBS" + LIBS="-l$x_direct_test_library $LIBS" +cat > conftest.$ac_ext < -int -main () -{ -XtMalloc (0) - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:10161: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:10164: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:10167: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:10170: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - LIBS=$ac_save_LIBS + +int main() { +${x_direct_test_function}() +; return 0; } +EOF +if { (eval echo configure:10597: \"$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. ac_x_libraries= else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -LIBS=$ac_save_LIBS -for ac_dir in `echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g` + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + LIBS="$ac_save_LIBS" +# First see if replacing the include by lib works. +# Check X11 before X11Rn because it is often a symlink to the current release. +for ac_dir in `echo "$ac_x_includes" | sed s/include/lib/` \ + /usr/X11/lib \ + /usr/X11R6/lib \ + /usr/X11R5/lib \ + /usr/X11R4/lib \ + \ + /usr/lib/X11 \ + /usr/lib/X11R6 \ + /usr/lib/X11R5 \ + /usr/lib/X11R4 \ + \ + /usr/local/X11/lib \ + /usr/local/X11R6/lib \ + /usr/local/X11R5/lib \ + /usr/local/X11R4/lib \ + \ + /usr/local/lib/X11 \ + /usr/local/lib/X11R6 \ + /usr/local/lib/X11R5 \ + /usr/local/lib/X11R4 \ + \ + /usr/X386/lib \ + /usr/x386/lib \ + /usr/XFree86/lib/X11 \ + \ + /usr/lib \ + /usr/local/lib \ + /usr/unsupported/lib \ + /usr/athena/lib \ + /usr/local/x11r5/lib \ + /usr/lpp/Xamples/lib \ + /lib/usr/lib/X11 \ + \ + /usr/openwin/lib \ + /usr/openwin/share/lib \ + ; \ do - # Don't even attempt the hair of trying to link an X program! for ac_extension in a so sl; do - if test -r $ac_dir/libXt.$ac_extension; then + if test -r $ac_dir/lib${x_direct_test_library}.$ac_extension; then ac_x_libraries=$ac_dir break 2 fi done done fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -fi # $ac_x_libraries = no +rm -f conftest* +fi # $ac_x_libraries = NO -if test "$ac_x_includes" = no || test "$ac_x_libraries" = no; then +if test "$ac_x_includes" = NO || test "$ac_x_libraries" = NO; then # Didn't find X anywhere. Cache the known absence of X. ac_cv_have_x="have_x=no" else @@ -10199,14 +10662,12 @@ else ac_x_includes=$ac_x_includes ac_x_libraries=$ac_x_libraries" fi fi - fi eval "$ac_cv_have_x" fi # $with_x != no if test "$have_x" != yes; then - echo "$as_me:10208: result: $have_x" >&5 -echo "${ECHO_T}$have_x" >&6 + echo "$ac_t""$have_x" 1>&6 no_x=yes else # If each of the values was on the command line, it overrides each guess. @@ -10215,14 +10676,12 @@ else # Update the cache value to reflect the command line values. ac_cv_have_x="have_x=yes \ ac_x_includes=$x_includes ac_x_libraries=$x_libraries" - echo "$as_me:10218: result: libraries $x_libraries, headers $x_includes" >&5 -echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6 + echo "$ac_t""libraries $x_libraries, headers $x_includes" 1>&6 fi if test "$no_x" = yes; then # Not all programs may use this symbol, but it does not hurt to define it. - -cat >>confdefs.h <<\EOF + cat >> confdefs.h <<\EOF #define X_DISPLAY_MISSING 1 EOF @@ -10237,89 +10696,60 @@ else X_LIBS="$X_LIBS -L$x_libraries" # For Solaris; some versions of Sun CC require a space after -R and # others require no space. Words are not sufficient . . . . - case `(uname -sr) 2>/dev/null` in + case "`(uname -sr) 2>/dev/null`" in "SunOS 5"*) - echo "$as_me:10242: checking whether -R must be followed by a space" >&5 -echo $ECHO_N "checking whether -R must be followed by a space... $ECHO_C" >&6 - ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries" - cat >conftest.$ac_ext <<_ACEOF -#line 10246 "configure" + echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6 +echo "configure:10703: 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 - ac_status=$? - echo "$as_me:10261: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:10264: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:10267: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then +; return 0; } +EOF +if { (eval echo configure:10713: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* ac_R_nospace=yes else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_R_nospace=no + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + ac_R_nospace=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest* if test $ac_R_nospace = yes; then - echo "$as_me:10277: result: no" >&5 -echo "${ECHO_T}no" >&6 + echo "$ac_t""no" 1>&6 X_LIBS="$X_LIBS -R$x_libraries" else LIBS="$ac_xsave_LIBS -R $x_libraries" - cat >conftest.$ac_ext <<_ACEOF -#line 10283 "configure" + cat > conftest.$ac_ext <&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:10298: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:10301: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:10304: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then +; return 0; } +EOF +if { (eval echo configure:10736: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* ac_R_space=yes else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_R_space=no + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + ac_R_space=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest* if test $ac_R_space = yes; then - echo "$as_me:10314: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + echo "$ac_t""yes" 1>&6 X_LIBS="$X_LIBS -R $x_libraries" else - echo "$as_me:10318: result: neither works" >&5 -echo "${ECHO_T}neither works" >&6 + echo "$ac_t""neither works" 1>&6 fi fi - LIBS=$ac_xsave_LIBS + LIBS="$ac_xsave_LIBS" esac fi @@ -10330,737 +10760,538 @@ echo "${ECHO_T}neither works" >&6 if test "$ISC" = yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl_s -linet" else - # Martyn Johnson says this is needed for Ultrix, if the X - # libraries were built with DECnet support. And Karl Berry says + # Martyn.Johnson@cl.cam.ac.uk says this is needed for Ultrix, if the X + # libraries were built with DECnet support. And karl@cs.umb.edu says # the Alpha needs dnet_stub (dnet does not exist). - echo "$as_me:10336: checking for dnet_ntoa in -ldnet" >&5 -echo $ECHO_N "checking for dnet_ntoa in -ldnet... $ECHO_C" >&6 -if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6 +echo "configure:10768: 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 else - ac_check_lib_save_LIBS=$LIBS + ac_save_LIBS="$LIBS" LIBS="-ldnet $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 10344 "configure" +cat > conftest.$ac_ext <&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:10366: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:10369: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:10372: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_dnet_dnet_ntoa=yes -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_lib_dnet_dnet_ntoa=no -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:10383: result: $ac_cv_lib_dnet_dnet_ntoa" >&5 -echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6 -if test $ac_cv_lib_dnet_dnet_ntoa = yes; then + builtin and then its argument prototype would still apply. */ +char dnet_ntoa(); + +int main() { +dnet_ntoa() +; return 0; } +EOF +if { (eval echo configure:10787: \"$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 -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_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet" +else + echo "$ac_t""no" 1>&6 fi if test $ac_cv_lib_dnet_dnet_ntoa = no; then - echo "$as_me:10390: checking for dnet_ntoa in -ldnet_stub" >&5 -echo $ECHO_N "checking for dnet_ntoa in -ldnet_stub... $ECHO_C" >&6 -if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6 +echo "configure:10809: 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 else - ac_check_lib_save_LIBS=$LIBS + ac_save_LIBS="$LIBS" LIBS="-ldnet_stub $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 10398 "configure" +cat > conftest.$ac_ext <&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:10420: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:10423: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:10426: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_dnet_stub_dnet_ntoa=yes -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_lib_dnet_stub_dnet_ntoa=no -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:10437: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5 -echo "${ECHO_T}$ac_cv_lib_dnet_stub_dnet_ntoa" >&6 -if test $ac_cv_lib_dnet_stub_dnet_ntoa = yes; then + builtin and then its argument prototype would still apply. */ +char dnet_ntoa(); + +int main() { +dnet_ntoa() +; return 0; } +EOF +if { (eval echo configure:10828: \"$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 -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_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub" +else + echo "$ac_t""no" 1>&6 fi fi # msh@cis.ufl.edu says -lnsl (and -lsocket) are needed for his 386/AT, # to get the SysV transport functions. - # Chad R. Larson says the Pyramis MIS-ES running DC/OSx (SVR4) + # chad@anasazi.com says the Pyramis MIS-ES running DC/OSx (SVR4) # needs -lnsl. # The nsl library prevents programs from opening the X display - # on Irix 5.2, according to T.E. Dickey. - # The functions gethostbyname, getservbyname, and inet_addr are - # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking. - echo "$as_me:10453: checking for gethostbyname" >&5 -echo $ECHO_N "checking for gethostbyname... $ECHO_C" >&6 -if test "${ac_cv_func_gethostbyname+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line 10459 "configure" + # on Irix 5.2, according to dickey@clark.net. + echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6 +echo "configure:10857: 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 < /* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char gethostbyname (); -char (*f) (); + builtin and then its argument prototype would still apply. */ +char gethostbyname(); + +int main() { -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_gethostbyname) || defined (__stub___gethostbyname) choke me #else -f = gethostbyname; +gethostbyname(); #endif - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:10490: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:10493: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:10496: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:10499: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_func_gethostbyname=yes -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_func_gethostbyname=no -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -fi -echo "$as_me:10509: result: $ac_cv_func_gethostbyname" >&5 -echo "${ECHO_T}$ac_cv_func_gethostbyname" >&6 +; return 0; } +EOF +if { (eval echo configure:10885: \"$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 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_func_gethostbyname=no" +fi +rm -f conftest* +fi + +if eval "test \"`echo '$ac_cv_func_'gethostbyname`\" = yes"; then + echo "$ac_t""yes" 1>&6 + : +else + echo "$ac_t""no" 1>&6 +fi if test $ac_cv_func_gethostbyname = no; then - echo "$as_me:10513: checking for gethostbyname in -lnsl" >&5 -echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6 -if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 +echo "configure:10906: 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 else - ac_check_lib_save_LIBS=$LIBS + ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 10521 "configure" +cat > conftest.$ac_ext <&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:10543: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:10546: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:10549: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_nsl_gethostbyname=yes -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_lib_nsl_gethostbyname=no -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:10560: result: $ac_cv_lib_nsl_gethostbyname" >&5 -echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6 -if test $ac_cv_lib_nsl_gethostbyname = yes; then - X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl" -fi + builtin and then its argument prototype would still apply. */ +char gethostbyname(); - if test $ac_cv_lib_nsl_gethostbyname = no; then - echo "$as_me:10567: checking for gethostbyname in -lbsd" >&5 -echo $ECHO_N "checking for gethostbyname in -lbsd... $ECHO_C" >&6 -if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +int main() { +gethostbyname() +; return 0; } +EOF +if { (eval echo configure:10925: \"$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 - ac_check_lib_save_LIBS=$LIBS -LIBS="-lbsd $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 10575 "configure" -#include "confdefs.h" + 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" -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char gethostbyname (); -int -main () -{ -gethostbyname (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:10594: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:10597: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:10600: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:10603: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_bsd_gethostbyname=yes -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_lib_bsd_gethostbyname=no -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:10614: result: $ac_cv_lib_bsd_gethostbyname" >&5 -echo "${ECHO_T}$ac_cv_lib_bsd_gethostbyname" >&6 -if test $ac_cv_lib_bsd_gethostbyname = yes; then - X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd" +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl" +else + echo "$ac_t""no" 1>&6 fi - fi fi # lieder@skyler.mavd.honeywell.com says without -lsocket, # socket/setsockopt and other routines are undefined under SCO ODT # 2.0. But -lsocket is broken on IRIX 5.2 (and is not necessary - # on later versions), says Simon Leinen: it contains gethostby* - # variants that don't use the nameserver (or something). -lsocket - # must be given before -lnsl if both are needed. We assume that - # if connect needs -lnsl, so does gethostbyname. - echo "$as_me:10630: checking for connect" >&5 -echo $ECHO_N "checking for connect... $ECHO_C" >&6 -if test "${ac_cv_func_connect+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line 10636 "configure" + # on later versions), says simon@lia.di.epfl.ch: it contains + # gethostby* variants that don't use the nameserver (or something). + # -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:10955: 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 < /* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char connect (); -char (*f) (); + builtin and then its argument prototype would still apply. */ +char connect(); + +int main() { -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_connect) || defined (__stub___connect) choke me #else -f = connect; +connect(); #endif - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:10667: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:10670: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:10673: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:10676: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_func_connect=yes -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_func_connect=no -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -fi -echo "$as_me:10686: result: $ac_cv_func_connect" >&5 -echo "${ECHO_T}$ac_cv_func_connect" >&6 +; return 0; } +EOF +if { (eval echo configure:10983: \"$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 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_func_connect=no" +fi +rm -f conftest* +fi + +if eval "test \"`echo '$ac_cv_func_'connect`\" = yes"; then + echo "$ac_t""yes" 1>&6 + : +else + echo "$ac_t""no" 1>&6 +fi if test $ac_cv_func_connect = no; then - echo "$as_me:10690: checking for connect in -lsocket" >&5 -echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6 -if test "${ac_cv_lib_socket_connect+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6 +echo "configure:11004: 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 else - ac_check_lib_save_LIBS=$LIBS + ac_save_LIBS="$LIBS" LIBS="-lsocket $X_EXTRA_LIBS $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 10698 "configure" +cat > conftest.$ac_ext <&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:10720: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:10723: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:10726: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_socket_connect=yes -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_lib_socket_connect=no -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:10737: result: $ac_cv_lib_socket_connect" >&5 -echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6 -if test $ac_cv_lib_socket_connect = yes; then + builtin and then its argument prototype would still apply. */ +char connect(); + +int main() { +connect() +; return 0; } +EOF +if { (eval echo configure:11023: \"$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 -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_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS" +else + echo "$ac_t""no" 1>&6 fi fi - # Guillermo Gomez says -lposix is necessary on A/UX. - echo "$as_me:10746: checking for remove" >&5 -echo $ECHO_N "checking for remove... $ECHO_C" >&6 -if test "${ac_cv_func_remove+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + # gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX. + echo $ac_n "checking for remove""... $ac_c" 1>&6 +echo "configure:11047: 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 <<_ACEOF -#line 10752 "configure" + cat > conftest.$ac_ext < /* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char remove (); -char (*f) (); + builtin and then its argument prototype would still apply. */ +char remove(); + +int main() { -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_remove) || defined (__stub___remove) choke me #else -f = remove; +remove(); #endif - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:10783: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:10786: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:10789: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:10792: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_func_remove=yes -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_func_remove=no -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -fi -echo "$as_me:10802: result: $ac_cv_func_remove" >&5 -echo "${ECHO_T}$ac_cv_func_remove" >&6 +; return 0; } +EOF +if { (eval echo configure:11075: \"$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 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_func_remove=no" +fi +rm -f conftest* +fi + +if eval "test \"`echo '$ac_cv_func_'remove`\" = yes"; then + echo "$ac_t""yes" 1>&6 + : +else + echo "$ac_t""no" 1>&6 +fi if test $ac_cv_func_remove = no; then - echo "$as_me:10806: checking for remove in -lposix" >&5 -echo $ECHO_N "checking for remove in -lposix... $ECHO_C" >&6 -if test "${ac_cv_lib_posix_remove+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6 +echo "configure:11096: 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 else - ac_check_lib_save_LIBS=$LIBS + ac_save_LIBS="$LIBS" LIBS="-lposix $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 10814 "configure" +cat > conftest.$ac_ext <&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:10836: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:10839: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:10842: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_posix_remove=yes -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_lib_posix_remove=no -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:10853: result: $ac_cv_lib_posix_remove" >&5 -echo "${ECHO_T}$ac_cv_lib_posix_remove" >&6 -if test $ac_cv_lib_posix_remove = yes; then + builtin and then its argument prototype would still apply. */ +char remove(); + +int main() { +remove() +; return 0; } +EOF +if { (eval echo configure:11115: \"$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 -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_EXTRA_LIBS="$X_EXTRA_LIBS -lposix" +else + echo "$ac_t""no" 1>&6 fi fi # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. - echo "$as_me:10862: checking for shmat" >&5 -echo $ECHO_N "checking for shmat... $ECHO_C" >&6 -if test "${ac_cv_func_shmat+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + echo $ac_n "checking for shmat""... $ac_c" 1>&6 +echo "configure:11139: 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 <<_ACEOF -#line 10868 "configure" + cat > conftest.$ac_ext < /* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char shmat (); -char (*f) (); + builtin and then its argument prototype would still apply. */ +char shmat(); + +int main() { -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_shmat) || defined (__stub___shmat) choke me #else -f = shmat; +shmat(); #endif - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:10899: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:10902: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:10905: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:10908: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_func_shmat=yes -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_func_shmat=no -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -fi -echo "$as_me:10918: result: $ac_cv_func_shmat" >&5 -echo "${ECHO_T}$ac_cv_func_shmat" >&6 +; return 0; } +EOF +if { (eval echo configure:11167: \"$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 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_func_shmat=no" +fi +rm -f conftest* +fi + +if eval "test \"`echo '$ac_cv_func_'shmat`\" = yes"; then + echo "$ac_t""yes" 1>&6 + : +else + echo "$ac_t""no" 1>&6 +fi if test $ac_cv_func_shmat = no; then - echo "$as_me:10922: checking for shmat in -lipc" >&5 -echo $ECHO_N "checking for shmat in -lipc... $ECHO_C" >&6 -if test "${ac_cv_lib_ipc_shmat+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6 +echo "configure:11188: 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 else - ac_check_lib_save_LIBS=$LIBS + ac_save_LIBS="$LIBS" LIBS="-lipc $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 10930 "configure" +cat > conftest.$ac_ext <&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:10952: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:10955: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:10958: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_ipc_shmat=yes -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_lib_ipc_shmat=no -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:10969: result: $ac_cv_lib_ipc_shmat" >&5 -echo "${ECHO_T}$ac_cv_lib_ipc_shmat" >&6 -if test $ac_cv_lib_ipc_shmat = yes; then + builtin and then its argument prototype would still apply. */ +char shmat(); + +int main() { +shmat() +; return 0; } +EOF +if { (eval echo configure:11207: \"$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 -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_EXTRA_LIBS="$X_EXTRA_LIBS -lipc" +else + echo "$ac_t""no" 1>&6 fi fi fi # Check for libraries that X11R6 Xt/Xaw programs need. - ac_save_LDFLAGS=$LDFLAGS + ac_save_LDFLAGS="$LDFLAGS" test -n "$x_libraries" && LDFLAGS="$LDFLAGS -L$x_libraries" # SM needs ICE to (dynamically) link under SunOS 4.x (so we have to # check for ICE first), but we must link in the order -lSM -lICE or # we get undefined symbols. So assume we have SM if we have ICE. # These have to be linked with before -lX11, unlike the other # libraries we check for below, so use a different variable. - # John Interrante, Karl Berry - echo "$as_me:10987: checking for IceConnectionNumber in -lICE" >&5 -echo $ECHO_N "checking for IceConnectionNumber in -lICE... $ECHO_C" >&6 -if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS + # --interran@uluru.Stanford.EDU, kb@cs.umb.edu. + echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6 +echo "configure:11240: 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 <<_ACEOF -#line 10995 "configure" +cat > conftest.$ac_ext <&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:11017: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:11020: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:11023: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_ICE_IceConnectionNumber=yes -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_lib_ICE_IceConnectionNumber=no -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:11034: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5 -echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6 -if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then - X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE" -fi - - LDFLAGS=$ac_save_LDFLAGS + builtin and then its argument prototype would still apply. */ +char IceConnectionNumber(); +int main() { +IceConnectionNumber() +; return 0; } +EOF +if { (eval echo configure:11259: \"$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 -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" fi +rm -f conftest* +LIBS="$ac_save_LIBS" -CPPFLAGS="$CPPFLAGS $X_CFLAGS" -LDFLAGS="$LDFLAGS $X_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 -if test "$wxUSE_MOTIF" = 1; then - if test "$no_x" = "yes"; then - { { echo "$as_me:11049: error: X11 not found" >&5 -echo "$as_me: error: X11 not found" >&2;} - { (exit please use --x-includes and/or --x-libraries options); exit please use --x-includes and/or --x-libraries options; }; } - fi + LDFLAGS="$ac_save_LDFLAGS" - GUI_TK_LIBRARY="$X_LIBS" - TOOLKIT_INCLUDE="$X_CFLAGS" +fi - AFMINSTALL=afminstall - COMPILED_X_PROGRAM=0 + if test "$no_x" = "yes"; then + { echo "configure: error: X11 not found" 1>&2; exit 1; } + fi - echo "$as_me:11061: checking for Motif/Lesstif headers" >&5 -echo $ECHO_N "checking for Motif/Lesstif headers... $ECHO_C" >&6 + GUI_TK_LIBRARY="$X_LIBS" + TOOLKIT_INCLUDE="$X_CFLAGS" + AFMINSTALL=afminstall + COMPILED_X_PROGRAM=0 + echo $ac_n "checking for Motif/Lesstif headers""... $ac_c" 1>&6 +echo "configure:11294: checking for Motif/Lesstif headers" >&5 + ac_find_includes= for ac_dir in $SEARCH_INCLUDE; do @@ -11070,67 +11301,49 @@ for ac_dir in $SEARCH_INCLUDE; fi done - if test "$ac_find_includes" != "" ; then - echo "$as_me:11074: result: found $ac_find_includes" >&5 -echo "${ECHO_T}found $ac_find_includes" >&6 - else - cat >conftest.$ac_ext <<_ACEOF -#line 11078 "configure" + if test "$ac_find_includes" != "" ; then + echo "$ac_t""found $ac_find_includes" 1>&6 + else + cat > conftest.$ac_ext < - -int -main () -{ - - int version; - - version = xmUseVersion; - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:11096: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:11099: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:11102: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:11105: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - - echo "$as_me:11108: result: found in default search path" >&5 -echo "${ECHO_T}found in default search path" >&6 - COMPILED_X_PROGRAM=1 - -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 - - echo "$as_me:11116: result: no" >&5 -echo "${ECHO_T}no" >&6 - { { echo "$as_me:11118: error: please set CFLAGS to contain the location of Xm/Xm.h" >&5 -echo "$as_me: error: please set CFLAGS to contain the location of Xm/Xm.h" >&2;} - { (exit 1); exit 1; }; } - -fi -rm -f conftest.$ac_objext conftest.$ac_ext - fi + #include + +int main() { - if test "$COMPILED_X_PROGRAM" = 0; then - echo "$as_me:11127: checking for Motif/Lesstif library" >&5 -echo $ECHO_N "checking for Motif/Lesstif library... $ECHO_C" >&6 + int version; + version = xmUseVersion; + +; return 0; } +EOF +if { (eval echo configure:11321: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + + echo "$ac_t""found in default search path" 1>&6 + COMPILED_X_PROGRAM=1 + +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + + echo "$ac_t""no" 1>&6 + { echo "configure: error: please set CFLAGS to contain the location of Xm/Xm.h" 1>&2; exit 1; } + + +fi +rm -f conftest* + fi + if test "$COMPILED_X_PROGRAM" = 0; then + echo $ac_n "checking for Motif/Lesstif library""... $ac_c" 1>&6 +echo "configure:11342: checking for Motif/Lesstif library" >&5 + ac_find_libraries= for ac_dir in $SEARCH_LIB; do - for ac_extension in a so sl; do + for ac_extension in a so sl dylib; do if test -f "$ac_dir/libXm.$ac_extension"; then ac_find_libraries=$ac_dir break 2 @@ -11138,8 +11351,8 @@ for ac_dir in $SEARCH_LIB; done done - if test "$ac_find_libraries" != "" ; then - + if test "$ac_find_libraries" != "" ; then + ac_path_to_include=$ac_find_includes echo "$TOOLKIT_INCLUDE" | grep "\-I$ac_find_includes" > /dev/null result=$? @@ -11149,6 +11362,7 @@ for ac_dir in $SEARCH_LIB; ac_path_to_include="-I$ac_find_includes" fi + echo "$GUI_TK_LIBRARY" | grep "\-L$ac_find_libraries" > /dev/null result=$? if test $result = 0; then @@ -11157,69 +11371,52 @@ for ac_dir in $SEARCH_LIB; ac_path_to_link="-L$ac_find_libraries" fi - GUI_TK_LIBRARY="$GUI_TK_LIBRARY $ac_path_to_link" - TOOLKIT_INCLUDE="$TOOLKIT_INCLUDE $ac_path_to_include" - echo "$as_me:11162: result: found at $ac_find_libraries" >&5 -echo "${ECHO_T}found at $ac_find_libraries" >&6 - else - cat >conftest.$ac_ext <<_ACEOF -#line 11166 "configure" -#include "confdefs.h" - - #include - -int -main () -{ - - int version; - version = xmUseVersion; + GUI_TK_LIBRARY="$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 + cat > conftest.$ac_ext <&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:11187: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:11190: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:11193: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - - echo "$as_me:11196: result: found in default search path" >&5 -echo "${ECHO_T}found in default search path" >&6 - COMPILED_X_PROGRAM=1 + #include + +int main() { + int version; + version = xmUseVersion; + +; return 0; } +EOF +if { (eval echo configure:11393: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + + echo "$ac_t""found in default search path" 1>&6 + COMPILED_X_PROGRAM=1 + else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 - - echo "$as_me:11204: result: no" >&5 -echo "${ECHO_T}no" >&6 - { { echo "$as_me:11206: error: please set LDFLAGS to contain the location of libXm" >&5 -echo "$as_me: error: please set LDFLAGS to contain the location of libXm" >&2;} - { (exit 1); exit 1; }; } - + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + + echo "$ac_t""no" 1>&6 + { echo "configure: error: please set LDFLAGS to contain the location of libXm" 1>&2; exit 1; } + + fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest* + fi fi - fi - - XPM_LINK="" - echo "$as_me:11216: checking for Xpm library" >&5 -echo $ECHO_N "checking for Xpm library... $ECHO_C" >&6 + xpm_link="" + echo $ac_n "checking for Xpm library""... $ac_c" 1>&6 +echo "configure:11415: checking for Xpm library" >&5 + ac_find_libraries= for ac_dir in $SEARCH_LIB; do - for ac_extension in a so sl; do + for ac_extension in a so sl dylib; do if test -f "$ac_dir/libXpm.$ac_extension"; then ac_find_libraries=$ac_dir break 2 @@ -11227,8 +11424,8 @@ for ac_dir in $SEARCH_LIB; done done - if test "$ac_find_libraries" != "" ; then - + if test "$ac_find_libraries" != "" ; then + echo "$GUI_TK_LIBRARY" | grep "\-L$ac_find_libraries" > /dev/null result=$? if test $result = 0; then @@ -11237,124 +11434,120 @@ for ac_dir in $SEARCH_LIB; ac_path_to_link="-L$ac_find_libraries" fi - GUI_TK_LIBRARY="$GUI_TK_LIBRARY $ac_path_to_link" - XPM_LINK="-lXpm " - cat >>confdefs.h <<\EOF + GUI_TK_LIBRARY="$GUI_TK_LIBRARY $ac_path_to_link" + xpm_link="-lXpm " + cat >> confdefs.h <<\EOF #define wxHAVE_LIB_XPM 1 EOF - echo "$as_me:11246: result: found at $ac_find_libraries" >&5 -echo "${ECHO_T}found at $ac_find_libraries" >&6 - else - cat >conftest.$ac_ext <<_ACEOF -#line 11250 "configure" + echo "$ac_t""found at $ac_find_libraries" 1>&6 + else + cat > conftest.$ac_ext < - -int -main () -{ - - int version; + #include + +int main() { - version = XpmLibraryVersion(); - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:11268: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:11271: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:11274: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:11277: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - - XPM_LINK="-lXpm " - cat >>confdefs.h <<\EOF + int version; + version = XpmLibraryVersion(); + +; return 0; } +EOF +if { (eval echo configure:11459: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + + xpm_link="-lXpm " + cat >> confdefs.h <<\EOF #define wxHAVE_LIB_XPM 1 EOF - echo "$as_me:11285: result: found in default search path" >&5 -echo "${ECHO_T}found in default search path" >&6 - COMPILED_X_PROGRAM=0 - + echo "$ac_t""found in default search path" 1>&6 + COMPILED_X_PROGRAM=0 + else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 - - echo "$as_me:11293: result: no" >&5 -echo "${ECHO_T}no" >&6 - { echo "$as_me:11295: WARNING: library will be compiled without support for images in XPM format" >&5 -echo "$as_me: WARNING: library will be compiled without support for images in XPM format" >&2;} - + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + + echo "$ac_t""no" 1>&6 + echo "configure: warning: library will be compiled without support for images in XPM format" 1>&2 + + fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest* + fi + + GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lXm $xpm_link -lXmu -lXext -lXt -lX11" + TOOLKIT_VPATH="\${top_srcdir}/src/motif${PATH_IFS}\${top_srcdir}/src/motif/xmcombo" + TOOLKIT=MOTIF + GUIDIST=MOTIF_DIST fi - GUI_TK_LINK="-lXm $XPM_LINK -lXmu -lXext -lXt -lX11" - GUI_TK_LIBRARY="$GUI_TK_LIBRARY $GUI_TK_LINK" - TOOLKIT=MOTIF - GUIDIST=MOTIF_DIST -fi + if test "$wxUSE_MAC" = 1; then + if test "$wxUSE_PRECOMP" = "yes"; then + CPPFLAGS="${CPPFLAGS} -cpp-precomp" + fi + CPPFLAGS="${CPPFLAGS} -I/Developer/Headers/FlatCarbon -I\${top_srcdir}/src/mac/morefile" + CFLAGS="${CFLAGS} -fpascal-strings" + CXXFLAGS="${CXXFLAGS} -fpascal-strings" + TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -DTARGET_CARBON" + + TOOLKIT_VPATH="\${top_srcdir}/src/mac${PATH_IFS}\${top_srcdir}/src/mac/morefile" + TOOLKIT=MAC + GUIDIST=MACX_DIST + fi -if test "$wxUSE_MAC" = 1; then - TOOLKIT=MAC - GUIDIST=MACX_DIST -fi + if test "$wxUSE_PM" = 1; then + TOOLKIT=PM + GUIDIST=GTK_DIST + fi -if test "$wxUSE_PM" = 1; then - TOOLKIT=PM - GUIDIST=GTK_DIST -fi + if test "$TOOLKIT" = "PM" ; then + TOOLKIT_DIR="os2" + else + TOOLKIT_DIR=`echo ${TOOLKIT} | tr "[A-Z]" "[a-z]"` + fi -if test "$TOOLKIT" != "PM" ; then - TOOLKIT_DIR=`echo ${TOOLKIT} | tr "[A-Z]" "[a-z]"` -else - TOOLKIT_DIR="os2" -fi + PORT_FILES="\${top_srcdir}/src/\$(TOOLKITDIR)/files.lst" - if test "$wxUSE_DEBUG_FLAG" = "yes"; then - TOOLKIT_NAME="${TOOLKIT_DIR}d" + if test "$wxUSE_UNIVERSAL" = "yes"; then + ALL_OBJECTS="\$(GUI_LOWLEVEL_OBJS) \${UNIVOBJS}" + PORT_FILES="${PORT_FILES} \${top_srcdir}/src/univ/files.lst" + TOOLKIT_VPATH="\${top_srcdir}/src/univ${PATH_IFS}\${top_srcdir}/src/univ/themes${PATH_IFS}\${top_srcdir}/src/${TOOLKIT_DIR}" + TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D__WXUNIVERSAL__" + WIDGET_SET=univ else - TOOLKIT_NAME="${TOOLKIT_DIR}" + ALL_OBJECTS="\$(GUIOBJS)" fi - TOOLKIT_DEF="-D__WX${TOOLKIT}__" + ALL_OBJECTS="${ALL_OBJECTS} \$(COMMONOBJS) \$(GENERICOBJS)" - WX_LIBRARY="wx_${TOOLKIT_NAME}" + if test "$TOOLKIT" != "MSW"; then + ALL_OBJECTS="${ALL_OBJECTS} \$(UNIXOBJS)" + fi - ALL_OBJECTS="\$(GUIOBJS) \$(COMMONOBJS) \$(GENERICOBJS) \$(UNIXOBJS) \$(HTMLOBJS) \$(OGLOBJS)" + if test "$wxUSE_HTML" = "yes"; then + ALL_OBJECTS="${ALL_OBJECTS} \$(HTMLOBJS)" + fi if test "$TOOLKIT" != "MSW" -a "$wxUSE_ODBC" = "yes" ; then ALL_OBJECTS="${ALL_OBJECTS} \$(IODBCOBJS)" fi - - if test "$wxUSE_LIBJPEG" = "yes" ; then + if test "$wxUSE_LIBJPEG" = "builtin" ; then ALL_OBJECTS="${ALL_OBJECTS} \$(JPEGOBJS)" fi - if test "$wxUSE_LIBTIFF" = "yes" ; then + if test "$wxUSE_LIBTIFF" = "builtin" ; then ALL_OBJECTS="${ALL_OBJECTS} \$(TIFFOBJS)" fi - if test "$wxUSE_LIBPNG" = "yes" ; then + if test "$wxUSE_LIBPNG" = "builtin" ; then ALL_OBJECTS="${ALL_OBJECTS} \$(PNGOBJS)" fi - if test "$wxUSE_ZLIB" = "yes" ; then - ALL_OBJECTS="${ALL_OBJECTS} \$(ZLIBOBJS)" - fi - if test "$wxUSE_FREETYPE" = "yes" ; then + if test "$wxUSE_FREETYPE" = "builtin" ; then ALL_OBJECTS="${ALL_OBJECTS} \$(FREETYPEOBJS)" fi - ALL_DEPFILES="\$(GUIDEPS) \$(COMMONDEPS) \$(GENERICDEPS) \$(UNIXDEPS) \$(HTMLDEPS) \$(OGLDEPS)" - PORT_FILES="src/\$(TOOLKITDIR)/files.lst" RPM_FILES="src/\$(TOOLKITDIR)/rpmfiles.lst" RPM_SPEC="wx\$(TOOLKIT).spec" @@ -11363,734 +11556,884 @@ fi else USE_GUI=0 - TOOLKIT_DIR="base" + TOOLKIT_DIR="base" + + if test "$USE_WIN32" = 1 ; then + ALL_OBJECTS="\${BASE_OBJS} \${BASE_MSW_OBJS}" + TOOLKIT_VPATH="\${top_srcdir}/src/msw" + + TOOLKIT="MSW" + else + ALL_OBJECTS="\${BASE_OBJS} \${BASE_UNIX_OBJS}" + TOOLKIT_VPATH="\${top_srcdir}/src/unix" + fi + + PORT_FILES="\${top_srcdir}/src/files.lst" + RPM_FILES="src/rpmfiles.lst" + RPM_SPEC="wxBase.spec" + + GUIDIST="BASE_DIST" + DISTDIR="wxBase" +fi + +if test "$wxUSE_REGEX" = "builtin" ; then + ALL_OBJECTS="${ALL_OBJECTS} \$(REGEXOBJS)" +fi +if test "$wxUSE_ZLIB" = "builtin" ; then + ALL_OBJECTS="${ALL_OBJECTS} \$(ZLIBOBJS)" +fi + +if test "$wxUSE_OPENGL" = "yes"; then + if test "$wxUSE_MAC" = 1; then + cat >> confdefs.h <<\EOF +#define wxUSE_OPENGL 1 +EOF + + cat >> confdefs.h <<\EOF +#define wxUSE_GLCANVAS 1 +EOF + + OPENGL_LIBS="-framework OpenGL -framework AGL" + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS opengl" + else + ac_safe=`echo "GL/gl.h" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for GL/gl.h""... $ac_c" 1>&6 +echo "configure:11602: 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:11612: \"$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 + + cat >> confdefs.h <<\EOF +#define wxUSE_OPENGL 1 +EOF + + cat >> confdefs.h <<\EOF +#define wxUSE_GLCANVAS 1 +EOF + + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS opengl" + echo $ac_n "checking for glFlush in -lGL""... $ac_c" 1>&6 +echo "configure:11639: checking for glFlush in -lGL" >&5 +ac_lib_var=`echo GL'_'glFlush | 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="-lGL $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 + + OPENGL_LIBS="-lGL -lGLU" + +else + echo "$ac_t""no" 1>&6 + + echo $ac_n "checking for glFlush in -lMesaGL""... $ac_c" 1>&6 +echo "configure:11680: checking for glFlush in -lMesaGL" >&5 +ac_lib_var=`echo MesaGL'_'glFlush | 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="-lMesaGL $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 + + OPENGL_LIBS="-lMesaGL -lMesaGLU" + +else + echo "$ac_t""no" 1>&6 +fi + + +fi + + +else + echo "$ac_t""no" 1>&6 +wxUSE_OPENGL=0 +fi + + fi +fi + +if test -z "$TOOLKIT_VPATH" ; then + TOOLKIT_VPATH="\${top_srcdir}/src/${TOOLKIT_DIR}" +fi + +if test -n "$TOOLKIT" ; then + TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D__WX${TOOLKIT}__" +fi - if test "$wxUSE_DEBUG_FLAG" = "yes"; then - TOOLKIT_NAME="${TOOLKIT_DIR}d" - else - TOOLKIT_NAME="${TOOLKIT_DIR}" - fi +if test "$wxUSE_CYGWIN" = 1 ; then + TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D__WIN95__" +fi - TOOLKIT_DEF="-D__WXBASE__" +lib_unicode_suffix= +if test "$wxUSE_UNICODE" = "yes"; then + lib_unicode_suffix=u +fi - ALL_OBJECTS="\$(BASE_OBJS) \$(BASE_UNIX_OBJS)" - ALL_DEPFILES="\$(BASE_DEPS) \$(BASE_UNIX_DEPS)" +lib_debug_suffix= +if test "$wxUSE_DEBUG_FLAG" = "yes"; then + lib_debug_suffix=d + TOOLCHAIN_NAME="${TOOLCHAIN_NAME}d" +fi - if test "$wxUSE_ZLIB" = "yes" ; then - ALL_OBJECTS="${ALL_OBJECTS} \$(ZLIBOBJS)" - fi +TOOLCHAIN_NAME="${TOOLKIT_DIR}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}-${WX_RELEASE}" +TOOLCHAIN_NAME_GL="${TOOLKIT_DIR}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}_gl-${WX_RELEASE}" - WX_LIBRARY="wx_${TOOLKIT_NAME}" +if test "$cross_compiling" = "yes"; then + TOOLCHAIN_NAME="${TOOLCHAIN_NAME}-${host_alias}" + TOOLCHAIN_NAME_GL="${TOOLCHAIN_NAME_GL}-${host_alias}" +fi - PORT_FILES="src/files.lst" - RPM_FILES="src/rpmfiles.lst" - RPM_SPEC="wxBase.spec" +WX_LIBRARY="wx_${TOOLCHAIN_NAME}" +WX_LIBRARY_GL="wx_${TOOLCHAIN_NAME_GL}" - GUIDIST="BASE_DIST" - DISTDIR="wxBase" -fi +WXCONFIG_LIBS="-l${WX_LIBRARY}" -WX_LIBRARY_NAME="lib${WX_LIBRARY}.la" -WX_LIBRARY_NAME_GL="lib${WX_LIBRARY}_gl.la" +if test "$wxUSE_OPENGL" = "yes"; then + WXCONFIG_LIBS_GL="-l${WX_LIBRARY_GL} $OPENGL_LIBS" +fi WX_LIBRARY_NAME_STATIC="lib${WX_LIBRARY}.a" -WX_LIBRARY_NAME_STATIC_GL="lib${WX_LIBRARY}_gl.a" +WX_LIBRARY_NAME_STATIC_GL="lib${WX_LIBRARY_GL}.a" + +WX_LIBRARY_NAME_SHARED="lib${WX_LIBRARY}.${SO_SUFFIX}.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}" +WX_LIBRARY_NAME_SHARED_GL="lib${WX_LIBRARY_GL}.${SO_SUFFIX}.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}" -WX_LIBRARY_NAME_SHARED="lib${WX_LIBRARY}-${WX_RELEASE}.so.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}" -WX_LIBRARY_NAME_SHARED_GL="lib${WX_LIBRARY}_gl-${WX_RELEASE}.so.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}" +WX_LIBRARY_LINK1="lib${WX_LIBRARY}.${SO_SUFFIX}.${WX_CURRENT}" +WX_LIBRARY_LINK2="lib${WX_LIBRARY}.${SO_SUFFIX}" +WX_LIBRARY_LINK1_GL="lib${WX_LIBRARY_GL}.${SO_SUFFIX}.${WX_CURRENT}" +WX_LIBRARY_LINK2_GL="lib${WX_LIBRARY_GL}.${SO_SUFFIX}" -WX_LIBRARY_LINK1="lib${WX_LIBRARY}-${WX_RELEASE}.so.${WX_CURRENT}" -WX_LIBRARY_LINK2="lib${WX_LIBRARY}-${WX_RELEASE}.so" -WX_LIBRARY_LINK3="lib${WX_LIBRARY}.so" -WX_LIBRARY_LINK1_GL="lib${WX_LIBRARY}_gl-${WX_RELEASE}.so.${WX_CURRENT}" -WX_LIBRARY_LINK2_GL="lib${WX_LIBRARY}_gl-${WX_RELEASE}.so" -WX_LIBRARY_LINK3_GL="lib${WX_LIBRARY}_gl.so" +WX_RESOURCES_MACOSX="lib${WX_LIBRARY}.rsrc" +WX_RESOURCES_MACOSX_COMPILED="lib${WX_LIBRARY}.r" -SHARED_LD= -PIC_FLAG= -WX_ALL= -WX_ALL_INSTALLED= -BURNT_LIBRARY_NAME= -WX_TARGET_LIBRARY_SONAME= if test "$wxUSE_SHARED" = "yes"; then + + if test "$wxUSE_OPENGL" = "yes"; then + WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS CREATE_INSTALLED_LINKS_GL" + WX_ALL="\$(build_libdir)/${WX_LIBRARY_LINK1} \$(build_libdir)/${WX_LIBRARY_LINK1_GL}" + else + WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS" + WX_ALL="\$(build_libdir)/${WX_LIBRARY_LINK1}" + fi + + if test "$GCC" = "yes"; then + PIC_FLAG="-fPIC" + fi + + SHARED_LD="${CXX} -shared -o" + case "${host}" in *-hp-hpux* ) - if test "$GCC" = yes ; then - SHARED_LD="${CC} -shared -fPIC -o" - PIC_FLAG="-fPIC" - else + if test "$GCC" != "yes"; then LDFLAGS="-L/usr/lib" SHARED_LD="${CXX} -b -o" PIC_FLAG="+Z" fi - WX_LIBRARY_NAME_SHARED="libwx_${TOOLKIT_NAME}.sl" - WX_LIBRARY_NAME_SHARED_GL="libwx_${TOOLKIT_NAME}_gl.sl" - if test "$wxUSE_OPENGL" = "yes"; then + + if test "$wxUSE_OPENGL" = "yes"; then WX_ALL_INSTALLED="preinstall_gl" - WX_ALL="${WX_LIBRARY_NAME_SHARED} ${WX_LIBRARY_NAME_SHARED_GL}" + WX_ALL="\$(build_libdir)/${WX_LIBRARY_NAME_SHARED} \$(build_libdir)/${WX_LIBRARY_NAME_SHARED_GL}" else - WX_ALL="${WX_LIBRARY_NAME_SHARED}" + WX_ALL="\$(build_libdir)/${WX_LIBRARY_NAME_SHARED}" fi ;; - *-*-linux* ) - SHARED_LD="${CC} -shared -o" - PIC_FLAG="-fPIC" - if test "$wxUSE_BURNT_NAME" = "yes" ; then - BURNT_LIBRARY_NAME="-Wl,-soname,${WX_LIBRARY_LINK1}" - BURNT_LIBRARY_NAME_GL="-Wl,-soname,${WX_LIBRARY_LINK1_GL}" - WX_TARGET_LIBRARY_SONAME="-Wl,-soname,\$(TARGETLIB_LINK1)" - fi - if test "$wxUSE_OPENGL" = "yes"; then - WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS CREATE_INSTALLED_LINKS_GL" - WX_ALL="CREATE_LINKS CREATE_LINKS_GL" - else - WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS" - WX_ALL="CREATE_LINKS" - fi - ;; - *-*-irix5* | *-*-irix6* ) - if test "$GCC" = yes ; then - SHARED_LD="${CC} -shared -o" - PIC_FLAG="-fPIC" - else - SHARED_LD="${CXX} -shared -o" + *-*-linux* ) + if test "$GCC" != "yes"; then + echo $ac_n "checking for Intel compiler""... $ac_c" 1>&6 +echo "configure:11824: checking for Intel compiler" >&5 +if eval "test \"`echo '$''{'wx_cv_prog_icc'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + wx_cv_prog_icc=yes +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + wx_cv_prog_icc=no + +fi +rm -f conftest* + +fi + +echo "$ac_t""$wx_cv_prog_icc" 1>&6 + if test "$wx_cv_prog_icc" = "yes"; then + PIC_FLAG="-KPIC" + fi fi - if test "$wxUSE_OPENGL" = "yes"; then - WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS CREATE_INSTALLED_LINKS_GL" - WX_ALL="CREATE_LINKS CREATE_LINKS_GL" - else - WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS" - WX_ALL="CREATE_LINKS" + + if test "$wxUSE_SONAME" = "yes" ; then + SONAME_FLAGS="-Wl,-soname,${WX_LIBRARY_LINK1}" + SONAME_FLAGS_GL="-Wl,-soname,${WX_LIBRARY_LINK1_GL}" + WX_TARGET_LIBRARY_SONAME="-Wl,-soname,\$(TARGETLIB_LINK1)" fi ;; + *-*-solaris2* ) if test "$GCC" = yes ; then - SHARED_LD="${CC} -shared -o" - PIC_FLAG="-fPIC" - CPPFLAGS="$CPPFLAGS -isystem /usr/openwin/include" else SHARED_LD="${CXX} -G -o" PIC_FLAG="-KPIC" - fi - if test "$wxUSE_OPENGL" = "yes"; then - WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS CREATE_INSTALLED_LINKS_GL" - WX_ALL="CREATE_LINKS CREATE_LINKS_GL" - else - WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS" - WX_ALL="CREATE_LINKS" - fi - ;; - *-*-sunos4* ) - SHARED_LD="${CC} -shared -o" - PIC_FLAG="-fPIC" - WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS" - WX_ALL="CREATE_LINKS" - ;; - *-*-freebsd* | *-*-openbsd* | *-*-netbsd* ) - SHARED_LD="${CC} -shared -o" - PIC_FLAG="-fPIC" - if test "$wxUSE_OPENGL" = "yes"; then - WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS CREATE_INSTALLED_LINKS_GL" - WX_ALL="CREATE_LINKS CREATE_LINKS_GL" - else - WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS" - WX_ALL="CREATE_LINKS" + SONAME_FLAGS="-h ${WX_LIBRARY_NAME_SHARED}" + SONAME_FLAGS_GL="-h ${WX_LIBRARY_NAME_SHARED}" fi ;; + *-*-darwin* ) + CFLAGS="${CFLAGS} -fno-common" + CXXFLAGS="${CXXFLAGS} -fno-common" SHARED_LD="${CXX} -dynamiclib -o" PIC_FLAG="-dynamic -fPIC" - if test "$wxUSE_OPENGL" = "yes"; then - WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS CREATE_INSTALLED_LINKS_GL" - WX_ALL="CREATE_LINKS CREATE_LINKS_GL" - else - WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS" - WX_ALL="CREATE_LINKS" - fi - WX_ALL="${WX_ALL} ./lib/lib${WX_LIBRARY}-${WX_RELEASE}.r" - WX_LIBRARY_NAME_SHARED="lib${WX_LIBRARY}-${WX_RELEASE}.dylib.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}" - WX_LIBRARY_NAME_SHARED_GL="lib${WX_LIBRARY}_gl-${WX_RELEASE}.dylib.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}" - WX_LIBRARY_LINK1="lib${WX_LIBRARY}-${WX_RELEASE}.dylib.${WX_CURRENT}" - WX_LIBRARY_LINK2="lib${WX_LIBRARY}-${WX_RELEASE}.dylib" - WX_LIBRARY_LINK3="lib${WX_LIBRARY}.dylib" - WX_LIBRARY_LINK1_GL="lib${WX_LIBRARY}_gl-${WX_RELEASE}.dylib.${WX_CURRENT}" - WX_LIBRARY_LINK2_GL="lib${WX_LIBRARY}_gl-${WX_RELEASE}.dylib" - WX_LIBRARY_LINK3_GL="lib${WX_LIBRARY}_gl.dylib" - ;; - *-*-osf* ) - SHARED_LD="${CXX} -shared -o" - PIC_FLAG="-fPIC" - WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS" - WX_ALL="CREATE_LINKS" - ;; - *-*-dgux5* ) - SHARED_LD="${CXX} -shared -o" - PIC_FLAG="-fPIC" - WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS" - WX_ALL="CREATE_LINKS" - ;; - *-*-sysv5* ) - SHARED_LD="${CC} -shared -o" - PIC_FLAG="-fPIC" - WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS" - WX_ALL="CREATE_LINKS" ;; + *-*-aix* ) SHARED_LD="/usr/lpp/xlC/bin/makeC++SharedLib -p 0 -o" - WX_ALL=${WX_LIBRARY_NAME_SHARED} - ;; - *-*-cygwin* ) - WX_TARGET_LIBRARY="${WX_LIBRARY_NAME_STATIC}" - WX_TARGET_LIBRARY_GL="${WX_LIBRARY_NAME_STATIC_GL}" - if test "$wxUSE_OPENGL" = "yes"; then - WX_ALL_INSTALLED="preinstall_gl" - WX_ALL="${WX_LIBRARY_NAME_STATIC} ${WX_LIBRARY_NAME_STATIC_GL}" - else - WX_ALL="${WX_LIBRARY_NAME_STATIC}" - fi ;; - *-*-mingw32* ) - WX_TARGET_LIBRARY="${WX_LIBRARY_NAME_STATIC}" - WX_TARGET_LIBRARY_GL="${WX_LIBRARY_NAME_STATIC_GL}" - if test "$wxUSE_OPENGL" = "yes"; then + + *-*-cygwin* | *-*-mingw32* ) + WX_LIBRARY="wxmsw${WX_MAJOR_VERSION_NUMBER}${WX_MINOR_VERSION_NUMBER}${WX_RELEASE_NUMBER}${lib_unicode_suffix}${lib_debug_suffix}" + WX_LIBRARY_NAME_SHARED="${WX_LIBRARY}.dll" + WX_LIBRARY_NAME_STATIC="lib${WX_LIBRARY}.a" + WXCONFIG_LIBS="-l${WX_LIBRARY}" + SHARED_LD="${CXX} -shared -Wl,--out-implib,lib/${WX_LIBRARY_NAME_STATIC} -o" + TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -DWXUSINGDLL=1" + WXMSW_DLL_DEFINES="-UWXUSINGDLL -DWXMAKINGDLL=1 -D_DLL=1 -D_WINDLL=1" + + if test "$wxUSE_OPENGL" = "yes"; then WX_ALL_INSTALLED="preinstall_gl" - WX_ALL="${WX_LIBRARY_NAME_STATIC} ${WX_LIBRARY_NAME_STATIC_GL}" + WX_ALL="\$(build_libdir)/${WX_LIBRARY_NAME_SHARED} \$(build_libdir)/${WX_LIBRARY_NAME_SHARED_GL}" else - WX_ALL="${WX_LIBRARY_NAME_STATIC}" + WX_ALL="\$(build_libdir)/${WX_LIBRARY_NAME_SHARED}" fi + PIC_FLAG= ;; - *-pc-os2_emx ) - WX_TARGET_LIBRARY="${WX_LIBRARY_NAME_STATIC}" - WX_ALL="${WX_LIBRARY_NAME_STATIC}" + + *-pc-os2_emx | *-pc-os2-emx ) + wxUSE_SHARED=no ;; + *-*-beos* ) SHARED_LD="${LD} -shared -o" - PIC_FLAG="-fPIC" - WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS" - WX_ALL="CREATE_LINKS" ;; + + *-*-freebsd* | *-*-openbsd* | *-*-netbsd* | \ + *-*-sunos4* | \ + *-*-irix5* | *-*-irix6* | \ + *-*-osf* | \ + *-*-dgux5* | \ + *-*-sysv5* ) + ;; + *) - { { echo "$as_me:11577: error: unknown system type ${host}." >&5 -echo "$as_me: error: unknown system type ${host}." >&2;} - { (exit 1); exit 1; }; } + { echo "configure: error: unknown system type $host." 1>&2; exit 1; } esac if test "x$WX_TARGET_LIBRARY" = "x"; then WX_TARGET_LIBRARY="${WX_LIBRARY_NAME_SHARED}" WX_TARGET_LIBRARY_GL="${WX_LIBRARY_NAME_SHARED_GL}" fi + WX_TARGET_LIBRARY_TYPE="so" -else - WX_TARGET_LIBRARY="${WX_LIBRARY_NAME_STATIC}" - WX_TARGET_LIBRARY_GL="${WX_LIBRARY_NAME_STATIC_GL}" +fi + +if test "$wxUSE_SHARED" = "no"; then + + if test "$wxUSE_GUI" = "no" -o "$USE_WIN32" = 1 ; then + WX_ALL_INSTALLED="${WX_ALL_INSTALLED} preinstall" + fi + + if test "$wxUSE_MAC" = 1; then + WX_ALL_INSTALLED="${WX_ALL_INSTALLED} preinstall" + fi if test "$wxUSE_OPENGL" = "yes"; then - WX_ALL_INSTALLED="preinstall_gl" - WX_ALL="${WX_LIBRARY_NAME_STATIC} ${WX_LIBRARY_NAME_STATIC_GL}" + WX_ALL_INSTALLED="${WX_ALL_INSTALLED} preinstall_gl" + WX_ALL="\$(build_libdir)/${WX_LIBRARY_NAME_STATIC} \$(build_libdir)/${WX_LIBRARY_NAME_STATIC_GL}" else - WX_ALL="${WX_LIBRARY_NAME_STATIC}" + WX_ALL="\$(build_libdir)/${WX_LIBRARY_NAME_STATIC}" fi - if test "$wxUSE_GUI" = "no"; then - WX_ALL_INSTALLED="${WX_ALL_INSTALLED} preinstall" - fi + WX_TARGET_LIBRARY="${WX_LIBRARY_NAME_STATIC}" + WX_TARGET_LIBRARY_GL="${WX_LIBRARY_NAME_STATIC_GL}" WX_TARGET_LIBRARY_TYPE="a" fi -for ac_header in strings.h -do -ac_ac_Header=`echo "ac_cv_header_$ac_header" | $ac_tr_sh` -echo "$as_me:11608: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$ac_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line 11614 "configure" -#include "confdefs.h" -#include <$ac_header> -_ACEOF -if { (eval echo "$as_me:11618: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:11624: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - else - ac_cpp_err= - fi +if test "$wxUSE_MAC" = 1; then + WX_ALL="${WX_ALL} \$(build_libdir)/lib${WX_LIBRARY}.r" + WX_ALL_INSTALLED="${WX_ALL_INSTALLED} preinstall_res" + # Extract the first word of "Rez", so it can be a program name with args. +set dummy Rez; ac_word=$2 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:11965: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_RESCOMP'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test -n "$RESCOMP"; then + ac_cv_prog_RESCOMP="$RESCOMP" # 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_RESCOMP="Rez" + break + fi + done + IFS="$ac_save_ifs" + test -z "$ac_cv_prog_RESCOMP" && ac_cv_prog_RESCOMP="/Developer/Tools/Rez" +fi +fi +RESCOMP="$ac_cv_prog_RESCOMP" +if test -n "$RESCOMP"; then + echo "$ac_t""$RESCOMP" 1>&6 else - ac_cpp_err=yes + echo "$ac_t""no" 1>&6 fi -if test -z "$ac_cpp_err"; then - eval "$ac_ac_Header=yes" + + # Extract the first word of "Derez", so it can be a program name with args. +set dummy Derez; ac_word=$2 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:11995: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_DEREZ'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 else - echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 - eval "$ac_ac_Header=no" + if test -n "$DEREZ"; then + ac_cv_prog_DEREZ="$DEREZ" # 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_DEREZ="Derez" + break + fi + done + IFS="$ac_save_ifs" + test -z "$ac_cv_prog_DEREZ" && ac_cv_prog_DEREZ="/Developer/Tools/Derez" fi -rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:11643: result: `eval echo '${'$ac_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$ac_ac_Header'}'`" >&6 -if test `eval echo '${'$ac_ac_Header'}'` = yes; then - cat >>confdefs.h <&6 +else + echo "$ac_t""no" 1>&6 +fi + LIBWXMACRES="\$(top_builddir)/lib/lib${WX_LIBRARY}.r" + LIBWXMACRESCOMP="\$(RESCOMP) Carbon.r -t APPL ${LIBWXMACRES} -o \$(BIN_PROGRAM)" + LIBWXMACRESWXCONFIG="${RESCOMP} Carbon.r -t APPL \${prefix}/lib/${WX_RESOURCES_MACOSX_COMPILED} -o" fi -done -for ac_header in stdlib.h + +if test "$wxUSE_MAC" != 1; then + for ac_hdr in strings.h do -ac_ac_Header=`echo "ac_cv_header_$ac_header" | $ac_tr_sh` -echo "$as_me:11656: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$ac_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line 11662 "configure" +ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +echo "configure:12033: 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 < -_ACEOF -if { (eval echo "$as_me:11666: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:11672: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - eval "$ac_ac_Header=yes" +#include <$ac_hdr> +EOF +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (eval echo configure:12043: \"$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 "$as_me: failed program was:" >&5 + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - eval "$ac_ac_Header=no" + rm -rf conftest* + eval "ac_cv_header_$ac_safe=no" fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest* fi -echo "$as_me:11691: result: `eval echo '${'$ac_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$ac_ac_Header'}'`" >&6 -if test `eval echo '${'$ac_ac_Header'}'` = yes; then - cat >>confdefs.h <&6 + ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` + cat >> confdefs.h <&6 fi done -for ac_header in unistd.h +fi + +for ac_hdr in stdlib.h do -ac_ac_Header=`echo "ac_cv_header_$ac_header" | $ac_tr_sh` -echo "$as_me:11704: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$ac_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line 11710 "configure" +ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +echo "configure:12075: 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 < -_ACEOF -if { (eval echo "$as_me:11714: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:11720: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - eval "$ac_ac_Header=yes" +#include <$ac_hdr> +EOF +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (eval echo configure:12085: \"$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 "$as_me: failed program was:" >&5 + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - eval "$ac_ac_Header=no" + rm -rf conftest* + eval "ac_cv_header_$ac_safe=no" fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest* fi -echo "$as_me:11739: result: `eval echo '${'$ac_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$ac_ac_Header'}'`" >&6 -if test `eval echo '${'$ac_ac_Header'}'` = yes; then - cat >>confdefs.h <&6 + ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` + cat >> confdefs.h <&6 fi done -for ac_header in wchar.h +for ac_hdr in unistd.h do -ac_ac_Header=`echo "ac_cv_header_$ac_header" | $ac_tr_sh` -echo "$as_me:11752: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$ac_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line 11758 "configure" +ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +echo "configure:12115: 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 < -_ACEOF -if { (eval echo "$as_me:11762: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:11768: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - eval "$ac_ac_Header=yes" +#include <$ac_hdr> +EOF +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (eval echo configure:12125: \"$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 "$as_me: failed program was:" >&5 + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - eval "$ac_ac_Header=no" + rm -rf conftest* + eval "ac_cv_header_$ac_safe=no" fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest* fi -echo "$as_me:11787: result: `eval echo '${'$ac_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$ac_ac_Header'}'`" >&6 -if test `eval echo '${'$ac_ac_Header'}'` = yes; then - cat >>confdefs.h <&6 + ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` + cat >> confdefs.h <&6 fi done -for ac_header in wcstr.h +for ac_hdr in wchar.h do -ac_ac_Header=`echo "ac_cv_header_$ac_header" | $ac_tr_sh` -echo "$as_me:11800: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$ac_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line 11806 "configure" +ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +echo "configure:12155: 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 < -_ACEOF -if { (eval echo "$as_me:11810: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:11816: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - eval "$ac_ac_Header=yes" +#include <$ac_hdr> +EOF +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (eval echo configure:12165: \"$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 "$as_me: failed program was:" >&5 + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - eval "$ac_ac_Header=no" + rm -rf conftest* + eval "ac_cv_header_$ac_safe=no" fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest* fi -echo "$as_me:11835: result: `eval echo '${'$ac_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$ac_ac_Header'}'`" >&6 -if test `eval echo '${'$ac_ac_Header'}'` = yes; then - cat >>confdefs.h <&6 + ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` + cat >> confdefs.h <&6 fi done -for ac_header in fnmatch.h +for ac_hdr in wcstr.h do -ac_ac_Header=`echo "ac_cv_header_$ac_header" | $ac_tr_sh` -echo "$as_me:11848: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$ac_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line 11854 "configure" +ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +echo "configure:12195: 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 < -_ACEOF -if { (eval echo "$as_me:11858: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:11864: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - eval "$ac_ac_Header=yes" +#include <$ac_hdr> +EOF +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (eval echo configure:12205: \"$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 "$as_me: failed program was:" >&5 + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - eval "$ac_ac_Header=no" + rm -rf conftest* + eval "ac_cv_header_$ac_safe=no" fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest* fi -echo "$as_me:11883: result: `eval echo '${'$ac_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$ac_ac_Header'}'`" >&6 -if test `eval echo '${'$ac_ac_Header'}'` = yes; then - cat >>confdefs.h <&6 + ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` + cat >> confdefs.h <&6 fi done -for ac_header in iconv.h +for ac_hdr in fnmatch.h do -ac_ac_Header=`echo "ac_cv_header_$ac_header" | $ac_tr_sh` -echo "$as_me:11896: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$ac_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line 11902 "configure" +ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +echo "configure:12235: 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 < -_ACEOF -if { (eval echo "$as_me:11906: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:11912: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - eval "$ac_ac_Header=yes" +#include <$ac_hdr> +EOF +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (eval echo configure:12245: \"$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 "$as_me: failed program was:" >&5 + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - eval "$ac_ac_Header=no" + rm -rf conftest* + eval "ac_cv_header_$ac_safe=no" fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest* fi -echo "$as_me:11931: result: `eval echo '${'$ac_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$ac_ac_Header'}'`" >&6 -if test `eval echo '${'$ac_ac_Header'}'` = yes; then - cat >>confdefs.h <&6 + ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` + cat >> confdefs.h <&6 fi done -for ac_header in langinfo.h +for ac_hdr in iconv.h do -ac_ac_Header=`echo "ac_cv_header_$ac_header" | $ac_tr_sh` -echo "$as_me:11944: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$ac_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line 11950 "configure" +ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +echo "configure:12275: 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 < -_ACEOF -if { (eval echo "$as_me:11954: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:11960: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - else - ac_cpp_err= - fi +#include <$ac_hdr> +EOF +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (eval echo configure:12285: \"$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 -if test -z "$ac_cpp_err"; then - eval "$ac_ac_Header=yes" +done + +for ac_hdr in langinfo.h +do +ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +echo "configure:12315: 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:12325: \"$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 "$as_me: failed program was:" >&5 + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - eval "$ac_ac_Header=no" + rm -rf conftest* + eval "ac_cv_header_$ac_safe=no" fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest* fi -echo "$as_me:11979: result: `eval echo '${'$ac_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$ac_ac_Header'}'`" >&6 -if test `eval echo '${'$ac_ac_Header'}'` = yes; then - cat >>confdefs.h <&6 + ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` + cat >> confdefs.h <&6 fi done + if test "$wxUSE_GUI" = "yes"; then if test "$wxUSE_UNIX" = "yes"; then - -for ac_header in X11/XKBlib.h + for ac_hdr in X11/XKBlib.h do -ac_ac_Header=`echo "ac_cv_header_$ac_header" | $ac_tr_sh` -echo "$as_me:11995: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$ac_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line 12001 "configure" +ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +echo "configure:12358: 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 < -_ACEOF -if { (eval echo "$as_me:12005: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:12011: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - eval "$ac_ac_Header=yes" +#include <$ac_hdr> +EOF +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (eval echo configure:12368: \"$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 "$as_me: failed program was:" >&5 + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - eval "$ac_ac_Header=no" + rm -rf conftest* + eval "ac_cv_header_$ac_safe=no" fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest* fi -echo "$as_me:12030: result: `eval echo '${'$ac_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$ac_ac_Header'}'`" >&6 -if test `eval echo '${'$ac_ac_Header'}'` = yes; then - cat >>confdefs.h <&6 + ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` + cat >> confdefs.h <&6 fi done fi fi -echo "$as_me:12043: checking for ANSI C header files" >&5 -echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 -if test "${ac_cv_header_stdc+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + +echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 +echo "configure:12399: 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 <<_ACEOF -#line 12049 "configure" + cat > conftest.$ac_ext < #include #include #include - -_ACEOF -if { (eval echo "$as_me:12057: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:12063: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then +EOF +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (eval echo configure:12412: \"$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* ac_cv_header_stdc=yes else - echo "$as_me: failed program was:" >&5 + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 + rm -rf conftest* ac_cv_header_stdc=no fi -rm -f conftest.err conftest.$ac_ext +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 <<_ACEOF -#line 12085 "configure" +cat > conftest.$ac_ext < - -_ACEOF +EOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | egrep "memchr" >/dev/null 2>&1; then : else + rm -rf conftest* ac_cv_header_stdc=no fi rm -f conftest* @@ -12099,16 +12442,16 @@ 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 <<_ACEOF -#line 12103 "configure" +cat > conftest.$ac_ext < - -_ACEOF +EOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | egrep "free" >/dev/null 2>&1; then : else + rm -rf conftest* ac_cv_header_stdc=no fi rm -f conftest* @@ -12117,2300 +12460,858 @@ fi if test $ac_cv_header_stdc = yes; then # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. - if test "$cross_compiling" = yes; then - : -else - cat >conftest.$ac_ext <<_ACEOF -#line 12124 "configure" -#include "confdefs.h" -#include -#if ((' ' & 0x0FF) == 0x020) -# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') -# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) -#else -# define ISLOWER(c) (('a' <= (c) && (c) <= 'i') \ - || ('j' <= (c) && (c) <= 'r') \ - || ('s' <= (c) && (c) <= 'z')) -# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) -#endif - -#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) -int -main () -{ - int i; - for (i = 0; i < 256; i++) - if (XOR (islower (i), ISLOWER (i)) - || toupper (i) != TOUPPER (i)) - exit(2); - exit (0); -} -_ACEOF -rm -f conftest$ac_exeext -if { (eval echo "$as_me:12150: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:12153: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:12155: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:12158: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - : -else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_header_stdc=no -fi -rm -f core core.* *.core conftest$ac_exeext conftest.$ac_ext -fi -fi -fi -echo "$as_me:12171: result: $ac_cv_header_stdc" >&5 -echo "${ECHO_T}$ac_cv_header_stdc" >&6 -if test $ac_cv_header_stdc = yes; then - -cat >>confdefs.h <<\EOF -#define STDC_HEADERS 1 -EOF - -fi - -for ac_header in stdlib.h string.h memory.h strings.h inttypes.h unistd.h -do -ac_ac_Header=`echo "ac_cv_header_$ac_header" | $ac_tr_sh` -echo "$as_me:12184: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$ac_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line 12190 "configure" -#include "confdefs.h" -#include <$ac_header> -_ACEOF -if { (eval echo "$as_me:12194: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:12200: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - else - ac_cpp_err= - fi +if test "$cross_compiling" = yes; then + : else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - eval "$ac_ac_Header=yes" + cat > conftest.$ac_ext < +#define ISLOWER(c) ('a' <= (c) && (c) <= 'z') +#define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) +#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) +int main () { int i; for (i = 0; i < 256; i++) +if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); +exit (0); } + +EOF +if { (eval echo configure:12479: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +then + : else - echo "$as_me: failed program was:" >&5 + echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - eval "$ac_ac_Header=no" + rm -fr conftest* + ac_cv_header_stdc=no +fi +rm -fr conftest* +fi + fi -rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:12219: result: `eval echo '${'$ac_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$ac_ac_Header'}'`" >&6 -if test `eval echo '${'$ac_ac_Header'}'` = yes; then - cat >>confdefs.h <&6 +if test $ac_cv_header_stdc = yes; then + cat >> confdefs.h <<\EOF +#define STDC_HEADERS 1 EOF fi -done -echo "$as_me:12229: checking for mode_t" >&5 -echo $ECHO_N "checking for mode_t... $ECHO_C" >&6 -if test "${ac_cv_type_mode_t+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +echo $ac_n "checking for mode_t""... $ac_c" 1>&6 +echo "configure:12503: 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 <<_ACEOF -#line 12235 "configure" + cat > conftest.$ac_ext <&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:12253: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:12256: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:12259: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then +#include +#if STDC_HEADERS +#include +#include +#endif +EOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + egrep "(^|[^a-zA-Z_0-9])mode_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then + rm -rf conftest* ac_cv_type_mode_t=yes else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_type_mode_t=no -fi -rm -f conftest.$ac_objext conftest.$ac_ext + rm -rf conftest* + ac_cv_type_mode_t=no fi -echo "$as_me:12269: result: $ac_cv_type_mode_t" >&5 -echo "${ECHO_T}$ac_cv_type_mode_t" >&6 -if test $ac_cv_type_mode_t = yes; then - : -else +rm -f conftest* -cat >>confdefs.h <&6 +if test $ac_cv_type_mode_t = no; then + cat >> confdefs.h <<\EOF #define mode_t int EOF fi -echo "$as_me:12281: checking for off_t" >&5 -echo $ECHO_N "checking for off_t... $ECHO_C" >&6 -if test "${ac_cv_type_off_t+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +echo $ac_n "checking for off_t""... $ac_c" 1>&6 +echo "configure:12536: 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 <<_ACEOF -#line 12287 "configure" + cat > conftest.$ac_ext <&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:12305: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:12308: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:12311: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then +#include +#if STDC_HEADERS +#include +#include +#endif +EOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + egrep "(^|[^a-zA-Z_0-9])off_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then + rm -rf conftest* ac_cv_type_off_t=yes else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_type_off_t=no + rm -rf conftest* + ac_cv_type_off_t=no fi -rm -f conftest.$ac_objext conftest.$ac_ext -fi -echo "$as_me:12321: result: $ac_cv_type_off_t" >&5 -echo "${ECHO_T}$ac_cv_type_off_t" >&6 -if test $ac_cv_type_off_t = yes; then - : -else +rm -f conftest* -cat >>confdefs.h <&6 +if test $ac_cv_type_off_t = no; then + cat >> confdefs.h <<\EOF #define off_t long EOF fi -echo "$as_me:12333: checking for pid_t" >&5 -echo $ECHO_N "checking for pid_t... $ECHO_C" >&6 -if test "${ac_cv_type_pid_t+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +echo $ac_n "checking for pid_t""... $ac_c" 1>&6 +echo "configure:12569: 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 <<_ACEOF -#line 12339 "configure" + cat > conftest.$ac_ext <&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:12357: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:12360: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:12363: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then +#include +#if STDC_HEADERS +#include +#include +#endif +EOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + egrep "(^|[^a-zA-Z_0-9])pid_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then + rm -rf conftest* ac_cv_type_pid_t=yes else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_type_pid_t=no -fi -rm -f conftest.$ac_objext conftest.$ac_ext + rm -rf conftest* + ac_cv_type_pid_t=no fi -echo "$as_me:12373: result: $ac_cv_type_pid_t" >&5 -echo "${ECHO_T}$ac_cv_type_pid_t" >&6 -if test $ac_cv_type_pid_t = yes; then - : -else +rm -f conftest* -cat >>confdefs.h <&6 +if test $ac_cv_type_pid_t = no; then + cat >> confdefs.h <<\EOF #define pid_t int EOF fi -echo "$as_me:12385: checking for size_t" >&5 -echo $ECHO_N "checking for size_t... $ECHO_C" >&6 -if test "${ac_cv_type_size_t+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +echo $ac_n "checking for size_t""... $ac_c" 1>&6 +echo "configure:12602: 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 <<_ACEOF -#line 12391 "configure" + cat > conftest.$ac_ext <&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:12409: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:12412: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:12415: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then +#include +#if STDC_HEADERS +#include +#include +#endif +EOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + egrep "(^|[^a-zA-Z_0-9])size_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then + rm -rf conftest* ac_cv_type_size_t=yes else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_type_size_t=no + rm -rf conftest* + ac_cv_type_size_t=no fi -rm -f conftest.$ac_objext conftest.$ac_ext -fi -echo "$as_me:12425: result: $ac_cv_type_size_t" >&5 -echo "${ECHO_T}$ac_cv_type_size_t" >&6 -if test $ac_cv_type_size_t = yes; then - : -else +rm -f conftest* -cat >>confdefs.h <&6 +if test $ac_cv_type_size_t = no; then + cat >> confdefs.h <<\EOF #define size_t unsigned EOF fi -echo "$as_me:12437: checking for uid_t in sys/types.h" >&5 -echo $ECHO_N "checking for uid_t in sys/types.h... $ECHO_C" >&6 -if test "${ac_cv_type_uid_t+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6 +echo "configure:12635: 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 <<_ACEOF -#line 12443 "configure" + cat > conftest.$ac_ext < - -_ACEOF +EOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | egrep "uid_t" >/dev/null 2>&1; then + rm -rf conftest* ac_cv_type_uid_t=yes else + rm -rf conftest* ac_cv_type_uid_t=no fi rm -f conftest* fi -echo "$as_me:12457: result: $ac_cv_type_uid_t" >&5 -echo "${ECHO_T}$ac_cv_type_uid_t" >&6 -if test $ac_cv_type_uid_t = no; then -cat >>confdefs.h <<\EOF +echo "$ac_t""$ac_cv_type_uid_t" 1>&6 +if test $ac_cv_type_uid_t = no; then + cat >> confdefs.h <<\EOF #define uid_t int EOF -cat >>confdefs.h <<\EOF + cat >> confdefs.h <<\EOF #define gid_t int EOF fi -echo "$as_me:12471: checking for wchar_t" >&5 -echo $ECHO_N "checking for wchar_t... $ECHO_C" >&6 -if test "${wx_cv_type_wchar_t+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - - cat >conftest.$ac_ext <<_ACEOF -#line 12478 "configure" -#include "confdefs.h" -#include -int -main () -{ - - wchar_t wc, *ws; - wc = L'a'; - ws = L"Hello, world!"; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:12494: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:12497: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:12500: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:12503: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - wx_cv_type_wchar_t=yes +echo $ac_n "checking for wchar_t""... $ac_c" 1>&6 +echo "configure:12670: checking for wchar_t" >&5 +if eval "test \"`echo '$''{'wx_cv_type_wchar_t'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -cat >conftest.$ac_ext <<_ACEOF -#line 12510 "configure" + + cat > conftest.$ac_ext < -int -main () -{ - - wchar_t wc, *ws; - wc = L'a'; - ws = L"Hello, world!"; +#include +int main() { - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:12526: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:12529: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:12532: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:12535: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + wchar_t wc, *ws; + wc = L'a'; + ws = L"Hello, world!"; + +; return 0; } +EOF +if { (eval echo configure:12687: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* wx_cv_type_wchar_t=yes else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -wx_cv_type_wchar_t=no -fi -rm -f conftest.$ac_objext conftest.$ac_ext - -fi -rm -f conftest.$ac_objext conftest.$ac_ext - -fi -echo "$as_me:12549: result: $wx_cv_type_wchar_t" >&5 -echo "${ECHO_T}$wx_cv_type_wchar_t" >&6 -if test "$wx_cv_type_wchar_t" = yes ; then - cat >>confdefs.h <<\EOF -#define wxUSE_WCHAR_T 1 -EOF - + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + wx_cv_type_wchar_t=no + fi - -echo "$as_me:12558: checking for pw_gecos in struct passwd" >&5 -echo $ECHO_N "checking for pw_gecos in struct passwd... $ECHO_C" >&6 -if test "${wx_cv_struct_pw_gecos+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - - cat >conftest.$ac_ext <<_ACEOF -#line 12565 "configure" -#include "confdefs.h" -#include -int -main () -{ - - char *p; - struct passwd *pw; - p = pw->pw_gecos; - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:12581: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:12584: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:12587: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:12590: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - - wx_cv_struct_pw_gecos=yes - -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 - - wx_cv_struct_pw_gecos=no +rm -f conftest* fi -rm -f conftest.$ac_objext conftest.$ac_ext -fi -echo "$as_me:12605: result: $wx_cv_struct_pw_gecos" >&5 -echo "${ECHO_T}$wx_cv_struct_pw_gecos" >&6 +echo "$ac_t""$wx_cv_type_wchar_t" 1>&6 -if test "$wx_cv_struct_pw_gecos" = "yes"; then - cat >>confdefs.h <<\EOF -#define HAVE_PW_GECOS 1 +if test "$wx_cv_type_wchar_t" = "yes"; then + cat >> confdefs.h <<\EOF +#define wxUSE_WCHAR_T 1 EOF fi -echo "$as_me:12615: checking for $CC option to accept ANSI C" >&5 -echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6 -if test "${ac_cv_prog_cc_stdc+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_prog_cc_stdc=no -ac_save_CC=$CC -cat >conftest.$ac_ext <<_ACEOF -#line 12623 "configure" -#include "confdefs.h" -#include -#include -#include -#include -/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ -struct buf { int x; }; -FILE * (*rcsopen) (struct buf *, struct stat *, int); -static char *e (p, i) - char **p; - int i; -{ - return p[i]; -} -static char *f (char * (*g) (char **, int), char **p, ...) -{ - char *s; - va_list v; - va_start (v,p); - s = g (p, va_arg (v,int)); - va_end (v); - return s; -} -int test (int i, double x); -struct s1 {int (*f) (int a);}; -struct s2 {int (*f) (double a);}; -int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); -int argc; -char **argv; -int -main () -{ -return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; - ; - return 0; -} -_ACEOF -# Don't try gcc -ansi; that turns off useful extensions and -# breaks some systems' header files. -# AIX -qlanglvl=ansi -# Ultrix and OSF/1 -std1 -# HP-UX 10.20 and later -Ae -# HP-UX older versions -Aa -D_HPUX_SOURCE -# SVR4 -Xc -D__EXTENSIONS__ -for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" -do - CC="$ac_save_CC $ac_arg" - rm -f conftest.$ac_objext -if { (eval echo "$as_me:12672: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:12675: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:12678: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:12681: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_prog_cc_stdc=$ac_arg -break -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -fi -rm -f conftest.$ac_objext -done -rm -f conftest.$ac_ext conftest.$ac_objext -CC=$ac_save_CC - -fi - -case "x$ac_cv_prog_cc_stdc" in - x|xno) - echo "$as_me:12698: result: none needed" >&5 -echo "${ECHO_T}none needed" >&6 ;; - *) - echo "$as_me:12701: result: $ac_cv_prog_cc_stdc" >&5 -echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6 - CC="$CC $ac_cv_prog_cc_stdc" ;; -esac - -echo "$as_me:12706: checking for an ANSI C-conforming const" >&5 -echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6 -if test "${ac_cv_c_const+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line 12712 "configure" -#include "confdefs.h" - -int -main () -{ -/* FIXME: Include the comments suggested by Paul. */ -#ifndef __cplusplus - /* Ultrix mips cc rejects this. */ - typedef int charset[2]; - const charset x; - /* SunOS 4.1.1 cc rejects this. */ - char const *const *ccp; - char **p; - /* NEC SVR4.0.2 mips cc rejects this. */ - struct point {int x, y;}; - static struct point const zero = {0,0}; - /* AIX XL C 1.02.0.0 rejects this. - It does not let you subtract one const X* pointer from another in - an arm of an if-expression whose if-part is not a constant - expression */ - const char *g = "string"; - ccp = &g + (g ? g-g : 0); - /* HPUX 7.0 cc rejects these. */ - ++ccp; - p = (char**) ccp; - ccp = (char const *const *) p; - { /* SCO 3.2v4 cc rejects this. */ - char *t; - char const *s = 0 ? (char *) 0 : (char const *) 0; - - *t++ = 0; - } - { /* Someone thinks the Sun supposedly-ANSI compiler will reject this. */ - int x[] = {25, 17}; - const int *foo = &x[0]; - ++foo; - } - { /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */ - typedef const int *iptr; - iptr p = 0; - ++p; - } - { /* AIX XL C 1.02.0.0 rejects this saying - "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */ - struct s { int j; const int *ap[3]; }; - struct s *b; b->j = 5; - } - { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */ - const int foo = 10; - } -#endif - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:12770: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:12773: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:12776: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:12779: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_c_const=yes -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_c_const=no -fi -rm -f conftest.$ac_objext conftest.$ac_ext -fi -echo "$as_me:12789: result: $ac_cv_c_const" >&5 -echo "${ECHO_T}$ac_cv_c_const" >&6 -if test $ac_cv_c_const = no; then - -cat >>confdefs.h <<\EOF -#define const -EOF -fi +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 "$as_me:12799: checking for inline" >&5 -echo $ECHO_N "checking for inline... $ECHO_C" >&6 -if test "${ac_cv_c_inline+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +echo $ac_n "checking if size_t is unsigned int""... $ac_c" 1>&6 +echo "configure:12719: checking if size_t is unsigned int" >&5 +if eval "test \"`echo '$''{'wx_cv_size_t_is_uint'+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 <<_ACEOF -#line 12807 "configure" + cat > conftest.$ac_ext <&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:12819: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:12822: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:12825: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_c_inline=$ac_kw; break -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -fi -rm -f conftest.$ac_objext conftest.$ac_ext -done +#include +int main() { -fi -echo "$as_me:12836: result: $ac_cv_c_inline" >&5 -echo "${ECHO_T}$ac_cv_c_inline" >&6 -case $ac_cv_c_inline in - inline | yes) ;; - no) -cat >>confdefs.h <<\EOF -#define inline -EOF - ;; - *) cat >>confdefs.h <&5 -echo $ECHO_N "checking for char... $ECHO_C" >&6 -if test "${ac_cv_type_char+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line 12857 "configure" -#include "confdefs.h" -$ac_includes_default -int -main () -{ -if ((char *) 0) - return 0; -if (sizeof (char)) - return 0; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:12872: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:12875: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:12878: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:12881: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_type_char=yes -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_type_char=no -fi -rm -f conftest.$ac_objext conftest.$ac_ext -fi -echo "$as_me:12891: result: $ac_cv_type_char" >&5 -echo "${ECHO_T}$ac_cv_type_char" >&6 - -echo "$as_me:12894: checking size of char" >&5 -echo $ECHO_N "checking size of char... $ECHO_C" >&6 -if test "${ac_cv_sizeof_char+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test "$ac_cv_type_char" = yes; then - if test "$cross_compiling" = yes; then - # Depending upon the size, compute the lo and hi bounds. -cat >conftest.$ac_ext <<_ACEOF -#line 12903 "configure" -#include "confdefs.h" -$ac_includes_default -int -main () -{ -int _array_ [1 - 2 * !((sizeof (char)) >= 0)] - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:12915: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:12918: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:12921: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:12924: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_lo=0 ac_mid=0 - while :; do - cat >conftest.$ac_ext <<_ACEOF -#line 12929 "configure" -#include "confdefs.h" -$ac_includes_default -int -main () -{ -int _array_ [1 - 2 * !((sizeof (char)) <= $ac_mid)] - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:12941: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:12944: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:12947: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:12950: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_hi=$ac_mid; break -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_lo=`expr $ac_mid + 1`; ac_mid=`expr 2 '*' $ac_mid + 1` -fi -rm -f conftest.$ac_objext conftest.$ac_ext - done -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_hi=-1 ac_mid=-1 - while :; do - cat >conftest.$ac_ext <<_ACEOF -#line 12966 "configure" -#include "confdefs.h" -$ac_includes_default -int -main () -{ -int _array_ [1 - 2 * !((sizeof (char)) >= $ac_mid)] - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:12978: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:12981: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:12984: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:12987: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_lo=$ac_mid; break -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_hi=`expr $ac_mid - 1`; ac_mid=`expr 2 '*' $ac_mid` -fi -rm -f conftest.$ac_objext conftest.$ac_ext - done -fi -rm -f conftest.$ac_objext conftest.$ac_ext -# Binary search between lo and hi bounds. -while test "x$ac_lo" != "x$ac_hi"; do - ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` - cat >conftest.$ac_ext <<_ACEOF -#line 13003 "configure" -#include "confdefs.h" -$ac_includes_default -int -main () -{ -int _array_ [1 - 2 * !((sizeof (char)) <= $ac_mid)] - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:13015: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:13018: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:13021: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:13024: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_hi=$ac_mid -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_lo=`expr $ac_mid + 1` -fi -rm -f conftest.$ac_objext conftest.$ac_ext -done -ac_cv_sizeof_char=$ac_lo -else - if test "$cross_compiling" = yes; then - { { echo "$as_me:13037: error: cannot run test program while cross compiling" >&5 -echo "$as_me: error: cannot run test program while cross compiling" >&2;} - { (exit 1); exit 1; }; } -else - cat >conftest.$ac_ext <<_ACEOF -#line 13042 "configure" -#include "confdefs.h" -$ac_includes_default -int -main () -{ -FILE *f = fopen ("conftest.val", "w"); -if (!f) - exit (1); -fprintf (f, "%d", (sizeof (char))); -fclose (f); - ; - return 0; -} -_ACEOF -rm -f conftest$ac_exeext -if { (eval echo "$as_me:13058: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:13061: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:13063: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:13066: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_sizeof_char=`cat conftest.val` -else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -fi -rm -f core core.* *.core conftest$ac_exeext conftest.$ac_ext -fi -fi -rm -f conftest.val -else - ac_cv_sizeof_char=0 -fi -fi -echo "$as_me:13082: result: $ac_cv_sizeof_char" >&5 -echo "${ECHO_T}$ac_cv_sizeof_char" >&6 -cat >>confdefs.h <&5 -echo $ECHO_N "checking for short... $ECHO_C" >&6 -if test "${ac_cv_type_short+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line 13094 "configure" -#include "confdefs.h" -$ac_includes_default -int -main () -{ -if ((short *) 0) - return 0; -if (sizeof (short)) - return 0; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:13109: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:13112: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:13115: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:13118: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_type_short=yes -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_type_short=no -fi -rm -f conftest.$ac_objext conftest.$ac_ext -fi -echo "$as_me:13128: result: $ac_cv_type_short" >&5 -echo "${ECHO_T}$ac_cv_type_short" >&6 - -echo "$as_me:13131: checking size of short" >&5 -echo $ECHO_N "checking size of short... $ECHO_C" >&6 -if test "${ac_cv_sizeof_short+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test "$ac_cv_type_short" = yes; then - if test "$cross_compiling" = yes; then - # Depending upon the size, compute the lo and hi bounds. -cat >conftest.$ac_ext <<_ACEOF -#line 13140 "configure" -#include "confdefs.h" -$ac_includes_default -int -main () -{ -int _array_ [1 - 2 * !((sizeof (short)) >= 0)] - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:13152: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:13155: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:13158: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:13161: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_lo=0 ac_mid=0 - while :; do - cat >conftest.$ac_ext <<_ACEOF -#line 13166 "configure" -#include "confdefs.h" -$ac_includes_default -int -main () -{ -int _array_ [1 - 2 * !((sizeof (short)) <= $ac_mid)] - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:13178: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:13181: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:13184: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:13187: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_hi=$ac_mid; break -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_lo=`expr $ac_mid + 1`; ac_mid=`expr 2 '*' $ac_mid + 1` -fi -rm -f conftest.$ac_objext conftest.$ac_ext - done + int bar() { + +; return 0; } +EOF +if { (eval echo configure:12737: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + wx_cv_size_t_is_uint=no else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_hi=-1 ac_mid=-1 - while :; do - cat >conftest.$ac_ext <<_ACEOF -#line 13203 "configure" -#include "confdefs.h" -$ac_includes_default -int -main () -{ -int _array_ [1 - 2 * !((sizeof (short)) >= $ac_mid)] - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:13215: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:13218: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:13221: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:13224: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_lo=$ac_mid; break -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_hi=`expr $ac_mid - 1`; ac_mid=`expr 2 '*' $ac_mid` -fi -rm -f conftest.$ac_objext conftest.$ac_ext - done + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + wx_cv_size_t_is_uint=yes + fi -rm -f conftest.$ac_objext conftest.$ac_ext -# Binary search between lo and hi bounds. -while test "x$ac_lo" != "x$ac_hi"; do - ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` - cat >conftest.$ac_ext <<_ACEOF -#line 13240 "configure" -#include "confdefs.h" -$ac_includes_default -int -main () -{ -int _array_ [1 - 2 * !((sizeof (short)) <= $ac_mid)] - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:13252: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:13255: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:13258: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:13261: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_hi=$ac_mid -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_lo=`expr $ac_mid + 1` -fi -rm -f conftest.$ac_objext conftest.$ac_ext -done -ac_cv_sizeof_short=$ac_lo +rm -f conftest* + +fi + +echo "$ac_t""$wx_cv_size_t_is_uint" 1>&6 + +if test "$wx_cv_size_t_is_uint" = "yes"; then + cat >> confdefs.h <<\EOF +#define wxSIZE_T_IS_UINT 1 +EOF + else - if test "$cross_compiling" = yes; then - { { echo "$as_me:13274: error: cannot run test program while cross compiling" >&5 -echo "$as_me: error: cannot run test program while cross compiling" >&2;} - { (exit 1); exit 1; }; } + echo $ac_n "checking if size_t is unsigned long""... $ac_c" 1>&6 +echo "configure:12760: checking if size_t is unsigned long" >&5 +if eval "test \"`echo '$''{'wx_cv_size_t_is_ulong'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 13279 "configure" + cat > conftest.$ac_ext <&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:13298: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:13300: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:13303: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_sizeof_short=`cat conftest.val` +#include +int main() { + + return 0; } + + struct Foo { void foo(size_t); void foo(unsigned long); }; + + int bar() { + +; return 0; } +EOF +if { (eval echo configure:12778: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + wx_cv_size_t_is_ulong=no else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + wx_cv_size_t_is_ulong=yes + fi -rm -f core core.* *.core conftest$ac_exeext conftest.$ac_ext +rm -f conftest* + fi + +echo "$ac_t""$wx_cv_size_t_is_ulong" 1>&6 + + if test "$wx_cv_size_t_is_ulong" = "yes"; then + cat >> confdefs.h <<\EOF +#define wxSIZE_T_IS_ULONG 1 +EOF + + fi fi -rm -f conftest.val + +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 + + + +echo $ac_n "checking for pw_gecos in struct passwd""... $ac_c" 1>&6 +echo "configure:12812: checking for pw_gecos in struct passwd" >&5 +if eval "test \"`echo '$''{'wx_cv_struct_pw_gecos'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 else - ac_cv_sizeof_short=0 + + cat > conftest.$ac_ext < +int main() { + + char *p; + struct passwd *pw; + p = pw->pw_gecos; + +; return 0; } +EOF +if { (eval echo configure:12829: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + + wx_cv_struct_pw_gecos=yes + +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + + wx_cv_struct_pw_gecos=no + + fi +rm -f conftest* + + fi -echo "$as_me:13319: result: $ac_cv_sizeof_short" >&5 -echo "${ECHO_T}$ac_cv_sizeof_short" >&6 -cat >>confdefs.h <&6 + +if test "$wx_cv_struct_pw_gecos" = "yes"; then + cat >> confdefs.h <<\EOF +#define HAVE_PW_GECOS 1 EOF -echo "$as_me:13325: checking for int *" >&5 -echo $ECHO_N "checking for int *... $ECHO_C" >&6 -if test "${ac_cv_type_int_p+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +fi + + +echo $ac_n "checking for working const""... $ac_c" 1>&6 +echo "configure:12859: 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 <<_ACEOF -#line 13331 "configure" -#include "confdefs.h" -$ac_includes_default -int -main () -{ -if ((int * *) 0) - return 0; -if (sizeof (int *)) - return 0; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:13346: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:13349: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:13352: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:13355: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_type_int_p=yes -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_type_int_p=no -fi -rm -f conftest.$ac_objext conftest.$ac_ext -fi -echo "$as_me:13365: result: $ac_cv_type_int_p" >&5 -echo "${ECHO_T}$ac_cv_type_int_p" >&6 - -echo "$as_me:13368: checking size of int *" >&5 -echo $ECHO_N "checking size of int *... $ECHO_C" >&6 -if test "${ac_cv_sizeof_int_p+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test "$ac_cv_type_int_p" = yes; then - if test "$cross_compiling" = yes; then - # Depending upon the size, compute the lo and hi bounds. -cat >conftest.$ac_ext <<_ACEOF -#line 13377 "configure" + cat > conftest.$ac_ext <= 0)] - ; - return 0; + +int main() { + +/* Ultrix mips cc rejects this. */ +typedef int charset[2]; const charset x = {0,0}; +/* SunOS 4.1.1 cc rejects this. */ +char const *const *ccp; +char **p; +/* NEC SVR4.0.2 mips cc rejects this. */ +struct point {int x, y;}; +static struct point const zero = {0,0}; +/* AIX XL C 1.02.0.0 rejects this. + It does not let you subtract one const X* pointer from another in an arm + of an if-expression whose if-part is not a constant expression */ +const char *g = "string"; +ccp = &g + (g ? g-g : 0); +/* HPUX 7.0 cc rejects these. */ +++ccp; +p = (char**) ccp; +ccp = (char const *const *) p; +{ /* SCO 3.2v4 cc rejects this. */ + char *t; + char const *s = 0 ? (char *) 0 : (char const *) 0; + + *t++ = 0; } -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:13389: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:13392: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:13395: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:13398: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_lo=0 ac_mid=0 - while :; do - cat >conftest.$ac_ext <<_ACEOF -#line 13403 "configure" -#include "confdefs.h" -$ac_includes_default -int -main () -{ -int _array_ [1 - 2 * !((sizeof (int *)) <= $ac_mid)] - ; - return 0; +{ /* Someone thinks the Sun supposedly-ANSI compiler will reject this. */ + int x[] = {25, 17}; + const int *foo = &x[0]; + ++foo; } -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:13415: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:13418: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:13421: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:13424: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_hi=$ac_mid; break -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_lo=`expr $ac_mid + 1`; ac_mid=`expr 2 '*' $ac_mid + 1` -fi -rm -f conftest.$ac_objext conftest.$ac_ext - done -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_hi=-1 ac_mid=-1 - while :; do - cat >conftest.$ac_ext <<_ACEOF -#line 13440 "configure" -#include "confdefs.h" -$ac_includes_default -int -main () -{ -int _array_ [1 - 2 * !((sizeof (int *)) >= $ac_mid)] - ; - return 0; +{ /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */ + typedef const int *iptr; + iptr p = 0; + ++p; } -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:13452: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:13455: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:13458: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:13461: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_lo=$ac_mid; break -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_hi=`expr $ac_mid - 1`; ac_mid=`expr 2 '*' $ac_mid` -fi -rm -f conftest.$ac_objext conftest.$ac_ext - done -fi -rm -f conftest.$ac_objext conftest.$ac_ext -# Binary search between lo and hi bounds. -while test "x$ac_lo" != "x$ac_hi"; do - ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` - cat >conftest.$ac_ext <<_ACEOF -#line 13477 "configure" -#include "confdefs.h" -$ac_includes_default -int -main () -{ -int _array_ [1 - 2 * !((sizeof (int *)) <= $ac_mid)] - ; - return 0; +{ /* AIX XL C 1.02.0.0 rejects this saying + "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */ + struct s { int j; const int *ap[3]; }; + struct s *b; b->j = 5; } -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:13489: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:13492: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:13495: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:13498: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_hi=$ac_mid -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_lo=`expr $ac_mid + 1` -fi -rm -f conftest.$ac_objext conftest.$ac_ext -done -ac_cv_sizeof_int_p=$ac_lo -else - if test "$cross_compiling" = yes; then - { { echo "$as_me:13511: error: cannot run test program while cross compiling" >&5 -echo "$as_me: error: cannot run test program while cross compiling" >&2;} - { (exit 1); exit 1; }; } -else - cat >conftest.$ac_ext <<_ACEOF -#line 13516 "configure" -#include "confdefs.h" -$ac_includes_default -int -main () -{ -FILE *f = fopen ("conftest.val", "w"); -if (!f) - exit (1); -fprintf (f, "%d", (sizeof (int *))); -fclose (f); - ; - return 0; +{ /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */ + const int foo = 10; } -_ACEOF -rm -f conftest$ac_exeext -if { (eval echo "$as_me:13532: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:13535: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:13537: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:13540: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_sizeof_int_p=`cat conftest.val` -else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -fi -rm -f core core.* *.core conftest$ac_exeext conftest.$ac_ext -fi -fi -rm -f conftest.val + +; return 0; } +EOF +if { (eval echo configure:12913: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_c_const=yes else - ac_cv_sizeof_int_p=0 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + ac_cv_c_const=no fi +rm -f conftest* fi -echo "$as_me:13556: result: $ac_cv_sizeof_int_p" >&5 -echo "${ECHO_T}$ac_cv_sizeof_int_p" >&6 -cat >>confdefs.h <&6 +if test $ac_cv_c_const = no; then + cat >> confdefs.h <<\EOF +#define const EOF -echo "$as_me:13562: checking for int" >&5 -echo $ECHO_N "checking for int... $ECHO_C" >&6 -if test "${ac_cv_type_int+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +fi + +echo $ac_n "checking for inline""... $ac_c" 1>&6 +echo "configure:12934: checking for inline" >&5 +if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 13568 "configure" -#include "confdefs.h" -$ac_includes_default -int -main () -{ -if ((int *) 0) - return 0; -if (sizeof (int)) - return 0; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:13583: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:13586: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:13589: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:13592: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_type_int=yes -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_type_int=no -fi -rm -f conftest.$ac_objext conftest.$ac_ext -fi -echo "$as_me:13602: result: $ac_cv_type_int" >&5 -echo "${ECHO_T}$ac_cv_type_int" >&6 - -echo "$as_me:13605: checking size of int" >&5 -echo $ECHO_N "checking size of int... $ECHO_C" >&6 -if test "${ac_cv_sizeof_int+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test "$ac_cv_type_int" = yes; then - if test "$cross_compiling" = yes; then - # Depending upon the size, compute the lo and hi bounds. -cat >conftest.$ac_ext <<_ACEOF -#line 13614 "configure" -#include "confdefs.h" -$ac_includes_default -int -main () -{ -int _array_ [1 - 2 * !((sizeof (int)) >= 0)] - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:13626: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:13629: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:13632: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:13635: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_lo=0 ac_mid=0 - while :; do - cat >conftest.$ac_ext <<_ACEOF -#line 13640 "configure" + ac_cv_c_inline=no +for ac_kw in inline __inline__ __inline; do + cat > conftest.$ac_ext <&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:13655: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:13658: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:13661: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_hi=$ac_mid; break -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_lo=`expr $ac_mid + 1`; ac_mid=`expr 2 '*' $ac_mid + 1` -fi -rm -f conftest.$ac_objext conftest.$ac_ext - done + +int main() { +} int $ac_kw foo() { +; return 0; } +EOF +if { (eval echo configure:12948: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_c_inline=$ac_kw; break else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_hi=-1 ac_mid=-1 - while :; do - cat >conftest.$ac_ext <<_ACEOF -#line 13677 "configure" -#include "confdefs.h" -$ac_includes_default -int -main () -{ -int _array_ [1 - 2 * !((sizeof (int)) >= $ac_mid)] - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:13689: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:13692: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:13695: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:13698: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_lo=$ac_mid; break -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_hi=`expr $ac_mid - 1`; ac_mid=`expr 2 '*' $ac_mid` -fi -rm -f conftest.$ac_objext conftest.$ac_ext - done + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 fi -rm -f conftest.$ac_objext conftest.$ac_ext -# Binary search between lo and hi bounds. -while test "x$ac_lo" != "x$ac_hi"; do - ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` - cat >conftest.$ac_ext <<_ACEOF -#line 13714 "configure" -#include "confdefs.h" -$ac_includes_default -int -main () -{ -int _array_ [1 - 2 * !((sizeof (int)) <= $ac_mid)] - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:13726: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:13729: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:13732: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:13735: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_hi=$ac_mid -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_lo=`expr $ac_mid + 1` -fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest* done -ac_cv_sizeof_int=$ac_lo + +fi + +echo "$ac_t""$ac_cv_c_inline" 1>&6 +case "$ac_cv_c_inline" in + inline | yes) ;; + no) cat >> confdefs.h <<\EOF +#define inline +EOF + ;; + *) cat >> confdefs.h <&6 +echo "configure:12975: 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 - { { echo "$as_me:13748: error: cannot run test program while cross compiling" >&5 -echo "$as_me: error: cannot run test program while cross compiling" >&2;} - { (exit 1); exit 1; }; } + ac_cv_sizeof_char=1 else - cat >conftest.$ac_ext <<_ACEOF -#line 13753 "configure" + cat > conftest.$ac_ext < +main() { -FILE *f = fopen ("conftest.val", "w"); -if (!f) - exit (1); -fprintf (f, "%d", (sizeof (int))); -fclose (f); - ; - return 0; + FILE *f=fopen("conftestval", "w"); + if (!f) exit(1); + fprintf(f, "%d\n", sizeof(char)); + exit(0); } -_ACEOF -rm -f conftest$ac_exeext -if { (eval echo "$as_me:13769: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:13772: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:13774: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:13777: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_sizeof_int=`cat conftest.val` +EOF +if { (eval echo configure:12994: \"$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 "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -fi -rm -f core core.* *.core conftest$ac_exeext conftest.$ac_ext -fi + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -fr conftest* + ac_cv_sizeof_char=0 fi -rm -f conftest.val -else - ac_cv_sizeof_int=0 +rm -fr conftest* fi + fi -echo "$as_me:13793: result: $ac_cv_sizeof_int" >&5 -echo "${ECHO_T}$ac_cv_sizeof_int" >&6 -cat >>confdefs.h <&6 +cat >> confdefs.h <&5 -echo $ECHO_N "checking for long... $ECHO_C" >&6 -if test "${ac_cv_type_long+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + +echo $ac_n "checking size of short""... $ac_c" 1>&6 +echo "configure:13014: 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 - cat >conftest.$ac_ext <<_ACEOF -#line 13805 "configure" -#include "confdefs.h" -$ac_includes_default -int -main () -{ -if ((long *) 0) - return 0; -if (sizeof (long)) - return 0; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:13820: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:13823: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:13826: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:13829: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_type_long=yes -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_type_long=no -fi -rm -f conftest.$ac_objext conftest.$ac_ext -fi -echo "$as_me:13839: result: $ac_cv_type_long" >&5 -echo "${ECHO_T}$ac_cv_type_long" >&6 - -echo "$as_me:13842: checking size of long" >&5 -echo $ECHO_N "checking size of long... $ECHO_C" >&6 -if test "${ac_cv_sizeof_long+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test "$ac_cv_type_long" = yes; then if test "$cross_compiling" = yes; then - # Depending upon the size, compute the lo and hi bounds. -cat >conftest.$ac_ext <<_ACEOF -#line 13851 "configure" -#include "confdefs.h" -$ac_includes_default -int -main () -{ -int _array_ [1 - 2 * !((sizeof (long)) >= 0)] - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:13863: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:13866: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:13869: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:13872: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_lo=0 ac_mid=0 - while :; do - cat >conftest.$ac_ext <<_ACEOF -#line 13877 "configure" -#include "confdefs.h" -$ac_includes_default -int -main () -{ -int _array_ [1 - 2 * !((sizeof (long)) <= $ac_mid)] - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:13889: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:13892: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:13895: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:13898: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_hi=$ac_mid; break -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_lo=`expr $ac_mid + 1`; ac_mid=`expr 2 '*' $ac_mid + 1` -fi -rm -f conftest.$ac_objext conftest.$ac_ext - done + ac_cv_sizeof_short=2 else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_hi=-1 ac_mid=-1 - while :; do - cat >conftest.$ac_ext <<_ACEOF -#line 13914 "configure" + cat > conftest.$ac_ext < +main() { -int _array_ [1 - 2 * !((sizeof (long)) >= $ac_mid)] - ; - return 0; + FILE *f=fopen("conftestval", "w"); + if (!f) exit(1); + fprintf(f, "%d\n", sizeof(short)); + exit(0); } -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:13926: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:13929: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:13932: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:13935: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_lo=$ac_mid; break -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_hi=`expr $ac_mid - 1`; ac_mid=`expr 2 '*' $ac_mid` -fi -rm -f conftest.$ac_objext conftest.$ac_ext - done +EOF +if { (eval echo configure:13033: \"$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 -f conftest.$ac_objext conftest.$ac_ext -# Binary search between lo and hi bounds. -while test "x$ac_lo" != "x$ac_hi"; do - ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` - cat >conftest.$ac_ext <<_ACEOF -#line 13951 "configure" -#include "confdefs.h" -$ac_includes_default -int -main () -{ -int _array_ [1 - 2 * !((sizeof (long)) <= $ac_mid)] - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:13963: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:13966: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:13969: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:13972: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_hi=$ac_mid -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_lo=`expr $ac_mid + 1` -fi -rm -f conftest.$ac_objext conftest.$ac_ext -done -ac_cv_sizeof_long=$ac_lo +rm -fr conftest* +fi + +fi +echo "$ac_t""$ac_cv_sizeof_short" 1>&6 +cat >> confdefs.h <&6 +echo "configure:13053: 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 if test "$cross_compiling" = yes; then - { { echo "$as_me:13985: error: cannot run test program while cross compiling" >&5 -echo "$as_me: error: cannot run test program while cross compiling" >&2;} - { (exit 1); exit 1; }; } + ac_cv_sizeof_int_p=4 else - cat >conftest.$ac_ext <<_ACEOF -#line 13990 "configure" + cat > conftest.$ac_ext < +main() { -FILE *f = fopen ("conftest.val", "w"); -if (!f) - exit (1); -fprintf (f, "%d", (sizeof (long))); -fclose (f); - ; - return 0; + FILE *f=fopen("conftestval", "w"); + if (!f) exit(1); + fprintf(f, "%d\n", sizeof(int *)); + exit(0); } -_ACEOF -rm -f conftest$ac_exeext -if { (eval echo "$as_me:14006: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:14009: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:14011: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:14014: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_sizeof_long=`cat conftest.val` +EOF +if { (eval echo configure:13072: \"$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 - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -fi -rm -f core core.* *.core conftest$ac_exeext conftest.$ac_ext -fi + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -fr conftest* + ac_cv_sizeof_int_p=0 fi -rm -f conftest.val -else - ac_cv_sizeof_long=0 +rm -fr conftest* fi + fi -echo "$as_me:14030: result: $ac_cv_sizeof_long" >&5 -echo "${ECHO_T}$ac_cv_sizeof_long" >&6 -cat >>confdefs.h <&6 +cat >> confdefs.h <&5 -echo $ECHO_N "checking for long long... $ECHO_C" >&6 -if test "${ac_cv_type_long_long+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + +echo $ac_n "checking size of int""... $ac_c" 1>&6 +echo "configure:13092: 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 - cat >conftest.$ac_ext <<_ACEOF -#line 14042 "configure" -#include "confdefs.h" -$ac_includes_default -int -main () -{ -if ((long long *) 0) - return 0; -if (sizeof (long long)) - return 0; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:14057: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:14060: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:14063: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:14066: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_type_long_long=yes -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_type_long_long=no -fi -rm -f conftest.$ac_objext conftest.$ac_ext -fi -echo "$as_me:14076: result: $ac_cv_type_long_long" >&5 -echo "${ECHO_T}$ac_cv_type_long_long" >&6 - -echo "$as_me:14079: checking size of long long" >&5 -echo $ECHO_N "checking size of long long... $ECHO_C" >&6 -if test "${ac_cv_sizeof_long_long+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test "$ac_cv_type_long_long" = yes; then if test "$cross_compiling" = yes; then - # Depending upon the size, compute the lo and hi bounds. -cat >conftest.$ac_ext <<_ACEOF -#line 14088 "configure" -#include "confdefs.h" -$ac_includes_default -int -main () -{ -int _array_ [1 - 2 * !((sizeof (long long)) >= 0)] - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:14100: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:14103: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:14106: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:14109: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_lo=0 ac_mid=0 - while :; do - cat >conftest.$ac_ext <<_ACEOF -#line 14114 "configure" -#include "confdefs.h" -$ac_includes_default -int -main () -{ -int _array_ [1 - 2 * !((sizeof (long long)) <= $ac_mid)] - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:14126: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:14129: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:14132: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:14135: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_hi=$ac_mid; break -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_lo=`expr $ac_mid + 1`; ac_mid=`expr 2 '*' $ac_mid + 1` -fi -rm -f conftest.$ac_objext conftest.$ac_ext - done + ac_cv_sizeof_int=4 else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_hi=-1 ac_mid=-1 - while :; do - cat >conftest.$ac_ext <<_ACEOF -#line 14151 "configure" + cat > conftest.$ac_ext < +main() { -int _array_ [1 - 2 * !((sizeof (long long)) >= $ac_mid)] - ; - return 0; + FILE *f=fopen("conftestval", "w"); + if (!f) exit(1); + fprintf(f, "%d\n", sizeof(int)); + exit(0); } -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:14163: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:14166: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:14169: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:14172: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_lo=$ac_mid; break -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_hi=`expr $ac_mid - 1`; ac_mid=`expr 2 '*' $ac_mid` -fi -rm -f conftest.$ac_objext conftest.$ac_ext - done +EOF +if { (eval echo configure:13111: \"$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 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -fr conftest* + ac_cv_sizeof_int=0 +fi +rm -fr conftest* +fi + fi -rm -f conftest.$ac_objext conftest.$ac_ext -# Binary search between lo and hi bounds. -while test "x$ac_lo" != "x$ac_hi"; do - ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` - cat >conftest.$ac_ext <<_ACEOF -#line 14188 "configure" -#include "confdefs.h" -$ac_includes_default -int -main () -{ -int _array_ [1 - 2 * !((sizeof (long long)) <= $ac_mid)] - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:14200: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:14203: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:14206: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:14209: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_hi=$ac_mid -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_lo=`expr $ac_mid + 1` -fi -rm -f conftest.$ac_objext conftest.$ac_ext -done -ac_cv_sizeof_long_long=$ac_lo +echo "$ac_t""$ac_cv_sizeof_int" 1>&6 +cat >> confdefs.h <&6 +echo "configure:13131: 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 if test "$cross_compiling" = yes; then - { { echo "$as_me:14222: error: cannot run test program while cross compiling" >&5 -echo "$as_me: error: cannot run test program while cross compiling" >&2;} - { (exit 1); exit 1; }; } + ac_cv_sizeof_long=4 else - cat >conftest.$ac_ext <<_ACEOF -#line 14227 "configure" + cat > conftest.$ac_ext < +main() { -FILE *f = fopen ("conftest.val", "w"); -if (!f) - exit (1); -fprintf (f, "%d", (sizeof (long long))); -fclose (f); - ; - return 0; + FILE *f=fopen("conftestval", "w"); + if (!f) exit(1); + fprintf(f, "%d\n", sizeof(long)); + exit(0); } -_ACEOF -rm -f conftest$ac_exeext -if { (eval echo "$as_me:14243: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:14246: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:14248: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:14251: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_sizeof_long_long=`cat conftest.val` +EOF +if { (eval echo configure:13150: \"$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 - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -fr conftest* + ac_cv_sizeof_long=0 fi -rm -f core core.* *.core conftest$ac_exeext conftest.$ac_ext +rm -fr conftest* fi + fi -rm -f conftest.val +echo "$ac_t""$ac_cv_sizeof_long" 1>&6 +cat >> confdefs.h <&6 +echo "configure:13170: 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 + if test "$cross_compiling" = yes; then + ac_cv_sizeof_long_long=0 +else + cat > conftest.$ac_ext < +main() +{ + FILE *f=fopen("conftestval", "w"); + if (!f) exit(1); + fprintf(f, "%d\n", sizeof(long long)); + exit(0); +} +EOF +if { (eval echo configure:13189: \"$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 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -fr conftest* ac_cv_sizeof_long_long=0 fi +rm -fr conftest* +fi + fi -echo "$as_me:14267: result: $ac_cv_sizeof_long_long" >&5 -echo "${ECHO_T}$ac_cv_sizeof_long_long" >&6 -cat >>confdefs.h <&6 +cat >> confdefs.h <&5 -echo $ECHO_N "checking size of wchar_t... $ECHO_C" >&6 -if test "${wx_cv_sizeof_wchar_t+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else + +echo $ac_n "checking size of wchar_t""... $ac_c" 1>&6 +echo "configure:13210: checking size of wchar_t" >&5 +if eval "test \"`echo '$''{'wx_cv_sizeof_wchar_t'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test "$cross_compiling" = yes; then wx_cv_sizeof_wchar_t=4 - + else - cat >conftest.$ac_ext <<_ACEOF -#line 14284 "configure" + cat > conftest.$ac_ext < - #endif - #ifdef HAVE_STDLIB_H - # include - #endif - #include - int main() - { - FILE *f=fopen("conftestval", "w"); - if (!f) exit(1); - fprintf(f, "%i", sizeof(wchar_t)); - exit(0); - } - -_ACEOF -rm -f conftest$ac_exeext -if { (eval echo "$as_me:14304: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:14307: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:14309: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:14312: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + #ifdef HAVE_WCHAR_H + # include + #endif + #ifdef HAVE_STDLIB_H + # include + #endif + #include + int main() + { + FILE *f=fopen("conftestval", "w"); + if (!f) exit(1); + fprintf(f, "%i", sizeof(wchar_t)); + exit(0); + } + +EOF +if { (eval echo configure:13239: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +then wx_cv_sizeof_wchar_t=`cat conftestval` else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -wx_cv_sizeof_wchar_t=0 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -fr conftest* + wx_cv_sizeof_wchar_t=0 fi -rm -f core core.* *.core conftest$ac_exeext conftest.$ac_ext +rm -fr conftest* fi + fi -echo "$as_me:14325: result: $wx_cv_sizeof_wchar_t" >&5 -echo "${ECHO_T}$wx_cv_sizeof_wchar_t" >&6 -cat >>confdefs.h <&6 + +cat >> confdefs.h <&5 -echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6 -if test "${ac_cv_c_bigendian+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + +echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6 +echo "configure:13262: 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 <<_ACEOF -#line 14340 "configure" +cat > conftest.$ac_ext < #include -int -main () -{ +int main() { #if !BYTE_ORDER || !BIG_ENDIAN || !LITTLE_ENDIAN bogus endian macros #endif - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:14356: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:14359: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:14362: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:14365: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then +; return 0; } +EOF +if { (eval echo configure:13280: \"$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 <<_ACEOF -#line 14369 "configure" +cat > conftest.$ac_ext < #include -int -main () -{ +int main() { #if BYTE_ORDER != BIG_ENDIAN not big endian #endif - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:14385: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:14388: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:14391: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:14394: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then +; return 0; } +EOF +if { (eval echo configure:13295: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* ac_cv_c_bigendian=yes else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_c_bigendian=no + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + ac_cv_c_bigendian=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest* else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 fi -rm -f conftest.$ac_objext conftest.$ac_ext +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 <<_ACEOF -#line 14413 "configure" + cat > conftest.$ac_ext <&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:14430: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:14432: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:14435: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then +EOF +if { (eval echo configure:13328: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +then ac_cv_c_bigendian=no else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_c_bigendian=yes + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -fr conftest* + ac_cv_c_bigendian=yes fi -rm -f core core.* *.core conftest$ac_exeext conftest.$ac_ext +rm -fr conftest* fi + fi fi -echo "$as_me:14448: result: $ac_cv_c_bigendian" >&5 -echo "${ECHO_T}$ac_cv_c_bigendian" >&6 + +echo "$ac_t""$ac_cv_c_bigendian" 1>&6 if test $ac_cv_c_bigendian = unknown; then - { echo "$as_me:14451: 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" >&5 -echo "$as_me: 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" >&2;} + 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 + cat >> confdefs.h <<\EOF #define WORDS_BIGENDIAN 1 EOF fi + +echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6 +echo "configure:13356: 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 +else + 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 + CXXCPP="${CXX-g++} -E" + cat > conftest.$ac_ext < +EOF +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (eval echo configure:13374: \"$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 + : +else + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + CXXCPP=/lib/cpp +fi +rm -f conftest* + ac_cv_prog_CXXCPP="$CXXCPP" +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 +fi +fi +CXXCPP="$ac_cv_prog_CXXCPP" +echo "$ac_t""$CXXCPP" 1>&6 + + if test "$cross_compiling" = "yes"; then - cat >>confdefs.h <<\EOF + cat >> confdefs.h <<\EOF #define wxUSE_IOSTREAMH 1 EOF else - - ac_ext=cc + + 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 -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu +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 + -for ac_header in iostream + for ac_hdr in iostream do -ac_ac_Header=`echo "ac_cv_header_$ac_header" | $ac_tr_sh` -echo "$as_me:14477: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$ac_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line 14483 "configure" +ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +echo "configure:13418: 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 < -_ACEOF -if { (eval echo "$as_me:14487: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:14493: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_cxx_preproc_warn_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - eval "$ac_ac_Header=yes" +#include <$ac_hdr> +EOF +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (eval echo configure:13428: \"$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 "$as_me: failed program was:" >&5 + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - eval "$ac_ac_Header=no" + rm -rf conftest* + eval "ac_cv_header_$ac_safe=no" fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest* fi -echo "$as_me:14512: result: `eval echo '${'$ac_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$ac_ac_Header'}'`" >&6 -if test `eval echo '${'$ac_ac_Header'}'` = yes; then - cat >>confdefs.h <&6 + ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` + cat >> confdefs.h <&6 fi done - if test "x$HAVE_IOSTREAM" = x ; then - cat >>confdefs.h <<\EOF + + if test "$ac_cv_header_iostream" = "yes" ; then + : + else + cat >> confdefs.h <<\EOF #define wxUSE_IOSTREAMH 1 EOF - else - : fi 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 -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu +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 fi - echo "$as_me:14539: checking if C++ compiler supports bool" >&5 -echo $ECHO_N "checking if C++ compiler supports bool... $ECHO_C" >&6 -if test "${wx_cv_cpp_bool+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_ext=cc + + echo $ac_n "checking if C++ compiler supports bool""... $ac_c" 1>&6 +echo "configure:13476: 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 + + + 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 -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu +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 - cat >conftest.$ac_ext <<_ACEOF -#line 14552 "configure" + + cat > conftest.$ac_ext <&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:14571: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:14574: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:14577: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - + +; return 0; } +EOF +if { (eval echo configure:13503: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + wx_cv_cpp_bool=yes - + else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 - + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + wx_cv_cpp_bool=no - + + fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest* 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 -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu +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 + fi -echo "$as_me:14598: result: $wx_cv_cpp_bool" >&5 -echo "${ECHO_T}$wx_cv_cpp_bool" >&6 + +echo "$ac_t""$wx_cv_cpp_bool" 1>&6 if test "$wx_cv_cpp_bool" = "yes"; then - cat >>confdefs.h <<\EOF + cat >> confdefs.h <<\EOF #define HAVE_BOOL 1 EOF fi -echo "$as_me:14608: checking if you need GNU extensions" >&5 -echo $ECHO_N "checking if you need GNU extensions... $ECHO_C" >&6 -if test "${wx_cv_gnu_extensions+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line 14615 "configure" -#include "confdefs.h" -#include -int -main () -{ -#ifndef __GNU_LIBRARY__ - Compile error wanted -#endif +echo $ac_n "checking for wcslen in -lc""... $ac_c" 1>&6 +echo "configure:13541: 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 +else + ac_save_LIBS="$LIBS" +LIBS="-lc $LIBS" +cat > conftest.$ac_ext <&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:14634: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:14637: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:14640: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - wx_cv_gnu_extensions=yes +int main() { +wcslen() +; return 0; } +EOF +if { (eval echo configure:13560: \"$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 "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -wx_cv_gnu_extensions=no + 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.$ac_objext conftest.$ac_ext +rm -f conftest* +LIBS="$ac_save_LIBS" fi - -echo "$as_me:14652: result: $wx_cv_gnu_extensions" >&5 -echo "${ECHO_T}$wx_cv_gnu_extensions" >&6 -if test "$wx_cv_gnu_extensions" = "yes"; then - cat >>confdefs.h <&6 + + cat >> confdefs.h <<\EOF +#define HAVE_WCSLEN 1 EOF -fi + WCHAR_LINK="" + +else + echo "$ac_t""no" 1>&6 -echo "$as_me:14661: checking for wcslen in -lc" >&5 -echo $ECHO_N "checking for wcslen in -lc... $ECHO_C" >&6 -if test "${ac_cv_lib_c_wcslen+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + echo $ac_n "checking for wcslen in -lw""... $ac_c" 1>&6 +echo "configure:13586: 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 else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lc $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 14669 "configure" + ac_save_LIBS="$LIBS" +LIBS="-lw $LIBS" +cat > conftest.$ac_ext <&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:14691: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:14694: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:14697: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_c_wcslen=yes -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_lib_c_wcslen=no -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:14708: result: $ac_cv_lib_c_wcslen" >&5 -echo "${ECHO_T}$ac_cv_lib_c_wcslen" >&6 -if test $ac_cv_lib_c_wcslen = yes; then - - cat >>confdefs.h <<\EOF -#define HAVE_WCSLEN 1 + builtin and then its argument prototype would still apply. */ +char wcslen(); + +int main() { +wcslen() +; return 0; } EOF +if { (eval echo configure:13605: \"$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 -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" +fi +rm -f conftest* +LIBS="$ac_save_LIBS" - WCHAR_LINK="" +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + + cat >> confdefs.h <<\EOF +#define HAVE_WCSLEN 1 +EOF + WCHAR_LINK="-lw" + else + echo "$ac_t""no" 1>&6 - echo "$as_me:14720: checking for wcslen in -lw" >&5 -echo $ECHO_N "checking for wcslen in -lw... $ECHO_C" >&6 -if test "${ac_cv_lib_w_wcslen+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + echo $ac_n "checking for wcslen in -lmsvcrt""... $ac_c" 1>&6 +echo "configure:13631: checking for wcslen in -lmsvcrt" >&5 +ac_lib_var=`echo msvcrt'_'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 else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lw $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 14728 "configure" + ac_save_LIBS="$LIBS" +LIBS="-lmsvcrt $LIBS" +cat > conftest.$ac_ext <&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:14750: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:14753: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:14756: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_w_wcslen=yes -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_lib_w_wcslen=no -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:14767: result: $ac_cv_lib_w_wcslen" >&5 -echo "${ECHO_T}$ac_cv_lib_w_wcslen" >&6 -if test $ac_cv_lib_w_wcslen = yes; then - - cat >>confdefs.h <<\EOF + builtin and then its argument prototype would still apply. */ +char wcslen(); + +int main() { +wcslen() +; return 0; } +EOF +if { (eval echo configure:13650: \"$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 -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 + + cat >> confdefs.h <<\EOF #define HAVE_WCSLEN 1 EOF - WCHAR_LINK="-lw" + WCHAR_LINK="" + +else + echo "$ac_t""no" 1>&6 +fi + fi + fi -for ac_func in vprintf + +for ac_func in wcsrtombs do -ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh` -echo "$as_me:14784: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 -if eval "test \"\${$ac_ac_var+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line 14790 "configure" +echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +echo "configure:13686: 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. */ -#ifdef __cplusplus -extern "C" -#endif /* 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) (); + builtin and then its argument prototype would still apply. */ +char $ac_func(); + +int main() { -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; +$ac_func(); #endif - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:14821: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:14824: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:14827: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:14830: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - eval "$ac_ac_var=yes" -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -eval "$ac_ac_var=no" -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -fi -echo "$as_me:14840: result: `eval echo '${'$ac_ac_var'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6 -if test `eval echo '${'$ac_ac_var'}'` = yes; then - cat >>confdefs.h <&5 -echo $ECHO_N "checking for _doprnt... $ECHO_C" >&6 -if test "${ac_cv_func__doprnt+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line 14853 "configure" +; return 0; } +EOF +if { (eval echo configure:13714: \"$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 vprintf""... $ac_c" 1>&6 +echo "configure:13740: 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 < /* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char vprintf(); + +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_vprintf) || defined (__stub___vprintf) +choke me +#else +vprintf(); #endif + +; return 0; } +EOF +if { (eval echo configure:13768: \"$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 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_func_vprintf=no" +fi +rm -f conftest* +fi + +if eval "test \"`echo '$ac_cv_func_'vprintf`\" = yes"; then + echo "$ac_t""yes" 1>&6 + cat >> confdefs.h <<\EOF +#define HAVE_VPRINTF 1 +EOF + +else + echo "$ac_t""no" 1>&6 +fi + +if test "$ac_cv_func_vprintf" != yes; then +echo $ac_n "checking for _doprnt""... $ac_c" 1>&6 +echo "configure:13792: 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 < +/* 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 _doprnt (); -char (*f) (); + builtin and then its argument prototype would still apply. */ +char _doprnt(); + +int main() { -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__doprnt) || defined (__stub____doprnt) choke me #else -f = _doprnt; +_doprnt(); #endif - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:14884: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:14887: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:14890: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:14893: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_func__doprnt=yes -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_func__doprnt=no -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -fi -echo "$as_me:14903: result: $ac_cv_func__doprnt" >&5 -echo "${ECHO_T}$ac_cv_func__doprnt" >&6 -if test $ac_cv_func__doprnt = yes; then - -cat >>confdefs.h <<\EOF +; return 0; } +EOF +if { (eval echo configure:13820: \"$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 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_func__doprnt=no" +fi +rm -f conftest* +fi + +if eval "test \"`echo '$ac_cv_func_'_doprnt`\" = yes"; then + echo "$ac_t""yes" 1>&6 + cat >> confdefs.h <<\EOF #define HAVE_DOPRNT 1 EOF +else + echo "$ac_t""no" 1>&6 fi fi -done -echo "$as_me:14916: checking for vsnprintf" >&5 -echo $ECHO_N "checking for vsnprintf... $ECHO_C" >&6 -if test "${wx_cv_func_vsnprintf+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line 14923 "configure" + + + + +echo $ac_n "checking for vsnprintf""... $ac_c" 1>&6 +echo "configure:13850: checking for vsnprintf" >&5 +if eval "test \"`echo '$''{'wx_cv_func_vsnprintf'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + + cat > conftest.$ac_ext < #include - -int -main () -{ + +int main() { int wx_test_vsnprintf(const char *, ...); @@ -14944,40 +13874,27 @@ main () va_start(argp, fmt); vsnprintf(s, 42, fmt, argp); va_end(argp); - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:14953: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:14956: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:14959: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:14962: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - + +; return 0; } +EOF +if { (eval echo configure:13881: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + wx_cv_func_vsnprintf=yes - + else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 - - cat >conftest.$ac_ext <<_ACEOF -#line 14972 "configure" + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + + cat > conftest.$ac_ext < #include - -int -main () -{ + +int main() { int wx_test_vsnprintf(const char *, ...); @@ -14993,68 +13910,54 @@ main () va_start(argp, fmt); _vsnprintf(s, 42, fmt, argp); va_end(argp); - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:15002: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:15005: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:15008: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:15011: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - + +; return 0; } +EOF +if { (eval echo configure:13917: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + wx_cv_func_vsnprintf=yes - + else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 - + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + wx_cv_func_vsnprintf=no - + fi -rm -f conftest.$ac_objext conftest.$ac_ext - +rm -f conftest* + fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest* fi -echo "$as_me:15029: result: $wx_cv_func_vsnprintf" >&5 -echo "${ECHO_T}$wx_cv_func_vsnprintf" >&6 + +echo "$ac_t""$wx_cv_func_vsnprintf" 1>&6 if test "$wx_cv_func_vsnprintf" = yes; then - cat >>confdefs.h <<\EOF + cat >> confdefs.h <<\EOF #define HAVE_VSNPRINTF 1 EOF else - { echo "$as_me:15038: WARNING: unsafe function sprintf will be used instead of snprintf" >&5 -echo "$as_me: WARNING: unsafe function sprintf will be used instead of snprintf" >&2;} + echo "configure: warning: unsafe function sprintf will be used instead of snprintf" 1>&2 fi -echo "$as_me:15042: checking for vsscanf" >&5 -echo $ECHO_N "checking for vsscanf... $ECHO_C" >&6 -if test "${wx_cv_func_vsscanf+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +echo $ac_n "checking for vsscanf""... $ac_c" 1>&6 +echo "configure:13949: checking for vsscanf" >&5 +if eval "test \"`echo '$''{'wx_cv_func_vsscanf'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 else - - cat >conftest.$ac_ext <<_ACEOF -#line 15049 "configure" + + cat > conftest.$ac_ext < #include - -int -main () -{ + +int main() { int wx_test_vsscanf(const char *, ...); @@ -15068,41 +13971,30 @@ main () va_start(argp, fmt); vsscanf("42", fmt, argp); va_end(argp); - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:15077: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:15080: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:15083: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:15086: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - + +; return 0; } +EOF +if { (eval echo configure:13978: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + wx_cv_func_vsscanf=yes - + else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 - + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + wx_cv_func_vsscanf=no - + fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest* fi -echo "$as_me:15101: result: $wx_cv_func_vsscanf" >&5 -echo "${ECHO_T}$wx_cv_func_vsscanf" >&6 + +echo "$ac_t""$wx_cv_func_vsscanf" 1>&6 if test "$wx_cv_func_vsscanf" = yes; then - cat >>confdefs.h <<\EOF + cat >> confdefs.h <<\EOF #define HAVE_VSSCANF 1 EOF @@ -15110,214 +14002,182 @@ fi if test "$TOOLKIT" != "MSW"; then -ac_ext=cc -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -echo "$as_me:15119: checking if iconv() takes char**" >&5 -echo $ECHO_N "checking if iconv() takes char**... $ECHO_C" >&6 -if test "${wx_cv_iconv_takes_char+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line 15126 "configure" +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 if iconv() takes char**""... $ac_c" 1>&6 +echo "configure:14016: checking if iconv() takes char**" >&5 +if eval "test \"`echo '$''{'wx_cv_iconv_takes_char'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + + cat > conftest.$ac_ext < -int -main () -{ +int main() { char **inbuf, **outbuf; - iconv_t cd; - size_t insz, outsz; - iconv(cd, inbuf, &insz, outbuf, &outsz); - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:15143: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:15146: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:15149: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:15152: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + iconv_t cd; + size_t insz, outsz; + iconv(cd, inbuf, &insz, outbuf, &outsz); + +; return 0; } +EOF +if { (eval echo configure:14034: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* wx_cv_iconv_takes_char=yes else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -wx_cv_iconv_takes_char=no + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + wx_cv_iconv_takes_char=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest* fi -echo "$as_me:15163: result: $wx_cv_iconv_takes_char" >&5 -echo "${ECHO_T}$wx_cv_iconv_takes_char" >&6 + +echo "$ac_t""$wx_cv_iconv_takes_char" 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 -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu +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 if test "$wx_cv_iconv_takes_char" = yes ; then - cat >>confdefs.h <<\EOF + cat >> confdefs.h <<\EOF #define WX_ICONV_TAKES_CHAR 1 EOF fi -if test "$wxUSE_ON_FATAL_EXCEPTION" = "yes" -a "$wxUSE_UNIX" = "yes"; then -for ac_func in sigaction +if test "$wxUSE_ON_FATAL_EXCEPTION" = "yes" -a "$wxUSE_UNIX" = "yes"; then + for ac_func in sigaction do -ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh` -echo "$as_me:15183: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 -if eval "test \"\${$ac_ac_var+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line 15189 "configure" +echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +echo "configure:14067: 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. */ -#ifdef __cplusplus -extern "C" -#endif /* 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) (); + builtin and then its argument prototype would still apply. */ +char $ac_func(); + +int main() { -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; +$ac_func(); #endif - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:15220: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:15223: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:15226: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:15229: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - eval "$ac_ac_var=yes" -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -eval "$ac_ac_var=no" -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -fi -echo "$as_me:15239: result: `eval echo '${'$ac_ac_var'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6 -if test `eval echo '${'$ac_ac_var'}'` = yes; then - cat >>confdefs.h <&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 + if test "$ac_cv_func_sigaction" = "no"; then - { echo "$as_me:15250: WARNING: No POSIX signal functions on this system, wxApp::OnFatalException will not be called" >&5 -echo "$as_me: WARNING: No POSIX signal functions on this system, wxApp::OnFatalException will not be called" >&2;} + echo "configure: warning: No POSIX signal functions on this system, wxApp::OnFatalException will not be called" 1>&2 wxUSE_ON_FATAL_EXCEPTION=no fi if test "$wxUSE_ON_FATAL_EXCEPTION" = "yes"; then - - ac_ext=cc + + 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 -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu +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 "$as_me:15263: checking for sa_handler type" >&5 -echo $ECHO_N "checking for sa_handler type... $ECHO_C" >&6 -if test "${wx_cv_type_sa_handler+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line 15270 "configure" + echo $ac_n "checking for sa_handler type""... $ac_c" 1>&6 +echo "configure:14136: checking for sa_handler type" >&5 +if eval "test \"`echo '$''{'wx_cv_type_sa_handler'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + + cat > conftest.$ac_ext < -int -main () -{ +int main() { extern void testSigHandler(int); struct sigaction sa; sa.sa_handler = testSigHandler; - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:15287: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:15290: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:15293: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:15296: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - + +; return 0; } +EOF +if { (eval echo configure:14154: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + wx_cv_type_sa_handler=int - + else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 - + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + wx_cv_type_sa_handler=void - + fi -rm -f conftest.$ac_objext conftest.$ac_ext - +rm -f conftest* + fi -echo "$as_me:15311: result: $wx_cv_type_sa_handler" >&5 -echo "${ECHO_T}$wx_cv_type_sa_handler" >&6 + +echo "$ac_t""$wx_cv_type_sa_handler" 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 -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu +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 - cat >>confdefs.h <> confdefs.h <&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 -if eval "test \"\${$ac_ac_var+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line 15336 "configure" +echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +echo "configure:14191: 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. */ -#ifdef __cplusplus -extern "C" -#endif /* 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) (); + builtin and then its argument prototype would still apply. */ +char $ac_func(); + +int main() { -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; +$ac_func(); #endif - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:15367: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:15370: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:15373: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:15376: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - eval "$ac_ac_var=yes" -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -eval "$ac_ac_var=no" -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -fi -echo "$as_me:15386: result: `eval echo '${'$ac_ac_var'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6 -if test `eval echo '${'$ac_ac_var'}'` = yes; then - cat >>confdefs.h <&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 -if test "$wxUSE_SNGLINST_CHECKER" = "yes"; then -for ac_func in fcntl flock +echo $ac_n "checking for statfs""... $ac_c" 1>&6 +echo "configure:14245: checking for statfs" >&5 +if eval "test \"`echo '$''{'wx_cv_func_statfs'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext < + #include + #else + #include + #endif + +int main() { + + long l; + struct statfs fs; + statfs("/", &fs); + l = fs.f_bsize; + l += fs.f_blocks; + l += fs.f_bavail; + +; return 0; } +EOF +if { (eval echo configure:14271: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + + wx_cv_func_statfs=yes + +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + + wx_cv_func_statfs=no + + +fi +rm -f conftest* + +fi + +echo "$ac_t""$wx_cv_func_statfs" 1>&6 + +if test "$wx_cv_func_statfs" = "yes"; then + cat >> confdefs.h <<\EOF +#define HAVE_STATFS 1 +EOF + +else + echo $ac_n "checking for statvfs""... $ac_c" 1>&6 +echo "configure:14298: checking for statvfs" >&5 +if eval "test \"`echo '$''{'wx_cv_func_statvfs'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext < + +int main() { + + long l; + struct statvfs fs; + statvfs("/", &fs); + l = fs.f_bsize; + l += fs.f_blocks; + l += fs.f_bavail; + +; return 0; } +EOF +if { (eval echo configure:14319: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + + wx_cv_func_statvfs=yes + +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + + wx_cv_func_statvfs=no + + +fi +rm -f conftest* + +fi + +echo "$ac_t""$wx_cv_func_statvfs" 1>&6 + + if test "$wx_cv_func_statvfs" = "yes"; then + cat >> confdefs.h <<\EOF +#define HAVE_STATVFS 1 +EOF + + else + echo "configure: warning: wxGetDiskSpace() function won't work without statfs()" 1>&2 + fi +fi + +if test "$wxUSE_SNGLINST_CHECKER" = "yes"; then + for ac_func in fcntl flock do -ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh` -echo "$as_me:15401: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 -if eval "test \"\${$ac_ac_var+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line 15407 "configure" +echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +echo "configure:14353: 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. */ -#ifdef __cplusplus -extern "C" -#endif /* 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) (); + builtin and then its argument prototype would still apply. */ +char $ac_func(); + +int main() { -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; +$ac_func(); #endif - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:15438: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:15441: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:15444: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:15447: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - eval "$ac_ac_var=yes" -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -eval "$ac_ac_var=no" -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -fi -echo "$as_me:15457: result: `eval echo '${'$ac_ac_var'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6 -if test `eval echo '${'$ac_ac_var'}'` = yes; then - cat >>confdefs.h <&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 + if test "$ac_cv_func_fcntl" != "yes" -a "$ac_cv_func_flock" != "yes"; then - { echo "$as_me:15468: WARNING: wxSingleInstanceChecker not available" >&5 -echo "$as_me: WARNING: wxSingleInstanceChecker not available" >&2;} + echo "configure: warning: wxSingleInstanceChecker not available" 1>&2 wxUSE_SNGLINST_CHECKER=no fi fi for ac_func in timegm do -ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh` -echo "$as_me:15477: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 -if eval "test \"\${$ac_ac_var+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line 15483 "configure" +echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +echo "configure:14415: 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. */ -#ifdef __cplusplus -extern "C" -#endif /* 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) (); + builtin and then its argument prototype would still apply. */ +char $ac_func(); + +int main() { -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; +$ac_func(); #endif - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:15514: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:15517: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:15520: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:15523: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - eval "$ac_ac_var=yes" -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -eval "$ac_ac_var=no" -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -fi -echo "$as_me:15533: result: `eval echo '${'$ac_ac_var'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6 -if test `eval echo '${'$ac_ac_var'}'` = yes; then - cat >>confdefs.h <&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 putenv setenv do -ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh` -echo "$as_me:15546: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 -if eval "test \"\${$ac_ac_var+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line 15552 "configure" +echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +echo "configure:14471: 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. */ -#ifdef __cplusplus -extern "C" -#endif /* 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) (); + builtin and then its argument prototype would still apply. */ +char $ac_func(); + +int main() { -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; +$ac_func(); #endif - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:15583: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:15586: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:15589: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:15592: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - eval "$ac_ac_var=yes" -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -eval "$ac_ac_var=no" -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -fi -echo "$as_me:15602: result: `eval echo '${'$ac_ac_var'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6 -if test `eval echo '${'$ac_ac_var'}'` = yes; then - cat >>confdefs.h <&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 + HAVE_SOME_SLEEP_FUNC=0 if test "$USE_BEOS" = 1; then - cat >>confdefs.h <<\EOF + cat >> confdefs.h <<\EOF #define HAVE_SLEEP 1 EOF HAVE_SOME_SLEEP_FUNC=1 fi -if test "$USE_MAC" = 1; then - cat >>confdefs.h <<\EOF +if test "$USE_DARWIN" = 1; then + cat >> confdefs.h <<\EOF #define HAVE_USLEEP 1 EOF @@ -15628,215 +14539,172 @@ fi if test "$HAVE_SOME_SLEEP_FUNC" != 1; then POSIX4_LINK= - -for ac_func in nanosleep + for ac_func in nanosleep do -ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh` -echo "$as_me:15635: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 -if eval "test \"\${$ac_ac_var+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line 15641 "configure" +echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +echo "configure:14546: 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. */ -#ifdef __cplusplus -extern "C" -#endif /* 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) (); + builtin and then its argument prototype would still apply. */ +char $ac_func(); + +int main() { -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; +$ac_func(); #endif - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:15672: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:15675: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:15678: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:15681: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - eval "$ac_ac_var=yes" -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -eval "$ac_ac_var=no" -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -fi -echo "$as_me:15691: result: `eval echo '${'$ac_ac_var'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6 -if test `eval echo '${'$ac_ac_var'}'` = yes; then - cat >>confdefs.h <>confdefs.h <<\EOF +; return 0; } +EOF +if { (eval echo configure:14574: \"$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 <> confdefs.h <<\EOF #define HAVE_NANOSLEEP 1 EOF else - - echo "$as_me:15703: checking for nanosleep in -lposix4" >&5 -echo $ECHO_N "checking for nanosleep in -lposix4... $ECHO_C" >&6 -if test "${ac_cv_lib_posix4_nanosleep+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + echo "$ac_t""no" 1>&6 +echo $ac_n "checking for nanosleep in -lposix4""... $ac_c" 1>&6 +echo "configure:14599: 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 else - ac_check_lib_save_LIBS=$LIBS + ac_save_LIBS="$LIBS" LIBS="-lposix4 $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 15711 "configure" +cat > conftest.$ac_ext <&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:15733: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:15736: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:15739: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_posix4_nanosleep=yes -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_lib_posix4_nanosleep=no -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:15750: result: $ac_cv_lib_posix4_nanosleep" >&5 -echo "${ECHO_T}$ac_cv_lib_posix4_nanosleep" >&6 -if test $ac_cv_lib_posix4_nanosleep = yes; then - - cat >>confdefs.h <<\EOF + builtin and then its argument prototype would still apply. */ +char nanosleep(); + +int main() { +nanosleep() +; return 0; } +EOF +if { (eval echo configure:14618: \"$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 -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 + + cat >> confdefs.h <<\EOF #define HAVE_NANOSLEEP 1 EOF POSIX4_LINK="-lposix4" - + else + echo "$ac_t""no" 1>&6 -for ac_func in usleep + for ac_func in usleep do -ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh` -echo "$as_me:15765: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 -if eval "test \"\${$ac_ac_var+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line 15771 "configure" +echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +echo "configure:14646: 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. */ -#ifdef __cplusplus -extern "C" -#endif /* 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) (); + builtin and then its argument prototype would still apply. */ +char $ac_func(); + +int main() { -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; +$ac_func(); #endif - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:15802: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:15805: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:15808: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:15811: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - eval "$ac_ac_var=yes" -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -eval "$ac_ac_var=no" -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -fi -echo "$as_me:15821: result: `eval echo '${'$ac_ac_var'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6 -if test `eval echo '${'$ac_ac_var'}'` = yes; then - cat >>confdefs.h <>confdefs.h <<\EOF +; return 0; } +EOF +if { (eval echo configure:14674: \"$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 <> confdefs.h <<\EOF #define HAVE_USLEEP 1 EOF else - { echo "$as_me:15832: WARNING: wxSleep() function will not work" >&5 -echo "$as_me: WARNING: wxSleep() function will not work" >&2;} - + echo "$ac_t""no" 1>&6 +echo "configure: warning: wxSleep() function will not work" 1>&2 + fi done + + fi + + fi done @@ -15844,471 +14712,385 @@ fi for ac_func in uname gethostname do -ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh` -echo "$as_me:15848: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 -if eval "test \"\${$ac_ac_var+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line 15854 "configure" +echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +echo "configure:14717: 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. */ -#ifdef __cplusplus -extern "C" -#endif /* 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) (); + builtin and then its argument prototype would still apply. */ +char $ac_func(); + +int main() { -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; +$ac_func(); #endif - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:15885: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:15888: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:15891: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:15894: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - eval "$ac_ac_var=yes" -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -eval "$ac_ac_var=no" -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -fi -echo "$as_me:15904: result: `eval echo '${'$ac_ac_var'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6 -if test `eval echo '${'$ac_ac_var'}'` = yes; then - cat >>confdefs.h <&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 -ac_ext=cc + + +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 -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu +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 + for ac_func in strtok_r do -ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh` -echo "$as_me:15923: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 -if eval "test \"\${$ac_ac_var+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line 15929 "configure" +echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +echo "configure:14782: 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. */ #ifdef __cplusplus extern "C" #endif /* 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) (); + builtin and then its argument prototype would still apply. */ +char $ac_func(); + +int main() { -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; +$ac_func(); #endif - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:15960: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:15963: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:15966: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:15969: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - eval "$ac_ac_var=yes" -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -eval "$ac_ac_var=no" -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -fi -echo "$as_me:15979: result: `eval echo '${'$ac_ac_var'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6 -if test `eval echo '${'$ac_ac_var'}'` = yes; then - cat >>confdefs.h <&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 + 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 -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu +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 -INET_LINK= +INET_LINK= for ac_func in inet_addr do -ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh` -echo "$as_me:16000: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 -if eval "test \"\${$ac_ac_var+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line 16006 "configure" +echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +echo "configure:14850: 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. */ -#ifdef __cplusplus -extern "C" -#endif /* 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) (); + builtin and then its argument prototype would still apply. */ +char $ac_func(); + +int main() { -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; +$ac_func(); #endif - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:16037: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:16040: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:16043: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:16046: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - eval "$ac_ac_var=yes" -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -eval "$ac_ac_var=no" -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -fi -echo "$as_me:16056: result: `eval echo '${'$ac_ac_var'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6 -if test `eval echo '${'$ac_ac_var'}'` = yes; then - cat >>confdefs.h <>confdefs.h <<\EOF +; return 0; } +EOF +if { (eval echo configure:14878: \"$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 <> confdefs.h <<\EOF #define HAVE_INET_ADDR 1 EOF else - - echo "$as_me:16068: checking for inet_addr in -lnsl" >&5 -echo $ECHO_N "checking for inet_addr in -lnsl... $ECHO_C" >&6 -if test "${ac_cv_lib_nsl_inet_addr+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + echo "$ac_t""no" 1>&6 +echo $ac_n "checking for inet_addr in -lnsl""... $ac_c" 1>&6 +echo "configure:14903: checking for inet_addr in -lnsl" >&5 +ac_lib_var=`echo nsl'_'inet_addr | 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_check_lib_save_LIBS=$LIBS + ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 16076 "configure" +cat > conftest.$ac_ext <&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:16098: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:16101: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:16104: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_nsl_inet_addr=yes -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_lib_nsl_inet_addr=no -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:16115: result: $ac_cv_lib_nsl_inet_addr" >&5 -echo "${ECHO_T}$ac_cv_lib_nsl_inet_addr" >&6 -if test $ac_cv_lib_nsl_inet_addr = yes; then + builtin and then its argument prototype would still apply. */ +char inet_addr(); + +int main() { +inet_addr() +; return 0; } +EOF +if { (eval echo configure:14922: \"$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 -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 INET_LINK="nsl" else - echo "$as_me:16120: checking for inet_addr in -lresolv" >&5 -echo $ECHO_N "checking for inet_addr in -lresolv... $ECHO_C" >&6 -if test "${ac_cv_lib_resolv_inet_addr+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + echo "$ac_t""no" 1>&6 +echo $ac_n "checking for inet_addr in -lresolv""... $ac_c" 1>&6 +echo "configure:14941: checking for inet_addr in -lresolv" >&5 +ac_lib_var=`echo resolv'_'inet_addr | 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_check_lib_save_LIBS=$LIBS + ac_save_LIBS="$LIBS" LIBS="-lresolv $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 16128 "configure" +cat > conftest.$ac_ext <&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:16150: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:16153: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:16156: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_resolv_inet_addr=yes -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_lib_resolv_inet_addr=no -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:16167: result: $ac_cv_lib_resolv_inet_addr" >&5 -echo "${ECHO_T}$ac_cv_lib_resolv_inet_addr" >&6 -if test $ac_cv_lib_resolv_inet_addr = yes; then - INET_LINK="resolv" + builtin and then its argument prototype would still apply. */ +char inet_addr(); + +int main() { +inet_addr() +; return 0; } +EOF +if { (eval echo configure:14960: \"$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 -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 + INET_LINK="resolv" + +else + echo "$ac_t""no" 1>&6 +fi + fi + + fi done + for ac_func in inet_aton do -ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh` -echo "$as_me:16182: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 -if eval "test \"\${$ac_ac_var+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line 16188 "configure" +echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +echo "configure:14993: 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. */ -#ifdef __cplusplus -extern "C" -#endif /* 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) (); + builtin and then its argument prototype would still apply. */ +char $ac_func(); + +int main() { -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; +$ac_func(); #endif - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:16219: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:16222: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:16225: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:16228: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - eval "$ac_ac_var=yes" -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -eval "$ac_ac_var=no" -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -fi -echo "$as_me:16238: result: `eval echo '${'$ac_ac_var'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6 -if test `eval echo '${'$ac_ac_var'}'` = yes; then - cat >>confdefs.h <>confdefs.h <<\EOF +; return 0; } +EOF +if { (eval echo configure:15021: \"$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 <> confdefs.h <<\EOF #define HAVE_INET_ATON 1 EOF else - - ac_ac_Lib=`echo "ac_cv_lib_$INET_LINK_inet_aton" | $ac_tr_sh` -echo "$as_me:16251: checking for inet_aton in -l$INET_LINK" >&5 -echo $ECHO_N "checking for inet_aton in -l$INET_LINK... $ECHO_C" >&6 -if eval "test \"\${$ac_ac_Lib+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + echo "$ac_t""no" 1>&6 + echo $ac_n "checking for inet_aton in -l$INET_LINK""... $ac_c" 1>&6 +echo "configure:15046: checking for inet_aton in -l$INET_LINK" >&5 +ac_lib_var=`echo $INET_LINK'_'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_check_lib_save_LIBS=$LIBS + ac_save_LIBS="$LIBS" LIBS="-l$INET_LINK $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 16259 "configure" +cat > conftest.$ac_ext <&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:16281: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:16284: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:16287: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - eval "$ac_ac_Lib=yes" -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -eval "$ac_ac_Lib=no" -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:16298: result: `eval echo '${'$ac_ac_Lib'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$ac_ac_Lib'}'`" >&6 -if test `eval echo '${'$ac_ac_Lib'}'` = yes; then - cat >>confdefs.h <<\EOF + builtin and then its argument prototype would still apply. */ +char inet_aton(); + +int main() { +inet_aton() +; return 0; } +EOF +if { (eval echo configure:15065: \"$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 -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 + cat >> confdefs.h <<\EOF #define HAVE_INET_ATON 1 EOF +else + echo "$ac_t""no" 1>&6 fi + fi done + if test "x$INET_LINK" != "x"; then - cat >>confdefs.h <<\EOF + cat >> confdefs.h <<\EOF #define HAVE_INET_ADDR 1 EOF @@ -16317,951 +15099,763 @@ fi fi -cat >confcache <<\_ACEOF + +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, see configure's option --config-cache. -# It is not useful on other systems. If it contains results you don't -# want to keep, you may remove or edit it. +# 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. # -# config.status only pays attention to the cache file if you give it -# the --recheck option to rerun configure. +# 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. # -# `ac_cv_env_foo' variables (set or unset) will be overriden when -# loading this file, other *unset* `ac_cv_foo' will be assigned the -# following values. - -_ACEOF - +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 \ - "s/'/'\\\\''/g; - s/^\\([_$ac_cr_alnum]*_cv_[_$ac_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" - ;; - *) - # `set' quotes correctly as required by POSIX, so do not add quotes. - sed -n \ - "s/^\\([_$ac_cr_alnum]*_cv_[_$ac_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" - ;; - esac; -} | - sed ' - t clear - : clear - s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ - t end - /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ - : end' >>confcache -if cmp -s $cache_file confcache; then :; else +(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 - test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file" - cat confcache >$cache_file + echo "updating cache $cache_file" + cat confcache > $cache_file else echo "not updating unwritable cache $cache_file" fi fi rm -f confcache + + if test "$TOOLKIT" != "MSW"; then -THREADS_LINK="" -THREADS_OBJ="" + +THREADS_LINK= +THREADS_OBJ= +CODE_GEN_FLAGS= +CODE_GEN_FLAGS_CXX= if test "$wxUSE_THREADS" = "yes" ; then if test "$wxUSE_WINE" = 1 ; then - { echo "$as_me:16382: WARNING: Threads are not supported under WINE" >&5 -echo "$as_me: WARNING: Threads are not supported under WINE" >&2;} + echo "configure: warning: Threads are not supported under WINE" 1>&2 wxUSE_THREADS="no" elif test "$USE_BEOS" = 1; then - { echo "$as_me:16386: WARNING: BeOS threads are not yet supported" >&5 -echo "$as_me: WARNING: BeOS threads are not yet supported" >&2;} + echo "configure: warning: BeOS threads are not yet supported" 1>&2 wxUSE_THREADS="no" fi fi if test "$wxUSE_THREADS" = "yes" ; then - + if test "$USE_AIX" = 1; then THREADS_LIB=pthreads else THREADS_LIB=pthread fi - ac_ac_Lib=`echo "ac_cv_lib_$THREADS_LIB_pthread_create" | $ac_tr_sh` -echo "$as_me:16401: checking for pthread_create in -l$THREADS_LIB" >&5 -echo $ECHO_N "checking for pthread_create in -l$THREADS_LIB... $ECHO_C" >&6 -if eval "test \"\${$ac_ac_Lib+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + echo $ac_n "checking for pthread_create in -l$THREADS_LIB""... $ac_c" 1>&6 +echo "configure:15180: checking for pthread_create in -l$THREADS_LIB" >&5 +ac_lib_var=`echo $THREADS_LIB'_'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 else - ac_check_lib_save_LIBS=$LIBS + ac_save_LIBS="$LIBS" LIBS="-l$THREADS_LIB $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 16409 "configure" +cat > conftest.$ac_ext <&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:16431: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:16434: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:16437: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - eval "$ac_ac_Lib=yes" -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -eval "$ac_ac_Lib=no" -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:16448: result: `eval echo '${'$ac_ac_Lib'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$ac_ac_Lib'}'`" >&6 -if test `eval echo '${'$ac_ac_Lib'}'` = yes; then + builtin and then its argument prototype would still apply. */ +char pthread_create(); + +int main() { +pthread_create() +; return 0; } +EOF +if { (eval echo configure:15199: \"$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 -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 + THREADS_OBJ="threadpsx.lo" THREADS_LINK=$THREADS_LIB - + else + echo "$ac_t""no" 1>&6 - echo "$as_me:16457: checking for pthread_create in -lc_r" >&5 -echo $ECHO_N "checking for pthread_create in -lc_r... $ECHO_C" >&6 -if test "${ac_cv_lib_c_r_pthread_create+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6 +echo "configure:15222: 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 else - ac_check_lib_save_LIBS=$LIBS + ac_save_LIBS="$LIBS" LIBS="-lc_r $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 16465 "configure" +cat > conftest.$ac_ext <&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:16487: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:16490: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:16493: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_c_r_pthread_create=yes -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_lib_c_r_pthread_create=no -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:16504: result: $ac_cv_lib_c_r_pthread_create" >&5 -echo "${ECHO_T}$ac_cv_lib_c_r_pthread_create" >&6 -if test $ac_cv_lib_c_r_pthread_create = yes; then + builtin and then its argument prototype would still apply. */ +char pthread_create(); + +int main() { +pthread_create() +; return 0; } +EOF +if { (eval echo configure:15241: \"$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 -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 + THREADS_OBJ="threadpsx.lo" THREADS_LINK="c_r" - + else + echo "$ac_t""no" 1>&6 - echo "$as_me:16513: checking for sys/prctl.h" >&5 -echo $ECHO_N "checking for sys/prctl.h... $ECHO_C" >&6 -if test "${ac_cv_header_sys_prctl_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + ac_safe=`echo "sys/prctl.h" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for sys/prctl.h""... $ac_c" 1>&6 +echo "configure:15265: 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 <<_ACEOF -#line 16519 "configure" + cat > conftest.$ac_ext < -_ACEOF -if { (eval echo "$as_me:16523: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:16529: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - ac_cv_header_sys_prctl_h=yes +EOF +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (eval echo configure:15275: \"$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 "$as_me: failed program was:" >&5 + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - ac_cv_header_sys_prctl_h=no + rm -rf conftest* + eval "ac_cv_header_$ac_safe=no" fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest* fi -echo "$as_me:16548: result: $ac_cv_header_sys_prctl_h" >&5 -echo "${ECHO_T}$ac_cv_header_sys_prctl_h" >&6 -if test $ac_cv_header_sys_prctl_h = yes; then - +if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then + echo "$ac_t""yes" 1>&6 + THREADS_OBJ="threadsgi.lo" - + +else + echo "$ac_t""no" 1>&6 fi + fi + fi + if test -z "$THREADS_OBJ" ; then wxUSE_THREADS=no - { echo "$as_me:16562: WARNING: No thread support on this system" >&5 -echo "$as_me: WARNING: No thread support on this system" >&2;} + echo "configure: warning: No thread support on this system" 1>&2 fi fi if test "$wxUSE_THREADS" = "yes" ; then - -for ac_func in thr_setconcurrency + for ac_func in thr_setconcurrency do -ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh` -echo "$as_me:16572: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 -if eval "test \"\${$ac_ac_var+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line 16578 "configure" +echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +echo "configure:15315: 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. */ -#ifdef __cplusplus -extern "C" -#endif /* 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) (); + builtin and then its argument prototype would still apply. */ +char $ac_func(); + +int main() { -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; +$ac_func(); #endif - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:16609: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:16612: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:16615: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:16618: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - eval "$ac_ac_var=yes" -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -eval "$ac_ac_var=no" -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -fi -echo "$as_me:16628: result: `eval echo '${'$ac_ac_var'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6 -if test `eval echo '${'$ac_ac_var'}'` = yes; then - cat >>confdefs.h <&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_header in sched.h + + + for ac_hdr in sched.h do -ac_ac_Header=`echo "ac_cv_header_$ac_header" | $ac_tr_sh` -echo "$as_me:16641: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$ac_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line 16647 "configure" +ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +echo "configure:15373: 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 < -_ACEOF -if { (eval echo "$as_me:16651: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:16657: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - eval "$ac_ac_Header=yes" +#include <$ac_hdr> +EOF +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (eval echo configure:15383: \"$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 "$as_me: failed program was:" >&5 + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - eval "$ac_ac_Header=no" + rm -rf conftest* + eval "ac_cv_header_$ac_safe=no" fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest* fi -echo "$as_me:16676: result: `eval echo '${'$ac_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$ac_ac_Header'}'`" >&6 -if test `eval echo '${'$ac_ac_Header'}'` = yes; then - cat >>confdefs.h <&6 + ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` + cat >> confdefs.h <&6 fi done - ac_ac_Lib=`echo "ac_cv_lib_$THREADS_LINK_sched_yield" | $ac_tr_sh` -echo "$as_me:16687: checking for sched_yield in -l$THREADS_LINK" >&5 -echo $ECHO_N "checking for sched_yield in -l$THREADS_LINK... $ECHO_C" >&6 -if eval "test \"\${$ac_ac_Lib+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + + echo $ac_n "checking for sched_yield in -l$THREADS_LINK""... $ac_c" 1>&6 +echo "configure:15411: 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 else - ac_check_lib_save_LIBS=$LIBS + ac_save_LIBS="$LIBS" LIBS="-l$THREADS_LINK $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 16695 "configure" +cat > conftest.$ac_ext <&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:16717: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:16720: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:16723: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - eval "$ac_ac_Lib=yes" -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -eval "$ac_ac_Lib=no" -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:16734: result: `eval echo '${'$ac_ac_Lib'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$ac_ac_Lib'}'`" >&6 -if test `eval echo '${'$ac_ac_Lib'}'` = yes; then - cat >>confdefs.h <<\EOF + builtin and then its argument prototype would still apply. */ +char sched_yield(); + +int main() { +sched_yield() +; return 0; } +EOF +if { (eval echo configure:15430: \"$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 -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 + cat >> confdefs.h <<\EOF #define HAVE_SCHED_YIELD 1 EOF else - echo "$as_me:16742: checking for sched_yield in -lposix4" >&5 -echo $ECHO_N "checking for sched_yield in -lposix4... $ECHO_C" >&6 -if test "${ac_cv_lib_posix4_sched_yield+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + echo "$ac_t""no" 1>&6 +echo $ac_n "checking for sched_yield in -lposix4""... $ac_c" 1>&6 +echo "configure:15452: checking for sched_yield in -lposix4" >&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 else - ac_check_lib_save_LIBS=$LIBS + ac_save_LIBS="$LIBS" LIBS="-lposix4 $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 16750 "configure" +cat > conftest.$ac_ext <&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:16772: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:16775: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:16778: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_posix4_sched_yield=yes -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_lib_posix4_sched_yield=no -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:16789: result: $ac_cv_lib_posix4_sched_yield" >&5 -echo "${ECHO_T}$ac_cv_lib_posix4_sched_yield" >&6 -if test $ac_cv_lib_posix4_sched_yield = yes; then - cat >>confdefs.h <<\EOF + builtin and then its argument prototype would still apply. */ +char sched_yield(); + +int main() { +sched_yield() +; return 0; } +EOF +if { (eval echo configure:15471: \"$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 -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 + cat >> confdefs.h <<\EOF #define HAVE_SCHED_YIELD 1 EOF POSIX4_LINK="-lposix4" else - { echo "$as_me:16797: WARNING: wxThread::Yield will not work properly" >&5 -echo "$as_me: WARNING: wxThread::Yield will not work properly" >&2;} - + echo "$ac_t""no" 1>&6 +echo "configure: warning: wxThread::Yield will not work properly" 1>&2 + fi + fi + HAVE_PRIOR_FUNCS=0 - ac_ac_Lib=`echo "ac_cv_lib_$THREADS_LINK_pthread_attr_getschedpolicy" | $ac_tr_sh` -echo "$as_me:16806: checking for pthread_attr_getschedpolicy in -l$THREADS_LINK" >&5 -echo $ECHO_N "checking for pthread_attr_getschedpolicy in -l$THREADS_LINK... $ECHO_C" >&6 -if eval "test \"\${$ac_ac_Lib+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + echo $ac_n "checking for pthread_attr_getschedpolicy in -l$THREADS_LINK""... $ac_c" 1>&6 +echo "configure:15502: 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 else - ac_check_lib_save_LIBS=$LIBS + ac_save_LIBS="$LIBS" LIBS="-l$THREADS_LINK $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 16814 "configure" +cat > conftest.$ac_ext <&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:16836: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:16839: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:16842: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - eval "$ac_ac_Lib=yes" -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -eval "$ac_ac_Lib=no" -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:16853: result: `eval echo '${'$ac_ac_Lib'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$ac_ac_Lib'}'`" >&6 -if test `eval echo '${'$ac_ac_Lib'}'` = yes; then - ac_ac_Lib=`echo "ac_cv_lib_$THREADS_LINK_pthread_attr_setschedparam" | $ac_tr_sh` -echo "$as_me:16857: checking for pthread_attr_setschedparam in -l$THREADS_LINK" >&5 -echo $ECHO_N "checking for pthread_attr_setschedparam in -l$THREADS_LINK... $ECHO_C" >&6 -if eval "test \"\${$ac_ac_Lib+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-l$THREADS_LINK $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 16865 "configure" -#include "confdefs.h" + builtin and then its argument prototype would still apply. */ +char pthread_attr_getschedpolicy(); -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char pthread_attr_setschedparam (); -int -main () -{ -pthread_attr_setschedparam (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:16884: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:16887: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:16890: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:16893: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - eval "$ac_ac_Lib=yes" -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -eval "$ac_ac_Lib=no" -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:16904: result: `eval echo '${'$ac_ac_Lib'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$ac_ac_Lib'}'`" >&6 -if test `eval echo '${'$ac_ac_Lib'}'` = yes; then - ac_ac_Lib=`echo "ac_cv_lib_$THREADS_LINK_sched_get_priority_max" | $ac_tr_sh` -echo "$as_me:16908: checking for sched_get_priority_max in -l$THREADS_LINK" >&5 -echo $ECHO_N "checking for sched_get_priority_max in -l$THREADS_LINK... $ECHO_C" >&6 -if eval "test \"\${$ac_ac_Lib+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS +int main() { +pthread_attr_getschedpolicy() +; return 0; } +EOF +if { (eval echo configure:15521: \"$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 -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 + echo $ac_n "checking for pthread_attr_setschedparam in -l$THREADS_LINK""... $ac_c" 1>&6 +echo "configure:15537: checking for pthread_attr_setschedparam in -l$THREADS_LINK" >&5 +ac_lib_var=`echo $THREADS_LINK'_'pthread_attr_setschedparam | 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="-l$THREADS_LINK $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 16916 "configure" +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 + echo $ac_n "checking for sched_get_priority_max in -l$THREADS_LINK""... $ac_c" 1>&6 +echo "configure:15572: checking for sched_get_priority_max in -l$THREADS_LINK" >&5 +ac_lib_var=`echo $THREADS_LINK'_'sched_get_priority_max | 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="-l$THREADS_LINK $LIBS" +cat > conftest.$ac_ext <&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:16938: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:16941: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:16944: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - eval "$ac_ac_Lib=yes" -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -eval "$ac_ac_Lib=no" -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:16955: result: `eval echo '${'$ac_ac_Lib'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$ac_ac_Lib'}'`" >&6 -if test `eval echo '${'$ac_ac_Lib'}'` = yes; then + builtin and then its argument prototype would still apply. */ +char sched_get_priority_max(); + +int main() { +sched_get_priority_max() +; return 0; } +EOF +if { (eval echo configure:15591: \"$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 -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 HAVE_PRIOR_FUNCS=1 else - echo "$as_me:16960: checking for sched_get_priority_max in -lposix4" >&5 -echo $ECHO_N "checking for sched_get_priority_max in -lposix4... $ECHO_C" >&6 -if test "${ac_cv_lib_posix4_sched_get_priority_max+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + echo "$ac_t""no" 1>&6 +echo $ac_n "checking for sched_get_priority_max in -lposix4""... $ac_c" 1>&6 +echo "configure:15610: checking for sched_get_priority_max in -lposix4" >&5 +ac_lib_var=`echo posix4'_'sched_get_priority_max | 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_check_lib_save_LIBS=$LIBS + ac_save_LIBS="$LIBS" LIBS="-lposix4 $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 16968 "configure" +cat > conftest.$ac_ext <&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:16990: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:16993: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:16996: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_posix4_sched_get_priority_max=yes -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_lib_posix4_sched_get_priority_max=no -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:17007: result: $ac_cv_lib_posix4_sched_get_priority_max" >&5 -echo "${ECHO_T}$ac_cv_lib_posix4_sched_get_priority_max" >&6 -if test $ac_cv_lib_posix4_sched_get_priority_max = yes; then + builtin and then its argument prototype would still apply. */ +char sched_get_priority_max(); + +int main() { +sched_get_priority_max() +; return 0; } +EOF +if { (eval echo configure:15629: \"$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 -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 + HAVE_PRIOR_FUNCS=1 POSIX4_LINK="-lposix4" - + +else + echo "$ac_t""no" 1>&6 fi + fi + +else + echo "$ac_t""no" 1>&6 fi + +else + echo "$ac_t""no" 1>&6 fi + if test "$HAVE_PRIOR_FUNCS" = 1; then - cat >>confdefs.h <<\EOF + cat >> confdefs.h <<\EOF #define HAVE_THREAD_PRIORITY_FUNCTIONS 1 EOF else - { echo "$as_me:17028: WARNING: Setting thread priority will not work" >&5 -echo "$as_me: WARNING: Setting thread priority will not work" >&2;} + echo "configure: warning: Setting thread priority will not work" 1>&2 fi - ac_ac_Lib=`echo "ac_cv_lib_$THREADS_LINK_pthread_cancel" | $ac_tr_sh` -echo "$as_me:17033: checking for pthread_cancel in -l$THREADS_LINK" >&5 -echo $ECHO_N "checking for pthread_cancel in -l$THREADS_LINK... $ECHO_C" >&6 -if eval "test \"\${$ac_ac_Lib+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + echo $ac_n "checking for pthread_cancel in -l$THREADS_LINK""... $ac_c" 1>&6 +echo "configure:15676: 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 else - ac_check_lib_save_LIBS=$LIBS + ac_save_LIBS="$LIBS" LIBS="-l$THREADS_LINK $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 17041 "configure" +cat > conftest.$ac_ext <&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:17063: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:17066: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:17069: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - eval "$ac_ac_Lib=yes" -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -eval "$ac_ac_Lib=no" -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:17080: result: `eval echo '${'$ac_ac_Lib'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$ac_ac_Lib'}'`" >&6 -if test `eval echo '${'$ac_ac_Lib'}'` = yes; then - cat >>confdefs.h <<\EOF + builtin and then its argument prototype would still apply. */ +char pthread_cancel(); + +int main() { +pthread_cancel() +; return 0; } +EOF +if { (eval echo configure:15695: \"$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 -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 + cat >> confdefs.h <<\EOF #define HAVE_PTHREAD_CANCEL 1 EOF else - { echo "$as_me:17088: WARNING: wxThread::Kill() will not work properly" >&5 -echo "$as_me: WARNING: wxThread::Kill() will not work properly" >&2;} + echo "$ac_t""no" 1>&6 +echo "configure: warning: wxThread::Kill() will not work properly" 1>&2 fi - echo "$as_me:17092: checking for pthread_cleanup_push/pop" >&5 -echo $ECHO_N "checking for pthread_cleanup_push/pop... $ECHO_C" >&6 -if test "${wx_cv_func_pthread_cleanup_push+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line 17099 "configure" + echo $ac_n "checking for pthread_cleanup_push/pop""... $ac_c" 1>&6 +echo "configure:15721: 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 () -{ +int main() { pthread_cleanup_push(NULL, NULL); pthread_cleanup_pop(0); - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:17114: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:17117: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:17120: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:17123: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - + +; return 0; } +EOF +if { (eval echo configure:15737: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + wx_cv_func_pthread_cleanup_push=yes - + else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 - + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + wx_cv_func_pthread_cleanup_push=no - + fi -rm -f conftest.$ac_objext conftest.$ac_ext - +rm -f conftest* + fi -echo "$as_me:17138: result: $wx_cv_func_pthread_cleanup_push" >&5 -echo "${ECHO_T}$wx_cv_func_pthread_cleanup_push" >&6 + +echo "$ac_t""$wx_cv_func_pthread_cleanup_push" 1>&6 if test "$wx_cv_func_pthread_cleanup_push" = "yes"; then - cat >>confdefs.h <<\EOF + cat >> confdefs.h <<\EOF #define HAVE_THREAD_CLEANUP_FUNCTIONS 1 EOF fi - echo "$as_me:17148: checking for pthread_mutexattr_t" >&5 -echo $ECHO_N "checking for pthread_mutexattr_t... $ECHO_C" >&6 -if test "${wx_cv_type_pthread_mutexattr_t+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else + + if test "x$wx_lib_glibc21" = "xyes"; then + CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE" + fi - cat >conftest.$ac_ext <<_ACEOF -#line 17155 "configure" + echo $ac_n "checking for pthread_mutexattr_t""... $ac_c" 1>&6 +echo "configure:15769: checking for pthread_mutexattr_t" >&5 +if eval "test \"`echo '$''{'wx_cv_type_pthread_mutexattr_t'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + + cat > conftest.$ac_ext < -int -main () -{ +int main() { pthread_mutexattr_t attr; pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE); - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:17170: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:17173: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:17176: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:17179: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - + +; return 0; } +EOF +if { (eval echo configure:15785: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + wx_cv_type_pthread_mutexattr_t=yes - + else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 - + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + wx_cv_type_pthread_mutexattr_t=no - + + fi -rm -f conftest.$ac_objext conftest.$ac_ext - +rm -f conftest* + fi -echo "$as_me:17194: result: $wx_cv_type_pthread_mutexattr_t" >&5 -echo "${ECHO_T}$wx_cv_type_pthread_mutexattr_t" >&6 + +echo "$ac_t""$wx_cv_type_pthread_mutexattr_t" 1>&6 if test "$wx_cv_type_pthread_mutexattr_t" = "yes"; then - cat >>confdefs.h <<\EOF + cat >> confdefs.h <<\EOF #define HAVE_PTHREAD_MUTEXATTR_T 1 EOF else - echo "$as_me:17203: checking for PTHREAD_RECURSIVE_MUTEX_INITIALIZER" >&5 -echo $ECHO_N "checking for PTHREAD_RECURSIVE_MUTEX_INITIALIZER... $ECHO_C" >&6 -if test "${wx_cv_type_pthread_rec_mutex_init+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - - cat >conftest.$ac_ext <<_ACEOF -#line 17210 "configure" + echo $ac_n "checking for PTHREAD_RECURSIVE_MUTEX_INITIALIZER""... $ac_c" 1>&6 +echo "configure:15812: checking for PTHREAD_RECURSIVE_MUTEX_INITIALIZER" >&5 +if eval "test \"`echo '$''{'wx_cv_type_pthread_rec_mutex_init'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + + cat > conftest.$ac_ext < -int -main () -{ +int main() { pthread_mutex_t attr = PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP; - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:17224: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:17227: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:17230: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:17233: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - + +; return 0; } +EOF +if { (eval echo configure:15827: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + wx_cv_type_pthread_rec_mutex_init=yes - + else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 - + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + wx_cv_type_pthread_rec_mutex_init=no - + + fi -rm -f conftest.$ac_objext conftest.$ac_ext - +rm -f conftest* + fi -echo "$as_me:17248: result: $wx_cv_type_pthread_rec_mutex_init" >&5 -echo "${ECHO_T}$wx_cv_type_pthread_rec_mutex_init" >&6 + +echo "$ac_t""$wx_cv_type_pthread_rec_mutex_init" 1>&6 if test "$wx_cv_type_pthread_rec_mutex_init" = "yes"; then - cat >>confdefs.h <<\EOF + cat >> confdefs.h <<\EOF #define HAVE_PTHREAD_RECURSIVE_MUTEX_INITIALIZER 1 EOF else - { echo "$as_me:17256: WARNING: wxMutex won't be recursive on this platform" >&5 -echo "$as_me: WARNING: wxMutex won't be recursive on this platform" >&2;} + echo "configure: warning: wxMutex won't be recursive on this platform" 1>&2 fi fi THREADS_LINK="-l$THREADS_LINK" if test "$USE_SOLARIS" = "yes" -a "$GCC" != "yes"; then - CFLAGS="${CFLAGS} -mt" + CPPFLAGS="${CFLAGS} -mt" CXXFLAGS="${CXXFLAGS} -mt" LDFLAGS="${LDFLAGS} -mt" fi @@ -17270,34 +15864,31 @@ fi fi if test "$wxUSE_THREADS" = "yes"; then - cat >>confdefs.h <<\EOF + cat >> confdefs.h <<\EOF #define wxUSE_THREADS 1 EOF - if test "$wxUSE_MAC" = "0"; then - CFLAGS="${CFLAGS} -D_REENTRANT" - CXXFLAGS="${CXXFLAGS} -D_REENTRANT" + + if test "$USE_DARWIN" != 1; then + TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D_REENTRANT" fi SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS thread" else if test "$ac_cv_func_strtok_r" = "yes"; then - echo "$as_me:17285: checking if -D_REENTRANT is needed" >&5 -echo $ECHO_N "checking if -D_REENTRANT is needed... $ECHO_C" >&6 + echo $ac_n "checking if -D_REENTRANT is needed""... $ac_c" 1>&6 +echo "configure:15881: checking if -D_REENTRANT is needed" >&5 if test "$NEEDS_D_REENTRANT_FOR_R_FUNCS" = 1; then - CFLAGS="${CFLAGS} -D_REENTRANT" - CXXFLAGS="${CXXFLAGS} -D_REENTRANT" - echo "$as_me:17290: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D_REENTRANT" + echo "$ac_t""yes" 1>&6 else - echo "$as_me:17293: result: no" >&5 -echo "${ECHO_T}no" >&6 + echo "$ac_t""no" 1>&6 fi fi fi if test "$WXGTK20" = 1 ; then - cat >>confdefs.h <> confdefs.h <>confdefs.h <> confdefs.h <>confdefs.h <> confdefs.h <&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_REZ+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$REZ"; then - ac_cv_prog_REZ="$REZ" # Let the user override the test. -else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_REZ="Rez" -echo "$as_me:17346: found $ac_dir/$ac_word" >&5 -break -done - - test -z "$ac_cv_prog_REZ" && ac_cv_prog_REZ="/Developer/Tools/Rez" -fi -fi -REZ=$ac_cv_prog_REZ -if test -n "$REZ"; then - echo "$as_me:17355: result: $REZ" >&5 -echo "${ECHO_T}$REZ" >&6 -else - echo "$as_me:17358: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - # Extract the first word of "Derez", so it can be a program name with args. -set dummy Derez; ac_word=$2 -echo "$as_me:17364: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_DEREZ+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$DEREZ"; then - ac_cv_prog_DEREZ="$DEREZ" # Let the user override the test. -else - ac_save_IFS=$IFS; IFS=$ac_path_separator -ac_dummy="$PATH" -for ac_dir in $ac_dummy; do - IFS=$ac_save_IFS - test -z "$ac_dir" && ac_dir=. - $as_executable_p "$ac_dir/$ac_word" || continue -ac_cv_prog_DEREZ="Derez" -echo "$as_me:17379: found $ac_dir/$ac_word" >&5 -break -done - - test -z "$ac_cv_prog_DEREZ" && ac_cv_prog_DEREZ="/Developer/Tools/Derez" -fi -fi -DEREZ=$ac_cv_prog_DEREZ -if test -n "$DEREZ"; then - echo "$as_me:17388: result: $DEREZ" >&5 -echo "${ECHO_T}$DEREZ" >&6 -else - echo "$as_me:17391: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - RESCOMP=${REZ} - REZFLAGS="-d __UNIX__ -useDF" - DEREZFLAGS="Carbon.r -useDF" - RESFLAGS="Carbon.r -t APPL" - LIBWXMACRES="\$(LIBWX_MACRES)" - LIBWXMACRESCOMP="\$(LIBWX_MACRESCOMP)" -fi - -if test "$wxUSE_CYGWIN" = 1 ; then - TOOLKIT_DEF="${TOOLKIT_DEF} -D__WIN95__" -fi - WXDEBUG= if test "$wxUSE_DEBUG_INFO" = "yes" ; then @@ -17417,7 +15922,7 @@ if test "$wxUSE_DEBUG_GDB" = "yes" ; then fi if test "$wxUSE_DEBUG_FLAG" = "yes" ; then - cat >>confdefs.h <<\EOF + cat >> confdefs.h <<\EOF #define WXDEBUG 1 EOF @@ -17429,15 +15934,15 @@ else 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 - cat >>confdefs.h <<\EOF + cat >> confdefs.h <<\EOF #define wxUSE_DEBUG_NEW_ALWAYS 1 EOF @@ -17453,24 +15958,29 @@ if test "$wxUSE_PROFILE" = "yes" ; then PROFILE="-pg" fi -DEP_INFO_FLAGS= -CODE_GEN_FLAGS= -CODE_GEN_FLAGS_CXX= if test "$GCC" = yes ; then if test "$wxUSE_NO_RTTI" = "yes" ; then - CODE_GEN_FLAGS_CXX="$CODE_GEN_FLAGS -fno-rtti" + CODE_GEN_FLAGS_CXX="$CODE_GEN_FLAGS_CXX -fno-rtti" fi if test "$wxUSE_NO_EXCEPTIONS" = "yes" ; then - CODE_GEN_FLAGS_CXX="$CODE_GEN_FLAGS -fno-exceptions" + CODE_GEN_FLAGS_CXX="$CODE_GEN_FLAGS_CXX -fno-exceptions" fi if test "$wxUSE_PERMISSIVE" = "yes" ; then - CODE_GEN_FLAGS="$CODE_GEN_FLAGS -fpermissive" + CODE_GEN_FLAGS="$CODE_GEN_FLAGS -fpermissive" fi if test "$wxUSE_NO_DEPS" = "no" ; then - DEP_INFO_FLAGS="-MMD" + CFLAGS="-MMD ${CFLAGS}" + CXXFLAGS="-MMD ${CXXFLAGS}" + fi + if test "$USE_WIN32" = 1 ; then + # I'm not even really sure what this was ever added to solve, + # but someone added it for mingw native builds, so I guess + # they had a reason, right?? + CODE_GEN_FLAGS="$CODE_GEN_FLAGS -fno-pcc-struct-return" fi fi + CXXFLAGS=`echo "${CXXFLAGS}" | sed "s/\-O.//g" ` CFLAGS=`echo "${CFLAGS}" | sed "s/\-O.//g" ` if test "$wxUSE_OPTIMISE" = "no" ; then @@ -17488,3893 +15998,2897 @@ else fi fi -ZLIB_INCLUDE= -if test "$wxUSE_ZLIB" = "yes" -o "$wxUSE_ZLIB" = "sys" ; then - cat >>confdefs.h <<\EOF -#define wxUSE_ZLIB 1 +if test "$WXWIN_COMPATIBILITY_2" = "yes"; then + cat >> confdefs.h <<\EOF +#define WXWIN_COMPATIBILITY_2 1 +EOF + + + WXWIN_COMPATIBILITY_2_2="yes" +fi + +if test "$WXWIN_COMPATIBILITY_2_2" = "yes"; then + cat >> confdefs.h <<\EOF +#define WXWIN_COMPATIBILITY_2_2 1 +EOF + +fi + + +if test "$wxUSE_GUI" = "yes"; then + cat >> confdefs.h <<\EOF +#define wxUSE_GUI 1 +EOF + + + else + cat >> confdefs.h <<\EOF +#define wxUSE_NOGUI 1 +EOF + +fi + + +if test "$wxUSE_UNIX" = "yes"; then + cat >> confdefs.h <<\EOF +#define wxUSE_UNIX 1 +EOF + +fi + + +if test "$wxUSE_APPLE_IEEE" = "yes"; then + cat >> confdefs.h <<\EOF +#define wxUSE_APPLE_IEEE 1 +EOF + +fi + +if test "$wxUSE_TIMER" = "yes"; then + cat >> confdefs.h <<\EOF +#define wxUSE_TIMER 1 +EOF + +fi + +if test "$wxUSE_WAVE" = "yes"; then + cat >> confdefs.h <<\EOF +#define wxUSE_WAVE 1 +EOF + +fi + +if test "$wxUSE_CMDLINE_PARSER" = "yes"; then + cat >> confdefs.h <<\EOF +#define wxUSE_CMDLINE_PARSER 1 +EOF + +fi + +if test "$wxUSE_STOPWATCH" = "yes"; then + cat >> confdefs.h <<\EOF +#define wxUSE_STOPWATCH 1 +EOF + +fi + +if test "$wxUSE_DATETIME" = "yes"; then + cat >> confdefs.h <<\EOF +#define wxUSE_DATETIME 1 +EOF + +fi + +if test "$wxUSE_TIMEDATE" = "yes"; then + cat >> confdefs.h <<\EOF +#define wxUSE_TIMEDATE 1 +EOF + +fi + +if test "$wxUSE_FILE" = "yes"; then + cat >> confdefs.h <<\EOF +#define wxUSE_FILE 1 +EOF + +fi + +if test "$wxUSE_FFILE" = "yes"; then + cat >> confdefs.h <<\EOF +#define wxUSE_FFILE 1 +EOF + +fi + +if test "$wxUSE_FILESYSTEM" = "yes"; then + cat >> confdefs.h <<\EOF +#define wxUSE_FILESYSTEM 1 +EOF + +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_ON_FATAL_EXCEPTION" = "yes"; then + cat >> confdefs.h <<\EOF +#define wxUSE_ON_FATAL_EXCEPTION 1 +EOF + +fi + +if test "$wxUSE_SNGLINST_CHECKER" = "yes"; then + cat >> confdefs.h <<\EOF +#define wxUSE_SNGLINST_CHECKER 1 +EOF + +fi + +if test "$wxUSE_BUSYINFO" = "yes"; then + cat >> confdefs.h <<\EOF +#define wxUSE_BUSYINFO 1 EOF - if test "$wxUSE_ZLIB" = "yes" ; then - ZLIB_INCLUDE="-I\${top_srcdir}/src/zlib" - else - ZLIB_LINK= - echo "$as_me:17501: checking for zlib.h" >&5 -echo $ECHO_N "checking for zlib.h... $ECHO_C" >&6 -if test "${ac_cv_header_zlib_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line 17507 "configure" -#include "confdefs.h" -#include -_ACEOF -if { (eval echo "$as_me:17511: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:17517: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - ac_cv_header_zlib_h=yes -else - echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 - ac_cv_header_zlib_h=no fi -rm -f conftest.err conftest.$ac_ext -fi -echo "$as_me:17536: result: $ac_cv_header_zlib_h" >&5 -echo "${ECHO_T}$ac_cv_header_zlib_h" >&6 -if test $ac_cv_header_zlib_h = yes; then - echo "$as_me:17539: checking for deflate in -lz" >&5 -echo $ECHO_N "checking for deflate in -lz... $ECHO_C" >&6 -if test "${ac_cv_lib_z_deflate+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lz $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 17547 "configure" -#include "confdefs.h" -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char deflate (); -int -main () -{ -deflate (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:17566: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:17569: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:17572: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:17575: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_z_deflate=yes -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_lib_z_deflate=no -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:17586: result: $ac_cv_lib_z_deflate" >&5 -echo "${ECHO_T}$ac_cv_lib_z_deflate" >&6 -if test $ac_cv_lib_z_deflate = yes; then - ZLIB_LINK="-lz" -fi +if test "$wxUSE_STD_IOSTREAM" = "yes"; then + cat >> confdefs.h <<\EOF +#define wxUSE_STD_IOSTREAM 1 +EOF fi - if test "x$ZLIB_LINK" = "x" ; then - { { echo "$as_me:17595: error: system zlib compression library not found! Use --with-zlib=yes to use built-in zlib" >&5 -echo "$as_me: error: system zlib compression library not found! Use --with-zlib=yes to use built-in zlib" >&2;} - { (exit 1); exit 1; }; } - fi +if test "$wxUSE_TEXTFILE" = "yes"; then + if test "$wxUSE_FILE" != "yes"; then + echo "configure: warning: wxTextFile requires wxFile and it won't be compiled without it" 1>&2 + else + cat >> confdefs.h <<\EOF +#define wxUSE_TEXTFILE 1 +EOF + fi fi -PNG_INCLUDE= -if test "$wxUSE_LIBPNG" = "yes" -o "$wxUSE_LIBPNG" = "sys" ; then - cat >>confdefs.h <<\EOF -#define wxUSE_LIBPNG 1 +if test "$wxUSE_CONFIG" = "yes" ; then + if test "$wxUSE_TEXTFILE" != "yes"; then + echo "configure: warning: wxConfig requires wxTextFile and it won't be compiled without it" 1>&2 + else + cat >> confdefs.h <<\EOF +#define wxUSE_CONFIG 1 EOF - if test "$wxUSE_LIBPNG" = "sys" -a "$wxUSE_ZLIB" != "sys" ; then - { echo "$as_me:17609: WARNING: --with-libpng=sys doesn't work without --with-zlib=sys, will compile the built-in libpng instead" >&5 -echo "$as_me: WARNING: --with-libpng=sys doesn't work without --with-zlib=sys, will compile the built-in libpng instead" >&2;} - wxUSE_LIBPNG=yes + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS config" fi +fi - if test "$wxUSE_LIBPNG" = "yes" ; then - PNG_INCLUDE="-I\${top_srcdir}/src/png" - else - PNG_LINK= - echo "$as_me:17618: checking for png.h" >&5 -echo $ECHO_N "checking for png.h... $ECHO_C" >&6 -if test "${ac_cv_header_png_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line 17624 "configure" -#include "confdefs.h" -#include -_ACEOF -if { (eval echo "$as_me:17628: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:17634: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag +if test "$wxUSE_INTL" = "yes" ; then + if test "$wxUSE_FILE" != "yes"; then + echo "configure: warning: I18n code requires wxFile and it won't be compiled without it" 1>&2 else - ac_cpp_err= + cat >> confdefs.h <<\EOF +#define wxUSE_INTL 1 +EOF + + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS internat" + GUIDIST="$GUIDIST INTL_DIST" fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - ac_cv_header_png_h=yes -else - echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 - ac_cv_header_png_h=no -fi -rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:17653: result: $ac_cv_header_png_h" >&5 -echo "${ECHO_T}$ac_cv_header_png_h" >&6 -if test $ac_cv_header_png_h = yes; then - echo "$as_me:17656: checking for png_check_sig in -lpng" >&5 -echo $ECHO_N "checking for png_check_sig in -lpng... $ECHO_C" >&6 -if test "${ac_cv_lib_png_png_check_sig+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lpng -lz -lm $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 17664 "configure" -#include "confdefs.h" -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char png_check_sig (); -int -main () -{ -png_check_sig (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:17683: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:17686: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:17689: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:17692: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_png_png_check_sig=yes -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_lib_png_png_check_sig=no -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:17703: result: $ac_cv_lib_png_png_check_sig" >&5 -echo "${ECHO_T}$ac_cv_lib_png_png_check_sig" >&6 -if test $ac_cv_lib_png_png_check_sig = yes; then - PNG_LINK="-lpng" -fi +if test "$wxUSE_LOG" = "yes"; then + cat >> confdefs.h <<\EOF +#define wxUSE_LOG 1 +EOF -fi - if test "x$PNG_LINK" = "x" ; then - { { echo "$as_me:17712: error: system png library not found! Use --with-libpng=yes to use the built-in libpng" >&5 -echo "$as_me: error: system png library not found! Use --with-libpng=yes to use the built-in libpng" >&2;} - { (exit 1); exit 1; }; } + if test "$wxUSE_LOGGUI" = "yes"; then + cat >> confdefs.h <<\EOF +#define wxUSE_LOGGUI 1 +EOF + fi - fi - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS png" + if test "$wxUSE_LOGWINDOW" = "yes"; then + cat >> confdefs.h <<\EOF +#define wxUSE_LOGWINDOW 1 +EOF + + fi fi -JPEG_INCLUDE= -if test "$wxUSE_LIBJPEG" = "yes" -o "$wxUSE_LIBJPEG" = "sys" ; then - cat >>confdefs.h <<\EOF -#define wxUSE_LIBJPEG 1 +if test "$wxUSE_LONGLONG" = "yes"; then + cat >> confdefs.h <<\EOF +#define wxUSE_LONGLONG 1 EOF - if test "$wxUSE_LIBJPEG" = "yes" ; then - JPEG_INCLUDE="-I\${top_srcdir}/src/jpeg" - else - JPEG_LINK= - echo "$as_me:17731: checking for jpeglib.h" >&5 -echo $ECHO_N "checking for jpeglib.h... $ECHO_C" >&6 -if test "${ac_cv_header_jpeglib_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line 17737 "configure" -#include "confdefs.h" -#include -_ACEOF -if { (eval echo "$as_me:17741: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:17747: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - ac_cv_header_jpeglib_h=yes -else - echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 - ac_cv_header_jpeglib_h=no fi -rm -f conftest.err conftest.$ac_ext -fi -echo "$as_me:17766: result: $ac_cv_header_jpeglib_h" >&5 -echo "${ECHO_T}$ac_cv_header_jpeglib_h" >&6 -if test $ac_cv_header_jpeglib_h = yes; then - echo "$as_me:17769: checking for jpeg_read_header in -ljpeg" >&5 -echo $ECHO_N "checking for jpeg_read_header in -ljpeg... $ECHO_C" >&6 -if test "${ac_cv_lib_jpeg_jpeg_read_header+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ljpeg $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 17777 "configure" -#include "confdefs.h" -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char jpeg_read_header (); -int -main () -{ -jpeg_read_header (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:17796: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:17799: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:17802: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:17805: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_jpeg_jpeg_read_header=yes -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_lib_jpeg_jpeg_read_header=no -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:17816: result: $ac_cv_lib_jpeg_jpeg_read_header" >&5 -echo "${ECHO_T}$ac_cv_lib_jpeg_jpeg_read_header" >&6 -if test $ac_cv_lib_jpeg_jpeg_read_header = yes; then - JPEG_LINK="-ljpeg" -fi +if test "$wxUSE_GEOMETRY" = "yes"; then + cat >> confdefs.h <<\EOF +#define wxUSE_GEOMETRY 1 +EOF fi - if test "x$JPEG_LINK" = "x" ; then - { { echo "$as_me:17825: error: system jpeg library not found! Use --with-libjpeg=yes to use the built-in one" >&5 -echo "$as_me: error: system jpeg library not found! Use --with-libjpeg=yes to use the built-in one" >&2;} - { (exit 1); exit 1; }; } - fi - fi +if test "$wxUSE_DIALUP_MANAGER" = "yes" ; then + cat >> confdefs.h <<\EOF +#define wxUSE_DIALUP_MANAGER 1 +EOF + + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS dialup" fi -TIFF_INCLUDE= -if test "$wxUSE_LIBTIFF" = "yes" -o "$wxUSE_LIBTIFF" = "sys" ; then - cat >>confdefs.h <<\EOF -#define wxUSE_LIBTIFF 1 +if test "$wxUSE_STREAMS" = "yes" ; then + cat >> confdefs.h <<\EOF +#define wxUSE_STREAMS 1 EOF - if test "$wxUSE_LIBTIFF" = "yes" ; then - TIFF_INCLUDE="-I\${top_srcdir}/src/tiff" - else - TIFF_LINK= - echo "$as_me:17842: checking for tiffio.h" >&5 -echo $ECHO_N "checking for tiffio.h... $ECHO_C" >&6 -if test "${ac_cv_header_tiffio_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line 17848 "configure" -#include "confdefs.h" -#include -_ACEOF -if { (eval echo "$as_me:17852: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:17858: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - ac_cv_header_tiffio_h=yes -else - echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 - ac_cv_header_tiffio_h=no fi -rm -f conftest.err conftest.$ac_ext -fi -echo "$as_me:17877: result: $ac_cv_header_tiffio_h" >&5 -echo "${ECHO_T}$ac_cv_header_tiffio_h" >&6 -if test $ac_cv_header_tiffio_h = yes; then - echo "$as_me:17880: checking for TIFFError in -ltiff" >&5 -echo $ECHO_N "checking for TIFFError in -ltiff... $ECHO_C" >&6 -if test "${ac_cv_lib_tiff_TIFFError+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + + +if test "$wxUSE_DATETIME" = "yes"; then + for ac_func in strptime +do +echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +echo "configure:16251: 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 - ac_check_lib_save_LIBS=$LIBS -LIBS="-ltiff -lm $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 17888 "configure" + cat > conftest.$ac_ext < /* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char TIFFError (); -int -main () -{ -TIFFError (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:17907: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:17910: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:17913: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:17916: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_tiff_TIFFError=yes -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_lib_tiff_TIFFError=no -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:17927: result: $ac_cv_lib_tiff_TIFFError" >&5 -echo "${ECHO_T}$ac_cv_lib_tiff_TIFFError" >&6 -if test $ac_cv_lib_tiff_TIFFError = yes; then - TIFF_LINK="-ltiff" -fi + builtin and then its argument prototype would still apply. */ +char $ac_func(); -fi +int main() { - if test "x$TIFF_LINK" = "x" ; then - { { echo "$as_me:17936: error: system tiff library not found! Use --with-libtiff=yes to use the built-in one" >&5 -echo "$as_me: error: system tiff library not found! Use --with-libtiff=yes to use the built-in one" >&2;} - { (exit 1); exit 1; }; } - fi - fi -fi +/* 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 +$ac_func(); +#endif -FREETYPE_INCLUDE= -if test "$wxUSE_FREETYPE" = "yes" -o "$wxUSE_FREETYPE" = "sys" ; then - cat >>confdefs.h <<\EOF -#define wxUSE_FREETYPE 1 +; return 0; } EOF - - if test "$wxUSE_FREETYPE" = "yes" ; then - FREETYPE_INCLUDE="-I\${top_srcdir}/src/freetype" - else - FREETYPE_LINK= - echo "$as_me:17953: checking for freetype.h" >&5 -echo $ECHO_N "checking for freetype.h... $ECHO_C" >&6 -if test "${ac_cv_header_freetype_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line 17959 "configure" -#include "confdefs.h" -#include -_ACEOF -if { (eval echo "$as_me:17963: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:17969: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - else - ac_cpp_err= - fi +if { (eval echo configure:16279: \"$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 - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - ac_cv_header_freetype_h=yes -else - echo "$as_me: failed program was:" >&5 + echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - ac_cv_header_freetype_h=no + rm -rf conftest* + eval "ac_cv_func_$ac_func=no" fi -rm -f conftest.err conftest.$ac_ext -fi -echo "$as_me:17988: result: $ac_cv_header_freetype_h" >&5 -echo "${ECHO_T}$ac_cv_header_freetype_h" >&6 -if test $ac_cv_header_freetype_h = yes; then - echo "$as_me:17991: checking for FT_Render_Glyph in -lfreetype" >&5 -echo $ECHO_N "checking for FT_Render_Glyph in -lfreetype... $ECHO_C" >&6 -if test "${ac_cv_lib_freetype_FT_Render_Glyph+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lfreetype -lm $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 17999 "configure" -#include "confdefs.h" - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char FT_Render_Glyph (); -int -main () -{ -FT_Render_Glyph (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:18018: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:18021: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:18024: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:18027: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_freetype_FT_Render_Glyph=yes -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_lib_freetype_FT_Render_Glyph=no -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:18038: result: $ac_cv_lib_freetype_FT_Render_Glyph" >&5 -echo "${ECHO_T}$ac_cv_lib_freetype_FT_Render_Glyph" >&6 -if test $ac_cv_lib_freetype_FT_Render_Glyph = yes; then - FREETYPE_LINK="-lfreetype" +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 - if test "x$FREETYPE_LINK" = "x" ; then - { { echo "$as_me:18047: error: system freetype library not found! Use --with-freetype=yes to use the built-in freetype" >&5 -echo "$as_me: error: system freetype library not found! Use --with-freetype=yes to use the built-in freetype" >&2;} - { (exit 1); exit 1; }; } - fi - fi -fi -if test "$wxUSE_OPENGL" = "yes"; then - echo "$as_me:18055: checking for GL/gl.h" >&5 -echo $ECHO_N "checking for GL/gl.h... $ECHO_C" >&6 -if test "${ac_cv_header_GL_gl_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + echo $ac_n "checking for timezone variable in ""... $ac_c" 1>&6 +echo "configure:16305: checking for timezone variable in " >&5 +if eval "test \"`echo '$''{'wx_cv_var_timezone'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 else - cat >conftest.$ac_ext <<_ACEOF -#line 18061 "configure" + + cat > conftest.$ac_ext < -_ACEOF -if { (eval echo "$as_me:18065: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:18071: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - ac_cv_header_GL_gl_h=yes + + #include + +int main() { + + int tz; + tz = timezone; + +; return 0; } +EOF +if { (eval echo configure:16323: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + + wx_cv_var_timezone=timezone + else - echo "$as_me: failed program was:" >&5 + echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - ac_cv_header_GL_gl_h=no -fi -rm -f conftest.err conftest.$ac_ext -fi -echo "$as_me:18090: result: $ac_cv_header_GL_gl_h" >&5 -echo "${ECHO_T}$ac_cv_header_GL_gl_h" >&6 -if test $ac_cv_header_GL_gl_h = yes; then + rm -rf conftest* + + cat > conftest.$ac_ext <>confdefs.h <<\EOF -#define wxUSE_OPENGL 1 -EOF + #include + +int main() { - cat >>confdefs.h <<\EOF -#define wxUSE_GLCANVAS 1 + int tz; + tz = _timezone; + +; return 0; } EOF - - echo "$as_me:18102: checking for glFlush in -lGL" >&5 -echo $ECHO_N "checking for glFlush in -lGL... $ECHO_C" >&6 -if test "${ac_cv_lib_GL_glFlush+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +if { (eval echo configure:16346: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + + wx_cv_var_timezone=_timezone + else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lGL $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 18110 "configure" + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + + cat > conftest.$ac_ext <&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:18132: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:18135: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:18138: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_GL_glFlush=yes -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_lib_GL_glFlush=no -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:18149: result: $ac_cv_lib_GL_glFlush" >&5 -echo "${ECHO_T}$ac_cv_lib_GL_glFlush" >&6 -if test $ac_cv_lib_GL_glFlush = yes; then - - OPENGL_LINK="-lGL -lGLU" - -else - - echo "$as_me:18157: checking for glFlush in -lMesaGL" >&5 -echo $ECHO_N "checking for glFlush in -lMesaGL... $ECHO_C" >&6 -if test "${ac_cv_lib_MesaGL_glFlush+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lMesaGL $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 18165 "configure" -#include "confdefs.h" + #include + +int main() { -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char glFlush (); -int -main () -{ -glFlush (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:18184: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:18187: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:18190: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:18193: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_MesaGL_glFlush=yes + int tz; + tz = __timezone; + +; return 0; } +EOF +if { (eval echo configure:16369: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + + wx_cv_var_timezone=__timezone + else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_lib_MesaGL_glFlush=no -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + { echo "configure: error: no timezone variable" 1>&2; exit 1; } + fi -echo "$as_me:18204: result: $ac_cv_lib_MesaGL_glFlush" >&5 -echo "${ECHO_T}$ac_cv_lib_MesaGL_glFlush" >&6 -if test $ac_cv_lib_MesaGL_glFlush = yes; then - - OPENGL_LINK="-lMesaGL -lMesaGLU" - +rm -f conftest* + + fi - +rm -f conftest* + + fi - -else - wxUSE_OPENGL=0 +rm -f conftest* + + fi -fi +echo "$ac_t""$wx_cv_var_timezone" 1>&6 -if test "$wxUSE_GUI" = "yes"; then - cat >>confdefs.h <<\EOF -#define wxUSE_GUI 1 + cat >> confdefs.h <>confdefs.h <<\EOF -#define wxUSE_NOGUI 1 -EOF -fi + for ac_func in localtime +do +echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +echo "configure:16404: 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(); -if test "$wxUSE_UNIX" = "yes"; then - cat >>confdefs.h <<\EOF -#define wxUSE_UNIX 1 -EOF +int main() { -fi +/* 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 +$ac_func(); +#endif -if test "$wxUSE_APPLE_IEEE" = "yes"; then - cat >>confdefs.h <<\EOF -#define wxUSE_APPLE_IEEE 1 +; return 0; } EOF - +if { (eval echo configure:16432: \"$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 - -if test "$wxUSE_WAVE" = "yes"; then - cat >>confdefs.h <<\EOF -#define wxUSE_WAVE 1 -EOF - +rm -f conftest* fi -if test "$wxUSE_FILE" = "yes"; then - cat >>confdefs.h <<\EOF -#define wxUSE_FILE 1 +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 -if test "$wxUSE_FILESYSTEM" = "yes"; then - cat >>confdefs.h <<\EOF -#define wxUSE_FILESYSTEM 1 -EOF - -fi -if test "$wxUSE_FS_INET" = "yes"; then - cat >>confdefs.h <<\EOF -#define wxUSE_FS_INET 1 -EOF + if test "$ac_cv_func_localtime" = "yes"; then + echo $ac_n "checking for tm_gmtoff in struct tm""... $ac_c" 1>&6 +echo "configure:16459: checking for tm_gmtoff in struct tm" >&5 +if eval "test \"`echo '$''{'wx_cv_struct_tm_has_gmtoff'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + + cat > conftest.$ac_ext < + +int main() { -if test "$wxUSE_FS_ZIP" = "yes"; then - cat >>confdefs.h <<\EOF -#define wxUSE_FS_ZIP 1 + struct tm tm; + tm.tm_gmtoff++; + +; return 0; } EOF - +if { (eval echo configure:16477: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + + wx_cv_struct_tm_has_gmtoff=yes + +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + wx_cv_struct_tm_has_gmtoff=no + fi - -if test "$wxUSE_ZIPSTREAM" = "yes"; then - cat >>confdefs.h <<\EOF -#define wxUSE_ZIPSTREAM 1 -EOF - +rm -f conftest* + fi -if test "$wxUSE_ON_FATAL_EXCEPTION" = "yes"; then - cat >>confdefs.h <<\EOF -#define wxUSE_ON_FATAL_EXCEPTION 1 -EOF - -fi +echo "$ac_t""$wx_cv_struct_tm_has_gmtoff" 1>&6 + fi -if test "$wxUSE_SNGLINST_CHECKER" = "yes"; then - cat >>confdefs.h <<\EOF -#define wxUSE_SNGLINST_CHECKER 1 + if test "$wx_cv_struct_tm_has_gmtoff" = "yes"; then + cat >> confdefs.h <<\EOF +#define WX_GMTOFF_IN_TM 1 EOF -fi - -if test "$wxUSE_BUSYINFO" = "yes"; then - cat >>confdefs.h <<\EOF -#define wxUSE_BUSYINFO 1 -EOF + fi -fi + for ac_func in gettimeofday ftime +do +echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +echo "configure:16506: 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(); -if test "$wxUSE_STD_IOSTREAM" = "yes"; then - cat >>confdefs.h <<\EOF -#define wxUSE_STD_IOSTREAM 1 -EOF +int main() { -fi +/* 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 +$ac_func(); +#endif -if test "$wxUSE_TEXTFILE" = "yes"; then - if test "$wxUSE_FILE" != "yes"; then - { echo "$as_me:18318: WARNING: wxTextFile requires wxFile and it won't be compiled without it" >&5 -echo "$as_me: WARNING: wxTextFile requires wxFile and it won't be compiled without it" >&2;} - else - cat >>confdefs.h <<\EOF -#define wxUSE_TEXTFILE 1 +; return 0; } EOF - - fi +if { (eval echo configure:16534: \"$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 test "$wxUSE_CONFIG" = "yes" ; then - if test "$wxUSE_TEXTFILE" != "yes"; then - { echo "$as_me:18330: WARNING: wxConfig requires wxTextFile and it won't be compiled without it" >&5 -echo "$as_me: WARNING: wxConfig requires wxTextFile and it won't be compiled without it" >&2;} - else - cat >>confdefs.h <<\EOF -#define wxUSE_CONFIG 1 +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 -if test "$wxUSE_INTL" = "yes" ; then - if test "$wxUSE_FILE" != "yes"; then - { echo "$as_me:18343: WARNING: I18n code requires wxFile and it won't be compiled without it" >&5 -echo "$as_me: WARNING: I18n code requires wxFile and it won't be compiled without it" >&2;} - else - cat >>confdefs.h <<\EOF -#define wxUSE_INTL 1 -EOF - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS internat" - GUIDIST="$GUIDIST INTL_DIST" - fi -fi + if test "$ac_cv_func_gettimeofday" = "yes"; then + echo $ac_n "checking whether gettimeofday takes two arguments""... $ac_c" 1>&6 +echo "configure:16561: checking whether gettimeofday takes two arguments" >&5 +if eval "test \"`echo '$''{'wx_cv_func_gettimeofday_has_2_args'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + + + 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 -if test "$wxUSE_LOG" = "yes"; then - cat >>confdefs.h <<\EOF -#define wxUSE_LOG 1 -EOF -fi + cat > conftest.$ac_ext <>confdefs.h <<\EOF -#define wxUSE_LONGLONG 1 + #include + #include + +int main() { + + struct timeval tv; + gettimeofday(&tv, NULL); + +; return 0; } EOF +if { (eval echo configure:16589: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + wx_cv_func_gettimeofday_has_2_args=yes +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + cat > conftest.$ac_ext < + #include + +int main() { -if test "$wxUSE_GEOMETRY" = "yes"; then - cat >>confdefs.h <<\EOF -#define wxUSE_GEOMETRY 1 + struct timeval tv; + gettimeofday(&tv); + +; return 0; } EOF +if { (eval echo configure:16610: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + wx_cv_func_gettimeofday_has_2_args=no +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + + echo "configure: warning: failed to determine number of gettimeofday() arguments" 1>&2 + wx_cv_func_gettimeofday_has_2_args=unknown + + +fi +rm -f conftest* + +fi +rm -f conftest* + 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 + fi -if test "$wxUSE_DIALUP_MANAGER" = "yes" ; then - cat >>confdefs.h <<\EOF -#define wxUSE_DIALUP_MANAGER 1 +echo "$ac_t""$wx_cv_func_gettimeofday_has_2_args" 1>&6 + + if test "$wx_cv_func_gettimeofday_has_2_args" != "yes"; then + cat >> confdefs.h <<\EOF +#define WX_GETTIMEOFDAY_NO_TZ 1 EOF - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS dialup" -fi + fi + fi -if test "$wxUSE_STREAMS" = "yes" ; then - cat >>confdefs.h <<\EOF -#define wxUSE_STREAMS 1 + cat >> confdefs.h <<\EOF +#define wxUSE_TIMEDATE 1 EOF + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS typetest" fi -if test "$wxUSE_TIMEDATE" = "yes"; then -for ac_func in strptime -do -ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh` -echo "$as_me:18396: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 -if eval "test \"\${$ac_ac_var+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line 18402 "configure" +if test "$TOOLKIT" != "MSW"; then + + if test "$wxUSE_SOCKETS" = "yes"; then + echo $ac_n "checking for socket""... $ac_c" 1>&6 +echo "configure:16659: checking for socket" >&5 +if eval "test \"`echo '$''{'ac_cv_func_socket'+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. */ -#ifdef __cplusplus -extern "C" -#endif /* 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) (); + builtin and then its argument prototype would still apply. */ +char socket(); + +int main() { -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) +#if defined (__stub_socket) || defined (__stub___socket) choke me #else -f = $ac_func; +socket(); #endif - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:18433: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:18436: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:18439: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:18442: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - eval "$ac_ac_var=yes" -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -eval "$ac_ac_var=no" -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -fi -echo "$as_me:18452: result: `eval echo '${'$ac_ac_var'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6 -if test `eval echo '${'$ac_ac_var'}'` = yes; then - cat >>confdefs.h <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_socket=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_func_socket=no" +fi +rm -f conftest* +fi + +if eval "test \"`echo '$ac_cv_func_'socket`\" = yes"; then + echo "$ac_t""yes" 1>&6 + : +else + echo "$ac_t""no" 1>&6 +echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6 +echo "configure:16705: checking for socket in -lsocket" >&5 +ac_lib_var=`echo socket'_'socket | 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="-lsocket $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 -done +rm -f conftest* +LIBS="$ac_save_LIBS" - echo "$as_me:18462: checking for timezone variable in " >&5 -echo $ECHO_N "checking for timezone variable in ... $ECHO_C" >&6 -if test "${wx_cv_var_timezone+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + INET_LINK="$INET_LINK -lsocket" else + echo "$ac_t""no" 1>&6 - cat >conftest.$ac_ext <<_ACEOF -#line 18469 "configure" -#include "confdefs.h" + echo "configure: warning: socket library not found - sockets will be disabled" 1>&2 + wxUSE_SOCKETS=no + + +fi - #include + +fi -int -main () -{ + fi - int tz; - tz = __timezone; + + if test "$wxUSE_SOCKETS" = "yes" ; then + echo $ac_n "checking what is the type of the third argument of getsockname""... $ac_c" 1>&6 +echo "configure:16757: checking what is the type of the third argument of getsockname" >&5 +if eval "test \"`echo '$''{'wx_cv_type_getsockname3'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + + + 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 - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:18486: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:18489: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:18492: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:18495: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - - wx_cv_var_timezone=__timezone - -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 - - cat >conftest.$ac_ext <<_ACEOF -#line 18505 "configure" + + cat > conftest.$ac_ext < + #include + #include + +int main() { -int -main () -{ + socklen_t len; + getsockname(0, 0, &len); + +; return 0; } +EOF +if { (eval echo configure:16785: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + wx_cv_type_getsockname3=socklen_t +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + cat > conftest.$ac_ext < + #include + +int main() { + + size_t len; + getsockname(0, 0, &len); + +; return 0; } +EOF +if { (eval echo configure:16806: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + wx_cv_type_getsockname3=size_t +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + cat > conftest.$ac_ext < + #include + +int main() { + + int len; + getsockname(0, 0, &len); + +; return 0; } +EOF +if { (eval echo configure:16827: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + wx_cv_type_getsockname3=int +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + wx_cv_type_getsockname3=unknown + +fi +rm -f conftest* + +fi +rm -f conftest* + +fi +rm -f conftest* - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:18522: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:18525: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:18528: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:18531: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + 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 - wx_cv_var_timezone=_timezone + +fi -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 +echo "$ac_t""$wx_cv_type_getsockname3" 1>&6 - cat >conftest.$ac_ext <<_ACEOF -#line 18541 "configure" -#include "confdefs.h" + if test "$wx_cv_type_getsockname3" = "unknown"; then + wxUSE_SOCKETS=no + echo "configure: warning: Couldn't find socklen_t synonym for this system" 1>&2 + else + cat >> confdefs.h < + fi + fi +fi -int -main () -{ +if test "$wxUSE_SOCKETS" = "yes" ; then + cat >> confdefs.h <<\EOF +#define wxUSE_SOCKETS 1 +EOF - int tz; - tz = timezone; + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS sockets" +fi - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:18558: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:18561: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:18564: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:18567: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - wx_cv_var_timezone=timezone +if test "$wxUSE_GUI" = "yes"; then + if test "$TOOLKIT" != "MSW"; then + if test "$wxUSE_JOYSTICK" = "yes"; then + for ac_hdr in linux/joystick.h +do +ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +echo "configure:16886: 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:16896: \"$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 "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -{ { echo "$as_me:18575: error: no timezone variable" >&5 -echo "$as_me: error: no timezone variable" >&2;} - { (exit 1); exit 1; }; } - + 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.$ac_objext conftest.$ac_ext - +rm -f conftest* fi -rm -f conftest.$ac_objext conftest.$ac_ext - +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 -rm -f conftest.$ac_objext conftest.$ac_ext +done -fi -echo "$as_me:18589: result: $wx_cv_var_timezone" >&5 -echo "${ECHO_T}$wx_cv_var_timezone" >&6 + if test "$ac_cv_header_linux_joystick_h" != "yes"; then + wxUSE_JOYSTICK=no + echo "configure: warning: Joystick not supported by this system" 1>&2 + fi + fi + fi - cat >>confdefs.h <> confdefs.h <<\EOF +#define wxUSE_JOYSTICK 1 EOF -for ac_func in localtime + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS joytest" + fi +fi + + +if test "$TOOLKIT" != "MSW"; then + + HAVE_DL_FUNCS=0 + HAVE_SHL_FUNCS=0 + if test "$wxUSE_DYNLIB_CLASS" = "yes"; then + if test "$USE_DARWIN" = 1; then + HAVE_DL_FUNCS=1 + else + for ac_func in dlopen do -ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh` -echo "$as_me:18599: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 -if eval "test \"\${$ac_ac_var+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line 18605 "configure" +echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +echo "configure:16950: 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. */ -#ifdef __cplusplus -extern "C" -#endif /* 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) (); + builtin and then its argument prototype would still apply. */ +char $ac_func(); + +int main() { -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; +$ac_func(); #endif - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:18636: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:18639: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:18642: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:18645: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - eval "$ac_ac_var=yes" -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -eval "$ac_ac_var=no" -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -fi -echo "$as_me:18655: result: `eval echo '${'$ac_ac_var'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6 -if test `eval echo '${'$ac_ac_var'}'` = yes; then - cat >>confdefs.h <&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 -done - if test "$ac_cv_func_localtime" = "yes"; then - echo "$as_me:18666: checking for tm_gmtoff in struct tm" >&5 -echo $ECHO_N "checking for tm_gmtoff in struct tm... $ECHO_C" >&6 -if test "${wx_cv_struct_tm_has_gmtoff+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else +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 <> confdefs.h <<\EOF +#define HAVE_DLOPEN 1 +EOF - cat >conftest.$ac_ext <<_ACEOF -#line 18673 "configure" + HAVE_DL_FUNCS=1 + +else + echo "$ac_t""no" 1>&6 +echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 +echo "configure:17006: 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 +else + ac_save_LIBS="$LIBS" +LIBS="-ldl $LIBS" +cat > conftest.$ac_ext < - -int -main () -{ - - struct tm tm; - tm.tm_gmtoff++; - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:18690: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:18693: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:18696: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:18699: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - - wx_cv_struct_tm_has_gmtoff=yes - +int main() { +dlopen() +; return 0; } +EOF +if { (eval echo configure:17025: \"$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 "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -wx_cv_struct_tm_has_gmtoff=no - + 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.$ac_objext conftest.$ac_ext +rm -f conftest* +LIBS="$ac_save_LIBS" fi -echo "$as_me:18713: result: $wx_cv_struct_tm_has_gmtoff" >&5 -echo "${ECHO_T}$wx_cv_struct_tm_has_gmtoff" >&6 - fi - - if test "$wx_cv_struct_tm_has_gmtoff" = "yes"; then - cat >>confdefs.h <<\EOF -#define WX_GMTOFF_IN_TM 1 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + + cat >> confdefs.h <<\EOF +#define HAVE_DLOPEN 1 EOF - fi + HAVE_DL_FUNCS=1 + LIBS="$LIBS -ldl" + +else + echo "$ac_t""no" 1>&6 -for ac_func in gettimeofday ftime + for ac_func in shl_load do -ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh` -echo "$as_me:18727: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 -if eval "test \"\${$ac_ac_var+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line 18733 "configure" +echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +echo "configure:17054: 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. */ -#ifdef __cplusplus -extern "C" -#endif /* 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) (); + builtin and then its argument prototype would still apply. */ +char $ac_func(); + +int main() { -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; +$ac_func(); #endif - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:18764: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:18767: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:18770: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:18773: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - eval "$ac_ac_var=yes" -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -eval "$ac_ac_var=no" -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -fi -echo "$as_me:18783: result: `eval echo '${'$ac_ac_var'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6 -if test `eval echo '${'$ac_ac_var'}'` = yes; then - cat >>confdefs.h <&5 -echo $ECHO_N "checking whether gettimeofday takes two arguments... $ECHO_C" >&6 -if test "${wx_cv_func_gettimeofday_has_2_args+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +if { (eval echo configure:17082: \"$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 - ac_ext=cc -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - - cat >conftest.$ac_ext <<_ACEOF -#line 18807 "configure" -#include "confdefs.h" - - #include - #include - -int -main () -{ - - struct timeval tv; - struct timezone tz; - gettimeofday(&tv, &tz); +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 <> confdefs.h <<\EOF +#define HAVE_SHL_LOAD 1 +EOF - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:18826: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:18829: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:18832: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:18835: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - wx_cv_func_gettimeofday_has_2_args=yes + HAVE_SHL_FUNCS=1 + else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -cat >conftest.$ac_ext <<_ACEOF -#line 18842 "configure" + echo "$ac_t""no" 1>&6 +echo $ac_n "checking for dld in -lshl_load""... $ac_c" 1>&6 +echo "configure:17110: checking for dld in -lshl_load" >&5 +ac_lib_var=`echo shl_load'_'dld | 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="-lshl_load $LIBS" +cat > conftest.$ac_ext < - #include - -int -main () -{ - - struct timeval tv; - gettimeofday(&tv); - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:18860: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:18863: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:18866: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:18869: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - wx_cv_func_gettimeofday_has_2_args=no +int main() { +dld() +; return 0; } +EOF +if { (eval echo configure:17129: \"$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 "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -wx_cv_func_gettimeofday_has_2_args=unknown - + 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.$ac_objext conftest.$ac_ext +rm -f conftest* +LIBS="$ac_save_LIBS" fi -rm -f conftest.$ac_objext conftest.$ac_ext - ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + + HAVE_SHL_FUNCS=1 + LIBS="$LIBS -ldld" + +else + echo "$ac_t""no" 1>&6 fi -echo "$as_me:18889: result: $wx_cv_func_gettimeofday_has_2_args" >&5 -echo "${ECHO_T}$wx_cv_func_gettimeofday_has_2_args" >&6 - - if test "$wx_cv_func_gettimeofday_has_2_args" != "yes"; then - cat >>confdefs.h <<\EOF -#define WX_GETTIMEOFDAY_NO_TZ 1 -EOF - fi - fi + +fi +done - cat >>confdefs.h <<\EOF -#define wxUSE_TIMEDATE 1 -EOF + +fi - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS typetest" + fi +done -if test "$TOOLKIT" != "MSW"; then -if test "$wxUSE_SOCKETS" = "yes"; then - echo "$as_me:18910: checking for socket" >&5 -echo $ECHO_N "checking for socket... $ECHO_C" >&6 -if test "${ac_cv_func_socket+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + if test "$HAVE_DL_FUNCS" = 1; then + for ac_func in dlerror +do +echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +echo "configure:17168: 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 <<_ACEOF -#line 18916 "configure" + cat > conftest.$ac_ext < /* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char socket (); -char (*f) (); + builtin and then its argument prototype would still apply. */ +char $ac_func(); + +int main() { -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_socket) || defined (__stub___socket) +#if defined (__stub_$ac_func) || defined (__stub___$ac_func) choke me #else -f = socket; +$ac_func(); #endif - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:18947: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:18950: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:18953: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:18956: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_func_socket=yes -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_func_socket=no -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -fi -echo "$as_me:18966: result: $ac_cv_func_socket" >&5 -echo "${ECHO_T}$ac_cv_func_socket" >&6 -if test $ac_cv_func_socket = yes; then - : +; return 0; } +EOF +if { (eval echo configure:17196: \"$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 <> confdefs.h <<\EOF +#define HAVE_DLERROR 1 +EOF + else - echo "$as_me:18971: checking for socket in -lsocket" >&5 -echo $ECHO_N "checking for socket in -lsocket... $ECHO_C" >&6 -if test "${ac_cv_lib_socket_socket+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + echo "$ac_t""no" 1>&6 +echo $ac_n "checking for dlerror in -ldl""... $ac_c" 1>&6 +echo "configure:17221: checking for dlerror in -ldl" >&5 +ac_lib_var=`echo dl'_'dlerror | 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_check_lib_save_LIBS=$LIBS -LIBS="-lsocket $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 18979 "configure" + ac_save_LIBS="$LIBS" +LIBS="-ldl $LIBS" +cat > conftest.$ac_ext <&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:19001: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:19004: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:19007: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_socket_socket=yes -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_lib_socket_socket=no -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:19018: result: $ac_cv_lib_socket_socket" >&5 -echo "${ECHO_T}$ac_cv_lib_socket_socket" >&6 -if test $ac_cv_lib_socket_socket = yes; then - INET_LINK="$INET_LINK -lsocket" + builtin and then its argument prototype would still apply. */ +char dlerror(); + +int main() { +dlerror() +; return 0; } +EOF +if { (eval echo configure:17240: \"$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 -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" +fi +rm -f conftest* +LIBS="$ac_save_LIBS" - { echo "$as_me:19024: WARNING: socket library not found - sockets will be disabled" >&5 -echo "$as_me: WARNING: socket library not found - sockets will be disabled" >&2;} - wxUSE_SOCKETS=no +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + cat >> confdefs.h <<\EOF +#define HAVE_DLERROR 1 +EOF +else + echo "$ac_t""no" 1>&6 fi fi +done + fi + fi + + if test "$HAVE_DL_FUNCS" = 0; then + if test "$HAVE_SHL_FUNCS" = 0; then + if test "$USE_UNIX" = 1; then + echo "configure: warning: Missing dynamic loading support, several features will be disabled" 1>&2 + wxUSE_DYNLIB_CLASS=no + else + echo "configure: warning: Assuming wxLibrary class works on this platform" 1>&2 + fi + fi + fi + fi fi -if test "$wxUSE_SOCKETS" = "yes" ; then - echo "$as_me:19035: checking what is the type of the third argument of getsockname" >&5 -echo $ECHO_N "checking what is the type of the third argument of getsockname... $ECHO_C" >&6 -if test "${wx_cv_type_getsockname3+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +if test "$wxUSE_DYNLIB_CLASS" = "yes" ; then + cat >> confdefs.h <<\EOF +#define wxUSE_DYNLIB_CLASS 1 +EOF + else + wxUSE_ODBC=no + wxUSE_SERIAL=no +fi - ac_ext=cc -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - cat >conftest.$ac_ext <<_ACEOF -#line 19048 "configure" -#include "confdefs.h" +if test "$wxUSE_FONTMAP" = "yes" ; then + cat >> confdefs.h <<\EOF +#define wxUSE_FONTMAP 1 +EOF - #include - #include +fi -int -main () -{ +if test "$wxUSE_UNICODE" = "yes" ; then + cat >> confdefs.h <<\EOF +#define wxUSE_UNICODE 1 +EOF - socklen_t len; - getsockname(0, 0, &len); +fi - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:19066: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:19069: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:19072: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:19075: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - wx_cv_type_getsockname3=socklen_t -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -cat >conftest.$ac_ext <<_ACEOF -#line 19082 "configure" -#include "confdefs.h" +if test "$wxUSE_wxUSE_EXPERIMENTAL_PRINTF" = "yes"; then + cat >> confdefs.h <<\EOF +#define wxUSE_EXPERIMENTAL_PRINTF 1 +EOF - #include - #include +fi -int -main () -{ - size_t len; - getsockname(0, 0, &len); +if test "$wxUSE_SERIAL" = "yes" ; then + cat >> confdefs.h <<\EOF +#define wxUSE_SERIAL 1 +EOF - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:19100: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:19103: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:19106: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:19109: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - wx_cv_type_getsockname3=size_t -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -cat >conftest.$ac_ext <<_ACEOF -#line 19116 "configure" -#include "confdefs.h" +fi - #include - #include -int -main () -{ +IODBC_C_SRC="" +if test "$wxUSE_ODBC" = "yes" ; then + cat >> confdefs.h <<\EOF +#define wxUSE_ODBC 1 +EOF - int len; - getsockname(0, 0, &len); + WXODBCFLAG="-D_IODBC_" + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS db" +fi - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:19134: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:19137: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:19140: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:19143: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - wx_cv_type_getsockname3=int -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -wx_cv_type_getsockname3=unknown -fi -rm -f conftest.$ac_objext conftest.$ac_ext +if test "$wxUSE_POSTSCRIPT" = "yes" ; then + cat >> confdefs.h <<\EOF +#define wxUSE_POSTSCRIPT 1 +EOF fi -rm -f conftest.$ac_objext conftest.$ac_ext -fi -rm -f conftest.$ac_objext conftest.$ac_ext +cat >> confdefs.h <<\EOF +#define wxUSE_AFM_FOR_POSTSCRIPT 1 +EOF - ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu -fi -echo "$as_me:19167: result: $wx_cv_type_getsockname3" >&5 -echo "${ECHO_T}$wx_cv_type_getsockname3" >&6 +cat >> confdefs.h <<\EOF +#define wxUSE_NORMALIZED_PS_FONTS 1 +EOF - if test "$wx_cv_type_getsockname3" = "unknown"; then - wxUSE_SOCKETS=no - { echo "$as_me:19172: WARNING: Couldn't find socklen_t synonym for this system" >&5 -echo "$as_me: WARNING: Couldn't find socklen_t synonym for this system" >&2;} - else - cat >>confdefs.h <> confdefs.h <<\EOF +#define wxUSE_CONSTRAINTS 1 EOF - fi + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS layout" fi -fi +if test "$wxUSE_MDI_ARCHITECTURE" = "yes"; then + if test "$wxUSE_UNIVERSAL" = "yes"; then + echo "configure: warning: MDI is not supported for wxUNIVERSAL yet... disabled" 1>&2 + wxUSE_MDI_ARCHITECTURE=no + fi -if test "$wxUSE_SOCKETS" = "yes" ; then - cat >>confdefs.h <<\EOF -#define wxUSE_SOCKETS 1 + if test "$wxUSE_MDI_ARCHITECTURE" = "yes"; then + cat >> confdefs.h <<\EOF +#define wxUSE_MDI_ARCHITECTURE 1 EOF - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS sockets" - INCLUDE_SUBDIRS="$INCLUDE_SUBDIRS protocol" + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS mdi" + fi fi -if test "$wxUSE_GUI" = "yes"; then +if test "$wxUSE_DOC_VIEW_ARCHITECTURE" = "yes" ; then + cat >> confdefs.h <<\EOF +#define wxUSE_DOC_VIEW_ARCHITECTURE 1 +EOF -if test "$TOOLKIT" != "MSW"; then + 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 +#define wxUSE_HELP 1 +EOF -if test "$wxUSE_JOYSTICK" = "yes"; then + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS help" -for ac_header in linux/joystick.h -do -ac_ac_Header=`echo "ac_cv_header_$ac_header" | $ac_tr_sh` -echo "$as_me:19202: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$ac_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line 19208 "configure" + if test "$USE_WIN32" = 1; then + if test "$wxUSE_MS_HTML_HELP" = "yes"; then + ac_safe=`echo "htmlhelp.h" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for htmlhelp.h""... $ac_c" 1>&6 +echo "configure:17397: checking for htmlhelp.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 < -_ACEOF -if { (eval echo "$as_me:19212: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:19218: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - eval "$ac_ac_Header=yes" +#include +EOF +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (eval echo configure:17407: \"$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 "$as_me: failed program was:" >&5 + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - eval "$ac_ac_Header=no" + rm -rf conftest* + eval "ac_cv_header_$ac_safe=no" fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest* fi -echo "$as_me:19237: result: `eval echo '${'$ac_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$ac_ac_Header'}'`" >&6 -if test `eval echo '${'$ac_ac_Header'}'` = yes; then - cat >>confdefs.h <&6 + + cat >> confdefs.h <<\EOF +#define wxUSE_MS_HTML_HELP 1 EOF -fi -done + +else + echo "$ac_t""no" 1>&6 - if test "$ac_cv_header_linux_joystick_h" != "yes"; then - wxUSE_JOYSTICK=no - { echo "$as_me:19249: WARNING: Joystick not supported by this system" >&5 -echo "$as_me: WARNING: Joystick not supported by this system" >&2;} - fi + echo "configure: warning: MS HTML Help cannot be used without htmlhelp.h... disabled" 1>&2 + wxUSE_MS_HTML_HELP=no + fi -fi + fi + fi -if test "$wxUSE_JOYSTICK" = "yes"; then - cat >>confdefs.h <<\EOF -#define wxUSE_JOYSTICK 1 + if test "$wxUSE_WXHTML_HELP" = "yes"; then + if test "$wxUSE_HTML" = "yes"; then + cat >> confdefs.h <<\EOF +#define wxUSE_WXHTML_HELP 1 EOF - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS joytest" -fi - + else + echo "configure: warning: Cannot use wxHTML-based help without wxHTML so it won't be compiled" 1>&2 + wxUSE_WXHTML_HELP=no + fi + fi fi -if test "$TOOLKIT" != "MSW"; then - -HAVE_DL_FUNCS=0 -HAVE_SHL_FUNCS=0 -if test "$wxUSE_DYNLIB_CLASS" = "yes"; then - if test "$USE_MAC" = 1; then - HAVE_DL_FUNCS=1 +if test "$wxUSE_PRINTING_ARCHITECTURE" = "yes" ; then + 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 -for ac_func in dlopen -do -ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh` -echo "$as_me:19278: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 -if eval "test \"\${$ac_ac_var+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line 19284 "configure" -#include "confdefs.h" -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. */ -#include -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* 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 + fi + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS printing" +fi - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:19315: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:19318: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:19321: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:19324: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - eval "$ac_ac_var=yes" -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -eval "$ac_ac_var=no" -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -fi -echo "$as_me:19334: result: `eval echo '${'$ac_ac_var'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6 -if test `eval echo '${'$ac_ac_var'}'` = yes; then - cat >>confdefs.h <>confdefs.h <<\EOF -#define HAVE_DLOPEN 1 +if test "$wxUSE_PROLOGIO" = "yes" ; then + cat >> confdefs.h <<\EOF +#define wxUSE_PROLOGIO 1 EOF - HAVE_DL_FUNCS=1 +fi -else +if test "$wxUSE_RESOURCES" = "yes" ; then + cat >> confdefs.h <<\EOF +#define wxUSE_RESOURCES 1 +EOF - echo "$as_me:19349: checking for dlopen in -ldl" >&5 -echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6 -if test "${ac_cv_lib_dl_dlopen+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ldl $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 19357 "configure" -#include "confdefs.h" + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS resource" +fi -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char dlopen (); -int -main () -{ -dlopen (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:19376: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:19379: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:19382: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:19385: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_dl_dlopen=yes -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_lib_dl_dlopen=no -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:19396: result: $ac_cv_lib_dl_dlopen" >&5 -echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6 -if test $ac_cv_lib_dl_dlopen = yes; then - - cat >>confdefs.h <<\EOF -#define HAVE_DLOPEN 1 +if test "$wxUSE_X_RESOURCES" = "yes"; then + cat >> confdefs.h <<\EOF +#define wxUSE_X_RESOURCES 1 EOF - HAVE_DL_FUNCS=1 - LIBS="$LIBS -ldl" +fi -else -for ac_func in shl_load +if test "$USE_WIN32" = 1 -a \( "$wxUSE_DATAOBJ" = "yes" \ + -o "$wxUSE_CLIPBOARD" = "yes" \ + -o "$wxUSE_DRAG_AND_DROP" = "yes" \) ; then + for ac_hdr in ole2.h do -ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh` -echo "$as_me:19412: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 -if eval "test \"\${$ac_ac_var+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line 19418 "configure" +ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +echo "configure:17495: 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 < -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* 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) (); +#include <$ac_hdr> +EOF +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (eval echo configure:17505: \"$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 -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; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:19449: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:19452: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:19455: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:19458: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - eval "$ac_ac_var=yes" -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -eval "$ac_ac_var=no" -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -fi -echo "$as_me:19468: result: `eval echo '${'$ac_ac_var'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6 -if test `eval echo '${'$ac_ac_var'}'` = yes; then - cat >>confdefs.h <>confdefs.h <<\EOF -#define HAVE_SHL_LOAD 1 + if test "$ac_cv_header_ole2_h" = "yes" ; then + if test "$GCC" = yes ; then + ALL_OBJECTS="$ALL_OBJECTS \$(OLEOBJS)" + CODE_GEN_FLAGS_CXX="$CODE_GEN_FLAGS_CXX -fvtable-thunks" + LIBS="$LIBS -lrpcrt4 -loleaut32 -lole32 -luuid" + cat >> confdefs.h <<\EOF +#define wxUSE_OLE 1 EOF - HAVE_SHL_FUNCS=1 -else + fi - echo "$as_me:19483: checking for dld in -lshl_load" >&5 -echo $ECHO_N "checking for dld in -lshl_load... $ECHO_C" >&6 -if test "${ac_cv_lib_shl_load_dld+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lshl_load $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 19491 "configure" -#include "confdefs.h" + cat >> confdefs.h <<\EOF +#define wxUSE_DATAOBJ 1 +EOF -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char dld (); -int -main () -{ -dld (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:19510: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:19513: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:19516: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:19519: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_shl_load_dld=yes -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_lib_shl_load_dld=no -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:19530: result: $ac_cv_lib_shl_load_dld" >&5 -echo "${ECHO_T}$ac_cv_lib_shl_load_dld" >&6 -if test $ac_cv_lib_shl_load_dld = yes; then + else + echo "configure: warning: Some features disabled because OLE headers not found" 1>&2 - HAVE_SHL_FUNCS=1 - LIBS="$LIBS -ldld" + wxUSE_CLIPBOARD=no + wxUSE_DRAG_AND_DROP=no + wxUSE_DATAOBJ=no + fi -fi + if test "$wxUSE_METAFILE" = "yes"; then + cat >> confdefs.h <<\EOF +#define wxUSE_METAFILE 1 +EOF -fi -done -fi + cat >> confdefs.h <<\EOF +#define wxUSE_ENH_METAFILE 1 +EOF + fi fi -done - - if test "$HAVE_DL_FUNCS" = 1; then - -for ac_func in dlerror -do -ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh` -echo "$as_me:19552: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 -if eval "test \"\${$ac_ac_var+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line 19558 "configure" -#include "confdefs.h" -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. */ -#include -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* 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 +if test "$wxUSE_IPC" = "yes"; then + if test "$wxUSE_SOCKETS" != "yes"; then + echo "configure: warning: wxWindows IPC classes require sockets" 1>&2 + fi - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:19589: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:19592: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:19595: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:19598: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - eval "$ac_ac_var=yes" -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -eval "$ac_ac_var=no" -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -fi -echo "$as_me:19608: result: `eval echo '${'$ac_ac_var'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6 -if test `eval echo '${'$ac_ac_var'}'` = yes; then - cat >>confdefs.h <>confdefs.h <<\EOF -#define HAVE_DLERROR 1 + cat >> confdefs.h <<\EOF +#define wxUSE_IPC 1 EOF -else - echo "$as_me:19619: checking for dlerror in -ldl" >&5 -echo $ECHO_N "checking for dlerror in -ldl... $ECHO_C" >&6 -if test "${ac_cv_lib_dl_dlerror+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ldl $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line 19627 "configure" -#include "confdefs.h" +fi -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char dlerror (); -int -main () -{ -dlerror (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:19646: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:19649: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:19652: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:19655: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_dl_dlerror=yes -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_lib_dl_dlerror=no -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:19666: result: $ac_cv_lib_dl_dlerror" >&5 -echo "${ECHO_T}$ac_cv_lib_dl_dlerror" >&6 -if test $ac_cv_lib_dl_dlerror = yes; then - cat >>confdefs.h <<\EOF -#define HAVE_DLERROR 1 +if test "$wxUSE_CLIPBOARD" = "yes"; then + cat >> confdefs.h <<\EOF +#define wxUSE_CLIPBOARD 1 EOF -fi + + cat >> confdefs.h <<\EOF +#define wxUSE_DATAOBJ 1 +EOF fi -done +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 "$HAVE_DL_FUNCS" = 0; then - if test "$HAVE_SHL_FUNCS" = 0; then - if test "$USE_UNIX" = 1; then - { echo "$as_me:19684: WARNING: Missing dynamic loading support, several features will be disabled" >&5 -echo "$as_me: WARNING: Missing dynamic loading support, several features will be disabled" >&2;} - wxUSE_DYNLIB_CLASS=no - else - { echo "$as_me:19688: WARNING: Assuming wxLibrary class works on this platform" >&5 -echo "$as_me: WARNING: Assuming wxLibrary class works on this platform" >&2;} - fi - fi + if test "$wxUSE_MAC" = 1; then + echo "configure: warning: Drag and drop is not yet supported under Mac OS X" 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 + + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS dnd" fi -fi fi -if test "$wxUSE_DYNLIB_CLASS" = "yes" ; then - cat >>confdefs.h <<\EOF -#define wxUSE_DYNLIB_CLASS 1 +if test "$wxUSE_SPLINES" = "yes" ; then + cat >> confdefs.h <<\EOF +#define wxUSE_SPLINES 1 EOF -else - wxUSE_ODBC=no - wxUSE_SERIAL=no fi -if test "$wxUSE_UNICODE" = "yes" ; then - cat >>confdefs.h <<\EOF -#define wxUSE_UNICODE 1 + +USES_CONTROLS=0 +if test "$wxUSE_CONTROLS" = "yes"; then + USES_CONTROLS=1 +fi + +if test "$wxUSE_ACCEL" = "yes"; then + cat >> confdefs.h <<\EOF +#define wxUSE_ACCEL 1 EOF + USES_CONTROLS=1 fi -if test "$wxUSE_WCSRTOMBS" = "yes" ; then - cat >>confdefs.h <<\EOF -#define wxUSE_WCSRTOMBS 1 +if test "$wxUSE_BUTTON" = "yes"; then + cat >> confdefs.h <<\EOF +#define wxUSE_BUTTON 1 EOF + USES_CONTROLS=1 fi -if test "$wxUSE_wxUSE_EXPERIMENTAL_PRINTF" = "yes"; then - cat >>confdefs.h <<\EOF -#define wxUSE_EXPERIMENTAL_PRINTF 1 +if test "$wxUSE_BMPBUTTON" = "yes"; then + cat >> confdefs.h <<\EOF +#define wxUSE_BMPBUTTON 1 EOF + USES_CONTROLS=1 fi -if test "$wxUSE_SERIAL" = "yes" ; then - cat >>confdefs.h <<\EOF -#define wxUSE_SERIAL 1 +if test "$wxUSE_CALCTRL" = "yes"; then + cat >> confdefs.h <<\EOF +#define wxUSE_CALENDARCTRL 1 EOF + USES_CONTROLS=1 + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS calendar" fi -IODBC_C_SRC="" -if test "$wxUSE_ODBC" = "yes" ; then - cat >>confdefs.h <<\EOF -#define wxUSE_ODBC 1 +if test "$wxUSE_CARET" = "yes"; then + cat >> confdefs.h <<\EOF +#define wxUSE_CARET 1 EOF - WXODBCFLAG="-D_IODBC_" - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS db" + USES_CONTROLS=1 + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS caret" fi -if test "$wxUSE_POSTSCRIPT" = "yes" ; then - cat >>confdefs.h <<\EOF -#define wxUSE_POSTSCRIPT 1 +if test "$wxUSE_COMBOBOX" = "yes"; then + cat >> confdefs.h <<\EOF +#define wxUSE_COMBOBOX 1 EOF + USES_CONTROLS=1 fi -cat >>confdefs.h <<\EOF -#define wxUSE_AFM_FOR_POSTSCRIPT 1 +if test "$wxUSE_CHOICE" = "yes"; then + cat >> confdefs.h <<\EOF +#define wxUSE_CHOICE 1 EOF -cat >>confdefs.h <<\EOF -#define wxUSE_NORMALIZED_PS_FONTS 1 + USES_CONTROLS=1 +fi + +if test "$wxUSE_CHECKBOX" = "yes"; then + cat >> confdefs.h <<\EOF +#define wxUSE_CHECKBOX 1 EOF -if test "$wxUSE_CONSTRAINTS" = "yes"; then - cat >>confdefs.h <<\EOF -#define wxUSE_CONSTRAINTS 1 + USES_CONTROLS=1 +fi + +if test "$wxUSE_CHECKLST" = "yes"; then + cat >> confdefs.h <<\EOF +#define wxUSE_CHECKLISTBOX 1 EOF - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS layout" + USES_CONTROLS=1 + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS checklst" fi -if test "$wxUSE_MDI_ARCHITECTURE" = "yes"; then - cat >>confdefs.h <<\EOF -#define wxUSE_MDI_ARCHITECTURE 1 +if test "$wxUSE_GAUGE" = "yes"; then + cat >> confdefs.h <<\EOF +#define wxUSE_GAUGE 1 EOF - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS mdi" + USES_CONTROLS=1 fi -if test "$wxUSE_DOC_VIEW_ARCHITECTURE" = "yes" ; then - cat >>confdefs.h <<\EOF -#define wxUSE_DOC_VIEW_ARCHITECTURE 1 +if test "$wxUSE_NEW_GRID" = "yes"; then + wxUSE_GRID="yes" + cat >> confdefs.h <<\EOF +#define wxUSE_NEW_GRID 1 EOF - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS docview" - if test "$wxUSE_MDI_ARCHITECTURE" = "yes"; then - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS docvwmdi" - fi + USES_CONTROLS=1 + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS newgrid" fi -if test "$wxUSE_HELP" = "yes"; then - cat >>confdefs.h <<\EOF -#define wxUSE_HELP 1 +if test "$wxUSE_GRID" = "yes"; then + cat >> confdefs.h <<\EOF +#define wxUSE_GRID 1 EOF - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS help" + USES_CONTROLS=1 + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS grid" fi -if test "$wxUSE_PRINTING_ARCHITECTURE" = "yes" ; then - if test "$wxUSE_CONSTRAINTS" != "yes"; then - { echo "$as_me:19797: WARNING: Printing support cannot be used without constraints so it won't be compiled without it" >&5 -echo "$as_me: WARNING: Printing support cannot be used without constraints so it won't be compiled without it" >&2;} - else - cat >>confdefs.h <<\EOF -#define wxUSE_PRINTING_ARCHITECTURE 1 +if test "$wxUSE_IMAGLIST" = "yes"; then + cat >> confdefs.h <<\EOF +#define wxUSE_IMAGLIST 1 EOF - fi - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS printing" fi -if test "$wxUSE_PROLOGIO" = "yes" ; then - cat >>confdefs.h <<\EOF -#define wxUSE_PROLOGIO 1 +if test "$wxUSE_LISTBOX" = "yes"; then + cat >> confdefs.h <<\EOF +#define wxUSE_LISTBOX 1 EOF + USES_CONTROLS=1 fi -if test "$wxUSE_RESOURCES" = "yes" ; then - if test "$wxUSE_PROLOGIO" = "yes" ; then - cat >>confdefs.h <<\EOF -#define wxUSE_RESOURCES 1 +if test "$wxUSE_LISTCTRL" = "yes"; then + if test "$wxUSE_IMAGLIST" = "yes"; then + cat >> confdefs.h <<\EOF +#define wxUSE_LISTCTRL 1 EOF - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS resource" + USES_CONTROLS=1 + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS listctrl" else - { echo "$as_me:19823: WARNING: wxWindows ressource system requires PrologIO and can't be compiled without it." >&5 -echo "$as_me: WARNING: wxWindows ressource system requires PrologIO and can't be compiled without it." >&2;} + echo "configure: warning: wxListCtrl requires wxImageList and won't be compiled without it" 1>&2 fi fi -if test "$wxUSE_X_RESOURCES" = "yes"; then - cat >>confdefs.h <<\EOF -#define wxUSE_X_RESOURCES 1 +if test "$wxUSE_NOTEBOOK" = "yes"; then + cat >> confdefs.h <<\EOF +#define wxUSE_NOTEBOOK 1 EOF + USES_CONTROLS=1 + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS notebook" fi -if test "$wxUSE_IPC" = "yes"; then - if test "$wxUSE_SOCKETS" != "yes"; then - { echo "$as_me:19837: WARNING: wxWindows IPC classes require sockets" >&5 -echo "$as_me: WARNING: wxWindows IPC classes require sockets" >&2;} - fi +if test "$wxUSE_PROPSHEET" = "yes"; then + cat >> confdefs.h <<\EOF +#define wxUSE_PROPSHEET 1 +EOF - cat >>confdefs.h <<\EOF -#define wxUSE_IPC 1 + USES_CONTROLS=1 + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS proplist" +fi + +if test "$wxUSE_RADIOBOX" = "yes"; then + cat >> confdefs.h <<\EOF +#define wxUSE_RADIOBOX 1 EOF + USES_CONTROLS=1 fi -if test "$wxUSE_CLIPBOARD" = "yes"; then - cat >>confdefs.h <<\EOF -#define wxUSE_CLIPBOARD 1 +if test "$wxUSE_RADIOBTN" = "yes"; then + cat >> confdefs.h <<\EOF +#define wxUSE_RADIOBTN 1 EOF + USES_CONTROLS=1 fi -if test "$wxUSE_DRAG_AND_DROP" = "yes" ; then - if test "$wxUSE_GTK" = 1; then - if test "$WXGTK12" != 1; then - { echo "$as_me:19857: WARNING: Drag and drop is only supported under GTK+ 1.2" >&5 -echo "$as_me: WARNING: Drag and drop is only supported under GTK+ 1.2" >&2;} - wxUSE_DRAG_AND_DROP=no - fi - fi +if test "$wxUSE_SASH" = "yes"; then + cat >> confdefs.h <<\EOF +#define wxUSE_SASH 1 +EOF - if test "$wxUSE_MOTIF" = 1; then - { echo "$as_me:19864: WARNING: Drag and drop is not yet supported under Motif" >&5 -echo "$as_me: WARNING: Drag and drop is not yet supported under Motif" >&2;} - wxUSE_DRAG_AND_DROP=no - fi + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS sashtest" +fi - if test "$wxUSE_MAC" = 1; then - { echo "$as_me:19870: WARNING: Drag and drop is not yet supported under Mac OS X" >&5 -echo "$as_me: WARNING: Drag and drop is not yet supported under Mac OS X" >&2;} - wxUSE_DRAG_AND_DROP=no - fi +if test "$wxUSE_SCROLLBAR" = "yes"; then + cat >> confdefs.h <<\EOF +#define wxUSE_SCROLLBAR 1 +EOF - if test "$USE_WIN32" = 1; then + USES_CONTROLS=1 + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS scroll scrollsub" +fi -for ac_header in ole2.h -do -ac_ac_Header=`echo "ac_cv_header_$ac_header" | $ac_tr_sh` -echo "$as_me:19880: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$ac_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line 19886 "configure" -#include "confdefs.h" -#include <$ac_header> -_ACEOF -if { (eval echo "$as_me:19890: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:19896: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes +if test "$wxUSE_SLIDER" = "yes"; then + cat >> confdefs.h <<\EOF +#define wxUSE_SLIDER 1 +EOF + + USES_CONTROLS=1 fi -if test -z "$ac_cpp_err"; then - eval "$ac_ac_Header=yes" -else - echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 - eval "$ac_ac_Header=no" + +if test "$wxUSE_SPINBTN" = "yes"; then + cat >> confdefs.h <<\EOF +#define wxUSE_SPINBTN 1 +EOF + + USES_CONTROLS=1 fi -rm -f conftest.err conftest.$ac_ext + +if test "$wxUSE_SPINCTRL" = "yes"; then + cat >> confdefs.h <<\EOF +#define wxUSE_SPINCTRL 1 +EOF + + USES_CONTROLS=1 fi -echo "$as_me:19915: result: `eval echo '${'$ac_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$ac_ac_Header'}'`" >&6 -if test `eval echo '${'$ac_ac_Header'}'` = yes; then - cat >>confdefs.h <> confdefs.h <<\EOF +#define wxUSE_SPLITTER 1 EOF + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS splitter" fi -done - if test "$ac_cv_header_ole2_h" = "yes" ; then - if test "$GCC" = yes ; then - ALL_OBJECTS="$ALL_OBJECTS \$(OLEOBJS)" - ALL_DEPFILES="$ALL_DEPFILES \$(OLEDEPS)" - CODE_GEN_FLAGS_CXX="$CODE_GEN_FLAGS_CXX -fvtable-thunks" - LIBS="$LIBS -lole32 -luuid" +if test "$wxUSE_STATBMP" = "yes"; then + cat >> confdefs.h <<\EOF +#define wxUSE_STATBMP 1 +EOF + + USES_CONTROLS=1 +fi - if test "$wxUSE_METAFILE" = "yes"; then - cat >>confdefs.h <<\EOF -#define wxUSE_METAFILE 1 +if test "$wxUSE_STATBOX" = "yes"; then + cat >> confdefs.h <<\EOF +#define wxUSE_STATBOX 1 EOF - cat >>confdefs.h <<\EOF -#define wxUSE_ENH_METAFILE 1 + USES_CONTROLS=1 +fi + +if test "$wxUSE_STATTEXT" = "yes"; then + cat >> confdefs.h <<\EOF +#define wxUSE_STATTEXT 1 EOF - fi - fi - else - { echo "$as_me:19944: WARNING: Drag and drop disabled because OLE headers not found" >&5 -echo "$as_me: WARNING: Drag and drop disabled because OLE headers not found" >&2;} - wxUSE_DRAG_AND_DROP=no - fi - fi + USES_CONTROLS=1 +fi - if test "$wxUSE_DRAG_AND_DROP" = "yes"; then - cat >>confdefs.h <<\EOF -#define wxUSE_DRAG_AND_DROP 1 +if test "$wxUSE_STATLINE" = "yes"; then + if test "$wxUSE_WINE" = 1 ; then + echo "configure: warning: wxStaticLine is not supported under WINE" 1>&2 + else + cat >> confdefs.h <<\EOF +#define wxUSE_STATLINE 1 EOF - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS dnd" + USES_CONTROLS=1 fi - fi -if test "$wxUSE_SPLINES" = "yes" ; then - cat >>confdefs.h <<\EOF -#define wxUSE_SPLINES 1 +if test "$wxUSE_STATUSBAR" = "yes"; then + cat >> confdefs.h <<\EOF +#define wxUSE_STATUSBAR 1 EOF + USES_CONTROLS=1 + + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS statbar" fi -if test "$wxUSE_ACCEL" = "yes"; then - cat >>confdefs.h <<\EOF -#define wxUSE_ACCEL 1 +if test "$wxUSE_TABDIALOG" = "yes"; then + cat >> confdefs.h <<\EOF +#define wxUSE_TAB_DIALOG 1 EOF + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS tab" fi -if test "$wxUSE_CARET" = "yes"; then - cat >>confdefs.h <<\EOF -#define wxUSE_CARET 1 +if test "$wxUSE_TEXTCTRL" = "yes"; then + cat >> confdefs.h <<\EOF +#define wxUSE_TEXTCTRL 1 EOF - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS caret" + USES_CONTROLS=1 + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS text" fi -if test "$wxUSE_COMBOBOX" = "yes"; then - cat >>confdefs.h <<\EOF -#define wxUSE_COMBOBOX 1 +if test "$wxUSE_TOGGLEBTN" = "yes"; then + if test "$wxUSE_MAC" = 1 -o "$wxUSE_UNIVERSAL" = "yes"; then + echo "configure: warning: Toggle button not yet supported under Mac OS X or wxUNIVERSAL... disabled" 1>&2 + wxUSE_TOGGLEBTN=no + fi + + if test "$wxUSE_TOGGLEBTN" = "yes"; then + cat >> confdefs.h <<\EOF +#define wxUSE_TOGGLEBTN 1 EOF + USES_CONTROLS=1 + fi fi -if test "$wxUSE_CHOICE" = "yes"; then - cat >>confdefs.h <<\EOF -#define wxUSE_CHOICE 1 +if test "$wxUSE_TOOLBAR_SIMPLE" = "yes"; then + cat >> confdefs.h <<\EOF +#define wxUSE_TOOLBAR_SIMPLE 1 EOF + wxUSE_TOOLBAR="yes" + USES_CONTROLS=1 fi -if test "$wxUSE_BMPBUTTON" = "yes"; then - cat >>confdefs.h <<\EOF -#define wxUSE_BMPBUTTON 1 +if test "$wxUSE_TOOLBAR" = "yes"; then + cat >> confdefs.h <<\EOF +#define wxUSE_TOOLBAR 1 +EOF + + USES_CONTROLS=1 + + if test "$wxUSE_TOOLBAR_SIMPLE" != "yes"; then + wxUSE_TOOLBAR_NATIVE="yes" + fi + + if test "$wxUSE_TOOLBAR_NATIVE" = "yes"; then + cat >> confdefs.h <<\EOF +#define wxUSE_TOOLBAR_NATIVE 1 EOF + USES_CONTROLS=1 + fi + + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS toolbar" fi -if test "$wxUSE_CHECKBOX" = "yes"; then - cat >>confdefs.h <<\EOF -#define wxUSE_CHECKBOX 1 +if test "$wxUSE_TOOLTIPS" = "yes"; then + if test "$wxUSE_MOTIF" = 1; then + echo "configure: warning: wxTooltip not supported yet under Motif" 1>&2 + else + 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 + fi + fi fi -if test "$wxUSE_CHECKLST" = "yes"; then - cat >>confdefs.h <<\EOF -#define wxUSE_CHECKLISTBOX 1 +if test "$wxUSE_TREECTRL" = "yes"; then + if test "$wxUSE_IMAGLIST" = "yes"; then + cat >> confdefs.h <<\EOF +#define wxUSE_TREECTRL 1 EOF - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS checklst" + USES_CONTROLS=1 + 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_GAUGE" = "yes"; then - cat >>confdefs.h <<\EOF -#define wxUSE_GAUGE 1 +if test "$wxUSE_POPUPWIN" = "yes"; then + if test "$wxUSE_MAC" = 1; then + echo "configure: warning: Popup window is not yet supported under Mac OS" 1>&2 + else + cat >> confdefs.h <<\EOF +#define wxUSE_POPUPWIN 1 EOF + USES_CONTROLS=1 + fi fi -if test "$wxUSE_NEW_GRID" = "yes"; then - wxUSE_GRID="yes" - cat >>confdefs.h <<\EOF -#define wxUSE_NEW_GRID 1 +if test "$USES_CONTROLS" = 1; then + cat >> confdefs.h <<\EOF +#define wxUSE_CONTROLS 1 EOF - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS newgrid" fi -if test "$wxUSE_GRID" = "yes"; then - cat >>confdefs.h <<\EOF -#define wxUSE_GRID 1 + +if test "$wxUSE_TREELAYOUT" = "yes"; then + cat >> confdefs.h <<\EOF +#define wxUSE_TREELAYOUT 1 EOF - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS grid" + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS treelay" fi -if test "$wxUSE_IMAGLIST" = "yes"; then - cat >>confdefs.h <<\EOF -#define wxUSE_IMAGLIST 1 +if test "$wxUSE_DRAGIMAGE" = "yes"; then + cat >> confdefs.h <<\EOF +#define wxUSE_DRAGIMAGE 1 EOF + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS dragimag" fi -if test "$wxUSE_LISTBOX" = "yes"; then - cat >>confdefs.h <<\EOF -#define wxUSE_LISTBOX 1 +if test "$wxUSE_MENUS" = "yes"; then + cat >> confdefs.h <<\EOF +#define wxUSE_MENUS 1 EOF + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS menu" fi -if test "$wxUSE_LISTCTRL" = "yes"; then - if test "$wxUSE_IMAGLIST" = "yes"; then - cat >>confdefs.h <<\EOF -#define wxUSE_LISTCTRL 1 +if test "$wxUSE_METAFILE" = "yes"; then + cat >> confdefs.h <<\EOF +#define wxUSE_METAFILE 1 EOF - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS listctrl" - else - { echo "$as_me:20064: WARNING: wxListCtrl requires wxImageList and won't be compiled without it" >&5 -echo "$as_me: WARNING: wxListCtrl requires wxImageList and won't be compiled without it" >&2;} - fi fi -if test "$wxUSE_NOTEBOOK" = "yes"; then - cat >>confdefs.h <<\EOF -#define wxUSE_NOTEBOOK 1 +if test "$wxUSE_MIMETYPE" = "yes"; then + cat >> confdefs.h <<\EOF +#define wxUSE_MIMETYPE 1 EOF - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS notebook" fi -if test "$wxUSE_RADIOBOX" = "yes"; then - cat >>confdefs.h <<\EOF -#define wxUSE_RADIOBOX 1 +if test "$wxUSE_SYSTEM_OPTIONS" = "yes"; then + cat >> confdefs.h <<\EOF +#define wxUSE_SYSTEM_OPTIONS 1 EOF fi -if test "$wxUSE_RADIOBTN" = "yes"; then - cat >>confdefs.h <<\EOF -#define wxUSE_RADIOBTN 1 +if test "$wxUSE_MINIFRAME" = "yes"; then + cat >> confdefs.h <<\EOF +#define wxUSE_MINIFRAME 1 EOF + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS minifram" fi -if test "$wxUSE_SASH" = "yes"; then - cat >>confdefs.h <<\EOF -#define wxUSE_SASH 1 +if test "$wxUSE_HTML" = "yes"; then + cat >> confdefs.h <<\EOF +#define wxUSE_HTML 1 EOF - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS sashtest" + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS html" fi -if test "$wxUSE_SCROLLBAR" = "yes"; then - cat >>confdefs.h <<\EOF -#define wxUSE_SCROLLBAR 1 +if test "$wxUSE_VALIDATORS" = "yes"; then + cat >> confdefs.h <<\EOF +#define wxUSE_VALIDATORS 1 EOF - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS scroll scrollsub" + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS validate" fi -if test "$wxUSE_SLIDER" = "yes"; then - cat >>confdefs.h <<\EOF -#define wxUSE_SLIDER 1 +if test "$wxUSE_PALETTE" = "yes" ; then + cat >> confdefs.h <<\EOF +#define wxUSE_PALETTE 1 EOF fi -if test "$wxUSE_SPINBTN" = "yes"; then - cat >>confdefs.h <<\EOF -#define wxUSE_SPINBTN 1 +if test "$wxUSE_IMAGE" = "yes" ; then + cat >> confdefs.h <<\EOF +#define wxUSE_IMAGE 1 EOF fi -if test "$wxUSE_SPINCTRL" = "yes"; then - cat >>confdefs.h <<\EOF -#define wxUSE_SPINCTRL 1 +if test "$wxUSE_GIF" = "yes" ; then + cat >> confdefs.h <<\EOF +#define wxUSE_GIF 1 EOF fi -if test "$wxUSE_SPLITTER" = "yes"; then - cat >>confdefs.h <<\EOF -#define wxUSE_SPLITTER 1 +if test "$wxUSE_PCX" = "yes" ; then + cat >> confdefs.h <<\EOF +#define wxUSE_PCX 1 EOF - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS splitter" fi -if test "$wxUSE_STATBMP" = "yes"; then - cat >>confdefs.h <<\EOF -#define wxUSE_STATBMP 1 +if test "$wxUSE_PNM" = "yes" ; then + cat >> confdefs.h <<\EOF +#define wxUSE_PNM 1 EOF fi -if test "$wxUSE_STATBOX" = "yes"; then - cat >>confdefs.h <<\EOF -#define wxUSE_STATBOX 1 +if test "$wxUSE_XPM" = "yes" ; then + cat >> confdefs.h <<\EOF +#define wxUSE_XPM 1 EOF fi -if test "$wxUSE_STATLINE" = "yes"; then - if test "$wxUSE_WINE" = 1 ; then - { echo "$as_me:20152: WARNING: wxStaticLine is not supported under WINE" >&5 -echo "$as_me: WARNING: wxStaticLine is not supported under WINE" >&2;} - else - cat >>confdefs.h <<\EOF -#define wxUSE_STATLINE 1 + +if test "$wxUSE_CHOICEDLG" = "yes"; then + cat >> confdefs.h <<\EOF +#define wxUSE_CHOICEDLG 1 EOF - fi fi -if test "$wxUSE_STATUSBAR" = "yes"; then - cat >>confdefs.h <<\EOF -#define wxUSE_STATUSBAR 1 +if test "$wxUSE_COLOURDLG" = "yes"; then + cat >> confdefs.h <<\EOF +#define wxUSE_COLOURDLG 1 EOF - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS statbar" fi -if test "$wxUSE_TABDIALOG" = "yes"; then - cat >>confdefs.h <<\EOF -#define wxUSE_TAB_DIALOG 1 +if test "$wxUSE_FILEDLG" = "yes"; then + cat >> confdefs.h <<\EOF +#define wxUSE_FILEDLG 1 EOF - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS tab" fi -if test "$wxUSE_TOGGLEBTN" = "yes"; then - cat >>confdefs.h <<\EOF -#define wxUSE_TOGGLEBTN 1 +if test "$wxUSE_FINDREPLDLG" = "yes"; then + cat >> confdefs.h <<\EOF +#define wxUSE_FINDREPLDLG 1 EOF fi -if test "$wxUSE_TOOLBAR_SIMPLE" = "yes"; then - cat >>confdefs.h <<\EOF -#define wxUSE_TOOLBAR_SIMPLE 1 +if test "$wxUSE_FONTDLG" = "yes"; then + cat >> confdefs.h <<\EOF +#define wxUSE_FONTDLG 1 EOF - wxUSE_TOOLBAR="yes" fi -if test "$wxUSE_TOOLBAR" = "yes"; then - cat >>confdefs.h <<\EOF -#define wxUSE_TOOLBAR 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 - if test "$wxUSE_TOOLBAR_SIMPLE" != "yes"; then - wxUSE_TOOLBAR_NATIVE="yes" + fi fi +fi + +if test "$wxUSE_MSGDLG" = "yes"; then + cat >> confdefs.h <<\EOF +#define wxUSE_MSGDLG 1 +EOF - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS toolbar" fi -if test "$wxUSE_TOOLBAR_NATIVE" = "yes"; then - cat >>confdefs.h <<\EOF -#define wxUSE_TOOLBAR_NATIVE 1 +if test "$wxUSE_NUMBERDLG" = "yes"; then + cat >> confdefs.h <<\EOF +#define wxUSE_NUMBERDLG 1 EOF fi -if test "$wxUSE_TOOLTIPS" = "yes"; then - if test "$wxUSE_MOTIF" = 1; then - { echo "$as_me:20214: WARNING: wxTooltip not supported yet under Motif" >&5 -echo "$as_me: WARNING: wxTooltip not supported yet under Motif" >&2;} +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 - if test "$wxUSE_WINE" = 1; then - { echo "$as_me:20218: WARNING: wxTooltip not supported under WINE" >&5 -echo "$as_me: WARNING: wxTooltip not supported under WINE" >&2;} - else - cat >>confdefs.h <<\EOF -#define wxUSE_TOOLTIPS 1 + cat >> confdefs.h <<\EOF +#define wxUSE_PROGRESSDLG 1 EOF - fi fi fi -if test "$wxUSE_TREECTRL" = "yes"; then - if test "$wxUSE_IMAGLIST" = "yes"; then - cat >>confdefs.h <<\EOF -#define wxUSE_TREECTRL 1 +if test "$wxUSE_SPLASH" = "yes"; then + cat >> confdefs.h <<\EOF +#define wxUSE_SPLASH 1 EOF - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS treectrl" - else - { echo "$as_me:20237: WARNING: wxTreeCtrl requires wxImageList and won't be compiled without it" >&5 -echo "$as_me: WARNING: wxTreeCtrl requires wxImageList and won't be compiled without it" >&2;} - fi fi -if test "$wxUSE_DIRDLG" = "yes"; then +if test "$wxUSE_STARTUP_TIPS" = "yes"; then if test "$wxUSE_CONSTRAINTS" != "yes"; then - { echo "$as_me:20244: WARNING: wxDirDialog requires constraints so it won't be compiled without them" >&5 -echo "$as_me: WARNING: wxDirDialog requires constraints so it won't be compiled without them" >&2;} + echo "configure: warning: Startup tips requires constraints and won't be compiled without them" 1>&2 else - if test "$wxUSE_TREECTRL" != "yes"; then - { echo "$as_me:20248: WARNING: wxDirDialog requires wxTreeCtrl so it won't be compiled without it" >&5 -echo "$as_me: WARNING: wxDirDialog requires wxTreeCtrl so it won't be compiled without it" >&2;} - else - cat >>confdefs.h <<\EOF -#define wxUSE_DIRDLG 1 + cat >> confdefs.h <<\EOF +#define wxUSE_STARTUP_TIPS 1 EOF - fi fi fi if test "$wxUSE_TEXTDLG" = "yes"; then - cat >>confdefs.h <<\EOF + cat >> confdefs.h <<\EOF #define wxUSE_TEXTDLG 1 EOF fi -if test "$wxUSE_STARTUP_TIPS" = "yes"; then - if test "$wxUSE_CONSTRAINTS" != "yes"; then - { echo "$as_me:20268: WARNING: Startup tips requires constraints and won't be compiled without them" >&5 -echo "$as_me: WARNING: Startup tips requires constraints and won't be compiled without them" >&2;} - else - cat >>confdefs.h <<\EOF -#define wxUSE_STARTUP_TIPS 1 +if test "$wxUSE_WIZARDDLG" = "yes"; then + cat >> confdefs.h <<\EOF +#define wxUSE_WIZARDDLG 1 EOF - fi + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS wizard" fi -if test "$wxUSE_PROGRESSDLG" = "yes"; then - if test "$wxUSE_CONSTRAINTS" != "yes"; then - { echo "$as_me:20280: WARNING: wxProgressDialog requires constraints so it won't be compiled without them" >&5 -echo "$as_me: WARNING: wxProgressDialog requires constraints so it won't be compiled without them" >&2;} - else - cat >>confdefs.h <<\EOF -#define wxUSE_PROGRESSDLG 1 -EOF - fi +if test "$cross_compiling" = "yes"; then + OSINFO="\"$host\"" +else + OSINFO=`uname -s -r -m` + OSINFO="\"$OSINFO\"" fi -if test "$wxUSE_MINIFRAME" = "yes"; then - cat >>confdefs.h <<\EOF -#define wxUSE_MINIFRAME 1 +cat >> confdefs.h <>confdefs.h <<\EOF -#define wxUSE_HTML 1 +cat >> confdefs.h <>confdefs.h <<\EOF -#define wxUSE_VALIDATORS 1 -EOF +if test "$wxUSE_GUI" = "yes"; then + EXTRA_LIBS="$GUILIBS $PNG_LINK $JPEG_LINK $TIFF_LINK $FREETYPE_LINK $EXTRA_LIBS" + + + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS controls dialogs \ + drawing dynamic erase event exec font image \ + minimal richedit rotate widgets" + + CPPFLAGS="$CPPFLAGS \$(EXTRADEFS) \$(APPEXTRADEFS)" +else + SAMPLES_SUBDIRS="console" +fi + +LD_LIBS="\${top_builddir}/lib/${WX_LIBRARY_NAME_STATIC} $EXTRA_LIBS" + +INCLUDES="-I\${top_builddir}/lib/wx/include/${TOOLCHAIN_NAME} -I\${top_srcdir}/include \ +$REGEX_INCLUDE $ZLIB_INCLUDE $PNG_INCLUDE $JPEG_INCLUDE $TIFF_INCLUDE \ +$FREETYPE_INCLUDE $TOOLKIT_INCLUDE" + +if test "$wxUSE_GTK" = 1; then + WXCONFIG_INCLUDE="" +else + WXCONFIG_INCLUDE="$TOOLKIT_INCLUDE" +fi + +if test "$GXX" = yes ; then + CXXWARNINGS="-Wall" + fi +EXTRA_CFLAGS="$WXDEBUG $WXODBCFLAG $PROFILE $OPTIMISE $INCLUDES" + +CFLAGS=`echo $CFLAGS $EXTRA_CFLAGS $CXXWARNINGS | sed 's/ \\+/ /g'` +CXXFLAGS=`echo $CXXFLAGS $EXTRA_CFLAGS $CXXWARNINGS | sed 's/ \+/ /g'` + +LDFLAGS="$LDFLAGS $PROFILE" + +SAMPLES_SUBDIRS="`echo $SAMPLES_SUBDIRS | tr -s ' ' | tr ' ' '\n' | sort | uniq | tr '\n' ' '| tr -d '\r'`" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS validate" -fi -if test "$wxUSE_IMAGE" = "yes" ; then - cat >>confdefs.h <<\EOF -#define wxUSE_IMAGE 1 -EOF -fi -if test "$wxUSE_GIF" = "yes" ; then - cat >>confdefs.h <<\EOF -#define wxUSE_GIF 1 -EOF -fi -if test "$wxUSE_PCX" = "yes" ; then - cat >>confdefs.h <<\EOF -#define wxUSE_PCX 1 -EOF -fi -if test "$wxUSE_PNM" = "yes" ; then - cat >>confdefs.h <<\EOF -#define wxUSE_PNM 1 -EOF -fi -if test "$wxUSE_XPM" = "yes" ; then - cat >>confdefs.h <<\EOF -#define wxUSE_XPM 1 -EOF -fi -if test "$cross_compiling" = "yes"; then - OSINFO="\"$host\"" -else - OSINFO=`uname -s -r -m` - OSINFO="\"$OSINFO\"" -fi -cat >>confdefs.h <&5 -echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" >&6 -set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'` -if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + +echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 +echo "configure:18378: 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 >conftest.make <<\EOF + cat > conftestmake <<\EOF all: @echo 'ac_maketemp="${MAKE}"' EOF # GNU make sometimes prints "make[1]: Entering...", which would confuse us. -eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=` +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 conftest.make +rm -f conftestmake fi if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then - echo "$as_me:20425: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + echo "$ac_t""yes" 1>&6 SET_MAKE= else - echo "$as_me:20429: result: no" >&5 -echo "${ECHO_T}no" >&6 + echo "$ac_t""no" 1>&6 SET_MAKE="MAKE=${MAKE-make}" fi -if test -d include; then - if test -d include/wx; then - if test -d include/wx/${TOOLKIT_DIR}; then - if test -f include/wx/${TOOLKIT_DIR}/setup.h; then - mv -f include/wx/${TOOLKIT_DIR}/setup.h setup.h - fi - fi - fi + +if test -f lib/wx/include/${TOOLCHAIN_NAME}/wx/setup.h; then + mv -f lib/wx/include/${TOOLCHAIN_NAME}/wx/setup.h setup.h fi -ac_config_headers="$ac_config_headers setup.h:setup.h.in" + if test "$wxUSE_GUI" = "yes"; then wx_cv_path_samplesubdirs=$SAMPLES_SUBDIRS wx_cv_path_ifs=$PATH_IFS wx_cv_program_ext=$PROGRAM_EXT wx_cv_target_library=$WX_TARGET_LIBRARY + wx_cv_target_library_gl=$WX_TARGET_LIBRARY_GL wx_cv_target_libtype=$WX_TARGET_LIBRARY_TYPE export wx_cv_path_samplesubdirs wx_cv_path_ifs wx_cv_program_ext \ - wx_cv_target_library wx_cv_target_libtype - -subdirs="$subdirs demos samples utils contrib" + wx_cv_target_library wx_cv_target_library_gl wx_cv_target_libtype + subdirs="demos samples utils contrib" fi -ac_config_files="$ac_config_files wx-config src/make.env src/makeprog.env src/makelib.env Makefile" -ac_config_commands="$ac_config_commands default" -cat >confcache <<\_ACEOF +trap '' 1 2 15 +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, see configure's option --config-cache. -# It is not useful on other systems. If it contains results you don't -# want to keep, you may remove or edit it. +# 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. # -# config.status only pays attention to the cache file if you give it -# the --recheck option to rerun configure. +# 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. # -# `ac_cv_env_foo' variables (set or unset) will be overriden when -# loading this file, other *unset* `ac_cv_foo' will be assigned the -# following values. - -_ACEOF - +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 \ - "s/'/'\\\\''/g; - s/^\\([_$ac_cr_alnum]*_cv_[_$ac_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" - ;; - *) - # `set' quotes correctly as required by POSIX, so do not add quotes. - sed -n \ - "s/^\\([_$ac_cr_alnum]*_cv_[_$ac_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" - ;; - esac; -} | - sed ' - t clear - : clear - s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ - t end - /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ - : end' >>confcache -if cmp -s $cache_file confcache; then :; else +(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 - test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file" - cat confcache >$cache_file + echo "updating cache $cache_file" + cat confcache > $cache_file else echo "not updating unwritable cache $cache_file" fi fi rm -f confcache +trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15 + test "x$prefix" = xNONE && prefix=$ac_default_prefix # Let make expand exec_prefix. test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' -# VPATH may cause trouble with some makes, so we remove $(srcdir), -# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and -# trailing colons and then remove the whole line if VPATH becomes empty -# (actually we leave an empty line to preserve line numbers). +# Any assignment to VPATH causes Sun make to only execute +# the first set of double-colon rules, so remove it if not needed. +# If there is a colon in the path, we need to keep it. if test "x$srcdir" = x.; then - ac_vpsub='/^[ ]*VPATH[ ]*=/{ -s/:*\$(srcdir):*/:/; -s/:*\${srcdir}:*/:/; -s/:*@srcdir@:*/:/; -s/^\([^=]*=[ ]*\):*/\1/; -s/:*$//; -s/^[^=]*=[ ]*$//; -}' + ac_vpsub='/^[ ]*VPATH[ ]*=[^:]*$/d' fi +trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15 + DEFS=-DHAVE_CONFIG_H +# Without the "./", some shells look in PATH for config.status. : ${CONFIG_STATUS=./config.status} -ac_clean_files_save=$ac_clean_files -ac_clean_files="$ac_clean_files $CONFIG_STATUS" -{ echo "$as_me:20540: creating $CONFIG_STATUS" >&5 -echo "$as_me: creating $CONFIG_STATUS" >&6;} -cat >$CONFIG_STATUS <<_ACEOF -#! $SHELL + +echo creating $CONFIG_STATUS +rm -f $CONFIG_STATUS +cat > $CONFIG_STATUS </dev/null | sed 1q`: +# +# $0 $ac_configure_args +# # Compiler output produced by configure, useful for debugging -# configure, is in config.log if it exists. - -debug=false -SHELL=\${CONFIG_SHELL-$SHELL} -ac_cs_invocation="\$0 \$@" - -_ACEOF - -cat >>$CONFIG_STATUS <<\_ACEOF -# Be Bourne compatible -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then - emulate sh - NULLCMD=: -elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then - set -o posix -fi - -# Name of the executable. -as_me=`echo "$0" |sed 's,.*[\\/],,'` - -if expr a : '\(a\)' >/dev/null 2>&1; then - as_expr=expr -else - as_expr=false -fi - -rm -f conf$$ conf$$.exe conf$$.file -echo >conf$$.file -if ln -s conf$$.file conf$$ 2>/dev/null; then - # We could just check for DJGPP; but this test a) works b) is more generic - # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04). - if test -f conf$$.exe; then - # Don't use ln at all; we don't have any links - as_ln_s='cp -p' - else - as_ln_s='ln -s' - fi -elif ln conf$$.file conf$$ 2>/dev/null; then - as_ln_s=ln -else - as_ln_s='cp -p' -fi -rm -f conf$$ conf$$.exe conf$$.file - -as_executable_p="test -f" - -# Support unset when possible. -if (FOO=FOO; unset FOO) >/dev/null 2>&1; then - as_unset=unset -else - as_unset=false -fi - -# NLS nuisances. -$as_unset LANG || test "${LANG+set}" != set || { LANG=C; export LANG; } -$as_unset LC_ALL || test "${LC_ALL+set}" != set || { LC_ALL=C; export LC_ALL; } -$as_unset LC_TIME || test "${LC_TIME+set}" != set || { LC_TIME=C; export LC_TIME; } -$as_unset LC_CTYPE || test "${LC_CTYPE+set}" != set || { LC_CTYPE=C; export LC_CTYPE; } -$as_unset LANGUAGE || test "${LANGUAGE+set}" != set || { LANGUAGE=C; export LANGUAGE; } -$as_unset LC_COLLATE || test "${LC_COLLATE+set}" != set || { LC_COLLATE=C; export LC_COLLATE; } -$as_unset LC_NUMERIC || test "${LC_NUMERIC+set}" != set || { LC_NUMERIC=C; export LC_NUMERIC; } -$as_unset LC_MESSAGES || test "${LC_MESSAGES+set}" != set || { LC_MESSAGES=C; export LC_MESSAGES; } - -# IFS -# We need space, tab and new line, in precisely that order. -as_nl=' -' -IFS=" $as_nl" - -# CDPATH. -$as_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=:; export CDPATH; } - -exec 6>&1 - -_ACEOF - -# Files that config.status was made for. -if test -n "$ac_config_files"; then - echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS -fi - -if test -n "$ac_config_headers"; then - echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS -fi - -if test -n "$ac_config_links"; then - echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS -fi - -if test -n "$ac_config_commands"; then - echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS -fi +# configure, is in ./config.log if it exists. -cat >>$CONFIG_STATUS <<\EOF - -ac_cs_usage="\ -\`$as_me' instantiates files from templates according to the -current configuration. - -Usage: $0 [OPTIONS] [FILE]... - - -h, --help print this help, then exit - -V, --version print version number, then exit - -d, --debug don't remove temporary files - --recheck update $as_me by reconfiguring in the same conditions - --file=FILE[:TEMPLATE] - instantiate the configuration file FILE - --header=FILE[:TEMPLATE] - instantiate the configuration header FILE - -Configuration files: -$config_files - -Configuration headers: -$config_headers - -Configuration commands: -$config_commands - -Report bugs to ." -EOF - -cat >>$CONFIG_STATUS <>$CONFIG_STATUS <<\EOF -# If no file are specified by the user, then we need to provide default -# value. By we need to know if files were specified by the user. -ac_need_defaults=: -while test $# != 0 +ac_cs_usage="Usage: $CONFIG_STATUS [--recheck] [--version] [--help]" +for ac_option do - case $1 in - --*=*) - ac_option=`expr "x$1" : 'x\([^=]*\)='` - ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'` - shift - set dummy "$ac_option" "$ac_optarg" ${1+"$@"} - shift - ;; - -*);; - *) # This is not an option, so the user has probably given explicit - # arguments. - ac_need_defaults=false;; - esac - - case $1 in - # Handling of the options. -EOF -cat >>$CONFIG_STATUS <>$CONFIG_STATUS <<\EOF - --version | --vers* | -V ) - echo "$ac_cs_version"; exit 0 ;; - --he | --h) - # Conflict between --help and --header - { { echo "$as_me:20716: error: ambiguous option: $1 -Try \`$0 --help' for more information." >&5 -echo "$as_me: error: ambiguous option: $1 -Try \`$0 --help' for more information." >&2;} - { (exit 1); exit 1; }; };; - --help | --hel | -h ) - echo "$ac_cs_usage"; exit 0 ;; - --debug | --d* | -d ) - debug=: ;; - --file | --fil | --fi | --f ) - shift - CONFIG_FILES="$CONFIG_FILES $1" - ac_need_defaults=false;; - --header | --heade | --head | --hea ) - shift - CONFIG_HEADERS="$CONFIG_HEADERS $1" - ac_need_defaults=false;; - - # Handling of arguments. - 'wx-config' ) CONFIG_FILES="$CONFIG_FILES wx-config" ;; - 'src/make.env' ) CONFIG_FILES="$CONFIG_FILES src/make.env" ;; - 'src/makeprog.env' ) CONFIG_FILES="$CONFIG_FILES src/makeprog.env" ;; - 'src/makelib.env' ) CONFIG_FILES="$CONFIG_FILES src/makelib.env" ;; - 'Makefile' ) CONFIG_FILES="$CONFIG_FILES Makefile" ;; - 'default' ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;; - 'setup.h' ) CONFIG_HEADERS="$CONFIG_HEADERS setup.h:setup.h.in" ;; - - # This is an error. - -*) { { echo "$as_me:20744: error: unrecognized option: $1 -Try \`$0 --help' for more information." >&5 -echo "$as_me: error: unrecognized option: $1 -Try \`$0 --help' for more information." >&2;} - { (exit 1); exit 1; }; } ;; - *) { { echo "$as_me:20749: error: invalid argument: $1" >&5 -echo "$as_me: error: invalid argument: $1" >&2;} - { (exit 1); exit 1; }; };; + 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" + exit 0 ;; + -help | --help | --hel | --he | --h) + echo "\$ac_cs_usage"; exit 0 ;; + *) echo "\$ac_cs_usage"; exit 1 ;; esac - shift done -exec 5>>config.log -cat >&5 << _ACEOF - -## ----------------------- ## -## Running config.status. ## -## ----------------------- ## - -This file was extended by $as_me 2.50, executed with - > $ac_cs_invocation -on `(hostname || uname -n) 2>/dev/null | sed 1q` - -_ACEOF -EOF - -cat >>$CONFIG_STATUS <<\EOF -# If the user did not use the arguments to specify the items to instantiate, -# then the envvar interface is used. Set only those that are not. -# We use the long form for the default assignment because of an extremely -# bizarre bug on SunOS 4.1.3. -if $ac_need_defaults; then - test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files - test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers - test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands -fi - -# Create a temporary directory, and hook for its removal unless debugging. -$debug || -{ - trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0 - trap '{ (exit $?); exit $?; }' 1 2 13 15 -} - -# Create a (secure) tmp directory for tmp files. -: ${TMPDIR=/tmp} -{ - tmp=`(umask 077 && mktemp -d -q "$TMPDIR/csXXXXXX") 2>/dev/null` && - test -n "$tmp" && test -d "$tmp" -} || -{ - tmp=$TMPDIR/cs$$-$RANDOM - (umask 077 && mkdir $tmp) -} || -{ - echo "$me: cannot create a temporary directory in $TMPDIR" >&2 - { (exit 1); exit 1; } -} - -EOF - -cat >>$CONFIG_STATUS <> $CONFIG_STATUS <>$CONFIG_STATUS < conftest.subs <<\\CEOF +$ac_vpsub +$extrasub +s%@SHELL@%$SHELL%g +s%@CFLAGS@%$CFLAGS%g +s%@CPPFLAGS@%$CPPFLAGS%g +s%@CXXFLAGS@%$CXXFLAGS%g +s%@FFLAGS@%$FFLAGS%g +s%@DEFS@%$DEFS%g +s%@LDFLAGS@%$LDFLAGS%g +s%@LIBS@%$LIBS%g +s%@exec_prefix@%$exec_prefix%g +s%@prefix@%$prefix%g +s%@program_transform_name@%$program_transform_name%g +s%@bindir@%$bindir%g +s%@sbindir@%$sbindir%g +s%@libexecdir@%$libexecdir%g +s%@datadir@%$datadir%g +s%@sysconfdir@%$sysconfdir%g +s%@sharedstatedir@%$sharedstatedir%g +s%@localstatedir@%$localstatedir%g +s%@libdir@%$libdir%g +s%@includedir@%$includedir%g +s%@oldincludedir@%$oldincludedir%g +s%@infodir@%$infodir%g +s%@mandir@%$mandir%g +s%@host@%$host%g +s%@host_alias@%$host_alias%g +s%@host_cpu@%$host_cpu%g +s%@host_vendor@%$host_vendor%g +s%@host_os@%$host_os%g +s%@target@%$target%g +s%@target_alias@%$target_alias%g +s%@target_cpu@%$target_cpu%g +s%@target_vendor@%$target_vendor%g +s%@target_os@%$target_os%g +s%@build@%$build%g +s%@build_alias@%$build_alias%g +s%@build_cpu@%$build_cpu%g +s%@build_vendor@%$build_vendor%g +s%@build_os@%$build_os%g +s%@CC@%$CC%g +s%@CPP@%$CPP%g +s%@CXX@%$CXX%g +s%@RANLIB@%$RANLIB%g +s%@AR@%$AR%g +s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g +s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g +s%@INSTALL_DATA@%$INSTALL_DATA%g +s%@STRIP@%$STRIP%g +s%@YACC@%$YACC%g +s%@LEX@%$LEX%g +s%@LEXLIB@%$LEXLIB%g +s%@LN_S@%$LN_S%g +s%@GTK_CONFIG_2_0@%$GTK_CONFIG_2_0%g +s%@GTK_CFLAGS@%$GTK_CFLAGS%g +s%@GTK_LIBS@%$GTK_LIBS%g +s%@GTK_CONFIG@%$GTK_CONFIG%g +s%@X_CFLAGS@%$X_CFLAGS%g +s%@X_PRE_LIBS@%$X_PRE_LIBS%g +s%@X_LIBS@%$X_LIBS%g +s%@X_EXTRA_LIBS@%$X_EXTRA_LIBS%g +s%@RESCOMP@%$RESCOMP%g +s%@DEREZ@%$DEREZ%g +s%@CXXCPP@%$CXXCPP%g +s%@LEX_STEM@%$LEX_STEM%g +s%@PATH_IFS@%$PATH_IFS%g +s%@WX_MAJOR_VERSION_NUMBER@%$WX_MAJOR_VERSION_NUMBER%g +s%@WX_MINOR_VERSION_NUMBER@%$WX_MINOR_VERSION_NUMBER%g +s%@WX_RELEASE_NUMBER@%$WX_RELEASE_NUMBER%g +s%@WX_LIBRARY_NAME_STATIC@%$WX_LIBRARY_NAME_STATIC%g +s%@WX_LIBRARY_NAME_SHARED@%$WX_LIBRARY_NAME_SHARED%g +s%@WX_TARGET_LIBRARY@%$WX_TARGET_LIBRARY%g +s%@WX_LIBRARY_LINK1@%$WX_LIBRARY_LINK1%g +s%@WX_LIBRARY_LINK2@%$WX_LIBRARY_LINK2%g +s%@PROGRAM_EXT@%$PROGRAM_EXT%g +s%@WX_LIBRARY_NAME_STATIC_GL@%$WX_LIBRARY_NAME_STATIC_GL%g +s%@WX_LIBRARY_NAME_SHARED_GL@%$WX_LIBRARY_NAME_SHARED_GL%g +s%@WX_TARGET_LIBRARY_GL@%$WX_TARGET_LIBRARY_GL%g +s%@WX_LIBRARY_LINK1_GL@%$WX_LIBRARY_LINK1_GL%g +s%@WX_LIBRARY_LINK2_GL@%$WX_LIBRARY_LINK2_GL%g +s%@WX_ALL@%$WX_ALL%g +s%@WX_ALL_INSTALLED@%$WX_ALL_INSTALLED%g +s%@SHARED_LD@%$SHARED_LD%g +s%@PIC_FLAG@%$PIC_FLAG%g +s%@CODE_GEN_FLAGS@%$CODE_GEN_FLAGS%g +s%@CODE_GEN_FLAGS_CXX@%$CODE_GEN_FLAGS_CXX%g +s%@SONAME_FLAGS@%$SONAME_FLAGS%g +s%@SONAME_FLAGS_GL@%$SONAME_FLAGS_GL%g +s%@WX_TARGET_LIBRARY_SONAME@%$WX_TARGET_LIBRARY_SONAME%g +s%@WX_TARGET_LIBRARY_TYPE@%$WX_TARGET_LIBRARY_TYPE%g +s%@WXDEBUG_DEFINE@%$WXDEBUG_DEFINE%g +s%@USE_GUI@%$USE_GUI%g +s%@AFMINSTALL@%$AFMINSTALL%g +s%@TOOLKIT@%$TOOLKIT%g +s%@TOOLKIT_DIR@%$TOOLKIT_DIR%g +s%@TOOLKIT_VPATH@%$TOOLKIT_VPATH%g +s%@TOOLCHAIN_NAME@%$TOOLCHAIN_NAME%g +s%@TOOLCHAIN_DEFS@%$TOOLCHAIN_DEFS%g +s%@cross_compiling@%$cross_compiling%g +s%@WXCONFIG_LIBS@%$WXCONFIG_LIBS%g +s%@WXCONFIG_LIBS_GL@%$WXCONFIG_LIBS_GL%g +s%@WXCONFIG_INCLUDE@%$WXCONFIG_INCLUDE%g +s%@ALL_OBJECTS@%$ALL_OBJECTS%g +s%@GUIDIST@%$GUIDIST%g +s%@PORT_FILES@%$PORT_FILES%g +s%@DISTDIR@%$DISTDIR%g +s%@RPM_SPEC@%$RPM_SPEC%g +s%@RPM_FILES@%$RPM_FILES%g +s%@SAMPLES_SUBDIRS@%$SAMPLES_SUBDIRS%g +s%@EXTRA_LIBS@%$EXTRA_LIBS%g +s%@OPENGL_LIBS@%$OPENGL_LIBS%g +s%@EXTRADEFS@%$EXTRADEFS%g +s%@LD_LIBS@%$LD_LIBS%g +s%@WXMSW_DLL_DEFINES@%$WXMSW_DLL_DEFINES%g +s%@RESFLAGS@%$RESFLAGS%g +s%@RESPROGRAMOBJ@%$RESPROGRAMOBJ%g +s%@WX_RESOURCES_MACOSX@%$WX_RESOURCES_MACOSX%g +s%@WX_RESOURCES_MACOSX_COMPILED@%$WX_RESOURCES_MACOSX_COMPILED%g +s%@LIBWXMACRES@%$LIBWXMACRES%g +s%@LIBWXMACRESCOMP@%$LIBWXMACRESCOMP%g +s%@LIBWXMACRESWXCONFIG@%$LIBWXMACRESWXCONFIG%g +s%@DLLTOOL@%$DLLTOOL%g +s%@AS@%$AS%g +s%@NM@%$NM%g +s%@LD@%$LD%g +s%@MAKEINFO@%$MAKEINFO%g +s%@SET_MAKE@%$SET_MAKE%g +s%@subdirs@%$subdirs%g -# No need to generate the scripts if there are no CONFIG_FILES. -# This happens for instance when ./config.status config.h -if test -n "\$CONFIG_FILES"; then - # Protect against being on the right side of a sed subst in config.status. - sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g; - s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF -s,@SHELL@,$SHELL,;t t -s,@exec_prefix@,$exec_prefix,;t t -s,@prefix@,$prefix,;t t -s,@program_transform_name@,$program_transform_name,;t t -s,@bindir@,$bindir,;t t -s,@sbindir@,$sbindir,;t t -s,@libexecdir@,$libexecdir,;t t -s,@datadir@,$datadir,;t t -s,@sysconfdir@,$sysconfdir,;t t -s,@sharedstatedir@,$sharedstatedir,;t t -s,@localstatedir@,$localstatedir,;t t -s,@libdir@,$libdir,;t t -s,@includedir@,$includedir,;t t -s,@oldincludedir@,$oldincludedir,;t t -s,@infodir@,$infodir,;t t -s,@mandir@,$mandir,;t t -s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t -s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t -s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t -s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t -s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t -s,@ECHO_C@,$ECHO_C,;t t -s,@ECHO_N@,$ECHO_N,;t t -s,@ECHO_T@,$ECHO_T,;t t -s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t -s,@DEFS@,$DEFS,;t t -s,@LIBS@,$LIBS,;t t -s,@build@,$build,;t t -s,@build_cpu@,$build_cpu,;t t -s,@build_vendor@,$build_vendor,;t t -s,@build_os@,$build_os,;t t -s,@host@,$host,;t t -s,@host_cpu@,$host_cpu,;t t -s,@host_vendor@,$host_vendor,;t t -s,@host_os@,$host_os,;t t -s,@target@,$target,;t t -s,@target_cpu@,$target_cpu,;t t -s,@target_vendor@,$target_vendor,;t t -s,@target_os@,$target_os,;t t -s,@CC@,$CC,;t t -s,@CFLAGS@,$CFLAGS,;t t -s,@LDFLAGS@,$LDFLAGS,;t t -s,@CPPFLAGS@,$CPPFLAGS,;t t -s,@ac_ct_CC@,$ac_ct_CC,;t t -s,@EXEEXT@,$EXEEXT,;t t -s,@OBJEXT@,$OBJEXT,;t t -s,@CPP@,$CPP,;t t -s,@CXX@,$CXX,;t t -s,@CXXFLAGS@,$CXXFLAGS,;t t -s,@ac_ct_CXX@,$ac_ct_CXX,;t t -s,@CXXCPP@,$CXXCPP,;t t -s,@RANLIB@,$RANLIB,;t t -s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t -s,@AR@,$AR,;t t -s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t -s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t -s,@INSTALL_DATA@,$INSTALL_DATA,;t t -s,@STRIP@,$STRIP,;t t -s,@YACC@,$YACC,;t t -s,@LEX@,$LEX,;t t -s,@LEXLIB@,$LEXLIB,;t t -s,@LEX_OUTPUT_ROOT@,$LEX_OUTPUT_ROOT,;t t -s,@LN_S@,$LN_S,;t t -s,@GTK_CONFIG_2_0@,$GTK_CONFIG_2_0,;t t -s,@GTK_CONFIG@,$GTK_CONFIG,;t t -s,@GTK_CFLAGS@,$GTK_CFLAGS,;t t -s,@GTK_LIBS@,$GTK_LIBS,;t t -s,@X_CFLAGS@,$X_CFLAGS,;t t -s,@X_PRE_LIBS@,$X_PRE_LIBS,;t t -s,@X_LIBS@,$X_LIBS,;t t -s,@X_EXTRA_LIBS@,$X_EXTRA_LIBS,;t t -s,@REZ@,$REZ,;t t -s,@DEREZ@,$DEREZ,;t t -s,@LEX_STEM@,$LEX_STEM,;t t -s,@PATH_IFS@,$PATH_IFS,;t t -s,@WX_MAJOR_VERSION_NUMBER@,$WX_MAJOR_VERSION_NUMBER,;t t -s,@WX_MINOR_VERSION_NUMBER@,$WX_MINOR_VERSION_NUMBER,;t t -s,@WX_RELEASE_NUMBER@,$WX_RELEASE_NUMBER,;t t -s,@WX_LIBRARY_NAME@,$WX_LIBRARY_NAME,;t t -s,@WX_LIBRARY_NAME_STATIC@,$WX_LIBRARY_NAME_STATIC,;t t -s,@WX_LIBRARY_NAME_SHARED@,$WX_LIBRARY_NAME_SHARED,;t t -s,@WX_LIBRARY@,$WX_LIBRARY,;t t -s,@WX_TARGET_LIBRARY@,$WX_TARGET_LIBRARY,;t t -s,@WX_LIBRARY_LINK1@,$WX_LIBRARY_LINK1,;t t -s,@WX_LIBRARY_LINK2@,$WX_LIBRARY_LINK2,;t t -s,@WX_LIBRARY_LINK3@,$WX_LIBRARY_LINK3,;t t -s,@PROGRAM_EXT@,$PROGRAM_EXT,;t t -s,@WX_LIBRARY_NAME_GL@,$WX_LIBRARY_NAME_GL,;t t -s,@WX_LIBRARY_NAME_STATIC_GL@,$WX_LIBRARY_NAME_STATIC_GL,;t t -s,@WX_LIBRARY_NAME_SHARED_GL@,$WX_LIBRARY_NAME_SHARED_GL,;t t -s,@WX_LIBRARY_GL@,$WX_LIBRARY_GL,;t t -s,@WX_TARGET_LIBRARY_GL@,$WX_TARGET_LIBRARY_GL,;t t -s,@WX_LIBRARY_LINK1_GL@,$WX_LIBRARY_LINK1_GL,;t t -s,@WX_LIBRARY_LINK2_GL@,$WX_LIBRARY_LINK2_GL,;t t -s,@WX_LIBRARY_LINK3_GL@,$WX_LIBRARY_LINK3_GL,;t t -s,@WX_ALL@,$WX_ALL,;t t -s,@WX_ALL_INSTALLED@,$WX_ALL_INSTALLED,;t t -s,@SHARED_LD@,$SHARED_LD,;t t -s,@PIC_FLAG@,$PIC_FLAG,;t t -s,@DEP_INFO_FLAGS@,$DEP_INFO_FLAGS,;t t -s,@CODE_GEN_FLAGS@,$CODE_GEN_FLAGS,;t t -s,@CODE_GEN_FLAGS_CXX@,$CODE_GEN_FLAGS_CXX,;t t -s,@BURNT_LIBRARY_NAME@,$BURNT_LIBRARY_NAME,;t t -s,@BURNT_LIBRARY_NAME_GL@,$BURNT_LIBRARY_NAME_GL,;t t -s,@WX_TARGET_LIBRARY_SONAME@,$WX_TARGET_LIBRARY_SONAME,;t t -s,@WX_TARGET_LIBRARY_TYPE@,$WX_TARGET_LIBRARY_TYPE,;t t -s,@WXDEBUG_DEFINE@,$WXDEBUG_DEFINE,;t t -s,@USE_GUI@,$USE_GUI,;t t -s,@AFMINSTALL@,$AFMINSTALL,;t t -s,@TOOLKIT@,$TOOLKIT,;t t -s,@TOOLKIT_DEF@,$TOOLKIT_DEF,;t t -s,@TOOLKIT_DIR@,$TOOLKIT_DIR,;t t -s,@TOOLKIT_NAME@,$TOOLKIT_NAME,;t t -s,@TOOLKIT_INCLUDE@,$TOOLKIT_INCLUDE,;t t -s,@WXCONFIG_INCLUDE@,$WXCONFIG_INCLUDE,;t t -s,@ALL_OBJECTS@,$ALL_OBJECTS,;t t -s,@ALL_DEPFILES@,$ALL_DEPFILES,;t t -s,@GUIDIST@,$GUIDIST,;t t -s,@PORT_FILES@,$PORT_FILES,;t t -s,@DISTDIR@,$DISTDIR,;t t -s,@RPM_SPEC@,$RPM_SPEC,;t t -s,@RPM_FILES@,$RPM_FILES,;t t -s,@SRC_SUBDIRS@,$SRC_SUBDIRS,;t t -s,@INCLUDE_SUBDIRS@,$INCLUDE_SUBDIRS,;t t -s,@UTILS_SUBDIRS@,$UTILS_SUBDIRS,;t t -s,@DOCS_SUBDIRS@,$DOCS_SUBDIRS,;t t -s,@SAMPLES_SUBDIRS@,$SAMPLES_SUBDIRS,;t t -s,@USER_SUBDIRS@,$USER_SUBDIRS,;t t -s,@EXTRA_LIBS@,$EXTRA_LIBS,;t t -s,@OPENGL_LIBS@,$OPENGL_LIBS,;t t -s,@EXTRADEFS@,$EXTRADEFS,;t t -s,@LD_LIBS@,$LD_LIBS,;t t -s,@RCINPUTSWITCH@,$RCINPUTSWITCH,;t t -s,@RCOUTPUTSWITCH@,$RCOUTPUTSWITCH,;t t -s,@RESPROGRAM@,$RESPROGRAM,;t t -s,@RESCOMP@,$RESCOMP,;t t -s,@RESFLAGS@,$RESFLAGS,;t t -s,@REZFLAGS@,$REZFLAGS,;t t -s,@DEREZFLAGS@,$DEREZFLAGS,;t t -s,@LIBWXMACRES@,$LIBWXMACRES,;t t -s,@LIBWXMACRESCOMP@,$LIBWXMACRESCOMP,;t t -s,@DLLTOOL@,$DLLTOOL,;t t -s,@AS@,$AS,;t t -s,@NM@,$NM,;t t -s,@LD@,$LD,;t t -s,@MAKEINFO@,$MAKEINFO,;t t -s,@SET_MAKE@,$SET_MAKE,;t t -s,@subdirs@,$subdirs,;t t CEOF - EOF - cat >>$CONFIG_STATUS <<\EOF - # Split the substitutions into bite-sized pieces for seds with - # small command number limits, like on Digital OSF/1 and HP-UX. - ac_max_sed_lines=48 - ac_sed_frag=1 # Number of current file. - ac_beg=1 # First line for current file. - ac_end=$ac_max_sed_lines # Line after last line for current file. - ac_more_lines=: - ac_sed_cmds= - while $ac_more_lines; do - if test $ac_beg -gt 1; then - sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag - else - sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag - fi - if test ! -s $tmp/subs.frag; then - ac_more_lines=false +cat >> $CONFIG_STATUS <<\EOF + +# Split the substitutions into bite-sized pieces for seds with +# small command number limits, like on Digital OSF/1 and HP-UX. +ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script. +ac_file=1 # Number of current file. +ac_beg=1 # First line for current file. +ac_end=$ac_max_sed_cmds # Line after last line for current file. +ac_more_lines=: +ac_sed_cmds="" +while $ac_more_lines; do + if test $ac_beg -gt 1; then + sed "1,${ac_beg}d; ${ac_end}q" conftest.subs > conftest.s$ac_file + else + sed "${ac_end}q" conftest.subs > conftest.s$ac_file + fi + if test ! -s conftest.s$ac_file; then + ac_more_lines=false + rm -f conftest.s$ac_file + else + if test -z "$ac_sed_cmds"; then + ac_sed_cmds="sed -f conftest.s$ac_file" else - # The purpose of the label and of the branching condition is to - # speed up the sed processing (if there are no `@' at all, there - # is no need to browse any of the substitutions). - # These are the two extra sed commands mentioned above. - (echo ':t - /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed - if test -z "$ac_sed_cmds"; then - ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed" - else - ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed" - fi - ac_sed_frag=`expr $ac_sed_frag + 1` - ac_beg=$ac_end - ac_end=`expr $ac_end + $ac_max_sed_lines` + ac_sed_cmds="$ac_sed_cmds | sed -f conftest.s$ac_file" fi - done - if test -z "$ac_sed_cmds"; then - ac_sed_cmds=cat + ac_file=`expr $ac_file + 1` + ac_beg=$ac_end + ac_end=`expr $ac_end + $ac_max_sed_cmds` fi -fi # test -n "$CONFIG_FILES" +done +if test -z "$ac_sed_cmds"; then + ac_sed_cmds=cat +fi +EOF +cat >> $CONFIG_STATUS <>$CONFIG_STATUS <<\EOF -for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue +cat >> $CONFIG_STATUS <<\EOF +for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". - case $ac_file in - - | *:- | *:-:* ) # input from stdin - cat >$tmp/stdin - ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` - ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; - *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` - ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; - * ) ac_file_in=$ac_file.in ;; + case "$ac_file" in + *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'` + ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;; + *) ac_file_in="${ac_file}.in" ;; esac - # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories. - ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$ac_file" : 'X\(//\)[^/]' \| \ - X"$ac_file" : 'X\(//\)$' \| \ - X"$ac_file" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || -echo X"$ac_file" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` - if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then - { case "$ac_dir" in - [\\/]* | ?:[\\/]* ) as_incr_dir=;; - *) as_incr_dir=.;; -esac -as_dummy="$ac_dir" -for as_mkdir_dir in `IFS='/\\'; set X $as_dummy; shift; echo "$@"`; do - case $as_mkdir_dir in - # Skip DOS drivespec - ?:) as_incr_dir=$as_mkdir_dir ;; - *) - as_incr_dir=$as_incr_dir/$as_mkdir_dir - test -d "$as_incr_dir" || mkdir "$as_incr_dir" - ;; - esac -done; } + # Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories. - ac_dir_suffix="/`echo $ac_dir|sed 's,^\./,,'`" + # Remove last slash and all that follows it. Not all systems have dirname. + ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'` + if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then + # The file is in a subdirectory. + test ! -d "$ac_dir" && mkdir "$ac_dir" + ac_dir_suffix="/`echo $ac_dir|sed 's%^\./%%'`" # A "../" for each directory in $ac_dir_suffix. - ac_dots=`echo "$ac_dir_suffix" | sed 's,/[^/]*,../,g'` + ac_dots=`echo $ac_dir_suffix|sed 's%/[^/]*%../%g'` else ac_dir_suffix= ac_dots= fi - case $srcdir in - .) ac_srcdir=. - if test -z "$ac_dots"; then - ac_top_srcdir=. - else - ac_top_srcdir=`echo $ac_dots | sed 's,/$,,'` - fi ;; - [\\/]* | ?:[\\/]* ) - ac_srcdir=$srcdir$ac_dir_suffix; - ac_top_srcdir=$srcdir ;; + case "$ac_given_srcdir" in + .) srcdir=. + if test -z "$ac_dots"; then top_srcdir=. + else top_srcdir=`echo $ac_dots|sed 's%/$%%'`; fi ;; + /*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;; *) # Relative path. - ac_srcdir=$ac_dots$srcdir$ac_dir_suffix - ac_top_srcdir=$ac_dots$srcdir ;; + srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix" + top_srcdir="$ac_dots$ac_given_srcdir" ;; esac - case $INSTALL in - [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;; - *) ac_INSTALL=$ac_dots$INSTALL ;; + case "$ac_given_INSTALL" in + [/$]*) INSTALL="$ac_given_INSTALL" ;; + *) INSTALL="$ac_dots$ac_given_INSTALL" ;; esac - if test x"$ac_file" != x-; then - { echo "$as_me:21090: creating $ac_file" >&5 -echo "$as_me: creating $ac_file" >&6;} - rm -f "$ac_file" - fi - # Let's still pretend it is `configure' which instantiates (i.e., don't - # use $as_me), people would be surprised to read: - # /* config.h. Generated automatically by config.status. */ - configure_input="Generated automatically from `echo $ac_file_in | - sed 's,.*/,,'` by configure." - - # First look for the input files in the build tree, otherwise in the - # src tree. - ac_file_inputs=`IFS=: - for f in $ac_file_in; do - case $f in - -) echo $tmp/stdin ;; - [\\/$]*) - # Absolute (can't be DOS-style, as IFS=:) - test -f "$f" || { { echo "$as_me:21108: error: cannot find input file: $f" >&5 -echo "$as_me: error: cannot find input file: $f" >&2;} - { (exit 1); exit 1; }; } - echo $f;; - *) # Relative - if test -f "$f"; then - # Build tree - echo $f - elif test -f "$srcdir/$f"; then - # Source tree - echo $srcdir/$f - else - # /dev/null tree - { { echo "$as_me:21121: error: cannot find input file: $f" >&5 -echo "$as_me: error: cannot find input file: $f" >&2;} - { (exit 1); exit 1; }; } - fi;; - esac - done` || { (exit 1); exit 1; } -EOF -cat >>$CONFIG_STATUS <>$CONFIG_STATUS <<\EOF -:t -/@[a-zA-Z_][a-zA-Z_0-9]*@/!b -s,@configure_input@,$configure_input,;t t -s,@srcdir@,$ac_srcdir,;t t -s,@top_srcdir@,$ac_top_srcdir,;t t -s,@INSTALL@,$ac_INSTALL,;t t -" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out - rm -f $tmp/stdin - if test x"$ac_file" != x-; then - mv $tmp/out $ac_file - else - cat $tmp/out - rm -f $tmp/out - fi - -done -EOF -cat >>$CONFIG_STATUS <<\EOF + echo creating "$ac_file" + rm -f "$ac_file" + configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure." + case "$ac_file" in + *Makefile*) ac_comsub="1i\\ +# $configure_input" ;; + *) ac_comsub= ;; + esac -# -# CONFIG_HEADER section. -# + ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"` + sed -e "$ac_comsub +s%@configure_input@%$configure_input%g +s%@srcdir@%$srcdir%g +s%@top_srcdir@%$top_srcdir%g +s%@INSTALL@%$INSTALL%g +" $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file +fi; done +rm -f conftest.s* # These sed commands are passed to sed as "A NAME B NAME C VALUE D", where # NAME is the cpp macro being defined and VALUE is the value it is being given. # # ac_d sets the value in "#define NAME VALUE" lines. -ac_dA='s,^\([ ]*\)#\([ ]*define[ ][ ]*\)' -ac_dB='[ ].*$,\1#\2' -ac_dC=' ' -ac_dD=',;t' -# ac_u turns "#undef NAME" without trailing blanks into "#define NAME VALUE". -ac_uA='s,^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)' -ac_uB='$,\1#\2define\3' +ac_dA='s%^\([ ]*\)#\([ ]*define[ ][ ]*\)' +ac_dB='\([ ][ ]*\)[^ ]*%\1#\2' +ac_dC='\3' +ac_dD='%g' +# ac_u turns "#undef NAME" with trailing blanks into "#define NAME VALUE". +ac_uA='s%^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)' +ac_uB='\([ ]\)%\1#\2define\3' ac_uC=' ' -ac_uD=',;t' +ac_uD='\4%g' +# ac_e turns "#undef NAME" without trailing blanks into "#define NAME VALUE". +ac_eA='s%^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)' +ac_eB='$%\1#\2define\3' +ac_eC=' ' +ac_eD='%g' -for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue +if test "${CONFIG_HEADERS+set}" != set; then +EOF +cat >> $CONFIG_STATUS <> $CONFIG_STATUS <<\EOF +fi +for ac_file in .. $CONFIG_HEADERS; do if test "x$ac_file" != x..; then # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". - case $ac_file in - - | *:- | *:-:* ) # input from stdin - cat >$tmp/stdin - ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` - ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; - *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` - ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; - * ) ac_file_in=$ac_file.in ;; + case "$ac_file" in + *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'` + ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;; + *) ac_file_in="${ac_file}.in" ;; esac - test x"$ac_file" != x- && { echo "$as_me:21182: creating $ac_file" >&5 -echo "$as_me: creating $ac_file" >&6;} - - # First look for the input files in the build tree, otherwise in the - # src tree. - ac_file_inputs=`IFS=: - for f in $ac_file_in; do - case $f in - -) echo $tmp/stdin ;; - [\\/$]*) - # Absolute (can't be DOS-style, as IFS=:) - test -f "$f" || { { echo "$as_me:21193: error: cannot find input file: $f" >&5 -echo "$as_me: error: cannot find input file: $f" >&2;} - { (exit 1); exit 1; }; } - echo $f;; - *) # Relative - if test -f "$f"; then - # Build tree - echo $f - elif test -f "$srcdir/$f"; then - # Source tree - echo $srcdir/$f - else - # /dev/null tree - { { echo "$as_me:21206: error: cannot find input file: $f" >&5 -echo "$as_me: error: cannot find input file: $f" >&2;} - { (exit 1); exit 1; }; } - fi;; - esac - done` || { (exit 1); exit 1; } - # Remove the trailing spaces. - sed 's/[ ]*$//' $ac_file_inputs >$tmp/in - -EOF - -# Transform confdefs.h into two sed scripts, `conftest.defines' and -# `conftest.undefs', that substitutes the proper values into -# config.h.in to produce config.h. The first handles `#define' -# templates, and the second `#undef' templates. -# And first: Protect against being on the right side of a sed subst in -# config.status. Protect against being in an unquoted here document -# in config.status. -rm -f conftest.defines conftest.undefs -# Using a here document instead of a string reduces the quoting nightmare. -# Putting comments in sed scripts is not portable. -# -# `end' is used to avoid that the second main sed command (meant for -# 0-ary CPP macros) applies to n-ary macro definitions. -# See the Autoconf documentation for `clear'. -cat >confdef2sed.sed <<\EOF -s/[\\&,]/\\&/g -s,[\\$`],\\&,g -t clear -: clear -s,^[ ]*#[ ]*define[ ][ ]*\(\([^ (][^ (]*\)([^)]*)\)[ ]*\(.*\)$,${ac_dA}\2${ac_dB}\1${ac_dC}\3${ac_dD},gp -t end -s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp -: end -EOF -# If some macros were called several times there might be several times -# the same #defines, which is useless. Nevertheless, we may not want to -# sort them, since we want the *last* AC-DEFINE to be honored. -uniq confdefs.h | sed -n -f confdef2sed.sed >conftest.defines -sed 's/ac_d/ac_u/g' conftest.defines >conftest.undefs -rm -f confdef2sed.sed + echo creating $ac_file + + rm -f conftest.frag conftest.in conftest.out + ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"` + cat $ac_file_inputs > conftest.in + +EOF + +# Transform confdefs.h into a sed script conftest.vals that substitutes +# the proper values into config.h.in to produce config.h. And first: +# Protect against being on the right side of a sed subst in config.status. +# Protect against being in an unquoted here document in config.status. +rm -f conftest.vals +cat > conftest.hdr <<\EOF +s/[\\&%]/\\&/g +s%[\\$`]%\\&%g +s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD}%gp +s%ac_d%ac_u%gp +s%ac_u%ac_e%gp +EOF +sed -n -f conftest.hdr confdefs.h > conftest.vals +rm -f conftest.hdr # This sed command replaces #undef with comments. This is necessary, for # example, in the case of _POSIX_SOURCE, which is predefined and required # on some systems where configure will not decide to define it. -cat >>conftest.undefs <<\EOF -s,^[ ]*#[ ]*undef[ ][ ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */, +cat >> conftest.vals <<\EOF +s%^[ ]*#[ ]*undef[ ][ ]*[a-zA-Z_][a-zA-Z_0-9]*%/* & */% EOF -# Break up conftest.defines because some shells have a limit on the size -# of here documents, and old seds have small limits too (100 cmds). -echo ' # Handle all the #define templates only if necessary.' >>$CONFIG_STATUS -echo ' if egrep "^[ ]*#[ ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS -echo ' # If there are no defines, we may have an empty if/fi' >>$CONFIG_STATUS -echo ' :' >>$CONFIG_STATUS -rm -f conftest.tail -while grep . conftest.defines >/dev/null -do - # Write a limited-size here document to $tmp/defines.sed. - echo ' cat >$tmp/defines.sed <>$CONFIG_STATUS - # Speed up: don't consider the non `#define' lines. - echo '/^[ ]*#[ ]*define/!b' >>$CONFIG_STATUS - # Work around the forget-to-reset-the-flag bug. - echo 't clr' >>$CONFIG_STATUS - echo ': clr' >>$CONFIG_STATUS - sed ${ac_max_here_lines}q conftest.defines >>$CONFIG_STATUS - echo 'CEOF - sed -f $tmp/defines.sed $tmp/in >$tmp/out - rm -f $tmp/in - mv $tmp/out $tmp/in -' >>$CONFIG_STATUS - sed 1,${ac_max_here_lines}d conftest.defines >conftest.tail - rm -f conftest.defines - mv conftest.tail conftest.defines -done -rm -f conftest.defines -echo ' fi # egrep' >>$CONFIG_STATUS -echo >>$CONFIG_STATUS +# Break up conftest.vals because some shells have a limit on +# the size of here documents, and old seds have small limits too. -# Break up conftest.undefs because some shells have a limit on the size -# of here documents, and old seds have small limits too (100 cmds). -echo ' # Handle all the #undef templates' >>$CONFIG_STATUS rm -f conftest.tail -while grep . conftest.undefs >/dev/null +while : do - # Write a limited-size here document to $tmp/undefs.sed. - echo ' cat >$tmp/undefs.sed <>$CONFIG_STATUS - # Speed up: don't consider the non `#undef' - echo '/^[ ]*#[ ]*undef/!b' >>$CONFIG_STATUS - # Work around the forget-to-reset-the-flag bug. - echo 't clr' >>$CONFIG_STATUS - echo ': clr' >>$CONFIG_STATUS - sed ${ac_max_here_lines}q conftest.undefs >>$CONFIG_STATUS + ac_lines=`grep -c . conftest.vals` + # grep -c gives empty output for an empty file on some AIX systems. + if test -z "$ac_lines" || test "$ac_lines" -eq 0; then break; fi + # Write a limited-size here document to conftest.frag. + echo ' cat > conftest.frag <> $CONFIG_STATUS + sed ${ac_max_here_lines}q conftest.vals >> $CONFIG_STATUS echo 'CEOF - sed -f $tmp/undefs.sed $tmp/in >$tmp/out - rm -f $tmp/in - mv $tmp/out $tmp/in -' >>$CONFIG_STATUS - sed 1,${ac_max_here_lines}d conftest.undefs >conftest.tail - rm -f conftest.undefs - mv conftest.tail conftest.undefs + sed -f conftest.frag conftest.in > conftest.out + rm -f conftest.in + mv conftest.out conftest.in +' >> $CONFIG_STATUS + sed 1,${ac_max_here_lines}d conftest.vals > conftest.tail + rm -f conftest.vals + mv conftest.tail conftest.vals done -rm -f conftest.undefs - -cat >>$CONFIG_STATUS <<\EOF - # Let's still pretend it is `configure' which instantiates (i.e., don't - # use $as_me), people would be surprised to read: - # /* config.h. Generated automatically by config.status. */ - if test x"$ac_file" = x-; then - echo "/* Generated automatically by configure. */" >$tmp/config.h +rm -f conftest.vals + +cat >> $CONFIG_STATUS <<\EOF + rm -f conftest.frag conftest.h + echo "/* $ac_file. Generated automatically by configure. */" > conftest.h + cat conftest.in >> conftest.h + rm -f conftest.in + if cmp -s $ac_file conftest.h 2>/dev/null; then + echo "$ac_file is unchanged" + rm -f conftest.h else - echo "/* $ac_file. Generated automatically by configure. */" >$tmp/config.h - fi - cat $tmp/in >>$tmp/config.h - rm -f $tmp/in - if test x"$ac_file" != x-; then - if cmp -s $ac_file $tmp/config.h 2>/dev/null; then - { echo "$as_me:21323: $ac_file is unchanged" >&5 -echo "$as_me: $ac_file is unchanged" >&6;} - else - ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$ac_file" : 'X\(//\)[^/]' \| \ - X"$ac_file" : 'X\(//\)$' \| \ - X"$ac_file" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || -echo X"$ac_file" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` + # Remove last slash and all that follows it. Not all systems have dirname. + ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'` if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then - { case "$ac_dir" in - [\\/]* | ?:[\\/]* ) as_incr_dir=;; - *) as_incr_dir=.;; -esac -as_dummy="$ac_dir" -for as_mkdir_dir in `IFS='/\\'; set X $as_dummy; shift; echo "$@"`; do - case $as_mkdir_dir in - # Skip DOS drivespec - ?:) as_incr_dir=$as_mkdir_dir ;; - *) - as_incr_dir=$as_incr_dir/$as_mkdir_dir - test -d "$as_incr_dir" || mkdir "$as_incr_dir" - ;; - esac -done; } - - fi - rm -f $ac_file - mv $tmp/config.h $ac_file + # The file is in a subdirectory. + test ! -d "$ac_dir" && mkdir "$ac_dir" fi - else - cat $tmp/config.h - rm -f $tmp/config.h + rm -f $ac_file + mv conftest.h $ac_file fi -done +fi; done + EOF -cat >>$CONFIG_STATUS <<\EOF +cat >> $CONFIG_STATUS <> $CONFIG_STATUS <<\EOF - case $ac_dest in - default ) - chmod +x wx-config - mv wx-config wx${TOOLKIT_NAME}-config - ${LN_S} wx${TOOLKIT_NAME}-config wx-config + if test ! -h wx-config; then + chmod +x wx-config + mv wx-config wx${TOOLCHAIN_NAME}-config + ${LN_S} wx${TOOLCHAIN_NAME}-config wx-config + fi if test ! -d lib; then mkdir lib @@ -21385,62 +18899,22 @@ for ac_file in : $CONFIG_COMMANDS; do test "x$ac_file" = x: && continue if test ! -d lib/wx/include; then mkdir lib/wx/include fi - if test ! -d lib/wx/include/wx; then - mkdir lib/wx/include/wx - fi - if test ! -d lib/wx/include/wx/${TOOLKIT_NAME}; then - mkdir lib/wx/include/wx/${TOOLKIT_NAME} + if test ! -d lib/wx/include/${TOOLCHAIN_NAME}; then + mkdir lib/wx/include/${TOOLCHAIN_NAME} fi - if test -f setup.h; then - cp -fp setup.h lib/wx/include/wx/${TOOLKIT_NAME}/setup.h - fi - - 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} + if test ! -d lib/wx/include/${TOOLCHAIN_NAME}/wx; then + mkdir lib/wx/include/${TOOLCHAIN_NAME}/wx fi if test -f setup.h; then - cp -fp setup.h include/wx/${TOOLKIT_DIR}/setup.h + mv -f setup.h lib/wx/include/${TOOLCHAIN_NAME}/wx/setup.h fi - - ;; - esac -done -EOF - -cat >>$CONFIG_STATUS <<\EOF - -{ (exit 0); exit 0; } + +exit 0 EOF chmod +x $CONFIG_STATUS -ac_clean_files=$ac_clean_files_save - -# configure is writing to config.log, and then calls config.status. -# config.status does its own redirection, appending to config.log. -# Unfortunately, on DOS this fails, as config.log is still kept open -# by configure, so config.status won't be able to write to it; its -# output is simply discarded. So we exec the FD to /dev/null, -# effectively closing config.log, so it can be properly (re)opened and -# appended to by config.status. When coming back to configure, we -# need to make the FD available again. -if test "$no_create" != yes; then - ac_cs_success=: - exec 5>/dev/null - $SHELL $CONFIG_STATUS || ac_cs_success=false - exec 5>>config.log - # Use ||, not &&, to avoid exiting from the if with $? = 1, which - # would make configure fail if this is the last instruction. - $ac_cs_success || { (exit 1); exit 1; } -fi +rm -fr confdefs* $ac_clean_files +test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1 -# -# CONFIG_SUBDIRS section. -# if test "$no_recursion" != yes; then # Remove --cache-file and --srcdir arguments so they do not pile up. @@ -21451,15 +18925,12 @@ if test "$no_recursion" != yes; then ac_prev= continue fi - case $ac_arg in + case "$ac_arg" in -cache-file | --cache-file | --cache-fil | --cache-fi \ | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c) ac_prev=cache_file ;; -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \ - | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* \ - | --c=*) - ;; - --config-cache | -C) + | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*) ;; -srcdir | --srcdir | --srcdi | --srcd | --src | --sr) ac_prev=srcdir ;; @@ -21469,90 +18940,76 @@ if test "$no_recursion" != yes; then esac done - for ac_subdir in : $subdirs; do test "x$ac_subdir" = x: && continue + for ac_config_dir in demos samples utils contrib; do # Do not complain, so a configure script can configure whichever # parts of a large source tree are present. - test -d $srcdir/$ac_subdir || continue + if test ! -d $srcdir/$ac_config_dir; then + continue + fi + + echo configuring in $ac_config_dir - { echo "$as_me:21478: configuring in $ac_subdir" >&5 -echo "$as_me: configuring in $ac_subdir" >&6;} - case $srcdir in + case "$srcdir" in .) ;; - *) { case "./$ac_subdir" in - [\\/]* | ?:[\\/]* ) as_incr_dir=;; - *) as_incr_dir=.;; -esac -as_dummy="./$ac_subdir" -for as_mkdir_dir in `IFS='/\\'; set X $as_dummy; shift; echo "$@"`; do - case $as_mkdir_dir in - # Skip DOS drivespec - ?:) as_incr_dir=$as_mkdir_dir ;; *) - as_incr_dir=$as_incr_dir/$as_mkdir_dir - test -d "$as_incr_dir" || mkdir "$as_incr_dir" - ;; - esac -done; } - - if test -d ./$ac_subdir; then :; - else - { { echo "$as_me:21500: error: cannot create \`pwd\`/$ac_subdir" >&5 -echo "$as_me: error: cannot create \`pwd\`/$ac_subdir" >&2;} - { (exit 1); exit 1; }; } - fi - ;; + if test -d ./$ac_config_dir || mkdir ./$ac_config_dir; then :; + else + { echo "configure: error: can not create `pwd`/$ac_config_dir" 1>&2; exit 1; } + fi + ;; esac ac_popdir=`pwd` - cd $ac_subdir + cd $ac_config_dir - # A "../" for each directory in /$ac_subdir. - ac_dots=`echo $ac_subdir | - sed 's,^\./,,;s,[^/]$,&/,;s,[^/]*/,../,g'` + # A "../" for each directory in /$ac_config_dir. + ac_dots=`echo $ac_config_dir|sed -e 's%^\./%%' -e 's%[^/]$%&/%' -e 's%[^/]*/%../%g'` - case $srcdir in + case "$srcdir" in .) # No --srcdir option. We are building in place. ac_sub_srcdir=$srcdir ;; - [\\/]* | ?:[\\/]* ) # Absolute path. - ac_sub_srcdir=$srcdir/$ac_subdir ;; + /*) # Absolute path. + ac_sub_srcdir=$srcdir/$ac_config_dir ;; *) # Relative path. - ac_sub_srcdir=$ac_dots$srcdir/$ac_subdir ;; + ac_sub_srcdir=$ac_dots$srcdir/$ac_config_dir ;; esac # Check for guested configure; otherwise get Cygnus style configure. - if test -f $ac_sub_srcdir/configure.gnu; then - ac_sub_configure="$SHELL '$ac_sub_srcdir/configure.gnu'" - elif test -f $ac_sub_srcdir/configure; then - ac_sub_configure="$SHELL '$ac_sub_srcdir/configure'" + if test -f $ac_sub_srcdir/configure; then + ac_sub_configure=$ac_sub_srcdir/configure elif test -f $ac_sub_srcdir/configure.in; then ac_sub_configure=$ac_configure else - { echo "$as_me:21531: WARNING: no configuration information is in $ac_subdir" >&5 -echo "$as_me: WARNING: no configuration information is in $ac_subdir" >&2;} + echo "configure: warning: no configuration information is in $ac_config_dir" 1>&2 ac_sub_configure= fi # The recursion is here. if test -n "$ac_sub_configure"; then + # Make the cache file name correct relative to the subdirectory. - case $cache_file in - [\\/]* | ?:[\\/]* ) ac_sub_cache_file=$cache_file ;; + case "$cache_file" in + /*) ac_sub_cache_file=$cache_file ;; *) # Relative path. - ac_sub_cache_file=$ac_dots$cache_file ;; + ac_sub_cache_file="$ac_dots$cache_file" ;; esac + case "$ac_given_INSTALL" in + [/$]*) INSTALL="$ac_given_INSTALL" ;; + *) INSTALL="$ac_dots$ac_given_INSTALL" ;; + esac - { echo "$as_me:21545: running $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir" >&5 -echo "$as_me: running $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir" >&6;} + echo "running ${CONFIG_SHELL-/bin/sh} $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir" # The eval makes quoting arguments work. - eval $ac_sub_configure $ac_sub_configure_args \ - --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir || - { { echo "$as_me:21550: error: $ac_sub_configure failed for $ac_subdir" >&5 -echo "$as_me: error: $ac_sub_configure failed for $ac_subdir" >&2;} - { (exit 1); exit 1; }; } + if eval ${CONFIG_SHELL-/bin/sh} $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir + then : + else + { echo "configure: error: $ac_sub_configure failed for $ac_config_dir" 1>&2; exit 1; } + fi fi cd $ac_popdir done fi +