+
+# Configure paths for GTK+
+# Owen Taylor 97-11-3
-# Configure paths for GTK+
-# Owen Taylor 97-11-3
# Guess values for system-dependent variables and create Makefiles.
ac_default_prefix=/usr/local
# Any additions from configure.in:
ac_help="$ac_help
---enable-gui use GUI classes"
+ --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
ac_help="$ac_help
--with-pm use OS/2 Presentation Manager"
ac_help="$ac_help
- --with-gtk-prefix=PFX Prefix where GTK is installed"
+ --with-mgl use 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-burnt_name create set name in shared library "
+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-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 exceptions information"
+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 wxWin 2.0 compatibility"
+ac_help="$ac_help
+ --enable-compat22 enable wxWin 2.2 compatibility"
ac_help="$ac_help
- --with-gtk-exec-prefix=PFX Exec prefix where GTK is installed"
+ --enable-intl use internationalization system"
ac_help="$ac_help
---with-libpng use libpng (PNG image format)"
+ --enable-config use wxConfig (and derived) classes"
ac_help="$ac_help
---with-libjpeg use libjpeg (JPEG file format)"
+ --enable-sockets use socket/network classes"
ac_help="$ac_help
---with-libtiff use libtiff (TIFF file format)"
+ --enable-ipc use interprocess communication (wxSocket etc.)"
ac_help="$ac_help
---with-freetype use freetype (font rasterizer)"
+ --enable-cmdline use wxCmdLineParser class"
ac_help="$ac_help
---with-opengl use OpenGL (or Mesa)"
+ --enable-datetime use wxDateTime class"
ac_help="$ac_help
---with-dmalloc use dmalloc library (www.letters.com/dmalloc)"
+ --enable-timedate use obsolete wxDate/wxTime classes"
ac_help="$ac_help
---with-zlib use zlib for LZW compression"
+ --enable-stopwatch use wxStopWatch class"
ac_help="$ac_help
---with-odbc use the IODBC and wxODBC classes"
+ --enable-dialupman use dialup network classes"
ac_help="$ac_help
---enable-shared create shared library code"
+ --enable-apple_ieee use the Apple IEEE codec"
ac_help="$ac_help
---enable-burnt_name create set name in shared library "
+ --enable-timer use wxTimer class"
ac_help="$ac_help
---enable-optimise create optimised code"
+ --enable-wave use wxWave class"
ac_help="$ac_help
---enable-debug same as debug_flag and debug_info"
+ --enable-fraction use wxFraction class"
ac_help="$ac_help
---enable-debug_flag set __WXDEBUG__ flag (recommended for developers!)"
+ --enable-dynlib use wxLibrary class for DLL loading"
ac_help="$ac_help
---enable-debug_info create code with debugging information"
+ --enable-longlong use wxLongLong class"
ac_help="$ac_help
---enable-debug_gdb create code with extra GDB debugging information"
+ --enable-geometry use geometry class"
ac_help="$ac_help
---enable-debug_cntxt use wxDebugContext"
+ --enable-log use logging system"
ac_help="$ac_help
---enable-mem_tracing create code with memory tracing"
+ --enable-streams use wxStream etc classes"
ac_help="$ac_help
---enable-profile create code with profiling information"
+ --enable-file use wxFile classes"
ac_help="$ac_help
---enable-no_rtti create code without RTTI information"
+ --enable-ffile use wxFFile classes"
ac_help="$ac_help
---enable-no_exceptions create code without exceptions information"
+ --enable-textfile use wxTextFile classes"
ac_help="$ac_help
---enable-permissive compile code disregarding strict ANSI"
+ --enable-fontmap use font encodings conversion classes"
ac_help="$ac_help
---enable-no_deps create code without dependency information"
+ --enable-unicode compile wxString with Unicode support"
ac_help="$ac_help
---enable-intl use internationalization system"
+ --enable-wcsrtombs use wcsrtombs instead of buggy (GNU libc1/Linux libc5) wcstombs"
ac_help="$ac_help
---enable-config use wxConfig (and derived) classes"
+ --enable-wxprintfv use wxWindows implementation of vprintf()"
ac_help="$ac_help
---enable-sockets use socket/network classes"
+ --enable-std_iostreams use standard C++ stream classes"
ac_help="$ac_help
---enable-ipc use interprocess communication (wxSocket etc.)"
+ --enable-filesystem use virtual file systems classes"
ac_help="$ac_help
---enable-dialupman use dialup network classes"
+ --enable-fs_inet use virtual HTTP/FTP filesystems"
ac_help="$ac_help
---enable-apple_ieee use the Apple IEEE codec"
+ --enable-fs_zip use virtual ZIP filesystems"
ac_help="$ac_help
---enable-timedate use date/time classes"
+ --enable-zipstream use wxZipInputStream"
ac_help="$ac_help
---enable-wave use wxWave class"
+ --enable-catch_segvs catch signals and pass them to wxApp::OnFatalException"
ac_help="$ac_help
---enable-fraction use wxFraction class"
+ --enable-snglinst use wxSingleInstanceChecker class"
ac_help="$ac_help
---enable-dynlib use wxLibrary class for DLL loading"
+ --enable-mimetypes use wxMimeTypesManager"
ac_help="$ac_help
---enable-longlong use wxLongLong class"
+ --enable-sysoptions use wxSystemOptions"
ac_help="$ac_help
---enable-geometry use geometry class"
+ --enable-threads use threads"
ac_help="$ac_help
---enable-log use logging system"
+ --enable-serial use class serialization"
ac_help="$ac_help
---enable-streams use wxStream etc classes"
+ --enable-docview use document view architecture"
ac_help="$ac_help
---enable-file use wxFile classes"
+ --enable-help use help subsystem"
ac_help="$ac_help
---enable-textfile use wxTextFile classes"
+ --enable-mshtmlhelp use MS HTML Help (win32)"
ac_help="$ac_help
---enable-unicode compile wxString with Unicode support"
+ --enable-html use wxHTML sub-library"
ac_help="$ac_help
---enable-wcsrtombs use wcsrtombs instead of buggy (GNU libc1/Linux libc5) wcstombs"
+ --enable-htmlhelp use wxHTML-based help"
ac_help="$ac_help
---enable-wxprintfv use wxWindows implementation of vprintf()"
+ --enable-constraints use layout-constraints system"
ac_help="$ac_help
---enable-std_iostreams use standard C++ stream classes"
+ --enable-printarch use printing architecture"
ac_help="$ac_help
---enable-filesystem use virtual file systems classes"
+ --enable-mdi use multiple document interface architecture"
ac_help="$ac_help
---enable-fs_inet use virtual HTTP/FTP filesystems"
+ --enable-loggui use standard GUI logger"
ac_help="$ac_help
---enable-fs_zip use virtual ZIP filesystems"
+ --enable-logwin use wxLogWindow"
ac_help="$ac_help
---enable-zipstream use wxZipInputStream"
+ --enable-postscript use wxPostscriptDC device context (default for gtk+)"
ac_help="$ac_help
---enable-catch_segvs catch signals and pass them to wxApp::OnFatalException"
+ --enable-prologio use Prolog IO library"
ac_help="$ac_help
---enable-threads use threads"
+ --enable-resources use wxWindows resources"
ac_help="$ac_help
---enable-serial use class serialization"
+ --enable-xresources use X resources for save (default for gtk+)"
ac_help="$ac_help
---enable-docview use document view architecture"
+ --enable-clipboard use wxClipboard classes"
ac_help="$ac_help
---enable-help use help (using external browser at present)"
+ --enable-dnd use Drag'n'Drop classes"
ac_help="$ac_help
---enable-constraints use layout-constraints system"
+ --enable-metafile use win32 metafiles"
ac_help="$ac_help
---enable-printarch use printing architecture"
+ --enable-treelayout use wxTreeLayout classes"
ac_help="$ac_help
---enable-mdi use multiple document interface architecture"
+ --enable-controls use all usual controls"
ac_help="$ac_help
---enable-postscript use wxPostscriptDC device context (default for gtk+)"
+ --enable-accel use accelerators"
ac_help="$ac_help
---enable-prologio use Prolog IO library"
+ --enable-button use wxButton class"
ac_help="$ac_help
---enable-resources use wxWindows resources"
+ --enable-bmpbutton use wxBitmapButton class"
ac_help="$ac_help
---enable-xresources use X resources for save (default for gtk+)"
+ --enable-calendar use wxCalendarCtrl class"
ac_help="$ac_help
---enable-clipboard use wxClipboard classes"
+ --enable-caret use wxCaret class"
ac_help="$ac_help
---enable-dnd use Drag'n'Drop classes"
+ --enable-checkbox use wxCheckBox class"
ac_help="$ac_help
---enable-wxtree make wxTree library"
+ --enable-checklst use wxCheckListBox (listbox with checkboxes) class"
ac_help="$ac_help
---enable-controls use all usual controls"
+ --enable-choice use wxChoice class"
ac_help="$ac_help
---enable-accel use accelerators"
+ --enable-combobox use wxComboBox classes"
ac_help="$ac_help
---enable-caret use wxCaret class"
+ --enable-gauge use wxGauge class"
ac_help="$ac_help
---enable-bmpbutton use wxBitmapButton class"
+ --enable-grid use wxGrid class"
ac_help="$ac_help
---enable-checkbox use wxCheckBox class"
+ --enable-newgrid use new wxGrid class"
ac_help="$ac_help
---enable-checklst use wxCheckListBox (listbox with checkboxes) class"
+ --enable-imaglist use wxImageList class"
ac_help="$ac_help
---enable-choice use wxChoice class"
+ --enable-listbox use wxListBox class"
ac_help="$ac_help
---enable-combobox use wxComboBox classes"
+ --enable-listctrl use wxListCtrl class"
ac_help="$ac_help
---enable-gauge use wxGauge class"
+ --enable-notebook use wxNotebook class"
ac_help="$ac_help
---enable-grid use wxGrid class"
+ --enable-propsheet use wxPropertySheet class"
ac_help="$ac_help
---enable-newgrid use new wxGrid class"
+ --enable-radiobox use wxRadioBox class"
ac_help="$ac_help
---enable-imaglist use wxImageList class"
+ --enable-radiobtn use wxRadioButton class"
ac_help="$ac_help
---enable-listbox use wxListBox class"
+ --enable-sash use wxSashWindow class"
ac_help="$ac_help
---enable-listctrl use wxListCtrl class"
+ --enable-scrollbar use wxScrollBar class and scrollable windows"
ac_help="$ac_help
---enable-notebook use wxNotebook class"
+ --enable-slider use wxSlider class"
ac_help="$ac_help
---enable-radiobox use wxRadioBox class"
+ --enable-spinbtn use wxSpinButton class"
ac_help="$ac_help
---enable-radiobtn use wxRadioButton class"
+ --enable-spinctrl use wxSpinCtrl class"
ac_help="$ac_help
---enable-sash use wxSashWindow class"
+ --enable-splitter use wxSplitterWindow class"
ac_help="$ac_help
---enable-scrollbar use wxScrollBar class and scrollable windows"
+ --enable-statbmp use wxStaticBitmap class"
ac_help="$ac_help
---enable-slider use wxSlider class"
+ --enable-statbox use wxStaticBox class"
ac_help="$ac_help
---enable-spinbtn use wxSpinButton class"
+ --enable-statline use wxStaticLine class"
ac_help="$ac_help
---enable-spinctrl use wxSpinCtrl class"
+ --enable-stattext use wxStaticText class"
ac_help="$ac_help
---enable-splitter use wxSplitterWindow class"
+ --enable-statusbar use wxStatusBar class"
ac_help="$ac_help
---enable-statbmp use wxStaticBitmap class"
+ --enable-tabdialog use wxTabControl class"
ac_help="$ac_help
---enable-statbox use wxStaticBox class"
+ --enable-textctrl use wxTextCtrl class"
ac_help="$ac_help
---enable-statline use wxStaticLine class"
+ --enable-togglebtn use wxToggleButton class"
ac_help="$ac_help
---enable-statusbar use wxStatusBar class"
+ --enable-toolbar use wxToolBar class"
ac_help="$ac_help
---enable-tabdialog use wxTabControl class"
+ --enable-tbarnative use native wxToolBar class"
ac_help="$ac_help
---enable-toolbar use wxToolBar class"
+ --enable-tbarsmpl use wxToolBarSimple class"
ac_help="$ac_help
---enable-tbarnative use native wxToolBar class"
+ --enable-treectrl use wxTreeCtrl class"
ac_help="$ac_help
---enable-tbarsmpl use wxToolBarSimple class"
+ --enable-popupwin use wxPopUpWindow class"
ac_help="$ac_help
---enable-treectrl use wxTreeCtrl class"
+ --enable-commondlg use common dialogs (wxDirDialog, wxProgressDialog, wxTextDialog, ...)"
ac_help="$ac_help
---enable-commondlg use common dialogs (wxDirDialog, wxProgressDialog, wxTextDialog, ...)"
+ --enable-choicedlg use wxChoiceDialog"
ac_help="$ac_help
---enable-dirdlg use wxDirDialog"
+ --enable-coldlg use wxColourDialog"
ac_help="$ac_help
---enable-textdlg use wxTextDialog"
+ --enable-filedlg use wxFileDialog"
ac_help="$ac_help
---enable-tipdlg use startup tips"
+ --enable-finddlg use wxFindReplaceDialog"
ac_help="$ac_help
---enable-progressdlg use wxProgressDialog"
+ --enable-fontdlg use wxFontDialog"
ac_help="$ac_help
---enable-miniframe use wxMiniFrame class"
+ --enable-dirdlg use wxDirDialog"
ac_help="$ac_help
---enable-html use wxHTML sub-library"
+ --enable-msgdlg use wxMessageDialog"
ac_help="$ac_help
---enable-tooltips use wxToolTip class"
+ --enable-numberdlg use wxNumberEntryDialog"
ac_help="$ac_help
---enable-splines use spline drawing code"
+ --enable-textdlg use wxTextDialog"
ac_help="$ac_help
---enable-validators use wxValidator and derived classes"
+ --enable-tipdlg use startup tips"
ac_help="$ac_help
---enable-busyinfo use wxBusyInfo"
+ --enable-progressdlg use wxProgressDialog"
ac_help="$ac_help
---enable-joystick compile in joystick support (Linux only)"
+ --enable-wizarddlg use wxWizard"
ac_help="$ac_help
---enable-gif use gif images (GIF file format)"
+ --enable-menus use wxMenu/wxMenuBar/wxMenuItem classes"
ac_help="$ac_help
---enable-pcx use pcx images (PCX file format)"
+ --enable-miniframe use wxMiniFrame class"
ac_help="$ac_help
---enable-pnm use pnm images (PNM file format)"
+ --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 compile in joystick support (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-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
fi
echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:860: checking host system type" >&5
+echo "configure:937: checking host system type" >&5
host_alias=$host
case "$host_alias" in
echo "$ac_t""$host" 1>&6
echo $ac_n "checking target system type""... $ac_c" 1>&6
-echo "configure:881: checking target system type" >&5
+echo "configure:958: checking target system type" >&5
target_alias=$target
case "$target_alias" in
echo "$ac_t""$target" 1>&6
echo $ac_n "checking build system type""... $ac_c" 1>&6
-echo "configure:899: checking build system type" >&5
+echo "configure:976: checking build system type" >&5
build_alias=$build
case "$build_alias" in
WX_MAJOR_VERSION_NUMBER=2
WX_MINOR_VERSION_NUMBER=3
-WX_RELEASE_NUMBER=0
-
-WX_INTERFACE_AGE=0
-WX_BINARY_AGE=0
+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=`expr $WX_RELEASE_NUMBER - $WX_INTERFACE_AGE`
-WX_REVISION=$WX_INTERFACE_AGE
-WX_AGE=`expr $WX_BINARY_AGE - $WX_INTERFACE_AGE`
+
+WX_CURRENT=1
+WX_REVISION=0
+WX_AGE=0
+
USE_UNIX=1
USE_WIN32=0
USE_BEOS=0
+USE_MAC=0
USE_LINUX=
USE_SGI=
USE_ALPHA=
USE_OSF=
USE_BSD=
+USE_DARWIN=
USE_FREEBSD=
+USE_OPENBSD=
USE_NETBSD=
USE_VMS=
USE_ULTRIX=
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=
cat >> confdefs.h <<\EOF
#define __BSD__ 1
+EOF
+
+ DEFAULT_DEFAULT_wxUSE_GTK=1
+ ;;
+ *-*-openbsd*)
+ USE_BSD=1
+ USE_OPENBSD=1
+ cat >> confdefs.h <<\EOF
+#define __FREEBSD__ 1
+EOF
+
+ cat >> confdefs.h <<\EOF
+#define __OPENBSD__ 1
EOF
DEFAULT_DEFAULT_wxUSE_GTK=1
DEFAULT_DEFAULT_wxUSE_MOTIF=1
;;
- *-*-cygwin32* | *-*-mingw32* )
+ *-*-cygwin* | *-*-mingw32* )
USE_UNIX=0
USE_WIN32=1
cat >> confdefs.h <<\EOF
*-*-darwin* )
USE_BSD=1
- USE_MAC=1
+ USE_DARWIN=1
cat >> confdefs.h <<\EOF
-#define __MAC__ 1
+#define __BSD__ 1
EOF
cat >> confdefs.h <<\EOF
-#define __BSD__ 1
+#define __DARWIN__ 1
EOF
cat >> confdefs.h <<\EOF
if test "$USE_LINUX" = 1; then
echo $ac_n "checking for gettext in -lc""... $ac_c" 1>&6
-echo "configure:1231: checking for gettext in -lc" >&5
+echo "configure:1324: checking for gettext in -lc" >&5
ac_lib_var=`echo c'_'gettext | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
ac_save_LIBS="$LIBS"
LIBS="-lc $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 1239 "configure"
+#line 1332 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
gettext()
; return 0; }
EOF
-if { (eval echo configure:1250: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1343: \"$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
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_OPTIMISE=no
DEFAULT_wxUSE_PROFILE=no
DEFAULT_wxUSE_NO_DEPS=no
DEFAULT_wxUSE_NO_RTTI=no
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
DEFAULT_wxUSE_OPENGL=no
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
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
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_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
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
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
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_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_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
DEFAULT_wxUSE_OPENGL=no
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
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
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_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
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
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
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_IMAGE=yes
DEFAULT_wxUSE_GIF=yes
DEFAULT_wxUSE_PCX=yes
DEFAULT_wxUSE_PNM=yes
+ DEFAULT_wxUSE_XPM=yes
fi
- echo $ac_n "checking "for --enable-gui"""... $ac_c" 1>&6
-echo "configure:1546: checking "for --enable-gui"" >&5
+ echo $ac_n "checking for --enable-gui""... $ac_c" 1>&6
+echo "configure:1712: checking for --enable-gui" >&5
no_cache=0
# Check whether --enable-gui or --disable-gui was given.
if test "${enable_gui+set}" = set; then
if test "$wxUSE_GUI" = "yes"; then
+
+ echo $ac_n "checking for --enable-universal""... $ac_c" 1>&6
+echo "configure:1754: 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_PM="$withval" CACHE_PM=1 TOOLKIT_GIVEN=1
fi
-
-# Check whether --with-gtk-prefix or --without-gtk-prefix was given.
-if test "${with_gtk_prefix+set}" = set; then
- withval="$with_gtk_prefix"
- gtk_config_prefix="$withval"
-else
- gtk_config_prefix=""
+# 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=""
+ wxUSE_GTK2=0
fi
- echo $ac_n "checking "for --with-libpng"""... $ac_c" 1>&6
-echo "configure:1648: checking "for --with-libpng"" >&5
+ echo $ac_n "checking for --with-libpng""... $ac_c" 1>&6
+echo "configure:1851: checking for --with-libpng" >&5
no_cache=0
# Check whether --with-libpng or --without-libpng was given.
if test "${with_libpng+set}" = set; then
fi
- echo $ac_n "checking "for --with-libjpeg"""... $ac_c" 1>&6
-echo "configure:1695: checking "for --with-libjpeg"" >&5
+ echo $ac_n "checking for --with-libjpeg""... $ac_c" 1>&6
+echo "configure:1898: checking for --with-libjpeg" >&5
no_cache=0
# Check whether --with-libjpeg or --without-libjpeg was given.
if test "${with_libjpeg+set}" = set; then
fi
- echo $ac_n "checking "for --with-libtiff"""... $ac_c" 1>&6
-echo "configure:1742: checking "for --with-libtiff"" >&5
+ echo $ac_n "checking for --with-libtiff""... $ac_c" 1>&6
+echo "configure:1945: checking for --with-libtiff" >&5
no_cache=0
# Check whether --with-libtiff or --without-libtiff was given.
if test "${with_libtiff+set}" = set; then
fi
- echo $ac_n "checking "for --with-freetype"""... $ac_c" 1>&6
-echo "configure:1789: checking "for --with-freetype"" >&5
+ echo $ac_n "checking for --with-freetype""... $ac_c" 1>&6
+echo "configure:1992: checking for --with-freetype" >&5
no_cache=0
# Check whether --with-freetype or --without-freetype was given.
if test "${with_freetype+set}" = set; then
fi
- echo $ac_n "checking "for --with-opengl"""... $ac_c" 1>&6
-echo "configure:1836: checking "for --with-opengl"" >&5
+ echo $ac_n "checking for --with-opengl""... $ac_c" 1>&6
+echo "configure:2039: checking for --with-opengl" >&5
no_cache=0
# Check whether --with-opengl or --without-opengl was given.
if test "${with_opengl+set}" = set; then
fi
- echo $ac_n "checking "for --with-dmalloc"""... $ac_c" 1>&6
-echo "configure:1878: checking "for --with-dmalloc"" >&5
+ echo $ac_n "checking for --with-dmalloc""... $ac_c" 1>&6
+echo "configure:2081: checking for --with-dmalloc" >&5
no_cache=0
# Check whether --with-dmalloc or --without-dmalloc was given.
if test "${with_dmalloc+set}" = set; then
fi
- echo $ac_n "checking "for --with-zlib"""... $ac_c" 1>&6
-echo "configure:1917: checking "for --with-zlib"" >&5
+ echo $ac_n "checking for --with-regex""... $ac_c" 1>&6
+echo "configure:2120: 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'
+ else
+ { echo "configure: error: Invalid value for --with-regex: should be yes, no or sys" 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
+ else
+ { echo "configure: error: Invalid value for --with-regex: should be yes, no or sys" 1>&2; exit 1; }
+ fi
+
+
+ echo $ac_n "checking for --with-zlib""... $ac_c" 1>&6
+echo "configure:2167: checking for --with-zlib" >&5
no_cache=0
# Check whether --with-zlib or --without-zlib was given.
if test "${with_zlib+set}" = set; then
fi
- echo $ac_n "checking "for --with-odbc"""... $ac_c" 1>&6
-echo "configure:1964: checking "for --with-odbc"" >&5
+ echo $ac_n "checking for --with-odbc""... $ac_c" 1>&6
+echo "configure:2214: checking for --with-odbc" >&5
no_cache=0
# Check whether --with-odbc or --without-odbc was given.
if test "${with_odbc+set}" = set; then
- echo $ac_n "checking "for --enable-shared"""... $ac_c" 1>&6
-echo "configure:2006: checking "for --enable-shared"" >&5
+ echo $ac_n "checking for --enable-shared""... $ac_c" 1>&6
+echo "configure:2256: checking for --enable-shared" >&5
no_cache=0
# Check whether --enable-shared or --disable-shared was given.
if test "${enable_shared+set}" = set; then
fi
- echo $ac_n "checking "for --enable-burnt_name"""... $ac_c" 1>&6
-echo "configure:2045: checking "for --enable-burnt_name"" >&5
+ echo $ac_n "checking for --enable-burnt_name""... $ac_c" 1>&6
+echo "configure:2295: checking for --enable-burnt_name" >&5
no_cache=0
# Check whether --enable-burnt_name or --disable-burnt_name was given.
if test "${enable_burnt_name+set}" = set; then
fi
- echo $ac_n "checking "for --enable-optimise"""... $ac_c" 1>&6
-echo "configure:2084: checking "for --enable-optimise"" >&5
+ echo $ac_n "checking for --enable-optimise""... $ac_c" 1>&6
+echo "configure:2334: checking for --enable-optimise" >&5
no_cache=0
# Check whether --enable-optimise or --disable-optimise was given.
if test "${enable_optimise+set}" = set; then
fi
- echo $ac_n "checking "for --enable-debug"""... $ac_c" 1>&6
-echo "configure:2123: checking "for --enable-debug"" >&5
+ echo $ac_n "checking for --enable-debug""... $ac_c" 1>&6
+echo "configure:2373: checking for --enable-debug" >&5
no_cache=0
# Check whether --enable-debug or --disable-debug was given.
if test "${enable_debug+set}" = set; then
fi
- echo $ac_n "checking "for --enable-debug_flag"""... $ac_c" 1>&6
-echo "configure:2171: checking "for --enable-debug_flag"" >&5
+ echo $ac_n "checking for --enable-debug_flag""... $ac_c" 1>&6
+echo "configure:2421: 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
fi
- echo $ac_n "checking "for --enable-debug_info"""... $ac_c" 1>&6
-echo "configure:2210: checking "for --enable-debug_info"" >&5
+ echo $ac_n "checking for --enable-debug_info""... $ac_c" 1>&6
+echo "configure:2460: 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
fi
- echo $ac_n "checking "for --enable-debug_gdb"""... $ac_c" 1>&6
-echo "configure:2249: checking "for --enable-debug_gdb"" >&5
+ echo $ac_n "checking for --enable-debug_gdb""... $ac_c" 1>&6
+echo "configure:2499: 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
fi
- echo $ac_n "checking "for --enable-debug_cntxt"""... $ac_c" 1>&6
-echo "configure:2288: checking "for --enable-debug_cntxt"" >&5
+ echo $ac_n "checking for --enable-debug_cntxt""... $ac_c" 1>&6
+echo "configure:2538: 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
fi
- echo $ac_n "checking "for --enable-mem_tracing"""... $ac_c" 1>&6
-echo "configure:2327: checking "for --enable-mem_tracing"" >&5
+ echo $ac_n "checking for --enable-mem_tracing""... $ac_c" 1>&6
+echo "configure:2577: 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
fi
- echo $ac_n "checking "for --enable-profile"""... $ac_c" 1>&6
-echo "configure:2366: checking "for --enable-profile"" >&5
+ echo $ac_n "checking for --enable-profile""... $ac_c" 1>&6
+echo "configure:2616: checking for --enable-profile" >&5
no_cache=0
# Check whether --enable-profile or --disable-profile was given.
if test "${enable_profile+set}" = set; then
fi
- echo $ac_n "checking "for --enable-no_rtti"""... $ac_c" 1>&6
-echo "configure:2405: checking "for --enable-no_rtti"" >&5
+ echo $ac_n "checking for --enable-no_rtti""... $ac_c" 1>&6
+echo "configure:2655: 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
fi
- echo $ac_n "checking "for --enable-no_exceptions"""... $ac_c" 1>&6
-echo "configure:2444: checking "for --enable-no_exceptions"" >&5
+ echo $ac_n "checking for --enable-no_exceptions""... $ac_c" 1>&6
+echo "configure:2694: 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
fi
- echo $ac_n "checking "for --enable-permissive"""... $ac_c" 1>&6
-echo "configure:2483: checking "for --enable-permissive"" >&5
+ echo $ac_n "checking for --enable-permissive""... $ac_c" 1>&6
+echo "configure:2733: checking for --enable-permissive" >&5
no_cache=0
# Check whether --enable-permissive or --disable-permissive was given.
if test "${enable_permissive+set}" = set; then
fi
- echo $ac_n "checking "for --enable-no_deps"""... $ac_c" 1>&6
-echo "configure:2522: checking "for --enable-no_deps"" >&5
+ echo $ac_n "checking for --enable-no_deps""... $ac_c" 1>&6
+echo "configure:2772: 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
+ echo $ac_n "checking for --enable-compat20""... $ac_c" 1>&6
+echo "configure:2812: 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:2851: 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 "$ac_t""no" 1>&6
+ fi
+
+
+
- echo $ac_n "checking "for --enable-intl"""... $ac_c" 1>&6
-echo "configure:2563: checking "for --enable-intl"" >&5
+ echo $ac_n "checking for --enable-intl""... $ac_c" 1>&6
+echo "configure:2892: checking for --enable-intl" >&5
no_cache=0
# Check whether --enable-intl or --disable-intl was given.
if test "${enable_intl+set}" = set; then
fi
- echo $ac_n "checking "for --enable-config"""... $ac_c" 1>&6
-echo "configure:2602: checking "for --enable-config"" >&5
+ echo $ac_n "checking for --enable-config""... $ac_c" 1>&6
+echo "configure:2931: checking for --enable-config" >&5
no_cache=0
# Check whether --enable-config or --disable-config was given.
if test "${enable_config+set}" = set; then
- echo $ac_n "checking "for --enable-sockets"""... $ac_c" 1>&6
-echo "configure:2642: checking "for --enable-sockets"" >&5
+ echo $ac_n "checking for --enable-sockets""... $ac_c" 1>&6
+echo "configure:2971: checking for --enable-sockets" >&5
no_cache=0
# Check whether --enable-sockets or --disable-sockets was given.
if test "${enable_sockets+set}" = set; then
- echo $ac_n "checking "for --enable-ipc"""... $ac_c" 1>&6
-echo "configure:2682: checking "for --enable-ipc"" >&5
+ echo $ac_n "checking for --enable-ipc""... $ac_c" 1>&6
+echo "configure:3011: checking for --enable-ipc" >&5
no_cache=0
# Check whether --enable-ipc or --disable-ipc was given.
if test "${enable_ipc+set}" = set; then
- echo $ac_n "checking "for --enable-dialupman"""... $ac_c" 1>&6
-echo "configure:2722: checking "for --enable-dialupman"" >&5
+ echo $ac_n "checking for --enable-cmdline""... $ac_c" 1>&6
+echo "configure:3051: checking for --enable-cmdline" >&5
no_cache=0
- # Check whether --enable-dialupman or --disable-dialupman was given.
-if test "${enable_dialupman+set}" = set; then
- enableval="$enable_dialupman"
+ # 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
- 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
+ if test "$wxUSE_CMDLINE_PARSER" = 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:2761: checking "for --enable-apple_ieee"" >&5
+ echo $ac_n "checking for --enable-datetime""... $ac_c" 1>&6
+echo "configure:3090: 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
- 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
+ if test "$wxUSE_DATETIME" = yes; then
echo "$ac_t""yes" 1>&6
else
echo "$ac_t""no" 1>&6
fi
- echo $ac_n "checking "for --enable-timedate"""... $ac_c" 1>&6
-echo "configure:2800: checking "for --enable-timedate"" >&5
+ echo $ac_n "checking for --enable-timedate""... $ac_c" 1>&6
+echo "configure:3129: checking for --enable-timedate" >&5
no_cache=0
# Check whether --enable-timedate or --disable-timedate was given.
if test "${enable_timedate+set}" = set; then
fi
- echo $ac_n "checking "for --enable-wave"""... $ac_c" 1>&6
-echo "configure:2839: checking "for --enable-wave"" >&5
+ echo $ac_n "checking for --enable-stopwatch""... $ac_c" 1>&6
+echo "configure:3168: 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_WAVE" ${wx_arg_cache_file}`
+ 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_wave='wxUSE_WAVE='$DEFAULT_wxUSE_WAVE
+ ac_cv_use_stopwatch='wxUSE_STOPWATCH='$DEFAULT_wxUSE_STOPWATCH
fi
- eval "$ac_cv_use_wave"
+ eval "$ac_cv_use_stopwatch"
if test "$no_cache" != 1; then
- echo $ac_cv_use_wave >> ${wx_arg_cache_file}.tmp
+ echo $ac_cv_use_stopwatch >> ${wx_arg_cache_file}.tmp
fi
- if test "$wxUSE_WAVE" = yes; then
+ 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-fraction"""... $ac_c" 1>&6
-echo "configure:2878: checking "for --enable-fraction"" >&5
+ echo $ac_n "checking for --enable-dialupman""... $ac_c" 1>&6
+echo "configure:3207: checking for --enable-dialupman" >&5
no_cache=0
- # Check whether --enable-fraction or --disable-fraction was given.
-if test "${enable_fraction+set}" = set; then
- enableval="$enable_fraction"
+ # 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_fraction='wxUSE_FRACTION=yes'
+ ac_cv_use_dialupman='wxUSE_DIALUP_MANAGER=yes'
else
- ac_cv_use_fraction='wxUSE_FRACTION=no'
+ ac_cv_use_dialupman='wxUSE_DIALUP_MANAGER=no'
fi
else
- LINE=`grep "wxUSE_FRACTION" ${wx_arg_cache_file}`
+ 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_fraction='wxUSE_FRACTION='$DEFAULT_wxUSE_FRACTION
+ ac_cv_use_dialupman='wxUSE_DIALUP_MANAGER='$DEFAULT_wxUSE_DIALUP_MANAGER
fi
- eval "$ac_cv_use_fraction"
+ eval "$ac_cv_use_dialupman"
if test "$no_cache" != 1; then
- echo $ac_cv_use_fraction >> ${wx_arg_cache_file}.tmp
+ echo $ac_cv_use_dialupman >> ${wx_arg_cache_file}.tmp
fi
- if test "$wxUSE_FRACTION" = yes; then
+ 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-dynlib"""... $ac_c" 1>&6
-echo "configure:2917: checking "for --enable-dynlib"" >&5
+ echo $ac_n "checking for --enable-apple_ieee""... $ac_c" 1>&6
+echo "configure:3246: 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:3285: 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:3324: 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"
+ else
+ no_cache=1
+ fi
+
+ ac_cv_use_wave='wxUSE_WAVE='$DEFAULT_wxUSE_WAVE
+
+fi
+
+
+ eval "$ac_cv_use_wave"
+ if test "$no_cache" != 1; then
+ echo $ac_cv_use_wave >> ${wx_arg_cache_file}.tmp
+ fi
+
+ if test "$wxUSE_WAVE" = yes; then
+ echo "$ac_t""yes" 1>&6
+ else
+ echo "$ac_t""no" 1>&6
+ fi
+
+
+ echo $ac_n "checking for --enable-fraction""... $ac_c" 1>&6
+echo "configure:3363: 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"
+ else
+ no_cache=1
+ fi
+
+ ac_cv_use_fraction='wxUSE_FRACTION='$DEFAULT_wxUSE_FRACTION
+
+fi
+
+
+ eval "$ac_cv_use_fraction"
+ if test "$no_cache" != 1; then
+ echo $ac_cv_use_fraction >> ${wx_arg_cache_file}.tmp
+ fi
+
+ if test "$wxUSE_FRACTION" = yes; then
+ echo "$ac_t""yes" 1>&6
+ else
+ echo "$ac_t""no" 1>&6
+ fi
+
+
+ echo $ac_n "checking for --enable-dynlib""... $ac_c" 1>&6
+echo "configure:3402: checking for --enable-dynlib" >&5
no_cache=0
# Check whether --enable-dynlib or --disable-dynlib was given.
if test "${enable_dynlib+set}" = set; then
fi
- echo $ac_n "checking "for --enable-longlong"""... $ac_c" 1>&6
-echo "configure:2956: checking "for --enable-longlong"" >&5
+ echo $ac_n "checking for --enable-longlong""... $ac_c" 1>&6
+echo "configure:3441: checking for --enable-longlong" >&5
no_cache=0
# Check whether --enable-longlong or --disable-longlong was given.
if test "${enable_longlong+set}" = set; then
fi
- echo $ac_n "checking "for --enable-geometry"""... $ac_c" 1>&6
-echo "configure:2995: checking "for --enable-geometry"" >&5
+ echo $ac_n "checking for --enable-geometry""... $ac_c" 1>&6
+echo "configure:3480: checking for --enable-geometry" >&5
no_cache=0
# Check whether --enable-geometry or --disable-geometry was given.
if test "${enable_geometry+set}" = set; then
fi
- echo $ac_n "checking "for --enable-log"""... $ac_c" 1>&6
-echo "configure:3034: checking "for --enable-log"" >&5
+ echo $ac_n "checking for --enable-log""... $ac_c" 1>&6
+echo "configure:3519: checking for --enable-log" >&5
no_cache=0
# Check whether --enable-log or --disable-log was given.
if test "${enable_log+set}" = set; then
fi
- echo $ac_n "checking "for --enable-streams"""... $ac_c" 1>&6
-echo "configure:3073: checking "for --enable-streams"" >&5
+ echo $ac_n "checking for --enable-streams""... $ac_c" 1>&6
+echo "configure:3558: checking for --enable-streams" >&5
no_cache=0
# Check whether --enable-streams or --disable-streams was given.
if test "${enable_streams+set}" = set; then
fi
- echo $ac_n "checking "for --enable-file"""... $ac_c" 1>&6
-echo "configure:3112: checking "for --enable-file"" >&5
+ echo $ac_n "checking for --enable-file""... $ac_c" 1>&6
+echo "configure:3597: checking for --enable-file" >&5
no_cache=0
# Check whether --enable-file or --disable-file was given.
if test "${enable_file+set}" = set; then
fi
- echo $ac_n "checking "for --enable-textfile"""... $ac_c" 1>&6
-echo "configure:3151: checking "for --enable-textfile"" >&5
+ echo $ac_n "checking for --enable-ffile""... $ac_c" 1>&6
+echo "configure:3636: 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 "$ac_t""no" 1>&6
+ fi
+
+
+ echo $ac_n "checking for --enable-textfile""... $ac_c" 1>&6
+echo "configure:3675: checking for --enable-textfile" >&5
no_cache=0
# Check whether --enable-textfile or --disable-textfile was given.
if test "${enable_textfile+set}" = set; then
fi
- echo $ac_n "checking "for --enable-unicode"""... $ac_c" 1>&6
-echo "configure:3190: checking "for --enable-unicode"" >&5
+ echo $ac_n "checking for --enable-fontmap""... $ac_c" 1>&6
+echo "configure:3714: checking for --enable-fontmap" >&5
+ no_cache=0
+ # 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_fontmap='wxUSE_FONTMAP=yes'
+ else
+ ac_cv_use_fontmap='wxUSE_FONTMAP=no'
+ fi
+
+else
+
+ 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_fontmap='wxUSE_FONTMAP='$DEFAULT_wxUSE_FONTMAP
+
+fi
+
+
+ eval "$ac_cv_use_fontmap"
+ if test "$no_cache" != 1; then
+ echo $ac_cv_use_fontmap >> ${wx_arg_cache_file}.tmp
+ fi
+
+ if test "$wxUSE_FONTMAP" = yes; then
+ echo "$ac_t""yes" 1>&6
+ else
+ echo "$ac_t""no" 1>&6
+ fi
+
+
+ echo $ac_n "checking for --enable-unicode""... $ac_c" 1>&6
+echo "configure:3753: checking for --enable-unicode" >&5
no_cache=0
# Check whether --enable-unicode or --disable-unicode was given.
if test "${enable_unicode+set}" = set; then
fi
- echo $ac_n "checking "for --enable-wcsrtombs"""... $ac_c" 1>&6
-echo "configure:3229: checking "for --enable-wcsrtombs"" >&5
+ echo $ac_n "checking for --enable-wcsrtombs""... $ac_c" 1>&6
+echo "configure:3792: checking for --enable-wcsrtombs" >&5
no_cache=0
# Check whether --enable-wcsrtombs or --disable-wcsrtombs was given.
if test "${enable_wcsrtombs+set}" = set; then
fi
- echo $ac_n "checking "for --enable-wxprintfv"""... $ac_c" 1>&6
-echo "configure:3268: checking "for --enable-wxprintfv"" >&5
+ echo $ac_n "checking for --enable-wxprintfv""... $ac_c" 1>&6
+echo "configure:3831: checking for --enable-wxprintfv" >&5
no_cache=0
# Check whether --enable-wxprintfv or --disable-wxprintfv was given.
if test "${enable_wxprintfv+set}" = set; then
fi
- echo $ac_n "checking "for --enable-std_iostreams"""... $ac_c" 1>&6
-echo "configure:3307: checking "for --enable-std_iostreams"" >&5
+ echo $ac_n "checking for --enable-std_iostreams""... $ac_c" 1>&6
+echo "configure:3870: 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
fi
- echo $ac_n "checking "for --enable-filesystem"""... $ac_c" 1>&6
-echo "configure:3346: checking "for --enable-filesystem"" >&5
+ echo $ac_n "checking for --enable-filesystem""... $ac_c" 1>&6
+echo "configure:3909: checking for --enable-filesystem" >&5
no_cache=0
# Check whether --enable-filesystem or --disable-filesystem was given.
if test "${enable_filesystem+set}" = set; then
fi
- echo $ac_n "checking "for --enable-fs_inet"""... $ac_c" 1>&6
-echo "configure:3385: checking "for --enable-fs_inet"" >&5
+ echo $ac_n "checking for --enable-fs_inet""... $ac_c" 1>&6
+echo "configure:3948: 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
fi
- echo $ac_n "checking "for --enable-fs_zip"""... $ac_c" 1>&6
-echo "configure:3424: checking "for --enable-fs_zip"" >&5
+ echo $ac_n "checking for --enable-fs_zip""... $ac_c" 1>&6
+echo "configure:3987: 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
fi
- echo $ac_n "checking "for --enable-zipstream"""... $ac_c" 1>&6
-echo "configure:3463: checking "for --enable-zipstream"" >&5
+ echo $ac_n "checking for --enable-zipstream""... $ac_c" 1>&6
+echo "configure:4026: checking for --enable-zipstream" >&5
no_cache=0
# Check whether --enable-zipstream or --disable-zipstream was given.
if test "${enable_zipstream+set}" = set; then
- echo $ac_n "checking "for --enable-catch_segvs"""... $ac_c" 1>&6
-echo "configure:3503: checking "for --enable-catch_segvs"" >&5
+ echo $ac_n "checking for --enable-catch_segvs""... $ac_c" 1>&6
+echo "configure:4066: 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
fi
-
-
- echo $ac_n "checking "for --enable-threads"""... $ac_c" 1>&6
-echo "configure:3544: checking "for --enable-threads"" >&5
+ echo $ac_n "checking for --enable-snglinst""... $ac_c" 1>&6
+echo "configure:4105: checking for --enable-snglinst" >&5
no_cache=0
- # Check whether --enable-threads or --disable-threads was given.
-if test "${enable_threads+set}" = set; then
- enableval="$enable_threads"
+ # 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_threads='wxUSE_THREADS=yes'
+ ac_cv_use_snglinst='wxUSE_SNGLINST_CHECKER=yes'
else
- ac_cv_use_threads='wxUSE_THREADS=no'
+ ac_cv_use_snglinst='wxUSE_SNGLINST_CHECKER=no'
fi
else
- LINE=`grep "wxUSE_THREADS" ${wx_arg_cache_file}`
+ LINE=`grep "wxUSE_SNGLINST_CHECKER" ${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_snglinst='wxUSE_SNGLINST_CHECKER='$DEFAULT_wxUSE_SNGLINST_CHECKER
fi
- eval "$ac_cv_use_threads"
+ eval "$ac_cv_use_snglinst"
if test "$no_cache" != 1; then
- echo $ac_cv_use_threads >> ${wx_arg_cache_file}.tmp
+ echo $ac_cv_use_snglinst >> ${wx_arg_cache_file}.tmp
fi
- if test "$wxUSE_THREADS" = yes; then
+ if test "$wxUSE_SNGLINST_CHECKER" = 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:3583: checking "for --enable-serial"" >&5
+
+ echo $ac_n "checking for --enable-mimetype""... $ac_c" 1>&6
+echo "configure:4145: checking for --enable-mimetype" >&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-mimetype or --disable-mimetype was given.
+if test "${enable_mimetype+set}" = set; then
+ enableval="$enable_mimetype"
if test "$enableval" = yes; then
- ac_cv_use_serial='wxUSE_SERIAL=yes'
+ ac_cv_use_mimetype='wxUSE_MIMETYPE=yes'
else
- ac_cv_use_serial='wxUSE_SERIAL=no'
+ ac_cv_use_mimetype='wxUSE_MIMETYPE=no'
fi
else
- LINE=`grep "wxUSE_SERIAL" ${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_serial='wxUSE_SERIAL='$DEFAULT_wxUSE_SERIAL
+ ac_cv_use_mimetype='wxUSE_MIMETYPE='$DEFAULT_wxUSE_MIMETYPE
fi
- eval "$ac_cv_use_serial"
+ eval "$ac_cv_use_mimetype"
if test "$no_cache" != 1; then
- echo $ac_cv_use_serial >> ${wx_arg_cache_file}.tmp
+ echo $ac_cv_use_mimetype >> ${wx_arg_cache_file}.tmp
fi
- if test "$wxUSE_SERIAL" = yes; then
+ if test "$wxUSE_MIMETYPE" = 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:3626: checking "for --enable-docview"" >&5
+ echo $ac_n "checking for --enable-system_options""... $ac_c" 1>&6
+echo "configure:4184: checking for --enable-system_options" >&5
no_cache=0
- # Check whether --enable-docview or --disable-docview was given.
-if test "${enable_docview+set}" = set; then
- enableval="$enable_docview"
+ # 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_docview='wxUSE_DOC_VIEW_ARCHITECTURE=yes'
+ ac_cv_use_system_options='wxUSE_SYSTEM_OPTIONS=yes'
else
- ac_cv_use_docview='wxUSE_DOC_VIEW_ARCHITECTURE=no'
+ ac_cv_use_system_options='wxUSE_SYSTEM_OPTIONS=no'
fi
else
- LINE=`grep "wxUSE_DOC_VIEW_ARCHITECTURE" ${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_docview='wxUSE_DOC_VIEW_ARCHITECTURE='$DEFAULT_wxUSE_DOC_VIEW_ARCHITECTURE
+ ac_cv_use_system_options='wxUSE_SYSTEM_OPTIONS='$DEFAULT_wxUSE_SYSTEM_OPTIONS
fi
- eval "$ac_cv_use_docview"
+ eval "$ac_cv_use_system_options"
if test "$no_cache" != 1; then
- echo $ac_cv_use_docview >> ${wx_arg_cache_file}.tmp
+ echo $ac_cv_use_system_options >> ${wx_arg_cache_file}.tmp
fi
- if test "$wxUSE_DOC_VIEW_ARCHITECTURE" = yes; then
+ if test "$wxUSE_SYSTEM_OPTIONS" = yes; then
echo "$ac_t""yes" 1>&6
else
echo "$ac_t""no" 1>&6
fi
- echo $ac_n "checking "for --enable-help"""... $ac_c" 1>&6
-echo "configure:3665: checking "for --enable-help"" >&5
+
+
+ echo $ac_n "checking for --enable-threads""... $ac_c" 1>&6
+echo "configure:4225: checking for --enable-threads" >&5
no_cache=0
- # Check whether --enable-help or --disable-help was given.
-if test "${enable_help+set}" = set; then
- enableval="$enable_help"
+ # 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_help='wxUSE_HELP=yes'
+ ac_cv_use_threads='wxUSE_THREADS=yes'
else
- ac_cv_use_help='wxUSE_HELP=no'
+ ac_cv_use_threads='wxUSE_THREADS=no'
fi
else
- LINE=`grep "wxUSE_HELP" ${wx_arg_cache_file}`
+ 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_help='wxUSE_HELP='$DEFAULT_wxUSE_HELP
+ ac_cv_use_threads='wxUSE_THREADS='$DEFAULT_wxUSE_THREADS
fi
- eval "$ac_cv_use_help"
+ eval "$ac_cv_use_threads"
if test "$no_cache" != 1; then
- echo $ac_cv_use_help >> ${wx_arg_cache_file}.tmp
+ echo $ac_cv_use_threads >> ${wx_arg_cache_file}.tmp
fi
- if test "$wxUSE_HELP" = yes; then
+ 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-constraints"""... $ac_c" 1>&6
-echo "configure:3704: checking "for --enable-constraints"" >&5
+ echo $ac_n "checking for --enable-serial""... $ac_c" 1>&6
+echo "configure:4264: checking for --enable-serial" >&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'
+ # 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_constraints='wxUSE_CONSTRAINTS=no'
+ ac_cv_use_serial='wxUSE_SERIAL=no'
fi
else
- LINE=`grep "wxUSE_CONSTRAINTS" ${wx_arg_cache_file}`
+ 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_constraints='wxUSE_CONSTRAINTS='$DEFAULT_wxUSE_CONSTRAINTS
+ ac_cv_use_serial='wxUSE_SERIAL='$DEFAULT_wxUSE_SERIAL
fi
- eval "$ac_cv_use_constraints"
+ eval "$ac_cv_use_serial"
if test "$no_cache" != 1; then
- echo $ac_cv_use_constraints >> ${wx_arg_cache_file}.tmp
+ echo $ac_cv_use_serial >> ${wx_arg_cache_file}.tmp
fi
- if test "$wxUSE_CONSTRAINTS" = yes; then
+ if test "$wxUSE_SERIAL" = yes; then
echo "$ac_t""yes" 1>&6
else
echo "$ac_t""no" 1>&6
fi
- echo $ac_n "checking "for --enable-printarch"""... $ac_c" 1>&6
-echo "configure:3743: checking "for --enable-printarch"" >&5
+if test "$wxUSE_GUI" = "yes"; then
+
+
+
+ echo $ac_n "checking for --enable-docview""... $ac_c" 1>&6
+echo "configure:4307: checking for --enable-docview" >&5
no_cache=0
- # Check whether --enable-printarch or --disable-printarch was given.
-if test "${enable_printarch+set}" = set; then
- enableval="$enable_printarch"
+ # 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_printarch='wxUSE_PRINTING_ARCHITECTURE=yes'
+ ac_cv_use_docview='wxUSE_DOC_VIEW_ARCHITECTURE=yes'
else
- ac_cv_use_printarch='wxUSE_PRINTING_ARCHITECTURE=no'
+ ac_cv_use_docview='wxUSE_DOC_VIEW_ARCHITECTURE=no'
fi
else
- LINE=`grep "wxUSE_PRINTING_ARCHITECTURE" ${wx_arg_cache_file}`
+ LINE=`grep "wxUSE_DOC_VIEW_ARCHITECTURE" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
eval "DEFAULT_$LINE"
else
no_cache=1
fi
- ac_cv_use_printarch='wxUSE_PRINTING_ARCHITECTURE='$DEFAULT_wxUSE_PRINTING_ARCHITECTURE
+ ac_cv_use_docview='wxUSE_DOC_VIEW_ARCHITECTURE='$DEFAULT_wxUSE_DOC_VIEW_ARCHITECTURE
fi
- eval "$ac_cv_use_printarch"
+ eval "$ac_cv_use_docview"
if test "$no_cache" != 1; then
- echo $ac_cv_use_printarch >> ${wx_arg_cache_file}.tmp
+ echo $ac_cv_use_docview >> ${wx_arg_cache_file}.tmp
fi
- if test "$wxUSE_PRINTING_ARCHITECTURE" = yes; then
+ if test "$wxUSE_DOC_VIEW_ARCHITECTURE" = yes; then
echo "$ac_t""yes" 1>&6
else
echo "$ac_t""no" 1>&6
fi
- echo $ac_n "checking "for --enable-mdi"""... $ac_c" 1>&6
-echo "configure:3782: checking "for --enable-mdi"" >&5
+ echo $ac_n "checking for --enable-help""... $ac_c" 1>&6
+echo "configure:4346: checking for --enable-help" >&5
no_cache=0
- # Check whether --enable-mdi or --disable-mdi was given.
-if test "${enable_mdi+set}" = set; then
- enableval="$enable_mdi"
+ # 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_mdi='wxUSE_MDI_ARCHITECTURE=yes'
+ ac_cv_use_help='wxUSE_HELP=yes'
else
- ac_cv_use_mdi='wxUSE_MDI_ARCHITECTURE=no'
+ ac_cv_use_help='wxUSE_HELP=no'
fi
else
- LINE=`grep "wxUSE_MDI_ARCHITECTURE" ${wx_arg_cache_file}`
+ LINE=`grep "wxUSE_HELP" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
eval "DEFAULT_$LINE"
else
no_cache=1
fi
- ac_cv_use_mdi='wxUSE_MDI_ARCHITECTURE='$DEFAULT_wxUSE_MDI_ARCHITECTURE
+ ac_cv_use_help='wxUSE_HELP='$DEFAULT_wxUSE_HELP
fi
- eval "$ac_cv_use_mdi"
+ eval "$ac_cv_use_help"
if test "$no_cache" != 1; then
- echo $ac_cv_use_mdi >> ${wx_arg_cache_file}.tmp
+ echo $ac_cv_use_help >> ${wx_arg_cache_file}.tmp
fi
- if test "$wxUSE_MDI_ARCHITECTURE" = yes; then
+ if test "$wxUSE_HELP" = yes; then
echo "$ac_t""yes" 1>&6
else
echo "$ac_t""no" 1>&6
fi
-
- echo $ac_n "checking "for --enable-postscript"""... $ac_c" 1>&6
-echo "configure:3822: checking "for --enable-postscript"" >&5
+ echo $ac_n "checking for --enable-mshtmlhelp""... $ac_c" 1>&6
+echo "configure:4385: checking for --enable-mshtmlhelp" >&5
no_cache=0
- # Check whether --enable-postscript or --disable-postscript was given.
-if test "${enable_postscript+set}" = set; then
- enableval="$enable_postscript"
+ # 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_postscript='wxUSE_POSTSCRIPT=yes'
+ ac_cv_use_mshtmlhelp='wxUSE_MS_HTML_HELP=yes'
else
- ac_cv_use_postscript='wxUSE_POSTSCRIPT=no'
+ ac_cv_use_mshtmlhelp='wxUSE_MS_HTML_HELP=no'
fi
else
- LINE=`grep "wxUSE_POSTSCRIPT" ${wx_arg_cache_file}`
+ 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_postscript='wxUSE_POSTSCRIPT='$DEFAULT_wxUSE_POSTSCRIPT
+ ac_cv_use_mshtmlhelp='wxUSE_MS_HTML_HELP='$DEFAULT_wxUSE_MS_HTML_HELP
fi
- eval "$ac_cv_use_postscript"
+ eval "$ac_cv_use_mshtmlhelp"
if test "$no_cache" != 1; then
- echo $ac_cv_use_postscript >> ${wx_arg_cache_file}.tmp
+ echo $ac_cv_use_mshtmlhelp >> ${wx_arg_cache_file}.tmp
fi
- if test "$wxUSE_POSTSCRIPT" = yes; then
+ 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:4424: 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-prologio"""... $ac_c" 1>&6
-echo "configure:3863: checking "for --enable-prologio"" >&5
+ echo $ac_n "checking for --enable-htmlhelp""... $ac_c" 1>&6
+echo "configure:4463: checking for --enable-htmlhelp" >&5
no_cache=0
- # Check whether --enable-prologio or --disable-prologio was given.
-if test "${enable_prologio+set}" = set; then
- enableval="$enable_prologio"
+ # 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_prologio='wxUSE_PROLOGIO=yes'
+ ac_cv_use_htmlhelp='wxUSE_WXHTML_HELP=yes'
else
- ac_cv_use_prologio='wxUSE_PROLOGIO=no'
+ ac_cv_use_htmlhelp='wxUSE_WXHTML_HELP=no'
fi
else
- LINE=`grep "wxUSE_PROLOGIO" ${wx_arg_cache_file}`
+ 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_prologio='wxUSE_PROLOGIO='$DEFAULT_wxUSE_PROLOGIO
+ ac_cv_use_htmlhelp='wxUSE_WXHTML_HELP='$DEFAULT_wxUSE_WXHTML_HELP
fi
- eval "$ac_cv_use_prologio"
+ eval "$ac_cv_use_htmlhelp"
if test "$no_cache" != 1; then
- echo $ac_cv_use_prologio >> ${wx_arg_cache_file}.tmp
+ echo $ac_cv_use_htmlhelp >> ${wx_arg_cache_file}.tmp
fi
- if test "$wxUSE_PROLOGIO" = yes; then
+ if test "$wxUSE_WXHTML_HELP" = yes; then
echo "$ac_t""yes" 1>&6
else
echo "$ac_t""no" 1>&6
fi
- echo $ac_n "checking "for --enable-resources"""... $ac_c" 1>&6
-echo "configure:3902: checking "for --enable-resources"" >&5
+ echo $ac_n "checking for --enable-constraints""... $ac_c" 1>&6
+echo "configure:4502: checking for --enable-constraints" >&5
no_cache=0
- # Check whether --enable-resources or --disable-resources was given.
-if test "${enable_resources+set}" = set; then
- enableval="$enable_resources"
+ # 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_resources='wxUSE_RESOURCES=yes'
+ ac_cv_use_constraints='wxUSE_CONSTRAINTS=yes'
else
- ac_cv_use_resources='wxUSE_RESOURCES=no'
+ ac_cv_use_constraints='wxUSE_CONSTRAINTS=no'
fi
else
- LINE=`grep "wxUSE_RESOURCES" ${wx_arg_cache_file}`
+ LINE=`grep "wxUSE_CONSTRAINTS" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
eval "DEFAULT_$LINE"
else
no_cache=1
fi
- ac_cv_use_resources='wxUSE_RESOURCES='$DEFAULT_wxUSE_RESOURCES
+ ac_cv_use_constraints='wxUSE_CONSTRAINTS='$DEFAULT_wxUSE_CONSTRAINTS
fi
- eval "$ac_cv_use_resources"
+ eval "$ac_cv_use_constraints"
if test "$no_cache" != 1; then
- echo $ac_cv_use_resources >> ${wx_arg_cache_file}.tmp
+ echo $ac_cv_use_constraints >> ${wx_arg_cache_file}.tmp
fi
- if test "$wxUSE_RESOURCES" = yes; then
+ if test "$wxUSE_CONSTRAINTS" = yes; then
echo "$ac_t""yes" 1>&6
else
echo "$ac_t""no" 1>&6
fi
-
- echo $ac_n "checking "for --enable-xresources"""... $ac_c" 1>&6
-echo "configure:3942: checking "for --enable-xresources"" >&5
+ echo $ac_n "checking for --enable-printarch""... $ac_c" 1>&6
+echo "configure:4541: checking for --enable-printarch" >&5
no_cache=0
- # Check whether --enable-xresources or --disable-xresources was given.
-if test "${enable_xresources+set}" = set; then
- enableval="$enable_xresources"
+ # 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_xresources='wxUSE_X_RESOURCES=yes'
+ ac_cv_use_printarch='wxUSE_PRINTING_ARCHITECTURE=yes'
else
- ac_cv_use_xresources='wxUSE_X_RESOURCES=no'
+ ac_cv_use_printarch='wxUSE_PRINTING_ARCHITECTURE=no'
fi
else
- LINE=`grep "wxUSE_X_RESOURCES" ${wx_arg_cache_file}`
+ LINE=`grep "wxUSE_PRINTING_ARCHITECTURE" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
eval "DEFAULT_$LINE"
else
no_cache=1
fi
- ac_cv_use_xresources='wxUSE_X_RESOURCES='$DEFAULT_wxUSE_X_RESOURCES
+ ac_cv_use_printarch='wxUSE_PRINTING_ARCHITECTURE='$DEFAULT_wxUSE_PRINTING_ARCHITECTURE
fi
- eval "$ac_cv_use_xresources"
+ eval "$ac_cv_use_printarch"
if test "$no_cache" != 1; then
- echo $ac_cv_use_xresources >> ${wx_arg_cache_file}.tmp
+ echo $ac_cv_use_printarch >> ${wx_arg_cache_file}.tmp
fi
- if test "$wxUSE_X_RESOURCES" = yes; then
+ if test "$wxUSE_PRINTING_ARCHITECTURE" = yes; then
echo "$ac_t""yes" 1>&6
else
echo "$ac_t""no" 1>&6
fi
+ echo $ac_n "checking for --enable-mdi""... $ac_c" 1>&6
+echo "configure:4580: 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"
+ else
+ no_cache=1
+ fi
+
+ ac_cv_use_mdi='wxUSE_MDI_ARCHITECTURE='$DEFAULT_wxUSE_MDI_ARCHITECTURE
+
+fi
+
+ eval "$ac_cv_use_mdi"
+ if test "$no_cache" != 1; then
+ echo $ac_cv_use_mdi >> ${wx_arg_cache_file}.tmp
+ fi
+
+ if test "$wxUSE_MDI_ARCHITECTURE" = yes; then
+ echo "$ac_t""yes" 1>&6
+ else
+ echo "$ac_t""no" 1>&6
+ fi
+
- echo $ac_n "checking "for --enable-clipboard"""... $ac_c" 1>&6
-echo "configure:3983: checking "for --enable-clipboard"" >&5
+ echo $ac_n "checking for --enable-loggui""... $ac_c" 1>&6
+echo "configure:4619: checking for --enable-loggui" >&5
no_cache=0
- # Check whether --enable-clipboard or --disable-clipboard was given.
-if test "${enable_clipboard+set}" = set; then
- enableval="$enable_clipboard"
+ # 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_clipboard='wxUSE_CLIPBOARD=yes'
+ ac_cv_use_loggui='wxUSE_LOGGUI=yes'
else
- ac_cv_use_clipboard='wxUSE_CLIPBOARD=no'
+ ac_cv_use_loggui='wxUSE_LOGGUI=no'
fi
else
- LINE=`grep "wxUSE_CLIPBOARD" ${wx_arg_cache_file}`
+ 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_clipboard='wxUSE_CLIPBOARD='$DEFAULT_wxUSE_CLIPBOARD
+ ac_cv_use_loggui='wxUSE_LOGGUI='$DEFAULT_wxUSE_LOGGUI
fi
- eval "$ac_cv_use_clipboard"
+ eval "$ac_cv_use_loggui"
if test "$no_cache" != 1; then
- echo $ac_cv_use_clipboard >> ${wx_arg_cache_file}.tmp
+ echo $ac_cv_use_loggui >> ${wx_arg_cache_file}.tmp
fi
- if test "$wxUSE_CLIPBOARD" = yes; then
+ 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-dnd"""... $ac_c" 1>&6
-echo "configure:4022: checking "for --enable-dnd"" >&5
+ echo $ac_n "checking for --enable-logwin""... $ac_c" 1>&6
+echo "configure:4658: checking for --enable-logwin" >&5
no_cache=0
- # Check whether --enable-dnd or --disable-dnd was given.
-if test "${enable_dnd+set}" = set; then
- enableval="$enable_dnd"
+ # 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_dnd='wxUSE_DRAG_AND_DROP=yes'
+ ac_cv_use_logwin='wxUSE_LOGWINDOW=yes'
else
- ac_cv_use_dnd='wxUSE_DRAG_AND_DROP=no'
+ ac_cv_use_logwin='wxUSE_LOGWINDOW=no'
fi
else
- LINE=`grep "wxUSE_DRAG_AND_DROP" ${wx_arg_cache_file}`
+ 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_dnd='wxUSE_DRAG_AND_DROP='$DEFAULT_wxUSE_DRAG_AND_DROP
+ ac_cv_use_logwin='wxUSE_LOGWINDOW='$DEFAULT_wxUSE_LOGWINDOW
fi
- eval "$ac_cv_use_dnd"
+ eval "$ac_cv_use_logwin"
if test "$no_cache" != 1; then
- echo $ac_cv_use_dnd >> ${wx_arg_cache_file}.tmp
+ echo $ac_cv_use_logwin >> ${wx_arg_cache_file}.tmp
fi
- if test "$wxUSE_DRAG_AND_DROP" = yes; then
+ if test "$wxUSE_LOGWINDOW" = yes; then
echo "$ac_t""yes" 1>&6
else
echo "$ac_t""no" 1>&6
- echo $ac_n "checking "for --enable-wxtree"""... $ac_c" 1>&6
-echo "configure:4062: checking "for --enable-wxtree"" >&5
+ echo $ac_n "checking for --enable-postscript""... $ac_c" 1>&6
+echo "configure:4698: checking for --enable-postscript" >&5
no_cache=0
- # Check whether --enable-wxtree or --disable-wxtree was given.
-if test "${enable_wxtree+set}" = set; then
- enableval="$enable_wxtree"
+ # 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_wxtree='wxUSE_WXTREE=yes'
+ ac_cv_use_postscript='wxUSE_POSTSCRIPT=yes'
else
- ac_cv_use_wxtree='wxUSE_WXTREE=no'
+ ac_cv_use_postscript='wxUSE_POSTSCRIPT=no'
fi
else
- LINE=`grep "wxUSE_WXTREE" ${wx_arg_cache_file}`
+ LINE=`grep "wxUSE_POSTSCRIPT" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
eval "DEFAULT_$LINE"
else
no_cache=1
fi
- ac_cv_use_wxtree='wxUSE_WXTREE='$DEFAULT_wxUSE_WXTREE
+ ac_cv_use_postscript='wxUSE_POSTSCRIPT='$DEFAULT_wxUSE_POSTSCRIPT
fi
- eval "$ac_cv_use_wxtree"
+ eval "$ac_cv_use_postscript"
if test "$no_cache" != 1; then
- echo $ac_cv_use_wxtree >> ${wx_arg_cache_file}.tmp
+ echo $ac_cv_use_postscript >> ${wx_arg_cache_file}.tmp
fi
- if test "$wxUSE_WXTREE" = yes; then
+ if test "$wxUSE_POSTSCRIPT" = yes; then
echo "$ac_t""yes" 1>&6
else
echo "$ac_t""no" 1>&6
- echo $ac_n "checking "for --enable-controls"""... $ac_c" 1>&6
-echo "configure:4103: checking "for --enable-controls"" >&5
+
+ echo $ac_n "checking for --enable-prologio""... $ac_c" 1>&6
+echo "configure:4740: checking for --enable-prologio" >&5
no_cache=0
- # Check whether --enable-controls or --disable-controls was given.
-if test "${enable_controls+set}" = set; then
- enableval="$enable_controls"
+ # 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_controls='wxUSE_CONTROLS=yes'
+ ac_cv_use_prologio='wxUSE_PROLOGIO=yes'
else
- ac_cv_use_controls='wxUSE_CONTROLS=no'
+ ac_cv_use_prologio='wxUSE_PROLOGIO=no'
fi
else
- LINE=`grep "wxUSE_CONTROLS" ${wx_arg_cache_file}`
+ LINE=`grep "wxUSE_PROLOGIO" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
eval "DEFAULT_$LINE"
else
no_cache=1
fi
- ac_cv_use_controls='wxUSE_CONTROLS='$DEFAULT_wxUSE_CONTROLS
+ ac_cv_use_prologio='wxUSE_PROLOGIO='$DEFAULT_wxUSE_PROLOGIO
fi
- eval "$ac_cv_use_controls"
+ eval "$ac_cv_use_prologio"
if test "$no_cache" != 1; then
- echo $ac_cv_use_controls >> ${wx_arg_cache_file}.tmp
+ echo $ac_cv_use_prologio >> ${wx_arg_cache_file}.tmp
fi
- if test "$wxUSE_CONTROLS" = yes; then
+ if test "$wxUSE_PROLOGIO" = yes; then
echo "$ac_t""yes" 1>&6
else
echo "$ac_t""no" 1>&6
fi
-if test "$wxUSE_CONTROLS" = "yes"; then
- DEFAULT_wxUSE_ACCEL=yes
- DEFAULT_wxUSE_CARET=yes
- DEFAULT_wxUSE_COMBOBOX=yes
- DEFAULT_wxUSE_BMPBUTTON=yes
- DEFAULT_wxUSE_CHECKBOX=yes
- DEFAULT_wxUSE_CHECKLISTBOX=yes
- DEFAULT_wxUSE_CHOICE=yes
- DEFAULT_wxUSE_GAUGE=yes
- DEFAULT_wxUSE_GRID=yes
+ echo $ac_n "checking for --enable-resources""... $ac_c" 1>&6
+echo "configure:4779: 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"
+ else
+ no_cache=1
+ fi
+
+ ac_cv_use_resources='wxUSE_RESOURCES='$DEFAULT_wxUSE_RESOURCES
+
+fi
+
+
+ eval "$ac_cv_use_resources"
+ if test "$no_cache" != 1; then
+ echo $ac_cv_use_resources >> ${wx_arg_cache_file}.tmp
+ fi
+
+ if test "$wxUSE_RESOURCES" = yes; then
+ echo "$ac_t""yes" 1>&6
+ else
+ echo "$ac_t""no" 1>&6
+ fi
+
+
+
+ echo $ac_n "checking for --enable-xresources""... $ac_c" 1>&6
+echo "configure:4819: 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"
+ else
+ no_cache=1
+ fi
+
+ ac_cv_use_xresources='wxUSE_X_RESOURCES='$DEFAULT_wxUSE_X_RESOURCES
+
+fi
+
+
+ eval "$ac_cv_use_xresources"
+ if test "$no_cache" != 1; then
+ echo $ac_cv_use_xresources >> ${wx_arg_cache_file}.tmp
+ fi
+
+ if test "$wxUSE_X_RESOURCES" = yes; then
+ echo "$ac_t""yes" 1>&6
+ else
+ echo "$ac_t""no" 1>&6
+ fi
+
+
+
+
+ echo $ac_n "checking for --enable-clipboard""... $ac_c" 1>&6
+echo "configure:4860: 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"
+ else
+ no_cache=1
+ fi
+
+ ac_cv_use_clipboard='wxUSE_CLIPBOARD='$DEFAULT_wxUSE_CLIPBOARD
+
+fi
+
+
+ eval "$ac_cv_use_clipboard"
+ if test "$no_cache" != 1; then
+ echo $ac_cv_use_clipboard >> ${wx_arg_cache_file}.tmp
+ fi
+
+ if test "$wxUSE_CLIPBOARD" = yes; then
+ echo "$ac_t""yes" 1>&6
+ else
+ echo "$ac_t""no" 1>&6
+ fi
+
+
+ echo $ac_n "checking for --enable-dnd""... $ac_c" 1>&6
+echo "configure:4899: 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"
+ else
+ no_cache=1
+ fi
+
+ ac_cv_use_dnd='wxUSE_DRAG_AND_DROP='$DEFAULT_wxUSE_DRAG_AND_DROP
+
+fi
+
+
+ eval "$ac_cv_use_dnd"
+ if test "$no_cache" != 1; then
+ echo $ac_cv_use_dnd >> ${wx_arg_cache_file}.tmp
+ fi
+
+ if test "$wxUSE_DRAG_AND_DROP" = yes; then
+ echo "$ac_t""yes" 1>&6
+ else
+ echo "$ac_t""no" 1>&6
+ fi
+
+
+ echo $ac_n "checking for --enable-metafile""... $ac_c" 1>&6
+echo "configure:4938: 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"
+ else
+ no_cache=1
+ fi
+
+ ac_cv_use_metafile='wxUSE_METAFILE='$DEFAULT_wxUSE_METAFILE
+
+fi
+
+
+ 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-treelayout""... $ac_c" 1>&6
+echo "configure:4978: 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_treelayout='wxUSE_TREELAYOUT=yes'
+ else
+ ac_cv_use_treelayout='wxUSE_TREELAYOUT=no'
+ fi
+
+else
+
+ 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_treelayout='wxUSE_TREELAYOUT='$DEFAULT_wxUSE_TREELAYOUT
+
+fi
+
+
+ eval "$ac_cv_use_treelayout"
+ if test "$no_cache" != 1; then
+ echo $ac_cv_use_treelayout >> ${wx_arg_cache_file}.tmp
+ fi
+
+ if test "$wxUSE_TREELAYOUT" = yes; then
+ echo "$ac_t""yes" 1>&6
+ else
+ echo "$ac_t""no" 1>&6
+ fi
+
+
+
+
+ echo $ac_n "checking for --enable-controls""... $ac_c" 1>&6
+echo "configure:5019: 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"
+ else
+ no_cache=1
+ fi
+
+ ac_cv_use_controls='wxUSE_CONTROLS='$DEFAULT_wxUSE_CONTROLS
+
+fi
+
+
+ eval "$ac_cv_use_controls"
+ if test "$no_cache" != 1; then
+ echo $ac_cv_use_controls >> ${wx_arg_cache_file}.tmp
+ fi
+
+ if test "$wxUSE_CONTROLS" = yes; then
+ echo "$ac_t""yes" 1>&6
+ else
+ echo "$ac_t""no" 1>&6
+ fi
+
+
+if test "$wxUSE_CONTROLS" = "yes"; then
+ DEFAULT_wxUSE_ACCEL=yes
+ DEFAULT_wxUSE_BMPBUTTON=yes
+ DEFAULT_wxUSE_BUTTON=yes
+ DEFAULT_wxUSE_CALCTRL=no
+ DEFAULT_wxUSE_CARET=yes
+ DEFAULT_wxUSE_COMBOBOX=yes
+ DEFAULT_wxUSE_CHECKBOX=yes
+ DEFAULT_wxUSE_CHECKLISTBOX=yes
+ DEFAULT_wxUSE_CHOICE=yes
+ DEFAULT_wxUSE_GAUGE=yes
+ DEFAULT_wxUSE_GRID=yes
DEFAULT_wxUSE_NEW_GRID=yes
DEFAULT_wxUSE_IMAGLIST=yes
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
DEFAULT_wxUSE_STATLINE=yes
DEFAULT_wxUSE_STATUSBAR=yes
DEFAULT_wxUSE_TAB_DIALOG=yes
+ DEFAULT_wxUSE_TOGGLEBTN=yes
DEFAULT_wxUSE_TOOLBAR=yes
DEFAULT_wxUSE_TOOLBAR_NATIVE=yes
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
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
DEFAULT_wxUSE_STATLINE=no
DEFAULT_wxUSE_STATUSBAR=no
DEFAULT_wxUSE_TAB_DIALOG=no
+ DEFAULT_wxUSE_TOGGLEBTN=no
DEFAULT_wxUSE_TOOLBAR=no
DEFAULT_wxUSE_TOOLBAR_NATIVE=no
DEFAULT_wxUSE_TOOLBAR_SIMPLE=no
DEFAULT_wxUSE_TOOLTIPS=no
DEFAULT_wxUSE_TREECTRL=no
+ DEFAULT_wxUSE_POPUPWIN=no
+fi
+
+
+ echo $ac_n "checking for --enable-accel""... $ac_c" 1>&6
+echo "configure:5137: 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"
+ else
+ no_cache=1
+ fi
+
+ ac_cv_use_accel='wxUSE_ACCEL='$DEFAULT_wxUSE_ACCEL
+
+fi
+
+
+ eval "$ac_cv_use_accel"
+ if test "$no_cache" != 1; then
+ echo $ac_cv_use_accel >> ${wx_arg_cache_file}.tmp
+ fi
+
+ if test "$wxUSE_ACCEL" = yes; then
+ echo "$ac_t""yes" 1>&6
+ else
+ echo "$ac_t""no" 1>&6
+ fi
+
+
+ echo $ac_n "checking for --enable-button""... $ac_c" 1>&6
+echo "configure:5176: checking for --enable-button" >&5
+ no_cache=0
+ # 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_button='wxUSE_BUTTON=yes'
+ else
+ ac_cv_use_button='wxUSE_BUTTON=no'
+ fi
+
+else
+
+ 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_button='wxUSE_BUTTON='$DEFAULT_wxUSE_BUTTON
+
+fi
+
+
+ eval "$ac_cv_use_button"
+ if test "$no_cache" != 1; then
+ echo $ac_cv_use_button >> ${wx_arg_cache_file}.tmp
+ fi
+
+ if test "$wxUSE_BUTTON" = yes; then
+ echo "$ac_t""yes" 1>&6
+ else
+ echo "$ac_t""no" 1>&6
+ fi
+
+
+ echo $ac_n "checking for --enable-bmpbutton""... $ac_c" 1>&6
+echo "configure:5215: 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"
+ else
+ no_cache=1
+ fi
+
+ ac_cv_use_bmpbutton='wxUSE_BMPBUTTON='$DEFAULT_wxUSE_BMPBUTTON
+
+fi
+
+
+ eval "$ac_cv_use_bmpbutton"
+ if test "$no_cache" != 1; then
+ echo $ac_cv_use_bmpbutton >> ${wx_arg_cache_file}.tmp
+ fi
+
+ if test "$wxUSE_BMPBUTTON" = yes; then
+ echo "$ac_t""yes" 1>&6
+ else
+ echo "$ac_t""no" 1>&6
+ fi
+
+
+ echo $ac_n "checking for --enable-calendar""... $ac_c" 1>&6
+echo "configure:5254: 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:5293: 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 "$ac_t""no" 1>&6
+ fi
+
+
+ echo $ac_n "checking for --enable-checkbox""... $ac_c" 1>&6
+echo "configure:5332: 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"
+ else
+ no_cache=1
+ fi
+
+ ac_cv_use_checkbox='wxUSE_CHECKBOX='$DEFAULT_wxUSE_CHECKBOX
+
+fi
+
+
+ eval "$ac_cv_use_checkbox"
+ if test "$no_cache" != 1; then
+ echo $ac_cv_use_checkbox >> ${wx_arg_cache_file}.tmp
+ fi
+
+ if test "$wxUSE_CHECKBOX" = yes; then
+ echo "$ac_t""yes" 1>&6
+ else
+ echo "$ac_t""no" 1>&6
+ fi
+
+
+ echo $ac_n "checking for --enable-checklst""... $ac_c" 1>&6
+echo "configure:5371: 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"
+ else
+ no_cache=1
+ fi
+
+ ac_cv_use_checklst='wxUSE_CHECKLST='$DEFAULT_wxUSE_CHECKLST
+
+fi
+
+
+ eval "$ac_cv_use_checklst"
+ if test "$no_cache" != 1; then
+ echo $ac_cv_use_checklst >> ${wx_arg_cache_file}.tmp
+ fi
+
+ if test "$wxUSE_CHECKLST" = yes; then
+ echo "$ac_t""yes" 1>&6
+ else
+ echo "$ac_t""no" 1>&6
+ fi
+
+
+ echo $ac_n "checking for --enable-choice""... $ac_c" 1>&6
+echo "configure:5410: 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"
+ else
+ no_cache=1
+ fi
+
+ ac_cv_use_choice='wxUSE_CHOICE='$DEFAULT_wxUSE_CHOICE
+
+fi
+
+
+ eval "$ac_cv_use_choice"
+ if test "$no_cache" != 1; then
+ echo $ac_cv_use_choice >> ${wx_arg_cache_file}.tmp
+ fi
+
+ if test "$wxUSE_CHOICE" = yes; then
+ echo "$ac_t""yes" 1>&6
+ else
+ echo "$ac_t""no" 1>&6
+ fi
+
+
+ echo $ac_n "checking for --enable-combobox""... $ac_c" 1>&6
+echo "configure:5449: 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"
+ else
+ no_cache=1
+ fi
+
+ ac_cv_use_combobox='wxUSE_COMBOBOX='$DEFAULT_wxUSE_COMBOBOX
+
+fi
+
+
+ eval "$ac_cv_use_combobox"
+ if test "$no_cache" != 1; then
+ echo $ac_cv_use_combobox >> ${wx_arg_cache_file}.tmp
+ fi
+
+ if test "$wxUSE_COMBOBOX" = yes; then
+ echo "$ac_t""yes" 1>&6
+ else
+ echo "$ac_t""no" 1>&6
+ fi
+
+
+ echo $ac_n "checking for --enable-gauge""... $ac_c" 1>&6
+echo "configure:5488: 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"
+ else
+ no_cache=1
+ fi
+
+ ac_cv_use_gauge='wxUSE_GAUGE='$DEFAULT_wxUSE_GAUGE
+
+fi
+
+
+ eval "$ac_cv_use_gauge"
+ if test "$no_cache" != 1; then
+ echo $ac_cv_use_gauge >> ${wx_arg_cache_file}.tmp
+ fi
+
+ if test "$wxUSE_GAUGE" = yes; then
+ echo "$ac_t""yes" 1>&6
+ else
+ echo "$ac_t""no" 1>&6
+ fi
+
+
+ echo $ac_n "checking for --enable-grid""... $ac_c" 1>&6
+echo "configure:5527: 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"
+ else
+ no_cache=1
+ fi
+
+ ac_cv_use_grid='wxUSE_GRID='$DEFAULT_wxUSE_GRID
+
+fi
+
+
+ eval "$ac_cv_use_grid"
+ if test "$no_cache" != 1; then
+ echo $ac_cv_use_grid >> ${wx_arg_cache_file}.tmp
+ fi
+
+ if test "$wxUSE_GRID" = yes; then
+ echo "$ac_t""yes" 1>&6
+ else
+ echo "$ac_t""no" 1>&6
+ fi
+
+
+ echo $ac_n "checking for --enable-newgrid""... $ac_c" 1>&6
+echo "configure:5566: 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"
+ else
+ no_cache=1
+ fi
+
+ ac_cv_use_newgrid='wxUSE_NEW_GRID='$DEFAULT_wxUSE_NEW_GRID
+
+fi
+
+
+ eval "$ac_cv_use_newgrid"
+ if test "$no_cache" != 1; then
+ echo $ac_cv_use_newgrid >> ${wx_arg_cache_file}.tmp
+ fi
+
+ if test "$wxUSE_NEW_GRID" = yes; then
+ echo "$ac_t""yes" 1>&6
+ else
+ echo "$ac_t""no" 1>&6
+ fi
+
+
+ echo $ac_n "checking for --enable-imaglist""... $ac_c" 1>&6
+echo "configure:5605: 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"
+ else
+ no_cache=1
+ fi
+
+ ac_cv_use_imaglist='wxUSE_IMAGLIST='$DEFAULT_wxUSE_IMAGLIST
+
+fi
+
+
+ eval "$ac_cv_use_imaglist"
+ if test "$no_cache" != 1; then
+ echo $ac_cv_use_imaglist >> ${wx_arg_cache_file}.tmp
+ fi
+
+ if test "$wxUSE_IMAGLIST" = yes; then
+ echo "$ac_t""yes" 1>&6
+ else
+ echo "$ac_t""no" 1>&6
+ fi
+
+
+ echo $ac_n "checking for --enable-listbox""... $ac_c" 1>&6
+echo "configure:5644: 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"
+ else
+ no_cache=1
+ fi
+
+ ac_cv_use_listbox='wxUSE_LISTBOX='$DEFAULT_wxUSE_LISTBOX
+
+fi
+
+
+ eval "$ac_cv_use_listbox"
+ if test "$no_cache" != 1; then
+ echo $ac_cv_use_listbox >> ${wx_arg_cache_file}.tmp
+ fi
+
+ if test "$wxUSE_LISTBOX" = yes; then
+ echo "$ac_t""yes" 1>&6
+ else
+ echo "$ac_t""no" 1>&6
+ fi
+
+
+ echo $ac_n "checking for --enable-listctrl""... $ac_c" 1>&6
+echo "configure:5683: 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"
+ else
+ no_cache=1
+ fi
+
+ ac_cv_use_listctrl='wxUSE_LISTCTRL='$DEFAULT_wxUSE_LISTCTRL
+
fi
- echo $ac_n "checking "for --enable-accel"""... $ac_c" 1>&6
-echo "configure:4211: checking "for --enable-accel"" >&5
+ eval "$ac_cv_use_listctrl"
+ if test "$no_cache" != 1; then
+ echo $ac_cv_use_listctrl >> ${wx_arg_cache_file}.tmp
+ fi
+
+ if test "$wxUSE_LISTCTRL" = yes; then
+ echo "$ac_t""yes" 1>&6
+ else
+ echo "$ac_t""no" 1>&6
+ fi
+
+
+ echo $ac_n "checking for --enable-notebook""... $ac_c" 1>&6
+echo "configure:5722: checking for --enable-notebook" >&5
no_cache=0
- # Check whether --enable-accel or --disable-accel was given.
-if test "${enable_accel+set}" = set; then
- enableval="$enable_accel"
+ # 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_accel='wxUSE_ACCEL=yes'
+ ac_cv_use_notebook='wxUSE_NOTEBOOK=yes'
else
- ac_cv_use_accel='wxUSE_ACCEL=no'
+ ac_cv_use_notebook='wxUSE_NOTEBOOK=no'
fi
else
- LINE=`grep "wxUSE_ACCEL" ${wx_arg_cache_file}`
+ LINE=`grep "wxUSE_NOTEBOOK" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
eval "DEFAULT_$LINE"
else
no_cache=1
fi
- ac_cv_use_accel='wxUSE_ACCEL='$DEFAULT_wxUSE_ACCEL
+ ac_cv_use_notebook='wxUSE_NOTEBOOK='$DEFAULT_wxUSE_NOTEBOOK
fi
- eval "$ac_cv_use_accel"
+ eval "$ac_cv_use_notebook"
if test "$no_cache" != 1; then
- echo $ac_cv_use_accel >> ${wx_arg_cache_file}.tmp
+ echo $ac_cv_use_notebook >> ${wx_arg_cache_file}.tmp
fi
- if test "$wxUSE_ACCEL" = yes; then
+ if test "$wxUSE_NOTEBOOK" = yes; then
echo "$ac_t""yes" 1>&6
else
echo "$ac_t""no" 1>&6
fi
- echo $ac_n "checking "for --enable-caret"""... $ac_c" 1>&6
-echo "configure:4250: checking "for --enable-caret"" >&5
+ echo $ac_n "checking for --enable-propsheet""... $ac_c" 1>&6
+echo "configure:5761: checking for --enable-propsheet" >&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-propsheet or --disable-propsheet was given.
+if test "${enable_propsheet+set}" = set; then
+ enableval="$enable_propsheet"
if test "$enableval" = yes; then
- ac_cv_use_caret='wxUSE_CARET=yes'
+ ac_cv_use_propsheet='wxUSE_PROPSHEET=yes'
else
- ac_cv_use_caret='wxUSE_CARET=no'
+ ac_cv_use_propsheet='wxUSE_PROPSHEET=no'
fi
else
- LINE=`grep "wxUSE_CARET" ${wx_arg_cache_file}`
+ 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_caret='wxUSE_CARET='$DEFAULT_wxUSE_CARET
+ ac_cv_use_propsheet='wxUSE_PROPSHEET='$DEFAULT_wxUSE_PROPSHEET
fi
- eval "$ac_cv_use_caret"
+ eval "$ac_cv_use_propsheet"
if test "$no_cache" != 1; then
- echo $ac_cv_use_caret >> ${wx_arg_cache_file}.tmp
+ echo $ac_cv_use_propsheet >> ${wx_arg_cache_file}.tmp
fi
- if test "$wxUSE_CARET" = yes; then
+ if test "$wxUSE_PROPSHEET" = yes; then
echo "$ac_t""yes" 1>&6
else
echo "$ac_t""no" 1>&6
fi
- echo $ac_n "checking "for --enable-bmpbutton"""... $ac_c" 1>&6
-echo "configure:4289: checking "for --enable-bmpbutton"" >&5
+ echo $ac_n "checking for --enable-radiobox""... $ac_c" 1>&6
+echo "configure:5800: checking for --enable-radiobox" >&5
no_cache=0
- # Check whether --enable-bmpbutton or --disable-bmpbutton was given.
-if test "${enable_bmpbutton+set}" = set; then
- enableval="$enable_bmpbutton"
+ # 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_bmpbutton='wxUSE_BMPBUTTON=yes'
+ ac_cv_use_radiobox='wxUSE_RADIOBOX=yes'
else
- ac_cv_use_bmpbutton='wxUSE_BMPBUTTON=no'
+ ac_cv_use_radiobox='wxUSE_RADIOBOX=no'
fi
else
- LINE=`grep "wxUSE_BMPBUTTON" ${wx_arg_cache_file}`
+ LINE=`grep "wxUSE_RADIOBOX" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
eval "DEFAULT_$LINE"
else
no_cache=1
fi
- ac_cv_use_bmpbutton='wxUSE_BMPBUTTON='$DEFAULT_wxUSE_BMPBUTTON
+ ac_cv_use_radiobox='wxUSE_RADIOBOX='$DEFAULT_wxUSE_RADIOBOX
fi
- eval "$ac_cv_use_bmpbutton"
+ eval "$ac_cv_use_radiobox"
if test "$no_cache" != 1; then
- echo $ac_cv_use_bmpbutton >> ${wx_arg_cache_file}.tmp
+ echo $ac_cv_use_radiobox >> ${wx_arg_cache_file}.tmp
fi
- if test "$wxUSE_BMPBUTTON" = yes; then
+ if test "$wxUSE_RADIOBOX" = yes; then
echo "$ac_t""yes" 1>&6
else
echo "$ac_t""no" 1>&6
fi
- echo $ac_n "checking "for --enable-checkbox"""... $ac_c" 1>&6
-echo "configure:4328: checking "for --enable-checkbox"" >&5
+ echo $ac_n "checking for --enable-radiobtn""... $ac_c" 1>&6
+echo "configure:5839: checking for --enable-radiobtn" >&5
no_cache=0
- # Check whether --enable-checkbox or --disable-checkbox was given.
-if test "${enable_checkbox+set}" = set; then
- enableval="$enable_checkbox"
+ # 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_checkbox='wxUSE_CHECKBOX=yes'
+ ac_cv_use_radiobtn='wxUSE_RADIOBTN=yes'
else
- ac_cv_use_checkbox='wxUSE_CHECKBOX=no'
+ ac_cv_use_radiobtn='wxUSE_RADIOBTN=no'
fi
else
- LINE=`grep "wxUSE_CHECKBOX" ${wx_arg_cache_file}`
+ LINE=`grep "wxUSE_RADIOBTN" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
eval "DEFAULT_$LINE"
else
no_cache=1
fi
- ac_cv_use_checkbox='wxUSE_CHECKBOX='$DEFAULT_wxUSE_CHECKBOX
+ ac_cv_use_radiobtn='wxUSE_RADIOBTN='$DEFAULT_wxUSE_RADIOBTN
fi
- eval "$ac_cv_use_checkbox"
+ eval "$ac_cv_use_radiobtn"
if test "$no_cache" != 1; then
- echo $ac_cv_use_checkbox >> ${wx_arg_cache_file}.tmp
+ echo $ac_cv_use_radiobtn >> ${wx_arg_cache_file}.tmp
fi
- if test "$wxUSE_CHECKBOX" = yes; then
+ if test "$wxUSE_RADIOBTN" = yes; then
echo "$ac_t""yes" 1>&6
else
echo "$ac_t""no" 1>&6
fi
- echo $ac_n "checking "for --enable-checklst"""... $ac_c" 1>&6
-echo "configure:4367: checking "for --enable-checklst"" >&5
+ echo $ac_n "checking for --enable-sash""... $ac_c" 1>&6
+echo "configure:5878: checking for --enable-sash" >&5
no_cache=0
- # Check whether --enable-checklst or --disable-checklst was given.
-if test "${enable_checklst+set}" = set; then
- enableval="$enable_checklst"
+ # 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_checklst='wxUSE_CHECKLST=yes'
+ ac_cv_use_sash='wxUSE_SASH=yes'
else
- ac_cv_use_checklst='wxUSE_CHECKLST=no'
+ ac_cv_use_sash='wxUSE_SASH=no'
fi
else
- LINE=`grep "wxUSE_CHECKLST" ${wx_arg_cache_file}`
+ LINE=`grep "wxUSE_SASH" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
eval "DEFAULT_$LINE"
else
no_cache=1
fi
- ac_cv_use_checklst='wxUSE_CHECKLST='$DEFAULT_wxUSE_CHECKLST
+ ac_cv_use_sash='wxUSE_SASH='$DEFAULT_wxUSE_SASH
fi
- eval "$ac_cv_use_checklst"
+ eval "$ac_cv_use_sash"
if test "$no_cache" != 1; then
- echo $ac_cv_use_checklst >> ${wx_arg_cache_file}.tmp
+ echo $ac_cv_use_sash >> ${wx_arg_cache_file}.tmp
fi
- if test "$wxUSE_CHECKLST" = yes; then
+ if test "$wxUSE_SASH" = yes; then
echo "$ac_t""yes" 1>&6
else
echo "$ac_t""no" 1>&6
fi
- echo $ac_n "checking "for --enable-choice"""... $ac_c" 1>&6
-echo "configure:4406: checking "for --enable-choice"" >&5
+ echo $ac_n "checking for --enable-scrollbar""... $ac_c" 1>&6
+echo "configure:5917: checking for --enable-scrollbar" >&5
no_cache=0
- # Check whether --enable-choice or --disable-choice was given.
-if test "${enable_choice+set}" = set; then
- enableval="$enable_choice"
+ # 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_choice='wxUSE_CHOICE=yes'
+ ac_cv_use_scrollbar='wxUSE_SCROLLBAR=yes'
else
- ac_cv_use_choice='wxUSE_CHOICE=no'
+ ac_cv_use_scrollbar='wxUSE_SCROLLBAR=no'
fi
else
- LINE=`grep "wxUSE_CHOICE" ${wx_arg_cache_file}`
+ LINE=`grep "wxUSE_SCROLLBAR" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
eval "DEFAULT_$LINE"
else
no_cache=1
fi
- ac_cv_use_choice='wxUSE_CHOICE='$DEFAULT_wxUSE_CHOICE
+ ac_cv_use_scrollbar='wxUSE_SCROLLBAR='$DEFAULT_wxUSE_SCROLLBAR
fi
- eval "$ac_cv_use_choice"
+ eval "$ac_cv_use_scrollbar"
if test "$no_cache" != 1; then
- echo $ac_cv_use_choice >> ${wx_arg_cache_file}.tmp
+ echo $ac_cv_use_scrollbar >> ${wx_arg_cache_file}.tmp
fi
- if test "$wxUSE_CHOICE" = yes; then
+ if test "$wxUSE_SCROLLBAR" = yes; then
echo "$ac_t""yes" 1>&6
else
echo "$ac_t""no" 1>&6
fi
- echo $ac_n "checking "for --enable-combobox"""... $ac_c" 1>&6
-echo "configure:4445: checking "for --enable-combobox"" >&5
+ echo $ac_n "checking for --enable-slider""... $ac_c" 1>&6
+echo "configure:5956: checking for --enable-slider" >&5
no_cache=0
- # Check whether --enable-combobox or --disable-combobox was given.
-if test "${enable_combobox+set}" = set; then
- enableval="$enable_combobox"
+ # 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_combobox='wxUSE_COMBOBOX=yes'
+ ac_cv_use_slider='wxUSE_SLIDER=yes'
else
- ac_cv_use_combobox='wxUSE_COMBOBOX=no'
+ 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"
+ else
+ no_cache=1
+ fi
+
+ ac_cv_use_slider='wxUSE_SLIDER='$DEFAULT_wxUSE_SLIDER
+
+fi
+
+
+ eval "$ac_cv_use_slider"
+ if test "$no_cache" != 1; then
+ echo $ac_cv_use_slider >> ${wx_arg_cache_file}.tmp
+ fi
+
+ if test "$wxUSE_SLIDER" = yes; then
+ echo "$ac_t""yes" 1>&6
+ else
+ echo "$ac_t""no" 1>&6
+ fi
+
+
+ echo $ac_n "checking for --enable-spinbtn""... $ac_c" 1>&6
+echo "configure:5995: 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"
+ else
+ no_cache=1
+ fi
+
+ ac_cv_use_spinbtn='wxUSE_SPINBTN='$DEFAULT_wxUSE_SPINBTN
+
+fi
+
+
+ eval "$ac_cv_use_spinbtn"
+ if test "$no_cache" != 1; then
+ echo $ac_cv_use_spinbtn >> ${wx_arg_cache_file}.tmp
+ fi
+
+ if test "$wxUSE_SPINBTN" = yes; then
+ echo "$ac_t""yes" 1>&6
+ else
+ echo "$ac_t""no" 1>&6
+ fi
+
+
+ echo $ac_n "checking for --enable-spinctrl""... $ac_c" 1>&6
+echo "configure:6034: 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"
+ else
+ no_cache=1
+ fi
+
+ ac_cv_use_spinctrl='wxUSE_SPINCTRL='$DEFAULT_wxUSE_SPINCTRL
+
+fi
+
+
+ eval "$ac_cv_use_spinctrl"
+ if test "$no_cache" != 1; then
+ echo $ac_cv_use_spinctrl >> ${wx_arg_cache_file}.tmp
+ fi
+
+ if test "$wxUSE_SPINCTRL" = yes; then
+ echo "$ac_t""yes" 1>&6
+ else
+ echo "$ac_t""no" 1>&6
+ fi
+
+
+ echo $ac_n "checking for --enable-splitter""... $ac_c" 1>&6
+echo "configure:6073: 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_COMBOBOX" ${wx_arg_cache_file}`
+ LINE=`grep "wxUSE_SPLITTER" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
eval "DEFAULT_$LINE"
else
no_cache=1
fi
- ac_cv_use_combobox='wxUSE_COMBOBOX='$DEFAULT_wxUSE_COMBOBOX
+ ac_cv_use_splitter='wxUSE_SPLITTER='$DEFAULT_wxUSE_SPLITTER
fi
- eval "$ac_cv_use_combobox"
+ eval "$ac_cv_use_splitter"
if test "$no_cache" != 1; then
- echo $ac_cv_use_combobox >> ${wx_arg_cache_file}.tmp
+ echo $ac_cv_use_splitter >> ${wx_arg_cache_file}.tmp
fi
- if test "$wxUSE_COMBOBOX" = yes; then
+ if test "$wxUSE_SPLITTER" = yes; then
echo "$ac_t""yes" 1>&6
else
echo "$ac_t""no" 1>&6
fi
- echo $ac_n "checking "for --enable-gauge"""... $ac_c" 1>&6
-echo "configure:4484: checking "for --enable-gauge"" >&5
+ echo $ac_n "checking for --enable-statbmp""... $ac_c" 1>&6
+echo "configure:6112: checking for --enable-statbmp" >&5
no_cache=0
- # Check whether --enable-gauge or --disable-gauge was given.
-if test "${enable_gauge+set}" = set; then
- enableval="$enable_gauge"
+ # 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_gauge='wxUSE_GAUGE=yes'
+ ac_cv_use_statbmp='wxUSE_STATBMP=yes'
else
- ac_cv_use_gauge='wxUSE_GAUGE=no'
+ ac_cv_use_statbmp='wxUSE_STATBMP=no'
fi
else
- LINE=`grep "wxUSE_GAUGE" ${wx_arg_cache_file}`
+ LINE=`grep "wxUSE_STATBMP" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
eval "DEFAULT_$LINE"
else
no_cache=1
fi
- ac_cv_use_gauge='wxUSE_GAUGE='$DEFAULT_wxUSE_GAUGE
+ ac_cv_use_statbmp='wxUSE_STATBMP='$DEFAULT_wxUSE_STATBMP
fi
- eval "$ac_cv_use_gauge"
+ eval "$ac_cv_use_statbmp"
if test "$no_cache" != 1; then
- echo $ac_cv_use_gauge >> ${wx_arg_cache_file}.tmp
+ echo $ac_cv_use_statbmp >> ${wx_arg_cache_file}.tmp
fi
- if test "$wxUSE_GAUGE" = yes; then
+ if test "$wxUSE_STATBMP" = yes; then
echo "$ac_t""yes" 1>&6
else
echo "$ac_t""no" 1>&6
fi
- echo $ac_n "checking "for --enable-grid"""... $ac_c" 1>&6
-echo "configure:4523: checking "for --enable-grid"" >&5
+ echo $ac_n "checking for --enable-statbox""... $ac_c" 1>&6
+echo "configure:6151: checking for --enable-statbox" >&5
no_cache=0
- # Check whether --enable-grid or --disable-grid was given.
-if test "${enable_grid+set}" = set; then
- enableval="$enable_grid"
+ # 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_grid='wxUSE_GRID=yes'
+ ac_cv_use_statbox='wxUSE_STATBOX=yes'
else
- ac_cv_use_grid='wxUSE_GRID=no'
+ ac_cv_use_statbox='wxUSE_STATBOX=no'
fi
else
- LINE=`grep "wxUSE_GRID" ${wx_arg_cache_file}`
+ LINE=`grep "wxUSE_STATBOX" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
eval "DEFAULT_$LINE"
else
no_cache=1
fi
- ac_cv_use_grid='wxUSE_GRID='$DEFAULT_wxUSE_GRID
+ ac_cv_use_statbox='wxUSE_STATBOX='$DEFAULT_wxUSE_STATBOX
fi
- eval "$ac_cv_use_grid"
+ eval "$ac_cv_use_statbox"
if test "$no_cache" != 1; then
- echo $ac_cv_use_grid >> ${wx_arg_cache_file}.tmp
+ echo $ac_cv_use_statbox >> ${wx_arg_cache_file}.tmp
fi
- if test "$wxUSE_GRID" = yes; then
+ if test "$wxUSE_STATBOX" = yes; then
echo "$ac_t""yes" 1>&6
else
echo "$ac_t""no" 1>&6
fi
- echo $ac_n "checking "for --enable-newgrid"""... $ac_c" 1>&6
-echo "configure:4562: checking "for --enable-newgrid"" >&5
+ echo $ac_n "checking for --enable-statline""... $ac_c" 1>&6
+echo "configure:6190: checking for --enable-statline" >&5
no_cache=0
- # Check whether --enable-newgrid or --disable-newgrid was given.
-if test "${enable_newgrid+set}" = set; then
- enableval="$enable_newgrid"
+ # 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_newgrid='wxUSE_NEW_GRID=yes'
+ ac_cv_use_statline='wxUSE_STATLINE=yes'
else
- ac_cv_use_newgrid='wxUSE_NEW_GRID=no'
+ ac_cv_use_statline='wxUSE_STATLINE=no'
fi
else
- LINE=`grep "wxUSE_NEW_GRID" ${wx_arg_cache_file}`
+ LINE=`grep "wxUSE_STATLINE" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
eval "DEFAULT_$LINE"
else
no_cache=1
fi
- ac_cv_use_newgrid='wxUSE_NEW_GRID='$DEFAULT_wxUSE_NEW_GRID
+ ac_cv_use_statline='wxUSE_STATLINE='$DEFAULT_wxUSE_STATLINE
fi
- eval "$ac_cv_use_newgrid"
+ eval "$ac_cv_use_statline"
if test "$no_cache" != 1; then
- echo $ac_cv_use_newgrid >> ${wx_arg_cache_file}.tmp
+ echo $ac_cv_use_statline >> ${wx_arg_cache_file}.tmp
fi
- if test "$wxUSE_NEW_GRID" = yes; then
+ if test "$wxUSE_STATLINE" = yes; then
echo "$ac_t""yes" 1>&6
else
echo "$ac_t""no" 1>&6
fi
- echo $ac_n "checking "for --enable-imaglist"""... $ac_c" 1>&6
-echo "configure:4601: checking "for --enable-imaglist"" >&5
+ echo $ac_n "checking for --enable-stattext""... $ac_c" 1>&6
+echo "configure:6229: checking for --enable-stattext" >&5
no_cache=0
- # Check whether --enable-imaglist or --disable-imaglist was given.
-if test "${enable_imaglist+set}" = set; then
- enableval="$enable_imaglist"
+ # 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_imaglist='wxUSE_IMAGLIST=yes'
+ ac_cv_use_stattext='wxUSE_STATTEXT=yes'
else
- ac_cv_use_imaglist='wxUSE_IMAGLIST=no'
+ ac_cv_use_stattext='wxUSE_STATTEXT=no'
fi
else
- LINE=`grep "wxUSE_IMAGLIST" ${wx_arg_cache_file}`
+ 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_imaglist='wxUSE_IMAGLIST='$DEFAULT_wxUSE_IMAGLIST
+ ac_cv_use_stattext='wxUSE_STATTEXT='$DEFAULT_wxUSE_STATTEXT
fi
- eval "$ac_cv_use_imaglist"
+ eval "$ac_cv_use_stattext"
if test "$no_cache" != 1; then
- echo $ac_cv_use_imaglist >> ${wx_arg_cache_file}.tmp
+ echo $ac_cv_use_stattext >> ${wx_arg_cache_file}.tmp
fi
- if test "$wxUSE_IMAGLIST" = yes; then
+ if test "$wxUSE_STATTEXT" = yes; then
echo "$ac_t""yes" 1>&6
else
echo "$ac_t""no" 1>&6
fi
- echo $ac_n "checking "for --enable-listbox"""... $ac_c" 1>&6
-echo "configure:4640: checking "for --enable-listbox"" >&5
+ echo $ac_n "checking for --enable-statusbar""... $ac_c" 1>&6
+echo "configure:6268: checking for --enable-statusbar" >&5
no_cache=0
- # Check whether --enable-listbox or --disable-listbox was given.
-if test "${enable_listbox+set}" = set; then
- enableval="$enable_listbox"
+ # 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_listbox='wxUSE_LISTBOX=yes'
+ ac_cv_use_statusbar='wxUSE_STATUSBAR=yes'
else
- ac_cv_use_listbox='wxUSE_LISTBOX=no'
+ ac_cv_use_statusbar='wxUSE_STATUSBAR=no'
fi
else
- LINE=`grep "wxUSE_LISTBOX" ${wx_arg_cache_file}`
+ LINE=`grep "wxUSE_STATUSBAR" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
eval "DEFAULT_$LINE"
else
no_cache=1
fi
- ac_cv_use_listbox='wxUSE_LISTBOX='$DEFAULT_wxUSE_LISTBOX
+ ac_cv_use_statusbar='wxUSE_STATUSBAR='$DEFAULT_wxUSE_STATUSBAR
fi
- eval "$ac_cv_use_listbox"
+ eval "$ac_cv_use_statusbar"
if test "$no_cache" != 1; then
- echo $ac_cv_use_listbox >> ${wx_arg_cache_file}.tmp
+ echo $ac_cv_use_statusbar >> ${wx_arg_cache_file}.tmp
fi
- if test "$wxUSE_LISTBOX" = yes; then
+ if test "$wxUSE_STATUSBAR" = yes; then
echo "$ac_t""yes" 1>&6
else
echo "$ac_t""no" 1>&6
fi
- echo $ac_n "checking "for --enable-listctrl"""... $ac_c" 1>&6
-echo "configure:4679: checking "for --enable-listctrl"" >&5
+ echo $ac_n "checking for --enable-tabdialog""... $ac_c" 1>&6
+echo "configure:6307: checking for --enable-tabdialog" >&5
no_cache=0
- # Check whether --enable-listctrl or --disable-listctrl was given.
-if test "${enable_listctrl+set}" = set; then
- enableval="$enable_listctrl"
+ # 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_listctrl='wxUSE_LISTCTRL=yes'
+ ac_cv_use_tabdialog='wxUSE_TABDIALOG=yes'
else
- ac_cv_use_listctrl='wxUSE_LISTCTRL=no'
+ ac_cv_use_tabdialog='wxUSE_TABDIALOG=no'
fi
else
- LINE=`grep "wxUSE_LISTCTRL" ${wx_arg_cache_file}`
+ LINE=`grep "wxUSE_TABDIALOG" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
eval "DEFAULT_$LINE"
else
no_cache=1
fi
- ac_cv_use_listctrl='wxUSE_LISTCTRL='$DEFAULT_wxUSE_LISTCTRL
+ ac_cv_use_tabdialog='wxUSE_TABDIALOG='$DEFAULT_wxUSE_TABDIALOG
fi
- eval "$ac_cv_use_listctrl"
+ eval "$ac_cv_use_tabdialog"
if test "$no_cache" != 1; then
- echo $ac_cv_use_listctrl >> ${wx_arg_cache_file}.tmp
+ echo $ac_cv_use_tabdialog >> ${wx_arg_cache_file}.tmp
fi
- if test "$wxUSE_LISTCTRL" = yes; then
+ if test "$wxUSE_TABDIALOG" = yes; then
echo "$ac_t""yes" 1>&6
else
echo "$ac_t""no" 1>&6
fi
- echo $ac_n "checking "for --enable-notebook"""... $ac_c" 1>&6
-echo "configure:4718: checking "for --enable-notebook"" >&5
+ echo $ac_n "checking for --enable-textctrl""... $ac_c" 1>&6
+echo "configure:6346: checking for --enable-textctrl" >&5
no_cache=0
- # Check whether --enable-notebook or --disable-notebook was given.
-if test "${enable_notebook+set}" = set; then
- enableval="$enable_notebook"
+ # 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_notebook='wxUSE_NOTEBOOK=yes'
+ ac_cv_use_textctrl='wxUSE_TEXTCTRL=yes'
else
- ac_cv_use_notebook='wxUSE_NOTEBOOK=no'
+ ac_cv_use_textctrl='wxUSE_TEXTCTRL=no'
fi
else
- LINE=`grep "wxUSE_NOTEBOOK" ${wx_arg_cache_file}`
+ 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_notebook='wxUSE_NOTEBOOK='$DEFAULT_wxUSE_NOTEBOOK
+ ac_cv_use_textctrl='wxUSE_TEXTCTRL='$DEFAULT_wxUSE_TEXTCTRL
fi
- eval "$ac_cv_use_notebook"
+ eval "$ac_cv_use_textctrl"
if test "$no_cache" != 1; then
- echo $ac_cv_use_notebook >> ${wx_arg_cache_file}.tmp
+ echo $ac_cv_use_textctrl >> ${wx_arg_cache_file}.tmp
fi
- if test "$wxUSE_NOTEBOOK" = yes; then
+ if test "$wxUSE_TEXTCTRL" = yes; then
echo "$ac_t""yes" 1>&6
else
echo "$ac_t""no" 1>&6
fi
- echo $ac_n "checking "for --enable-radiobox"""... $ac_c" 1>&6
-echo "configure:4757: checking "for --enable-radiobox"" >&5
+ echo $ac_n "checking for --enable-togglebtn""... $ac_c" 1>&6
+echo "configure:6385: checking for --enable-togglebtn" >&5
no_cache=0
- # Check whether --enable-radiobox or --disable-radiobox was given.
-if test "${enable_radiobox+set}" = set; then
- enableval="$enable_radiobox"
+ # 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_radiobox='wxUSE_RADIOBOX=yes'
+ ac_cv_use_togglebtn='wxUSE_TOGGLEBTN=yes'
else
- ac_cv_use_radiobox='wxUSE_RADIOBOX=no'
+ ac_cv_use_togglebtn='wxUSE_TOGGLEBTN=no'
fi
else
- LINE=`grep "wxUSE_RADIOBOX" ${wx_arg_cache_file}`
+ LINE=`grep "wxUSE_TOGGLEBTN" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
eval "DEFAULT_$LINE"
else
no_cache=1
fi
- ac_cv_use_radiobox='wxUSE_RADIOBOX='$DEFAULT_wxUSE_RADIOBOX
+ ac_cv_use_togglebtn='wxUSE_TOGGLEBTN='$DEFAULT_wxUSE_TOGGLEBTN
fi
- eval "$ac_cv_use_radiobox"
+ eval "$ac_cv_use_togglebtn"
if test "$no_cache" != 1; then
- echo $ac_cv_use_radiobox >> ${wx_arg_cache_file}.tmp
+ echo $ac_cv_use_togglebtn >> ${wx_arg_cache_file}.tmp
fi
- if test "$wxUSE_RADIOBOX" = yes; then
+ if test "$wxUSE_TOGGLEBTN" = yes; then
echo "$ac_t""yes" 1>&6
else
echo "$ac_t""no" 1>&6
fi
- echo $ac_n "checking "for --enable-radiobtn"""... $ac_c" 1>&6
-echo "configure:4796: checking "for --enable-radiobtn"" >&5
+ echo $ac_n "checking for --enable-toolbar""... $ac_c" 1>&6
+echo "configure:6424: checking for --enable-toolbar" >&5
no_cache=0
- # Check whether --enable-radiobtn or --disable-radiobtn was given.
-if test "${enable_radiobtn+set}" = set; then
- enableval="$enable_radiobtn"
+ # 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_radiobtn='wxUSE_RADIOBTN=yes'
+ ac_cv_use_toolbar='wxUSE_TOOLBAR=yes'
else
- ac_cv_use_radiobtn='wxUSE_RADIOBTN=no'
+ ac_cv_use_toolbar='wxUSE_TOOLBAR=no'
fi
else
- LINE=`grep "wxUSE_RADIOBTN" ${wx_arg_cache_file}`
+ LINE=`grep "wxUSE_TOOLBAR" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
eval "DEFAULT_$LINE"
else
no_cache=1
fi
- ac_cv_use_radiobtn='wxUSE_RADIOBTN='$DEFAULT_wxUSE_RADIOBTN
+ ac_cv_use_toolbar='wxUSE_TOOLBAR='$DEFAULT_wxUSE_TOOLBAR
fi
- eval "$ac_cv_use_radiobtn"
+ eval "$ac_cv_use_toolbar"
if test "$no_cache" != 1; then
- echo $ac_cv_use_radiobtn >> ${wx_arg_cache_file}.tmp
+ echo $ac_cv_use_toolbar >> ${wx_arg_cache_file}.tmp
fi
- if test "$wxUSE_RADIOBTN" = yes; then
+ if test "$wxUSE_TOOLBAR" = yes; then
echo "$ac_t""yes" 1>&6
else
echo "$ac_t""no" 1>&6
fi
- echo $ac_n "checking "for --enable-sash"""... $ac_c" 1>&6
-echo "configure:4835: checking "for --enable-sash"" >&5
+ echo $ac_n "checking for --enable-tbarnative""... $ac_c" 1>&6
+echo "configure:6463: checking for --enable-tbarnative" >&5
no_cache=0
- # Check whether --enable-sash or --disable-sash was given.
-if test "${enable_sash+set}" = set; then
- enableval="$enable_sash"
+ # 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_sash='wxUSE_SASH=yes'
+ ac_cv_use_tbarnative='wxUSE_TOOLBAR_NATIVE=yes'
else
- ac_cv_use_sash='wxUSE_SASH=no'
+ ac_cv_use_tbarnative='wxUSE_TOOLBAR_NATIVE=no'
fi
else
- LINE=`grep "wxUSE_SASH" ${wx_arg_cache_file}`
+ LINE=`grep "wxUSE_TOOLBAR_NATIVE" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
eval "DEFAULT_$LINE"
else
no_cache=1
fi
- ac_cv_use_sash='wxUSE_SASH='$DEFAULT_wxUSE_SASH
+ ac_cv_use_tbarnative='wxUSE_TOOLBAR_NATIVE='$DEFAULT_wxUSE_TOOLBAR_NATIVE
fi
- eval "$ac_cv_use_sash"
+ eval "$ac_cv_use_tbarnative"
if test "$no_cache" != 1; then
- echo $ac_cv_use_sash >> ${wx_arg_cache_file}.tmp
+ echo $ac_cv_use_tbarnative >> ${wx_arg_cache_file}.tmp
fi
- if test "$wxUSE_SASH" = yes; then
+ if test "$wxUSE_TOOLBAR_NATIVE" = yes; then
echo "$ac_t""yes" 1>&6
else
echo "$ac_t""no" 1>&6
fi
- echo $ac_n "checking "for --enable-scrollbar"""... $ac_c" 1>&6
-echo "configure:4874: checking "for --enable-scrollbar"" >&5
+ echo $ac_n "checking for --enable-tbarsmpl""... $ac_c" 1>&6
+echo "configure:6502: checking for --enable-tbarsmpl" >&5
no_cache=0
- # Check whether --enable-scrollbar or --disable-scrollbar was given.
-if test "${enable_scrollbar+set}" = set; then
- enableval="$enable_scrollbar"
+ # 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_scrollbar='wxUSE_SCROLLBAR=yes'
+ ac_cv_use_tbarsmpl='wxUSE_TOOLBAR_SIMPLE=yes'
else
- ac_cv_use_scrollbar='wxUSE_SCROLLBAR=no'
+ ac_cv_use_tbarsmpl='wxUSE_TOOLBAR_SIMPLE=no'
fi
else
- LINE=`grep "wxUSE_SCROLLBAR" ${wx_arg_cache_file}`
+ LINE=`grep "wxUSE_TOOLBAR_SIMPLE" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
eval "DEFAULT_$LINE"
else
no_cache=1
fi
- ac_cv_use_scrollbar='wxUSE_SCROLLBAR='$DEFAULT_wxUSE_SCROLLBAR
+ ac_cv_use_tbarsmpl='wxUSE_TOOLBAR_SIMPLE='$DEFAULT_wxUSE_TOOLBAR_SIMPLE
fi
- eval "$ac_cv_use_scrollbar"
+ eval "$ac_cv_use_tbarsmpl"
if test "$no_cache" != 1; then
- echo $ac_cv_use_scrollbar >> ${wx_arg_cache_file}.tmp
+ echo $ac_cv_use_tbarsmpl >> ${wx_arg_cache_file}.tmp
fi
- if test "$wxUSE_SCROLLBAR" = yes; then
+ if test "$wxUSE_TOOLBAR_SIMPLE" = yes; then
echo "$ac_t""yes" 1>&6
else
echo "$ac_t""no" 1>&6
fi
- echo $ac_n "checking "for --enable-slider"""... $ac_c" 1>&6
-echo "configure:4913: checking "for --enable-slider"" >&5
+ echo $ac_n "checking for --enable-treectrl""... $ac_c" 1>&6
+echo "configure:6541: checking for --enable-treectrl" >&5
no_cache=0
- # Check whether --enable-slider or --disable-slider was given.
-if test "${enable_slider+set}" = set; then
- enableval="$enable_slider"
+ # 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_slider='wxUSE_SLIDER=yes'
+ ac_cv_use_treectrl='wxUSE_TREECTRL=yes'
else
- ac_cv_use_slider='wxUSE_SLIDER=no'
+ ac_cv_use_treectrl='wxUSE_TREECTRL=no'
fi
else
- LINE=`grep "wxUSE_SLIDER" ${wx_arg_cache_file}`
+ LINE=`grep "wxUSE_TREECTRL" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
eval "DEFAULT_$LINE"
else
no_cache=1
fi
- ac_cv_use_slider='wxUSE_SLIDER='$DEFAULT_wxUSE_SLIDER
+ ac_cv_use_treectrl='wxUSE_TREECTRL='$DEFAULT_wxUSE_TREECTRL
fi
- eval "$ac_cv_use_slider"
+ eval "$ac_cv_use_treectrl"
if test "$no_cache" != 1; then
- echo $ac_cv_use_slider >> ${wx_arg_cache_file}.tmp
+ echo $ac_cv_use_treectrl >> ${wx_arg_cache_file}.tmp
fi
- if test "$wxUSE_SLIDER" = yes; then
+ if test "$wxUSE_TREECTRL" = yes; then
echo "$ac_t""yes" 1>&6
else
echo "$ac_t""no" 1>&6
fi
- echo $ac_n "checking "for --enable-spinbtn"""... $ac_c" 1>&6
-echo "configure:4952: checking "for --enable-spinbtn"" >&5
+ echo $ac_n "checking for --enable-popupwin""... $ac_c" 1>&6
+echo "configure:6580: checking for --enable-popupwin" >&5
no_cache=0
- # Check whether --enable-spinbtn or --disable-spinbtn was given.
-if test "${enable_spinbtn+set}" = set; then
- enableval="$enable_spinbtn"
+ # 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_spinbtn='wxUSE_SPINBTN=yes'
+ ac_cv_use_popupwin='wxUSE_POPUPWIN=yes'
else
- ac_cv_use_spinbtn='wxUSE_SPINBTN=no'
+ ac_cv_use_popupwin='wxUSE_POPUPWIN=no'
fi
else
- LINE=`grep "wxUSE_SPINBTN" ${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_spinbtn='wxUSE_SPINBTN='$DEFAULT_wxUSE_SPINBTN
+ ac_cv_use_popupwin='wxUSE_POPUPWIN='$DEFAULT_wxUSE_POPUPWIN
fi
- eval "$ac_cv_use_spinbtn"
+ eval "$ac_cv_use_popupwin"
if test "$no_cache" != 1; then
- echo $ac_cv_use_spinbtn >> ${wx_arg_cache_file}.tmp
+ echo $ac_cv_use_popupwin >> ${wx_arg_cache_file}.tmp
fi
- if test "$wxUSE_SPINBTN" = yes; then
+ if test "$wxUSE_POPUPWIN" = yes; then
echo "$ac_t""yes" 1>&6
else
echo "$ac_t""no" 1>&6
fi
- echo $ac_n "checking "for --enable-spinctrl"""... $ac_c" 1>&6
-echo "configure:4991: checking "for --enable-spinctrl"" >&5
+
+
+ echo $ac_n "checking for --enable-commondlg""... $ac_c" 1>&6
+echo "configure:6621: checking for --enable-commondlg" >&5
no_cache=0
- # Check whether --enable-spinctrl or --disable-spinctrl was given.
-if test "${enable_spinctrl+set}" = set; then
- enableval="$enable_spinctrl"
+ # 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_spinctrl='wxUSE_SPINCTRL=yes'
+ ac_cv_use_commondlg='wxUSE_COMMONDLGS=yes'
else
- ac_cv_use_spinctrl='wxUSE_SPINCTRL=no'
+ ac_cv_use_commondlg='wxUSE_COMMONDLGS=no'
fi
else
- LINE=`grep "wxUSE_SPINCTRL" ${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_spinctrl='wxUSE_SPINCTRL='$DEFAULT_wxUSE_SPINCTRL
+ ac_cv_use_commondlg='wxUSE_COMMONDLGS='$DEFAULT_wxUSE_COMMONDLGS
fi
- eval "$ac_cv_use_spinctrl"
+ eval "$ac_cv_use_commondlg"
if test "$no_cache" != 1; then
- echo $ac_cv_use_spinctrl >> ${wx_arg_cache_file}.tmp
+ echo $ac_cv_use_commondlg >> ${wx_arg_cache_file}.tmp
fi
- if test "$wxUSE_SPINCTRL" = yes; then
+ if test "$wxUSE_COMMONDLGS" = yes; then
echo "$ac_t""yes" 1>&6
else
echo "$ac_t""no" 1>&6
fi
- echo $ac_n "checking "for --enable-splitter"""... $ac_c" 1>&6
-echo "configure:5030: checking "for --enable-splitter"" >&5
+ echo $ac_n "checking for --enable-choicedlg""... $ac_c" 1>&6
+echo "configure:6660: checking for --enable-choicedlg" >&5
no_cache=0
- # Check whether --enable-splitter or --disable-splitter was given.
-if test "${enable_splitter+set}" = set; then
- enableval="$enable_splitter"
+ # 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_splitter='wxUSE_SPLITTER=yes'
+ ac_cv_use_choicedlg='wxUSE_CHOICEDLG=yes'
else
- ac_cv_use_splitter='wxUSE_SPLITTER=no'
+ ac_cv_use_choicedlg='wxUSE_CHOICEDLG=no'
fi
else
- LINE=`grep "wxUSE_SPLITTER" ${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_splitter='wxUSE_SPLITTER='$DEFAULT_wxUSE_SPLITTER
+ ac_cv_use_choicedlg='wxUSE_CHOICEDLG='$DEFAULT_wxUSE_CHOICEDLG
fi
- eval "$ac_cv_use_splitter"
+ eval "$ac_cv_use_choicedlg"
if test "$no_cache" != 1; then
- echo $ac_cv_use_splitter >> ${wx_arg_cache_file}.tmp
+ echo $ac_cv_use_choicedlg >> ${wx_arg_cache_file}.tmp
fi
- if test "$wxUSE_SPLITTER" = yes; then
+ if test "$wxUSE_CHOICEDLG" = yes; then
echo "$ac_t""yes" 1>&6
else
echo "$ac_t""no" 1>&6
fi
- echo $ac_n "checking "for --enable-statbmp"""... $ac_c" 1>&6
-echo "configure:5069: checking "for --enable-statbmp"" >&5
+ echo $ac_n "checking for --enable-coldlg""... $ac_c" 1>&6
+echo "configure:6699: checking for --enable-coldlg" >&5
no_cache=0
- # Check whether --enable-statbmp or --disable-statbmp was given.
-if test "${enable_statbmp+set}" = set; then
- enableval="$enable_statbmp"
+ # 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_statbmp='wxUSE_STATBMP=yes'
+ ac_cv_use_coldlg='wxUSE_COLOURDLG=yes'
else
- ac_cv_use_statbmp='wxUSE_STATBMP=no'
+ ac_cv_use_coldlg='wxUSE_COLOURDLG=no'
fi
else
- LINE=`grep "wxUSE_STATBMP" ${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_statbmp='wxUSE_STATBMP='$DEFAULT_wxUSE_STATBMP
+ ac_cv_use_coldlg='wxUSE_COLOURDLG='$DEFAULT_wxUSE_COLOURDLG
fi
- eval "$ac_cv_use_statbmp"
+ eval "$ac_cv_use_coldlg"
if test "$no_cache" != 1; then
- echo $ac_cv_use_statbmp >> ${wx_arg_cache_file}.tmp
+ echo $ac_cv_use_coldlg >> ${wx_arg_cache_file}.tmp
fi
- if test "$wxUSE_STATBMP" = yes; then
+ if test "$wxUSE_COLOURDLG" = yes; then
echo "$ac_t""yes" 1>&6
else
echo "$ac_t""no" 1>&6
fi
- echo $ac_n "checking "for --enable-statbox"""... $ac_c" 1>&6
-echo "configure:5108: checking "for --enable-statbox"" >&5
+ echo $ac_n "checking for --enable-filedlg""... $ac_c" 1>&6
+echo "configure:6738: checking for --enable-filedlg" >&5
no_cache=0
- # Check whether --enable-statbox or --disable-statbox was given.
-if test "${enable_statbox+set}" = set; then
- enableval="$enable_statbox"
+ # 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_statbox='wxUSE_STATBOX=yes'
+ ac_cv_use_filedlg='wxUSE_FILEDLG=yes'
else
- ac_cv_use_statbox='wxUSE_STATBOX=no'
+ ac_cv_use_filedlg='wxUSE_FILEDLG=no'
fi
else
- LINE=`grep "wxUSE_STATBOX" ${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_statbox='wxUSE_STATBOX='$DEFAULT_wxUSE_STATBOX
+ ac_cv_use_filedlg='wxUSE_FILEDLG='$DEFAULT_wxUSE_FILEDLG
fi
- eval "$ac_cv_use_statbox"
+ eval "$ac_cv_use_filedlg"
if test "$no_cache" != 1; then
- echo $ac_cv_use_statbox >> ${wx_arg_cache_file}.tmp
+ echo $ac_cv_use_filedlg >> ${wx_arg_cache_file}.tmp
fi
- if test "$wxUSE_STATBOX" = yes; then
+ if test "$wxUSE_FILEDLG" = yes; then
echo "$ac_t""yes" 1>&6
else
echo "$ac_t""no" 1>&6
fi
- echo $ac_n "checking "for --enable-statline"""... $ac_c" 1>&6
-echo "configure:5147: checking "for --enable-statline"" >&5
+ echo $ac_n "checking for --enable-filedlg""... $ac_c" 1>&6
+echo "configure:6777: checking for --enable-filedlg" >&5
no_cache=0
- # Check whether --enable-statline or --disable-statline was given.
-if test "${enable_statline+set}" = set; then
- enableval="$enable_statline"
+ # 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_statline='wxUSE_STATLINE=yes'
+ ac_cv_use_filedlg='wxUSE_FINDREPLDLG=yes'
else
- ac_cv_use_statline='wxUSE_STATLINE=no'
+ ac_cv_use_filedlg='wxUSE_FINDREPLDLG=no'
fi
else
- LINE=`grep "wxUSE_STATLINE" ${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_statline='wxUSE_STATLINE='$DEFAULT_wxUSE_STATLINE
+ ac_cv_use_filedlg='wxUSE_FINDREPLDLG='$DEFAULT_wxUSE_FINDREPLDLG
fi
- eval "$ac_cv_use_statline"
+ eval "$ac_cv_use_filedlg"
if test "$no_cache" != 1; then
- echo $ac_cv_use_statline >> ${wx_arg_cache_file}.tmp
+ echo $ac_cv_use_filedlg >> ${wx_arg_cache_file}.tmp
fi
- if test "$wxUSE_STATLINE" = yes; then
+ if test "$wxUSE_FINDREPLDLG" = yes; then
echo "$ac_t""yes" 1>&6
else
echo "$ac_t""no" 1>&6
fi
- echo $ac_n "checking "for --enable-statusbar"""... $ac_c" 1>&6
-echo "configure:5186: checking "for --enable-statusbar"" >&5
+ echo $ac_n "checking for --enable-fontdlg""... $ac_c" 1>&6
+echo "configure:6816: checking for --enable-fontdlg" >&5
no_cache=0
- # Check whether --enable-statusbar or --disable-statusbar was given.
-if test "${enable_statusbar+set}" = set; then
- enableval="$enable_statusbar"
+ # 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_statusbar='wxUSE_STATUSBAR=yes'
+ ac_cv_use_fontdlg='wxUSE_FONTDLG=yes'
else
- ac_cv_use_statusbar='wxUSE_STATUSBAR=no'
+ ac_cv_use_fontdlg='wxUSE_FONTDLG=no'
fi
else
- LINE=`grep "wxUSE_STATUSBAR" ${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_statusbar='wxUSE_STATUSBAR='$DEFAULT_wxUSE_STATUSBAR
+ ac_cv_use_fontdlg='wxUSE_FONTDLG='$DEFAULT_wxUSE_FONTDLG
fi
- eval "$ac_cv_use_statusbar"
+ eval "$ac_cv_use_fontdlg"
if test "$no_cache" != 1; then
- echo $ac_cv_use_statusbar >> ${wx_arg_cache_file}.tmp
+ echo $ac_cv_use_fontdlg >> ${wx_arg_cache_file}.tmp
fi
- if test "$wxUSE_STATUSBAR" = yes; then
+ if test "$wxUSE_FONTDLG" = yes; then
echo "$ac_t""yes" 1>&6
else
echo "$ac_t""no" 1>&6
fi
- echo $ac_n "checking "for --enable-tabdialog"""... $ac_c" 1>&6
-echo "configure:5225: checking "for --enable-tabdialog"" >&5
+ echo $ac_n "checking for --enable-dirdlg""... $ac_c" 1>&6
+echo "configure:6855: checking for --enable-dirdlg" >&5
no_cache=0
- # Check whether --enable-tabdialog or --disable-tabdialog was given.
-if test "${enable_tabdialog+set}" = set; then
- enableval="$enable_tabdialog"
+ # 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_tabdialog='wxUSE_TABDIALOG=yes'
+ ac_cv_use_dirdlg='wxUSE_DIRDLG=yes'
else
- ac_cv_use_tabdialog='wxUSE_TABDIALOG=no'
+ ac_cv_use_dirdlg='wxUSE_DIRDLG=no'
fi
else
- LINE=`grep "wxUSE_TABDIALOG" ${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_tabdialog='wxUSE_TABDIALOG='$DEFAULT_wxUSE_TABDIALOG
+ ac_cv_use_dirdlg='wxUSE_DIRDLG='$DEFAULT_wxUSE_DIRDLG
fi
- eval "$ac_cv_use_tabdialog"
+ eval "$ac_cv_use_dirdlg"
if test "$no_cache" != 1; then
- echo $ac_cv_use_tabdialog >> ${wx_arg_cache_file}.tmp
+ echo $ac_cv_use_dirdlg >> ${wx_arg_cache_file}.tmp
fi
- if test "$wxUSE_TABDIALOG" = yes; then
+ if test "$wxUSE_DIRDLG" = yes; then
echo "$ac_t""yes" 1>&6
else
echo "$ac_t""no" 1>&6
fi
- echo $ac_n "checking "for --enable-toolbar"""... $ac_c" 1>&6
-echo "configure:5264: checking "for --enable-toolbar"" >&5
+ echo $ac_n "checking for --enable-msgdlg""... $ac_c" 1>&6
+echo "configure:6894: checking for --enable-msgdlg" >&5
no_cache=0
- # Check whether --enable-toolbar or --disable-toolbar was given.
-if test "${enable_toolbar+set}" = set; then
- enableval="$enable_toolbar"
+ # 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_toolbar='wxUSE_TOOLBAR=yes'
+ ac_cv_use_msgdlg='wxUSE_MSGDLG=yes'
else
- ac_cv_use_toolbar='wxUSE_TOOLBAR=no'
+ ac_cv_use_msgdlg='wxUSE_MSGDLG=no'
fi
else
- LINE=`grep "wxUSE_TOOLBAR" ${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_toolbar='wxUSE_TOOLBAR='$DEFAULT_wxUSE_TOOLBAR
+ ac_cv_use_msgdlg='wxUSE_MSGDLG='$DEFAULT_wxUSE_MSGDLG
fi
- eval "$ac_cv_use_toolbar"
+ eval "$ac_cv_use_msgdlg"
if test "$no_cache" != 1; then
- echo $ac_cv_use_toolbar >> ${wx_arg_cache_file}.tmp
+ echo $ac_cv_use_msgdlg >> ${wx_arg_cache_file}.tmp
fi
- if test "$wxUSE_TOOLBAR" = yes; then
+ if test "$wxUSE_MSGDLG" = yes; then
echo "$ac_t""yes" 1>&6
else
echo "$ac_t""no" 1>&6
fi
- echo $ac_n "checking "for --enable-tbarnative"""... $ac_c" 1>&6
-echo "configure:5303: checking "for --enable-tbarnative"" >&5
+ echo $ac_n "checking for --enable-numberdlg""... $ac_c" 1>&6
+echo "configure:6933: checking for --enable-numberdlg" >&5
no_cache=0
- # Check whether --enable-tbarnative or --disable-tbarnative was given.
-if test "${enable_tbarnative+set}" = set; then
- enableval="$enable_tbarnative"
+ # 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_tbarnative='wxUSE_TOOLBAR_NATIVE=yes'
+ ac_cv_use_numberdlg='wxUSE_NUMBERDLG=yes'
else
- ac_cv_use_tbarnative='wxUSE_TOOLBAR_NATIVE=no'
+ ac_cv_use_numberdlg='wxUSE_NUMBERDLG=no'
fi
else
- LINE=`grep "wxUSE_TOOLBAR_NATIVE" ${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_tbarnative='wxUSE_TOOLBAR_NATIVE='$DEFAULT_wxUSE_TOOLBAR_NATIVE
+ ac_cv_use_numberdlg='wxUSE_NUMBERDLG='$DEFAULT_wxUSE_NUMBERDLG
fi
- eval "$ac_cv_use_tbarnative"
+ eval "$ac_cv_use_numberdlg"
if test "$no_cache" != 1; then
- echo $ac_cv_use_tbarnative >> ${wx_arg_cache_file}.tmp
+ echo $ac_cv_use_numberdlg >> ${wx_arg_cache_file}.tmp
fi
- if test "$wxUSE_TOOLBAR_NATIVE" = yes; then
+ if test "$wxUSE_NUMBERDLG" = yes; then
echo "$ac_t""yes" 1>&6
else
echo "$ac_t""no" 1>&6
fi
- echo $ac_n "checking "for --enable-tbarsmpl"""... $ac_c" 1>&6
-echo "configure:5342: checking "for --enable-tbarsmpl"" >&5
+ echo $ac_n "checking for --enable-textdlg""... $ac_c" 1>&6
+echo "configure:6972: checking for --enable-textdlg" >&5
no_cache=0
- # Check whether --enable-tbarsmpl or --disable-tbarsmpl was given.
-if test "${enable_tbarsmpl+set}" = set; then
- enableval="$enable_tbarsmpl"
+ # 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_tbarsmpl='wxUSE_TOOLBAR_SIMPLE=yes'
+ ac_cv_use_textdlg='wxUSE_TEXTDLG=yes'
else
- ac_cv_use_tbarsmpl='wxUSE_TOOLBAR_SIMPLE=no'
+ ac_cv_use_textdlg='wxUSE_TEXTDLG=no'
fi
else
- LINE=`grep "wxUSE_TOOLBAR_SIMPLE" ${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_tbarsmpl='wxUSE_TOOLBAR_SIMPLE='$DEFAULT_wxUSE_TOOLBAR_SIMPLE
+ ac_cv_use_textdlg='wxUSE_TEXTDLG='$DEFAULT_wxUSE_TEXTDLG
fi
- eval "$ac_cv_use_tbarsmpl"
+ eval "$ac_cv_use_textdlg"
if test "$no_cache" != 1; then
- echo $ac_cv_use_tbarsmpl >> ${wx_arg_cache_file}.tmp
+ echo $ac_cv_use_textdlg >> ${wx_arg_cache_file}.tmp
fi
- if test "$wxUSE_TOOLBAR_SIMPLE" = yes; then
+ if test "$wxUSE_TEXTDLG" = yes; then
echo "$ac_t""yes" 1>&6
else
echo "$ac_t""no" 1>&6
fi
- echo $ac_n "checking "for --enable-treectrl"""... $ac_c" 1>&6
-echo "configure:5381: checking "for --enable-treectrl"" >&5
+ echo $ac_n "checking for --enable-tipdlg""... $ac_c" 1>&6
+echo "configure:7011: checking for --enable-tipdlg" >&5
no_cache=0
- # Check whether --enable-treectrl or --disable-treectrl was given.
-if test "${enable_treectrl+set}" = set; then
- enableval="$enable_treectrl"
+ # 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_treectrl='wxUSE_TREECTRL=yes'
+ ac_cv_use_tipdlg='wxUSE_STARTUP_TIPS=yes'
else
- ac_cv_use_treectrl='wxUSE_TREECTRL=no'
+ ac_cv_use_tipdlg='wxUSE_STARTUP_TIPS=no'
fi
else
- LINE=`grep "wxUSE_TREECTRL" ${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_treectrl='wxUSE_TREECTRL='$DEFAULT_wxUSE_TREECTRL
+ ac_cv_use_tipdlg='wxUSE_STARTUP_TIPS='$DEFAULT_wxUSE_STARTUP_TIPS
fi
- eval "$ac_cv_use_treectrl"
+ eval "$ac_cv_use_tipdlg"
if test "$no_cache" != 1; then
- echo $ac_cv_use_treectrl >> ${wx_arg_cache_file}.tmp
+ echo $ac_cv_use_tipdlg >> ${wx_arg_cache_file}.tmp
fi
- if test "$wxUSE_TREECTRL" = yes; then
+ if test "$wxUSE_STARTUP_TIPS" = yes; then
echo "$ac_t""yes" 1>&6
else
echo "$ac_t""no" 1>&6
fi
-
-
- echo $ac_n "checking "for --enable-commondlg"""... $ac_c" 1>&6
-echo "configure:5422: checking "for --enable-commondlg"" >&5
+ echo $ac_n "checking for --enable-progressdlg""... $ac_c" 1>&6
+echo "configure:7050: checking for --enable-progressdlg" >&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-progressdlg or --disable-progressdlg was given.
+if test "${enable_progressdlg+set}" = set; then
+ enableval="$enable_progressdlg"
if test "$enableval" = yes; then
- ac_cv_use_commondlg='wxUSE_COMMONDLGS=yes'
+ ac_cv_use_progressdlg='wxUSE_PROGRESSDLG=yes'
else
- ac_cv_use_commondlg='wxUSE_COMMONDLGS=no'
+ ac_cv_use_progressdlg='wxUSE_PROGRESSDLG=no'
fi
else
- LINE=`grep "wxUSE_COMMONDLGS" ${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_commondlg='wxUSE_COMMONDLGS='$DEFAULT_wxUSE_COMMONDLGS
+ ac_cv_use_progressdlg='wxUSE_PROGRESSDLG='$DEFAULT_wxUSE_PROGRESSDLG
fi
- eval "$ac_cv_use_commondlg"
+ eval "$ac_cv_use_progressdlg"
if test "$no_cache" != 1; then
- echo $ac_cv_use_commondlg >> ${wx_arg_cache_file}.tmp
+ echo $ac_cv_use_progressdlg >> ${wx_arg_cache_file}.tmp
fi
- if test "$wxUSE_COMMONDLGS" = yes; then
+ if test "$wxUSE_PROGRESSDLG" = yes; then
echo "$ac_t""yes" 1>&6
else
echo "$ac_t""no" 1>&6
fi
- echo $ac_n "checking "for --enable-dirdlg"""... $ac_c" 1>&6
-echo "configure:5461: checking "for --enable-dirdlg"" >&5
+ echo $ac_n "checking for --enable-wizarddlg""... $ac_c" 1>&6
+echo "configure:7089: checking for --enable-wizarddlg" >&5
no_cache=0
- # Check whether --enable-dirdlg or --disable-dirdlg was given.
-if test "${enable_dirdlg+set}" = set; then
- enableval="$enable_dirdlg"
+ # 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_dirdlg='wxUSE_DIRDLG=yes'
+ ac_cv_use_wizarddlg='wxUSE_WIZARDDLG=yes'
else
- ac_cv_use_dirdlg='wxUSE_DIRDLG=no'
+ ac_cv_use_wizarddlg='wxUSE_WIZARDDLG=no'
fi
else
- LINE=`grep "wxUSE_DIRDLG" ${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_dirdlg='wxUSE_DIRDLG='$DEFAULT_wxUSE_DIRDLG
+ ac_cv_use_wizarddlg='wxUSE_WIZARDDLG='$DEFAULT_wxUSE_WIZARDDLG
fi
- eval "$ac_cv_use_dirdlg"
+ eval "$ac_cv_use_wizarddlg"
if test "$no_cache" != 1; then
- echo $ac_cv_use_dirdlg >> ${wx_arg_cache_file}.tmp
+ echo $ac_cv_use_wizarddlg >> ${wx_arg_cache_file}.tmp
fi
- if test "$wxUSE_DIRDLG" = yes; then
+ if test "$wxUSE_WIZARDDLG" = yes; then
echo "$ac_t""yes" 1>&6
else
echo "$ac_t""no" 1>&6
fi
- echo $ac_n "checking "for --enable-textdlg"""... $ac_c" 1>&6
-echo "configure:5500: checking "for --enable-textdlg"" >&5
+
+
+ echo $ac_n "checking for --enable-menus""... $ac_c" 1>&6
+echo "configure:7130: checking for --enable-menus" >&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-menus or --disable-menus was given.
+if test "${enable_menus+set}" = set; then
+ enableval="$enable_menus"
if test "$enableval" = yes; then
- ac_cv_use_textdlg='wxUSE_TEXTDLG=yes'
+ ac_cv_use_menus='wxUSE_MENUS=yes'
else
- ac_cv_use_textdlg='wxUSE_TEXTDLG=no'
+ ac_cv_use_menus='wxUSE_MENUS=no'
fi
else
- LINE=`grep "wxUSE_TEXTDLG" ${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_textdlg='wxUSE_TEXTDLG='$DEFAULT_wxUSE_TEXTDLG
+ ac_cv_use_menus='wxUSE_MENUS='$DEFAULT_wxUSE_MENUS
fi
- eval "$ac_cv_use_textdlg"
+ eval "$ac_cv_use_menus"
if test "$no_cache" != 1; then
- echo $ac_cv_use_textdlg >> ${wx_arg_cache_file}.tmp
+ echo $ac_cv_use_menus >> ${wx_arg_cache_file}.tmp
fi
- if test "$wxUSE_TEXTDLG" = yes; then
+ if test "$wxUSE_MENUS" = yes; then
echo "$ac_t""yes" 1>&6
else
echo "$ac_t""no" 1>&6
fi
- echo $ac_n "checking "for --enable-tipdlg"""... $ac_c" 1>&6
-echo "configure:5539: checking "for --enable-tipdlg"" >&5
+ echo $ac_n "checking for --enable-miniframe""... $ac_c" 1>&6
+echo "configure:7169: checking for --enable-miniframe" >&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-miniframe or --disable-miniframe was given.
+if test "${enable_miniframe+set}" = set; then
+ enableval="$enable_miniframe"
if test "$enableval" = yes; then
- ac_cv_use_tipdlg='wxUSE_STARTUP_TIPS=yes'
+ ac_cv_use_miniframe='wxUSE_MINIFRAME=yes'
else
- ac_cv_use_tipdlg='wxUSE_STARTUP_TIPS=no'
+ ac_cv_use_miniframe='wxUSE_MINIFRAME=no'
fi
else
- LINE=`grep "wxUSE_STARTUP_TIPS" ${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_tipdlg='wxUSE_STARTUP_TIPS='$DEFAULT_wxUSE_STARTUP_TIPS
+ ac_cv_use_miniframe='wxUSE_MINIFRAME='$DEFAULT_wxUSE_MINIFRAME
fi
- eval "$ac_cv_use_tipdlg"
+ eval "$ac_cv_use_miniframe"
if test "$no_cache" != 1; then
- echo $ac_cv_use_tipdlg >> ${wx_arg_cache_file}.tmp
+ echo $ac_cv_use_miniframe >> ${wx_arg_cache_file}.tmp
fi
- if test "$wxUSE_STARTUP_TIPS" = yes; then
+ if test "$wxUSE_MINIFRAME" = yes; then
echo "$ac_t""yes" 1>&6
else
echo "$ac_t""no" 1>&6
fi
- echo $ac_n "checking "for --enable-progressdlg"""... $ac_c" 1>&6
-echo "configure:5578: checking "for --enable-progressdlg"" >&5
+ echo $ac_n "checking for --enable-tooltips""... $ac_c" 1>&6
+echo "configure:7208: checking for --enable-tooltips" >&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-tooltips or --disable-tooltips was given.
+if test "${enable_tooltips+set}" = set; then
+ enableval="$enable_tooltips"
if test "$enableval" = yes; then
- ac_cv_use_progressdlg='wxUSE_PROGRESSDLG=yes'
+ ac_cv_use_tooltips='wxUSE_TOOLTIPS=yes'
else
- ac_cv_use_progressdlg='wxUSE_PROGRESSDLG=no'
+ ac_cv_use_tooltips='wxUSE_TOOLTIPS=no'
fi
else
- LINE=`grep "wxUSE_PROGRESSDLG" ${wx_arg_cache_file}`
+ LINE=`grep "wxUSE_TOOLTIPS" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
eval "DEFAULT_$LINE"
else
no_cache=1
fi
- ac_cv_use_progressdlg='wxUSE_PROGRESSDLG='$DEFAULT_wxUSE_PROGRESSDLG
+ ac_cv_use_tooltips='wxUSE_TOOLTIPS='$DEFAULT_wxUSE_TOOLTIPS
fi
- eval "$ac_cv_use_progressdlg"
+ eval "$ac_cv_use_tooltips"
if test "$no_cache" != 1; then
- echo $ac_cv_use_progressdlg >> ${wx_arg_cache_file}.tmp
+ echo $ac_cv_use_tooltips >> ${wx_arg_cache_file}.tmp
fi
- if test "$wxUSE_PROGRESSDLG" = yes; then
+ if test "$wxUSE_TOOLTIPS" = yes; then
echo "$ac_t""yes" 1>&6
else
echo "$ac_t""no" 1>&6
fi
- echo $ac_n "checking "for --enable-miniframe"""... $ac_c" 1>&6
-echo "configure:5617: checking "for --enable-miniframe"" >&5
+ echo $ac_n "checking for --enable-splines""... $ac_c" 1>&6
+echo "configure:7247: checking for --enable-splines" >&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-splines or --disable-splines was given.
+if test "${enable_splines+set}" = set; then
+ enableval="$enable_splines"
if test "$enableval" = yes; then
- ac_cv_use_miniframe='wxUSE_MINIFRAME=yes'
+ ac_cv_use_splines='wxUSE_SPLINES=yes'
else
- ac_cv_use_miniframe='wxUSE_MINIFRAME=no'
+ ac_cv_use_splines='wxUSE_SPLINES=no'
fi
else
- LINE=`grep "wxUSE_MINIFRAME" ${wx_arg_cache_file}`
+ LINE=`grep "wxUSE_SPLINES" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
eval "DEFAULT_$LINE"
else
no_cache=1
fi
- ac_cv_use_miniframe='wxUSE_MINIFRAME='$DEFAULT_wxUSE_MINIFRAME
+ ac_cv_use_splines='wxUSE_SPLINES='$DEFAULT_wxUSE_SPLINES
fi
- eval "$ac_cv_use_miniframe"
+ eval "$ac_cv_use_splines"
if test "$no_cache" != 1; then
- echo $ac_cv_use_miniframe >> ${wx_arg_cache_file}.tmp
+ echo $ac_cv_use_splines >> ${wx_arg_cache_file}.tmp
fi
- if test "$wxUSE_MINIFRAME" = yes; then
+ 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-html"""... $ac_c" 1>&6
-echo "configure:5656: checking "for --enable-html"" >&5
+ echo $ac_n "checking for --enable-validators""... $ac_c" 1>&6
+echo "configure:7286: checking for --enable-validators" >&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-validators or --disable-validators was given.
+if test "${enable_validators+set}" = set; then
+ enableval="$enable_validators"
if test "$enableval" = yes; then
- ac_cv_use_html='wxUSE_HTML=yes'
+ ac_cv_use_validators='wxUSE_VALIDATORS=yes'
else
- ac_cv_use_html='wxUSE_HTML=no'
+ ac_cv_use_validators='wxUSE_VALIDATORS=no'
fi
else
- LINE=`grep "wxUSE_HTML" ${wx_arg_cache_file}`
+ LINE=`grep "wxUSE_VALIDATORS" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
eval "DEFAULT_$LINE"
else
no_cache=1
fi
- ac_cv_use_html='wxUSE_HTML='$DEFAULT_wxUSE_HTML
+ ac_cv_use_validators='wxUSE_VALIDATORS='$DEFAULT_wxUSE_VALIDATORS
fi
- eval "$ac_cv_use_html"
+ eval "$ac_cv_use_validators"
if test "$no_cache" != 1; then
- echo $ac_cv_use_html >> ${wx_arg_cache_file}.tmp
+ echo $ac_cv_use_validators >> ${wx_arg_cache_file}.tmp
fi
- if test "$wxUSE_HTML" = yes; then
+ if test "$wxUSE_VALIDATORS" = yes; then
echo "$ac_t""yes" 1>&6
else
echo "$ac_t""no" 1>&6
fi
- echo $ac_n "checking "for --enable-tooltips"""... $ac_c" 1>&6
-echo "configure:5695: checking "for --enable-tooltips"" >&5
+ echo $ac_n "checking for --enable-busyinfo""... $ac_c" 1>&6
+echo "configure:7325: checking for --enable-busyinfo" >&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-busyinfo or --disable-busyinfo was given.
+if test "${enable_busyinfo+set}" = set; then
+ enableval="$enable_busyinfo"
if test "$enableval" = yes; then
- ac_cv_use_tooltips='wxUSE_TOOLTIPS=yes'
+ ac_cv_use_busyinfo='wxUSE_BUSYINFO=yes'
else
- ac_cv_use_tooltips='wxUSE_TOOLTIPS=no'
+ ac_cv_use_busyinfo='wxUSE_BUSYINFO=no'
fi
else
- LINE=`grep "wxUSE_TOOLTIPS" ${wx_arg_cache_file}`
+ LINE=`grep "wxUSE_BUSYINFO" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
eval "DEFAULT_$LINE"
else
no_cache=1
fi
- ac_cv_use_tooltips='wxUSE_TOOLTIPS='$DEFAULT_wxUSE_TOOLTIPS
+ ac_cv_use_busyinfo='wxUSE_BUSYINFO='$DEFAULT_wxUSE_BUSYINFO
fi
- eval "$ac_cv_use_tooltips"
+ eval "$ac_cv_use_busyinfo"
if test "$no_cache" != 1; then
- echo $ac_cv_use_tooltips >> ${wx_arg_cache_file}.tmp
+ echo $ac_cv_use_busyinfo >> ${wx_arg_cache_file}.tmp
fi
- if test "$wxUSE_TOOLTIPS" = yes; then
+ if test "$wxUSE_BUSYINFO" = yes; then
echo "$ac_t""yes" 1>&6
else
echo "$ac_t""no" 1>&6
fi
- echo $ac_n "checking "for --enable-splines"""... $ac_c" 1>&6
-echo "configure:5734: checking "for --enable-splines"" >&5
+ echo $ac_n "checking for --enable-joystick""... $ac_c" 1>&6
+echo "configure:7364: checking for --enable-joystick" >&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-joystick or --disable-joystick was given.
+if test "${enable_joystick+set}" = set; then
+ enableval="$enable_joystick"
if test "$enableval" = yes; then
- ac_cv_use_splines='wxUSE_SPLINES=yes'
+ ac_cv_use_joystick='wxUSE_JOYSTICK=yes'
else
- ac_cv_use_splines='wxUSE_SPLINES=no'
+ ac_cv_use_joystick='wxUSE_JOYSTICK=no'
fi
else
- LINE=`grep "wxUSE_SPLINES" ${wx_arg_cache_file}`
+ LINE=`grep "wxUSE_JOYSTICK" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
eval "DEFAULT_$LINE"
else
no_cache=1
fi
- ac_cv_use_splines='wxUSE_SPLINES='$DEFAULT_wxUSE_SPLINES
+ ac_cv_use_joystick='wxUSE_JOYSTICK='$DEFAULT_wxUSE_JOYSTICK
fi
- eval "$ac_cv_use_splines"
+ eval "$ac_cv_use_joystick"
if test "$no_cache" != 1; then
- echo $ac_cv_use_splines >> ${wx_arg_cache_file}.tmp
+ echo $ac_cv_use_joystick >> ${wx_arg_cache_file}.tmp
fi
- if test "$wxUSE_SPLINES" = yes; then
+ 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-validators"""... $ac_c" 1>&6
-echo "configure:5773: checking "for --enable-validators"" >&5
+ echo $ac_n "checking for --enable-metafile""... $ac_c" 1>&6
+echo "configure:7403: checking for --enable-metafile" >&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-metafile or --disable-metafile was given.
+if test "${enable_metafile+set}" = set; then
+ enableval="$enable_metafile"
if test "$enableval" = yes; then
- ac_cv_use_validators='wxUSE_VALIDATORS=yes'
+ ac_cv_use_metafile='wxUSE_METAFILE=yes'
else
- ac_cv_use_validators='wxUSE_VALIDATORS=no'
+ ac_cv_use_metafile='wxUSE_METAFILE=no'
fi
else
- LINE=`grep "wxUSE_VALIDATORS" ${wx_arg_cache_file}`
+ 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_validators='wxUSE_VALIDATORS='$DEFAULT_wxUSE_VALIDATORS
+ ac_cv_use_metafile='wxUSE_METAFILE='$DEFAULT_wxUSE_METAFILE
fi
- eval "$ac_cv_use_validators"
+ eval "$ac_cv_use_metafile"
if test "$no_cache" != 1; then
- echo $ac_cv_use_validators >> ${wx_arg_cache_file}.tmp
+ echo $ac_cv_use_metafile >> ${wx_arg_cache_file}.tmp
fi
- if test "$wxUSE_VALIDATORS" = yes; then
+ 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-busyinfo"""... $ac_c" 1>&6
-echo "configure:5812: checking "for --enable-busyinfo"" >&5
+ echo $ac_n "checking for --enable-dragimage""... $ac_c" 1>&6
+echo "configure:7442: checking for --enable-dragimage" >&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-dragimage or --disable-dragimage was given.
+if test "${enable_dragimage+set}" = set; then
+ enableval="$enable_dragimage"
if test "$enableval" = yes; then
- ac_cv_use_busyinfo='wxUSE_BUSYINFO=yes'
+ ac_cv_use_dragimage='wxUSE_DRAGIMAGE=yes'
else
- ac_cv_use_busyinfo='wxUSE_BUSYINFO=no'
+ ac_cv_use_dragimage='wxUSE_DRAGIMAGE=no'
fi
else
- LINE=`grep "wxUSE_BUSYINFO" ${wx_arg_cache_file}`
+ 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_busyinfo='wxUSE_BUSYINFO='$DEFAULT_wxUSE_BUSYINFO
+ ac_cv_use_dragimage='wxUSE_DRAGIMAGE='$DEFAULT_wxUSE_DRAGIMAGE
fi
- eval "$ac_cv_use_busyinfo"
+ eval "$ac_cv_use_dragimage"
if test "$no_cache" != 1; then
- echo $ac_cv_use_busyinfo >> ${wx_arg_cache_file}.tmp
+ echo $ac_cv_use_dragimage >> ${wx_arg_cache_file}.tmp
fi
- if test "$wxUSE_BUSYINFO" = yes; then
+ 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-joystick"""... $ac_c" 1>&6
-echo "configure:5851: checking "for --enable-joystick"" >&5
+
+
+ echo $ac_n "checking for --enable-image""... $ac_c" 1>&6
+echo "configure:7483: checking for --enable-image" >&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-image or --disable-image was given.
+if test "${enable_image+set}" = set; then
+ enableval="$enable_image"
if test "$enableval" = yes; then
- ac_cv_use_joystick='wxUSE_JOYSTICK=yes'
+ ac_cv_use_image='wxUSE_IMAGE=yes'
else
- ac_cv_use_joystick='wxUSE_JOYSTICK=no'
+ ac_cv_use_image='wxUSE_IMAGE=no'
fi
else
- LINE=`grep "wxUSE_JOYSTICK" ${wx_arg_cache_file}`
+ 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_joystick='wxUSE_JOYSTICK='$DEFAULT_wxUSE_JOYSTICK
+ ac_cv_use_image='wxUSE_IMAGE='$DEFAULT_wxUSE_IMAGE
fi
- eval "$ac_cv_use_joystick"
+ eval "$ac_cv_use_image"
if test "$no_cache" != 1; then
- echo $ac_cv_use_joystick >> ${wx_arg_cache_file}.tmp
+ echo $ac_cv_use_image >> ${wx_arg_cache_file}.tmp
fi
- if test "$wxUSE_JOYSTICK" = yes; then
+ 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:5892: checking "for --enable-gif"" >&5
+ echo $ac_n "checking for --enable-gif""... $ac_c" 1>&6
+echo "configure:7522: checking for --enable-gif" >&5
no_cache=0
# Check whether --enable-gif or --disable-gif was given.
if test "${enable_gif+set}" = set; then
fi
- echo $ac_n "checking "for --enable-pcx"""... $ac_c" 1>&6
-echo "configure:5931: checking "for --enable-pcx"" >&5
+ echo $ac_n "checking for --enable-pcx""... $ac_c" 1>&6
+echo "configure:7561: checking for --enable-pcx" >&5
no_cache=0
# Check whether --enable-pcx or --disable-pcx was given.
if test "${enable_pcx+set}" = set; then
fi
- echo $ac_n "checking "for --enable-pnm"""... $ac_c" 1>&6
-echo "configure:5970: checking "for --enable-pnm"" >&5
+ echo $ac_n "checking for --enable-pnm""... $ac_c" 1>&6
+echo "configure:7600: checking for --enable-pnm" >&5
no_cache=0
# Check whether --enable-pnm or --disable-pnm was given.
if test "${enable_pnm+set}" = set; then
fi
+ echo $ac_n "checking for --enable-pnm""... $ac_c" 1>&6
+echo "configure:7639: 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 $ac_n "checking for toolkit""... $ac_c" 1>&6
-echo "configure:6017: checking for toolkit" >&5
+echo "configure:7686: checking for toolkit" >&5
if test "$wxUSE_GUI" = "yes"; then
done
fi
-NUM_TOOLKITS=`expr ${wxUSE_GTK:-0} + ${wxUSE_MOTIF:-0} + ${wxUSE_MAC:-0} + ${wxUSE_WINE:-0} + ${wxUSE_MINGW:-0} + ${wxUSE_CYGWIN:-0}`
+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 )
echo "$var=$value" >> ${wx_arg_cache_file}
fi
if test "$value" = 1; then
- echo "$ac_t""`echo $toolkit | tr A-Z a-z`" 1>&6
+ toolkit_echo=`echo $toolkit | tr [A-Z] [a-z]`
+ echo "$ac_t""$toolkit_echo" 1>&6
fi
fi
done
# 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:6150: checking for $ac_word" >&5
+echo "configure:7820: 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
# 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:6180: checking for $ac_word" >&5
+echo "configure:7850: 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
# 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:6231: checking for $ac_word" >&5
+echo "configure:7901: 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
fi
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:6263: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:7933: 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.
cat > conftest.$ac_ext << EOF
-#line 6274 "configure"
+#line 7944 "configure"
#include "confdefs.h"
main(){return(0);}
EOF
-if { (eval echo configure:6279: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7949: \"$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
{ 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:6305: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:7975: 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:6310: checking whether we are using GNU C" >&5
+echo "configure:7980: 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
yes;
#endif
EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:6319: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:7989: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
ac_cv_prog_gcc=yes
else
ac_cv_prog_gcc=no
ac_save_CFLAGS="$CFLAGS"
CFLAGS=
echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:6338: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:8008: 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
CFLAGS=`echo "$CFLAGS" | sed 's/-g//g'`
echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:6373: checking how to run the C preprocessor" >&5
+echo "configure:8043: checking how to run the C preprocessor" >&5
# On Suns, sometimes $CPP names a directory.
if test -n "$CPP" && test -d "$CPP"; then
CPP=
# On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp.
cat > conftest.$ac_ext <<EOF
-#line 6388 "configure"
+#line 8058 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6394: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8064: \"$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*
CPP="${CC-cc} -E -traditional-cpp"
cat > conftest.$ac_ext <<EOF
-#line 6405 "configure"
+#line 8075 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6411: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8081: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
:
rm -rf conftest*
CPP="${CC-cc} -nologo -E"
cat > conftest.$ac_ext <<EOF
-#line 6422 "configure"
+#line 8092 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6428: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8098: \"$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
:
if test $ac_cv_prog_gcc = yes; then
echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6
-echo "configure:6455: checking whether ${CC-cc} needs -traditional" >&5
+echo "configure:8125: 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 <<EOF
-#line 6461 "configure"
+#line 8131 "configure"
#include "confdefs.h"
#include <sgtty.h>
Autoconf TIOCGETP
if test $ac_cv_prog_gcc_traditional = no; then
cat > conftest.$ac_ext <<EOF
-#line 6479 "configure"
+#line 8149 "configure"
#include "confdefs.h"
#include <termio.h>
Autoconf TCGETA
# 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:6515: checking for $ac_word" >&5
+echo "configure:8185: 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
echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:6547: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
+echo "configure:8217: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
ac_ext=C
# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
cat > conftest.$ac_ext << EOF
-#line 6558 "configure"
+#line 8228 "configure"
#include "confdefs.h"
int main(){return(0);}
EOF
-if { (eval echo configure:6563: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8233: \"$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
{ 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:6589: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:8259: 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:6594: checking whether we are using GNU C++" >&5
+echo "configure:8264: 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
yes;
#endif
EOF
-if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:6603: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:8273: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
ac_cv_prog_gxx=yes
else
ac_cv_prog_gxx=no
ac_save_CXXFLAGS="$CXXFLAGS"
CXXFLAGS=
echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6
-echo "configure:6622: checking whether ${CXX-g++} accepts -g" >&5
+echo "configure:8292: 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 $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6
-echo "configure:6655: checking how to run the C++ preprocessor" >&5
+echo "configure:8325: 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
cross_compiling=$ac_cv_prog_cxx_cross
CXXCPP="${CXX-g++} -E"
cat > conftest.$ac_ext <<EOF
-#line 6668 "configure"
+#line 8338 "configure"
#include "confdefs.h"
#include <stdlib.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6673: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8343: \"$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
:
# 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:6711: checking for $ac_word" >&5
+echo "configure:8381: 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
# 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:6742: checking for $ac_word" >&5
+echo "configure:8412: 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
# 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:6782: checking for a BSD compatible install" >&5
+echo "configure:8452: 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
# 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:6838: checking for $ac_word" >&5
+echo "configure:8508: 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
fi
-echo $ac_n "checking "make for VPATH support"""... $ac_c" 1>&6
-echo "configure:6867: checking "make for VPATH support"" >&5
+echo $ac_n "checking make for VPATH support""... $ac_c" 1>&6
+echo "configure:8537: checking make for VPATH support" >&5
cat - << EOF > confMake
check : file
cp \$? \$@
echo "$ac_t""yes" 1>&6
else
echo "$ac_t""no" 1>&6
- { echo "configure: error: You need a make-utility that is able to use the variable
+ { 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" 1>&2; exit 1; }
+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
for ac_prog in 'bison -y' byacc
# 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:6896: checking for $ac_word" >&5
+echo "configure:8574: 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
# 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:6930: checking for $ac_word" >&5
+echo "configure:8608: 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_lib=l ;;
esac
echo $ac_n "checking for yywrap in -l$ac_lib""... $ac_c" 1>&6
-echo "configure:6964: checking for yywrap in -l$ac_lib" >&5
+echo "configure:8642: 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
ac_save_LIBS="$LIBS"
LIBS="-l$ac_lib $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 6972 "configure"
+#line 8650 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
yywrap()
; return 0; }
EOF
-if { (eval echo configure:6983: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8661: \"$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 $ac_n "checking whether ln -s works""... $ac_c" 1>&6
-echo "configure:7007: checking whether ln -s works" >&5
+echo "configure:8685: 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
-AFMINSTALL=
+REGEX_INCLUDE=
+if test "$wxUSE_REGEX" != "no"; then
+ ac_safe=`echo "regex.h" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for regex.h""... $ac_c" 1>&6
+echo "configure:8830: 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
+ cat > conftest.$ac_ext <<EOF
+#line 8835 "configure"
+#include "confdefs.h"
+#include <regex.h>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:8840: \"$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
+ for ac_func in regcomp
+do
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:8859: 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 <<EOF
+#line 8864 "configure"
+#include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char $ac_func(); below. */
+#include <assert.h>
+/* 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_GUI" = "yes"; then
+int main() {
-USE_GUI=1
+/* 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
-TOOLKIT=
-TOOLKIT_INCLUDE=
+; return 0; }
+EOF
+if { (eval echo configure:8887: \"$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
-GUIOBJS=
-COMMONOBJS=
-GENERICOBJS=
+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 <<EOF
+#define $ac_tr_func 1
+EOF
+
+else
+ echo "$ac_t""no" 1>&6
+fi
+done
-GUI_TK_LIBRARY=
-GUI_TK_LINK=
+else
+ echo "$ac_t""no" 1>&6
+fi
-WXGTK12=
-WXGTK127=
-WXGTK20=
-WXWINE=
+ 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 the built-in regex library." 1>&2; exit 1; }
+ fi
-if test "$wxUSE_CYGWIN" = 1 || test "$wxUSE_MINGW" = 1 ; then
- if test "$cross_compiling" = "yes" ; then
- echo "configure: warning: skipping windows.h check for cross-compilation" 1>&2
- else
- echo $ac_n "checking for Windows headers""... $ac_c" 1>&6
-echo "configure:7175: checking for Windows headers" >&5
-
-ac_find_includes=
-for ac_dir in $SEARCH_INCLUDE;
- do
- if test -f "$ac_dir/windows.h"; then
- ac_find_includes=$ac_dir
- break
+ REGEX_INCLUDE="-I\${top_srcdir}/src/regex"
fi
- done
- if test "$ac_find_includes" != "" ; then
- echo "$ac_t""found $ac_find_includes" 1>&6
- TOOLKIT_INCLUDE="$TOOLKIT_INCLUDE -I$ac_find_includes"
- else
- echo "$ac_t""no" 1>&6
- { echo "configure: error: please set CFLAGS to contain the location of windows.h" 1>&2; exit 1; }
- fi
- fi
+ cat >> confdefs.h <<\EOF
+#define wxUSE_REGEX 1
+EOF
- INCLUDE_SUBDIRS="$INCLUDE_SUBDIRS msw"
- LIBS="$LIBS -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lctl3d32 -lcrtdll -ladvapi32 -lwsock32"
+fi
- if test "$wxUSE_ODBC" = "yes" ; then
- LIBS="$LIBS -lodbc32 -lole32 -loleaut32"
- fi
- if test "$wxUSE_MINGW" = 1; then
- LDFLAGS="$LDFLAGS -mwindows"
- fi
+AFMINSTALL=
+
+if test "$wxUSE_GUI" = "yes"; then
+ USE_GUI=1
- TOOLKIT=MSW
+ TOOLKIT=
+ TOOLKIT_INCLUDE=
- GUIOBJS="\$(MSW_GUIOBJS)"
- GUIHEADERS="\$(MSW_HEADERS)"
- COMMONOBJS="\$(MSW_COMMONOBJS)"
- GENERICOBJS="\$(MSW_GENERICOBJS)"
- UNIXOBJS=
- GUIDIST=MSW_DIST
+ GUI_TK_LIBRARY=
+ GUI_TK_LINK=
- 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__"
+ WXGTK12=
+ WXGTK127=
+ WXGTK20=
- RESPROGRAM="\$(RES_PROGRAM)"
+ WXWINE=
+
+ if test "$wxUSE_CYGWIN" = 1 || test "$wxUSE_MINGW" = 1 ; then
+ ac_safe=`echo "windows.h" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for windows.h""... $ac_c" 1>&6
+echo "configure:8951: 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
+#line 8956 "configure"
+#include "confdefs.h"
+#include <windows.h>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:8961: \"$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
-if test "$wxUSE_GTK" = 1; then
- # Check whether --with-gtk-prefix or --without-gtk-prefix was given.
+
+ INCLUDE_SUBDIRS="$INCLUDE_SUBDIRS msw"
+
+ LIBS="$LIBS -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lctl3d32 -ladvapi32 -lwsock32"
+
+ if test "$wxUSE_ODBC" = "yes" ; then
+ LIBS="$LIBS -lodbc32 -lole32 -loleaut32"
+ fi
+
+ if test "$wxUSE_MINGW" = 1; then
+ LDFLAGS="$LDFLAGS -mwindows"
+ fi
+
+ TOOLKIT=MSW
+ GUIDIST=MSW_DIST
+
+ 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__"
+
+ RESPROGRAM="\$(RES_PROGRAM)"
+ fi
+
+ if test "$wxUSE_GTK" = 1; then
+ echo $ac_n "checking for GTK+ version""... $ac_c" 1>&6
+echo "configure:9013: 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
+
+ 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"
fi
- for module in . gthread
+ for module in .
do
case "$module" in
- gthread)
+ gthread)
gtk_config_args="$gtk_config_args gthread"
;;
esac
# 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 $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:7277: checking for $ac_word" >&5
+echo "configure:9075: 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
min_gtk_version=1.3.1
echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6
-echo "configure:7312: checking for GTK - version >= $min_gtk_version" >&5
+echo "configure:9110: checking for GTK - version >= $min_gtk_version" >&5
no_gtk=""
if test "$GTK_CONFIG_2_0" = "no" ; then
no_gtk=yes
echo $ac_n "cross compiling; assumed OK... $ac_c"
else
cat > conftest.$ac_ext <<EOF
-#line 7335 "configure"
+#line 9133 "configure"
#include "confdefs.h"
#include <gtk/gtk.h>
#include <stdio.h>
#include <stdlib.h>
-int
+int
main ()
{
int major, minor, micro;
(gtk_minor_version != $gtk_config_minor_version) ||
(gtk_micro_version != $gtk_config_micro_version))
{
- printf("\n*** 'gtk-config-2.0 --version' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n",
+ printf("\n*** 'gtk-config-2.0 --version' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n",
$gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version,
gtk_major_version, gtk_minor_version, gtk_micro_version);
printf ("*** was found! If gtk-config-2.0 was correct, then it is best\n");
printf("*** If gtk-config-2.0 was wrong, set the environment variable GTK_CONFIG_2_0\n");
printf("*** to point to the correct copy of gtk-config-2.0, and remove the file config.cache\n");
printf("*** before re-running configure\n");
- }
+ }
#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
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");
}
EOF
-if { (eval echo configure:7413: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:9211: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
:
else
fi
if test "x$no_gtk" = x ; then
echo "$ac_t""yes (version $gtk_config_major_version.$gtk_config_minor_version.$gtk_config_micro_version)" 1>&6
- WXGTK20=1
+ wx_cv_lib_gtk=2.0
else
echo "$ac_t""no" 1>&6
if test "$GTK_CONFIG_2_0" = "no" ; then
CFLAGS="$CFLAGS $GTK_CFLAGS"
LIBS="$LIBS $GTK_LIBS"
cat > conftest.$ac_ext <<EOF
-#line 7447 "configure"
+#line 9245 "configure"
#include "confdefs.h"
#include <gtk/gtk.h>
return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version));
; return 0; }
EOF
-if { (eval echo configure:7457: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9255: \"$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 "*** 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 "***"
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
# Extract the first word of "gtk-config", so it can be a program name with args.
set dummy gtk-config; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:7507: checking for $ac_word" >&5
+echo "configure:9313: 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
min_gtk_version=1.2.7
echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6
-echo "configure:7542: checking for GTK - version >= $min_gtk_version" >&5
+echo "configure:9348: checking for GTK - version >= $min_gtk_version" >&5
no_gtk=""
if test "$GTK_CONFIG" != "no" ; then
GTK_CFLAGS=`$GTK_CONFIG --cflags`
echo $ac_n "cross compiling; assumed OK... $ac_c"
else
cat > conftest.$ac_ext <<EOF
-#line 7555 "configure"
+#line 9361 "configure"
#include "confdefs.h"
#include <gtk/gtk.h>
}
EOF
-if { (eval echo configure:7588: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:9394: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
:
else
fi
if test "x$no_gtk" = x ; then
echo "$ac_t""yes" 1>&6
- WXGTK127=1
+ wx_cv_lib_gtk=1.2.7
else
echo "$ac_t""no" 1>&6
GTK_CFLAGS=""
-
+ 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
# Extract the first word of "gtk-config", so it can be a program name with args.
set dummy gtk-config; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:7634: checking for $ac_word" >&5
+echo "configure:9443: 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
min_gtk_version=1.2.3
echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6
-echo "configure:7669: checking for GTK - version >= $min_gtk_version" >&5
+echo "configure:9478: checking for GTK - version >= $min_gtk_version" >&5
no_gtk=""
if test "$GTK_CONFIG" != "no" ; then
GTK_CFLAGS=`$GTK_CONFIG --cflags`
echo $ac_n "cross compiling; assumed OK... $ac_c"
else
cat > conftest.$ac_ext <<EOF
-#line 7682 "configure"
+#line 9491 "configure"
#include "confdefs.h"
#include <gtk/gtk.h>
}
EOF
-if { (eval echo configure:7715: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:9524: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
:
else
fi
if test "x$no_gtk" = x ; then
echo "$ac_t""yes" 1>&6
- WXGTK12=1
+ wx_cv_lib_gtk=1.2.3
else
echo "$ac_t""no" 1>&6
GTK_CFLAGS=""
-
- fi
-
-
- rm -f conf.gtktest
-
+ fi
- if test "$WXGTK12" != 1 -a "$WXGTK20" != 1; then
- { 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; }
- fi
-
- TOOLKIT_INCLUDE="$GTK_CFLAGS"
+ 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
- GUI_TK_LIBRARY="$GTK_LIBS"
+ if test "$gtk_version_cached" = 1; then
+ echo "$ac_t""$wx_cv_lib_gtk" 1>&6
+ fi
- TOOLKIT=GTK
+ 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
- AFMINSTALL=afminstall
+ TOOLKIT_INCLUDE="$wx_cv_cflags_gtk"
+ GUI_TK_LIBRARY="$wx_cv_libs_gtk"
- GUIOBJS="\$(GTK_GUIOBJS)"
- GUIHEADERS="\$(GTK_HEADERS)"
- COMMONOBJS="\$(GTK_COMMONOBJS)"
- GENERICOBJS="\$(GTK_GENERICOBJS)"
- GUIDEPS="\$(GTK_GUIDEPS)"
- COMMONDEPS="\$(GTK_COMMONDEPS)"
- GENERICDEPS="\$(GTK_GENERICDEPS)"
- UNIXOBJS="\$(UNIX_OBJS)"
- UNIXDEPS="\$(UNIX_DEPS)"
- GUIDIST=GTK_DIST
+ AFMINSTALL=afminstall
+ TOOLKIT=GTK
+ GUIDIST=GTK_DIST
- echo $ac_n "checking for gdk_im_open in -lgdk""... $ac_c" 1>&6
-echo "configure:7781: checking for gdk_im_open in -lgdk" >&5
+ echo $ac_n "checking for gdk_im_open in -lgdk""... $ac_c" 1>&6
+echo "configure:9595: 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
ac_save_LIBS="$LIBS"
LIBS="-lgdk $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 7789 "configure"
+#line 9603 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
gdk_im_open()
; return 0; }
EOF
-if { (eval echo configure:7800: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9614: \"$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 "$ac_t""no" 1>&6
fi
-fi
+ fi
-if test "$wxUSE_WINE" = 1; then
- echo $ac_n "checking for WINE includes""... $ac_c" 1>&6
-echo "configure:7827: checking for WINE includes" >&5
-
+ if test "$wxUSE_MGL" = 1; then
+
+ echo $ac_n "checking for SciTech MGL library""... $ac_c" 1>&6
+echo "configure:9642: 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
+
+ if test "$wxUSE_WINE" = 1; then
+ echo $ac_n "checking for WINE includes""... $ac_c" 1>&6
+echo "configure:9676: checking for WINE includes" >&5
+
ac_find_includes=
for ac_dir in $SEARCH_INCLUDE;
do
fi
done
- if test "$ac_find_includes" != "" ; then
- echo "$ac_t""found $ac_find_includes" 1>&6
- TOOLKIT_INCLUDE="$TOOLKIT_INCLUDE -I$ac_find_includes"
- else
- echo "$ac_t""no" 1>&6
- { echo "configure: error: please set CFLAGS to contain the location of windows.h" 1>&2; exit 1; }
- fi
+ if test "$ac_find_includes" != "" ; then
+ echo "$ac_t""found $ac_find_includes" 1>&6
+ TOOLKIT_INCLUDE="$TOOLKIT_INCLUDE -I$ac_find_includes"
+ else
+ echo "$ac_t""no" 1>&6
+ { echo "configure: error: please set CFLAGS to contain the location of windows.h" 1>&2; exit 1; }
+ fi
- XPM_LINK=""
- echo $ac_n "checking for Xpm library""... $ac_c" 1>&6
-echo "configure:7848: checking for Xpm library" >&5
-
+ XPM_LINK=""
+ echo $ac_n "checking for Xpm library""... $ac_c" 1>&6
+echo "configure:9697: 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
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 "$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
+ 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:7876: checking for Mesa library" >&5
-
+ MESA_LINK=""
+ echo $ac_n "checking for Mesa library""... $ac_c" 1>&6
+echo "configure:9725: 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
done
done
- 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
-
- GUIHEADERS="\$(MSW_HEADERS)"
- GUIOBJS="\$(MSW_GUIOBJS)"
- COMMONOBJS="\$(MSW_COMMONOBJS)"
- GENERICOBJS="\$(MSW_GENERICOBJS)"
- GUIDEPS="\$(MSW_GUIDEPS)"
- COMMONDEPS="\$(MSW_COMMONDEPS)"
- GENERICDEPS="\$(MSW_GENERICDEPS)"
- UNIXOBJS="\$(UNIX_OBJS)"
- UNIXDEPS="\$(UNIX_DEPS)"
- GUIDIST=MSW_DIST
-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
-# If we find X, set shell vars x_includes and x_libraries to the
+
+ # 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:7920: checking for X" >&5
+echo "configure:9759: checking for X" >&5
# Check whether --with-x or --without-x was given.
if test "${with_x+set}" = set; then
# First, try using that file with no special directory specified.
cat > conftest.$ac_ext <<EOF
-#line 7982 "configure"
+#line 9821 "configure"
#include "confdefs.h"
#include <$x_direct_test_include>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7987: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9826: \"$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_save_LIBS="$LIBS"
LIBS="-l$x_direct_test_library $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 8056 "configure"
+#line 9895 "configure"
#include "confdefs.h"
int main() {
${x_direct_test_function}()
; return 0; }
EOF
-if { (eval echo configure:8063: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9902: \"$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.
case "`(uname -sr) 2>/dev/null`" in
"SunOS 5"*)
echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6
-echo "configure:8169: checking whether -R must be followed by a space" >&5
+echo "configure:10008: checking whether -R must be followed by a space" >&5
ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries"
cat > conftest.$ac_ext <<EOF
-#line 8172 "configure"
+#line 10011 "configure"
#include "confdefs.h"
int main() {
; return 0; }
EOF
-if { (eval echo configure:8179: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10018: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ac_R_nospace=yes
else
else
LIBS="$ac_xsave_LIBS -R $x_libraries"
cat > conftest.$ac_ext <<EOF
-#line 8195 "configure"
+#line 10034 "configure"
#include "confdefs.h"
int main() {
; return 0; }
EOF
-if { (eval echo configure:8202: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10041: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ac_R_space=yes
else
# libraries were built with DECnet support. And karl@cs.umb.edu says
# the Alpha needs dnet_stub (dnet does not exist).
echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6
-echo "configure:8234: checking for dnet_ntoa in -ldnet" >&5
+echo "configure:10073: 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
ac_save_LIBS="$LIBS"
LIBS="-ldnet $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 8242 "configure"
+#line 10081 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
dnet_ntoa()
; return 0; }
EOF
-if { (eval echo configure:8253: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10092: \"$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
if test $ac_cv_lib_dnet_dnet_ntoa = no; then
echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6
-echo "configure:8275: checking for dnet_ntoa in -ldnet_stub" >&5
+echo "configure:10114: 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
ac_save_LIBS="$LIBS"
LIBS="-ldnet_stub $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 8283 "configure"
+#line 10122 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
dnet_ntoa()
; return 0; }
EOF
-if { (eval echo configure:8294: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10133: \"$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
# The nsl library prevents programs from opening the X display
# on Irix 5.2, according to dickey@clark.net.
echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6
-echo "configure:8323: checking for gethostbyname" >&5
+echo "configure:10162: 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 <<EOF
-#line 8328 "configure"
+#line 10167 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char gethostbyname(); below. */
; return 0; }
EOF
-if { (eval echo configure:8351: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10190: \"$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
if test $ac_cv_func_gethostbyname = no; then
echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
-echo "configure:8372: checking for gethostbyname in -lnsl" >&5
+echo "configure:10211: 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
ac_save_LIBS="$LIBS"
LIBS="-lnsl $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 8380 "configure"
+#line 10219 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
gethostbyname()
; return 0; }
EOF
-if { (eval echo configure:8391: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10230: \"$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
# -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:8421: checking for connect" >&5
+echo "configure:10260: 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 <<EOF
-#line 8426 "configure"
+#line 10265 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char connect(); below. */
; return 0; }
EOF
-if { (eval echo configure:8449: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10288: \"$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
if test $ac_cv_func_connect = no; then
echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6
-echo "configure:8470: checking for connect in -lsocket" >&5
+echo "configure:10309: 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
ac_save_LIBS="$LIBS"
LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 8478 "configure"
+#line 10317 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
connect()
; return 0; }
EOF
-if { (eval echo configure:8489: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10328: \"$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
# gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX.
echo $ac_n "checking for remove""... $ac_c" 1>&6
-echo "configure:8513: checking for remove" >&5
+echo "configure:10352: 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 <<EOF
-#line 8518 "configure"
+#line 10357 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char remove(); below. */
; return 0; }
EOF
-if { (eval echo configure:8541: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10380: \"$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
if test $ac_cv_func_remove = no; then
echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6
-echo "configure:8562: checking for remove in -lposix" >&5
+echo "configure:10401: 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
ac_save_LIBS="$LIBS"
LIBS="-lposix $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 8570 "configure"
+#line 10409 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
remove()
; return 0; }
EOF
-if { (eval echo configure:8581: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10420: \"$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
# BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
echo $ac_n "checking for shmat""... $ac_c" 1>&6
-echo "configure:8605: checking for shmat" >&5
+echo "configure:10444: 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 <<EOF
-#line 8610 "configure"
+#line 10449 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char shmat(); below. */
; return 0; }
EOF
-if { (eval echo configure:8633: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10472: \"$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
if test $ac_cv_func_shmat = no; then
echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6
-echo "configure:8654: checking for shmat in -lipc" >&5
+echo "configure:10493: 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
ac_save_LIBS="$LIBS"
LIBS="-lipc $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 8662 "configure"
+#line 10501 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
shmat()
; return 0; }
EOF
-if { (eval echo configure:8673: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10512: \"$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
# libraries we check for below, so use a different variable.
# --interran@uluru.Stanford.EDU, kb@cs.umb.edu.
echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6
-echo "configure:8706: checking for IceConnectionNumber in -lICE" >&5
+echo "configure:10545: 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
ac_save_LIBS="$LIBS"
LIBS="-lICE $X_EXTRA_LIBS $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 8714 "configure"
+#line 10553 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
IceConnectionNumber()
; return 0; }
EOF
-if { (eval echo configure:8725: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10564: \"$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
fi
-CPPFLAGS="$CPPFLAGS $X_CFLAGS"
-LDFLAGS="$LDFLAGS $X_LIBS"
+ CPPFLAGS="$CPPFLAGS $X_CFLAGS"
+ LDFLAGS="$LDFLAGS $X_LIBS"
-if test "$wxUSE_MOTIF" = 1; then
- if test "$no_x" = "yes"; then
- { echo "configure: error: X11 not found" 1>&2; exit 1; }
- fi
+ if test "$wxUSE_MOTIF" = 1; then
+ if test "$no_x" = "yes"; then
+ { echo "configure: error: X11 not found" 1>&2; exit 1; }
+ fi
- GUI_TK_LIBRARY="$X_LIBS"
- TOOLKIT_INCLUDE="$X_CFLAGS"
+ GUI_TK_LIBRARY="$X_LIBS"
+ TOOLKIT_INCLUDE="$X_CFLAGS"
- AFMINSTALL=afminstall
+ AFMINSTALL=afminstall
-
- COMPILED_X_PROGRAM=0
+
+ COMPILED_X_PROGRAM=0
- echo $ac_n "checking for Motif/Lesstif headers""... $ac_c" 1>&6
-echo "configure:8766: checking for Motif/Lesstif headers" >&5
-
+ echo $ac_n "checking for Motif/Lesstif headers""... $ac_c" 1>&6
+echo "configure:10605: checking for Motif/Lesstif headers" >&5
+
ac_find_includes=
for ac_dir in $SEARCH_INCLUDE;
do
fi
done
- if test "$ac_find_includes" != "" ; then
- echo "$ac_t""found $ac_find_includes" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
-#line 8781 "configure"
+ if test "$ac_find_includes" != "" ; then
+ echo "$ac_t""found $ac_find_includes" 1>&6
+ else
+ cat > conftest.$ac_ext <<EOF
+#line 10620 "configure"
#include "confdefs.h"
- #include <Xm/Xm.h>
-
+ #include <Xm/Xm.h>
+
int main() {
- int version;
+ int version;
- version = xmUseVersion;
-
+ version = xmUseVersion;
+
; return 0; }
EOF
-if { (eval echo configure:8794: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:10633: \"$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
-
+ 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; }
+ 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
+ fi
- if test "$COMPILED_X_PROGRAM" = 0; then
- echo $ac_n "checking for Motif/Lesstif library""... $ac_c" 1>&6
-echo "configure:8815: checking for Motif/Lesstif library" >&5
-
+ if test "$COMPILED_X_PROGRAM" = 0; then
+ echo $ac_n "checking for Motif/Lesstif library""... $ac_c" 1>&6
+echo "configure:10654: 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
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=$?
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
fi
- 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 <<EOF
-#line 8854 "configure"
+ 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 <<EOF
+#line 10693 "configure"
#include "confdefs.h"
- #include <Xm/Xm.h>
-
+ #include <Xm/Xm.h>
+
int main() {
- int version;
+ int version;
- version = xmUseVersion;
-
+ version = xmUseVersion;
+
; return 0; }
EOF
-if { (eval echo configure:8867: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:10706: \"$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
-
+ 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 LDFLAGS to contain the location of libXm" 1>&2; exit 1; }
+ 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*
+ fi
fi
- fi
-
- XPM_LINK=""
- echo $ac_n "checking for Xpm library""... $ac_c" 1>&6
-echo "configure:8890: checking for Xpm library" >&5
-
+
+ XPM_LINK=""
+ echo $ac_n "checking for Xpm library""... $ac_c" 1>&6
+echo "configure:10729: 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
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
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 "$ac_t""found at $ac_find_libraries" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
-#line 8922 "configure"
+ echo "$ac_t""found at $ac_find_libraries" 1>&6
+ else
+ cat > conftest.$ac_ext <<EOF
+#line 10761 "configure"
#include "confdefs.h"
- #include <X11/xpm.h>
-
+ #include <X11/xpm.h>
+
int main() {
- int version;
+ int version;
- version = XpmLibraryVersion();
-
+ version = XpmLibraryVersion();
+
; return 0; }
EOF
-if { (eval echo configure:8935: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:10774: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
- XPM_LINK="-lXpm "
- cat >> confdefs.h <<\EOF
+ XPM_LINK="-lXpm "
+ cat >> confdefs.h <<\EOF
#define wxHAVE_LIB_XPM 1
EOF
- echo "$ac_t""found in default search path" 1>&6
- COMPILED_X_PROGRAM=0
-
+ echo "$ac_t""found in default search path" 1>&6
+ COMPILED_X_PROGRAM=0
+
else
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
+ 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*
+ 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
- GUI_TK_LINK="-lXm $XPM_LINK -lXmu -lXext -lXt -lX11"
- GUI_TK_LIBRARY="$GUI_TK_LIBRARY $GUI_TK_LINK"
- TOOLKIT=MOTIF
+ if test "$wxUSE_MAC" = 1; then
+ TOOLKIT=MAC
+ GUIDIST=MACX_DIST
+ fi
- GUIHEADERS="\$(MOTIF_HEADERS)"
- GUIOBJS="\$(MOTIF_GUIOBJS)"
- COMMONOBJS="\$(MOTIF_COMMONOBJS)"
- GENERICOBJS="\$(MOTIF_GENERICOBJS)"
- GUIDEPS="\$(MOTIF_GUIDEPS)"
- COMMONDEPS="\$(MOTIF_COMMONDEPS)"
- GENERICDEPS="\$(MOTIF_GENERICDEPS)"
- UNIXOBJS="\$(UNIX_OBJS)"
- UNIXDEPS="\$(UNIX_DEPS)"
- GUIDIST=MOTIF_DIST
-fi
+ if test "$wxUSE_PM" = 1; then
+ TOOLKIT=PM
+ GUIDIST=GTK_DIST
+ fi
-if test "$wxUSE_MAC" = 1; then
- TOOLKIT=MAC
- UNIXOBJS="\$(UNIX_OBJS)"
- UNIXDEPS="\$(UNIX_DEPS)"
- GUIDIST=MAC_DIST
-fi
+ if test "$TOOLKIT" != "PM" ; then
+ TOOLKIT_DIR=`echo ${TOOLKIT} | tr "[A-Z]" "[a-z]"`
+ else
+ TOOLKIT_DIR="os2"
+ fi
-if test "$wxUSE_PM" = 1; then
- TOOLKIT=PM
+ TOOLKIT_NAME="${TOOLKIT_DIR}"
- GUIOBJS="\$(PM_GUIOBJS)"
- GUIHEADERS="\$(PM_HEADERS)"
- COMMONOBJS="\$(PM_COMMONOBJS)"
- GENERICOBJS="\$(PM_GENERICOBJS)"
- GUIDEPS="\$(PM_GUIDEPS)"
- COMMONDEPS="\$(PM_COMMONDEPS)"
- GENERICDEPS="\$(PM_GENERICDEPS)"
- UNIXOBJS=
- UNIXDEPS=
- GUIDIST=GTK_DIST
-fi
+ TOOLKIT_VPATH="\${top_srcdir}/src/${TOOLKIT_DIR}"
-if test "$TOOLKIT" != "PM" ; then
- TOOLKIT_DIR=`echo ${TOOLKIT} | tr "[A-Z]" "[a-z]"`
-else
- TOOLKIT_DIR="os2"
-fi
+ if test "$TOOLKIT_NAME" = "motif"; then
+ TOOLKIT_VPATH="${TOOLKIT_VPATH}${PATH_IFS}\${top_srcdir}/src/motif/xmcombo"
+ fi
- if test "$wxUSE_DEBUG_FLAG" = "yes"; then
- TOOLKIT_NAME="${TOOLKIT_DIR}d"
+ if test "$wxUSE_UNIVERSAL" = "yes"; then
+ TOOLKIT_NAME="${TOOLKIT_NAME}univ"
+ UNIV_VPATH="\${top_srcdir}/src/univ${PATH_IFS}\${top_srcdir}/src/univ/themes"
+ TOOLKIT_VPATH="${UNIV_VPATH}${PATH_IFS}${TOOLKIT_VPATH}"
+ SETUPH_DIR="univ"
else
- TOOLKIT_NAME="${TOOLKIT_DIR}"
+ SETUPH_DIR="${TOOLKIT_DIR}"
+ fi
+
+ if test "$wxUSE_DEBUG_FLAG" = "yes"; then
+ TOOLKIT_NAME="${TOOLKIT_NAME}d"
fi
TOOLKIT_DEF="-D__WX${TOOLKIT}__"
+ if test "$wxUSE_UNIVERSAL" = "yes"; then
+ TOOLKIT_DEF="${TOOLKIT_DEF} -D__WXUNIVERSAL__"
+ fi
WX_LIBRARY="wx_${TOOLKIT_NAME}"
- ALL_OBJECTS="\$(GUIOBJS) \$(COMMONOBJS) \$(GENERICOBJS) \$(UNIXOBJS) \$(HTMLOBJS) \$(OGLOBJS)"
+ if test "$wxUSE_UNIVERSAL" = "yes"; then
+ ALL_OBJECTS="\$(GUI_LOWLEVEL_OBJS) \${UNIVOBJS}"
+ else
+ ALL_OBJECTS="\$(GUIOBJS)"
+ fi
+
+ ALL_OBJECTS="${ALL_OBJECTS} \$(COMMONOBJS) \$(GENERICOBJS)"
+
+ if test "$TOOLKIT" != "MSW"; then
+ ALL_OBJECTS="${ALL_OBJECTS} \$(UNIXOBJS)"
+ fi
+
+ if test "$wxUSE_HTML" = "yes"; then
+ ALL_OBJECTS="${ALL_OBJECTS} \$(HTMLOBJS)"
+ fi
if test "$TOOLKIT" != "MSW"; then
if test "$wxUSE_ODBC" = "yes" ; then
fi
fi
+ if test "x$REGEX_INCLUDE" != "x" ; then
+ ALL_OBJECTS="${ALL_OBJECTS} \$(REGEXOBJS)"
+ fi
+
if test "$wxUSE_LIBJPEG" = "yes" ; then
ALL_OBJECTS="${ALL_OBJECTS} \$(JPEGOBJS)"
fi
if test "$wxUSE_FREETYPE" = "yes" ; then
ALL_OBJECTS="${ALL_OBJECTS} \$(FREETYPEOBJS)"
fi
- ALL_DEPFILES="\$(GUIDEPS) \$(COMMONDEPS) \$(GENERICDEPS) \$(UNIXDEPS) \$(HTMLDEPS) \$(OGLDEPS)"
- PORT_FILES="src/\$(TOOLKITDIR)/files.lst"
+ if test "$wxUSE_UNIVERSAL" = "yes"; then
+ ALL_DEPFILES="\$(GUI_LOWLEVEL_DEPS) \$(UNIVDEPS)"
+ else
+ ALL_DEPFILES="\$(GUIDEPS)"
+ fi
+
+ ALL_DEPFILES="${ALL_DEPFILES} \$(COMMONDEPS) \$(GENERICDEPS)"
+
+ if test "$TOOLKIT" != "MSW"; then
+ ALL_DEPFILES="${ALL_DEPFILES} \$(UNIXDEPS)"
+ fi
+
+ if test "$wxUSE_HTML" = "yes"; then
+ ALL_DEPFILES="${ALL_DEPFILES} \$(HTMLDEPS)"
+ fi
+
+ PORT_FILES="\${top_srcdir}/src/\$(TOOLKITDIR)/files.lst"
+ if test "$wxUSE_UNIVERSAL" = "yes"; then
+ PORT_FILES="${PORT_FILES} \${top_srcdir}/src/univ/files.lst"
+ fi
RPM_FILES="src/\$(TOOLKITDIR)/rpmfiles.lst"
RPM_SPEC="wx\$(TOOLKIT).spec"
TOOLKIT_DIR="base"
+ TOOLKIT_VPATH="."
+
if test "$wxUSE_DEBUG_FLAG" = "yes"; then
TOOLKIT_NAME="${TOOLKIT_DIR}d"
else
ALL_OBJECTS="\$(BASE_OBJS) \$(BASE_UNIX_OBJS)"
ALL_DEPFILES="\$(BASE_DEPS) \$(BASE_UNIX_DEPS)"
+ if test "x$REGEX_INCLUDE" != "x" ; then
+ ALL_OBJECTS="${ALL_OBJECTS} \$(REGEXOBJS)"
+ fi
+
if test "$wxUSE_ZLIB" = "yes" ; then
ALL_OBJECTS="${ALL_OBJECTS} \$(ZLIBOBJS)"
fi
WX_LIBRARY="wx_${TOOLKIT_NAME}"
- PORT_FILES="src/files.lst"
+ PORT_FILES="\${top_srcdir}/src/files.lst"
RPM_FILES="src/rpmfiles.lst"
RPM_SPEC="wxBase.spec"
GUIDIST="BASE_DIST"
DISTDIR="wxBase"
-
- if test "$USE_UNIX" = 1 ; then
- ALL_OBJECTS="${ALL_OBJECTS} dl_macosx.o"
- ALL_DEPFILES="${ALL_DEPFILES} dl_macosx.d"
- fi
fi
WX_LIBRARY_NAME="lib${WX_LIBRARY}.la"
WX_LIBRARY_NAME_STATIC="lib${WX_LIBRARY}.a"
WX_LIBRARY_NAME_STATIC_GL="lib${WX_LIBRARY}_gl.a"
-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}"
+case "${host}" in
+ *-*-mingw32* )
+ WX_LIBRARY_NAME_SHARED="wx${WX_MAJOR_VERSION_NUMBER}${WX_MINOR_VERSION_NUMBER}_${WX_RELEASE_NUMBER}.dll"
+ ;;
+ * )
+ 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}"
+ ;;
+esac
WX_LIBRARY_LINK1="lib${WX_LIBRARY}-${WX_RELEASE}.so.${WX_CURRENT}"
WX_LIBRARY_LINK2="lib${WX_LIBRARY}-${WX_RELEASE}.so"
case "${host}" in
*-hp-hpux* )
if test "$GCC" = yes ; then
- SHARED_LD="${CC} -shared -fPIC -o"
+ SHARED_LD="${CXX} -shared -fPIC -o"
PIC_FLAG="-fPIC"
else
LDFLAGS="-L/usr/lib"
;;
*-*-linux* )
- SHARED_LD="${CC} -shared -o"
+ SHARED_LD="${CXX} -shared -o"
PIC_FLAG="-fPIC"
if test "$wxUSE_BURNT_NAME" = "yes" ; then
BURNT_LIBRARY_NAME="-Wl,-soname,${WX_LIBRARY_LINK1}"
;;
*-*-irix5* | *-*-irix6* )
if test "$GCC" = yes ; then
- SHARED_LD="${CC} -shared -o"
+ SHARED_LD="${CXX} -shared -o"
PIC_FLAG="-fPIC"
else
SHARED_LD="${CXX} -shared -o"
;;
*-*-solaris2* )
if test "$GCC" = yes ; then
- SHARED_LD="${CC} -shared -o"
+ SHARED_LD="${CXX} -shared -o"
PIC_FLAG="-fPIC"
CPPFLAGS="$CPPFLAGS -isystem /usr/openwin/include"
fi
;;
*-*-sunos4* )
- SHARED_LD="${CC} -shared -o"
+ SHARED_LD="${CXX} -shared -o"
PIC_FLAG="-fPIC"
WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS"
WX_ALL="CREATE_LINKS"
;;
- *-*-freebsd* | *-*-netbsd* )
- SHARED_LD="${CC} -shared -o"
+ *-*-freebsd* | *-*-openbsd* | *-*-netbsd* )
+ SHARED_LD="${CXX} -shared -o"
PIC_FLAG="-fPIC"
if test "$wxUSE_OPENGL" = "yes"; then
WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS CREATE_INSTALLED_LINKS_GL"
fi
;;
*-*-darwin* )
- SHARED_LD="libtool -dynamic -o"
- PIC_FLAG="-fPIC"
+ TOOLKIT_DEF="${TOOLKIT_DEF} -D__UNIX__ -D__DARWIN__ -D__POWERPC__"
+ CFLAGS="${CFLAGS} -fno-common"
+ CPPFLAGS="${CPPFLAGS} -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"
WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS"
WX_ALL="CREATE_LINKS"
fi
+ if test "$wxUSE_MAC" = 1 ; then
+ WX_ALL="${WX_ALL} ./lib/lib${WX_LIBRARY}-${WX_RELEASE}.r"
+ fi
+ 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"
WX_ALL="CREATE_LINKS"
;;
*-*-sysv5* )
- SHARED_LD="${CC} -shared -o"
+ SHARED_LD="${CXX} -shared -o"
PIC_FLAG="-fPIC"
WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS"
WX_ALL="CREATE_LINKS"
SHARED_LD="/usr/lpp/xlC/bin/makeC++SharedLib -p 0 -o"
WX_ALL=${WX_LIBRARY_NAME_SHARED}
;;
- *-*-cygwin32* )
+ *-*-cygwin* )
WX_TARGET_LIBRARY="${WX_LIBRARY_NAME_STATIC}"
WX_TARGET_LIBRARY_GL="${WX_LIBRARY_NAME_STATIC_GL}"
if test "$wxUSE_OPENGL" = "yes"; then
fi
;;
*-*-mingw32* )
- WX_TARGET_LIBRARY="${WX_LIBRARY_NAME_STATIC}"
- WX_TARGET_LIBRARY_GL="${WX_LIBRARY_NAME_STATIC_GL}"
+ WX_LIBRARY_NAME_STATIC="lib/libwx${WX_MAJOR_VERSION_NUMBER}${WX_MINOR_VERSION_NUMBER}_${WX_RELEASE_NUMBER}.a"
+ SHARED_LD="${CC} -shared -Wl,--out-implib,${WX_LIBRARY_NAME_STATIC} -o"
+ TOOLKIT_DEF="${TOOLKIT_DEF} -DWXUSINGDLL=1"
+ WXMSW_DLL_DEFINES="-UWXUSINGDLL -DWXMAKINGDLL=1 -D_DLL=1 -D_WINDLL=1"
+ WX_TARGET_LIBRARY="${WX_LIBRARY_NAME_SHARED}"
+ WX_TARGET_LIBRARY_GL="${WX_LIBRARY_NAME_SHARED_GL}"
if test "$wxUSE_OPENGL" = "yes"; then
WX_ALL_INSTALLED="preinstall_gl"
- WX_ALL="${WX_LIBRARY_NAME_STATIC} ${WX_LIBRARY_NAME_STATIC_GL}"
+ WX_ALL="${WX_LIBRARY_NAME_SHARED} ${WX_LIBRARY_NAME_SHARED_GL}"
else
- WX_ALL="${WX_LIBRARY_NAME_STATIC}"
+ WX_ALL="${WX_LIBRARY_NAME_SHARED}"
fi
;;
*-pc-os2_emx )
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:9286: checking for $ac_hdr" >&5
+echo "configure:11183: 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
-#line 9291 "configure"
+#line 11188 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9296: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11193: \"$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*
fi
done
-for ac_hdr in unistd.h
+for ac_hdr in stdlib.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:9326: checking for $ac_hdr" >&5
+echo "configure:11223: 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
-#line 9331 "configure"
+#line 11228 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9336: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11233: \"$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*
fi
done
-for ac_hdr in fcntl.h
+for ac_hdr in unistd.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:9366: checking for $ac_hdr" >&5
+echo "configure:11263: 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
-#line 9371 "configure"
+#line 11268 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9376: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11273: \"$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*
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:9406: checking for $ac_hdr" >&5
+echo "configure:11303: 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
+#line 11308 "configure"
+#include "confdefs.h"
+#include <$ac_hdr>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:11313: \"$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 <<EOF
+#define $ac_tr_hdr 1
+EOF
+
+else
+ echo "$ac_t""no" 1>&6
+fi
+done
+
+for ac_hdr in wcstr.h
+do
+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+echo "configure:11343: 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
-#line 9411 "configure"
+#line 11348 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9416: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11353: \"$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*
fi
done
-for ac_hdr in wcstr.h
+for ac_hdr in fnmatch.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:9446: checking for $ac_hdr" >&5
+echo "configure:11383: 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
-#line 9451 "configure"
+#line 11388 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9456: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11393: \"$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*
fi
done
-for ac_hdr in fnmatch.h
+for ac_hdr in iconv.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:9486: checking for $ac_hdr" >&5
+echo "configure:11423: 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
-#line 9491 "configure"
+#line 11428 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9496: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11433: \"$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*
fi
done
-for ac_hdr in iconv.h
+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:9526: checking for $ac_hdr" >&5
+echo "configure:11463: 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
-#line 9531 "configure"
+#line 11468 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9536: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11473: \"$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*
fi
done
-for ac_hdr in langinfo.h
+
+if test "$wxUSE_GUI" = "yes"; then
+ if test "$wxUSE_UNIX" = "yes"; then
+ for ac_hdr in X11/XKBlib.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:9566: checking for $ac_hdr" >&5
+echo "configure:11506: 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
-#line 9571 "configure"
+#line 11511 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9576: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11516: \"$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*
fi
done
+ fi
+fi
-if test "$wxUSE_GUI" = "yes"; then
- if test "$wxUSE_UNIX" = "yes"; then
- for ac_hdr in X11/XKBlib.h
+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:9609: checking for $ac_hdr" >&5
+echo "configure:11550: 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
-#line 9614 "configure"
+#line 11555 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9619: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11560: \"$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*
fi
done
- fi
fi
echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:9650: checking for ANSI C header files" >&5
+echo "configure:11590: 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 <<EOF
-#line 9655 "configure"
+#line 11595 "configure"
#include "confdefs.h"
#include <stdlib.h>
#include <stdarg.h>
#include <float.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9663: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11603: \"$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*
if test $ac_cv_header_stdc = yes; then
# SunOS 4.x string.h does not declare mem*, contrary to ANSI.
cat > conftest.$ac_ext <<EOF
-#line 9680 "configure"
+#line 11620 "configure"
#include "confdefs.h"
#include <string.h>
EOF
if test $ac_cv_header_stdc = yes; then
# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
cat > conftest.$ac_ext <<EOF
-#line 9698 "configure"
+#line 11638 "configure"
#include "confdefs.h"
#include <stdlib.h>
EOF
:
else
cat > conftest.$ac_ext <<EOF
-#line 9719 "configure"
+#line 11659 "configure"
#include "confdefs.h"
#include <ctype.h>
#define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
exit (0); }
EOF
-if { (eval echo configure:9730: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:11670: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
:
else
fi
echo $ac_n "checking for mode_t""... $ac_c" 1>&6
-echo "configure:9754: checking for mode_t" >&5
+echo "configure:11694: 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 <<EOF
-#line 9759 "configure"
+#line 11699 "configure"
#include "confdefs.h"
#include <sys/types.h>
#if STDC_HEADERS
fi
echo $ac_n "checking for off_t""... $ac_c" 1>&6
-echo "configure:9787: checking for off_t" >&5
+echo "configure:11727: 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 <<EOF
-#line 9792 "configure"
+#line 11732 "configure"
#include "confdefs.h"
#include <sys/types.h>
#if STDC_HEADERS
fi
echo $ac_n "checking for pid_t""... $ac_c" 1>&6
-echo "configure:9820: checking for pid_t" >&5
+echo "configure:11760: 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 <<EOF
-#line 9825 "configure"
+#line 11765 "configure"
#include "confdefs.h"
#include <sys/types.h>
#if STDC_HEADERS
fi
echo $ac_n "checking for size_t""... $ac_c" 1>&6
-echo "configure:9853: checking for size_t" >&5
+echo "configure:11793: 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 <<EOF
-#line 9858 "configure"
+#line 11798 "configure"
#include "confdefs.h"
#include <sys/types.h>
#if STDC_HEADERS
fi
echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6
-echo "configure:9886: checking for uid_t in sys/types.h" >&5
+echo "configure:11826: checking for uid_t in sys/types.h" >&5
if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 9891 "configure"
+#line 11831 "configure"
#include "confdefs.h"
#include <sys/types.h>
EOF
fi
+echo $ac_n "checking for wchar_t""... $ac_c" 1>&6
+echo "configure:11861: 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
+
+ cat > conftest.$ac_ext <<EOF
+#line 11867 "configure"
+#include "confdefs.h"
+#include <wchar.h>
+int main() {
+
+ wchar_t wc, *ws;
+ wc = L'a';
+ ws = L"Hello, world!";
+
+; return 0; }
+EOF
+if { (eval echo configure:11878: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+ rm -rf conftest*
+ wx_cv_type_wchar_t=yes
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ cat > conftest.$ac_ext <<EOF
+#line 11886 "configure"
+#include "confdefs.h"
+#include <stdlib.h>
+int main() {
+
+ wchar_t wc, *ws;
+ wc = L'a';
+ ws = L"Hello, world!";
+
+; return 0; }
+EOF
+if { (eval echo configure:11897: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+ rm -rf conftest*
+ wx_cv_type_wchar_t=yes
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ wx_cv_type_wchar_t=no
+fi
+rm -f conftest*
+
+fi
+rm -f conftest*
+
+fi
+
+echo "$ac_t""$wx_cv_type_wchar_t" 1>&6
+
+if test "$wx_cv_type_wchar_t" = "yes"; then
+ cat >> confdefs.h <<\EOF
+#define wxUSE_WCHAR_T 1
+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 $ac_n "checking if size_t is unsigned int""... $ac_c" 1>&6
+echo "configure:11931: 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
+ cat > conftest.$ac_ext <<EOF
+#line 11936 "configure"
+#include "confdefs.h"
+#include <stddef.h>
+int main() {
+
+ return 0; }
+
+ struct Foo { void foo(size_t); void foo(unsigned int); };
+
+ int bar() {
+
+; return 0; }
+EOF
+if { (eval echo configure:11949: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+ rm -rf conftest*
+ wx_cv_size_t_is_uint=no
+else
+ 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*
+
+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
+ echo $ac_n "checking if size_t is unsigned long""... $ac_c" 1>&6
+echo "configure:11972: 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 <<EOF
+#line 11977 "configure"
+#include "confdefs.h"
+#include <stddef.h>
+int main() {
+
+ return 0; }
+
+ struct Foo { void foo(size_t); void foo(unsigned long); };
+
+ int bar() {
+
+; return 0; }
+EOF
+if { (eval echo configure:11990: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+ rm -rf conftest*
+ wx_cv_size_t_is_ulong=no
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ wx_cv_size_t_is_ulong=yes
+
+fi
+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
+
+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:9922: checking for pw_gecos in struct passwd" >&5
+echo "configure:12024: 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
cat > conftest.$ac_ext <<EOF
-#line 9928 "configure"
+#line 12030 "configure"
#include "confdefs.h"
#include <pwd.h>
int main() {
; return 0; }
EOF
-if { (eval echo configure:9939: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:12041: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
wx_cv_struct_pw_gecos=yes
echo $ac_n "checking for working const""... $ac_c" 1>&6
-echo "configure:9969: checking for working const" >&5
+echo "configure:12071: 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 <<EOF
-#line 9974 "configure"
+#line 12076 "configure"
#include "confdefs.h"
int main() {
; return 0; }
EOF
-if { (eval echo configure:10023: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:12125: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_c_const=yes
else
fi
echo $ac_n "checking for inline""... $ac_c" 1>&6
-echo "configure:10044: checking for inline" >&5
+echo "configure:12146: checking for inline" >&5
if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_cv_c_inline=no
for ac_kw in inline __inline__ __inline; do
cat > conftest.$ac_ext <<EOF
-#line 10051 "configure"
+#line 12153 "configure"
#include "confdefs.h"
int main() {
} $ac_kw foo() {
; return 0; }
EOF
-if { (eval echo configure:10058: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:12160: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_c_inline=$ac_kw; break
else
echo $ac_n "checking size of char""... $ac_c" 1>&6
-echo "configure:10085: checking size of char" >&5
+echo "configure:12187: 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
ac_cv_sizeof_char=1
else
cat > conftest.$ac_ext <<EOF
-#line 10093 "configure"
+#line 12195 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
exit(0);
}
EOF
-if { (eval echo configure:10104: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:12206: \"$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
EOF
-echo $ac_n "checking size of wchar_t""... $ac_c" 1>&6
-echo "configure:10124: checking size of wchar_t" >&5
-if eval "test \"`echo '$''{'ac_cv_sizeof_wchar_t'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- if test "$cross_compiling" = yes; then
- ac_cv_sizeof_wchar_t=4
-else
- cat > conftest.$ac_ext <<EOF
-#line 10132 "configure"
-#include "confdefs.h"
-#include <stdio.h>
-main()
-{
- FILE *f=fopen("conftestval", "w");
- if (!f) exit(1);
- fprintf(f, "%d\n", sizeof(wchar_t));
- exit(0);
-}
-EOF
-if { (eval echo configure:10143: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-then
- ac_cv_sizeof_wchar_t=`cat conftestval`
-else
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -fr conftest*
- ac_cv_sizeof_wchar_t=0
-fi
-rm -fr conftest*
-fi
-
-fi
-echo "$ac_t""$ac_cv_sizeof_wchar_t" 1>&6
-cat >> confdefs.h <<EOF
-#define SIZEOF_WCHAR_T $ac_cv_sizeof_wchar_t
-EOF
-
-
echo $ac_n "checking size of short""... $ac_c" 1>&6
-echo "configure:10163: checking size of short" >&5
+echo "configure:12226: 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
ac_cv_sizeof_short=2
else
cat > conftest.$ac_ext <<EOF
-#line 10171 "configure"
+#line 12234 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
exit(0);
}
EOF
-if { (eval echo configure:10182: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:12245: \"$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 $ac_n "checking size of int *""... $ac_c" 1>&6
-echo "configure:10202: checking size of int *" >&5
+echo "configure:12265: 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
ac_cv_sizeof_int_p=4
else
cat > conftest.$ac_ext <<EOF
-#line 10210 "configure"
+#line 12273 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
exit(0);
}
EOF
-if { (eval echo configure:10221: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:12284: \"$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 $ac_n "checking size of int""... $ac_c" 1>&6
-echo "configure:10241: checking size of int" >&5
+echo "configure:12304: 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
ac_cv_sizeof_int=4
else
cat > conftest.$ac_ext <<EOF
-#line 10249 "configure"
+#line 12312 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
exit(0);
}
EOF
-if { (eval echo configure:10260: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:12323: \"$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 $ac_n "checking size of long""... $ac_c" 1>&6
-echo "configure:10280: checking size of long" >&5
+echo "configure:12343: 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
ac_cv_sizeof_long=4
else
cat > conftest.$ac_ext <<EOF
-#line 10288 "configure"
+#line 12351 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
exit(0);
}
EOF
-if { (eval echo configure:10299: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:12362: \"$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 $ac_n "checking size of long long""... $ac_c" 1>&6
-echo "configure:10319: checking size of long long" >&5
+echo "configure:12382: 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
ac_cv_sizeof_long_long=0
else
cat > conftest.$ac_ext <<EOF
-#line 10327 "configure"
+#line 12390 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
exit(0);
}
EOF
-if { (eval echo configure:10338: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:12401: \"$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 $ac_n "checking size of wchar_t""... $ac_c" 1>&6
+echo "configure:12422: 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 <<EOF
+#line 12432 "configure"
+#include "confdefs.h"
+
+ #ifdef HAVE_WCHAR_H
+ # include <wchar.h>
+ #endif
+ #ifdef HAVE_STDLIB_H
+ # include <stdlib.h>
+ #endif
+ #include <stdio.h>
+ int main()
+ {
+ FILE *f=fopen("conftestval", "w");
+ if (!f) exit(1);
+ fprintf(f, "%i", sizeof(wchar_t));
+ exit(0);
+ }
+
+EOF
+if { (eval echo configure:12451: \"$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 "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -fr conftest*
+ wx_cv_sizeof_wchar_t=0
+fi
+rm -fr conftest*
+fi
+
+
+fi
+
+echo "$ac_t""$wx_cv_sizeof_wchar_t" 1>&6
+
+cat >> confdefs.h <<EOF
+#define SIZEOF_WCHAR_T $wx_cv_sizeof_wchar_t
+EOF
+
+
echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6
-echo "configure:10359: checking whether byte ordering is bigendian" >&5
+echo "configure:12474: 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 <<EOF
-#line 10366 "configure"
+#line 12481 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/param.h>
#endif
; return 0; }
EOF
-if { (eval echo configure:10377: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:12492: \"$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 <<EOF
-#line 10381 "configure"
+#line 12496 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/param.h>
#endif
; return 0; }
EOF
-if { (eval echo configure:10392: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:12507: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_c_bigendian=yes
else
ac_cv_c_bigendian=unknown
else
cat > conftest.$ac_ext <<EOF
-#line 10412 "configure"
+#line 12527 "configure"
#include "confdefs.h"
main () {
/* Are we little or big endian? From Harbison&Steele. */
exit (u.c[sizeof (long) - 1] == 1);
}
EOF
-if { (eval echo configure:10425: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:12540: \"$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
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:10472: checking for $ac_hdr" >&5
+echo "configure:12587: 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
-#line 10477 "configure"
+#line 12592 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10482: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12597: \"$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*
done
- if test "x$HAVE_IOSTREAM" = x ; then
+ if test "$ac_cv_header_iostream" = "yes" ; then
+ :
+ else
cat >> confdefs.h <<\EOF
#define wxUSE_IOSTREAMH 1
EOF
- else
- :
fi
ac_ext=c
echo $ac_n "checking if C++ compiler supports bool""... $ac_c" 1>&6
-echo "configure:10530: checking if C++ compiler supports bool" >&5
+echo "configure:12645: 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
cat > conftest.$ac_ext <<EOF
-#line 10545 "configure"
+#line 12660 "configure"
#include "confdefs.h"
; return 0; }
EOF
-if { (eval echo configure:10557: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:12672: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
- cat >> confdefs.h <<\EOF
-#define HAVE_BOOL 1
-EOF
-
wx_cv_cpp_bool=yes
else
-echo $ac_n "checking if you need GNU extensions""... $ac_c" 1>&6
-echo "configure:10599: checking if you need GNU extensions" >&5
-if eval "test \"`echo '$''{'wx_cv_gnu_extensions'+set}'`\" = set"; then
+echo $ac_n "checking for wcslen in -lc""... $ac_c" 1>&6
+echo "configure:12710: 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
-
- cat > conftest.$ac_ext <<EOF
-#line 10605 "configure"
+ ac_save_LIBS="$LIBS"
+LIBS="-lc $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 12718 "configure"
#include "confdefs.h"
-#include <features.h>
-int main() {
-
-
-#ifndef __GNU_LIBRARY__
- Compile error wanted
-#endif
-
+/* 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 wcslen();
+int main() {
+wcslen()
; return 0; }
EOF
-if { (eval echo configure:10618: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:12729: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
- wx_cv_gnu_extensions=yes
+ eval "ac_cv_lib_$ac_lib_var=yes"
else
echo "configure: failed program was:" >&5
cat conftest.$ac_ext >&5
rm -rf conftest*
- wx_cv_gnu_extensions=no
+ eval "ac_cv_lib_$ac_lib_var=no"
fi
rm -f conftest*
+LIBS="$ac_save_LIBS"
fi
-
-
-echo "$ac_t""$wx_cv_gnu_extensions" 1>&6
-if test "$wx_cv_gnu_extensions" = "yes"; then
- cat >> confdefs.h <<EOF
-#define _GNU_SOURCE 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_WCSLEN 1
EOF
-fi
-
-
+ WCHAR_LINK=""
+
+else
+ echo "$ac_t""no" 1>&6
-echo $ac_n "checking for wcslen in -lc""... $ac_c" 1>&6
-echo "configure:10643: checking for wcslen in -lc" >&5
-ac_lib_var=`echo c'_'wcslen | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for wcslen in -lw""... $ac_c" 1>&6
+echo "configure:12755: 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_save_LIBS="$LIBS"
-LIBS="-lc $LIBS"
+LIBS="-lw $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 10651 "configure"
+#line 12763 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
wcslen()
; return 0; }
EOF
-if { (eval echo configure:10662: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12774: \"$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
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
echo "$ac_t""yes" 1>&6
- cat >> confdefs.h <<\EOF
+ cat >> confdefs.h <<\EOF
#define HAVE_WCSLEN 1
EOF
- WCHAR_LINK=""
-
+ WCHAR_LINK="-lw"
+
else
echo "$ac_t""no" 1>&6
- echo $ac_n "checking for wcslen in -lw""... $ac_c" 1>&6
-echo "configure:10688: checking for wcslen in -lw" >&5
-ac_lib_var=`echo w'_'wcslen | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for wcslen in -lmsvcrt""... $ac_c" 1>&6
+echo "configure:12800: 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_save_LIBS="$LIBS"
-LIBS="-lw $LIBS"
+LIBS="-lmsvcrt $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 10696 "configure"
+#line 12808 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
wcslen()
; return 0; }
EOF
-if { (eval echo configure:10707: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12819: \"$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
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
echo "$ac_t""yes" 1>&6
- cat >> confdefs.h <<\EOF
+ cat >> confdefs.h <<\EOF
#define HAVE_WCSLEN 1
EOF
- WCHAR_LINK="-lw"
-
+ WCHAR_LINK=""
+
else
echo "$ac_t""no" 1>&6
fi
+
+fi
+
fi
echo $ac_n "checking for vprintf""... $ac_c" 1>&6
-echo "configure:10738: checking for vprintf" >&5
+echo "configure:12853: 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 <<EOF
-#line 10743 "configure"
+#line 12858 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char vprintf(); below. */
; return 0; }
EOF
-if { (eval echo configure:10766: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12881: \"$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
if test "$ac_cv_func_vprintf" != yes; then
echo $ac_n "checking for _doprnt""... $ac_c" 1>&6
-echo "configure:10790: checking for _doprnt" >&5
+echo "configure:12905: 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 <<EOF
-#line 10795 "configure"
+#line 12910 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char _doprnt(); below. */
; return 0; }
EOF
-if { (eval echo configure:10818: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12933: \"$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
-ac_ext=C
-# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cxx_cross
echo $ac_n "checking for vsnprintf""... $ac_c" 1>&6
-echo "configure:10855: checking for vsnprintf" >&5
+echo "configure:12964: 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 <<EOF
-#line 10861 "configure"
+#line 12970 "configure"
#include "confdefs.h"
#include <stdio.h>
; return 0; }
EOF
-if { (eval echo configure:10886: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:12995: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
- cat >> confdefs.h <<\EOF
-#define HAVE_VSNPRINTF 1
-EOF
-
wx_cv_func_vsnprintf=yes
else
cat conftest.$ac_ext >&5
rm -rf conftest*
- echo "configure: warning: unsafe function sprintf will be used instead of snprintf" 1>&2
- wx_cv_func_vsnprintf=no
+ cat > conftest.$ac_ext <<EOF
+#line 13006 "configure"
+#include "confdefs.h"
+
+ #include <stdio.h>
+ #include <stdarg.h>
+
+int main() {
+
+ int wx_test_vsnprintf(const char *, ...);
+
+ wx_test_vsnprintf("%s");
+ return 0;
+ }
+
+ int wx_test_vsnprintf(const char *fmt, ...)
+ {
+ char *s;
+
+ va_list argp;
+ va_start(argp, fmt);
+ _vsnprintf(s, 42, fmt, argp);
+ va_end(argp);
+
+; return 0; }
+EOF
+if { (eval echo configure:13031: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+ rm -rf conftest*
+
+ wx_cv_func_vsnprintf=yes
+
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+
+ wx_cv_func_vsnprintf=no
+
+fi
+rm -f conftest*
fi
rm -f conftest*
echo "$ac_t""$wx_cv_func_vsnprintf" 1>&6
+if test "$wx_cv_func_vsnprintf" = yes; then
+ cat >> confdefs.h <<\EOF
+#define HAVE_VSNPRINTF 1
+EOF
+
+else
+ echo "configure: warning: unsafe function sprintf will be used instead of snprintf" 1>&2
+fi
+
echo $ac_n "checking for vsscanf""... $ac_c" 1>&6
-echo "configure:10911: checking for vsscanf" >&5
+echo "configure:13063: 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 <<EOF
-#line 10917 "configure"
+#line 13069 "configure"
#include "confdefs.h"
#include <stdio.h>
; return 0; }
EOF
-if { (eval echo configure:10940: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:13092: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
- cat >> confdefs.h <<\EOF
-#define HAVE_VSSCANF 1
-EOF
-
wx_cv_func_vsscanf=yes
else
echo "$ac_t""$wx_cv_func_vsscanf" 1>&6
+if test "$wx_cv_func_vsscanf" = yes; then
+ cat >> confdefs.h <<\EOF
+#define HAVE_VSSCANF 1
+EOF
+
+fi
+
+if test "$TOOLKIT" != "MSW"; then
+
+
+
+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:13130: 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 <<EOF
+#line 13136 "configure"
+#include "confdefs.h"
+#include <iconv.h>
+int main() {
+
+ char **inbuf, **outbuf;
+ iconv_t cd;
+ size_t insz, outsz;
+ iconv(cd, inbuf, &insz, outbuf, &outsz);
+
+; return 0; }
+EOF
+if { (eval echo configure:13148: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+ rm -rf conftest*
+ wx_cv_iconv_takes_char=yes
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ wx_cv_iconv_takes_char=no
+fi
+rm -f conftest*
+
+fi
+
+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_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
+#define WX_ICONV_TAKES_CHAR 1
+EOF
+
+fi
-if test "$TOOLKIT" != "MSW"; then
if test "$wxUSE_ON_FATAL_EXCEPTION" = "yes" -a "$wxUSE_UNIX" = "yes"; then
for ac_func in sigaction
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:10977: checking for $ac_func" >&5
+echo "configure:13181: 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 <<EOF
-#line 10982 "configure"
+#line 13186 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
; return 0; }
EOF
-if { (eval echo configure:11005: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13209: \"$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 $ac_n "checking for sa_handler type""... $ac_c" 1>&6
-echo "configure:11046: checking for sa_handler type" >&5
+echo "configure:13250: 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 <<EOF
-#line 11052 "configure"
+#line 13256 "configure"
#include "confdefs.h"
#include <signal.h>
int main() {
; return 0; }
EOF
-if { (eval echo configure:11064: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:13268: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
wx_cv_type_sa_handler=int
for ac_func in vfork
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:11101: checking for $ac_func" >&5
+echo "configure:13305: 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 <<EOF
-#line 11106 "configure"
+#line 13310 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
; return 0; }
EOF
-if { (eval echo configure:11129: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13333: \"$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
done
+if test "$wxUSE_SNGLINST_CHECKER" = "yes"; then
+ for ac_func in fcntl flock
+do
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:13362: 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 <<EOF
+#line 13367 "configure"
+#include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char $ac_func(); below. */
+#include <assert.h>
+/* 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();
+
+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
+$ac_func();
+#endif
+
+; return 0; }
+EOF
+if { (eval echo configure:13390: \"$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 <<EOF
+#define $ac_tr_func 1
+EOF
+ break
+else
+ echo "$ac_t""no" 1>&6
+fi
+done
+
+
+ if test "$ac_cv_func_fcntl" != "yes" -a "$ac_cv_func_flock" != "yes"; then
+ echo "configure: warning: wxSingleInstanceChecker not available" 1>&2
+ wxUSE_SNGLINST_CHECKER=no
+ fi
+fi
+
for ac_func in timegm
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:11157: checking for $ac_func" >&5
+echo "configure:13424: 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 <<EOF
-#line 11162 "configure"
+#line 13429 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
; return 0; }
EOF
-if { (eval echo configure:11185: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13452: \"$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
for ac_func in putenv setenv
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:11213: checking for $ac_func" >&5
+echo "configure:13480: 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 <<EOF
-#line 11218 "configure"
+#line 13485 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
; return 0; }
EOF
-if { (eval echo configure:11241: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13508: \"$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
HAVE_SOME_SLEEP_FUNC=1
fi
-if test "$USE_MAC" = 1; then
+if test "$USE_DARWIN" = 1; then
cat >> confdefs.h <<\EOF
#define HAVE_USLEEP 1
EOF
for ac_func in nanosleep
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:11288: checking for $ac_func" >&5
+echo "configure:13555: 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 <<EOF
-#line 11293 "configure"
+#line 13560 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
; return 0; }
EOF
-if { (eval echo configure:11316: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13583: \"$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
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for nanosleep in -lposix4""... $ac_c" 1>&6
-echo "configure:11341: checking for nanosleep in -lposix4" >&5
+echo "configure:13608: 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
ac_save_LIBS="$LIBS"
LIBS="-lposix4 $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 11349 "configure"
+#line 13616 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
nanosleep()
; return 0; }
EOF
-if { (eval echo configure:11360: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13627: \"$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
for ac_func in usleep
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:11388: checking for $ac_func" >&5
+echo "configure:13655: 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 <<EOF
-#line 11393 "configure"
+#line 13660 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
; return 0; }
EOF
-if { (eval echo configure:11416: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13683: \"$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
else
echo "$ac_t""no" 1>&6
+echo "configure: warning: wxSleep() function will not work" 1>&2
+
fi
done
- echo "configure: warning: wxSleep() function will not work" 1>&2
fi
for ac_func in uname gethostname
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:11458: checking for $ac_func" >&5
+echo "configure:13726: 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 <<EOF
-#line 11463 "configure"
+#line 13731 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
; return 0; }
EOF
-if { (eval echo configure:11486: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13754: \"$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
for ac_func in strtok_r
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:11523: checking for $ac_func" >&5
+echo "configure:13791: 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 <<EOF
-#line 11528 "configure"
+#line 13796 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
; return 0; }
EOF
-if { (eval echo configure:11554: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13822: \"$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
for ac_func in inet_addr
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:11591: checking for $ac_func" >&5
+echo "configure:13859: 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 <<EOF
-#line 11596 "configure"
+#line 13864 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
; return 0; }
EOF
-if { (eval echo configure:11619: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13887: \"$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
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for inet_addr in -lnsl""... $ac_c" 1>&6
-echo "configure:11644: checking for inet_addr in -lnsl" >&5
+echo "configure:13912: 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
ac_save_LIBS="$LIBS"
LIBS="-lnsl $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 11652 "configure"
+#line 13920 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
inet_addr()
; return 0; }
EOF
-if { (eval echo configure:11663: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13931: \"$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
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for inet_addr in -lresolv""... $ac_c" 1>&6
-echo "configure:11682: checking for inet_addr in -lresolv" >&5
+echo "configure:13950: 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
ac_save_LIBS="$LIBS"
LIBS="-lresolv $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 11690 "configure"
+#line 13958 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
inet_addr()
; return 0; }
EOF
-if { (eval echo configure:11701: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13969: \"$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
for ac_func in inet_aton
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:11734: checking for $ac_func" >&5
+echo "configure:14002: 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 <<EOF
-#line 11739 "configure"
+#line 14007 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
; return 0; }
EOF
-if { (eval echo configure:11762: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14030: \"$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
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for inet_aton in -l$INET_LINK""... $ac_c" 1>&6
-echo "configure:11787: checking for inet_aton in -l$INET_LINK" >&5
+echo "configure:14055: 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
ac_save_LIBS="$LIBS"
LIBS="-l$INET_LINK $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 11795 "configure"
+#line 14063 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
inet_aton()
; return 0; }
EOF
-if { (eval echo configure:11806: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14074: \"$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
fi
echo $ac_n "checking for pthread_create in -l$THREADS_LIB""... $ac_c" 1>&6
-echo "configure:11919: checking for pthread_create in -l$THREADS_LIB" >&5
+echo "configure:14187: 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
ac_save_LIBS="$LIBS"
LIBS="-l$THREADS_LIB $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 11927 "configure"
+#line 14195 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
pthread_create()
; return 0; }
EOF
-if { (eval echo configure:11938: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14206: \"$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 "$ac_t""no" 1>&6
echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6
-echo "configure:11961: checking for pthread_create in -lc_r" >&5
+echo "configure:14229: 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
ac_save_LIBS="$LIBS"
LIBS="-lc_r $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 11969 "configure"
+#line 14237 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
pthread_create()
; return 0; }
EOF
-if { (eval echo configure:11980: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14248: \"$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
else
echo "$ac_t""no" 1>&6
- echo $ac_n "checking for pthread_create in -lcc_dynamic""... $ac_c" 1>&6
-echo "configure:12003: checking for pthread_create in -lcc_dynamic" >&5
-ac_lib_var=`echo cc_dynamic'_'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_save_LIBS="$LIBS"
-LIBS="-lcc_dynamic $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 12011 "configure"
-#include "confdefs.h"
-/* 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 pthread_create();
-
-int main() {
-pthread_create()
-; return 0; }
-EOF
-if { (eval echo configure:12022: \"$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="cc_dynamic"
-
-else
- echo "$ac_t""no" 1>&6
-
- ac_safe=`echo "sys/prctl.h" | sed 'y%./+-%__p_%'`
+ ac_safe=`echo "sys/prctl.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for sys/prctl.h""... $ac_c" 1>&6
-echo "configure:12046: checking for sys/prctl.h" >&5
+echo "configure:14272: checking for sys/prctl.h" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 12051 "configure"
+#line 14277 "configure"
#include "confdefs.h"
#include <sys/prctl.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12056: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:14282: \"$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*
if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
echo "$ac_t""yes" 1>&6
- THREADS_OBJ="threadsgi.lo"
-
+ THREADS_OBJ="threadsgi.lo"
+
else
echo "$ac_t""no" 1>&6
fi
-
-fi
-
fi
for ac_func in thr_setconcurrency
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:12099: checking for $ac_func" >&5
+echo "configure:14322: 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 <<EOF
-#line 12104 "configure"
+#line 14327 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
; return 0; }
EOF
-if { (eval echo configure:12127: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14350: \"$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
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:12157: checking for $ac_hdr" >&5
+echo "configure:14380: 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
-#line 12162 "configure"
+#line 14385 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12167: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:14390: \"$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*
echo $ac_n "checking for sched_yield in -l$THREADS_LINK""... $ac_c" 1>&6
-echo "configure:12195: checking for sched_yield in -l$THREADS_LINK" >&5
+echo "configure:14418: 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
ac_save_LIBS="$LIBS"
LIBS="-l$THREADS_LINK $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 12203 "configure"
+#line 14426 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
sched_yield()
; return 0; }
EOF
-if { (eval echo configure:12214: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14437: \"$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
else
echo "$ac_t""no" 1>&6
-echo $ac_n "checking for sched_yield in -l"posix4"""... $ac_c" 1>&6
-echo "configure:12236: checking for sched_yield in -l"posix4"" >&5
-ac_lib_var=`echo "posix4"'_'sched_yield | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for sched_yield in -lposix4""... $ac_c" 1>&6
+echo "configure:14459: 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_save_LIBS="$LIBS"
-LIBS="-l"posix4" $LIBS"
+LIBS="-lposix4 $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 12244 "configure"
+#line 14467 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
sched_yield()
; return 0; }
EOF
-if { (eval echo configure:12255: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14478: \"$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
HAVE_PRIOR_FUNCS=0
echo $ac_n "checking for pthread_attr_getschedpolicy in -l$THREADS_LINK""... $ac_c" 1>&6
-echo "configure:12286: checking for pthread_attr_getschedpolicy in -l$THREADS_LINK" >&5
+echo "configure:14509: 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
ac_save_LIBS="$LIBS"
LIBS="-l$THREADS_LINK $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 12294 "configure"
+#line 14517 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
pthread_attr_getschedpolicy()
; return 0; }
EOF
-if { (eval echo configure:12305: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14528: \"$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
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:12321: checking for pthread_attr_setschedparam in -l$THREADS_LINK" >&5
+echo "configure:14544: 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
ac_save_LIBS="$LIBS"
LIBS="-l$THREADS_LINK $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 12329 "configure"
+#line 14552 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
pthread_attr_setschedparam()
; return 0; }
EOF
-if { (eval echo configure:12340: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14563: \"$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
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:12356: checking for sched_get_priority_max in -l$THREADS_LINK" >&5
+echo "configure:14579: 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
ac_save_LIBS="$LIBS"
LIBS="-l$THREADS_LINK $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 12364 "configure"
+#line 14587 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
sched_get_priority_max()
; return 0; }
EOF
-if { (eval echo configure:12375: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14598: \"$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
HAVE_PRIOR_FUNCS=1
else
echo "$ac_t""no" 1>&6
-echo $ac_n "checking for sched_get_priority_max in -l"posix4"""... $ac_c" 1>&6
-echo "configure:12394: checking for sched_get_priority_max in -l"posix4"" >&5
-ac_lib_var=`echo "posix4"'_'sched_get_priority_max | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for sched_get_priority_max in -lposix4""... $ac_c" 1>&6
+echo "configure:14617: 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_save_LIBS="$LIBS"
-LIBS="-l"posix4" $LIBS"
+LIBS="-lposix4 $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 12402 "configure"
+#line 14625 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
sched_get_priority_max()
; return 0; }
EOF
-if { (eval echo configure:12413: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14636: \"$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
fi
echo $ac_n "checking for pthread_cancel in -l$THREADS_LINK""... $ac_c" 1>&6
-echo "configure:12460: checking for pthread_cancel in -l$THREADS_LINK" >&5
+echo "configure:14683: 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
ac_save_LIBS="$LIBS"
LIBS="-l$THREADS_LINK $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 12468 "configure"
+#line 14691 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
pthread_cancel()
; return 0; }
EOF
-if { (eval echo configure:12479: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14702: \"$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 "$ac_t""no" 1>&6
+echo "configure: warning: wxThread::Kill() will not work properly" 1>&2
+fi
+
+
+ echo $ac_n "checking for pthread_cleanup_push/pop""... $ac_c" 1>&6
+echo "configure:14728: 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 <<EOF
+#line 14734 "configure"
+#include "confdefs.h"
+#include <pthread.h>
+int main() {
+
+ pthread_cleanup_push(NULL, NULL);
+ pthread_cleanup_pop(0);
+
+; return 0; }
+EOF
+if { (eval echo configure:14744: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+ rm -rf conftest*
+
+ wx_cv_func_pthread_cleanup_push=yes
+
+else
+ 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*
+
+fi
+
+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
+#define HAVE_THREAD_CLEANUP_FUNCTIONS 1
+EOF
+
+ fi
+
+
+ echo $ac_n "checking for pthread_mutexattr_t""... $ac_c" 1>&6
+echo "configure:14772: 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 <<EOF
+#line 14778 "configure"
+#include "confdefs.h"
+#include <pthread.h>
+int main() {
+
+ pthread_mutexattr_t attr;
+ pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);
+
+; return 0; }
+EOF
+if { (eval echo configure:14788: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
+
+ wx_cv_type_pthread_mutexattr_t=yes
+
else
echo "configure: failed program was:" >&5
cat conftest.$ac_ext >&5
rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=no"
+
+ wx_cv_type_pthread_mutexattr_t=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 "$ac_t""no" 1>&6
-echo "configure: warning: wxThread::Kill() will not work properly" 1>&2
-fi
+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
+#define HAVE_PTHREAD_MUTEXATTR_T 1
+EOF
- echo $ac_n "checking for pthread_cleanup_push/pop""... $ac_c" 1>&6
-echo "configure:12505: checking for pthread_cleanup_push/pop" >&5
-if eval "test \"`echo '$''{'wx_cv_func_pthread_cleanup_push'+set}'`\" = set"; then
+ else
+ echo $ac_n "checking for PTHREAD_RECURSIVE_MUTEX_INITIALIZER""... $ac_c" 1>&6
+echo "configure:14815: 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 <<EOF
-#line 12511 "configure"
+ cat > conftest.$ac_ext <<EOF
+#line 14821 "configure"
#include "confdefs.h"
#include <pthread.h>
int main() {
- pthread_cleanup_push(NULL, NULL);
- pthread_cleanup_pop(0);
-
+ pthread_mutex_t attr = PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP;
+
; return 0; }
EOF
-if { (eval echo configure:12521: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:14830: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
- wx_cv_func_pthread_cleanup_push=yes
- cat >> confdefs.h <<\EOF
-#define HAVE_THREAD_CLEANUP_FUNCTIONS 1
-EOF
-
-
+ wx_cv_type_pthread_rec_mutex_init=yes
+
else
echo "configure: failed program was:" >&5
cat conftest.$ac_ext >&5
rm -rf conftest*
- wx_cv_func_pthread_cleanup_push=no
-
+ wx_cv_type_pthread_rec_mutex_init=no
+
+
fi
rm -f conftest*
-
+
fi
-echo "$ac_t""$wx_cv_func_pthread_cleanup_push" 1>&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
+#define HAVE_PTHREAD_RECURSIVE_MUTEX_INITIALIZER 1
+EOF
+
+ else
+ echo "configure: warning: wxMutex won't be recursive on this platform" 1>&2
+ fi
+ fi
THREADS_LINK="-l$THREADS_LINK"
EOF
+ if test "$USE_DARWIN" != 1; then
CFLAGS="${CFLAGS} -D_REENTRANT"
- CXXFLAGS="${CXXFLAGS} -D_REENTRANT"
+ CXXFLAGS="${CXXFLAGS} -D_REENTRANT"
+ fi
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS thread"
else
if test "$ac_cv_func_strtok_r" = "yes"; then
echo $ac_n "checking if -D_REENTRANT is needed""... $ac_c" 1>&6
-echo "configure:12568: checking if -D_REENTRANT is needed" >&5
+echo "configure:14885: 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"
fi
if test "$wxUSE_MAC" = 1 ; then
- TOOLKIT_DEF="${TOOLKIT_DEF} -D__UNIX__ -DTARGET_CARBON"
- TOOLKIT_INCLUDE="${TOOLKIT_INCLUDE}"
+ TOOLKIT_DEF="${TOOLKIT_DEF} -DTARGET_CARBON"
+ CFLAGS="${CFLAGS} -fpascal-strings"
+ CPPFLAGS="${CPPFLAGS} -cpp-precomp -fpascal-strings"
+ # 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:14929: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_REZ'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ if test -n "$REZ"; then
+ ac_cv_prog_REZ="$REZ" # 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_REZ="Rez"
+ break
+ fi
+ done
+ IFS="$ac_save_ifs"
+ 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 "$ac_t""$REZ" 1>&6
+else
+ echo "$ac_t""no" 1>&6
+fi
+
+ # 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:14959: 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
+ 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
+fi
+DEREZ="$ac_cv_prog_DEREZ"
+if test -n "$DEREZ"; then
+ echo "$ac_t""$DEREZ" 1>&6
+else
+ echo "$ac_t""no" 1>&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
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="$CODE_GEN_FLAGS -fno-rtti"
+ CODE_GEN_FLAGS_CXX="$CODE_GEN_FLAGS -fno-rtti"
fi
if test "$wxUSE_NO_EXCEPTIONS" = "yes" ; then
- CODE_GEN_FLAGS="$CODE_GEN_FLAGS -fno-exceptions"
+ CODE_GEN_FLAGS_CXX="$CODE_GEN_FLAGS -fno-exceptions"
fi
if test "$wxUSE_PERMISSIVE" = "yes" ; then
CODE_GEN_FLAGS="$CODE_GEN_FLAGS -fpermissive"
fi
fi
+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
+
ZLIB_INCLUDE=
if test "$wxUSE_ZLIB" = "yes" -o "$wxUSE_ZLIB" = "sys" ; then
ZLIB_LINK=
ac_safe=`echo "zlib.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for zlib.h""... $ac_c" 1>&6
-echo "configure:12711: checking for zlib.h" >&5
+echo "configure:15112: 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 <<EOF
-#line 12716 "configure"
+#line 15117 "configure"
#include "confdefs.h"
#include <zlib.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12721: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:15122: \"$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*
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:12738: checking for deflate in -lz" >&5
+echo "configure:15139: 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
ac_save_LIBS="$LIBS"
LIBS="-lz $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 12746 "configure"
+#line 15147 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
deflate()
; return 0; }
EOF
-if { (eval echo configure:12757: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15158: \"$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
PNG_LINK=
ac_safe=`echo "png.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for png.h""... $ac_c" 1>&6
-echo "configure:12804: checking for png.h" >&5
+echo "configure:15205: 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
cat > conftest.$ac_ext <<EOF
-#line 12809 "configure"
+#line 15210 "configure"
#include "confdefs.h"
#include <png.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12814: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:15215: \"$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*
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:12831: checking for png_check_sig in -lpng" >&5
+echo "configure:15232: 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
ac_save_LIBS="$LIBS"
LIBS="-lpng -lz -lm $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 12839 "configure"
+#line 15240 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
png_check_sig()
; return 0; }
EOF
-if { (eval echo configure:12850: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15251: \"$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
JPEG_INCLUDE="-I\${top_srcdir}/src/jpeg"
else
JPEG_LINK=
- ac_safe=`echo "jpeglib.h" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for jpeglib.h""... $ac_c" 1>&6
-echo "configure:12895: checking for jpeglib.h" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+ echo $ac_n "checking for jpeglib.h""... $ac_c" 1>&6
+echo "configure:15295: 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
cat > conftest.$ac_ext <<EOF
-#line 12900 "configure"
+#line 15300 "configure"
#include "confdefs.h"
-#include <jpeglib.h>
+
+ #undef HAVE_STDLIB_H
+ #include <stdio.h>
+ #include <jpeglib.h>
+
+int main() {
+
+
+; return 0; }
EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12905: \"$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
+if { (eval echo configure:15312: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
- eval "ac_cv_header_$ac_safe=yes"
+ ac_cv_header_jpeglib_h=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"
+ ac_cv_header_jpeglib_h=no
+
fi
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 jpeg_read_header in -ljpeg""... $ac_c" 1>&6
-echo "configure:12922: checking for jpeg_read_header in -ljpeg" >&5
+
+ 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:15330: 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
ac_save_LIBS="$LIBS"
LIBS="-ljpeg $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 12930 "configure"
+#line 15338 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
jpeg_read_header()
; return 0; }
EOF
-if { (eval echo configure:12941: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15349: \"$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 "$ac_t""no" 1>&6
fi
-else
- echo "$ac_t""no" 1>&6
-fi
+ fi
if test "x$JPEG_LINK" = "x" ; then
{ echo "configure: error: system jpeg library not found! Use --with-libjpeg=yes to use the built-in one" 1>&2; exit 1; }
#define wxUSE_LIBTIFF 1
EOF
- if test "$wxUSE_LIBTIFF" = "yes" ; then
+ if test "$wxUSE_LIBTIFF" = "yes" ; then
TIFF_INCLUDE="-I\${top_srcdir}/src/tiff"
else
TIFF_LINK=
ac_safe=`echo "tiffio.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for tiffio.h""... $ac_c" 1>&6
-echo "configure:12983: checking for tiffio.h" >&5
+echo "configure:15389: 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
cat > conftest.$ac_ext <<EOF
-#line 12988 "configure"
+#line 15394 "configure"
#include "confdefs.h"
#include <tiffio.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12993: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:15399: \"$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*
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:13010: checking for TIFFError in -ltiff" >&5
+echo "configure:15416: 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
ac_save_LIBS="$LIBS"
LIBS="-ltiff -lm $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 13018 "configure"
+#line 15424 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
TIFFError()
; return 0; }
EOF
-if { (eval echo configure:13029: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15435: \"$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
FREETYPE_LINK=
ac_safe=`echo "freetype.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for freetype.h""... $ac_c" 1>&6
-echo "configure:13071: checking for freetype.h" >&5
+echo "configure:15477: 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
cat > conftest.$ac_ext <<EOF
-#line 13076 "configure"
+#line 15482 "configure"
#include "confdefs.h"
#include <freetype.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13081: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:15487: \"$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*
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:13098: checking for FT_Render_Glyph in -lfreetype" >&5
+echo "configure:15504: 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
ac_save_LIBS="$LIBS"
LIBS="-lfreetype -lm $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 13106 "configure"
+#line 15512 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
FT_Render_Glyph()
; return 0; }
EOF
-if { (eval echo configure:13117: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15523: \"$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
fi
if test "$wxUSE_OPENGL" = "yes"; then
- ac_safe=`echo "GL/gl.h" | sed 'y%./+-%__p_%'`
+ 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_LINK="-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:13151: checking for GL/gl.h" >&5
+echo "configure:15569: 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
-#line 13156 "configure"
+#line 15574 "configure"
#include "confdefs.h"
#include <GL/gl.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13161: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:15579: \"$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*
if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
echo "$ac_t""yes" 1>&6
- cat >> confdefs.h <<\EOF
+ cat >> confdefs.h <<\EOF
#define wxUSE_OPENGL 1
EOF
- cat >> confdefs.h <<\EOF
+ cat >> confdefs.h <<\EOF
#define wxUSE_GLCANVAS 1
EOF
- echo $ac_n "checking for glFlush in -lGL""... $ac_c" 1>&6
-echo "configure:13187: checking for glFlush in -lGL" >&5
+ SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS opengl"
+ echo $ac_n "checking for glFlush in -lGL""... $ac_c" 1>&6
+echo "configure:15606: 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
ac_save_LIBS="$LIBS"
LIBS="-lGL $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 13195 "configure"
+#line 15614 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
glFlush()
; return 0; }
EOF
-if { (eval echo configure:13206: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15625: \"$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
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
echo "$ac_t""yes" 1>&6
- OPENGL_LINK="-lGL -lGLU"
-
+ OPENGL_LINK="-lGL -lGLU"
+
else
echo "$ac_t""no" 1>&6
- echo $ac_n "checking for glFlush in -lMesaGL""... $ac_c" 1>&6
-echo "configure:13228: checking for glFlush in -lMesaGL" >&5
+ echo $ac_n "checking for glFlush in -lMesaGL""... $ac_c" 1>&6
+echo "configure:15647: 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
ac_save_LIBS="$LIBS"
LIBS="-lMesaGL $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 13236 "configure"
+#line 15655 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
glFlush()
; return 0; }
EOF
-if { (eval echo configure:13247: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15666: \"$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
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
echo "$ac_t""yes" 1>&6
- OPENGL_LINK="-lMesaGL -lMesaGLU"
-
+ OPENGL_LINK="-lMesaGL -lMesaGLU"
+
else
echo "$ac_t""no" 1>&6
fi
-
+
fi
-
+
else
echo "$ac_t""no" 1>&6
wxUSE_OPENGL=0
fi
+ fi
fi
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
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
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
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
#define wxUSE_LOG 1
EOF
+
+ if test "$wxUSE_LOGGUI" = "yes"; then
+ cat >> confdefs.h <<\EOF
+#define wxUSE_LOGGUI 1
+EOF
+
+ fi
+
+ if test "$wxUSE_LOGWINDOW" = "yes"; then
+ cat >> confdefs.h <<\EOF
+#define wxUSE_LOGWINDOW 1
+EOF
+
+ fi
fi
if test "$wxUSE_LONGLONG" = "yes"; then
fi
-if test "$wxUSE_TIMEDATE" = "yes"; then
+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:13450: checking for $ac_func" >&5
+echo "configure:15933: 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 <<EOF
-#line 13455 "configure"
+#line 15938 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
; return 0; }
EOF
-if { (eval echo configure:13478: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15961: \"$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 $ac_n "checking for timezone variable in <time.h>""... $ac_c" 1>&6
-echo "configure:13504: checking for timezone variable in <time.h>" >&5
+echo "configure:15987: checking for timezone variable in <time.h>" >&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 <<EOF
-#line 13510 "configure"
+#line 15993 "configure"
#include "confdefs.h"
#include <time.h>
int main() {
int tz;
- tz = __timezone;
+ tz = timezone;
; return 0; }
EOF
-if { (eval echo configure:13522: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:16005: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
- wx_cv_var_timezone=__timezone
+ wx_cv_var_timezone=timezone
else
echo "configure: failed program was:" >&5
rm -rf conftest*
cat > conftest.$ac_ext <<EOF
-#line 13533 "configure"
+#line 16016 "configure"
#include "confdefs.h"
#include <time.h>
; return 0; }
EOF
-if { (eval echo configure:13545: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:16028: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
wx_cv_var_timezone=_timezone
rm -rf conftest*
cat > conftest.$ac_ext <<EOF
-#line 13556 "configure"
+#line 16039 "configure"
#include "confdefs.h"
#include <time.h>
int main() {
int tz;
- tz = timezone;
+ tz = __timezone;
; return 0; }
EOF
-if { (eval echo configure:13568: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:16051: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
- wx_cv_var_timezone=timezone
+ wx_cv_var_timezone=__timezone
else
echo "configure: failed program was:" >&5
for ac_func in localtime
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:13603: checking for $ac_func" >&5
+echo "configure:16086: 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 <<EOF
-#line 13608 "configure"
+#line 16091 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
; return 0; }
EOF
-if { (eval echo configure:13631: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:16114: \"$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
if test "$ac_cv_func_localtime" = "yes"; then
echo $ac_n "checking for tm_gmtoff in struct tm""... $ac_c" 1>&6
-echo "configure:13658: checking for tm_gmtoff in struct tm" >&5
+echo "configure:16141: 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 <<EOF
-#line 13664 "configure"
+#line 16147 "configure"
#include "confdefs.h"
#include <time.h>
; return 0; }
EOF
-if { (eval echo configure:13676: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:16159: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
wx_cv_struct_tm_has_gmtoff=yes
- cat >> confdefs.h <<\EOF
-#define WX_GMTOFF_IN_TM 1
-EOF
-
else
echo "configure: failed program was:" >&5
fi
echo "$ac_t""$wx_cv_struct_tm_has_gmtoff" 1>&6
+ fi
+
+ if test "$wx_cv_struct_tm_has_gmtoff" = "yes"; then
+ cat >> confdefs.h <<\EOF
+#define WX_GMTOFF_IN_TM 1
+EOF
+
fi
for ac_func in gettimeofday ftime
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:13702: checking for $ac_func" >&5
+echo "configure:16188: 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 <<EOF
-#line 13707 "configure"
+#line 16193 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
; return 0; }
EOF
-if { (eval echo configure:13730: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:16216: \"$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
if test "$ac_cv_func_gettimeofday" = "yes"; then
echo $ac_n "checking whether gettimeofday takes two arguments""... $ac_c" 1>&6
-echo "configure:13757: checking whether gettimeofday takes two arguments" >&5
+echo "configure:16243: 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
cat > conftest.$ac_ext <<EOF
-#line 13772 "configure"
+#line 16258 "configure"
#include "confdefs.h"
#include <sys/time.h>
; return 0; }
EOF
-if { (eval echo configure:13786: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:16272: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
wx_cv_func_gettimeofday_has_2_args=yes
else
cat conftest.$ac_ext >&5
rm -rf conftest*
cat > conftest.$ac_ext <<EOF
-#line 13794 "configure"
+#line 16280 "configure"
#include "confdefs.h"
#include <sys/time.h>
; return 0; }
EOF
-if { (eval echo configure:13807: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:16293: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
wx_cv_func_gettimeofday_has_2_args=no
else
if test "$wxUSE_SOCKETS" = "yes"; then
echo $ac_n "checking for socket""... $ac_c" 1>&6
-echo "configure:13853: checking for socket" >&5
+echo "configure:16339: 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 <<EOF
-#line 13858 "configure"
+#line 16344 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char socket(); below. */
; return 0; }
EOF
-if { (eval echo configure:13881: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:16367: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_socket=yes"
else
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6
-echo "configure:13899: checking for socket in -lsocket" >&5
+echo "configure:16385: 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
ac_save_LIBS="$LIBS"
LIBS="-lsocket $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 13907 "configure"
+#line 16393 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
socket()
; return 0; }
EOF
-if { (eval echo configure:13918: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:16404: \"$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
fi
-fi
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:13952: checking what is the type of the third argument of getsockname" >&5
+echo "configure:16437: 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
cat > conftest.$ac_ext <<EOF
-#line 13967 "configure"
+#line 16452 "configure"
#include "confdefs.h"
#include <sys/types.h>
; return 0; }
EOF
-if { (eval echo configure:13980: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:16465: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
wx_cv_type_getsockname3=socklen_t
else
cat conftest.$ac_ext >&5
rm -rf conftest*
cat > conftest.$ac_ext <<EOF
-#line 13988 "configure"
+#line 16473 "configure"
#include "confdefs.h"
#include <sys/types.h>
; return 0; }
EOF
-if { (eval echo configure:14001: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:16486: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
wx_cv_type_getsockname3=size_t
else
cat conftest.$ac_ext >&5
rm -rf conftest*
cat > conftest.$ac_ext <<EOF
-#line 14009 "configure"
+#line 16494 "configure"
#include "confdefs.h"
#include <sys/types.h>
; return 0; }
EOF
-if { (eval echo configure:14022: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:16507: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
wx_cv_type_getsockname3=int
else
fi
fi
+fi
+
if test "$wxUSE_SOCKETS" = "yes" ; then
cat >> confdefs.h <<\EOF
#define wxUSE_SOCKETS 1
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:14082: checking for $ac_hdr" >&5
+echo "configure:16569: 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
-#line 14087 "configure"
+#line 16574 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:14092: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:16579: \"$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*
HAVE_DL_FUNCS=0
HAVE_SHL_FUNCS=0
if test "$wxUSE_DYNLIB_CLASS" = "yes"; then
- if test "$USE_MAC" = 1; then
+ if test "$USE_DARWIN" = 1; then
HAVE_DL_FUNCS=1
else
for ac_func in dlopen
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:14148: checking for $ac_func" >&5
+echo "configure:16635: 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 <<EOF
-#line 14153 "configure"
+#line 16640 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
; return 0; }
EOF
-if { (eval echo configure:14176: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:16663: \"$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
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
-echo "configure:14204: checking for dlopen in -ldl" >&5
+echo "configure:16691: 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
ac_save_LIBS="$LIBS"
LIBS="-ldl $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 14212 "configure"
+#line 16699 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
dlopen()
; return 0; }
EOF
-if { (eval echo configure:14223: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:16710: \"$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
for ac_func in shl_load
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:14252: checking for $ac_func" >&5
+echo "configure:16739: 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 <<EOF
-#line 14257 "configure"
+#line 16744 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
; return 0; }
EOF
-if { (eval echo configure:14280: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:16767: \"$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
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for dld in -lshl_load""... $ac_c" 1>&6
-echo "configure:14308: checking for dld in -lshl_load" >&5
+echo "configure:16795: 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
ac_save_LIBS="$LIBS"
LIBS="-lshl_load $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 14316 "configure"
+#line 16803 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
dld()
; return 0; }
EOF
-if { (eval echo configure:14327: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:16814: \"$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
for ac_func in dlerror
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:14366: checking for $ac_func" >&5
+echo "configure:16853: 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 <<EOF
-#line 14371 "configure"
+#line 16858 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
; return 0; }
EOF
-if { (eval echo configure:14394: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:16881: \"$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
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for dlerror in -ldl""... $ac_c" 1>&6
-echo "configure:14419: checking for dlerror in -ldl" >&5
+echo "configure:16906: 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
ac_save_LIBS="$LIBS"
LIBS="-ldl $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 14427 "configure"
+#line 16914 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
dlerror()
; return 0; }
EOF
-if { (eval echo configure:14438: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:16925: \"$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
fi
+if test "$wxUSE_FONTMAP" = "yes" ; then
+ cat >> confdefs.h <<\EOF
+#define wxUSE_FONTMAP 1
+EOF
+
+fi
+
if test "$wxUSE_UNICODE" = "yes" ; then
cat >> confdefs.h <<\EOF
#define wxUSE_UNICODE 1
WXODBCFLAG="-D_IODBC_"
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS db"
- IODBCOBJS="\$(IODBC_OBJS)"
-else
- IODBCOBJS=
fi
#define wxUSE_DOC_VIEW_ARCHITECTURE 1
EOF
- SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS docview"
- if test "$wxUSE_MDI_ARCHITECTURE" = "yes"; then
- SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS docvwmdi"
+ 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
+
+ SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS help"
+
+ 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:17083: 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 <<EOF
+#line 17088 "configure"
+#include "confdefs.h"
+#include <htmlhelp.h>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:17093: \"$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_MS_HTML_HELP 1
+EOF
+
+
+else
+ echo "$ac_t""no" 1>&6
+
+ echo "configure: warning: MS HTML Help cannot be used without htmlhelp.h so it won't be compiled without it" 1>&2
+ wxUSE_MS_HTML_HELP=no
+
+fi
+
+ fi
fi
-fi
-if test "$wxUSE_HELP" = "yes"; then
- cat >> confdefs.h <<\EOF
-#define wxUSE_HELP 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 help"
+ 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 "$wxUSE_PRINTING_ARCHITECTURE" = "yes" ; then
fi
if test "$wxUSE_RESOURCES" = "yes" ; then
- if test "$wxUSE_PROLOGIO" = "yes" ; then
- cat >> confdefs.h <<\EOF
+ cat >> confdefs.h <<\EOF
#define wxUSE_RESOURCES 1
EOF
- SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS resource"
- else
- echo "configure: warning: wxWindows ressource system requires PrologIO and can't be compiled without it." 1>&2
- fi
+ SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS resource"
fi
if test "$wxUSE_X_RESOURCES" = "yes"; then
if test "$wxUSE_CLIPBOARD" = "yes"; then
cat >> confdefs.h <<\EOF
#define wxUSE_CLIPBOARD 1
+EOF
+
+ cat >> confdefs.h <<\EOF
+#define wxUSE_DATAOBJ 1
EOF
fi
wxUSE_DRAG_AND_DROP=no
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 "$USE_WIN32" = 1; then
- for ac_hdr in ole2.h
+
+ for ac_hdr in ole2.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:14664: checking for $ac_hdr" >&5
+echo "configure:17220: 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
-#line 14669 "configure"
+#line 17225 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:14674: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:17230: \"$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*
fi
done
- if test "x$HAVE_OLE2_H" = x ; then
+
+ 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 -lrpcrt4 -loleaut32 -lole32 -luuid"
+ cat >> confdefs.h <<\EOF
+#define wxUSE_OLE 1
+EOF
+
+
+ if test "$wxUSE_METAFILE" = "yes"; then
+ cat >> confdefs.h <<\EOF
+#define wxUSE_METAFILE 1
+EOF
+
+ cat >> confdefs.h <<\EOF
+#define wxUSE_ENH_METAFILE 1
+EOF
+
+ fi
+ fi
+ else
echo "configure: warning: Drag and drop disabled because OLE headers not found" 1>&2
wxUSE_DRAG_AND_DROP=no
fi
fi
+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_BUTTON" = "yes"; then
+ cat >> confdefs.h <<\EOF
+#define wxUSE_BUTTON 1
+EOF
+
+ USES_CONTROLS=1
+fi
+
+if test "$wxUSE_BMPBUTTON" = "yes"; then
+ cat >> confdefs.h <<\EOF
+#define wxUSE_BMPBUTTON 1
+EOF
+
+ USES_CONTROLS=1
+fi
+
+if test "$wxUSE_CALCTRL" = "yes"; then
+ cat >> confdefs.h <<\EOF
+#define wxUSE_CALENDARCTRL 1
+EOF
+
+ USES_CONTROLS=1
+ SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS calendar"
fi
if test "$wxUSE_CARET" = "yes"; then
#define wxUSE_CARET 1
EOF
+ USES_CONTROLS=1
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS caret"
fi
#define wxUSE_COMBOBOX 1
EOF
+ USES_CONTROLS=1
fi
if test "$wxUSE_CHOICE" = "yes"; then
#define wxUSE_CHOICE 1
EOF
-fi
-
-if test "$wxUSE_BMPBUTTON" = "yes"; then
- cat >> confdefs.h <<\EOF
-#define wxUSE_BMPBUTTON 1
-EOF
-
+ USES_CONTROLS=1
fi
if test "$wxUSE_CHECKBOX" = "yes"; then
#define wxUSE_CHECKBOX 1
EOF
+ USES_CONTROLS=1
fi
if test "$wxUSE_CHECKLST" = "yes"; then
#define wxUSE_CHECKLISTBOX 1
EOF
+ USES_CONTROLS=1
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS checklst"
fi
#define wxUSE_GAUGE 1
EOF
+ USES_CONTROLS=1
fi
if test "$wxUSE_NEW_GRID" = "yes"; then
#define wxUSE_NEW_GRID 1
EOF
+ USES_CONTROLS=1
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS newgrid"
fi
#define wxUSE_GRID 1
EOF
+ USES_CONTROLS=1
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS grid"
fi
#define wxUSE_LISTBOX 1
EOF
+ USES_CONTROLS=1
fi
if test "$wxUSE_LISTCTRL" = "yes"; then
#define wxUSE_LISTCTRL 1
EOF
+ USES_CONTROLS=1
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS listctrl"
else
echo "configure: warning: wxListCtrl requires wxImageList and won't be compiled without it" 1>&2
#define wxUSE_NOTEBOOK 1
EOF
+ USES_CONTROLS=1
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS notebook"
fi
+if test "$wxUSE_PROPSHEET" = "yes"; then
+ cat >> confdefs.h <<\EOF
+#define wxUSE_PROPSHEET 1
+EOF
+
+ 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_RADIOBTN" = "yes"; then
#define wxUSE_RADIOBTN 1
EOF
+ USES_CONTROLS=1
fi
if test "$wxUSE_SASH" = "yes"; then
#define wxUSE_SCROLLBAR 1
EOF
+ USES_CONTROLS=1
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS scroll scrollsub"
fi
#define wxUSE_SLIDER 1
EOF
+ USES_CONTROLS=1
fi
if test "$wxUSE_SPINBTN" = "yes"; then
#define wxUSE_SPINBTN 1
EOF
+ USES_CONTROLS=1
fi
if test "$wxUSE_SPINCTRL" = "yes"; then
#define wxUSE_SPINCTRL 1
EOF
+ USES_CONTROLS=1
fi
if test "$wxUSE_SPLITTER" = "yes"; then
#define wxUSE_STATBMP 1
EOF
+ USES_CONTROLS=1
fi
if test "$wxUSE_STATBOX" = "yes"; then
#define wxUSE_STATBOX 1
EOF
+ USES_CONTROLS=1
+fi
+
+if test "$wxUSE_STATTEXT" = "yes"; then
+ cat >> confdefs.h <<\EOF
+#define wxUSE_STATTEXT 1
+EOF
+
+ USES_CONTROLS=1
fi
if test "$wxUSE_STATLINE" = "yes"; then
#define wxUSE_STATLINE 1
EOF
+ USES_CONTROLS=1
fi
fi
#define wxUSE_STATUSBAR 1
EOF
+ USES_CONTROLS=1
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS statbar"
fi
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS tab"
fi
+if test "$wxUSE_TEXTCTRL" = "yes"; then
+ cat >> confdefs.h <<\EOF
+#define wxUSE_TEXTCTRL 1
+EOF
+
+ USES_CONTROLS=1
+ SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS text"
+fi
+
+if test "$wxUSE_TOGGLEBTN" = "yes"; then
+ if test "$wxUSE_MAC" = 1; then
+ echo "configure: warning: Toggle button is not yet supported under Mac OS X" 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_TOOLBAR_SIMPLE" = "yes"; then
cat >> confdefs.h <<\EOF
#define wxUSE_TOOLBAR_SIMPLE 1
EOF
wxUSE_TOOLBAR="yes"
+ USES_CONTROLS=1
fi
if test "$wxUSE_TOOLBAR" = "yes"; then
#define wxUSE_TOOLBAR 1
EOF
+ USES_CONTROLS=1
if test "$wxUSE_TOOLBAR_SIMPLE" != "yes"; then
wxUSE_TOOLBAR_NATIVE="yes"
fi
- SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS toolbar"
-fi
-
-if test "$wxUSE_TOOLBAR_NATIVE" = "yes"; then
- cat >> confdefs.h <<\EOF
+ 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_TOOLTIPS" = "yes"; then
#define wxUSE_TREECTRL 1
EOF
+ 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_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_METAFILE" = "yes"; then
+if test "$USES_CONTROLS" = 1; then
cat >> confdefs.h <<\EOF
-#define wxUSE_METAFILE 1
+#define wxUSE_CONTROLS 1
EOF
fi
-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
+
+if test "$wxUSE_TREELAYOUT" = "yes"; then
+ cat >> confdefs.h <<\EOF
+#define wxUSE_TREELAYOUT 1
EOF
- fi
- fi
+ SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS treelay"
fi
-if test "$wxUSE_TEXTDLG" = "yes"; then
+if test "$wxUSE_DRAGIMAGE" = "yes"; then
cat >> confdefs.h <<\EOF
-#define wxUSE_TEXTDLG 1
+#define wxUSE_DRAGIMAGE 1
EOF
+ SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS dragimag"
fi
-if test "$wxUSE_STARTUP_TIPS" = "yes"; then
- if test "$wxUSE_CONSTRAINTS" != "yes"; then
- echo "configure: warning: Startup tips requires constraints and won't be compiled without them" 1>&2
- else
- cat >> confdefs.h <<\EOF
-#define wxUSE_STARTUP_TIPS 1
+if test "$wxUSE_MENUS" = "yes"; then
+ cat >> confdefs.h <<\EOF
+#define wxUSE_MENUS 1
EOF
- fi
+ SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS menu"
fi
-if test "$wxUSE_PROGRESSDLG" = "yes"; then
- if test "$wxUSE_CONSTRAINTS" != "yes"; then
- echo "configure: warning: wxProgressDialog requires constraints so it won't be compiled without them" 1>&2
- else
- cat >> confdefs.h <<\EOF
-#define wxUSE_PROGRESSDLG 1
+if test "$wxUSE_METAFILE" = "yes"; then
+ cat >> confdefs.h <<\EOF
+#define wxUSE_METAFILE 1
+EOF
+
+fi
+
+if test "$wxUSE_MIMETYPE" = "yes"; then
+ cat >> confdefs.h <<\EOF
+#define wxUSE_MIMETYPE 1
+EOF
+
+fi
+
+if test "$wxUSE_SYSTEM_OPTIONS" = "yes"; then
+ cat >> confdefs.h <<\EOF
+#define wxUSE_SYSTEM_OPTIONS 1
EOF
- fi
fi
if test "$wxUSE_MINIFRAME" = "yes"; then
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
fi
+if test "$wxUSE_XPM" = "yes" ; then
+ cat >> confdefs.h <<\EOF
+#define wxUSE_XPM 1
+EOF
+
+fi
+
+
+if test "$wxUSE_CHOICEDLG" = "yes"; then
+ cat >> confdefs.h <<\EOF
+#define wxUSE_CHOICEDLG 1
+EOF
+
+fi
+
+if test "$wxUSE_COLOURDLG" = "yes"; then
+ cat >> confdefs.h <<\EOF
+#define wxUSE_COLOURDLG 1
+EOF
+
+fi
+
+if test "$wxUSE_FILEDLG" = "yes"; then
+ cat >> confdefs.h <<\EOF
+#define wxUSE_FILEDLG 1
+EOF
+
+fi
+
+if test "$wxUSE_FINDREPLDLG" = "yes"; then
+ cat >> confdefs.h <<\EOF
+#define wxUSE_FINDREPLDLG 1
+EOF
+
+fi
+
+if test "$wxUSE_FONTDLG" = "yes"; then
+ cat >> confdefs.h <<\EOF
+#define wxUSE_FONTDLG 1
+EOF
+
+fi
+
+if test "$wxUSE_DIRDLG" = "yes"; then
+ if test "$wxUSE_CONSTRAINTS" != "yes"; then
+ echo "configure: warning: wxDirDialog requires constraints so it won't be compiled without them" 1>&2
+ else
+ if test "$wxUSE_TREECTRL" != "yes"; then
+ echo "configure: warning: wxDirDialog requires wxTreeCtrl so it won't be compiled without it" 1>&2
+ else
+ cat >> confdefs.h <<\EOF
+#define wxUSE_DIRDLG 1
+EOF
+
+ fi
+ fi
+fi
+
+if test "$wxUSE_MSGDLG" = "yes"; then
+ cat >> confdefs.h <<\EOF
+#define wxUSE_MSGDLG 1
+EOF
+
+fi
+
+if test "$wxUSE_NUMBERDLG" = "yes"; then
+ cat >> confdefs.h <<\EOF
+#define wxUSE_NUMBERDLG 1
+EOF
+
+fi
+
+if test "$wxUSE_PROGRESSDLG" = "yes"; then
+ if test "$wxUSE_CONSTRAINTS" != "yes"; then
+ echo "configure: warning: wxProgressDialog requires constraints so it won't be compiled without them" 1>&2
+ else
+ cat >> confdefs.h <<\EOF
+#define wxUSE_PROGRESSDLG 1
+EOF
+
+ fi
+fi
+
+if test "$wxUSE_STARTUP_TIPS" = "yes"; then
+ if test "$wxUSE_CONSTRAINTS" != "yes"; then
+ echo "configure: warning: Startup tips requires constraints and won't be compiled without them" 1>&2
+ else
+ cat >> confdefs.h <<\EOF
+#define wxUSE_STARTUP_TIPS 1
+EOF
+
+ fi
+fi
+
+if test "$wxUSE_TEXTDLG" = "yes"; then
+ cat >> confdefs.h <<\EOF
+#define wxUSE_TEXTDLG 1
+EOF
+
+fi
+
+if test "$wxUSE_WIZARDDLG" = "yes"; then
+ cat >> confdefs.h <<\EOF
+#define wxUSE_WIZARDDLG 1
+EOF
+
+ SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS wizard"
+fi
+
if test "$cross_compiling" = "yes"; then
OSINFO="\"$host\""
GUILIBS="$GUI_TK_LIBRARY $TOOLKIT_LINK"
OPENGL_LIBS="$OPENGL_LINK"
-if test "$USE_MAC" = 1 ; then
- EXTRA_LIBS="$LIBS $POSIX4_LINK $INET_LINK $WCHAR_LINK $THREADS_LINK $DMALLOC_LINK $DL_LINK $ZLIB_LINK -framework System"
- CFLAGS="${CFLAGS} -fpascal-strings"
- CPPFLAGS="${CPPFLAGS} -fpascal-strings"
-else
- EXTRA_LIBS="$LIBS $POSIX4_LINK $INET_LINK $WCHAR_LINK $THREADS_LINK $DMALLOC_LINK $DL_LINK $ZLIB_LINK -lm"
+EXTRA_LIBS="$LIBS $POSIX4_LINK $INET_LINK $WCHAR_LINK $THREADS_LINK $DMALLOC_LINK $DL_LINK $ZLIB_LINK -lm"
+if test "$wxUSE_MAC" = 1 ; then
+ EXTRA_LIBS="$EXTRA_LIBS -framework Carbon -framework System"
fi
if test "$wxUSE_GUI" = "yes"; then
EXTRA_LIBS="$GUILIBS $PNG_LINK $JPEG_LINK $TIFF_LINK $FREETYPE_LINK $EXTRA_LIBS"
LD_LIBS="\${top_builddir}/lib/${WX_LIBRARY_NAME_STATIC} $EXTRA_LIBS"
-INCLUDES="-I. -I\${top_builddir}/include -I\${top_srcdir}/include $ZLIB_INCLUDE $PNG_INCLUDE $JPEG_INCLUDE $TIFF_INCLUDE $FREETYPE_INCLUDE $TOOLKIT_INCLUDE"
+INCLUDES="-I. -I\${top_builddir}/include -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=""
if test "$wxUSE_GUI" = "yes"; then
- SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS controls dialogs dragimag \
- drawing dynamic event font fractal image menu \
- minimal richedit"
+ SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS controls dialogs \
+ drawing dynamic erase event exec font image \
+ minimal richedit rotate widgets"
+
+ if test "$wxUSE_UNIVERSAL" = "yes" ; then
+ SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS univ"
+ fi
CPPFLAGS="$CPPFLAGS \$(EXTRADEFS) \$(APPEXTRADEFS)"
else
- SAMPLES_SUBDIRS=""
+ SAMPLES_SUBDIRS="console"
fi
SAMPLES_SUBDIRS="`echo $SAMPLES_SUBDIRS | tr -s ' ' | tr ' ' '\n' | sort | uniq | tr '\n' ' '| tr -d '\r'`"
echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:15244: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:18044: 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
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
+ if test -d include/wx/${SETUPH_DIR}; then
+ if test -f include/wx/${SETUPH_DIR}/setup.h; then
+ mv -f include/wx/${SETUPH_DIR}/setup.h setup.h
fi
fi
fi
fi
-
+
if test "$wxUSE_GUI" = "yes"; then
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_library_gl wx_cv_target_libtype
subdirs="demos samples utils contrib"
fi
s%@LEXLIB@%$LEXLIB%g
s%@LN_S@%$LN_S%g
s%@GTK_CONFIG_2_0@%$GTK_CONFIG_2_0%g
-s%@GTK_CONFIG@%$GTK_CONFIG%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%@REZ@%$REZ%g
+s%@DEREZ@%$DEREZ%g
s%@LEX_STEM@%$LEX_STEM%g
s%@PATH_IFS@%$PATH_IFS%g
s%@WX_MAJOR_VERSION_NUMBER@%$WX_MAJOR_VERSION_NUMBER%g
s%@PIC_FLAG@%$PIC_FLAG%g
s%@DEP_INFO_FLAGS@%$DEP_INFO_FLAGS%g
s%@CODE_GEN_FLAGS@%$CODE_GEN_FLAGS%g
+s%@CODE_GEN_FLAGS_CXX@%$CODE_GEN_FLAGS_CXX%g
s%@BURNT_LIBRARY_NAME@%$BURNT_LIBRARY_NAME%g
s%@BURNT_LIBRARY_NAME_GL@%$BURNT_LIBRARY_NAME_GL%g
s%@WX_TARGET_LIBRARY_SONAME@%$WX_TARGET_LIBRARY_SONAME%g
s%@WXDEBUG_DEFINE@%$WXDEBUG_DEFINE%g
s%@USE_GUI@%$USE_GUI%g
s%@AFMINSTALL@%$AFMINSTALL%g
+s%@SETUPH_DIR@%$SETUPH_DIR%g
s%@TOOLKIT@%$TOOLKIT%g
s%@TOOLKIT_DEF@%$TOOLKIT_DEF%g
s%@TOOLKIT_DIR@%$TOOLKIT_DIR%g
s%@TOOLKIT_NAME@%$TOOLKIT_NAME%g
s%@TOOLKIT_INCLUDE@%$TOOLKIT_INCLUDE%g
+s%@TOOLKIT_VPATH@%$TOOLKIT_VPATH%g
s%@WXCONFIG_INCLUDE@%$WXCONFIG_INCLUDE%g
-s%@GUIHEADERS@%$GUIHEADERS%g
-s%@GUIOBJS@%$GUIOBJS%g
-s%@COMMONOBJS@%$COMMONOBJS%g
-s%@GENERICOBJS@%$GENERICOBJS%g
-s%@GUIDEPS@%$GUIDEPS%g
-s%@COMMONDEPS@%$COMMONDEPS%g
-s%@GENERICDEPS@%$GENERICDEPS%g
-s%@IODBCOBJS@%$IODBCOBJS%g
-s%@UNIXOBJS@%$UNIXOBJS%g
-s%@UNIXDEPS@%$UNIXDEPS%g
s%@ALL_OBJECTS@%$ALL_OBJECTS%g
s%@ALL_DEPFILES@%$ALL_DEPFILES%g
s%@GUIDIST@%$GUIDIST%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%@RCINPUTSWITCH@%$RCINPUTSWITCH%g
s%@RCOUTPUTSWITCH@%$RCOUTPUTSWITCH%g
s%@RESPROGRAM@%$RESPROGRAM%g
s%@RESCOMP@%$RESCOMP%g
s%@RESFLAGS@%$RESFLAGS%g
+s%@REZFLAGS@%$REZFLAGS%g
+s%@DEREZFLAGS@%$DEREZFLAGS%g
+s%@LIBWXMACRES@%$LIBWXMACRES%g
+s%@LIBWXMACRESCOMP@%$LIBWXMACRESCOMP%g
s%@DLLTOOL@%$DLLTOOL%g
s%@AS@%$AS%g
s%@NM@%$NM%g
EOF
cat >> $CONFIG_STATUS <<EOF
- TOOLKIT_DIR="${TOOLKIT_DIR}"
+ SETUPH_DIR="${SETUPH_DIR}"
TOOLKIT_NAME="${TOOLKIT_NAME}"
LN_S="${LN_S}"
EOF
cat >> $CONFIG_STATUS <<\EOF
- chmod +x wx-config
- mv wx-config wx${TOOLKIT_NAME}-config
- ${LN_S} wx${TOOLKIT_NAME}-config wx-config
-
-
+ if test ! -f wx${TOOLKIT_NAME}-config; then
+ chmod +x wx-config
+ mv wx-config wx${TOOLKIT_NAME}-config
+ ${LN_S} wx${TOOLKIT_NAME}-config wx-config
+ fi
+
+
if test ! -d lib; then
mkdir lib
fi
mkdir lib/wx/include/wx/${TOOLKIT_NAME}
fi
if test -f setup.h; then
- cp -f setup.h lib/wx/include/wx/${TOOLKIT_NAME}/setup.h
+ cp -fp setup.h lib/wx/include/wx/${TOOLKIT_NAME}/setup.h
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 include/wx/${SETUPH_DIR}; then
+ mkdir include/wx/${SETUPH_DIR}
fi
if test -f setup.h; then
- mv -f setup.h include/wx/${TOOLKIT_DIR}/setup.h
+ cp -fp setup.h include/wx/${SETUPH_DIR}/setup.h
fi
-
+
exit 0
EOF
projects / wxWidgets.git / blobdiff