X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1e6feb95a79834836e88143b15d9f424ebe79621..3e44f09d771f3a7910e1b6bf17baa19a8f11de82:/configure diff --git a/configure b/configure index 6b6fae67f6..fcaee44aed 100755 --- a/configure +++ b/configure @@ -35,12 +35,13 @@ + +# 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. @@ -55,9 +56,9 @@ ac_help= 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" + --enable-universal use wxWindows GUI controls instead of native ones" ac_help="$ac_help --with-gtk use GTK+" ac_help="$ac_help @@ -75,277 +76,293 @@ ac_help="$ac_help ac_help="$ac_help --with-mgl use MGL" ac_help="$ac_help - --with-gtk-prefix=PFX Prefix where GTK is installed" + --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-gtk-exec-prefix=PFX Exec prefix where GTK is installed" + --with-freetype use freetype (font rasterizer)" ac_help="$ac_help ---with-libpng use libpng (PNG image format)" + --with-opengl use OpenGL (or Mesa)" ac_help="$ac_help ---with-libjpeg use libjpeg (JPEG file format)" + --with-dmalloc use dmalloc library (www.letters.com/dmalloc)" ac_help="$ac_help ---with-libtiff use libtiff (TIFF file format)" + --with-regex enable support for wxRegEx class" ac_help="$ac_help ---with-freetype use freetype (font rasterizer)" + --with-zlib use zlib for LZW compression" ac_help="$ac_help ---with-opengl use OpenGL (or Mesa)" + --with-odbc use the IODBC and wxODBC classes" ac_help="$ac_help ---with-dmalloc use dmalloc library (www.letters.com/dmalloc)" + --enable-shared create shared library code" ac_help="$ac_help ---with-zlib use zlib for LZW compression" + --enable-burnt_name create set name in shared library " ac_help="$ac_help ---with-odbc use the IODBC and wxODBC classes" + --enable-optimise create optimised code" ac_help="$ac_help ---enable-shared create shared library code" + --enable-debug same as debug_flag and debug_info" ac_help="$ac_help ---enable-burnt_name create set name in shared library " + --enable-debug_flag set __WXDEBUG__ flag (recommended for developers!)" ac_help="$ac_help ---enable-optimise create optimised code" + --enable-debug_info create code with debugging information" ac_help="$ac_help ---enable-debug same as debug_flag and debug_info" + --enable-debug_gdb create code with extra GDB debugging information" ac_help="$ac_help ---enable-debug_flag set __WXDEBUG__ flag (recommended for developers!)" + --enable-debug_cntxt use wxDebugContext" ac_help="$ac_help ---enable-debug_info create code with debugging information" + --enable-mem_tracing create code with memory tracing" ac_help="$ac_help ---enable-debug_gdb create code with extra GDB debugging information" + --enable-profile create code with profiling information" ac_help="$ac_help ---enable-debug_cntxt use wxDebugContext" + --enable-no_rtti create code without RTTI information" ac_help="$ac_help ---enable-mem_tracing create code with memory tracing" + --enable-no_exceptions create code without exceptions information" ac_help="$ac_help ---enable-profile create code with profiling information" + --enable-permissive compile code disregarding strict ANSI" ac_help="$ac_help ---enable-no_rtti create code without RTTI information" + --enable-no_deps create code without dependency information" ac_help="$ac_help ---enable-no_exceptions create code without exceptions information" + --enable-compat20 enable wxWin 2.0 compatibility" ac_help="$ac_help ---enable-permissive compile code disregarding strict ANSI" + --enable-compat22 enable wxWin 2.2 compatibility" ac_help="$ac_help ---enable-no_deps create code without dependency information" + --enable-intl use internationalization system" ac_help="$ac_help ---enable-intl use internationalization system" + --enable-config use wxConfig (and derived) classes" ac_help="$ac_help ---enable-config use wxConfig (and derived) classes" + --enable-sockets use socket/network classes" ac_help="$ac_help ---enable-sockets use socket/network classes" + --enable-ipc use interprocess communication (wxSocket etc.)" ac_help="$ac_help ---enable-ipc use interprocess communication (wxSocket etc.)" + --enable-cmdline use wxCmdLineParser class" ac_help="$ac_help ---enable-cmdline use wxCmdLineParser class" + --enable-datetime use wxDateTime class" ac_help="$ac_help ---enable-datetime use wxDateTime class" + --enable-timedate use obsolete wxDate/wxTime classes" ac_help="$ac_help ---enable-timedate use obsolete wxDate/wxTime classes" + --enable-stopwatch use wxStopWatch class" ac_help="$ac_help ---enable-stopwatch use wxStopWatch class" + --enable-dialupman use dialup network classes" ac_help="$ac_help ---enable-dialupman use dialup network classes" + --enable-apple_ieee use the Apple IEEE codec" ac_help="$ac_help ---enable-apple_ieee use the Apple IEEE codec" + --enable-timer use wxTimer class" ac_help="$ac_help ---enable-timer use wxTimer class" + --enable-wave use wxWave class" ac_help="$ac_help ---enable-wave use wxWave class" + --enable-fraction use wxFraction class" ac_help="$ac_help ---enable-fraction use wxFraction class" + --enable-dynlib use wxLibrary class for DLL loading" ac_help="$ac_help ---enable-dynlib use wxLibrary class for DLL loading" + --enable-longlong use wxLongLong class" ac_help="$ac_help ---enable-longlong use wxLongLong class" + --enable-geometry use geometry class" ac_help="$ac_help ---enable-geometry use geometry class" + --enable-log use logging system" ac_help="$ac_help ---enable-log use logging system" + --enable-streams use wxStream etc classes" ac_help="$ac_help ---enable-streams use wxStream etc classes" + --enable-file use wxFile classes" ac_help="$ac_help ---enable-file use wxFile classes" + --enable-ffile use wxFFile classes" ac_help="$ac_help ---enable-ffile use wxFFile classes" + --enable-textfile use wxTextFile classes" ac_help="$ac_help ---enable-textfile use wxTextFile classes" + --enable-fontmap use font encodings conversion classes" ac_help="$ac_help ---enable-fontmap use font encodings conversion classes" + --enable-unicode compile wxString with Unicode support" ac_help="$ac_help ---enable-unicode compile wxString with Unicode support" + --enable-wcsrtombs use wcsrtombs instead of buggy (GNU libc1/Linux libc5) wcstombs" ac_help="$ac_help ---enable-wcsrtombs use wcsrtombs instead of buggy (GNU libc1/Linux libc5) wcstombs" + --enable-wxprintfv use wxWindows implementation of vprintf()" ac_help="$ac_help ---enable-wxprintfv use wxWindows implementation of vprintf()" + --enable-std_iostreams use standard C++ stream classes" ac_help="$ac_help ---enable-std_iostreams use standard C++ stream classes" + --enable-filesystem use virtual file systems classes" ac_help="$ac_help ---enable-filesystem use virtual file systems classes" + --enable-fs_inet use virtual HTTP/FTP filesystems" ac_help="$ac_help ---enable-fs_inet use virtual HTTP/FTP filesystems" + --enable-fs_zip use virtual ZIP filesystems" ac_help="$ac_help ---enable-fs_zip use virtual ZIP filesystems" + --enable-zipstream use wxZipInputStream" ac_help="$ac_help ---enable-zipstream use wxZipInputStream" + --enable-catch_segvs catch signals and pass them to wxApp::OnFatalException" ac_help="$ac_help ---enable-catch_segvs catch signals and pass them to wxApp::OnFatalException" + --enable-snglinst use wxSingleInstanceChecker class" ac_help="$ac_help ---enable-snglinst use wxSingleInstanceChecker class" + --enable-mimetypes use wxMimeTypesManager" ac_help="$ac_help ---enable-mimetypes use wxMimeTypesManager" + --enable-sysoptions use wxSystemOptions" ac_help="$ac_help ---enable-threads use threads" + --enable-threads use threads" ac_help="$ac_help ---enable-serial use class serialization" + --enable-serial use class serialization" ac_help="$ac_help ---enable-docview use document view architecture" + --enable-docview use document view architecture" ac_help="$ac_help ---enable-help use help (using external browser at present)" + --enable-help use help subsystem" ac_help="$ac_help ---enable-constraints use layout-constraints system" + --enable-mshtmlhelp use MS HTML Help (win32)" ac_help="$ac_help ---enable-printarch use printing architecture" + --enable-html use wxHTML sub-library" ac_help="$ac_help ---enable-mdi use multiple document interface architecture" + --enable-htmlhelp use wxHTML-based help" ac_help="$ac_help ---enable-loggui use standard GUI logger" + --enable-constraints use layout-constraints system" ac_help="$ac_help ---enable-logwin use wxLogWindow" + --enable-printarch use printing architecture" ac_help="$ac_help ---enable-postscript use wxPostscriptDC device context (default for gtk+)" + --enable-mdi use multiple document interface architecture" ac_help="$ac_help ---enable-prologio use Prolog IO library" + --enable-loggui use standard GUI logger" ac_help="$ac_help ---enable-resources use wxWindows resources" + --enable-logwin use wxLogWindow" ac_help="$ac_help ---enable-xresources use X resources for save (default for gtk+)" + --enable-postscript use wxPostscriptDC device context (default for gtk+)" ac_help="$ac_help ---enable-clipboard use wxClipboard classes" + --enable-prologio use Prolog IO library" ac_help="$ac_help ---enable-dnd use Drag'n'Drop classes" + --enable-resources use wxWindows resources" ac_help="$ac_help ---enable-metafile use win32 metafiles" + --enable-xresources use X resources for save (default for gtk+)" ac_help="$ac_help ---enable-wxtree make wxTree library" + --enable-clipboard use wxClipboard classes" ac_help="$ac_help ---enable-controls use all usual controls" + --enable-dnd use Drag'n'Drop classes" ac_help="$ac_help ---enable-accel use accelerators" + --enable-metafile use win32 metafiles" ac_help="$ac_help ---enable-button use wxButton class" + --enable-wxtree make wxTree library" ac_help="$ac_help ---enable-bmpbutton use wxBitmapButton class" + --enable-controls use all usual controls" ac_help="$ac_help ---enable-calendar use wxCalendarCtrl class" + --enable-accel use accelerators" ac_help="$ac_help ---enable-caret use wxCaret class" + --enable-button use wxButton class" ac_help="$ac_help ---enable-checkbox use wxCheckBox class" + --enable-bmpbutton use wxBitmapButton class" ac_help="$ac_help ---enable-checklst use wxCheckListBox (listbox with checkboxes) class" + --enable-calendar use wxCalendarCtrl class" ac_help="$ac_help ---enable-choice use wxChoice class" + --enable-caret use wxCaret class" ac_help="$ac_help ---enable-combobox use wxComboBox classes" + --enable-checkbox use wxCheckBox class" ac_help="$ac_help ---enable-gauge use wxGauge class" + --enable-checklst use wxCheckListBox (listbox with checkboxes) class" ac_help="$ac_help ---enable-grid use wxGrid class" + --enable-choice use wxChoice class" ac_help="$ac_help ---enable-newgrid use new wxGrid class" + --enable-combobox use wxComboBox classes" ac_help="$ac_help ---enable-imaglist use wxImageList class" + --enable-gauge use wxGauge class" ac_help="$ac_help ---enable-listbox use wxListBox class" + --enable-grid use wxGrid class" ac_help="$ac_help ---enable-listctrl use wxListCtrl class" + --enable-newgrid use new wxGrid class" ac_help="$ac_help ---enable-notebook use wxNotebook class" + --enable-imaglist use wxImageList class" ac_help="$ac_help ---enable-radiobox use wxRadioBox class" + --enable-listbox use wxListBox class" ac_help="$ac_help ---enable-radiobtn use wxRadioButton class" + --enable-listctrl use wxListCtrl class" ac_help="$ac_help ---enable-sash use wxSashWindow class" + --enable-notebook use wxNotebook class" ac_help="$ac_help ---enable-scrollbar use wxScrollBar class and scrollable windows" + --enable-radiobox use wxRadioBox class" ac_help="$ac_help ---enable-slider use wxSlider class" + --enable-radiobtn use wxRadioButton class" ac_help="$ac_help ---enable-spinbtn use wxSpinButton class" + --enable-sash use wxSashWindow class" ac_help="$ac_help ---enable-spinctrl use wxSpinCtrl class" + --enable-scrollbar use wxScrollBar class and scrollable windows" ac_help="$ac_help ---enable-splitter use wxSplitterWindow class" + --enable-slider use wxSlider class" ac_help="$ac_help ---enable-statbmp use wxStaticBitmap class" + --enable-spinbtn use wxSpinButton class" ac_help="$ac_help ---enable-statbox use wxStaticBox class" + --enable-spinctrl use wxSpinCtrl class" ac_help="$ac_help ---enable-statline use wxStaticLine class" + --enable-splitter use wxSplitterWindow class" ac_help="$ac_help ---enable-stattext use wxStaticText class" + --enable-statbmp use wxStaticBitmap class" ac_help="$ac_help ---enable-statusbar use wxStatusBar class" + --enable-statbox use wxStaticBox class" ac_help="$ac_help ---enable-tabdialog use wxTabControl class" + --enable-statline use wxStaticLine class" ac_help="$ac_help ---enable-textctrl use wxTextCtrl class" + --enable-stattext use wxStaticText class" ac_help="$ac_help ---enable-togglebtn use wxToggleButton class" + --enable-statusbar use wxStatusBar class" ac_help="$ac_help ---enable-toolbar use wxToolBar class" + --enable-tabdialog use wxTabControl class" ac_help="$ac_help ---enable-tbarnative use native wxToolBar class" + --enable-textctrl use wxTextCtrl class" ac_help="$ac_help ---enable-tbarsmpl use wxToolBarSimple class" + --enable-togglebtn use wxToggleButton class" ac_help="$ac_help ---enable-treectrl use wxTreeCtrl class" + --enable-toolbar use wxToolBar class" ac_help="$ac_help ---enable-commondlg use common dialogs (wxDirDialog, wxProgressDialog, wxTextDialog, ...)" + --enable-tbarnative use native wxToolBar class" ac_help="$ac_help ---enable-choicedlg use wxChoiceDialog" + --enable-tbarsmpl use wxToolBarSimple class" ac_help="$ac_help ---enable-coldlg use wxColourDialog" + --enable-treectrl use wxTreeCtrl class" ac_help="$ac_help ---enable-filedlg use wxFileDialog" + --enable-popupwin use wxPopUpWindow class" ac_help="$ac_help ---enable-fontdlg use wxFontDialog" + --enable-commondlg use common dialogs (wxDirDialog, wxProgressDialog, wxTextDialog, ...)" ac_help="$ac_help ---enable-dirdlg use wxDirDialog" + --enable-choicedlg use wxChoiceDialog" ac_help="$ac_help ---enable-msgdlg use wxMessageDialog" + --enable-coldlg use wxColourDialog" ac_help="$ac_help ---enable-numberdlg use wxNumberEntryDialog" + --enable-filedlg use wxFileDialog" ac_help="$ac_help ---enable-textdlg use wxTextDialog" + --enable-fontdlg use wxFontDialog" ac_help="$ac_help ---enable-tipdlg use startup tips" + --enable-dirdlg use wxDirDialog" ac_help="$ac_help ---enable-progressdlg use wxProgressDialog" + --enable-msgdlg use wxMessageDialog" ac_help="$ac_help ---enable-menus use wxMenu/wxMenuBar/wxMenuItem classes" + --enable-numberdlg use wxNumberEntryDialog" ac_help="$ac_help ---enable-miniframe use wxMiniFrame class" + --enable-textdlg use wxTextDialog" ac_help="$ac_help ---enable-html use wxHTML sub-library" + --enable-tipdlg use startup tips" ac_help="$ac_help ---enable-tooltips use wxToolTip class" + --enable-progressdlg use wxProgressDialog" ac_help="$ac_help ---enable-splines use spline drawing code" + --enable-wizarddlg use wxWizard" ac_help="$ac_help ---enable-validators use wxValidator and derived classes" + --enable-menus use wxMenu/wxMenuBar/wxMenuItem classes" ac_help="$ac_help ---enable-busyinfo use wxBusyInfo" + --enable-miniframe use wxMiniFrame class" ac_help="$ac_help ---enable-joystick compile in joystick support (Linux only)" + --enable-tooltips use wxToolTip class" ac_help="$ac_help ---enable-metafiles use wxMetaFile (Windows only)" + --enable-splines use spline drawing code" ac_help="$ac_help ---enable-image use wxImage class" + --enable-validators use wxValidator and derived classes" ac_help="$ac_help ---enable-gif use gif images (GIF file format)" + --enable-busyinfo use wxBusyInfo" ac_help="$ac_help ---enable-pcx use pcx images (PCX file format)" + --enable-joystick compile in joystick support (Linux only)" ac_help="$ac_help ---enable-pnm use pnm images (PNM file format)" + --enable-metafiles use wxMetaFile (Windows only)" ac_help="$ac_help ---enable-xpm use xpm images (XPM file format)" + --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 @@ -912,7 +929,7 @@ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } fi echo $ac_n "checking host system type""... $ac_c" 1>&6 -echo "configure:916: checking host system type" >&5 +echo "configure:933: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -933,7 +950,7 @@ host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` echo "$ac_t""$host" 1>&6 echo $ac_n "checking target system type""... $ac_c" 1>&6 -echo "configure:937: checking target system type" >&5 +echo "configure:954: checking target system type" >&5 target_alias=$target case "$target_alias" in @@ -951,7 +968,7 @@ target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` echo "$ac_t""$target" 1>&6 echo $ac_n "checking build system type""... $ac_c" 1>&6 -echo "configure:955: checking build system type" >&5 +echo "configure:972: checking build system type" >&5 build_alias=$build case "$build_alias" in @@ -977,12 +994,12 @@ test "$host_alias" != "$target_alias" && WX_MAJOR_VERSION_NUMBER=2 WX_MINOR_VERSION_NUMBER=3 -WX_RELEASE_NUMBER=1 +WX_RELEASE_NUMBER=2 WX_VERSION=$WX_MAJOR_VERSION_NUMBER.$WX_MINOR_VERSION_NUMBER.$WX_RELEASE_NUMBER WX_RELEASE=$WX_MAJOR_VERSION_NUMBER.$WX_MINOR_VERSION_NUMBER -WX_CURRENT=0 +WX_CURRENT=1 WX_REVISION=0 WX_AGE=0 @@ -1298,7 +1315,7 @@ fi if test "$USE_LINUX" = 1; then echo $ac_n "checking for gettext in -lc""... $ac_c" 1>&6 -echo "configure:1302: checking for gettext in -lc" >&5 +echo "configure:1319: 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 @@ -1306,7 +1323,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lc $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1338: \"$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 @@ -1381,6 +1398,7 @@ if test $DEBUG_CONFIGURE = 1; then DEFAULT_wxUSE_GUI=yes DEFAULT_wxUSE_CONTROLS=no + DEFAULT_wxUSE_REGEX=no DEFAULT_wxUSE_ZLIB=no DEFAULT_wxUSE_LIBPNG=no DEFAULT_wxUSE_LIBJPEG=no @@ -1421,6 +1439,7 @@ if test $DEBUG_CONFIGURE = 1; then DEFAULT_wxUSE_CLIPBOARD=no DEFAULT_wxUSE_TOOLTIPS=no DEFAULT_wxUSE_DRAG_AND_DROP=no + DEFAULT_wxUSE_DRAGIMAGE=no DEFAULT_wxUSE_SPLINES=no DEFAULT_wxUSE_MDI_ARCHITECTURE=no @@ -1432,9 +1451,13 @@ if test $DEBUG_CONFIGURE = 1; then DEFAULT_wxUSE_CONSTRAINTS=no DEFAULT_wxUSE_IPC=no DEFAULT_wxUSE_HELP=no + DEFAULT_wxUSE_MS_HTML_HELP=no + + DEFAULT_wxUSE_WXHTML_HELP=no DEFAULT_wxUSE_WXTREE=no DEFAULT_wxUSE_METAFILE=no DEFAULT_wxUSE_MIMETYPE=no + DEFAULT_wxUSE_SYSTEM_OPTIONS=yes DEFAULT_wxUSE_COMMONDLGS=no DEFAULT_wxUSE_CHOICEDLG=no @@ -1447,6 +1470,8 @@ if test $DEBUG_CONFIGURE = 1; then 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 @@ -1493,6 +1518,7 @@ if test $DEBUG_CONFIGURE = 1; then 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 @@ -1524,9 +1550,12 @@ else DEFAULT_wxUSE_APPLE_IEEE=yes DEFAULT_wxUSE_LOG=yes + DEFAULT_wxUSE_LOGWINDOW=yes + DEFAULT_wxUSE_LOGGUI=yes DEFAULT_wxUSE_GUI=yes + DEFAULT_wxUSE_REGEX=sys DEFAULT_wxUSE_ZLIB=yes DEFAULT_wxUSE_LIBPNG=yes DEFAULT_wxUSE_LIBJPEG=yes @@ -1567,6 +1596,7 @@ else DEFAULT_wxUSE_CLIPBOARD=yes DEFAULT_wxUSE_TOOLTIPS=yes DEFAULT_wxUSE_DRAG_AND_DROP=yes + DEFAULT_wxUSE_DRAGIMAGE=yes DEFAULT_wxUSE_SPLINES=yes DEFAULT_wxUSE_MDI_ARCHITECTURE=yes @@ -1578,9 +1608,12 @@ else DEFAULT_wxUSE_CONSTRAINTS=yes DEFAULT_wxUSE_IPC=yes DEFAULT_wxUSE_HELP=yes + DEFAULT_wxUSE_MS_HTML_HELP=yes + DEFAULT_wxUSE_WXHTML_HELP=yes DEFAULT_wxUSE_WXTREE=yes DEFAULT_wxUSE_METAFILE=yes DEFAULT_wxUSE_MIMETYPE=yes + DEFAULT_wxUSE_SYSTEM_OPTIONS=yes DEFAULT_wxUSE_COMMONDLGS=yes DEFAULT_wxUSE_CHOICEDLG=yes @@ -1593,6 +1626,8 @@ else 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 @@ -1639,6 +1674,7 @@ else 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 @@ -1664,7 +1700,7 @@ done echo $ac_n "checking for --enable-gui""... $ac_c" 1>&6 -echo "configure:1668: checking for --enable-gui" >&5 +echo "configure:1704: checking for --enable-gui" >&5 no_cache=0 # Check whether --enable-gui or --disable-gui was given. if test "${enable_gui+set}" = set; then @@ -1706,7 +1742,7 @@ if test "$wxUSE_GUI" = "yes"; then echo $ac_n "checking for --enable-universal""... $ac_c" 1>&6 -echo "configure:1710: checking for --enable-universal" >&5 +echo "configure:1746: checking for --enable-universal" >&5 no_cache=0 # Check whether --enable-universal or --disable-universal was given. if test "${enable_universal+set}" = set; then @@ -1792,26 +1828,18 @@ if test "${with_mgl+set}" = set; then fi -# Check whether --with-gtk-prefix or --without-gtk-prefix was given. -if test "${with_gtk_prefix+set}" = set; then - withval="$with_gtk_prefix" - gtk_config_prefix="$withval" -else - gtk_config_prefix="" -fi - -# Check whether --with-gtk-exec-prefix or --without-gtk-exec-prefix was given. -if test "${with_gtk_exec_prefix+set}" = set; then - withval="$with_gtk_exec_prefix" - gtk_config_exec_prefix="$withval" +# 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:1815: checking for --with-libpng" >&5 +echo "configure:1843: checking for --with-libpng" >&5 no_cache=0 # Check whether --with-libpng or --without-libpng was given. if test "${with_libpng+set}" = set; then @@ -1858,7 +1886,7 @@ fi echo $ac_n "checking for --with-libjpeg""... $ac_c" 1>&6 -echo "configure:1862: checking for --with-libjpeg" >&5 +echo "configure:1890: checking for --with-libjpeg" >&5 no_cache=0 # Check whether --with-libjpeg or --without-libjpeg was given. if test "${with_libjpeg+set}" = set; then @@ -1905,7 +1933,7 @@ fi echo $ac_n "checking for --with-libtiff""... $ac_c" 1>&6 -echo "configure:1909: checking for --with-libtiff" >&5 +echo "configure:1937: checking for --with-libtiff" >&5 no_cache=0 # Check whether --with-libtiff or --without-libtiff was given. if test "${with_libtiff+set}" = set; then @@ -1952,7 +1980,7 @@ fi echo $ac_n "checking for --with-freetype""... $ac_c" 1>&6 -echo "configure:1956: checking for --with-freetype" >&5 +echo "configure:1984: checking for --with-freetype" >&5 no_cache=0 # Check whether --with-freetype or --without-freetype was given. if test "${with_freetype+set}" = set; then @@ -1999,7 +2027,7 @@ fi echo $ac_n "checking for --with-opengl""... $ac_c" 1>&6 -echo "configure:2003: checking for --with-opengl" >&5 +echo "configure:2031: checking for --with-opengl" >&5 no_cache=0 # Check whether --with-opengl or --without-opengl was given. if test "${with_opengl+set}" = set; then @@ -2041,7 +2069,7 @@ fi echo $ac_n "checking for --with-dmalloc""... $ac_c" 1>&6 -echo "configure:2045: checking for --with-dmalloc" >&5 +echo "configure:2073: checking for --with-dmalloc" >&5 no_cache=0 # Check whether --with-dmalloc or --without-dmalloc was given. if test "${with_dmalloc+set}" = set; then @@ -2079,8 +2107,55 @@ fi fi + echo $ac_n "checking for --with-regex""... $ac_c" 1>&6 +echo "configure:2112: 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:2084: checking for --with-zlib" >&5 +echo "configure:2159: checking for --with-zlib" >&5 no_cache=0 # Check whether --with-zlib or --without-zlib was given. if test "${with_zlib+set}" = set; then @@ -2127,7 +2202,7 @@ fi echo $ac_n "checking for --with-odbc""... $ac_c" 1>&6 -echo "configure:2131: checking for --with-odbc" >&5 +echo "configure:2206: checking for --with-odbc" >&5 no_cache=0 # Check whether --with-odbc or --without-odbc was given. if test "${with_odbc+set}" = set; then @@ -2169,7 +2244,7 @@ fi echo $ac_n "checking for --enable-shared""... $ac_c" 1>&6 -echo "configure:2173: checking for --enable-shared" >&5 +echo "configure:2248: checking for --enable-shared" >&5 no_cache=0 # Check whether --enable-shared or --disable-shared was given. if test "${enable_shared+set}" = set; then @@ -2208,7 +2283,7 @@ fi echo $ac_n "checking for --enable-burnt_name""... $ac_c" 1>&6 -echo "configure:2212: checking for --enable-burnt_name" >&5 +echo "configure:2287: 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 @@ -2247,7 +2322,7 @@ fi echo $ac_n "checking for --enable-optimise""... $ac_c" 1>&6 -echo "configure:2251: checking for --enable-optimise" >&5 +echo "configure:2326: checking for --enable-optimise" >&5 no_cache=0 # Check whether --enable-optimise or --disable-optimise was given. if test "${enable_optimise+set}" = set; then @@ -2286,7 +2361,7 @@ fi echo $ac_n "checking for --enable-debug""... $ac_c" 1>&6 -echo "configure:2290: checking for --enable-debug" >&5 +echo "configure:2365: checking for --enable-debug" >&5 no_cache=0 # Check whether --enable-debug or --disable-debug was given. if test "${enable_debug+set}" = set; then @@ -2334,7 +2409,7 @@ fi echo $ac_n "checking for --enable-debug_flag""... $ac_c" 1>&6 -echo "configure:2338: checking for --enable-debug_flag" >&5 +echo "configure:2413: 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 @@ -2373,7 +2448,7 @@ fi echo $ac_n "checking for --enable-debug_info""... $ac_c" 1>&6 -echo "configure:2377: checking for --enable-debug_info" >&5 +echo "configure:2452: 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 @@ -2412,7 +2487,7 @@ fi echo $ac_n "checking for --enable-debug_gdb""... $ac_c" 1>&6 -echo "configure:2416: checking for --enable-debug_gdb" >&5 +echo "configure:2491: 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 @@ -2451,7 +2526,7 @@ fi echo $ac_n "checking for --enable-debug_cntxt""... $ac_c" 1>&6 -echo "configure:2455: checking for --enable-debug_cntxt" >&5 +echo "configure:2530: 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 @@ -2490,7 +2565,7 @@ fi echo $ac_n "checking for --enable-mem_tracing""... $ac_c" 1>&6 -echo "configure:2494: checking for --enable-mem_tracing" >&5 +echo "configure:2569: 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 @@ -2529,7 +2604,7 @@ fi echo $ac_n "checking for --enable-profile""... $ac_c" 1>&6 -echo "configure:2533: checking for --enable-profile" >&5 +echo "configure:2608: checking for --enable-profile" >&5 no_cache=0 # Check whether --enable-profile or --disable-profile was given. if test "${enable_profile+set}" = set; then @@ -2568,7 +2643,7 @@ fi echo $ac_n "checking for --enable-no_rtti""... $ac_c" 1>&6 -echo "configure:2572: checking for --enable-no_rtti" >&5 +echo "configure:2647: 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 @@ -2607,7 +2682,7 @@ fi echo $ac_n "checking for --enable-no_exceptions""... $ac_c" 1>&6 -echo "configure:2611: checking for --enable-no_exceptions" >&5 +echo "configure:2686: 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 @@ -2646,7 +2721,7 @@ fi echo $ac_n "checking for --enable-permissive""... $ac_c" 1>&6 -echo "configure:2650: checking for --enable-permissive" >&5 +echo "configure:2725: checking for --enable-permissive" >&5 no_cache=0 # Check whether --enable-permissive or --disable-permissive was given. if test "${enable_permissive+set}" = set; then @@ -2685,7 +2760,7 @@ fi echo $ac_n "checking for --enable-no_deps""... $ac_c" 1>&6 -echo "configure:2689: checking for --enable-no_deps" >&5 +echo "configure:2764: 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 @@ -2724,9 +2799,88 @@ fi + echo $ac_n "checking for --enable-compat20""... $ac_c" 1>&6 +echo "configure:2804: 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:2843: 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:2730: checking for --enable-intl" >&5 +echo "configure:2884: checking for --enable-intl" >&5 no_cache=0 # Check whether --enable-intl or --disable-intl was given. if test "${enable_intl+set}" = set; then @@ -2765,7 +2919,7 @@ fi echo $ac_n "checking for --enable-config""... $ac_c" 1>&6 -echo "configure:2769: checking for --enable-config" >&5 +echo "configure:2923: checking for --enable-config" >&5 no_cache=0 # Check whether --enable-config or --disable-config was given. if test "${enable_config+set}" = set; then @@ -2805,7 +2959,7 @@ fi echo $ac_n "checking for --enable-sockets""... $ac_c" 1>&6 -echo "configure:2809: checking for --enable-sockets" >&5 +echo "configure:2963: checking for --enable-sockets" >&5 no_cache=0 # Check whether --enable-sockets or --disable-sockets was given. if test "${enable_sockets+set}" = set; then @@ -2845,7 +2999,7 @@ fi echo $ac_n "checking for --enable-ipc""... $ac_c" 1>&6 -echo "configure:2849: checking for --enable-ipc" >&5 +echo "configure:3003: checking for --enable-ipc" >&5 no_cache=0 # Check whether --enable-ipc or --disable-ipc was given. if test "${enable_ipc+set}" = set; then @@ -2885,7 +3039,7 @@ fi echo $ac_n "checking for --enable-cmdline""... $ac_c" 1>&6 -echo "configure:2889: checking for --enable-cmdline" >&5 +echo "configure:3043: checking for --enable-cmdline" >&5 no_cache=0 # Check whether --enable-cmdline or --disable-cmdline was given. if test "${enable_cmdline+set}" = set; then @@ -2924,7 +3078,7 @@ fi echo $ac_n "checking for --enable-datetime""... $ac_c" 1>&6 -echo "configure:2928: checking for --enable-datetime" >&5 +echo "configure:3082: checking for --enable-datetime" >&5 no_cache=0 # Check whether --enable-datetime or --disable-datetime was given. if test "${enable_datetime+set}" = set; then @@ -2963,7 +3117,7 @@ fi echo $ac_n "checking for --enable-timedate""... $ac_c" 1>&6 -echo "configure:2967: checking for --enable-timedate" >&5 +echo "configure:3121: checking for --enable-timedate" >&5 no_cache=0 # Check whether --enable-timedate or --disable-timedate was given. if test "${enable_timedate+set}" = set; then @@ -3002,7 +3156,7 @@ fi echo $ac_n "checking for --enable-stopwatch""... $ac_c" 1>&6 -echo "configure:3006: checking for --enable-stopwatch" >&5 +echo "configure:3160: checking for --enable-stopwatch" >&5 no_cache=0 # Check whether --enable-stopwatch or --disable-stopwatch was given. if test "${enable_stopwatch+set}" = set; then @@ -3041,7 +3195,7 @@ fi echo $ac_n "checking for --enable-dialupman""... $ac_c" 1>&6 -echo "configure:3045: checking for --enable-dialupman" >&5 +echo "configure:3199: checking for --enable-dialupman" >&5 no_cache=0 # Check whether --enable-dialupman or --disable-dialupman was given. if test "${enable_dialupman+set}" = set; then @@ -3080,7 +3234,7 @@ fi echo $ac_n "checking for --enable-apple_ieee""... $ac_c" 1>&6 -echo "configure:3084: checking for --enable-apple_ieee" >&5 +echo "configure:3238: 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 @@ -3119,7 +3273,7 @@ fi echo $ac_n "checking for --enable-timer""... $ac_c" 1>&6 -echo "configure:3123: checking for --enable-timer" >&5 +echo "configure:3277: checking for --enable-timer" >&5 no_cache=0 # Check whether --enable-timer or --disable-timer was given. if test "${enable_timer+set}" = set; then @@ -3158,7 +3312,7 @@ fi echo $ac_n "checking for --enable-wave""... $ac_c" 1>&6 -echo "configure:3162: checking for --enable-wave" >&5 +echo "configure:3316: checking for --enable-wave" >&5 no_cache=0 # Check whether --enable-wave or --disable-wave was given. if test "${enable_wave+set}" = set; then @@ -3197,7 +3351,7 @@ fi echo $ac_n "checking for --enable-fraction""... $ac_c" 1>&6 -echo "configure:3201: checking for --enable-fraction" >&5 +echo "configure:3355: checking for --enable-fraction" >&5 no_cache=0 # Check whether --enable-fraction or --disable-fraction was given. if test "${enable_fraction+set}" = set; then @@ -3236,7 +3390,7 @@ fi echo $ac_n "checking for --enable-dynlib""... $ac_c" 1>&6 -echo "configure:3240: checking for --enable-dynlib" >&5 +echo "configure:3394: checking for --enable-dynlib" >&5 no_cache=0 # Check whether --enable-dynlib or --disable-dynlib was given. if test "${enable_dynlib+set}" = set; then @@ -3275,7 +3429,7 @@ fi echo $ac_n "checking for --enable-longlong""... $ac_c" 1>&6 -echo "configure:3279: checking for --enable-longlong" >&5 +echo "configure:3433: checking for --enable-longlong" >&5 no_cache=0 # Check whether --enable-longlong or --disable-longlong was given. if test "${enable_longlong+set}" = set; then @@ -3314,7 +3468,7 @@ fi echo $ac_n "checking for --enable-geometry""... $ac_c" 1>&6 -echo "configure:3318: checking for --enable-geometry" >&5 +echo "configure:3472: checking for --enable-geometry" >&5 no_cache=0 # Check whether --enable-geometry or --disable-geometry was given. if test "${enable_geometry+set}" = set; then @@ -3353,7 +3507,7 @@ fi echo $ac_n "checking for --enable-log""... $ac_c" 1>&6 -echo "configure:3357: checking for --enable-log" >&5 +echo "configure:3511: checking for --enable-log" >&5 no_cache=0 # Check whether --enable-log or --disable-log was given. if test "${enable_log+set}" = set; then @@ -3392,7 +3546,7 @@ fi echo $ac_n "checking for --enable-streams""... $ac_c" 1>&6 -echo "configure:3396: checking for --enable-streams" >&5 +echo "configure:3550: checking for --enable-streams" >&5 no_cache=0 # Check whether --enable-streams or --disable-streams was given. if test "${enable_streams+set}" = set; then @@ -3431,7 +3585,7 @@ fi echo $ac_n "checking for --enable-file""... $ac_c" 1>&6 -echo "configure:3435: checking for --enable-file" >&5 +echo "configure:3589: checking for --enable-file" >&5 no_cache=0 # Check whether --enable-file or --disable-file was given. if test "${enable_file+set}" = set; then @@ -3470,7 +3624,7 @@ fi echo $ac_n "checking for --enable-ffile""... $ac_c" 1>&6 -echo "configure:3474: checking for --enable-ffile" >&5 +echo "configure:3628: checking for --enable-ffile" >&5 no_cache=0 # Check whether --enable-ffile or --disable-ffile was given. if test "${enable_ffile+set}" = set; then @@ -3509,7 +3663,7 @@ fi echo $ac_n "checking for --enable-textfile""... $ac_c" 1>&6 -echo "configure:3513: checking for --enable-textfile" >&5 +echo "configure:3667: checking for --enable-textfile" >&5 no_cache=0 # Check whether --enable-textfile or --disable-textfile was given. if test "${enable_textfile+set}" = set; then @@ -3548,7 +3702,7 @@ fi echo $ac_n "checking for --enable-fontmap""... $ac_c" 1>&6 -echo "configure:3552: checking for --enable-fontmap" >&5 +echo "configure:3706: checking for --enable-fontmap" >&5 no_cache=0 # Check whether --enable-fontmap or --disable-fontmap was given. if test "${enable_fontmap+set}" = set; then @@ -3587,7 +3741,7 @@ fi echo $ac_n "checking for --enable-unicode""... $ac_c" 1>&6 -echo "configure:3591: checking for --enable-unicode" >&5 +echo "configure:3745: checking for --enable-unicode" >&5 no_cache=0 # Check whether --enable-unicode or --disable-unicode was given. if test "${enable_unicode+set}" = set; then @@ -3626,7 +3780,7 @@ fi echo $ac_n "checking for --enable-wcsrtombs""... $ac_c" 1>&6 -echo "configure:3630: checking for --enable-wcsrtombs" >&5 +echo "configure:3784: checking for --enable-wcsrtombs" >&5 no_cache=0 # Check whether --enable-wcsrtombs or --disable-wcsrtombs was given. if test "${enable_wcsrtombs+set}" = set; then @@ -3665,7 +3819,7 @@ fi echo $ac_n "checking for --enable-wxprintfv""... $ac_c" 1>&6 -echo "configure:3669: checking for --enable-wxprintfv" >&5 +echo "configure:3823: checking for --enable-wxprintfv" >&5 no_cache=0 # Check whether --enable-wxprintfv or --disable-wxprintfv was given. if test "${enable_wxprintfv+set}" = set; then @@ -3704,7 +3858,7 @@ fi echo $ac_n "checking for --enable-std_iostreams""... $ac_c" 1>&6 -echo "configure:3708: checking for --enable-std_iostreams" >&5 +echo "configure:3862: 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 @@ -3743,7 +3897,7 @@ fi echo $ac_n "checking for --enable-filesystem""... $ac_c" 1>&6 -echo "configure:3747: checking for --enable-filesystem" >&5 +echo "configure:3901: checking for --enable-filesystem" >&5 no_cache=0 # Check whether --enable-filesystem or --disable-filesystem was given. if test "${enable_filesystem+set}" = set; then @@ -3782,7 +3936,7 @@ fi echo $ac_n "checking for --enable-fs_inet""... $ac_c" 1>&6 -echo "configure:3786: checking for --enable-fs_inet" >&5 +echo "configure:3940: 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 @@ -3821,7 +3975,7 @@ fi echo $ac_n "checking for --enable-fs_zip""... $ac_c" 1>&6 -echo "configure:3825: checking for --enable-fs_zip" >&5 +echo "configure:3979: 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 @@ -3860,7 +4014,7 @@ fi echo $ac_n "checking for --enable-zipstream""... $ac_c" 1>&6 -echo "configure:3864: checking for --enable-zipstream" >&5 +echo "configure:4018: checking for --enable-zipstream" >&5 no_cache=0 # Check whether --enable-zipstream or --disable-zipstream was given. if test "${enable_zipstream+set}" = set; then @@ -3900,7 +4054,7 @@ fi echo $ac_n "checking for --enable-catch_segvs""... $ac_c" 1>&6 -echo "configure:3904: checking for --enable-catch_segvs" >&5 +echo "configure:4058: 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 @@ -3939,7 +4093,7 @@ fi echo $ac_n "checking for --enable-snglinst""... $ac_c" 1>&6 -echo "configure:3943: checking for --enable-snglinst" >&5 +echo "configure:4097: checking for --enable-snglinst" >&5 no_cache=0 # Check whether --enable-snglinst or --disable-snglinst was given. if test "${enable_snglinst+set}" = set; then @@ -3979,7 +4133,7 @@ fi echo $ac_n "checking for --enable-mimetype""... $ac_c" 1>&6 -echo "configure:3983: checking for --enable-mimetype" >&5 +echo "configure:4137: checking for --enable-mimetype" >&5 no_cache=0 # Check whether --enable-mimetype or --disable-mimetype was given. if test "${enable_mimetype+set}" = set; then @@ -4017,10 +4171,49 @@ fi fi + echo $ac_n "checking for --enable-system_options""... $ac_c" 1>&6 +echo "configure:4176: checking for --enable-system_options" >&5 + no_cache=0 + # 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_system_options='wxUSE_SYSTEM_OPTIONS=yes' + else + ac_cv_use_system_options='wxUSE_SYSTEM_OPTIONS=no' + fi + +else + + 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_system_options='wxUSE_SYSTEM_OPTIONS='$DEFAULT_wxUSE_SYSTEM_OPTIONS + +fi + + + eval "$ac_cv_use_system_options" + if test "$no_cache" != 1; then + echo $ac_cv_use_system_options >> ${wx_arg_cache_file}.tmp + fi + + 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-threads""... $ac_c" 1>&6 -echo "configure:4024: checking for --enable-threads" >&5 +echo "configure:4217: checking for --enable-threads" >&5 no_cache=0 # Check whether --enable-threads or --disable-threads was given. if test "${enable_threads+set}" = set; then @@ -4059,7 +4252,7 @@ fi echo $ac_n "checking for --enable-serial""... $ac_c" 1>&6 -echo "configure:4063: checking for --enable-serial" >&5 +echo "configure:4256: checking for --enable-serial" >&5 no_cache=0 # Check whether --enable-serial or --disable-serial was given. if test "${enable_serial+set}" = set; then @@ -4102,7 +4295,7 @@ if test "$wxUSE_GUI" = "yes"; then echo $ac_n "checking for --enable-docview""... $ac_c" 1>&6 -echo "configure:4106: checking for --enable-docview" >&5 +echo "configure:4299: checking for --enable-docview" >&5 no_cache=0 # Check whether --enable-docview or --disable-docview was given. if test "${enable_docview+set}" = set; then @@ -4141,7 +4334,7 @@ fi echo $ac_n "checking for --enable-help""... $ac_c" 1>&6 -echo "configure:4145: checking for --enable-help" >&5 +echo "configure:4338: checking for --enable-help" >&5 no_cache=0 # Check whether --enable-help or --disable-help was given. if test "${enable_help+set}" = set; then @@ -4179,8 +4372,125 @@ fi fi + echo $ac_n "checking for --enable-mshtmlhelp""... $ac_c" 1>&6 +echo "configure:4377: checking for --enable-mshtmlhelp" >&5 + no_cache=0 + # Check whether --enable-mshtmlhelp or --disable-mshtmlhelp was given. +if test "${enable_mshtmlhelp+set}" = set; then + enableval="$enable_mshtmlhelp" + + if test "$enableval" = yes; then + ac_cv_use_mshtmlhelp='wxUSE_MS_HTML_HELP=yes' + else + ac_cv_use_mshtmlhelp='wxUSE_MS_HTML_HELP=no' + fi + +else + + LINE=`grep "wxUSE_MS_HTML_HELP" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_mshtmlhelp='wxUSE_MS_HTML_HELP='$DEFAULT_wxUSE_MS_HTML_HELP + +fi + + + eval "$ac_cv_use_mshtmlhelp" + if test "$no_cache" != 1; then + echo $ac_cv_use_mshtmlhelp >> ${wx_arg_cache_file}.tmp + fi + + if test "$wxUSE_MS_HTML_HELP" = yes; then + echo "$ac_t""yes" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + + + echo $ac_n "checking for --enable-html""... $ac_c" 1>&6 +echo "configure:4416: checking for --enable-html" >&5 + no_cache=0 + # Check whether --enable-html or --disable-html was given. +if test "${enable_html+set}" = set; then + enableval="$enable_html" + + if test "$enableval" = yes; then + ac_cv_use_html='wxUSE_HTML=yes' + else + ac_cv_use_html='wxUSE_HTML=no' + fi + +else + + LINE=`grep "wxUSE_HTML" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_html='wxUSE_HTML='$DEFAULT_wxUSE_HTML + +fi + + + eval "$ac_cv_use_html" + if test "$no_cache" != 1; then + echo $ac_cv_use_html >> ${wx_arg_cache_file}.tmp + fi + + if test "$wxUSE_HTML" = yes; then + echo "$ac_t""yes" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + + + echo $ac_n "checking for --enable-htmlhelp""... $ac_c" 1>&6 +echo "configure:4455: checking for --enable-htmlhelp" >&5 + no_cache=0 + # Check whether --enable-htmlhelp or --disable-htmlhelp was given. +if test "${enable_htmlhelp+set}" = set; then + enableval="$enable_htmlhelp" + + if test "$enableval" = yes; then + ac_cv_use_htmlhelp='wxUSE_WXHTML_HELP=yes' + else + ac_cv_use_htmlhelp='wxUSE_WXHTML_HELP=no' + fi + +else + + LINE=`grep "wxUSE_WXHTML_HELP" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_htmlhelp='wxUSE_WXHTML_HELP='$DEFAULT_wxUSE_WXHTML_HELP + +fi + + + eval "$ac_cv_use_htmlhelp" + if test "$no_cache" != 1; then + echo $ac_cv_use_htmlhelp >> ${wx_arg_cache_file}.tmp + fi + + if test "$wxUSE_WXHTML_HELP" = yes; then + echo "$ac_t""yes" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + + echo $ac_n "checking for --enable-constraints""... $ac_c" 1>&6 -echo "configure:4184: checking for --enable-constraints" >&5 +echo "configure:4494: checking for --enable-constraints" >&5 no_cache=0 # Check whether --enable-constraints or --disable-constraints was given. if test "${enable_constraints+set}" = set; then @@ -4219,7 +4529,7 @@ fi echo $ac_n "checking for --enable-printarch""... $ac_c" 1>&6 -echo "configure:4223: checking for --enable-printarch" >&5 +echo "configure:4533: checking for --enable-printarch" >&5 no_cache=0 # Check whether --enable-printarch or --disable-printarch was given. if test "${enable_printarch+set}" = set; then @@ -4258,7 +4568,7 @@ fi echo $ac_n "checking for --enable-mdi""... $ac_c" 1>&6 -echo "configure:4262: checking for --enable-mdi" >&5 +echo "configure:4572: checking for --enable-mdi" >&5 no_cache=0 # Check whether --enable-mdi or --disable-mdi was given. if test "${enable_mdi+set}" = set; then @@ -4297,7 +4607,7 @@ fi echo $ac_n "checking for --enable-loggui""... $ac_c" 1>&6 -echo "configure:4301: checking for --enable-loggui" >&5 +echo "configure:4611: checking for --enable-loggui" >&5 no_cache=0 # Check whether --enable-loggui or --disable-loggui was given. if test "${enable_loggui+set}" = set; then @@ -4336,7 +4646,7 @@ fi echo $ac_n "checking for --enable-logwin""... $ac_c" 1>&6 -echo "configure:4340: checking for --enable-logwin" >&5 +echo "configure:4650: checking for --enable-logwin" >&5 no_cache=0 # Check whether --enable-logwin or --disable-logwin was given. if test "${enable_logwin+set}" = set; then @@ -4376,7 +4686,7 @@ fi echo $ac_n "checking for --enable-postscript""... $ac_c" 1>&6 -echo "configure:4380: checking for --enable-postscript" >&5 +echo "configure:4690: checking for --enable-postscript" >&5 no_cache=0 # Check whether --enable-postscript or --disable-postscript was given. if test "${enable_postscript+set}" = set; then @@ -4418,7 +4728,7 @@ fi echo $ac_n "checking for --enable-prologio""... $ac_c" 1>&6 -echo "configure:4422: checking for --enable-prologio" >&5 +echo "configure:4732: checking for --enable-prologio" >&5 no_cache=0 # Check whether --enable-prologio or --disable-prologio was given. if test "${enable_prologio+set}" = set; then @@ -4457,7 +4767,7 @@ fi echo $ac_n "checking for --enable-resources""... $ac_c" 1>&6 -echo "configure:4461: checking for --enable-resources" >&5 +echo "configure:4771: checking for --enable-resources" >&5 no_cache=0 # Check whether --enable-resources or --disable-resources was given. if test "${enable_resources+set}" = set; then @@ -4497,7 +4807,7 @@ fi echo $ac_n "checking for --enable-xresources""... $ac_c" 1>&6 -echo "configure:4501: checking for --enable-xresources" >&5 +echo "configure:4811: checking for --enable-xresources" >&5 no_cache=0 # Check whether --enable-xresources or --disable-xresources was given. if test "${enable_xresources+set}" = set; then @@ -4538,7 +4848,7 @@ fi echo $ac_n "checking for --enable-clipboard""... $ac_c" 1>&6 -echo "configure:4542: checking for --enable-clipboard" >&5 +echo "configure:4852: checking for --enable-clipboard" >&5 no_cache=0 # Check whether --enable-clipboard or --disable-clipboard was given. if test "${enable_clipboard+set}" = set; then @@ -4577,7 +4887,7 @@ fi echo $ac_n "checking for --enable-dnd""... $ac_c" 1>&6 -echo "configure:4581: checking for --enable-dnd" >&5 +echo "configure:4891: checking for --enable-dnd" >&5 no_cache=0 # Check whether --enable-dnd or --disable-dnd was given. if test "${enable_dnd+set}" = set; then @@ -4616,7 +4926,7 @@ fi echo $ac_n "checking for --enable-metafile""... $ac_c" 1>&6 -echo "configure:4620: checking for --enable-metafile" >&5 +echo "configure:4930: checking for --enable-metafile" >&5 no_cache=0 # Check whether --enable-metafile or --disable-metafile was given. if test "${enable_metafile+set}" = set; then @@ -4656,7 +4966,7 @@ fi echo $ac_n "checking for --enable-wxtree""... $ac_c" 1>&6 -echo "configure:4660: checking for --enable-wxtree" >&5 +echo "configure:4970: checking for --enable-wxtree" >&5 no_cache=0 # Check whether --enable-wxtree or --disable-wxtree was given. if test "${enable_wxtree+set}" = set; then @@ -4697,7 +5007,7 @@ fi echo $ac_n "checking for --enable-controls""... $ac_c" 1>&6 -echo "configure:4701: checking for --enable-controls" >&5 +echo "configure:5011: checking for --enable-controls" >&5 no_cache=0 # Check whether --enable-controls or --disable-controls was given. if test "${enable_controls+set}" = set; then @@ -4771,6 +5081,7 @@ if test "$wxUSE_CONTROLS" = "yes"; then DEFAULT_wxUSE_TOOLBAR_SIMPLE=yes DEFAULT_wxUSE_TOOLTIPS=yes DEFAULT_wxUSE_TREECTRL=yes + DEFAULT_wxUSE_POPUPWIN=yes elif test "$wxUSE_CONTROLS" = "no"; then DEFAULT_wxUSE_ACCEL=no DEFAULT_wxUSE_BMPBUTTON=no @@ -4807,11 +5118,12 @@ elif test "$wxUSE_CONTROLS" = "no"; then DEFAULT_wxUSE_TOOLBAR_SIMPLE=no DEFAULT_wxUSE_TOOLTIPS=no DEFAULT_wxUSE_TREECTRL=no + DEFAULT_wxUSE_POPUPWIN=no fi echo $ac_n "checking for --enable-accel""... $ac_c" 1>&6 -echo "configure:4815: checking for --enable-accel" >&5 +echo "configure:5127: checking for --enable-accel" >&5 no_cache=0 # Check whether --enable-accel or --disable-accel was given. if test "${enable_accel+set}" = set; then @@ -4850,7 +5162,7 @@ fi echo $ac_n "checking for --enable-button""... $ac_c" 1>&6 -echo "configure:4854: checking for --enable-button" >&5 +echo "configure:5166: checking for --enable-button" >&5 no_cache=0 # Check whether --enable-button or --disable-button was given. if test "${enable_button+set}" = set; then @@ -4889,7 +5201,7 @@ fi echo $ac_n "checking for --enable-bmpbutton""... $ac_c" 1>&6 -echo "configure:4893: checking for --enable-bmpbutton" >&5 +echo "configure:5205: checking for --enable-bmpbutton" >&5 no_cache=0 # Check whether --enable-bmpbutton or --disable-bmpbutton was given. if test "${enable_bmpbutton+set}" = set; then @@ -4928,7 +5240,7 @@ fi echo $ac_n "checking for --enable-calendar""... $ac_c" 1>&6 -echo "configure:4932: checking for --enable-calendar" >&5 +echo "configure:5244: checking for --enable-calendar" >&5 no_cache=0 # Check whether --enable-calendar or --disable-calendar was given. if test "${enable_calendar+set}" = set; then @@ -4967,7 +5279,7 @@ fi echo $ac_n "checking for --enable-caret""... $ac_c" 1>&6 -echo "configure:4971: checking for --enable-caret" >&5 +echo "configure:5283: checking for --enable-caret" >&5 no_cache=0 # Check whether --enable-caret or --disable-caret was given. if test "${enable_caret+set}" = set; then @@ -5006,7 +5318,7 @@ fi echo $ac_n "checking for --enable-checkbox""... $ac_c" 1>&6 -echo "configure:5010: checking for --enable-checkbox" >&5 +echo "configure:5322: checking for --enable-checkbox" >&5 no_cache=0 # Check whether --enable-checkbox or --disable-checkbox was given. if test "${enable_checkbox+set}" = set; then @@ -5045,7 +5357,7 @@ fi echo $ac_n "checking for --enable-checklst""... $ac_c" 1>&6 -echo "configure:5049: checking for --enable-checklst" >&5 +echo "configure:5361: checking for --enable-checklst" >&5 no_cache=0 # Check whether --enable-checklst or --disable-checklst was given. if test "${enable_checklst+set}" = set; then @@ -5084,7 +5396,7 @@ fi echo $ac_n "checking for --enable-choice""... $ac_c" 1>&6 -echo "configure:5088: checking for --enable-choice" >&5 +echo "configure:5400: checking for --enable-choice" >&5 no_cache=0 # Check whether --enable-choice or --disable-choice was given. if test "${enable_choice+set}" = set; then @@ -5123,7 +5435,7 @@ fi echo $ac_n "checking for --enable-combobox""... $ac_c" 1>&6 -echo "configure:5127: checking for --enable-combobox" >&5 +echo "configure:5439: checking for --enable-combobox" >&5 no_cache=0 # Check whether --enable-combobox or --disable-combobox was given. if test "${enable_combobox+set}" = set; then @@ -5162,7 +5474,7 @@ fi echo $ac_n "checking for --enable-gauge""... $ac_c" 1>&6 -echo "configure:5166: checking for --enable-gauge" >&5 +echo "configure:5478: checking for --enable-gauge" >&5 no_cache=0 # Check whether --enable-gauge or --disable-gauge was given. if test "${enable_gauge+set}" = set; then @@ -5201,7 +5513,7 @@ fi echo $ac_n "checking for --enable-grid""... $ac_c" 1>&6 -echo "configure:5205: checking for --enable-grid" >&5 +echo "configure:5517: checking for --enable-grid" >&5 no_cache=0 # Check whether --enable-grid or --disable-grid was given. if test "${enable_grid+set}" = set; then @@ -5240,7 +5552,7 @@ fi echo $ac_n "checking for --enable-newgrid""... $ac_c" 1>&6 -echo "configure:5244: checking for --enable-newgrid" >&5 +echo "configure:5556: checking for --enable-newgrid" >&5 no_cache=0 # Check whether --enable-newgrid or --disable-newgrid was given. if test "${enable_newgrid+set}" = set; then @@ -5279,7 +5591,7 @@ fi echo $ac_n "checking for --enable-imaglist""... $ac_c" 1>&6 -echo "configure:5283: checking for --enable-imaglist" >&5 +echo "configure:5595: checking for --enable-imaglist" >&5 no_cache=0 # Check whether --enable-imaglist or --disable-imaglist was given. if test "${enable_imaglist+set}" = set; then @@ -5318,7 +5630,7 @@ fi echo $ac_n "checking for --enable-listbox""... $ac_c" 1>&6 -echo "configure:5322: checking for --enable-listbox" >&5 +echo "configure:5634: checking for --enable-listbox" >&5 no_cache=0 # Check whether --enable-listbox or --disable-listbox was given. if test "${enable_listbox+set}" = set; then @@ -5357,7 +5669,7 @@ fi echo $ac_n "checking for --enable-listctrl""... $ac_c" 1>&6 -echo "configure:5361: checking for --enable-listctrl" >&5 +echo "configure:5673: checking for --enable-listctrl" >&5 no_cache=0 # Check whether --enable-listctrl or --disable-listctrl was given. if test "${enable_listctrl+set}" = set; then @@ -5396,7 +5708,7 @@ fi echo $ac_n "checking for --enable-notebook""... $ac_c" 1>&6 -echo "configure:5400: checking for --enable-notebook" >&5 +echo "configure:5712: checking for --enable-notebook" >&5 no_cache=0 # Check whether --enable-notebook or --disable-notebook was given. if test "${enable_notebook+set}" = set; then @@ -5435,7 +5747,7 @@ fi echo $ac_n "checking for --enable-radiobox""... $ac_c" 1>&6 -echo "configure:5439: checking for --enable-radiobox" >&5 +echo "configure:5751: checking for --enable-radiobox" >&5 no_cache=0 # Check whether --enable-radiobox or --disable-radiobox was given. if test "${enable_radiobox+set}" = set; then @@ -5474,7 +5786,7 @@ fi echo $ac_n "checking for --enable-radiobtn""... $ac_c" 1>&6 -echo "configure:5478: checking for --enable-radiobtn" >&5 +echo "configure:5790: checking for --enable-radiobtn" >&5 no_cache=0 # Check whether --enable-radiobtn or --disable-radiobtn was given. if test "${enable_radiobtn+set}" = set; then @@ -5513,7 +5825,7 @@ fi echo $ac_n "checking for --enable-sash""... $ac_c" 1>&6 -echo "configure:5517: checking for --enable-sash" >&5 +echo "configure:5829: checking for --enable-sash" >&5 no_cache=0 # Check whether --enable-sash or --disable-sash was given. if test "${enable_sash+set}" = set; then @@ -5552,7 +5864,7 @@ fi echo $ac_n "checking for --enable-scrollbar""... $ac_c" 1>&6 -echo "configure:5556: checking for --enable-scrollbar" >&5 +echo "configure:5868: checking for --enable-scrollbar" >&5 no_cache=0 # Check whether --enable-scrollbar or --disable-scrollbar was given. if test "${enable_scrollbar+set}" = set; then @@ -5591,7 +5903,7 @@ fi echo $ac_n "checking for --enable-slider""... $ac_c" 1>&6 -echo "configure:5595: checking for --enable-slider" >&5 +echo "configure:5907: checking for --enable-slider" >&5 no_cache=0 # Check whether --enable-slider or --disable-slider was given. if test "${enable_slider+set}" = set; then @@ -5630,7 +5942,7 @@ fi echo $ac_n "checking for --enable-spinbtn""... $ac_c" 1>&6 -echo "configure:5634: checking for --enable-spinbtn" >&5 +echo "configure:5946: checking for --enable-spinbtn" >&5 no_cache=0 # Check whether --enable-spinbtn or --disable-spinbtn was given. if test "${enable_spinbtn+set}" = set; then @@ -5669,7 +5981,7 @@ fi echo $ac_n "checking for --enable-spinctrl""... $ac_c" 1>&6 -echo "configure:5673: checking for --enable-spinctrl" >&5 +echo "configure:5985: checking for --enable-spinctrl" >&5 no_cache=0 # Check whether --enable-spinctrl or --disable-spinctrl was given. if test "${enable_spinctrl+set}" = set; then @@ -5708,7 +6020,7 @@ fi echo $ac_n "checking for --enable-splitter""... $ac_c" 1>&6 -echo "configure:5712: checking for --enable-splitter" >&5 +echo "configure:6024: checking for --enable-splitter" >&5 no_cache=0 # Check whether --enable-splitter or --disable-splitter was given. if test "${enable_splitter+set}" = set; then @@ -5747,7 +6059,7 @@ fi echo $ac_n "checking for --enable-statbmp""... $ac_c" 1>&6 -echo "configure:5751: checking for --enable-statbmp" >&5 +echo "configure:6063: checking for --enable-statbmp" >&5 no_cache=0 # Check whether --enable-statbmp or --disable-statbmp was given. if test "${enable_statbmp+set}" = set; then @@ -5786,7 +6098,7 @@ fi echo $ac_n "checking for --enable-statbox""... $ac_c" 1>&6 -echo "configure:5790: checking for --enable-statbox" >&5 +echo "configure:6102: checking for --enable-statbox" >&5 no_cache=0 # Check whether --enable-statbox or --disable-statbox was given. if test "${enable_statbox+set}" = set; then @@ -5825,7 +6137,7 @@ fi echo $ac_n "checking for --enable-statline""... $ac_c" 1>&6 -echo "configure:5829: checking for --enable-statline" >&5 +echo "configure:6141: checking for --enable-statline" >&5 no_cache=0 # Check whether --enable-statline or --disable-statline was given. if test "${enable_statline+set}" = set; then @@ -5864,7 +6176,7 @@ fi echo $ac_n "checking for --enable-stattext""... $ac_c" 1>&6 -echo "configure:5868: checking for --enable-stattext" >&5 +echo "configure:6180: checking for --enable-stattext" >&5 no_cache=0 # Check whether --enable-stattext or --disable-stattext was given. if test "${enable_stattext+set}" = set; then @@ -5903,7 +6215,7 @@ fi echo $ac_n "checking for --enable-statusbar""... $ac_c" 1>&6 -echo "configure:5907: checking for --enable-statusbar" >&5 +echo "configure:6219: checking for --enable-statusbar" >&5 no_cache=0 # Check whether --enable-statusbar or --disable-statusbar was given. if test "${enable_statusbar+set}" = set; then @@ -5942,7 +6254,7 @@ fi echo $ac_n "checking for --enable-tabdialog""... $ac_c" 1>&6 -echo "configure:5946: checking for --enable-tabdialog" >&5 +echo "configure:6258: checking for --enable-tabdialog" >&5 no_cache=0 # Check whether --enable-tabdialog or --disable-tabdialog was given. if test "${enable_tabdialog+set}" = set; then @@ -5981,7 +6293,7 @@ fi echo $ac_n "checking for --enable-textctrl""... $ac_c" 1>&6 -echo "configure:5985: checking for --enable-textctrl" >&5 +echo "configure:6297: checking for --enable-textctrl" >&5 no_cache=0 # Check whether --enable-textctrl or --disable-textctrl was given. if test "${enable_textctrl+set}" = set; then @@ -6020,7 +6332,7 @@ fi echo $ac_n "checking for --enable-togglebtn""... $ac_c" 1>&6 -echo "configure:6024: checking for --enable-togglebtn" >&5 +echo "configure:6336: checking for --enable-togglebtn" >&5 no_cache=0 # Check whether --enable-togglebtn or --disable-togglebtn was given. if test "${enable_togglebtn+set}" = set; then @@ -6059,7 +6371,7 @@ fi echo $ac_n "checking for --enable-toolbar""... $ac_c" 1>&6 -echo "configure:6063: checking for --enable-toolbar" >&5 +echo "configure:6375: checking for --enable-toolbar" >&5 no_cache=0 # Check whether --enable-toolbar or --disable-toolbar was given. if test "${enable_toolbar+set}" = set; then @@ -6098,7 +6410,7 @@ fi echo $ac_n "checking for --enable-tbarnative""... $ac_c" 1>&6 -echo "configure:6102: checking for --enable-tbarnative" >&5 +echo "configure:6414: checking for --enable-tbarnative" >&5 no_cache=0 # Check whether --enable-tbarnative or --disable-tbarnative was given. if test "${enable_tbarnative+set}" = set; then @@ -6137,7 +6449,7 @@ fi echo $ac_n "checking for --enable-tbarsmpl""... $ac_c" 1>&6 -echo "configure:6141: checking for --enable-tbarsmpl" >&5 +echo "configure:6453: checking for --enable-tbarsmpl" >&5 no_cache=0 # Check whether --enable-tbarsmpl or --disable-tbarsmpl was given. if test "${enable_tbarsmpl+set}" = set; then @@ -6176,7 +6488,7 @@ fi echo $ac_n "checking for --enable-treectrl""... $ac_c" 1>&6 -echo "configure:6180: checking for --enable-treectrl" >&5 +echo "configure:6492: checking for --enable-treectrl" >&5 no_cache=0 # Check whether --enable-treectrl or --disable-treectrl was given. if test "${enable_treectrl+set}" = set; then @@ -6214,10 +6526,49 @@ fi fi + echo $ac_n "checking for --enable-popupwin""... $ac_c" 1>&6 +echo "configure:6531: checking for --enable-popupwin" >&5 + no_cache=0 + # 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_popupwin='wxUSE_POPUPWIN=yes' + else + ac_cv_use_popupwin='wxUSE_POPUPWIN=no' + fi + +else + + 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_popupwin='wxUSE_POPUPWIN='$DEFAULT_wxUSE_POPUPWIN + +fi + + + eval "$ac_cv_use_popupwin" + if test "$no_cache" != 1; then + echo $ac_cv_use_popupwin >> ${wx_arg_cache_file}.tmp + fi + + 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-commondlg""... $ac_c" 1>&6 -echo "configure:6221: checking for --enable-commondlg" >&5 +echo "configure:6572: checking for --enable-commondlg" >&5 no_cache=0 # Check whether --enable-commondlg or --disable-commondlg was given. if test "${enable_commondlg+set}" = set; then @@ -6256,7 +6607,7 @@ fi echo $ac_n "checking for --enable-choicedlg""... $ac_c" 1>&6 -echo "configure:6260: checking for --enable-choicedlg" >&5 +echo "configure:6611: checking for --enable-choicedlg" >&5 no_cache=0 # Check whether --enable-choicedlg or --disable-choicedlg was given. if test "${enable_choicedlg+set}" = set; then @@ -6295,7 +6646,7 @@ fi echo $ac_n "checking for --enable-coldlg""... $ac_c" 1>&6 -echo "configure:6299: checking for --enable-coldlg" >&5 +echo "configure:6650: checking for --enable-coldlg" >&5 no_cache=0 # Check whether --enable-coldlg or --disable-coldlg was given. if test "${enable_coldlg+set}" = set; then @@ -6334,7 +6685,7 @@ fi echo $ac_n "checking for --enable-filedlg""... $ac_c" 1>&6 -echo "configure:6338: checking for --enable-filedlg" >&5 +echo "configure:6689: checking for --enable-filedlg" >&5 no_cache=0 # Check whether --enable-filedlg or --disable-filedlg was given. if test "${enable_filedlg+set}" = set; then @@ -6373,7 +6724,7 @@ fi echo $ac_n "checking for --enable-fontdlg""... $ac_c" 1>&6 -echo "configure:6377: checking for --enable-fontdlg" >&5 +echo "configure:6728: checking for --enable-fontdlg" >&5 no_cache=0 # Check whether --enable-fontdlg or --disable-fontdlg was given. if test "${enable_fontdlg+set}" = set; then @@ -6412,7 +6763,7 @@ fi echo $ac_n "checking for --enable-dirdlg""... $ac_c" 1>&6 -echo "configure:6416: checking for --enable-dirdlg" >&5 +echo "configure:6767: checking for --enable-dirdlg" >&5 no_cache=0 # Check whether --enable-dirdlg or --disable-dirdlg was given. if test "${enable_dirdlg+set}" = set; then @@ -6451,7 +6802,7 @@ fi echo $ac_n "checking for --enable-msgdlg""... $ac_c" 1>&6 -echo "configure:6455: checking for --enable-msgdlg" >&5 +echo "configure:6806: checking for --enable-msgdlg" >&5 no_cache=0 # Check whether --enable-msgdlg or --disable-msgdlg was given. if test "${enable_msgdlg+set}" = set; then @@ -6490,7 +6841,7 @@ fi echo $ac_n "checking for --enable-numberdlg""... $ac_c" 1>&6 -echo "configure:6494: checking for --enable-numberdlg" >&5 +echo "configure:6845: checking for --enable-numberdlg" >&5 no_cache=0 # Check whether --enable-numberdlg or --disable-numberdlg was given. if test "${enable_numberdlg+set}" = set; then @@ -6529,7 +6880,7 @@ fi echo $ac_n "checking for --enable-textdlg""... $ac_c" 1>&6 -echo "configure:6533: checking for --enable-textdlg" >&5 +echo "configure:6884: checking for --enable-textdlg" >&5 no_cache=0 # Check whether --enable-textdlg or --disable-textdlg was given. if test "${enable_textdlg+set}" = set; then @@ -6568,7 +6919,7 @@ fi echo $ac_n "checking for --enable-tipdlg""... $ac_c" 1>&6 -echo "configure:6572: checking for --enable-tipdlg" >&5 +echo "configure:6923: checking for --enable-tipdlg" >&5 no_cache=0 # Check whether --enable-tipdlg or --disable-tipdlg was given. if test "${enable_tipdlg+set}" = set; then @@ -6607,7 +6958,7 @@ fi echo $ac_n "checking for --enable-progressdlg""... $ac_c" 1>&6 -echo "configure:6611: checking for --enable-progressdlg" >&5 +echo "configure:6962: checking for --enable-progressdlg" >&5 no_cache=0 # Check whether --enable-progressdlg or --disable-progressdlg was given. if test "${enable_progressdlg+set}" = set; then @@ -6645,117 +6996,119 @@ fi fi - echo $ac_n "checking for --enable-menus""... $ac_c" 1>&6 -echo "configure:6650: checking for --enable-menus" >&5 + echo $ac_n "checking for --enable-wizarddlg""... $ac_c" 1>&6 +echo "configure:7001: checking for --enable-wizarddlg" >&5 no_cache=0 - # Check whether --enable-menus or --disable-menus was given. -if test "${enable_menus+set}" = set; then - enableval="$enable_menus" + # 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_menus='wxUSE_MENUS=yes' + ac_cv_use_wizarddlg='wxUSE_WIZARDDLG=yes' else - ac_cv_use_menus='wxUSE_MENUS=no' + ac_cv_use_wizarddlg='wxUSE_WIZARDDLG=no' fi else - LINE=`grep "wxUSE_MENUS" ${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_menus='wxUSE_MENUS='$DEFAULT_wxUSE_MENUS + ac_cv_use_wizarddlg='wxUSE_WIZARDDLG='$DEFAULT_wxUSE_WIZARDDLG fi - eval "$ac_cv_use_menus" + eval "$ac_cv_use_wizarddlg" if test "$no_cache" != 1; then - echo $ac_cv_use_menus >> ${wx_arg_cache_file}.tmp + echo $ac_cv_use_wizarddlg >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_MENUS" = 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-miniframe""... $ac_c" 1>&6 -echo "configure:6689: checking for --enable-miniframe" >&5 + + + echo $ac_n "checking for --enable-menus""... $ac_c" 1>&6 +echo "configure:7042: checking for --enable-menus" >&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-menus or --disable-menus was given. +if test "${enable_menus+set}" = set; then + enableval="$enable_menus" if test "$enableval" = yes; then - ac_cv_use_miniframe='wxUSE_MINIFRAME=yes' + ac_cv_use_menus='wxUSE_MENUS=yes' else - ac_cv_use_miniframe='wxUSE_MINIFRAME=no' + ac_cv_use_menus='wxUSE_MENUS=no' fi else - LINE=`grep "wxUSE_MINIFRAME" ${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_miniframe='wxUSE_MINIFRAME='$DEFAULT_wxUSE_MINIFRAME + ac_cv_use_menus='wxUSE_MENUS='$DEFAULT_wxUSE_MENUS fi - eval "$ac_cv_use_miniframe" + eval "$ac_cv_use_menus" if test "$no_cache" != 1; then - echo $ac_cv_use_miniframe >> ${wx_arg_cache_file}.tmp + echo $ac_cv_use_menus >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_MINIFRAME" = 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-html""... $ac_c" 1>&6 -echo "configure:6728: checking for --enable-html" >&5 + echo $ac_n "checking for --enable-miniframe""... $ac_c" 1>&6 +echo "configure:7081: checking for --enable-miniframe" >&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-miniframe or --disable-miniframe was given. +if test "${enable_miniframe+set}" = set; then + enableval="$enable_miniframe" if test "$enableval" = yes; then - ac_cv_use_html='wxUSE_HTML=yes' + ac_cv_use_miniframe='wxUSE_MINIFRAME=yes' else - ac_cv_use_html='wxUSE_HTML=no' + ac_cv_use_miniframe='wxUSE_MINIFRAME=no' fi else - LINE=`grep "wxUSE_HTML" ${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_html='wxUSE_HTML='$DEFAULT_wxUSE_HTML + ac_cv_use_miniframe='wxUSE_MINIFRAME='$DEFAULT_wxUSE_MINIFRAME fi - eval "$ac_cv_use_html" + eval "$ac_cv_use_miniframe" if test "$no_cache" != 1; then - echo $ac_cv_use_html >> ${wx_arg_cache_file}.tmp + echo $ac_cv_use_miniframe >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_HTML" = yes; then + if test "$wxUSE_MINIFRAME" = yes; then echo "$ac_t""yes" 1>&6 else echo "$ac_t""no" 1>&6 @@ -6763,7 +7116,7 @@ fi echo $ac_n "checking for --enable-tooltips""... $ac_c" 1>&6 -echo "configure:6767: checking for --enable-tooltips" >&5 +echo "configure:7120: checking for --enable-tooltips" >&5 no_cache=0 # Check whether --enable-tooltips or --disable-tooltips was given. if test "${enable_tooltips+set}" = set; then @@ -6802,7 +7155,7 @@ fi echo $ac_n "checking for --enable-splines""... $ac_c" 1>&6 -echo "configure:6806: checking for --enable-splines" >&5 +echo "configure:7159: checking for --enable-splines" >&5 no_cache=0 # Check whether --enable-splines or --disable-splines was given. if test "${enable_splines+set}" = set; then @@ -6841,7 +7194,7 @@ fi echo $ac_n "checking for --enable-validators""... $ac_c" 1>&6 -echo "configure:6845: checking for --enable-validators" >&5 +echo "configure:7198: checking for --enable-validators" >&5 no_cache=0 # Check whether --enable-validators or --disable-validators was given. if test "${enable_validators+set}" = set; then @@ -6880,7 +7233,7 @@ fi echo $ac_n "checking for --enable-busyinfo""... $ac_c" 1>&6 -echo "configure:6884: checking for --enable-busyinfo" >&5 +echo "configure:7237: checking for --enable-busyinfo" >&5 no_cache=0 # Check whether --enable-busyinfo or --disable-busyinfo was given. if test "${enable_busyinfo+set}" = set; then @@ -6919,7 +7272,7 @@ fi echo $ac_n "checking for --enable-joystick""... $ac_c" 1>&6 -echo "configure:6923: checking for --enable-joystick" >&5 +echo "configure:7276: checking for --enable-joystick" >&5 no_cache=0 # Check whether --enable-joystick or --disable-joystick was given. if test "${enable_joystick+set}" = set; then @@ -6958,7 +7311,7 @@ fi echo $ac_n "checking for --enable-metafile""... $ac_c" 1>&6 -echo "configure:6962: checking for --enable-metafile" >&5 +echo "configure:7315: checking for --enable-metafile" >&5 no_cache=0 # Check whether --enable-metafile or --disable-metafile was given. if test "${enable_metafile+set}" = set; then @@ -6996,10 +7349,49 @@ fi fi + echo $ac_n "checking for --enable-dragimage""... $ac_c" 1>&6 +echo "configure:7354: checking for --enable-dragimage" >&5 + no_cache=0 + # Check whether --enable-dragimage or --disable-dragimage was given. +if test "${enable_dragimage+set}" = set; then + enableval="$enable_dragimage" + + if test "$enableval" = yes; then + ac_cv_use_dragimage='wxUSE_DRAGIMAGE=yes' + else + ac_cv_use_dragimage='wxUSE_DRAGIMAGE=no' + fi + +else + + LINE=`grep "wxUSE_DRAGIMAGE" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_dragimage='wxUSE_DRAGIMAGE='$DEFAULT_wxUSE_DRAGIMAGE + +fi + + + eval "$ac_cv_use_dragimage" + if test "$no_cache" != 1; then + echo $ac_cv_use_dragimage >> ${wx_arg_cache_file}.tmp + fi + + if test "$wxUSE_DRAGIMAGE" = yes; then + echo "$ac_t""yes" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + + echo $ac_n "checking for --enable-image""... $ac_c" 1>&6 -echo "configure:7003: checking for --enable-image" >&5 +echo "configure:7395: checking for --enable-image" >&5 no_cache=0 # Check whether --enable-image or --disable-image was given. if test "${enable_image+set}" = set; then @@ -7038,7 +7430,7 @@ fi echo $ac_n "checking for --enable-gif""... $ac_c" 1>&6 -echo "configure:7042: checking for --enable-gif" >&5 +echo "configure:7434: checking for --enable-gif" >&5 no_cache=0 # Check whether --enable-gif or --disable-gif was given. if test "${enable_gif+set}" = set; then @@ -7077,7 +7469,7 @@ fi echo $ac_n "checking for --enable-pcx""... $ac_c" 1>&6 -echo "configure:7081: checking for --enable-pcx" >&5 +echo "configure:7473: checking for --enable-pcx" >&5 no_cache=0 # Check whether --enable-pcx or --disable-pcx was given. if test "${enable_pcx+set}" = set; then @@ -7116,7 +7508,7 @@ fi echo $ac_n "checking for --enable-pnm""... $ac_c" 1>&6 -echo "configure:7120: checking for --enable-pnm" >&5 +echo "configure:7512: checking for --enable-pnm" >&5 no_cache=0 # Check whether --enable-pnm or --disable-pnm was given. if test "${enable_pnm+set}" = set; then @@ -7155,7 +7547,7 @@ fi echo $ac_n "checking for --enable-pnm""... $ac_c" 1>&6 -echo "configure:7159: checking for --enable-pnm" >&5 +echo "configure:7551: checking for --enable-pnm" >&5 no_cache=0 # Check whether --enable-pnm or --disable-pnm was given. if test "${enable_pnm+set}" = set; then @@ -7202,7 +7594,7 @@ fi echo $ac_n "checking for toolkit""... $ac_c" 1>&6 -echo "configure:7206: checking for toolkit" >&5 +echo "configure:7598: checking for toolkit" >&5 if test "$wxUSE_GUI" = "yes"; then @@ -7261,7 +7653,8 @@ for toolkit in `echo $ALL_TOOLKITS`; do 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 @@ -7335,7 +7728,7 @@ fi # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:7339: checking for $ac_word" >&5 +echo "configure:7732: 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 @@ -7365,7 +7758,7 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:7369: checking for $ac_word" >&5 +echo "configure:7762: 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 @@ -7416,7 +7809,7 @@ fi # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:7420: checking for $ac_word" >&5 +echo "configure:7813: 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 @@ -7448,7 +7841,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:7452: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:7845: 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. @@ -7459,12 +7852,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 7463 "configure" +#line 7856 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:7468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7861: \"$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 @@ -7490,12 +7883,12 @@ if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:7494: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:7887: 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:7499: checking whether we are using GNU C" >&5 +echo "configure:7892: 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 @@ -7504,7 +7897,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:7508: \"$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:7901: \"$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 @@ -7523,7 +7916,7 @@ ac_test_CFLAGS="${CFLAGS+set}" ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:7527: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:7920: 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 @@ -7558,7 +7951,7 @@ fi CFLAGS=`echo "$CFLAGS" | sed 's/-g//g'` echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:7562: checking how to run the C preprocessor" >&5 +echo "configure:7955: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -7573,13 +7966,13 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7583: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7976: \"$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 : @@ -7590,13 +7983,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7600: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7993: \"$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 : @@ -7607,13 +8000,13 @@ else rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7617: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8010: \"$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 : @@ -7640,13 +8033,13 @@ echo "$ac_t""$CPP" 1>&6 if test $ac_cv_prog_gcc = yes; then echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6 -echo "configure:7644: checking whether ${CC-cc} needs -traditional" >&5 +echo "configure:8037: checking whether ${CC-cc} needs -traditional" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_pattern="Autoconf.*'x'" cat > conftest.$ac_ext < Autoconf TIOCGETP @@ -7664,7 +8057,7 @@ rm -f conftest* if test $ac_cv_prog_gcc_traditional = no; then cat > conftest.$ac_ext < Autoconf TCGETA @@ -7700,7 +8093,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:7704: checking for $ac_word" >&5 +echo "configure:8097: 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 @@ -7732,7 +8125,7 @@ test -n "$CXX" || CXX="gcc" echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:7736: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 +echo "configure:8129: 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. @@ -7743,12 +8136,12 @@ cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext << EOF -#line 7747 "configure" +#line 8140 "configure" #include "confdefs.h" int main(){return(0);} EOF -if { (eval echo configure:7752: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8145: \"$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 @@ -7774,12 +8167,12 @@ if test $ac_cv_prog_cxx_works = no; then { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:7778: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:8171: 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:7783: checking whether we are using GNU C++" >&5 +echo "configure:8176: 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 @@ -7788,7 +8181,7 @@ else yes; #endif EOF -if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:7792: \"$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:8185: \"$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 @@ -7807,7 +8200,7 @@ ac_test_CXXFLAGS="${CXXFLAGS+set}" ac_save_CXXFLAGS="$CXXFLAGS" CXXFLAGS= echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6 -echo "configure:7811: checking whether ${CXX-g++} accepts -g" >&5 +echo "configure:8204: 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 @@ -7840,7 +8233,7 @@ fi echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6 -echo "configure:7844: checking how to run the C++ preprocessor" >&5 +echo "configure:8237: 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 @@ -7853,12 +8246,12 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross CXXCPP="${CXX-g++} -E" cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7862: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8255: \"$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 : @@ -7896,7 +8289,7 @@ cross_compiling=$ac_cv_prog_cc_cross # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:7900: checking for $ac_word" >&5 +echo "configure:8293: 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 @@ -7927,7 +8320,7 @@ fi # Extract the first word of "ar", so it can be a program name with args. set dummy ar; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:7931: checking for $ac_word" >&5 +echo "configure:8324: 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 @@ -7967,7 +8360,7 @@ fi # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:7971: checking for a BSD compatible install" >&5 +echo "configure:8364: 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 @@ -8023,7 +8416,7 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' # Extract the first word of "strip", so it can be a program name with args. set dummy strip; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:8027: checking for $ac_word" >&5 +echo "configure:8420: 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 @@ -8052,7 +8445,7 @@ fi echo $ac_n "checking make for VPATH support""... $ac_c" 1>&6 -echo "configure:8056: checking make for VPATH support" >&5 +echo "configure:8449: checking make for VPATH support" >&5 cat - << EOF > confMake check : file cp \$? \$@ @@ -8089,7 +8482,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:8093: checking for $ac_word" >&5 +echo "configure:8486: 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 @@ -8123,7 +8516,7 @@ test -n "$YACC" || YACC="yacc" # 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:8127: checking for $ac_word" >&5 +echo "configure:8520: 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 @@ -8157,7 +8550,7 @@ then *) ac_lib=l ;; esac echo $ac_n "checking for yywrap in -l$ac_lib""... $ac_c" 1>&6 -echo "configure:8161: checking for yywrap in -l$ac_lib" >&5 +echo "configure:8554: 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 @@ -8165,7 +8558,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l$ac_lib $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8573: \"$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 @@ -8200,7 +8593,7 @@ fi echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:8204: checking whether ln -s works" >&5 +echo "configure:8597: 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 @@ -8359,30 +8752,43 @@ if test "$wxUSE_GUI" = "yes"; then WXWINE= 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:8367: checking for Windows headers" >&5 - -ac_find_includes= -for ac_dir in $SEARCH_INCLUDE; - do - if test -f "$ac_dir/windows.h"; then - ac_find_includes=$ac_dir - break - fi - done + ac_safe=`echo "windows.h" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for windows.h""... $ac_c" 1>&6 +echo "configure:8758: checking for windows.h" >&5 +if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext < +EOF +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (eval echo configure:8768: \"$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 - 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 + +fi + INCLUDE_SUBDIRS="$INCLUDE_SUBDIRS msw" LIBS="$LIBS -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lctl3d32 -lcrtdll -ladvapi32 -lwsock32" @@ -8408,7 +8814,20 @@ for ac_dir in $SEARCH_INCLUDE; fi if test "$wxUSE_GTK" = 1; then - # Check whether --with-gtk-prefix or --without-gtk-prefix was given. + echo $ac_n "checking for GTK+ version""... $ac_c" 1>&6 +echo "configure:8819: 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" @@ -8433,10 +8852,10 @@ else fi - for module in . gthread + for module in . do case "$module" in - gthread) + gthread) gtk_config_args="$gtk_config_args gthread" ;; esac @@ -8458,7 +8877,7 @@ fi # Extract the first word of "gtk-config-2.0", so it can be a program name with args. set dummy gtk-config-2.0; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:8462: checking for $ac_word" >&5 +echo "configure:8881: 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 @@ -8493,7 +8912,7 @@ fi min_gtk_version=1.3.1 echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6 -echo "configure:8497: checking for GTK - version >= $min_gtk_version" >&5 +echo "configure:8916: checking for GTK - version >= $min_gtk_version" >&5 no_gtk="" if test "$GTK_CONFIG_2_0" = "no" ; then no_gtk=yes @@ -8516,14 +8935,14 @@ echo "configure:8497: checking for GTK - version >= $min_gtk_version" >&5 echo $ac_n "cross compiling; assumed OK... $ac_c" else cat > conftest.$ac_ext < #include #include -int +int main () { int major, minor, micro; @@ -8542,7 +8961,7 @@ main () (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"); @@ -8553,16 +8972,16 @@ main () 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 @@ -8578,7 +8997,7 @@ main () printf("\n*** An old version of GTK+ (%d.%d.%d) was found.\n", gtk_major_version, gtk_minor_version, gtk_micro_version); printf("*** You need a version of GTK+ newer than %d.%d.%d. The latest version of\n", - major, minor, micro); + major, minor, micro); printf("*** GTK+ is always available from ftp://ftp.gtk.org.\n"); printf("***\n"); printf("*** If you have already installed a sufficiently new version, this error\n"); @@ -8594,7 +9013,7 @@ main () } EOF -if { (eval echo configure:8598: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:9017: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -8612,7 +9031,7 @@ fi 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 @@ -8628,7 +9047,7 @@ fi CFLAGS="$CFLAGS $GTK_CFLAGS" LIBS="$LIBS $GTK_LIBS" cat > conftest.$ac_ext < @@ -8638,7 +9057,7 @@ int main() { return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); ; return 0; } EOF -if { (eval echo configure:8642: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9061: \"$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" @@ -8646,7 +9065,7 @@ if { (eval echo configure:8642: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && t 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 "***" @@ -8670,8 +9089,16 @@ rm -f conftest* 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 @@ -8688,7 +9115,7 @@ rm -f conftest* # 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:8692: checking for $ac_word" >&5 +echo "configure:9119: 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 @@ -8723,7 +9150,7 @@ fi min_gtk_version=1.2.7 echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6 -echo "configure:8727: checking for GTK - version >= $min_gtk_version" >&5 +echo "configure:9154: checking for GTK - version >= $min_gtk_version" >&5 no_gtk="" if test "$GTK_CONFIG" != "no" ; then GTK_CFLAGS=`$GTK_CONFIG --cflags` @@ -8736,7 +9163,7 @@ echo "configure:8727: checking for GTK - version >= $min_gtk_version" >&5 echo $ac_n "cross compiling; assumed OK... $ac_c" else cat > conftest.$ac_ext < @@ -8769,7 +9196,7 @@ main () } EOF -if { (eval echo configure:8773: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:9200: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -8788,7 +9215,7 @@ fi 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="" @@ -8798,7 +9225,10 @@ fi - + fi + + if test -z "$wx_cv_lib_gtk"; then + if test x$gtk_config_exec_prefix != x ; then gtk_config_args="$gtk_config_args --exec-prefix=$gtk_config_exec_prefix" if test x${GTK_CONFIG+set} != xset ; then @@ -8815,7 +9245,7 @@ fi # Extract the first word of "gtk-config", so it can be a program name with args. set dummy gtk-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:8819: checking for $ac_word" >&5 +echo "configure:9249: 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 @@ -8850,7 +9280,7 @@ fi min_gtk_version=1.2.3 echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6 -echo "configure:8854: checking for GTK - version >= $min_gtk_version" >&5 +echo "configure:9284: checking for GTK - version >= $min_gtk_version" >&5 no_gtk="" if test "$GTK_CONFIG" != "no" ; then GTK_CFLAGS=`$GTK_CONFIG --cflags` @@ -8863,7 +9293,7 @@ echo "configure:8854: checking for GTK - version >= $min_gtk_version" >&5 echo $ac_n "cross compiling; assumed OK... $ac_c" else cat > conftest.$ac_ext < @@ -8896,7 +9326,7 @@ main () } EOF -if { (eval echo configure:8900: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:9330: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -8915,7 +9345,7 @@ fi 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="" @@ -8925,34 +9355,49 @@ fi + fi + + 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 - - - 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; } + if test "$gtk_version_cached" = 1; then + echo "$ac_t""$wx_cv_lib_gtk" 1>&6 fi - TOOLKIT_INCLUDE="$GTK_CFLAGS" + case "$wx_cv_lib_gtk" in + 2.0) WXGTK20=1 + ;; + 1.2.7) WXGTK127=1 + WXGTK12=1 + ;; + 1.2.3) WXGTK12=1 + ;; + *) { echo "configure: error: +Please check that gtk-config is in path, the directory +where GTK+ libraries are installed (returned by +'gtk-config --libs' command) is in LD_LIBRARY_PATH or +equivalent variable and GTK+ is version 1.2.3 or above. + " 1>&2; exit 1; } + ;; + esac - - GUI_TK_LIBRARY="$GTK_LIBS" + TOOLKIT_INCLUDE="$wx_cv_cflags_gtk" + GUI_TK_LIBRARY="$wx_cv_libs_gtk" - AFMINSTALL=afminstall TOOLKIT=GTK GUIDIST=GTK_DIST echo $ac_n "checking for gdk_im_open in -lgdk""... $ac_c" 1>&6 -echo "configure:8956: checking for gdk_im_open in -lgdk" >&5 +echo "configure:9401: 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 @@ -8960,7 +9405,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgdk $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9420: \"$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 @@ -8999,7 +9444,7 @@ fi if test "$wxUSE_MGL" = 1; then echo $ac_n "checking for SciTech MGL library""... $ac_c" 1>&6 -echo "configure:9003: checking for SciTech MGL library" >&5 +echo "configure:9448: 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; } @@ -9033,7 +9478,7 @@ echo "configure:9003: checking for SciTech MGL library" >&5 if test "$wxUSE_WINE" = 1; then echo $ac_n "checking for WINE includes""... $ac_c" 1>&6 -echo "configure:9037: checking for WINE includes" >&5 +echo "configure:9482: checking for WINE includes" >&5 ac_find_includes= for ac_dir in $SEARCH_INCLUDE; @@ -9054,7 +9499,7 @@ for ac_dir in $SEARCH_INCLUDE; XPM_LINK="" echo $ac_n "checking for Xpm library""... $ac_c" 1>&6 -echo "configure:9058: checking for Xpm library" >&5 +echo "configure:9503: checking for Xpm library" >&5 ac_find_libraries= for ac_dir in $SEARCH_LIB; @@ -9082,7 +9527,7 @@ EOF MESA_LINK="" echo $ac_n "checking for Mesa library""... $ac_c" 1>&6 -echo "configure:9086: checking for Mesa library" >&5 +echo "configure:9531: checking for Mesa library" >&5 ac_find_libraries= for ac_dir in $SEARCH_LIB; @@ -9116,7 +9561,7 @@ for ac_dir in $SEARCH_LIB; # 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:9120: checking for X" >&5 +echo "configure:9565: checking for X" >&5 # Check whether --with-x or --without-x was given. if test "${with_x+set}" = set; then @@ -9178,12 +9623,12 @@ if test "$ac_x_includes" = NO; then # First, try using that file with no special directory specified. cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9187: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9632: \"$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* @@ -9252,14 +9697,14 @@ if test "$ac_x_libraries" = NO; then ac_save_LIBS="$LIBS" LIBS="-l$x_direct_test_library $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9708: \"$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. @@ -9365,17 +9810,17 @@ else case "`(uname -sr) 2>/dev/null`" in "SunOS 5"*) echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6 -echo "configure:9369: checking whether -R must be followed by a space" >&5 +echo "configure:9814: checking whether -R must be followed by a space" >&5 ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9824: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_R_nospace=yes else @@ -9391,14 +9836,14 @@ rm -f conftest* else LIBS="$ac_xsave_LIBS -R $x_libraries" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9847: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_R_space=yes else @@ -9430,7 +9875,7 @@ rm -f conftest* # libraries were built with DECnet support. And karl@cs.umb.edu says # the Alpha needs dnet_stub (dnet does not exist). echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6 -echo "configure:9434: checking for dnet_ntoa in -ldnet" >&5 +echo "configure:9879: 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 @@ -9438,7 +9883,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldnet $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9898: \"$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 @@ -9471,7 +9916,7 @@ fi if test $ac_cv_lib_dnet_dnet_ntoa = no; then echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6 -echo "configure:9475: checking for dnet_ntoa in -ldnet_stub" >&5 +echo "configure:9920: 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 @@ -9479,7 +9924,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldnet_stub $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9939: \"$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 @@ -9519,12 +9964,12 @@ fi # The nsl library prevents programs from opening the X display # on Irix 5.2, according to dickey@clark.net. echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6 -echo "configure:9523: checking for gethostbyname" >&5 +echo "configure:9968: checking for gethostbyname" >&5 if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9996: \"$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 @@ -9568,7 +10013,7 @@ fi if test $ac_cv_func_gethostbyname = no; then echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 -echo "configure:9572: checking for gethostbyname in -lnsl" >&5 +echo "configure:10017: 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 @@ -9576,7 +10021,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10036: \"$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 @@ -9617,12 +10062,12 @@ fi # -lsocket must be given before -lnsl if both are needed. # We assume that if connect needs -lnsl, so does gethostbyname. echo $ac_n "checking for connect""... $ac_c" 1>&6 -echo "configure:9621: checking for connect" >&5 +echo "configure:10066: checking for connect" >&5 if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10094: \"$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 @@ -9666,7 +10111,7 @@ fi if test $ac_cv_func_connect = no; then echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6 -echo "configure:9670: checking for connect in -lsocket" >&5 +echo "configure:10115: 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 @@ -9674,7 +10119,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsocket $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10134: \"$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 @@ -9709,12 +10154,12 @@ fi # gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX. echo $ac_n "checking for remove""... $ac_c" 1>&6 -echo "configure:9713: checking for remove" >&5 +echo "configure:10158: checking for remove" >&5 if eval "test \"`echo '$''{'ac_cv_func_remove'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10186: \"$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 @@ -9758,7 +10203,7 @@ fi if test $ac_cv_func_remove = no; then echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6 -echo "configure:9762: checking for remove in -lposix" >&5 +echo "configure:10207: 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 @@ -9766,7 +10211,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lposix $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10226: \"$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 @@ -9801,12 +10246,12 @@ fi # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. echo $ac_n "checking for shmat""... $ac_c" 1>&6 -echo "configure:9805: checking for shmat" >&5 +echo "configure:10250: checking for shmat" >&5 if eval "test \"`echo '$''{'ac_cv_func_shmat'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10278: \"$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 @@ -9850,7 +10295,7 @@ fi if test $ac_cv_func_shmat = no; then echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6 -echo "configure:9854: checking for shmat in -lipc" >&5 +echo "configure:10299: 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 @@ -9858,7 +10303,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lipc $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10318: \"$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 @@ -9902,7 +10347,7 @@ fi # libraries we check for below, so use a different variable. # --interran@uluru.Stanford.EDU, kb@cs.umb.edu. echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6 -echo "configure:9906: checking for IceConnectionNumber in -lICE" >&5 +echo "configure:10351: 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 @@ -9910,7 +10355,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lICE $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10370: \"$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 @@ -9962,7 +10407,7 @@ fi COMPILED_X_PROGRAM=0 echo $ac_n "checking for Motif/Lesstif headers""... $ac_c" 1>&6 -echo "configure:9966: checking for Motif/Lesstif headers" >&5 +echo "configure:10411: checking for Motif/Lesstif headers" >&5 ac_find_includes= for ac_dir in $SEARCH_INCLUDE; @@ -9977,7 +10422,7 @@ for ac_dir in $SEARCH_INCLUDE; echo "$ac_t""found $ac_find_includes" 1>&6 else cat > conftest.$ac_ext < @@ -9990,7 +10435,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:9994: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:10439: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""found in default search path" 1>&6 @@ -10011,7 +10456,7 @@ rm -f conftest* if test "$COMPILED_X_PROGRAM" = 0; then echo $ac_n "checking for Motif/Lesstif library""... $ac_c" 1>&6 -echo "configure:10015: checking for Motif/Lesstif library" >&5 +echo "configure:10460: checking for Motif/Lesstif library" >&5 ac_find_libraries= for ac_dir in $SEARCH_LIB; @@ -10050,7 +10495,7 @@ for ac_dir in $SEARCH_LIB; echo "$ac_t""found at $ac_find_libraries" 1>&6 else cat > conftest.$ac_ext < @@ -10063,7 +10508,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:10067: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:10512: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""found in default search path" 1>&6 @@ -10086,7 +10531,7 @@ rm -f conftest* XPM_LINK="" echo $ac_n "checking for Xpm library""... $ac_c" 1>&6 -echo "configure:10090: checking for Xpm library" >&5 +echo "configure:10535: checking for Xpm library" >&5 ac_find_libraries= for ac_dir in $SEARCH_LIB; @@ -10118,7 +10563,7 @@ EOF echo "$ac_t""found at $ac_find_libraries" 1>&6 else cat > conftest.$ac_ext < @@ -10131,7 +10576,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:10135: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:10580: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* XPM_LINK="-lXpm " @@ -10259,7 +10704,7 @@ rm -f conftest* ALL_DEPFILES="${ALL_DEPFILES} \$(HTMLDEPS)" fi - PORT_FILES="src/\$(TOOLKITDIR)/files.lst" + 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 @@ -10514,17 +10959,17 @@ for ac_hdr in strings.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:10518: checking for $ac_hdr" >&5 +echo "configure:10963: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10528: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10973: \"$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* @@ -10554,17 +10999,57 @@ 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:10558: checking for $ac_hdr" >&5 +echo "configure:11003: checking for $ac_hdr" >&5 +if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext < +EOF +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (eval echo configure:11013: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` +if test -z "$ac_err"; then + rm -rf conftest* + eval "ac_cv_header_$ac_safe=yes" +else + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_header_$ac_safe=no" +fi +rm -f conftest* +fi +if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then + echo "$ac_t""yes" 1>&6 + ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` + cat >> confdefs.h <&6 +fi +done + +for ac_hdr in unistd.h +do +ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +echo "configure:11043: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10568: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:11053: \"$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* @@ -10590,21 +11075,21 @@ else fi done -for ac_hdr in unistd.h +for ac_hdr in wchar.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:10598: checking for $ac_hdr" >&5 +echo "configure:11083: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10608: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:11093: \"$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* @@ -10630,21 +11115,21 @@ else fi done -for ac_hdr in wchar.h +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:10638: checking for $ac_hdr" >&5 +echo "configure:11123: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10648: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:11133: \"$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* @@ -10670,21 +11155,21 @@ else 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:10678: checking for $ac_hdr" >&5 +echo "configure:11163: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10688: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:11173: \"$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* @@ -10710,21 +11195,21 @@ else 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:10718: checking for $ac_hdr" >&5 +echo "configure:11203: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10728: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:11213: \"$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* @@ -10750,21 +11235,21 @@ else 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:10758: checking for $ac_hdr" >&5 +echo "configure:11243: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10768: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:11253: \"$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* @@ -10790,21 +11275,24 @@ else 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:10798: checking for $ac_hdr" >&5 +echo "configure:11286: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10808: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:11296: \"$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* @@ -10830,24 +11318,25 @@ else 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:10841: checking for $ac_hdr" >&5 +echo "configure:11330: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10851: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:11340: \"$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* @@ -10873,17 +11362,16 @@ else fi done - fi fi echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:10882: checking for ANSI C header files" >&5 +echo "configure:11370: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -10891,7 +11379,7 @@ else #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10895: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:11383: \"$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* @@ -10908,7 +11396,7 @@ rm -f conftest* if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -10926,7 +11414,7 @@ fi if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -10947,7 +11435,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -10958,7 +11446,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } EOF -if { (eval echo configure:10962: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:11450: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -10982,12 +11470,12 @@ EOF fi echo $ac_n "checking for mode_t""... $ac_c" 1>&6 -echo "configure:10986: checking for mode_t" >&5 +echo "configure:11474: checking for mode_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_mode_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -11015,12 +11503,12 @@ EOF fi echo $ac_n "checking for off_t""... $ac_c" 1>&6 -echo "configure:11019: checking for off_t" >&5 +echo "configure:11507: checking for off_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -11048,12 +11536,12 @@ EOF fi echo $ac_n "checking for pid_t""... $ac_c" 1>&6 -echo "configure:11052: checking for pid_t" >&5 +echo "configure:11540: checking for pid_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -11081,12 +11569,12 @@ EOF fi echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:11085: checking for size_t" >&5 +echo "configure:11573: checking for size_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -11114,12 +11602,12 @@ EOF fi echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6 -echo "configure:11118: checking for uid_t in sys/types.h" >&5 +echo "configure:11606: 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 @@ -11149,13 +11637,13 @@ fi echo $ac_n "checking for wchar_t""... $ac_c" 1>&6 -echo "configure:11153: checking for wchar_t" >&5 +echo "configure:11641: 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 < int main() { @@ -11166,7 +11654,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:11170: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:11658: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_type_wchar_t=yes else @@ -11174,7 +11662,7 @@ else cat conftest.$ac_ext >&5 rm -rf conftest* cat > conftest.$ac_ext < int main() { @@ -11185,7 +11673,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:11189: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:11677: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_type_wchar_t=yes else @@ -11219,12 +11707,12 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross echo $ac_n "checking if size_t is unsigned int""... $ac_c" 1>&6 -echo "configure:11223: checking if size_t is unsigned int" >&5 +echo "configure:11711: 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 < int main() { @@ -11237,7 +11725,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:11241: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:11729: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_size_t_is_uint=no else @@ -11260,12 +11748,12 @@ EOF else echo $ac_n "checking if size_t is unsigned long""... $ac_c" 1>&6 -echo "configure:11264: checking if size_t is unsigned long" >&5 +echo "configure:11752: 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 < int main() { @@ -11278,7 +11766,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:11282: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:11770: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_size_t_is_ulong=no else @@ -11312,13 +11800,13 @@ cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking for pw_gecos in struct passwd""... $ac_c" 1>&6 -echo "configure:11316: checking for pw_gecos in struct passwd" >&5 +echo "configure:11804: 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 < int main() { @@ -11329,7 +11817,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:11333: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:11821: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_struct_pw_gecos=yes @@ -11359,12 +11847,12 @@ fi echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:11363: checking for working const" >&5 +echo "configure:11851: checking for working const" >&5 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:11905: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -11434,21 +11922,21 @@ EOF fi echo $ac_n "checking for inline""... $ac_c" 1>&6 -echo "configure:11438: checking for inline" >&5 +echo "configure:11926: checking for inline" >&5 if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_cv_c_inline=no for ac_kw in inline __inline__ __inline; do cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:11940: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_inline=$ac_kw; break else @@ -11475,7 +11963,7 @@ esac echo $ac_n "checking size of char""... $ac_c" 1>&6 -echo "configure:11479: checking size of char" >&5 +echo "configure:11967: 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 @@ -11483,7 +11971,7 @@ else ac_cv_sizeof_char=1 else cat > conftest.$ac_ext < main() @@ -11494,7 +11982,7 @@ main() exit(0); } EOF -if { (eval echo configure:11498: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:11986: \"$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 @@ -11514,7 +12002,7 @@ EOF echo $ac_n "checking size of short""... $ac_c" 1>&6 -echo "configure:11518: checking size of short" >&5 +echo "configure:12006: 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 @@ -11522,7 +12010,7 @@ else ac_cv_sizeof_short=2 else cat > conftest.$ac_ext < main() @@ -11533,7 +12021,7 @@ main() exit(0); } EOF -if { (eval echo configure:11537: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:12025: \"$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 @@ -11553,7 +12041,7 @@ EOF echo $ac_n "checking size of int *""... $ac_c" 1>&6 -echo "configure:11557: checking size of int *" >&5 +echo "configure:12045: 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 @@ -11561,7 +12049,7 @@ else ac_cv_sizeof_int_p=4 else cat > conftest.$ac_ext < main() @@ -11572,7 +12060,7 @@ main() exit(0); } EOF -if { (eval echo configure:11576: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:12064: \"$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 @@ -11592,7 +12080,7 @@ EOF echo $ac_n "checking size of int""... $ac_c" 1>&6 -echo "configure:11596: checking size of int" >&5 +echo "configure:12084: 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 @@ -11600,7 +12088,7 @@ else ac_cv_sizeof_int=4 else cat > conftest.$ac_ext < main() @@ -11611,7 +12099,7 @@ main() exit(0); } EOF -if { (eval echo configure:11615: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:12103: \"$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 @@ -11631,7 +12119,7 @@ EOF echo $ac_n "checking size of long""... $ac_c" 1>&6 -echo "configure:11635: checking size of long" >&5 +echo "configure:12123: 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 @@ -11639,7 +12127,7 @@ else ac_cv_sizeof_long=4 else cat > conftest.$ac_ext < main() @@ -11650,7 +12138,7 @@ main() exit(0); } EOF -if { (eval echo configure:11654: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:12142: \"$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 @@ -11670,7 +12158,7 @@ EOF echo $ac_n "checking size of long long""... $ac_c" 1>&6 -echo "configure:11674: checking size of long long" >&5 +echo "configure:12162: 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 @@ -11678,7 +12166,7 @@ else ac_cv_sizeof_long_long=0 else cat > conftest.$ac_ext < main() @@ -11689,7 +12177,7 @@ main() exit(0); } EOF -if { (eval echo configure:11693: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:12181: \"$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 @@ -11710,7 +12198,7 @@ EOF echo $ac_n "checking size of wchar_t""... $ac_c" 1>&6 -echo "configure:11714: checking size of wchar_t" >&5 +echo "configure:12202: 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 @@ -11720,7 +12208,7 @@ else else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:12231: \"$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 @@ -11761,16 +12249,15 @@ cat >> confdefs.h <&6 -echo "configure:11767: checking whether byte ordering is bigendian" >&5 +echo "configure:12254: checking whether byte ordering is bigendian" >&5 if eval "test \"`echo '$''{'ac_cv_c_bigendian'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_cv_c_bigendian=unknown # See if sys/param.h defines the BYTE_ORDER macro. cat > conftest.$ac_ext < #include @@ -11781,11 +12268,11 @@ int main() { #endif ; return 0; } EOF -if { (eval echo configure:11785: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:12272: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* # It does; now see whether it defined to BIG_ENDIAN or not. cat > conftest.$ac_ext < #include @@ -11796,7 +12283,7 @@ int main() { #endif ; return 0; } EOF -if { (eval echo configure:11800: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:12287: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_bigendian=yes else @@ -11816,7 +12303,7 @@ if test "$cross_compiling" = yes; then ac_cv_c_bigendian=unknown else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:12320: \"$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 @@ -11876,17 +12363,17 @@ cross_compiling=$ac_cv_prog_cxx_cross do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:11880: checking for $ac_hdr" >&5 +echo "configure:12367: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:11890: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12377: \"$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* @@ -11934,7 +12421,7 @@ cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking if C++ compiler supports bool""... $ac_c" 1>&6 -echo "configure:11938: checking if C++ compiler supports bool" >&5 +echo "configure:12425: 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 @@ -11949,7 +12436,7 @@ cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:12452: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_cpp_bool=yes @@ -11998,52 +12485,8 @@ EOF -echo $ac_n "checking if you need GNU extensions""... $ac_c" 1>&6 -echo "configure:12003: checking if you need GNU extensions" >&5 -if eval "test \"`echo '$''{'wx_cv_gnu_extensions'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - - cat > conftest.$ac_ext < -int main() { - - -#ifndef __GNU_LIBRARY__ - Compile error wanted -#endif - - -; return 0; } -EOF -if { (eval echo configure:12022: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - wx_cv_gnu_extensions=yes -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - wx_cv_gnu_extensions=no -fi -rm -f conftest* - -fi - - -echo "$ac_t""$wx_cv_gnu_extensions" 1>&6 -if test "$wx_cv_gnu_extensions" = "yes"; then - cat >> confdefs.h <&6 -echo "configure:12047: checking for wcslen in -lc" >&5 +echo "configure:12490: 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 @@ -12051,7 +12494,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lc $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12509: \"$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 @@ -12088,7 +12531,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for wcslen in -lw""... $ac_c" 1>&6 -echo "configure:12092: checking for wcslen in -lw" >&5 +echo "configure:12535: 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 @@ -12096,7 +12539,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lw $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12554: \"$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 @@ -12138,12 +12581,12 @@ fi echo $ac_n "checking for vprintf""... $ac_c" 1>&6 -echo "configure:12142: checking for vprintf" >&5 +echo "configure:12585: checking for vprintf" >&5 if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12613: \"$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 @@ -12190,12 +12633,12 @@ fi if test "$ac_cv_func_vprintf" != yes; then echo $ac_n "checking for _doprnt""... $ac_c" 1>&6 -echo "configure:12194: checking for _doprnt" >&5 +echo "configure:12637: checking for _doprnt" >&5 if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12665: \"$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 @@ -12249,13 +12692,13 @@ fi echo $ac_n "checking for vsnprintf""... $ac_c" 1>&6 -echo "configure:12253: checking for vsnprintf" >&5 +echo "configure:12696: 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 < @@ -12280,7 +12723,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:12284: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:12727: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_func_vsnprintf=yes @@ -12291,7 +12734,7 @@ else rm -rf conftest* cat > conftest.$ac_ext < @@ -12316,7 +12759,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:12320: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:12763: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_func_vsnprintf=yes @@ -12348,13 +12791,13 @@ else fi echo $ac_n "checking for vsscanf""... $ac_c" 1>&6 -echo "configure:12352: checking for vsscanf" >&5 +echo "configure:12795: 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 < @@ -12377,7 +12820,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:12381: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:12824: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_func_vsscanf=yes @@ -12415,13 +12858,13 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross echo $ac_n "checking if iconv() takes char**""... $ac_c" 1>&6 -echo "configure:12419: checking if iconv() takes char**" >&5 +echo "configure:12862: checking if iconv() takes char**" >&5 if eval "test \"`echo '$''{'wx_cv_iconv_takes_char'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { @@ -12433,7 +12876,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:12437: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:12880: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_iconv_takes_char=yes else @@ -12466,12 +12909,12 @@ 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:12470: checking for $ac_func" >&5 +echo "configure:12913: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12941: \"$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 @@ -12535,13 +12978,13 @@ cross_compiling=$ac_cv_prog_cxx_cross echo $ac_n "checking for sa_handler type""... $ac_c" 1>&6 -echo "configure:12539: checking for sa_handler type" >&5 +echo "configure:12982: checking for sa_handler type" >&5 if eval "test \"`echo '$''{'wx_cv_type_sa_handler'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { @@ -12553,7 +12996,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:12557: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:13000: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_type_sa_handler=int @@ -12590,12 +13033,12 @@ fi for ac_func in vfork do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:12594: checking for $ac_func" >&5 +echo "configure:13037: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13065: \"$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 @@ -12647,12 +13090,12 @@ 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:12651: checking for $ac_func" >&5 +echo "configure:13094: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13122: \"$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 @@ -12709,12 +13152,12 @@ fi for ac_func in timegm do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:12713: checking for $ac_func" >&5 +echo "configure:13156: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13184: \"$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 @@ -12765,12 +13208,12 @@ done for ac_func in putenv setenv do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:12769: checking for $ac_func" >&5 +echo "configure:13212: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13240: \"$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 @@ -12840,12 +13283,12 @@ if test "$HAVE_SOME_SLEEP_FUNC" != 1; then for ac_func in nanosleep do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:12844: checking for $ac_func" >&5 +echo "configure:13287: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13315: \"$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 @@ -12893,7 +13336,7 @@ EOF else echo "$ac_t""no" 1>&6 echo $ac_n "checking for nanosleep in -lposix4""... $ac_c" 1>&6 -echo "configure:12897: checking for nanosleep in -lposix4" >&5 +echo "configure:13340: 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 @@ -12901,7 +13344,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lposix4 $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13359: \"$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 @@ -12940,12 +13383,12 @@ else for ac_func in usleep do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:12944: checking for $ac_func" >&5 +echo "configure:13387: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13415: \"$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 @@ -13011,12 +13454,12 @@ fi for ac_func in uname gethostname do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:13015: checking for $ac_func" >&5 +echo "configure:13458: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13486: \"$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 @@ -13076,12 +13519,12 @@ cross_compiling=$ac_cv_prog_cxx_cross for ac_func in strtok_r do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:13080: checking for $ac_func" >&5 +echo "configure:13523: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13554: \"$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 @@ -13144,12 +13587,12 @@ INET_LINK= for ac_func in inet_addr do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:13148: checking for $ac_func" >&5 +echo "configure:13591: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13619: \"$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 @@ -13197,7 +13640,7 @@ EOF else echo "$ac_t""no" 1>&6 echo $ac_n "checking for inet_addr in -lnsl""... $ac_c" 1>&6 -echo "configure:13201: checking for inet_addr in -lnsl" >&5 +echo "configure:13644: 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 @@ -13205,7 +13648,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13663: \"$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 @@ -13235,7 +13678,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then else echo "$ac_t""no" 1>&6 echo $ac_n "checking for inet_addr in -lresolv""... $ac_c" 1>&6 -echo "configure:13239: checking for inet_addr in -lresolv" >&5 +echo "configure:13682: 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 @@ -13243,7 +13686,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lresolv $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13701: \"$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 @@ -13287,12 +13730,12 @@ done for ac_func in inet_aton do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:13291: checking for $ac_func" >&5 +echo "configure:13734: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13762: \"$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 @@ -13340,7 +13783,7 @@ EOF else echo "$ac_t""no" 1>&6 echo $ac_n "checking for inet_aton in -l$INET_LINK""... $ac_c" 1>&6 -echo "configure:13344: checking for inet_aton in -l$INET_LINK" >&5 +echo "configure:13787: 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 @@ -13348,7 +13791,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l$INET_LINK $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13806: \"$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 @@ -13472,7 +13915,7 @@ if test "$wxUSE_THREADS" = "yes" ; then fi echo $ac_n "checking for pthread_create in -l$THREADS_LIB""... $ac_c" 1>&6 -echo "configure:13476: checking for pthread_create in -l$THREADS_LIB" >&5 +echo "configure:13919: 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 @@ -13480,7 +13923,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l$THREADS_LIB $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13938: \"$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 @@ -13514,7 +13957,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6 -echo "configure:13518: checking for pthread_create in -lc_r" >&5 +echo "configure:13961: 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 @@ -13522,7 +13965,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lc_r $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13980: \"$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 @@ -13557,17 +14000,17 @@ else ac_safe=`echo "sys/prctl.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for sys/prctl.h""... $ac_c" 1>&6 -echo "configure:13561: checking for sys/prctl.h" >&5 +echo "configure:14004: checking for sys/prctl.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:13571: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:14014: \"$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* @@ -13607,12 +14050,12 @@ if test "$wxUSE_THREADS" = "yes" ; then for ac_func in thr_setconcurrency do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:13611: checking for $ac_func" >&5 +echo "configure:14054: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14082: \"$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 @@ -13665,17 +14108,17 @@ done do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:13669: checking for $ac_hdr" >&5 +echo "configure:14112: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:13679: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:14122: \"$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* @@ -13703,7 +14146,7 @@ done echo $ac_n "checking for sched_yield in -l$THREADS_LINK""... $ac_c" 1>&6 -echo "configure:13707: checking for sched_yield in -l$THREADS_LINK" >&5 +echo "configure:14150: 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 @@ -13711,7 +14154,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l$THREADS_LINK $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14169: \"$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 @@ -13744,7 +14187,7 @@ EOF else echo "$ac_t""no" 1>&6 echo $ac_n "checking for sched_yield in -lposix4""... $ac_c" 1>&6 -echo "configure:13748: checking for sched_yield in -lposix4" >&5 +echo "configure:14191: 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 @@ -13752,7 +14195,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lposix4 $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14210: \"$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 @@ -13794,7 +14237,7 @@ fi HAVE_PRIOR_FUNCS=0 echo $ac_n "checking for pthread_attr_getschedpolicy in -l$THREADS_LINK""... $ac_c" 1>&6 -echo "configure:13798: checking for pthread_attr_getschedpolicy in -l$THREADS_LINK" >&5 +echo "configure:14241: 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 @@ -13802,7 +14245,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l$THREADS_LINK $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14260: \"$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 @@ -13829,7 +14272,7 @@ fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 echo $ac_n "checking for pthread_attr_setschedparam in -l$THREADS_LINK""... $ac_c" 1>&6 -echo "configure:13833: checking for pthread_attr_setschedparam in -l$THREADS_LINK" >&5 +echo "configure:14276: 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 @@ -13837,7 +14280,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l$THREADS_LINK $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14295: \"$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 @@ -13864,7 +14307,7 @@ fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 echo $ac_n "checking for sched_get_priority_max in -l$THREADS_LINK""... $ac_c" 1>&6 -echo "configure:13868: checking for sched_get_priority_max in -l$THREADS_LINK" >&5 +echo "configure:14311: 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 @@ -13872,7 +14315,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l$THREADS_LINK $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14330: \"$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 @@ -13902,7 +14345,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then else echo "$ac_t""no" 1>&6 echo $ac_n "checking for sched_get_priority_max in -lposix4""... $ac_c" 1>&6 -echo "configure:13906: checking for sched_get_priority_max in -lposix4" >&5 +echo "configure:14349: 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 @@ -13910,7 +14353,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lposix4 $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14368: \"$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 @@ -13968,7 +14411,7 @@ EOF fi echo $ac_n "checking for pthread_cancel in -l$THREADS_LINK""... $ac_c" 1>&6 -echo "configure:13972: checking for pthread_cancel in -l$THREADS_LINK" >&5 +echo "configure:14415: 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 @@ -13976,7 +14419,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l$THREADS_LINK $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14434: \"$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 @@ -14013,13 +14456,13 @@ fi echo $ac_n "checking for pthread_cleanup_push/pop""... $ac_c" 1>&6 -echo "configure:14017: checking for pthread_cleanup_push/pop" >&5 +echo "configure:14460: checking for pthread_cleanup_push/pop" >&5 if eval "test \"`echo '$''{'wx_cv_func_pthread_cleanup_push'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { @@ -14029,7 +14472,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:14033: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:14476: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_func_pthread_cleanup_push=yes @@ -14057,13 +14500,13 @@ EOF echo $ac_n "checking for pthread_mutexattr_t""... $ac_c" 1>&6 -echo "configure:14061: checking for pthread_mutexattr_t" >&5 +echo "configure:14504: checking for pthread_mutexattr_t" >&5 if eval "test \"`echo '$''{'wx_cv_type_pthread_mutexattr_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { @@ -14073,7 +14516,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:14077: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:14520: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_type_pthread_mutexattr_t=yes @@ -14100,13 +14543,13 @@ EOF else echo $ac_n "checking for PTHREAD_RECURSIVE_MUTEX_INITIALIZER""... $ac_c" 1>&6 -echo "configure:14104: checking for PTHREAD_RECURSIVE_MUTEX_INITIALIZER" >&5 +echo "configure:14547: checking for PTHREAD_RECURSIVE_MUTEX_INITIALIZER" >&5 if eval "test \"`echo '$''{'wx_cv_type_pthread_rec_mutex_init'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { @@ -14115,7 +14558,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:14119: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:14562: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_type_pthread_rec_mutex_init=yes @@ -14170,7 +14613,7 @@ EOF 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:14174: checking if -D_REENTRANT is needed" >&5 +echo "configure:14617: 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" @@ -14214,7 +14657,7 @@ if test "$wxUSE_MAC" = 1 ; then # 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:14218: checking for $ac_word" >&5 +echo "configure:14661: 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 @@ -14244,7 +14687,7 @@ 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:14248: checking for $ac_word" >&5 +echo "configure:14691: 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 @@ -14368,6 +14811,126 @@ else 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 + + +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:14836: 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 +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (eval echo configure:14846: \"$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:14865: checking for $ac_func" >&5 +if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext < +/* Override any gcc2 internal prototype to avoid an error. */ +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char $ac_func(); + +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:14893: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_$ac_func=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_func_$ac_func=no" +fi +rm -f conftest* +fi + +if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then + echo "$ac_t""yes" 1>&6 + ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` + cat >> confdefs.h <&6 +fi +done + +else + echo "$ac_t""no" 1>&6 +fi + + + 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 + + REGEX_INCLUDE="-I\${top_srcdir}/src/regex" + fi + + cat >> confdefs.h <<\EOF +#define wxUSE_REGEX 1 +EOF + +fi ZLIB_INCLUDE= if test "$wxUSE_ZLIB" = "yes" -o "$wxUSE_ZLIB" = "sys" ; then @@ -14381,17 +14944,17 @@ EOF ZLIB_LINK= ac_safe=`echo "zlib.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for zlib.h""... $ac_c" 1>&6 -echo "configure:14385: checking for zlib.h" >&5 +echo "configure:14948: 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 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:14395: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:14958: \"$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* @@ -14408,7 +14971,7 @@ fi if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then echo "$ac_t""yes" 1>&6 echo $ac_n "checking for deflate in -lz""... $ac_c" 1>&6 -echo "configure:14412: checking for deflate in -lz" >&5 +echo "configure:14975: 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 @@ -14416,7 +14979,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lz $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14994: \"$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 @@ -14474,17 +15037,17 @@ EOF PNG_LINK= ac_safe=`echo "png.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for png.h""... $ac_c" 1>&6 -echo "configure:14478: checking for png.h" >&5 +echo "configure:15041: 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 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:14488: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:15051: \"$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* @@ -14501,7 +15064,7 @@ fi 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:14505: checking for png_check_sig in -lpng" >&5 +echo "configure:15068: 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 @@ -14509,7 +15072,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpng -lz -lm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15087: \"$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 @@ -14563,36 +15126,43 @@ EOF 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:14569: 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:15131: 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 < + + #undef HAVE_STDLIB_H + #include + #include + +int main() { + + +; return 0; } EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:14579: \"$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:15148: \"$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:14596: 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:15166: 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 @@ -14600,7 +15170,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ljpeg $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15185: \"$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 @@ -14631,9 +15201,7 @@ 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; } @@ -14653,17 +15221,17 @@ EOF TIFF_LINK= ac_safe=`echo "tiffio.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for tiffio.h""... $ac_c" 1>&6 -echo "configure:14657: checking for tiffio.h" >&5 +echo "configure:15225: 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 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:14667: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:15235: \"$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* @@ -14680,7 +15248,7 @@ fi 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:14684: checking for TIFFError in -ltiff" >&5 +echo "configure:15252: 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 @@ -14688,7 +15256,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ltiff -lm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15271: \"$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 @@ -14741,17 +15309,17 @@ EOF FREETYPE_LINK= ac_safe=`echo "freetype.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for freetype.h""... $ac_c" 1>&6 -echo "configure:14745: checking for freetype.h" >&5 +echo "configure:15313: 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 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:14755: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:15323: \"$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* @@ -14768,7 +15336,7 @@ fi 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:14772: checking for FT_Render_Glyph in -lfreetype" >&5 +echo "configure:15340: 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 @@ -14776,7 +15344,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lfreetype -lm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15359: \"$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 @@ -14821,17 +15389,17 @@ fi if test "$wxUSE_OPENGL" = "yes"; then ac_safe=`echo "GL/gl.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for GL/gl.h""... $ac_c" 1>&6 -echo "configure:14825: checking for GL/gl.h" >&5 +echo "configure:15393: checking for GL/gl.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:14835: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:15403: \"$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* @@ -14857,7 +15425,7 @@ EOF EOF echo $ac_n "checking for glFlush in -lGL""... $ac_c" 1>&6 -echo "configure:14861: checking for glFlush in -lGL" >&5 +echo "configure:15429: 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 @@ -14865,7 +15433,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lGL $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15448: \"$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 @@ -14898,7 +15466,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for glFlush in -lMesaGL""... $ac_c" 1>&6 -echo "configure:14902: checking for glFlush in -lMesaGL" >&5 +echo "configure:15470: 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 @@ -14906,7 +15474,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lMesaGL $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15489: \"$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 @@ -15133,6 +15701,20 @@ if test "$wxUSE_LOG" = "yes"; then #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 @@ -15169,12 +15751,12 @@ 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:15173: checking for $ac_func" >&5 +echo "configure:15755: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15783: \"$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 @@ -15223,13 +15805,13 @@ done echo $ac_n "checking for timezone variable in ""... $ac_c" 1>&6 -echo "configure:15227: checking for timezone variable in " >&5 +echo "configure:15809: checking for timezone variable in " >&5 if eval "test \"`echo '$''{'wx_cv_var_timezone'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -15237,14 +15819,14 @@ else int main() { int tz; - tz = __timezone; + tz = timezone; ; return 0; } EOF -if { (eval echo configure:15245: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:15827: \"$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 @@ -15252,7 +15834,7 @@ else rm -rf conftest* cat > conftest.$ac_ext < @@ -15264,7 +15846,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:15268: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:15850: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_var_timezone=_timezone @@ -15275,7 +15857,7 @@ else rm -rf conftest* cat > conftest.$ac_ext < @@ -15283,14 +15865,14 @@ else int main() { int tz; - tz = timezone; + tz = __timezone; ; return 0; } EOF -if { (eval echo configure:15291: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:15873: \"$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 @@ -15322,12 +15904,12 @@ EOF for ac_func in localtime do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:15326: checking for $ac_func" >&5 +echo "configure:15908: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15936: \"$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 @@ -15377,13 +15959,13 @@ done if test "$ac_cv_func_localtime" = "yes"; then echo $ac_n "checking for tm_gmtoff in struct tm""... $ac_c" 1>&6 -echo "configure:15381: checking for tm_gmtoff in struct tm" >&5 +echo "configure:15963: 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 < @@ -15395,7 +15977,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:15399: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:15981: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_struct_tm_has_gmtoff=yes @@ -15424,12 +16006,12 @@ EOF for ac_func in gettimeofday ftime do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:15428: checking for $ac_func" >&5 +echo "configure:16010: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:16038: \"$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 @@ -15479,7 +16061,7 @@ done if test "$ac_cv_func_gettimeofday" = "yes"; then echo $ac_n "checking whether gettimeofday takes two arguments""... $ac_c" 1>&6 -echo "configure:15483: checking whether gettimeofday takes two arguments" >&5 +echo "configure:16065: 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 @@ -15494,7 +16076,7 @@ cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext < @@ -15508,7 +16090,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:15512: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:16094: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_func_gettimeofday_has_2_args=yes else @@ -15516,7 +16098,7 @@ else cat conftest.$ac_ext >&5 rm -rf conftest* cat > conftest.$ac_ext < @@ -15529,7 +16111,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:15533: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:16115: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_func_gettimeofday_has_2_args=no else @@ -15575,12 +16157,12 @@ if test "$TOOLKIT" != "MSW"; then if test "$wxUSE_SOCKETS" = "yes"; then echo $ac_n "checking for socket""... $ac_c" 1>&6 -echo "configure:15579: checking for socket" >&5 +echo "configure:16161: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:16189: \"$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 @@ -15621,7 +16203,7 @@ if eval "test \"`echo '$ac_cv_func_'socket`\" = yes"; then else echo "$ac_t""no" 1>&6 echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6 -echo "configure:15625: checking for socket in -lsocket" >&5 +echo "configure:16207: 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 @@ -15629,7 +16211,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsocket $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:16226: \"$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 @@ -15673,7 +16255,7 @@ 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:15677: checking what is the type of the third argument of getsockname" >&5 +echo "configure:16259: 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 @@ -15688,7 +16270,7 @@ cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext < @@ -15701,7 +16283,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:15705: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:16287: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_type_getsockname3=socklen_t else @@ -15709,7 +16291,7 @@ else cat conftest.$ac_ext >&5 rm -rf conftest* cat > conftest.$ac_ext < @@ -15722,7 +16304,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:15726: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:16308: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_type_getsockname3=size_t else @@ -15730,7 +16312,7 @@ else cat conftest.$ac_ext >&5 rm -rf conftest* cat > conftest.$ac_ext < @@ -15743,7 +16325,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:15747: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:16329: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_type_getsockname3=int else @@ -15805,17 +16387,17 @@ if test "$wxUSE_JOYSTICK" = "yes"; then do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:15809: checking for $ac_hdr" >&5 +echo "configure:16391: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:15819: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:16401: \"$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* @@ -15871,12 +16453,12 @@ if test "$wxUSE_DYNLIB_CLASS" = "yes"; then for ac_func in dlopen do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:15875: checking for $ac_func" >&5 +echo "configure:16457: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:16485: \"$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 @@ -15927,7 +16509,7 @@ EOF else echo "$ac_t""no" 1>&6 echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 -echo "configure:15931: checking for dlopen in -ldl" >&5 +echo "configure:16513: 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 @@ -15935,7 +16517,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:16532: \"$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 @@ -15975,12 +16557,12 @@ else for ac_func in shl_load do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:15979: checking for $ac_func" >&5 +echo "configure:16561: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:16589: \"$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 @@ -16031,7 +16613,7 @@ EOF else echo "$ac_t""no" 1>&6 echo $ac_n "checking for dld in -lshl_load""... $ac_c" 1>&6 -echo "configure:16035: checking for dld in -lshl_load" >&5 +echo "configure:16617: 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 @@ -16039,7 +16621,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lshl_load $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:16636: \"$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 @@ -16089,12 +16671,12 @@ done for ac_func in dlerror do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:16093: checking for $ac_func" >&5 +echo "configure:16675: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:16703: \"$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 @@ -16142,7 +16724,7 @@ EOF else echo "$ac_t""no" 1>&6 echo $ac_n "checking for dlerror in -ldl""... $ac_c" 1>&6 -echo "configure:16146: checking for dlerror in -ldl" >&5 +echo "configure:16728: 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 @@ -16150,7 +16732,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:16747: \"$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 @@ -16314,6 +16896,57 @@ if test "$wxUSE_HELP" = "yes"; then EOF SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS help" + + if test "$USE_WIN32" = 1; then + if test "$wxUSE_WXHTML_HELP" = "yes"; then + cat >> confdefs.h <<\EOF +#define wxUSE_WXHTML_HELP 1 +EOF + + ac_safe=`echo "htmlhelp.h" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for htmlhelp.h""... $ac_c" 1>&6 +echo "configure:16909: 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 +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (eval echo configure:16919: \"$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_PRINTING_ARCHITECTURE" = "yes" ; then @@ -16336,15 +16969,11 @@ EOF 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 @@ -16401,17 +17030,17 @@ if test "$wxUSE_DRAG_AND_DROP" = "yes" ; then do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:16405: checking for $ac_hdr" >&5 +echo "configure:17034: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:16415: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:17044: \"$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* @@ -16444,6 +17073,10 @@ done ALL_DEPFILES="$ALL_DEPFILES \$(OLEDEPS)" CODE_GEN_FLAGS_CXX="$CODE_GEN_FLAGS_CXX -fvtable-thunks" LIBS="$LIBS -lole32 -luuid" + cat >> confdefs.h <<\EOF +#define wxUSE_OLE 1 +EOF + if test "$wxUSE_METAFILE" = "yes"; then cat >> confdefs.h <<\EOF @@ -16826,6 +17459,18 @@ EOF 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 "$USES_CONTROLS" = 1; then cat >> confdefs.h <<\EOF #define wxUSE_CONTROLS 1 @@ -16835,6 +17480,14 @@ fi +if test "$wxUSE_DRAGIMAGE" = "yes"; then + cat >> confdefs.h <<\EOF +#define wxUSE_DRAGIMAGE 1 +EOF + + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS dragimag" +fi + if test "$wxUSE_MENUS" = "yes"; then cat >> confdefs.h <<\EOF #define wxUSE_MENUS 1 @@ -16857,6 +17510,13 @@ EOF fi +if test "$wxUSE_SYSTEM_OPTIONS" = "yes"; then + cat >> confdefs.h <<\EOF +#define wxUSE_SYSTEM_OPTIONS 1 +EOF + +fi + if test "$wxUSE_MINIFRAME" = "yes"; then cat >> confdefs.h <<\EOF #define wxUSE_MINIFRAME 1 @@ -17004,6 +17664,14 @@ 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\"" @@ -17031,7 +17699,9 @@ fi 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="" @@ -17051,7 +17721,7 @@ LDFLAGS="$LDFLAGS $PROFILE" if test "$wxUSE_GUI" = "yes"; then - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS controls dialogs dragimag \ + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS controls dialogs \ drawing dynamic event font fractal image \ minimal richedit widgets" @@ -17160,7 +17830,7 @@ SAMPLES_SUBDIRS="`echo $SAMPLES_SUBDIRS | tr -s ' ' | tr ' ' '\n' | sort | uniq echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:17164: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:17834: 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 @@ -17380,9 +18050,9 @@ s%@LEX@%$LEX%g s%@LEXLIB@%$LEXLIB%g s%@LN_S@%$LN_S%g s%@GTK_CONFIG_2_0@%$GTK_CONFIG_2_0%g -s%@GTK_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