X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/24fd6d87e9eccdf8d3357c247e270e957ab2683d..88e30f2b719c232adb42f2a8e7f5884b4547b3f4:/configure?ds=sidebyside diff --git a/configure b/configure index 5615a09920..001ae4eaa4 100755 --- a/configure +++ b/configure @@ -68,13 +68,11 @@ ac_help="$ac_help ac_help="$ac_help --with-wine use WINE" ac_help="$ac_help - --with-cygwin use Cygwin for MS-Windows" -ac_help="$ac_help - --with-mingw use GCC Minimal MS-Windows" + --with-msw use MS-Windows" ac_help="$ac_help --with-pm use OS/2 Presentation Manager" ac_help="$ac_help - --with-mgl use MGL" + --with-mgl use SciTech MGL" ac_help="$ac_help --enable-gtk2 use GTK+ 2.0 if available (EXPERIMENTAL)" ac_help="$ac_help @@ -89,6 +87,8 @@ ac_help="$ac_help --with-opengl use OpenGL (or Mesa)" ac_help="$ac_help --with-dmalloc use dmalloc library (www.letters.com/dmalloc)" +ac_help="$ac_help + --with-regex enable support for wxRegEx class" ac_help="$ac_help --with-zlib use zlib for LZW compression" ac_help="$ac_help @@ -96,11 +96,13 @@ ac_help="$ac_help ac_help="$ac_help --enable-shared create shared library code" ac_help="$ac_help - --enable-burnt_name create set name in shared library " + --enable-soname set the DT_SONAME field in ELF shared libraries" ac_help="$ac_help --enable-optimise create optimised code" ac_help="$ac_help --enable-debug same as debug_flag and debug_info" +ac_help="$ac_help + --enable-precomp enable use of precompiled headers (Mac OS X)" ac_help="$ac_help --enable-debug_flag set __WXDEBUG__ flag (recommended for developers!)" ac_help="$ac_help @@ -116,15 +118,15 @@ ac_help="$ac_help ac_help="$ac_help --enable-no_rtti create code without RTTI information" ac_help="$ac_help - --enable-no_exceptions create code without exceptions information" + --enable-no_exceptions create code without C++ exceptions handling" ac_help="$ac_help --enable-permissive compile code disregarding strict ANSI" ac_help="$ac_help --enable-no_deps create code without dependency information" ac_help="$ac_help - --enable-compat20 enable wxWin 2.0 compatibility" + --enable-compat20 enable wxWindows 2.0 compatibility" ac_help="$ac_help - --enable-compat22 enable wxWin 2.2 compatibility" + --enable-compat22 enable wxWindows 2.2 compatibility" ac_help="$ac_help --enable-intl use internationalization system" ac_help="$ac_help @@ -166,13 +168,13 @@ ac_help="$ac_help ac_help="$ac_help --enable-ffile use wxFFile classes" ac_help="$ac_help - --enable-textfile use wxTextFile classes" + --enable-textbuf use wxTextBuffer class" +ac_help="$ac_help + --enable-textfile use wxTextFile class" ac_help="$ac_help --enable-fontmap use font encodings conversion classes" ac_help="$ac_help --enable-unicode compile wxString with Unicode support" -ac_help="$ac_help - --enable-wcsrtombs use wcsrtombs instead of buggy (GNU libc1/Linux libc5) wcstombs" ac_help="$ac_help --enable-wxprintfv use wxWindows implementation of vprintf()" ac_help="$ac_help @@ -191,6 +193,8 @@ ac_help="$ac_help --enable-snglinst use wxSingleInstanceChecker class" ac_help="$ac_help --enable-mimetypes use wxMimeTypesManager" +ac_help="$ac_help + --enable-sysoptions use wxSystemOptions" ac_help="$ac_help --enable-threads use threads" ac_help="$ac_help @@ -198,7 +202,13 @@ ac_help="$ac_help ac_help="$ac_help --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-mshtmlhelp use MS HTML Help (win32)" +ac_help="$ac_help + --enable-html use wxHTML sub-library" +ac_help="$ac_help + --enable-htmlhelp use wxHTML-based help" ac_help="$ac_help --enable-constraints use layout-constraints system" ac_help="$ac_help @@ -224,7 +234,7 @@ ac_help="$ac_help ac_help="$ac_help --enable-metafile use win32 metafiles" ac_help="$ac_help - --enable-wxtree make wxTree library" + --enable-treelayout use wxTreeLayout classes" ac_help="$ac_help --enable-controls use all usual controls" ac_help="$ac_help @@ -259,6 +269,8 @@ ac_help="$ac_help --enable-listctrl use wxListCtrl class" ac_help="$ac_help --enable-notebook use wxNotebook class" +ac_help="$ac_help + --enable-propsheet use wxPropertySheet class" ac_help="$ac_help --enable-radiobox use wxRadioBox class" ac_help="$ac_help @@ -300,13 +312,17 @@ ac_help="$ac_help ac_help="$ac_help --enable-treectrl use wxTreeCtrl class" ac_help="$ac_help - --enable-commondlg use common dialogs (wxDirDialog, wxProgressDialog, wxTextDialog, ...)" + --enable-popupwin use wxPopUpWindow class" +ac_help="$ac_help + --enable-commondlg use all common dialogs" ac_help="$ac_help --enable-choicedlg use wxChoiceDialog" ac_help="$ac_help --enable-coldlg use wxColourDialog" ac_help="$ac_help --enable-filedlg use wxFileDialog" +ac_help="$ac_help + --enable-finddlg use wxFindReplaceDialog" ac_help="$ac_help --enable-fontdlg use wxFontDialog" ac_help="$ac_help @@ -315,18 +331,20 @@ ac_help="$ac_help --enable-msgdlg use wxMessageDialog" ac_help="$ac_help --enable-numberdlg use wxNumberEntryDialog" +ac_help="$ac_help + --enable-splash use wxSplashScreen" ac_help="$ac_help --enable-textdlg use wxTextDialog" ac_help="$ac_help --enable-tipdlg use startup tips" ac_help="$ac_help --enable-progressdlg use wxProgressDialog" +ac_help="$ac_help + --enable-wizarddlg use wxWizard" ac_help="$ac_help --enable-menus use wxMenu/wxMenuBar/wxMenuItem classes" ac_help="$ac_help --enable-miniframe use wxMiniFrame class" -ac_help="$ac_help - --enable-html use wxHTML sub-library" ac_help="$ac_help --enable-tooltips use wxToolTip class" ac_help="$ac_help @@ -336,11 +354,13 @@ ac_help="$ac_help ac_help="$ac_help --enable-busyinfo use wxBusyInfo" ac_help="$ac_help - --enable-joystick compile in joystick support (Linux only)" + --enable-joystick use wxJoystick (Linux only)" ac_help="$ac_help --enable-metafiles use wxMetaFile (Windows only)" ac_help="$ac_help --enable-dragimage use wxDragImage" +ac_help="$ac_help + --enable-palette use wxPalette class" ac_help="$ac_help --enable-image use wxImage class" ac_help="$ac_help @@ -917,7 +937,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:921: checking host system type" >&5 +echo "configure:941: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -938,7 +958,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:942: checking target system type" >&5 +echo "configure:962: checking target system type" >&5 target_alias=$target case "$target_alias" in @@ -956,7 +976,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:960: checking build system type" >&5 +echo "configure:980: checking build system type" >&5 build_alias=$build case "$build_alias" in @@ -982,12 +1002,14 @@ 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_MSW_VERSION=$WX_MAJOR_VERSION_NUMBER$WX_MINOR_VERSION_NUMBER$WX_RELEASE_NUMBER + +WX_CURRENT=1 WX_REVISION=0 WX_AGE=0 @@ -1008,20 +1030,20 @@ USE_SUN= USE_SOLARIS= USE_SUNOS= USE_ALPHA= +USE_IA64= USE_OSF= USE_BSD= +USE_DARWIN= USE_FREEBSD= USE_OPENBSD= USE_NETBSD= USE_VMS= USE_ULTRIX= -USE_CYGWIN= -USE_MINGW= USE_DATA_GENERAL= NEEDS_D_REENTRANT_FOR_R_FUNCS=0 -ALL_TOOLKITS="CYGWIN GTK MAC MGL MINGW MOTIF PM WINE" +ALL_TOOLKITS="GTK MAC MGL MOTIF MSW PM WINE" DEFAULT_wxUSE_GTK=0 DEFAULT_wxUSE_MAC=0 @@ -1040,12 +1062,14 @@ DEFAULT_DEFAULT_wxUSE_PM=0 DEFAULT_DEFAULT_wxUSE_WINE=0 PROGRAM_EXT= +SO_SUFFIX=so case "${host}" in *-hp-hpux* ) USE_HPUX=1 DEFAULT_DEFAULT_wxUSE_MOTIF=1 NEEDS_D_REENTRANT_FOR_R_FUNCS=1 + SO_SUFFIX=sl cat >> confdefs.h <<\EOF #define __HPUX__ 1 EOF @@ -1062,6 +1086,13 @@ EOF USE_ALPHA=1 cat >> confdefs.h <<\EOF #define __ALPHA__ 1 +EOF + + fi + if test "x$TMP" = "xia64"; then + USE_IA64=1 + cat >> confdefs.h <<\EOF +#define __IA64__ 1 EOF fi @@ -1218,6 +1249,7 @@ EOF *-*-cygwin* | *-*-mingw32* ) USE_UNIX=0 USE_WIN32=1 + SO_SUFFIX=dll cat >> confdefs.h <<\EOF #define __WIN32__ 1 EOF @@ -1243,10 +1275,11 @@ EOF EOF PROGRAM_EXT=".exe" + RESCOMP=windres DEFAULT_DEFAULT_wxUSE_MSW=1 ;; - *-pc-os2_emx ) + *-pc-os2_emx | *-pc-os2-emx ) cat >> confdefs.h <<\EOF #define __EMX__ 1 EOF @@ -1255,19 +1288,20 @@ EOF DEFAULT_DEFAULT_wxUSE_PM=1 ;; - *-*-darwin* ) - USE_BSD=1 - USE_MAC=1 + powerpc-*-darwin* ) + USE_BSD=1 + USE_DARWIN=1 + SO_SUFFIX=dylib cat >> confdefs.h <<\EOF -#define __MAC__ 1 +#define __BSD__ 1 EOF cat >> confdefs.h <<\EOF -#define __BSD__ 1 +#define __DARWIN__ 1 EOF cat >> confdefs.h <<\EOF -#define __UNIX__ 1 +#define __POWERPC__ 1 EOF DEFAULT_DEFAULT_wxUSE_MAC=1 @@ -1291,60 +1325,51 @@ if test "$USE_UNIX" = 1 ; then #define __UNIX__ 1 EOF - - SRC_SUBDIRS="$SRC_SUBDIRS unix" - INCLUDE_SUBDIRS="$INCLUDE_SUBDIRS unix" -fi - -if test "$USE_BEOS" = 1; then - SRC_SUBDIRS="$SRC_SUBDIRS be" - INCLUDE_SUBDIRS="$INCLUDE_SUBDIRS be" fi if test "$USE_LINUX" = 1; then - echo $ac_n "checking for gettext in -lc""... $ac_c" 1>&6 -echo "configure:1307: 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 "checking for glibc 2.1 or later""... $ac_c" 1>&6 +echo "configure:1333: checking for glibc 2.1 or later" >&5 +if eval "test \"`echo '$''{'wx_lib_glibc21'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - ac_save_LIBS="$LIBS" -LIBS="-lc $LIBS" -cat > conftest.$ac_ext < conftest.$ac_ext < int main() { -gettext() + + #if !__GLIBC_PREREQ(2, 1) + #error not glibc2.1 + #endif + ; return 0; } EOF -if { (eval echo configure:1326: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1349: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" + + wx_lib_glibc21=yes + else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" + + wx_lib_glibc21=no + + fi rm -f conftest* -LIBS="$ac_save_LIBS" - + fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - cat >> confdefs.h <<\EOF + +echo "$ac_t""$wx_lib_glibc21" 1>&6 + if test "$wx_lib_glibc21" = "yes"; then + cat >> confdefs.h <<\EOF #define wxHAVE_GLIBC2 1 EOF -else - echo "$ac_t""no" 1>&6 -fi - + fi fi @@ -1364,12 +1389,12 @@ if test $DEBUG_CONFIGURE = 1; then DEFAULT_wxUSE_THREADS=yes DEFAULT_wxUSE_SHARED=yes - DEFAULT_wxUSE_BURNT_NAME=no + DEFAULT_wxUSE_SONAME=no DEFAULT_wxUSE_OPTIMISE=no DEFAULT_wxUSE_PROFILE=no DEFAULT_wxUSE_NO_DEPS=no - DEFAULT_wxUSE_NO_RTTI=no - DEFAULT_wxUSE_NO_EXCEPTIONS=no + DEFAULT_wxUSE_NO_RTTI=yes + DEFAULT_wxUSE_NO_EXCEPTIONS=yes DEFAULT_wxUSE_PERMISSIVE=no DEFAULT_wxUSE_DEBUG_FLAG=yes DEFAULT_wxUSE_DEBUG_INFO=yes @@ -1377,6 +1402,7 @@ if test $DEBUG_CONFIGURE = 1; then DEFAULT_wxUSE_MEM_TRACING=no DEFAULT_wxUSE_DEBUG_CONTEXT=no DEFAULT_wxUSE_DMALLOC=no + DEFAULT_wxUSE_PRECOMP=yes DEFAULT_wxUSE_APPLE_IEEE=no DEFAULT_wxUSE_LOG=yes @@ -1386,6 +1412,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 @@ -1404,6 +1431,7 @@ if test $DEBUG_CONFIGURE = 1; then DEFAULT_wxUSE_STOPWATCH=no DEFAULT_wxUSE_FILE=no DEFAULT_wxUSE_FFILE=no + DEFAULT_wxUSE_TEXTBUFFER=no DEFAULT_wxUSE_TEXTFILE=no DEFAULT_wxUSE_WAVE=no DEFAULT_wxUSE_INTL=no @@ -1438,21 +1466,28 @@ if test $DEBUG_CONFIGURE = 1; then DEFAULT_wxUSE_CONSTRAINTS=no DEFAULT_wxUSE_IPC=no DEFAULT_wxUSE_HELP=no - DEFAULT_wxUSE_WXTREE=no + DEFAULT_wxUSE_MS_HTML_HELP=no + DEFAULT_wxUSE_WXHTML_HELP=no + DEFAULT_wxUSE_TREELAYOUT=no DEFAULT_wxUSE_METAFILE=no DEFAULT_wxUSE_MIMETYPE=no + DEFAULT_wxUSE_SYSTEM_OPTIONS=yes DEFAULT_wxUSE_COMMONDLGS=no DEFAULT_wxUSE_CHOICEDLG=no DEFAULT_wxUSE_COLOURDLG=no DEFAULT_wxUSE_DIRDLG=no DEFAULT_wxUSE_FILEDLG=no + DEFAULT_wxUSE_FINDREPLDLG=no DEFAULT_wxUSE_FONTDLG=no DEFAULT_wxUSE_MSGDLG=no DEFAULT_wxUSE_NUMBERDLG=no DEFAULT_wxUSE_TEXTDLG=no + DEFAULT_wxUSE_SPLASH=no DEFAULT_wxUSE_STARTUP_TIPS=no DEFAULT_wxUSE_PROGRESSDLG=no + DEFAULT_wxUSE_WIZARDDLG=no + DEFAULT_wxUSE_MENUS=no DEFAULT_wxUSE_MINIFRAME=no DEFAULT_wxUSE_HTML=no @@ -1479,6 +1514,7 @@ if test $DEBUG_CONFIGURE = 1; then DEFAULT_wxUSE_LISTBOX=no DEFAULT_wxUSE_LISTCTRL=no DEFAULT_wxUSE_NOTEBOOK=no + DEFAULT_wxUSE_PROPSHEET=no DEFAULT_wxUSE_RADIOBOX=no DEFAULT_wxUSE_RADIOBTN=no DEFAULT_wxUSE_SASH=no @@ -1499,10 +1535,12 @@ 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 + DEFAULT_wxUSE_PALETTE=no DEFAULT_wxUSE_IMAGE=no DEFAULT_wxUSE_GIF=no DEFAULT_wxUSE_PCX=no @@ -1514,12 +1552,12 @@ else DEFAULT_wxUSE_THREADS=yes DEFAULT_wxUSE_SHARED=yes - DEFAULT_wxUSE_BURNT_NAME=no + DEFAULT_wxUSE_SONAME=no DEFAULT_wxUSE_OPTIMISE=yes DEFAULT_wxUSE_PROFILE=no DEFAULT_wxUSE_NO_DEPS=no - DEFAULT_wxUSE_NO_RTTI=no - DEFAULT_wxUSE_NO_EXCEPTIONS=no + DEFAULT_wxUSE_NO_RTTI=yes + DEFAULT_wxUSE_NO_EXCEPTIONS=yes DEFAULT_wxUSE_PERMISSIVE=no DEFAULT_wxUSE_DEBUG_FLAG=no DEFAULT_wxUSE_DEBUG_INFO=no @@ -1527,6 +1565,7 @@ else DEFAULT_wxUSE_MEM_TRACING=no DEFAULT_wxUSE_DEBUG_CONTEXT=no DEFAULT_wxUSE_DMALLOC=no + DEFAULT_wxUSE_PRECOMP=yes DEFAULT_wxUSE_APPLE_IEEE=yes DEFAULT_wxUSE_LOG=yes @@ -1535,6 +1574,7 @@ else DEFAULT_wxUSE_GUI=yes + DEFAULT_wxUSE_REGEX=yes DEFAULT_wxUSE_ZLIB=yes DEFAULT_wxUSE_LIBPNG=yes DEFAULT_wxUSE_LIBJPEG=yes @@ -1553,6 +1593,7 @@ else DEFAULT_wxUSE_STOPWATCH=yes DEFAULT_wxUSE_FILE=yes DEFAULT_wxUSE_FFILE=yes + DEFAULT_wxUSE_TEXTBUFFER=yes DEFAULT_wxUSE_TEXTFILE=yes DEFAULT_wxUSE_WAVE=no DEFAULT_wxUSE_INTL=yes @@ -1587,21 +1628,28 @@ else DEFAULT_wxUSE_CONSTRAINTS=yes DEFAULT_wxUSE_IPC=yes DEFAULT_wxUSE_HELP=yes - DEFAULT_wxUSE_WXTREE=yes + DEFAULT_wxUSE_MS_HTML_HELP=yes + DEFAULT_wxUSE_WXHTML_HELP=yes + DEFAULT_wxUSE_TREELAYOUT=yes DEFAULT_wxUSE_METAFILE=yes DEFAULT_wxUSE_MIMETYPE=yes + DEFAULT_wxUSE_SYSTEM_OPTIONS=yes DEFAULT_wxUSE_COMMONDLGS=yes DEFAULT_wxUSE_CHOICEDLG=yes DEFAULT_wxUSE_COLOURDLG=yes DEFAULT_wxUSE_DIRDLG=yes DEFAULT_wxUSE_FILEDLG=yes + DEFAULT_wxUSE_FINDREPLDLG=yes DEFAULT_wxUSE_FONTDLG=yes DEFAULT_wxUSE_MSGDLG=yes DEFAULT_wxUSE_NUMBERDLG=yes DEFAULT_wxUSE_TEXTDLG=yes + DEFAULT_wxUSE_SPLASH=yes DEFAULT_wxUSE_STARTUP_TIPS=yes DEFAULT_wxUSE_PROGRESSDLG=yes + DEFAULT_wxUSE_WIZARDDLG=yes + DEFAULT_wxUSE_MENUS=yes DEFAULT_wxUSE_MINIFRAME=yes DEFAULT_wxUSE_HTML=yes @@ -1628,6 +1676,7 @@ else DEFAULT_wxUSE_LISTBOX=yes DEFAULT_wxUSE_LISTCTRL=yes DEFAULT_wxUSE_NOTEBOOK=yes + DEFAULT_wxUSE_PROPSHEET=yes DEFAULT_wxUSE_RADIOBOX=yes DEFAULT_wxUSE_RADIOBTN=yes DEFAULT_wxUSE_SASH=yes @@ -1648,10 +1697,12 @@ 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 + DEFAULT_wxUSE_PALETTE=yes DEFAULT_wxUSE_IMAGE=yes DEFAULT_wxUSE_GIF=yes DEFAULT_wxUSE_PCX=yes @@ -1673,7 +1724,7 @@ done echo $ac_n "checking for --enable-gui""... $ac_c" 1>&6 -echo "configure:1677: checking for --enable-gui" >&5 +echo "configure:1728: checking for --enable-gui" >&5 no_cache=0 # Check whether --enable-gui or --disable-gui was given. if test "${enable_gui+set}" = set; then @@ -1715,7 +1766,7 @@ if test "$wxUSE_GUI" = "yes"; then echo $ac_n "checking for --enable-universal""... $ac_c" 1>&6 -echo "configure:1719: checking for --enable-universal" >&5 +echo "configure:1770: checking for --enable-universal" >&5 no_cache=0 # Check whether --enable-universal or --disable-universal was given. if test "${enable_universal+set}" = set; then @@ -1776,16 +1827,10 @@ if test "${with_wine+set}" = set; then wxUSE_WINE="$withval" CACHE_WINE=1 TOOLKIT_GIVEN=1 fi -# Check whether --with-cygwin or --without-cygwin was given. -if test "${with_cygwin+set}" = set; then - withval="$with_cygwin" - wxUSE_CYGWIN="$withval" CACHE_CYGWIN=1 TOOLKIT_GIVEN=1 -fi - -# Check whether --with-mingw or --without-mingw was given. -if test "${with_mingw+set}" = set; then - withval="$with_mingw" - wxUSE_MINGW="$withval" CACHE_MINGW=1 TOOLKIT_GIVEN=1 +# Check whether --with-msw or --without-msw was given. +if test "${with_msw+set}" = set; then + withval="$with_msw" + wxUSE_MSW="$withval" CACHE_MSW TOOLKIT_GIVEN=1 fi # Check whether --with-pm or --without-pm was given. @@ -1812,7 +1857,7 @@ fi echo $ac_n "checking for --with-libpng""... $ac_c" 1>&6 -echo "configure:1816: checking for --with-libpng" >&5 +echo "configure:1861: checking for --with-libpng" >&5 no_cache=0 # Check whether --with-libpng or --without-libpng was given. if test "${with_libpng+set}" = set; then @@ -1824,8 +1869,10 @@ if test "${with_libpng+set}" = set; then ac_cv_use_libpng='wxUSE_LIBPNG=no' elif test "$withval" = sys; then ac_cv_use_libpng='wxUSE_LIBPNG=sys' + elif test "$withval" = builtin; then + ac_cv_use_libpng='wxUSE_LIBPNG=builtin' else - { echo "configure: error: Invalid value for --with-libpng: should be yes, no or sys" 1>&2; exit 1; } + { echo "configure: error: Invalid value for --with-libpng: should be yes, no, sys, or builtin" 1>&2; exit 1; } fi else @@ -1853,13 +1900,15 @@ fi echo "$ac_t""no" 1>&6 elif test "$wxUSE_LIBPNG" = sys; then echo "$ac_t""system version" 1>&6 + elif test "$wxUSE_LIBPNG" = builtin; then + echo "$ac_t""builtin version" 1>&6 else - { echo "configure: error: Invalid value for --with-libpng: should be yes, no or sys" 1>&2; exit 1; } + { echo "configure: error: Invalid value for --with-libpng: should be yes, no, sys, or builtin" 1>&2; exit 1; } fi echo $ac_n "checking for --with-libjpeg""... $ac_c" 1>&6 -echo "configure:1863: checking for --with-libjpeg" >&5 +echo "configure:1912: checking for --with-libjpeg" >&5 no_cache=0 # Check whether --with-libjpeg or --without-libjpeg was given. if test "${with_libjpeg+set}" = set; then @@ -1871,8 +1920,10 @@ if test "${with_libjpeg+set}" = set; then ac_cv_use_libjpeg='wxUSE_LIBJPEG=no' elif test "$withval" = sys; then ac_cv_use_libjpeg='wxUSE_LIBJPEG=sys' + elif test "$withval" = builtin; then + ac_cv_use_libjpeg='wxUSE_LIBJPEG=builtin' else - { echo "configure: error: Invalid value for --with-libjpeg: should be yes, no or sys" 1>&2; exit 1; } + { echo "configure: error: Invalid value for --with-libjpeg: should be yes, no, sys, or builtin" 1>&2; exit 1; } fi else @@ -1900,13 +1951,15 @@ fi echo "$ac_t""no" 1>&6 elif test "$wxUSE_LIBJPEG" = sys; then echo "$ac_t""system version" 1>&6 + elif test "$wxUSE_LIBJPEG" = builtin; then + echo "$ac_t""builtin version" 1>&6 else - { echo "configure: error: Invalid value for --with-libjpeg: should be yes, no or sys" 1>&2; exit 1; } + { echo "configure: error: Invalid value for --with-libjpeg: should be yes, no, sys, or builtin" 1>&2; exit 1; } fi echo $ac_n "checking for --with-libtiff""... $ac_c" 1>&6 -echo "configure:1910: checking for --with-libtiff" >&5 +echo "configure:1963: checking for --with-libtiff" >&5 no_cache=0 # Check whether --with-libtiff or --without-libtiff was given. if test "${with_libtiff+set}" = set; then @@ -1918,8 +1971,10 @@ if test "${with_libtiff+set}" = set; then ac_cv_use_libtiff='wxUSE_LIBTIFF=no' elif test "$withval" = sys; then ac_cv_use_libtiff='wxUSE_LIBTIFF=sys' + elif test "$withval" = builtin; then + ac_cv_use_libtiff='wxUSE_LIBTIFF=builtin' else - { echo "configure: error: Invalid value for --with-libtiff: should be yes, no or sys" 1>&2; exit 1; } + { echo "configure: error: Invalid value for --with-libtiff: should be yes, no, sys, or builtin" 1>&2; exit 1; } fi else @@ -1947,13 +2002,15 @@ fi echo "$ac_t""no" 1>&6 elif test "$wxUSE_LIBTIFF" = sys; then echo "$ac_t""system version" 1>&6 + elif test "$wxUSE_LIBTIFF" = builtin; then + echo "$ac_t""builtin version" 1>&6 else - { echo "configure: error: Invalid value for --with-libtiff: should be yes, no or sys" 1>&2; exit 1; } + { echo "configure: error: Invalid value for --with-libtiff: should be yes, no, sys, or builtin" 1>&2; exit 1; } fi echo $ac_n "checking for --with-freetype""... $ac_c" 1>&6 -echo "configure:1957: checking for --with-freetype" >&5 +echo "configure:2014: checking for --with-freetype" >&5 no_cache=0 # Check whether --with-freetype or --without-freetype was given. if test "${with_freetype+set}" = set; then @@ -1965,8 +2022,10 @@ if test "${with_freetype+set}" = set; then ac_cv_use_freetype='wxUSE_FREETYPE=no' elif test "$withval" = sys; then ac_cv_use_freetype='wxUSE_FREETYPE=sys' + elif test "$withval" = builtin; then + ac_cv_use_freetype='wxUSE_FREETYPE=builtin' else - { echo "configure: error: Invalid value for --with-freetype: should be yes, no or sys" 1>&2; exit 1; } + { echo "configure: error: Invalid value for --with-freetype: should be yes, no, sys, or builtin" 1>&2; exit 1; } fi else @@ -1994,13 +2053,15 @@ fi echo "$ac_t""no" 1>&6 elif test "$wxUSE_FREETYPE" = sys; then echo "$ac_t""system version" 1>&6 + elif test "$wxUSE_FREETYPE" = builtin; then + echo "$ac_t""builtin version" 1>&6 else - { echo "configure: error: Invalid value for --with-freetype: should be yes, no or sys" 1>&2; exit 1; } + { echo "configure: error: Invalid value for --with-freetype: should be yes, no, sys, or builtin" 1>&2; exit 1; } fi echo $ac_n "checking for --with-opengl""... $ac_c" 1>&6 -echo "configure:2004: checking for --with-opengl" >&5 +echo "configure:2065: checking for --with-opengl" >&5 no_cache=0 # Check whether --with-opengl or --without-opengl was given. if test "${with_opengl+set}" = set; then @@ -2042,7 +2103,7 @@ fi echo $ac_n "checking for --with-dmalloc""... $ac_c" 1>&6 -echo "configure:2046: checking for --with-dmalloc" >&5 +echo "configure:2107: checking for --with-dmalloc" >&5 no_cache=0 # Check whether --with-dmalloc or --without-dmalloc was given. if test "${with_dmalloc+set}" = set; then @@ -2080,8 +2141,59 @@ fi fi + echo $ac_n "checking for --with-regex""... $ac_c" 1>&6 +echo "configure:2146: checking for --with-regex" >&5 + no_cache=0 + # Check whether --with-regex or --without-regex was given. +if test "${with_regex+set}" = set; then + withval="$with_regex" + + if test "$withval" = yes; then + ac_cv_use_regex='wxUSE_REGEX=yes' + elif test "$withval" = no; then + ac_cv_use_regex='wxUSE_REGEX=no' + elif test "$withval" = sys; then + ac_cv_use_regex='wxUSE_REGEX=sys' + elif test "$withval" = builtin; then + ac_cv_use_regex='wxUSE_REGEX=builtin' + else + { echo "configure: error: Invalid value for --with-regex: should be yes, no, sys, or builtin" 1>&2; exit 1; } + fi + +else + + LINE=`grep "wxUSE_REGEX" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_regex='wxUSE_REGEX='$DEFAULT_wxUSE_REGEX + +fi + + + eval "$ac_cv_use_regex" + if test "$no_cache" != 1; then + echo $ac_cv_use_regex >> ${wx_arg_cache_file}.tmp + fi + + if test "$wxUSE_REGEX" = yes; then + echo "$ac_t""yes" 1>&6 + elif test "$wxUSE_REGEX" = no; then + echo "$ac_t""no" 1>&6 + elif test "$wxUSE_REGEX" = sys; then + echo "$ac_t""system version" 1>&6 + elif test "$wxUSE_REGEX" = builtin; then + echo "$ac_t""builtin version" 1>&6 + else + { echo "configure: error: Invalid value for --with-regex: should be yes, no, sys, or builtin" 1>&2; exit 1; } + fi + + echo $ac_n "checking for --with-zlib""... $ac_c" 1>&6 -echo "configure:2085: checking for --with-zlib" >&5 +echo "configure:2197: checking for --with-zlib" >&5 no_cache=0 # Check whether --with-zlib or --without-zlib was given. if test "${with_zlib+set}" = set; then @@ -2093,8 +2205,10 @@ if test "${with_zlib+set}" = set; then ac_cv_use_zlib='wxUSE_ZLIB=no' elif test "$withval" = sys; then ac_cv_use_zlib='wxUSE_ZLIB=sys' + elif test "$withval" = builtin; then + ac_cv_use_zlib='wxUSE_ZLIB=builtin' else - { echo "configure: error: Invalid value for --with-zlib: should be yes, no or sys" 1>&2; exit 1; } + { echo "configure: error: Invalid value for --with-zlib: should be yes, no, sys, or builtin" 1>&2; exit 1; } fi else @@ -2122,13 +2236,15 @@ fi echo "$ac_t""no" 1>&6 elif test "$wxUSE_ZLIB" = sys; then echo "$ac_t""system version" 1>&6 + elif test "$wxUSE_ZLIB" = builtin; then + echo "$ac_t""builtin version" 1>&6 else - { echo "configure: error: Invalid value for --with-zlib: should be yes, no or sys" 1>&2; exit 1; } + { echo "configure: error: Invalid value for --with-zlib: should be yes, no, sys, or builtin" 1>&2; exit 1; } fi echo $ac_n "checking for --with-odbc""... $ac_c" 1>&6 -echo "configure:2132: checking for --with-odbc" >&5 +echo "configure:2248: checking for --with-odbc" >&5 no_cache=0 # Check whether --with-odbc or --without-odbc was given. if test "${with_odbc+set}" = set; then @@ -2168,9 +2284,8 @@ fi - echo $ac_n "checking for --enable-shared""... $ac_c" 1>&6 -echo "configure:2174: checking for --enable-shared" >&5 +echo "configure:2289: 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,39 +2323,39 @@ fi fi - echo $ac_n "checking for --enable-burnt_name""... $ac_c" 1>&6 -echo "configure:2213: checking for --enable-burnt_name" >&5 + echo $ac_n "checking for --enable-soname""... $ac_c" 1>&6 +echo "configure:2328: checking for --enable-soname" >&5 no_cache=0 - # Check whether --enable-burnt_name or --disable-burnt_name was given. -if test "${enable_burnt_name+set}" = set; then - enableval="$enable_burnt_name" + # Check whether --enable-soname or --disable-soname was given. +if test "${enable_soname+set}" = set; then + enableval="$enable_soname" if test "$enableval" = yes; then - ac_cv_use_burnt_name='wxUSE_BURNT_NAME=yes' + ac_cv_use_soname='wxUSE_SONAME=yes' else - ac_cv_use_burnt_name='wxUSE_BURNT_NAME=no' + ac_cv_use_soname='wxUSE_SONAME=no' fi else - LINE=`grep "wxUSE_BURNT_NAME" ${wx_arg_cache_file}` + LINE=`grep "wxUSE_SONAME" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_burnt_name='wxUSE_BURNT_NAME='$DEFAULT_wxUSE_BURNT_NAME + ac_cv_use_soname='wxUSE_SONAME='$DEFAULT_wxUSE_SONAME fi - eval "$ac_cv_use_burnt_name" + eval "$ac_cv_use_soname" if test "$no_cache" != 1; then - echo $ac_cv_use_burnt_name >> ${wx_arg_cache_file}.tmp + echo $ac_cv_use_soname >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_BURNT_NAME" = yes; then + if test "$wxUSE_SONAME" = yes; then echo "$ac_t""yes" 1>&6 else echo "$ac_t""no" 1>&6 @@ -2248,7 +2363,7 @@ fi echo $ac_n "checking for --enable-optimise""... $ac_c" 1>&6 -echo "configure:2252: checking for --enable-optimise" >&5 +echo "configure:2367: checking for --enable-optimise" >&5 no_cache=0 # Check whether --enable-optimise or --disable-optimise was given. if test "${enable_optimise+set}" = set; then @@ -2287,7 +2402,7 @@ fi echo $ac_n "checking for --enable-debug""... $ac_c" 1>&6 -echo "configure:2291: checking for --enable-debug" >&5 +echo "configure:2406: checking for --enable-debug" >&5 no_cache=0 # Check whether --enable-debug or --disable-debug was given. if test "${enable_debug+set}" = set; then @@ -2325,6 +2440,46 @@ fi fi + + echo $ac_n "checking for --enable-precomp""... $ac_c" 1>&6 +echo "configure:2446: checking for --enable-precomp" >&5 + no_cache=0 + # Check whether --enable-precomp or --disable-precomp was given. +if test "${enable_precomp+set}" = set; then + enableval="$enable_precomp" + + if test "$enableval" = yes; then + ac_cv_use_precomp='wxUSE_PRECOMP=yes' + else + ac_cv_use_precomp='wxUSE_PRECOMP=no' + fi + +else + + LINE=`grep "wxUSE_PRECOMP" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_precomp='wxUSE_PRECOMP='$DEFAULT_wxUSE_PRECOMP + +fi + + + eval "$ac_cv_use_precomp" + if test "$no_cache" != 1; then + echo $ac_cv_use_precomp >> ${wx_arg_cache_file}.tmp + fi + + if test "$wxUSE_PRECOMP" = yes; then + echo "$ac_t""yes" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + + if test "$wxUSE_DEBUG" = "yes"; then DEFAULT_wxUSE_DEBUG_FLAG=yes DEFAULT_wxUSE_DEBUG_INFO=yes @@ -2335,7 +2490,7 @@ fi echo $ac_n "checking for --enable-debug_flag""... $ac_c" 1>&6 -echo "configure:2339: checking for --enable-debug_flag" >&5 +echo "configure:2494: 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 @@ -2374,7 +2529,7 @@ fi echo $ac_n "checking for --enable-debug_info""... $ac_c" 1>&6 -echo "configure:2378: checking for --enable-debug_info" >&5 +echo "configure:2533: 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 @@ -2413,7 +2568,7 @@ fi echo $ac_n "checking for --enable-debug_gdb""... $ac_c" 1>&6 -echo "configure:2417: checking for --enable-debug_gdb" >&5 +echo "configure:2572: 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 @@ -2452,7 +2607,7 @@ fi echo $ac_n "checking for --enable-debug_cntxt""... $ac_c" 1>&6 -echo "configure:2456: checking for --enable-debug_cntxt" >&5 +echo "configure:2611: 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 @@ -2491,7 +2646,7 @@ fi echo $ac_n "checking for --enable-mem_tracing""... $ac_c" 1>&6 -echo "configure:2495: checking for --enable-mem_tracing" >&5 +echo "configure:2650: 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 @@ -2530,7 +2685,7 @@ fi echo $ac_n "checking for --enable-profile""... $ac_c" 1>&6 -echo "configure:2534: checking for --enable-profile" >&5 +echo "configure:2689: checking for --enable-profile" >&5 no_cache=0 # Check whether --enable-profile or --disable-profile was given. if test "${enable_profile+set}" = set; then @@ -2569,7 +2724,7 @@ fi echo $ac_n "checking for --enable-no_rtti""... $ac_c" 1>&6 -echo "configure:2573: checking for --enable-no_rtti" >&5 +echo "configure:2728: 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 @@ -2608,7 +2763,7 @@ fi echo $ac_n "checking for --enable-no_exceptions""... $ac_c" 1>&6 -echo "configure:2612: checking for --enable-no_exceptions" >&5 +echo "configure:2767: 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 @@ -2647,7 +2802,7 @@ fi echo $ac_n "checking for --enable-permissive""... $ac_c" 1>&6 -echo "configure:2651: checking for --enable-permissive" >&5 +echo "configure:2806: checking for --enable-permissive" >&5 no_cache=0 # Check whether --enable-permissive or --disable-permissive was given. if test "${enable_permissive+set}" = set; then @@ -2686,7 +2841,7 @@ fi echo $ac_n "checking for --enable-no_deps""... $ac_c" 1>&6 -echo "configure:2690: checking for --enable-no_deps" >&5 +echo "configure:2845: 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 @@ -2726,7 +2881,7 @@ fi echo $ac_n "checking for --enable-compat20""... $ac_c" 1>&6 -echo "configure:2730: checking for --enable-compat20" >&5 +echo "configure:2885: checking for --enable-compat20" >&5 no_cache=0 # Check whether --enable-compat20 or --disable-compat20 was given. if test "${enable_compat20+set}" = set; then @@ -2765,7 +2920,7 @@ fi echo $ac_n "checking for --enable-compat22""... $ac_c" 1>&6 -echo "configure:2769: checking for --enable-compat22" >&5 +echo "configure:2924: checking for --enable-compat22" >&5 no_cache=0 # Check whether --enable-compat22 or --disable-compat22 was given. if test "${enable_compat22+set}" = set; then @@ -2806,7 +2961,7 @@ fi echo $ac_n "checking for --enable-intl""... $ac_c" 1>&6 -echo "configure:2810: checking for --enable-intl" >&5 +echo "configure:2965: checking for --enable-intl" >&5 no_cache=0 # Check whether --enable-intl or --disable-intl was given. if test "${enable_intl+set}" = set; then @@ -2845,7 +3000,7 @@ fi echo $ac_n "checking for --enable-config""... $ac_c" 1>&6 -echo "configure:2849: checking for --enable-config" >&5 +echo "configure:3004: checking for --enable-config" >&5 no_cache=0 # Check whether --enable-config or --disable-config was given. if test "${enable_config+set}" = set; then @@ -2885,7 +3040,7 @@ fi echo $ac_n "checking for --enable-sockets""... $ac_c" 1>&6 -echo "configure:2889: checking for --enable-sockets" >&5 +echo "configure:3044: checking for --enable-sockets" >&5 no_cache=0 # Check whether --enable-sockets or --disable-sockets was given. if test "${enable_sockets+set}" = set; then @@ -2925,7 +3080,7 @@ fi echo $ac_n "checking for --enable-ipc""... $ac_c" 1>&6 -echo "configure:2929: checking for --enable-ipc" >&5 +echo "configure:3084: checking for --enable-ipc" >&5 no_cache=0 # Check whether --enable-ipc or --disable-ipc was given. if test "${enable_ipc+set}" = set; then @@ -2965,7 +3120,7 @@ fi echo $ac_n "checking for --enable-cmdline""... $ac_c" 1>&6 -echo "configure:2969: checking for --enable-cmdline" >&5 +echo "configure:3124: checking for --enable-cmdline" >&5 no_cache=0 # Check whether --enable-cmdline or --disable-cmdline was given. if test "${enable_cmdline+set}" = set; then @@ -3004,7 +3159,7 @@ fi echo $ac_n "checking for --enable-datetime""... $ac_c" 1>&6 -echo "configure:3008: checking for --enable-datetime" >&5 +echo "configure:3163: checking for --enable-datetime" >&5 no_cache=0 # Check whether --enable-datetime or --disable-datetime was given. if test "${enable_datetime+set}" = set; then @@ -3043,7 +3198,7 @@ fi echo $ac_n "checking for --enable-timedate""... $ac_c" 1>&6 -echo "configure:3047: checking for --enable-timedate" >&5 +echo "configure:3202: checking for --enable-timedate" >&5 no_cache=0 # Check whether --enable-timedate or --disable-timedate was given. if test "${enable_timedate+set}" = set; then @@ -3082,7 +3237,7 @@ fi echo $ac_n "checking for --enable-stopwatch""... $ac_c" 1>&6 -echo "configure:3086: checking for --enable-stopwatch" >&5 +echo "configure:3241: checking for --enable-stopwatch" >&5 no_cache=0 # Check whether --enable-stopwatch or --disable-stopwatch was given. if test "${enable_stopwatch+set}" = set; then @@ -3121,7 +3276,7 @@ fi echo $ac_n "checking for --enable-dialupman""... $ac_c" 1>&6 -echo "configure:3125: checking for --enable-dialupman" >&5 +echo "configure:3280: checking for --enable-dialupman" >&5 no_cache=0 # Check whether --enable-dialupman or --disable-dialupman was given. if test "${enable_dialupman+set}" = set; then @@ -3160,7 +3315,7 @@ fi echo $ac_n "checking for --enable-apple_ieee""... $ac_c" 1>&6 -echo "configure:3164: checking for --enable-apple_ieee" >&5 +echo "configure:3319: 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 @@ -3199,7 +3354,7 @@ fi echo $ac_n "checking for --enable-timer""... $ac_c" 1>&6 -echo "configure:3203: checking for --enable-timer" >&5 +echo "configure:3358: checking for --enable-timer" >&5 no_cache=0 # Check whether --enable-timer or --disable-timer was given. if test "${enable_timer+set}" = set; then @@ -3238,7 +3393,7 @@ fi echo $ac_n "checking for --enable-wave""... $ac_c" 1>&6 -echo "configure:3242: checking for --enable-wave" >&5 +echo "configure:3397: checking for --enable-wave" >&5 no_cache=0 # Check whether --enable-wave or --disable-wave was given. if test "${enable_wave+set}" = set; then @@ -3277,7 +3432,7 @@ fi echo $ac_n "checking for --enable-fraction""... $ac_c" 1>&6 -echo "configure:3281: checking for --enable-fraction" >&5 +echo "configure:3436: checking for --enable-fraction" >&5 no_cache=0 # Check whether --enable-fraction or --disable-fraction was given. if test "${enable_fraction+set}" = set; then @@ -3316,7 +3471,7 @@ fi echo $ac_n "checking for --enable-dynlib""... $ac_c" 1>&6 -echo "configure:3320: checking for --enable-dynlib" >&5 +echo "configure:3475: checking for --enable-dynlib" >&5 no_cache=0 # Check whether --enable-dynlib or --disable-dynlib was given. if test "${enable_dynlib+set}" = set; then @@ -3355,7 +3510,7 @@ fi echo $ac_n "checking for --enable-longlong""... $ac_c" 1>&6 -echo "configure:3359: checking for --enable-longlong" >&5 +echo "configure:3514: checking for --enable-longlong" >&5 no_cache=0 # Check whether --enable-longlong or --disable-longlong was given. if test "${enable_longlong+set}" = set; then @@ -3394,7 +3549,7 @@ fi echo $ac_n "checking for --enable-geometry""... $ac_c" 1>&6 -echo "configure:3398: checking for --enable-geometry" >&5 +echo "configure:3553: checking for --enable-geometry" >&5 no_cache=0 # Check whether --enable-geometry or --disable-geometry was given. if test "${enable_geometry+set}" = set; then @@ -3433,7 +3588,7 @@ fi echo $ac_n "checking for --enable-log""... $ac_c" 1>&6 -echo "configure:3437: checking for --enable-log" >&5 +echo "configure:3592: checking for --enable-log" >&5 no_cache=0 # Check whether --enable-log or --disable-log was given. if test "${enable_log+set}" = set; then @@ -3472,7 +3627,7 @@ fi echo $ac_n "checking for --enable-streams""... $ac_c" 1>&6 -echo "configure:3476: checking for --enable-streams" >&5 +echo "configure:3631: checking for --enable-streams" >&5 no_cache=0 # Check whether --enable-streams or --disable-streams was given. if test "${enable_streams+set}" = set; then @@ -3511,7 +3666,7 @@ fi echo $ac_n "checking for --enable-file""... $ac_c" 1>&6 -echo "configure:3515: checking for --enable-file" >&5 +echo "configure:3670: checking for --enable-file" >&5 no_cache=0 # Check whether --enable-file or --disable-file was given. if test "${enable_file+set}" = set; then @@ -3550,7 +3705,7 @@ fi echo $ac_n "checking for --enable-ffile""... $ac_c" 1>&6 -echo "configure:3554: checking for --enable-ffile" >&5 +echo "configure:3709: checking for --enable-ffile" >&5 no_cache=0 # Check whether --enable-ffile or --disable-ffile was given. if test "${enable_ffile+set}" = set; then @@ -3588,8 +3743,47 @@ fi fi + echo $ac_n "checking for --enable-textbuf""... $ac_c" 1>&6 +echo "configure:3748: checking for --enable-textbuf" >&5 + no_cache=0 + # Check whether --enable-textbuf or --disable-textbuf was given. +if test "${enable_textbuf+set}" = set; then + enableval="$enable_textbuf" + + if test "$enableval" = yes; then + ac_cv_use_textbuf='wxUSE_TEXTBUFFER=yes' + else + ac_cv_use_textbuf='wxUSE_TEXTBUFFER=no' + fi + +else + + LINE=`grep "wxUSE_TEXTBUFFER" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_textbuf='wxUSE_TEXTBUFFER='$DEFAULT_wxUSE_TEXTBUFFER + +fi + + + eval "$ac_cv_use_textbuf" + if test "$no_cache" != 1; then + echo $ac_cv_use_textbuf >> ${wx_arg_cache_file}.tmp + fi + + if test "$wxUSE_TEXTBUFFER" = yes; then + echo "$ac_t""yes" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + + echo $ac_n "checking for --enable-textfile""... $ac_c" 1>&6 -echo "configure:3593: checking for --enable-textfile" >&5 +echo "configure:3787: checking for --enable-textfile" >&5 no_cache=0 # Check whether --enable-textfile or --disable-textfile was given. if test "${enable_textfile+set}" = set; then @@ -3628,7 +3822,7 @@ fi echo $ac_n "checking for --enable-fontmap""... $ac_c" 1>&6 -echo "configure:3632: checking for --enable-fontmap" >&5 +echo "configure:3826: checking for --enable-fontmap" >&5 no_cache=0 # Check whether --enable-fontmap or --disable-fontmap was given. if test "${enable_fontmap+set}" = set; then @@ -3667,7 +3861,7 @@ fi echo $ac_n "checking for --enable-unicode""... $ac_c" 1>&6 -echo "configure:3671: checking for --enable-unicode" >&5 +echo "configure:3865: checking for --enable-unicode" >&5 no_cache=0 # Check whether --enable-unicode or --disable-unicode was given. if test "${enable_unicode+set}" = set; then @@ -3705,47 +3899,8 @@ fi fi - echo $ac_n "checking for --enable-wcsrtombs""... $ac_c" 1>&6 -echo "configure:3710: checking for --enable-wcsrtombs" >&5 - no_cache=0 - # Check whether --enable-wcsrtombs or --disable-wcsrtombs was given. -if test "${enable_wcsrtombs+set}" = set; then - enableval="$enable_wcsrtombs" - - if test "$enableval" = yes; then - ac_cv_use_wcsrtombs='wxUSE_WCSRTOMBS=yes' - else - ac_cv_use_wcsrtombs='wxUSE_WCSRTOMBS=no' - fi - -else - - LINE=`grep "wxUSE_WCSRTOMBS" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - - ac_cv_use_wcsrtombs='wxUSE_WCSRTOMBS='$DEFAULT_wxUSE_WCSRTOMBS - -fi - - - eval "$ac_cv_use_wcsrtombs" - if test "$no_cache" != 1; then - echo $ac_cv_use_wcsrtombs >> ${wx_arg_cache_file}.tmp - fi - - if test "$wxUSE_WCSRTOMBS" = yes; then - echo "$ac_t""yes" 1>&6 - else - echo "$ac_t""no" 1>&6 - fi - - echo $ac_n "checking for --enable-wxprintfv""... $ac_c" 1>&6 -echo "configure:3749: checking for --enable-wxprintfv" >&5 +echo "configure:3904: checking for --enable-wxprintfv" >&5 no_cache=0 # Check whether --enable-wxprintfv or --disable-wxprintfv was given. if test "${enable_wxprintfv+set}" = set; then @@ -3784,7 +3939,7 @@ fi echo $ac_n "checking for --enable-std_iostreams""... $ac_c" 1>&6 -echo "configure:3788: checking for --enable-std_iostreams" >&5 +echo "configure:3943: 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 @@ -3823,7 +3978,7 @@ fi echo $ac_n "checking for --enable-filesystem""... $ac_c" 1>&6 -echo "configure:3827: checking for --enable-filesystem" >&5 +echo "configure:3982: checking for --enable-filesystem" >&5 no_cache=0 # Check whether --enable-filesystem or --disable-filesystem was given. if test "${enable_filesystem+set}" = set; then @@ -3862,7 +4017,7 @@ fi echo $ac_n "checking for --enable-fs_inet""... $ac_c" 1>&6 -echo "configure:3866: checking for --enable-fs_inet" >&5 +echo "configure:4021: 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 @@ -3901,7 +4056,7 @@ fi echo $ac_n "checking for --enable-fs_zip""... $ac_c" 1>&6 -echo "configure:3905: checking for --enable-fs_zip" >&5 +echo "configure:4060: 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 @@ -3940,7 +4095,7 @@ fi echo $ac_n "checking for --enable-zipstream""... $ac_c" 1>&6 -echo "configure:3944: checking for --enable-zipstream" >&5 +echo "configure:4099: checking for --enable-zipstream" >&5 no_cache=0 # Check whether --enable-zipstream or --disable-zipstream was given. if test "${enable_zipstream+set}" = set; then @@ -3980,7 +4135,7 @@ fi echo $ac_n "checking for --enable-catch_segvs""... $ac_c" 1>&6 -echo "configure:3984: checking for --enable-catch_segvs" >&5 +echo "configure:4139: 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 @@ -4019,7 +4174,7 @@ fi echo $ac_n "checking for --enable-snglinst""... $ac_c" 1>&6 -echo "configure:4023: checking for --enable-snglinst" >&5 +echo "configure:4178: checking for --enable-snglinst" >&5 no_cache=0 # Check whether --enable-snglinst or --disable-snglinst was given. if test "${enable_snglinst+set}" = set; then @@ -4059,7 +4214,7 @@ fi echo $ac_n "checking for --enable-mimetype""... $ac_c" 1>&6 -echo "configure:4063: checking for --enable-mimetype" >&5 +echo "configure:4218: checking for --enable-mimetype" >&5 no_cache=0 # Check whether --enable-mimetype or --disable-mimetype was given. if test "${enable_mimetype+set}" = set; then @@ -4097,10 +4252,49 @@ fi fi + echo $ac_n "checking for --enable-system_options""... $ac_c" 1>&6 +echo "configure:4257: 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:4104: checking for --enable-threads" >&5 +echo "configure:4298: checking for --enable-threads" >&5 no_cache=0 # Check whether --enable-threads or --disable-threads was given. if test "${enable_threads+set}" = set; then @@ -4139,7 +4333,7 @@ fi echo $ac_n "checking for --enable-serial""... $ac_c" 1>&6 -echo "configure:4143: checking for --enable-serial" >&5 +echo "configure:4337: checking for --enable-serial" >&5 no_cache=0 # Check whether --enable-serial or --disable-serial was given. if test "${enable_serial+set}" = set; then @@ -4182,7 +4376,7 @@ if test "$wxUSE_GUI" = "yes"; then echo $ac_n "checking for --enable-docview""... $ac_c" 1>&6 -echo "configure:4186: checking for --enable-docview" >&5 +echo "configure:4380: checking for --enable-docview" >&5 no_cache=0 # Check whether --enable-docview or --disable-docview was given. if test "${enable_docview+set}" = set; then @@ -4221,7 +4415,7 @@ fi echo $ac_n "checking for --enable-help""... $ac_c" 1>&6 -echo "configure:4225: checking for --enable-help" >&5 +echo "configure:4419: checking for --enable-help" >&5 no_cache=0 # Check whether --enable-help or --disable-help was given. if test "${enable_help+set}" = set; then @@ -4259,130 +4453,247 @@ fi fi - echo $ac_n "checking for --enable-constraints""... $ac_c" 1>&6 -echo "configure:4264: checking for --enable-constraints" >&5 + echo $ac_n "checking for --enable-mshtmlhelp""... $ac_c" 1>&6 +echo "configure:4458: checking for --enable-mshtmlhelp" >&5 no_cache=0 - # Check whether --enable-constraints or --disable-constraints was given. -if test "${enable_constraints+set}" = set; then - enableval="$enable_constraints" + # 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_constraints='wxUSE_CONSTRAINTS=yes' + ac_cv_use_mshtmlhelp='wxUSE_MS_HTML_HELP=yes' else - ac_cv_use_constraints='wxUSE_CONSTRAINTS=no' + ac_cv_use_mshtmlhelp='wxUSE_MS_HTML_HELP=no' fi else - LINE=`grep "wxUSE_CONSTRAINTS" ${wx_arg_cache_file}` + LINE=`grep "wxUSE_MS_HTML_HELP" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_constraints='wxUSE_CONSTRAINTS='$DEFAULT_wxUSE_CONSTRAINTS + ac_cv_use_mshtmlhelp='wxUSE_MS_HTML_HELP='$DEFAULT_wxUSE_MS_HTML_HELP fi - eval "$ac_cv_use_constraints" + eval "$ac_cv_use_mshtmlhelp" if test "$no_cache" != 1; then - echo $ac_cv_use_constraints >> ${wx_arg_cache_file}.tmp + echo $ac_cv_use_mshtmlhelp >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_CONSTRAINTS" = yes; then + if test "$wxUSE_MS_HTML_HELP" = yes; then echo "$ac_t""yes" 1>&6 else echo "$ac_t""no" 1>&6 fi - echo $ac_n "checking for --enable-printarch""... $ac_c" 1>&6 -echo "configure:4303: checking for --enable-printarch" >&5 + echo $ac_n "checking for --enable-html""... $ac_c" 1>&6 +echo "configure:4497: checking for --enable-html" >&5 no_cache=0 - # Check whether --enable-printarch or --disable-printarch was given. -if test "${enable_printarch+set}" = set; then - enableval="$enable_printarch" + # Check whether --enable-html or --disable-html was given. +if test "${enable_html+set}" = set; then + enableval="$enable_html" if test "$enableval" = yes; then - ac_cv_use_printarch='wxUSE_PRINTING_ARCHITECTURE=yes' + ac_cv_use_html='wxUSE_HTML=yes' else - ac_cv_use_printarch='wxUSE_PRINTING_ARCHITECTURE=no' + ac_cv_use_html='wxUSE_HTML=no' fi else - LINE=`grep "wxUSE_PRINTING_ARCHITECTURE" ${wx_arg_cache_file}` + 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_printarch='wxUSE_PRINTING_ARCHITECTURE='$DEFAULT_wxUSE_PRINTING_ARCHITECTURE + ac_cv_use_html='wxUSE_HTML='$DEFAULT_wxUSE_HTML fi - eval "$ac_cv_use_printarch" + eval "$ac_cv_use_html" if test "$no_cache" != 1; then - echo $ac_cv_use_printarch >> ${wx_arg_cache_file}.tmp + echo $ac_cv_use_html >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_PRINTING_ARCHITECTURE" = yes; then + 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-mdi""... $ac_c" 1>&6 -echo "configure:4342: checking for --enable-mdi" >&5 + echo $ac_n "checking for --enable-htmlhelp""... $ac_c" 1>&6 +echo "configure:4536: checking for --enable-htmlhelp" >&5 no_cache=0 - # Check whether --enable-mdi or --disable-mdi was given. -if test "${enable_mdi+set}" = set; then - enableval="$enable_mdi" + # Check whether --enable-htmlhelp or --disable-htmlhelp was given. +if test "${enable_htmlhelp+set}" = set; then + enableval="$enable_htmlhelp" if test "$enableval" = yes; then - ac_cv_use_mdi='wxUSE_MDI_ARCHITECTURE=yes' + ac_cv_use_htmlhelp='wxUSE_WXHTML_HELP=yes' else - ac_cv_use_mdi='wxUSE_MDI_ARCHITECTURE=no' + ac_cv_use_htmlhelp='wxUSE_WXHTML_HELP=no' fi else - LINE=`grep "wxUSE_MDI_ARCHITECTURE" ${wx_arg_cache_file}` + LINE=`grep "wxUSE_WXHTML_HELP" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_mdi='wxUSE_MDI_ARCHITECTURE='$DEFAULT_wxUSE_MDI_ARCHITECTURE + ac_cv_use_htmlhelp='wxUSE_WXHTML_HELP='$DEFAULT_wxUSE_WXHTML_HELP fi - eval "$ac_cv_use_mdi" + eval "$ac_cv_use_htmlhelp" if test "$no_cache" != 1; then - echo $ac_cv_use_mdi >> ${wx_arg_cache_file}.tmp + echo $ac_cv_use_htmlhelp >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_MDI_ARCHITECTURE" = yes; then + if test "$wxUSE_WXHTML_HELP" = yes; then echo "$ac_t""yes" 1>&6 else echo "$ac_t""no" 1>&6 fi - echo $ac_n "checking for --enable-loggui""... $ac_c" 1>&6 -echo "configure:4381: checking for --enable-loggui" >&5 + echo $ac_n "checking for --enable-constraints""... $ac_c" 1>&6 +echo "configure:4575: checking for --enable-constraints" >&5 no_cache=0 - # Check whether --enable-loggui or --disable-loggui was given. -if test "${enable_loggui+set}" = set; then - enableval="$enable_loggui" - + # Check whether --enable-constraints or --disable-constraints was given. +if test "${enable_constraints+set}" = set; then + enableval="$enable_constraints" + + if test "$enableval" = yes; then + ac_cv_use_constraints='wxUSE_CONSTRAINTS=yes' + else + ac_cv_use_constraints='wxUSE_CONSTRAINTS=no' + fi + +else + + LINE=`grep "wxUSE_CONSTRAINTS" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_constraints='wxUSE_CONSTRAINTS='$DEFAULT_wxUSE_CONSTRAINTS + +fi + + + eval "$ac_cv_use_constraints" + if test "$no_cache" != 1; then + echo $ac_cv_use_constraints >> ${wx_arg_cache_file}.tmp + fi + + if test "$wxUSE_CONSTRAINTS" = yes; then + echo "$ac_t""yes" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + + + echo $ac_n "checking for --enable-printarch""... $ac_c" 1>&6 +echo "configure:4614: checking for --enable-printarch" >&5 + no_cache=0 + # Check whether --enable-printarch or --disable-printarch was given. +if test "${enable_printarch+set}" = set; then + enableval="$enable_printarch" + + if test "$enableval" = yes; then + ac_cv_use_printarch='wxUSE_PRINTING_ARCHITECTURE=yes' + else + ac_cv_use_printarch='wxUSE_PRINTING_ARCHITECTURE=no' + fi + +else + + LINE=`grep "wxUSE_PRINTING_ARCHITECTURE" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_printarch='wxUSE_PRINTING_ARCHITECTURE='$DEFAULT_wxUSE_PRINTING_ARCHITECTURE + +fi + + + eval "$ac_cv_use_printarch" + if test "$no_cache" != 1; then + echo $ac_cv_use_printarch >> ${wx_arg_cache_file}.tmp + fi + + if test "$wxUSE_PRINTING_ARCHITECTURE" = yes; then + echo "$ac_t""yes" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + + + echo $ac_n "checking for --enable-mdi""... $ac_c" 1>&6 +echo "configure:4653: checking for --enable-mdi" >&5 + no_cache=0 + # Check whether --enable-mdi or --disable-mdi was given. +if test "${enable_mdi+set}" = set; then + enableval="$enable_mdi" + + if test "$enableval" = yes; then + ac_cv_use_mdi='wxUSE_MDI_ARCHITECTURE=yes' + else + ac_cv_use_mdi='wxUSE_MDI_ARCHITECTURE=no' + fi + +else + + LINE=`grep "wxUSE_MDI_ARCHITECTURE" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_mdi='wxUSE_MDI_ARCHITECTURE='$DEFAULT_wxUSE_MDI_ARCHITECTURE + +fi + + + eval "$ac_cv_use_mdi" + if test "$no_cache" != 1; then + echo $ac_cv_use_mdi >> ${wx_arg_cache_file}.tmp + fi + + if test "$wxUSE_MDI_ARCHITECTURE" = yes; then + echo "$ac_t""yes" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + + + echo $ac_n "checking for --enable-loggui""... $ac_c" 1>&6 +echo "configure:4692: checking for --enable-loggui" >&5 + no_cache=0 + # Check whether --enable-loggui or --disable-loggui was given. +if test "${enable_loggui+set}" = set; then + enableval="$enable_loggui" + if test "$enableval" = yes; then ac_cv_use_loggui='wxUSE_LOGGUI=yes' else @@ -4416,7 +4727,7 @@ fi echo $ac_n "checking for --enable-logwin""... $ac_c" 1>&6 -echo "configure:4420: checking for --enable-logwin" >&5 +echo "configure:4731: checking for --enable-logwin" >&5 no_cache=0 # Check whether --enable-logwin or --disable-logwin was given. if test "${enable_logwin+set}" = set; then @@ -4456,7 +4767,7 @@ fi echo $ac_n "checking for --enable-postscript""... $ac_c" 1>&6 -echo "configure:4460: checking for --enable-postscript" >&5 +echo "configure:4771: checking for --enable-postscript" >&5 no_cache=0 # Check whether --enable-postscript or --disable-postscript was given. if test "${enable_postscript+set}" = set; then @@ -4498,7 +4809,7 @@ fi echo $ac_n "checking for --enable-prologio""... $ac_c" 1>&6 -echo "configure:4502: checking for --enable-prologio" >&5 +echo "configure:4813: checking for --enable-prologio" >&5 no_cache=0 # Check whether --enable-prologio or --disable-prologio was given. if test "${enable_prologio+set}" = set; then @@ -4537,7 +4848,7 @@ fi echo $ac_n "checking for --enable-resources""... $ac_c" 1>&6 -echo "configure:4541: checking for --enable-resources" >&5 +echo "configure:4852: checking for --enable-resources" >&5 no_cache=0 # Check whether --enable-resources or --disable-resources was given. if test "${enable_resources+set}" = set; then @@ -4577,7 +4888,7 @@ fi echo $ac_n "checking for --enable-xresources""... $ac_c" 1>&6 -echo "configure:4581: checking for --enable-xresources" >&5 +echo "configure:4892: checking for --enable-xresources" >&5 no_cache=0 # Check whether --enable-xresources or --disable-xresources was given. if test "${enable_xresources+set}" = set; then @@ -4618,7 +4929,7 @@ fi echo $ac_n "checking for --enable-clipboard""... $ac_c" 1>&6 -echo "configure:4622: checking for --enable-clipboard" >&5 +echo "configure:4933: checking for --enable-clipboard" >&5 no_cache=0 # Check whether --enable-clipboard or --disable-clipboard was given. if test "${enable_clipboard+set}" = set; then @@ -4657,7 +4968,7 @@ fi echo $ac_n "checking for --enable-dnd""... $ac_c" 1>&6 -echo "configure:4661: checking for --enable-dnd" >&5 +echo "configure:4972: checking for --enable-dnd" >&5 no_cache=0 # Check whether --enable-dnd or --disable-dnd was given. if test "${enable_dnd+set}" = set; then @@ -4696,7 +5007,7 @@ fi echo $ac_n "checking for --enable-metafile""... $ac_c" 1>&6 -echo "configure:4700: checking for --enable-metafile" >&5 +echo "configure:5011: checking for --enable-metafile" >&5 no_cache=0 # Check whether --enable-metafile or --disable-metafile was given. if test "${enable_metafile+set}" = set; then @@ -4735,39 +5046,39 @@ fi - echo $ac_n "checking for --enable-wxtree""... $ac_c" 1>&6 -echo "configure:4740: checking for --enable-wxtree" >&5 + echo $ac_n "checking for --enable-treelayout""... $ac_c" 1>&6 +echo "configure:5051: checking for --enable-treelayout" >&5 no_cache=0 - # Check whether --enable-wxtree or --disable-wxtree was given. -if test "${enable_wxtree+set}" = set; then - enableval="$enable_wxtree" + # Check whether --enable-treelayout or --disable-treelayout was given. +if test "${enable_treelayout+set}" = set; then + enableval="$enable_treelayout" if test "$enableval" = yes; then - ac_cv_use_wxtree='wxUSE_WXTREE=yes' + ac_cv_use_treelayout='wxUSE_TREELAYOUT=yes' else - ac_cv_use_wxtree='wxUSE_WXTREE=no' + ac_cv_use_treelayout='wxUSE_TREELAYOUT=no' fi else - LINE=`grep "wxUSE_WXTREE" ${wx_arg_cache_file}` + LINE=`grep "wxUSE_TREELAYOUT" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_wxtree='wxUSE_WXTREE='$DEFAULT_wxUSE_WXTREE + ac_cv_use_treelayout='wxUSE_TREELAYOUT='$DEFAULT_wxUSE_TREELAYOUT fi - eval "$ac_cv_use_wxtree" + eval "$ac_cv_use_treelayout" if test "$no_cache" != 1; then - echo $ac_cv_use_wxtree >> ${wx_arg_cache_file}.tmp + echo $ac_cv_use_treelayout >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_WXTREE" = yes; then + if test "$wxUSE_TREELAYOUT" = yes; then echo "$ac_t""yes" 1>&6 else echo "$ac_t""no" 1>&6 @@ -4777,7 +5088,7 @@ fi echo $ac_n "checking for --enable-controls""... $ac_c" 1>&6 -echo "configure:4781: checking for --enable-controls" >&5 +echo "configure:5092: checking for --enable-controls" >&5 no_cache=0 # Check whether --enable-controls or --disable-controls was given. if test "${enable_controls+set}" = set; then @@ -4832,6 +5143,7 @@ if test "$wxUSE_CONTROLS" = "yes"; then DEFAULT_wxUSE_LISTBOX=yes DEFAULT_wxUSE_LISTCTRL=yes DEFAULT_wxUSE_NOTEBOOK=yes + DEFAULT_wxUSE_PROPSHEET=yes DEFAULT_wxUSE_RADIOBOX=yes DEFAULT_wxUSE_RADIOBTN=yes DEFAULT_wxUSE_SASH=yes @@ -4851,6 +5163,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 @@ -4868,6 +5181,7 @@ elif test "$wxUSE_CONTROLS" = "no"; then DEFAULT_wxUSE_LISTBOX=no DEFAULT_wxUSE_LISTCTRL=no DEFAULT_wxUSE_NOTEBOOK=no + DEFAULT_wxUSE_PROPSHEET=no DEFAULT_wxUSE_RADIOBOX=no DEFAULT_wxUSE_RADIOBTN=no DEFAULT_wxUSE_SASH=no @@ -4887,11 +5201,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:4895: checking for --enable-accel" >&5 +echo "configure:5210: checking for --enable-accel" >&5 no_cache=0 # Check whether --enable-accel or --disable-accel was given. if test "${enable_accel+set}" = set; then @@ -4930,7 +5245,7 @@ fi echo $ac_n "checking for --enable-button""... $ac_c" 1>&6 -echo "configure:4934: checking for --enable-button" >&5 +echo "configure:5249: checking for --enable-button" >&5 no_cache=0 # Check whether --enable-button or --disable-button was given. if test "${enable_button+set}" = set; then @@ -4969,7 +5284,7 @@ fi echo $ac_n "checking for --enable-bmpbutton""... $ac_c" 1>&6 -echo "configure:4973: checking for --enable-bmpbutton" >&5 +echo "configure:5288: checking for --enable-bmpbutton" >&5 no_cache=0 # Check whether --enable-bmpbutton or --disable-bmpbutton was given. if test "${enable_bmpbutton+set}" = set; then @@ -5008,7 +5323,7 @@ fi echo $ac_n "checking for --enable-calendar""... $ac_c" 1>&6 -echo "configure:5012: checking for --enable-calendar" >&5 +echo "configure:5327: checking for --enable-calendar" >&5 no_cache=0 # Check whether --enable-calendar or --disable-calendar was given. if test "${enable_calendar+set}" = set; then @@ -5047,7 +5362,7 @@ fi echo $ac_n "checking for --enable-caret""... $ac_c" 1>&6 -echo "configure:5051: checking for --enable-caret" >&5 +echo "configure:5366: checking for --enable-caret" >&5 no_cache=0 # Check whether --enable-caret or --disable-caret was given. if test "${enable_caret+set}" = set; then @@ -5086,7 +5401,7 @@ fi echo $ac_n "checking for --enable-checkbox""... $ac_c" 1>&6 -echo "configure:5090: checking for --enable-checkbox" >&5 +echo "configure:5405: checking for --enable-checkbox" >&5 no_cache=0 # Check whether --enable-checkbox or --disable-checkbox was given. if test "${enable_checkbox+set}" = set; then @@ -5125,7 +5440,7 @@ fi echo $ac_n "checking for --enable-checklst""... $ac_c" 1>&6 -echo "configure:5129: checking for --enable-checklst" >&5 +echo "configure:5444: checking for --enable-checklst" >&5 no_cache=0 # Check whether --enable-checklst or --disable-checklst was given. if test "${enable_checklst+set}" = set; then @@ -5164,7 +5479,7 @@ fi echo $ac_n "checking for --enable-choice""... $ac_c" 1>&6 -echo "configure:5168: checking for --enable-choice" >&5 +echo "configure:5483: checking for --enable-choice" >&5 no_cache=0 # Check whether --enable-choice or --disable-choice was given. if test "${enable_choice+set}" = set; then @@ -5203,7 +5518,7 @@ fi echo $ac_n "checking for --enable-combobox""... $ac_c" 1>&6 -echo "configure:5207: checking for --enable-combobox" >&5 +echo "configure:5522: checking for --enable-combobox" >&5 no_cache=0 # Check whether --enable-combobox or --disable-combobox was given. if test "${enable_combobox+set}" = set; then @@ -5242,7 +5557,7 @@ fi echo $ac_n "checking for --enable-gauge""... $ac_c" 1>&6 -echo "configure:5246: checking for --enable-gauge" >&5 +echo "configure:5561: checking for --enable-gauge" >&5 no_cache=0 # Check whether --enable-gauge or --disable-gauge was given. if test "${enable_gauge+set}" = set; then @@ -5281,7 +5596,7 @@ fi echo $ac_n "checking for --enable-grid""... $ac_c" 1>&6 -echo "configure:5285: checking for --enable-grid" >&5 +echo "configure:5600: checking for --enable-grid" >&5 no_cache=0 # Check whether --enable-grid or --disable-grid was given. if test "${enable_grid+set}" = set; then @@ -5320,7 +5635,7 @@ fi echo $ac_n "checking for --enable-newgrid""... $ac_c" 1>&6 -echo "configure:5324: checking for --enable-newgrid" >&5 +echo "configure:5639: checking for --enable-newgrid" >&5 no_cache=0 # Check whether --enable-newgrid or --disable-newgrid was given. if test "${enable_newgrid+set}" = set; then @@ -5359,7 +5674,7 @@ fi echo $ac_n "checking for --enable-imaglist""... $ac_c" 1>&6 -echo "configure:5363: checking for --enable-imaglist" >&5 +echo "configure:5678: checking for --enable-imaglist" >&5 no_cache=0 # Check whether --enable-imaglist or --disable-imaglist was given. if test "${enable_imaglist+set}" = set; then @@ -5398,7 +5713,7 @@ fi echo $ac_n "checking for --enable-listbox""... $ac_c" 1>&6 -echo "configure:5402: checking for --enable-listbox" >&5 +echo "configure:5717: checking for --enable-listbox" >&5 no_cache=0 # Check whether --enable-listbox or --disable-listbox was given. if test "${enable_listbox+set}" = set; then @@ -5437,7 +5752,7 @@ fi echo $ac_n "checking for --enable-listctrl""... $ac_c" 1>&6 -echo "configure:5441: checking for --enable-listctrl" >&5 +echo "configure:5756: checking for --enable-listctrl" >&5 no_cache=0 # Check whether --enable-listctrl or --disable-listctrl was given. if test "${enable_listctrl+set}" = set; then @@ -5476,7 +5791,7 @@ fi echo $ac_n "checking for --enable-notebook""... $ac_c" 1>&6 -echo "configure:5480: checking for --enable-notebook" >&5 +echo "configure:5795: checking for --enable-notebook" >&5 no_cache=0 # Check whether --enable-notebook or --disable-notebook was given. if test "${enable_notebook+set}" = set; then @@ -5514,8 +5829,47 @@ fi fi + echo $ac_n "checking for --enable-propsheet""... $ac_c" 1>&6 +echo "configure:5834: checking for --enable-propsheet" >&5 + no_cache=0 + # Check whether --enable-propsheet or --disable-propsheet was given. +if test "${enable_propsheet+set}" = set; then + enableval="$enable_propsheet" + + if test "$enableval" = yes; then + ac_cv_use_propsheet='wxUSE_PROPSHEET=yes' + else + ac_cv_use_propsheet='wxUSE_PROPSHEET=no' + fi + +else + + LINE=`grep "wxUSE_PROPSHEET" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_propsheet='wxUSE_PROPSHEET='$DEFAULT_wxUSE_PROPSHEET + +fi + + + eval "$ac_cv_use_propsheet" + if test "$no_cache" != 1; then + echo $ac_cv_use_propsheet >> ${wx_arg_cache_file}.tmp + fi + + if test "$wxUSE_PROPSHEET" = yes; then + echo "$ac_t""yes" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + + echo $ac_n "checking for --enable-radiobox""... $ac_c" 1>&6 -echo "configure:5519: checking for --enable-radiobox" >&5 +echo "configure:5873: checking for --enable-radiobox" >&5 no_cache=0 # Check whether --enable-radiobox or --disable-radiobox was given. if test "${enable_radiobox+set}" = set; then @@ -5554,7 +5908,7 @@ fi echo $ac_n "checking for --enable-radiobtn""... $ac_c" 1>&6 -echo "configure:5558: checking for --enable-radiobtn" >&5 +echo "configure:5912: checking for --enable-radiobtn" >&5 no_cache=0 # Check whether --enable-radiobtn or --disable-radiobtn was given. if test "${enable_radiobtn+set}" = set; then @@ -5593,7 +5947,7 @@ fi echo $ac_n "checking for --enable-sash""... $ac_c" 1>&6 -echo "configure:5597: checking for --enable-sash" >&5 +echo "configure:5951: checking for --enable-sash" >&5 no_cache=0 # Check whether --enable-sash or --disable-sash was given. if test "${enable_sash+set}" = set; then @@ -5632,7 +5986,7 @@ fi echo $ac_n "checking for --enable-scrollbar""... $ac_c" 1>&6 -echo "configure:5636: checking for --enable-scrollbar" >&5 +echo "configure:5990: checking for --enable-scrollbar" >&5 no_cache=0 # Check whether --enable-scrollbar or --disable-scrollbar was given. if test "${enable_scrollbar+set}" = set; then @@ -5671,7 +6025,7 @@ fi echo $ac_n "checking for --enable-slider""... $ac_c" 1>&6 -echo "configure:5675: checking for --enable-slider" >&5 +echo "configure:6029: checking for --enable-slider" >&5 no_cache=0 # Check whether --enable-slider or --disable-slider was given. if test "${enable_slider+set}" = set; then @@ -5710,7 +6064,7 @@ fi echo $ac_n "checking for --enable-spinbtn""... $ac_c" 1>&6 -echo "configure:5714: checking for --enable-spinbtn" >&5 +echo "configure:6068: checking for --enable-spinbtn" >&5 no_cache=0 # Check whether --enable-spinbtn or --disable-spinbtn was given. if test "${enable_spinbtn+set}" = set; then @@ -5749,7 +6103,7 @@ fi echo $ac_n "checking for --enable-spinctrl""... $ac_c" 1>&6 -echo "configure:5753: checking for --enable-spinctrl" >&5 +echo "configure:6107: checking for --enable-spinctrl" >&5 no_cache=0 # Check whether --enable-spinctrl or --disable-spinctrl was given. if test "${enable_spinctrl+set}" = set; then @@ -5788,7 +6142,7 @@ fi echo $ac_n "checking for --enable-splitter""... $ac_c" 1>&6 -echo "configure:5792: checking for --enable-splitter" >&5 +echo "configure:6146: checking for --enable-splitter" >&5 no_cache=0 # Check whether --enable-splitter or --disable-splitter was given. if test "${enable_splitter+set}" = set; then @@ -5827,7 +6181,7 @@ fi echo $ac_n "checking for --enable-statbmp""... $ac_c" 1>&6 -echo "configure:5831: checking for --enable-statbmp" >&5 +echo "configure:6185: checking for --enable-statbmp" >&5 no_cache=0 # Check whether --enable-statbmp or --disable-statbmp was given. if test "${enable_statbmp+set}" = set; then @@ -5866,7 +6220,7 @@ fi echo $ac_n "checking for --enable-statbox""... $ac_c" 1>&6 -echo "configure:5870: checking for --enable-statbox" >&5 +echo "configure:6224: checking for --enable-statbox" >&5 no_cache=0 # Check whether --enable-statbox or --disable-statbox was given. if test "${enable_statbox+set}" = set; then @@ -5905,7 +6259,7 @@ fi echo $ac_n "checking for --enable-statline""... $ac_c" 1>&6 -echo "configure:5909: checking for --enable-statline" >&5 +echo "configure:6263: checking for --enable-statline" >&5 no_cache=0 # Check whether --enable-statline or --disable-statline was given. if test "${enable_statline+set}" = set; then @@ -5944,7 +6298,7 @@ fi echo $ac_n "checking for --enable-stattext""... $ac_c" 1>&6 -echo "configure:5948: checking for --enable-stattext" >&5 +echo "configure:6302: checking for --enable-stattext" >&5 no_cache=0 # Check whether --enable-stattext or --disable-stattext was given. if test "${enable_stattext+set}" = set; then @@ -5983,7 +6337,7 @@ fi echo $ac_n "checking for --enable-statusbar""... $ac_c" 1>&6 -echo "configure:5987: checking for --enable-statusbar" >&5 +echo "configure:6341: checking for --enable-statusbar" >&5 no_cache=0 # Check whether --enable-statusbar or --disable-statusbar was given. if test "${enable_statusbar+set}" = set; then @@ -6022,7 +6376,7 @@ fi echo $ac_n "checking for --enable-tabdialog""... $ac_c" 1>&6 -echo "configure:6026: checking for --enable-tabdialog" >&5 +echo "configure:6380: checking for --enable-tabdialog" >&5 no_cache=0 # Check whether --enable-tabdialog or --disable-tabdialog was given. if test "${enable_tabdialog+set}" = set; then @@ -6061,7 +6415,7 @@ fi echo $ac_n "checking for --enable-textctrl""... $ac_c" 1>&6 -echo "configure:6065: checking for --enable-textctrl" >&5 +echo "configure:6419: checking for --enable-textctrl" >&5 no_cache=0 # Check whether --enable-textctrl or --disable-textctrl was given. if test "${enable_textctrl+set}" = set; then @@ -6100,7 +6454,7 @@ fi echo $ac_n "checking for --enable-togglebtn""... $ac_c" 1>&6 -echo "configure:6104: checking for --enable-togglebtn" >&5 +echo "configure:6458: checking for --enable-togglebtn" >&5 no_cache=0 # Check whether --enable-togglebtn or --disable-togglebtn was given. if test "${enable_togglebtn+set}" = set; then @@ -6139,7 +6493,7 @@ fi echo $ac_n "checking for --enable-toolbar""... $ac_c" 1>&6 -echo "configure:6143: checking for --enable-toolbar" >&5 +echo "configure:6497: checking for --enable-toolbar" >&5 no_cache=0 # Check whether --enable-toolbar or --disable-toolbar was given. if test "${enable_toolbar+set}" = set; then @@ -6178,7 +6532,7 @@ fi echo $ac_n "checking for --enable-tbarnative""... $ac_c" 1>&6 -echo "configure:6182: checking for --enable-tbarnative" >&5 +echo "configure:6536: checking for --enable-tbarnative" >&5 no_cache=0 # Check whether --enable-tbarnative or --disable-tbarnative was given. if test "${enable_tbarnative+set}" = set; then @@ -6217,7 +6571,7 @@ fi echo $ac_n "checking for --enable-tbarsmpl""... $ac_c" 1>&6 -echo "configure:6221: checking for --enable-tbarsmpl" >&5 +echo "configure:6575: checking for --enable-tbarsmpl" >&5 no_cache=0 # Check whether --enable-tbarsmpl or --disable-tbarsmpl was given. if test "${enable_tbarsmpl+set}" = set; then @@ -6256,7 +6610,7 @@ fi echo $ac_n "checking for --enable-treectrl""... $ac_c" 1>&6 -echo "configure:6260: checking for --enable-treectrl" >&5 +echo "configure:6614: checking for --enable-treectrl" >&5 no_cache=0 # Check whether --enable-treectrl or --disable-treectrl was given. if test "${enable_treectrl+set}" = set; then @@ -6294,10 +6648,49 @@ fi fi + echo $ac_n "checking for --enable-popupwin""... $ac_c" 1>&6 +echo "configure:6653: 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:6301: checking for --enable-commondlg" >&5 +echo "configure:6694: checking for --enable-commondlg" >&5 no_cache=0 # Check whether --enable-commondlg or --disable-commondlg was given. if test "${enable_commondlg+set}" = set; then @@ -6336,7 +6729,7 @@ fi echo $ac_n "checking for --enable-choicedlg""... $ac_c" 1>&6 -echo "configure:6340: checking for --enable-choicedlg" >&5 +echo "configure:6733: checking for --enable-choicedlg" >&5 no_cache=0 # Check whether --enable-choicedlg or --disable-choicedlg was given. if test "${enable_choicedlg+set}" = set; then @@ -6375,7 +6768,7 @@ fi echo $ac_n "checking for --enable-coldlg""... $ac_c" 1>&6 -echo "configure:6379: checking for --enable-coldlg" >&5 +echo "configure:6772: checking for --enable-coldlg" >&5 no_cache=0 # Check whether --enable-coldlg or --disable-coldlg was given. if test "${enable_coldlg+set}" = set; then @@ -6414,7 +6807,7 @@ fi echo $ac_n "checking for --enable-filedlg""... $ac_c" 1>&6 -echo "configure:6418: checking for --enable-filedlg" >&5 +echo "configure:6811: checking for --enable-filedlg" >&5 no_cache=0 # Check whether --enable-filedlg or --disable-filedlg was given. if test "${enable_filedlg+set}" = set; then @@ -6452,8 +6845,47 @@ fi fi + echo $ac_n "checking for --enable-filedlg""... $ac_c" 1>&6 +echo "configure:6850: checking for --enable-filedlg" >&5 + no_cache=0 + # Check whether --enable-filedlg or --disable-filedlg was given. +if test "${enable_filedlg+set}" = set; then + enableval="$enable_filedlg" + + if test "$enableval" = yes; then + ac_cv_use_filedlg='wxUSE_FINDREPLDLG=yes' + else + ac_cv_use_filedlg='wxUSE_FINDREPLDLG=no' + fi + +else + + LINE=`grep "wxUSE_FINDREPLDLG" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_filedlg='wxUSE_FINDREPLDLG='$DEFAULT_wxUSE_FINDREPLDLG + +fi + + + eval "$ac_cv_use_filedlg" + if test "$no_cache" != 1; then + echo $ac_cv_use_filedlg >> ${wx_arg_cache_file}.tmp + fi + + if test "$wxUSE_FINDREPLDLG" = yes; then + echo "$ac_t""yes" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + + echo $ac_n "checking for --enable-fontdlg""... $ac_c" 1>&6 -echo "configure:6457: checking for --enable-fontdlg" >&5 +echo "configure:6889: checking for --enable-fontdlg" >&5 no_cache=0 # Check whether --enable-fontdlg or --disable-fontdlg was given. if test "${enable_fontdlg+set}" = set; then @@ -6492,7 +6924,7 @@ fi echo $ac_n "checking for --enable-dirdlg""... $ac_c" 1>&6 -echo "configure:6496: checking for --enable-dirdlg" >&5 +echo "configure:6928: checking for --enable-dirdlg" >&5 no_cache=0 # Check whether --enable-dirdlg or --disable-dirdlg was given. if test "${enable_dirdlg+set}" = set; then @@ -6531,7 +6963,7 @@ fi echo $ac_n "checking for --enable-msgdlg""... $ac_c" 1>&6 -echo "configure:6535: checking for --enable-msgdlg" >&5 +echo "configure:6967: checking for --enable-msgdlg" >&5 no_cache=0 # Check whether --enable-msgdlg or --disable-msgdlg was given. if test "${enable_msgdlg+set}" = set; then @@ -6570,7 +7002,7 @@ fi echo $ac_n "checking for --enable-numberdlg""... $ac_c" 1>&6 -echo "configure:6574: checking for --enable-numberdlg" >&5 +echo "configure:7006: checking for --enable-numberdlg" >&5 no_cache=0 # Check whether --enable-numberdlg or --disable-numberdlg was given. if test "${enable_numberdlg+set}" = set; then @@ -6608,8 +7040,47 @@ fi fi + echo $ac_n "checking for --enable-splash""... $ac_c" 1>&6 +echo "configure:7045: checking for --enable-splash" >&5 + no_cache=0 + # Check whether --enable-splash or --disable-splash was given. +if test "${enable_splash+set}" = set; then + enableval="$enable_splash" + + if test "$enableval" = yes; then + ac_cv_use_splash='wxUSE_SPLASH=yes' + else + ac_cv_use_splash='wxUSE_SPLASH=no' + fi + +else + + LINE=`grep "wxUSE_SPLASH" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_splash='wxUSE_SPLASH='$DEFAULT_wxUSE_SPLASH + +fi + + + eval "$ac_cv_use_splash" + if test "$no_cache" != 1; then + echo $ac_cv_use_splash >> ${wx_arg_cache_file}.tmp + fi + + if test "$wxUSE_SPLASH" = yes; then + echo "$ac_t""yes" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + + echo $ac_n "checking for --enable-textdlg""... $ac_c" 1>&6 -echo "configure:6613: checking for --enable-textdlg" >&5 +echo "configure:7084: checking for --enable-textdlg" >&5 no_cache=0 # Check whether --enable-textdlg or --disable-textdlg was given. if test "${enable_textdlg+set}" = set; then @@ -6648,7 +7119,7 @@ fi echo $ac_n "checking for --enable-tipdlg""... $ac_c" 1>&6 -echo "configure:6652: checking for --enable-tipdlg" >&5 +echo "configure:7123: checking for --enable-tipdlg" >&5 no_cache=0 # Check whether --enable-tipdlg or --disable-tipdlg was given. if test "${enable_tipdlg+set}" = set; then @@ -6687,7 +7158,7 @@ fi echo $ac_n "checking for --enable-progressdlg""... $ac_c" 1>&6 -echo "configure:6691: checking for --enable-progressdlg" >&5 +echo "configure:7162: checking for --enable-progressdlg" >&5 no_cache=0 # Check whether --enable-progressdlg or --disable-progressdlg was given. if test "${enable_progressdlg+set}" = set; then @@ -6725,117 +7196,119 @@ fi fi - echo $ac_n "checking for --enable-menus""... $ac_c" 1>&6 -echo "configure:6730: checking for --enable-menus" >&5 + echo $ac_n "checking for --enable-wizarddlg""... $ac_c" 1>&6 +echo "configure:7201: 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:6769: checking for --enable-miniframe" >&5 + + + echo $ac_n "checking for --enable-menus""... $ac_c" 1>&6 +echo "configure:7242: 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:6808: checking for --enable-html" >&5 + echo $ac_n "checking for --enable-miniframe""... $ac_c" 1>&6 +echo "configure:7281: 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 @@ -6843,7 +7316,7 @@ fi echo $ac_n "checking for --enable-tooltips""... $ac_c" 1>&6 -echo "configure:6847: checking for --enable-tooltips" >&5 +echo "configure:7320: checking for --enable-tooltips" >&5 no_cache=0 # Check whether --enable-tooltips or --disable-tooltips was given. if test "${enable_tooltips+set}" = set; then @@ -6882,7 +7355,7 @@ fi echo $ac_n "checking for --enable-splines""... $ac_c" 1>&6 -echo "configure:6886: checking for --enable-splines" >&5 +echo "configure:7359: checking for --enable-splines" >&5 no_cache=0 # Check whether --enable-splines or --disable-splines was given. if test "${enable_splines+set}" = set; then @@ -6921,7 +7394,7 @@ fi echo $ac_n "checking for --enable-validators""... $ac_c" 1>&6 -echo "configure:6925: checking for --enable-validators" >&5 +echo "configure:7398: checking for --enable-validators" >&5 no_cache=0 # Check whether --enable-validators or --disable-validators was given. if test "${enable_validators+set}" = set; then @@ -6960,7 +7433,7 @@ fi echo $ac_n "checking for --enable-busyinfo""... $ac_c" 1>&6 -echo "configure:6964: checking for --enable-busyinfo" >&5 +echo "configure:7437: checking for --enable-busyinfo" >&5 no_cache=0 # Check whether --enable-busyinfo or --disable-busyinfo was given. if test "${enable_busyinfo+set}" = set; then @@ -6999,7 +7472,7 @@ fi echo $ac_n "checking for --enable-joystick""... $ac_c" 1>&6 -echo "configure:7003: checking for --enable-joystick" >&5 +echo "configure:7476: checking for --enable-joystick" >&5 no_cache=0 # Check whether --enable-joystick or --disable-joystick was given. if test "${enable_joystick+set}" = set; then @@ -7038,7 +7511,7 @@ fi echo $ac_n "checking for --enable-metafile""... $ac_c" 1>&6 -echo "configure:7042: checking for --enable-metafile" >&5 +echo "configure:7515: checking for --enable-metafile" >&5 no_cache=0 # Check whether --enable-metafile or --disable-metafile was given. if test "${enable_metafile+set}" = set; then @@ -7077,7 +7550,7 @@ fi echo $ac_n "checking for --enable-dragimage""... $ac_c" 1>&6 -echo "configure:7081: checking for --enable-dragimage" >&5 +echo "configure:7554: checking for --enable-dragimage" >&5 no_cache=0 # Check whether --enable-dragimage or --disable-dragimage was given. if test "${enable_dragimage+set}" = set; then @@ -7117,8 +7590,47 @@ fi + echo $ac_n "checking for --enable-palette""... $ac_c" 1>&6 +echo "configure:7595: checking for --enable-palette" >&5 + no_cache=0 + # Check whether --enable-palette or --disable-palette was given. +if test "${enable_palette+set}" = set; then + enableval="$enable_palette" + + if test "$enableval" = yes; then + ac_cv_use_palette='wxUSE_PALETTE=yes' + else + ac_cv_use_palette='wxUSE_PALETTE=no' + fi + +else + + LINE=`grep "wxUSE_PALETTE" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_palette='wxUSE_PALETTE='$DEFAULT_wxUSE_PALETTE + +fi + + + eval "$ac_cv_use_palette" + if test "$no_cache" != 1; then + echo $ac_cv_use_palette >> ${wx_arg_cache_file}.tmp + fi + + if test "$wxUSE_PALETTE" = yes; then + echo "$ac_t""yes" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + + echo $ac_n "checking for --enable-image""... $ac_c" 1>&6 -echo "configure:7122: checking for --enable-image" >&5 +echo "configure:7634: checking for --enable-image" >&5 no_cache=0 # Check whether --enable-image or --disable-image was given. if test "${enable_image+set}" = set; then @@ -7157,7 +7669,7 @@ fi echo $ac_n "checking for --enable-gif""... $ac_c" 1>&6 -echo "configure:7161: checking for --enable-gif" >&5 +echo "configure:7673: checking for --enable-gif" >&5 no_cache=0 # Check whether --enable-gif or --disable-gif was given. if test "${enable_gif+set}" = set; then @@ -7196,7 +7708,7 @@ fi echo $ac_n "checking for --enable-pcx""... $ac_c" 1>&6 -echo "configure:7200: checking for --enable-pcx" >&5 +echo "configure:7712: checking for --enable-pcx" >&5 no_cache=0 # Check whether --enable-pcx or --disable-pcx was given. if test "${enable_pcx+set}" = set; then @@ -7235,7 +7747,7 @@ fi echo $ac_n "checking for --enable-pnm""... $ac_c" 1>&6 -echo "configure:7239: checking for --enable-pnm" >&5 +echo "configure:7751: checking for --enable-pnm" >&5 no_cache=0 # Check whether --enable-pnm or --disable-pnm was given. if test "${enable_pnm+set}" = set; then @@ -7274,7 +7786,7 @@ fi echo $ac_n "checking for --enable-pnm""... $ac_c" 1>&6 -echo "configure:7278: checking for --enable-pnm" >&5 +echo "configure:7790: checking for --enable-pnm" >&5 no_cache=0 # Check whether --enable-pnm or --disable-pnm was given. if test "${enable_pnm+set}" = set; then @@ -7321,74 +7833,74 @@ fi echo $ac_n "checking for toolkit""... $ac_c" 1>&6 -echo "configure:7325: checking for toolkit" >&5 +echo "configure:7837: checking for toolkit" >&5 if test "$wxUSE_GUI" = "yes"; then -if test "$USE_BEOS" = 1; then - { echo "configure: error: BeOS GUI is not supported yet, use --disable-gui" 1>&2; exit 1; } -fi + if test "$USE_BEOS" = 1; then + { echo "configure: error: BeOS GUI is not supported yet, use --disable-gui" 1>&2; exit 1; } + fi -if test "$TOOLKIT_GIVEN" = 1; then - for toolkit in `echo $ALL_TOOLKITS`; do - var=wxUSE_$toolkit - eval "value=\$${var}" - eval "$var=`echo \$value | sed -e "s/yes/1/" -e "s/no/0/"`" - done -else - for toolkit in `echo $ALL_TOOLKITS`; do - if test "$has_toolkit_in_cache" != 1; then - var=DEFAULT_DEFAULT_wxUSE_$toolkit + if test "$TOOLKIT_GIVEN" = 1; then + for toolkit in `echo $ALL_TOOLKITS`; do + var=wxUSE_$toolkit + eval "value=\$${var}" + eval "$var=`echo \$value | sed -e "s/yes/1/" -e "s/no/0/"`" + done else - var=DEFAULT_wxUSE_$toolkit + for toolkit in `echo $ALL_TOOLKITS`; do + if test "$has_toolkit_in_cache" != 1; then + var=DEFAULT_DEFAULT_wxUSE_$toolkit + else + var=DEFAULT_wxUSE_$toolkit + fi + eval "wxUSE_$toolkit=\$${var}" + done fi - eval "wxUSE_$toolkit=\$${var}" - done -fi - -NUM_TOOLKITS=`expr ${wxUSE_GTK:-0} + ${wxUSE_MOTIF:-0} + ${wxUSE_MAC:-0} + ${wxUSE_WINE:-0} + ${wxUSE_MINGW:-0} + ${wxUSE_CYGWIN:-0} + ${wxUSE_MGL:-0}` -case "${host}" in - *-pc-os2_emx ) - NUM_TOOLKITS=`expr ${NUM_TOOLKITS} + ${wxUSE_PM:-0}` - # PATH_IFS is autodetected by OS/2's configure (usually ';') - LEX_STEM="lexyy" - ;; - *) - PATH_IFS=':' - LEX_STEM="lex.yy" - ;; -esac + NUM_TOOLKITS=`expr ${wxUSE_GTK:-0} + ${wxUSE_MOTIF:-0} + ${wxUSE_MAC:-0} \ + + ${wxUSE_WINE:-0} + ${wxUSE_MSW:-0} + ${wxUSE_MGL:-0}` -case "$NUM_TOOLKITS" in - 1) - ;; - 0) - { echo "configure: error: Please specify a toolkit - cannot determine the default for ${host}" 1>&2; exit 1; } - ;; - *) - { echo "configure: error: Please specify at most one toolkit (may be some are cached?)" 1>&2; exit 1; } -esac + case "${host}" in + *-pc-os2_emx | *-pc-os2-emx ) + # PATH_IFS is autodetected by OS/2's configure (usually ';') + NUM_TOOLKITS=`expr ${NUM_TOOLKITS} + ${wxUSE_PM:-0}` + LEX_STEM="lexyy" + ;; + *) + PATH_IFS=':' + LEX_STEM="lex.yy" + ;; + esac -for toolkit in `echo $ALL_TOOLKITS`; do - var=wxUSE_$toolkit - eval "value=\$${var}" - if test "x$value" != x; then - cache_var=CACHE_$toolkit - eval "cache=\$${cache_var}" - if test "$cache" = 1; then - echo "$var=$value" >> ${wx_arg_cache_file} - fi - if test "$value" = 1; then - toolkit_echo=`echo $toolkit | tr [A-Z] [a-z]` - echo "$ac_t""$toolkit_echo" 1>&6 - fi - fi -done + case "$NUM_TOOLKITS" in + 1) + ;; + 0) + { echo "configure: error: Please specify a toolkit - cannot determine the default for ${host}" 1>&2; exit 1; } + ;; + *) + { echo "configure: error: Please specify at most one toolkit (may be some are cached?)" 1>&2; exit 1; } + esac + for toolkit in `echo $ALL_TOOLKITS`; do + var=wxUSE_$toolkit + eval "value=\$${var}" + if test "x$value" != x; then + cache_var=CACHE_$toolkit + eval "cache=\$${cache_var}" + if test "$cache" = 1; then + echo "$var=$value" >> ${wx_arg_cache_file} + fi + if test "$value" = 1; then + toolkit_echo=`echo $toolkit | tr [A-Z] [a-z]` + echo "$ac_t""$toolkit_echo" 1>&6 + fi + fi + done else PATH_IFS=':' - echo "$ac_t""base only" 1>&6 + echo "$ac_t""base ($host_alias hosted) only" 1>&6 fi @@ -7441,21 +7953,25 @@ rm -f confcache if test "$build" != "$host" ; then - CC=$host_alias-gcc - CXX=$host_alias-c++ - AR=$host_alias-ar - RANLIB=$host_alias-ranlib - DLLTOOL=$host_alias-dlltool - RESCOMP=$host_alias-windres - LD=$host_alias-ld - NM=$host_alias-nm - STRIP=$host_alias-strip + if test "$USE_WIN32" = 1 ; then + CC=$host_alias-gcc + CXX=$host_alias-c++ + AR=$host_alias-ar + RANLIB=$host_alias-ranlib + DLLTOOL=$host_alias-dlltool + RESCOMP=$host_alias-windres + LD=$host_alias-ld + NM=$host_alias-nm + STRIP=$host_alias-strip + else + { echo "configure: error: $build_alias -> $host_alias cross compilation not supported yet." 1>&2; exit 1; } + fi fi # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:7459: checking for $ac_word" >&5 +echo "configure:7975: 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 @@ -7485,7 +8001,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:7489: checking for $ac_word" >&5 +echo "configure:8005: 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 @@ -7536,7 +8052,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:7540: checking for $ac_word" >&5 +echo "configure:8056: 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 @@ -7568,7 +8084,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:7572: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:8088: 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. @@ -7579,12 +8095,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 7583 "configure" +#line 8099 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:7588: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8104: \"$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 @@ -7610,12 +8126,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:7614: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:8130: 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:7619: checking whether we are using GNU C" >&5 +echo "configure:8135: 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 @@ -7624,7 +8140,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:7628: \"$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:8144: \"$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 @@ -7643,7 +8159,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:7647: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:8163: 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 @@ -7678,7 +8194,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:7682: checking how to run the C preprocessor" >&5 +echo "configure:8198: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -7693,13 +8209,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:7703: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8219: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -7710,13 +8226,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:7720: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8236: \"$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 : @@ -7727,13 +8243,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:7737: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8253: \"$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 : @@ -7757,16 +8273,15 @@ else fi echo "$ac_t""$CPP" 1>&6 - if test $ac_cv_prog_gcc = yes; then echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6 -echo "configure:7764: checking whether ${CC-cc} needs -traditional" >&5 +echo "configure:8279: 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 @@ -7784,7 +8299,7 @@ rm -f conftest* if test $ac_cv_prog_gcc_traditional = no; then cat > conftest.$ac_ext < Autoconf TCGETA @@ -7820,7 +8335,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:7824: checking for $ac_word" >&5 +echo "configure:8339: 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 @@ -7852,7 +8367,7 @@ test -n "$CXX" || CXX="gcc" echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:7856: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 +echo "configure:8371: 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. @@ -7863,12 +8378,12 @@ cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext << EOF -#line 7867 "configure" +#line 8382 "configure" #include "confdefs.h" int main(){return(0);} EOF -if { (eval echo configure:7872: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8387: \"$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 @@ -7894,12 +8409,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:7898: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:8413: 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:7903: checking whether we are using GNU C++" >&5 +echo "configure:8418: 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 @@ -7908,7 +8423,7 @@ else yes; #endif EOF -if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:7912: \"$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:8427: \"$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 @@ -7927,7 +8442,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:7931: checking whether ${CXX-g++} accepts -g" >&5 +echo "configure:8446: 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 @@ -7959,50 +8474,6 @@ else fi -echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6 -echo "configure:7964: checking how to run the C++ preprocessor" >&5 -if test -z "$CXXCPP"; then -if eval "test \"`echo '$''{'ac_cv_prog_CXXCPP'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - ac_ext=C -# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -cross_compiling=$ac_cv_prog_cxx_cross - CXXCPP="${CXX-g++} -E" - cat > conftest.$ac_ext < -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7982: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -if test -z "$ac_err"; then - : -else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - CXXCPP=/lib/cpp -fi -rm -f conftest* - ac_cv_prog_CXXCPP="$CXXCPP" -ac_ext=C -# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -cross_compiling=$ac_cv_prog_cxx_cross -fi -fi -CXXCPP="$ac_cv_prog_CXXCPP" -echo "$ac_t""$CXXCPP" 1>&6 - - CXXFLAGS=`echo "$CXXFLAGS" | sed 's/-g//g'` ac_ext=c @@ -8016,7 +8487,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:8020: checking for $ac_word" >&5 +echo "configure:8491: 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 @@ -8047,7 +8518,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:8051: checking for $ac_word" >&5 +echo "configure:8522: 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 @@ -8087,7 +8558,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:8091: checking for a BSD compatible install" >&5 +echo "configure:8562: 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 @@ -8139,11 +8610,20 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' +case "${host}" in + + powerpc-*-darwin* ) + INSTALL_PROGRAM="cp -fp" + INSTALL_DATA="cp -fp" + ;; + *) + ;; +esac # 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:8147: checking for $ac_word" >&5 +echo "configure:8627: 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 @@ -8172,7 +8652,7 @@ fi echo $ac_n "checking make for VPATH support""... $ac_c" 1>&6 -echo "configure:8176: checking make for VPATH support" >&5 +echo "configure:8656: checking make for VPATH support" >&5 cat - << EOF > confMake check : file cp \$? \$@ @@ -8209,7 +8689,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:8213: checking for $ac_word" >&5 +echo "configure:8693: 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 @@ -8243,7 +8723,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:8247: checking for $ac_word" >&5 +echo "configure:8727: 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 @@ -8277,7 +8757,7 @@ then *) ac_lib=l ;; esac echo $ac_n "checking for yywrap in -l$ac_lib""... $ac_c" 1>&6 -echo "configure:8281: checking for yywrap in -l$ac_lib" >&5 +echo "configure:8761: 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 @@ -8285,7 +8765,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:8780: \"$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 @@ -8320,7 +8800,7 @@ fi echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:8324: checking whether ln -s works" >&5 +echo "configure:8804: 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 @@ -8461,83 +8941,810 @@ rm -f confcache -AFMINSTALL= -if test "$wxUSE_GUI" = "yes"; then - USE_GUI=1 +REGEX_INCLUDE= +if test "$wxUSE_REGEX" != "no"; then + cat >> confdefs.h <<\EOF +#define wxUSE_REGEX 1 +EOF - TOOLKIT= - TOOLKIT_INCLUDE= - GUI_TK_LIBRARY= - GUI_TK_LINK= + if test "$wxUSE_REGEX" = "sys" -o "$wxUSE_REGEX" = "yes" ; then + ac_safe=`echo "regex.h" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for regex.h""... $ac_c" 1>&6 +echo "configure:8956: 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:8966: \"$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:8985: 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(); - WXGTK12= - WXGTK127= - WXGTK20= +int main() { - WXWINE= +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_$ac_func) || defined (__stub___$ac_func) +choke me +#else +$ac_func(); +#endif - if test "$wxUSE_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:8487: 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 +; return 0; } +EOF +if { (eval echo configure:9013: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_$ac_func=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_func_$ac_func=no" +fi +rm -f conftest* +fi - if test "$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 +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 - INCLUDE_SUBDIRS="$INCLUDE_SUBDIRS msw" - LIBS="$LIBS -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lctl3d32 -lcrtdll -ladvapi32 -lwsock32" +else + echo "$ac_t""no" 1>&6 +fi - if test "$wxUSE_ODBC" = "yes" ; then - LIBS="$LIBS -lodbc32 -lole32 -loleaut32" - fi - if test "$wxUSE_MINGW" = 1; then - LDFLAGS="$LDFLAGS -mwindows" + if test "x$ac_cv_func_regcomp" != "xyes"; then + if test "$wxUSE_REGEX" = "sys" ; then + { echo "configure: error: system regex library not found! Use --with-regex to use built-in version" 1>&2; exit 1; } + else + echo "configure: warning: system regex library not found, will use built-in instead" 1>&2 + wxUSE_REGEX=builtin + fi + else + wxUSE_REGEX=sys fi + fi - TOOLKIT=MSW - GUIDIST=MSW_DIST - - RCINCSWITCH="--include-dir" - RCDEFSWITCH="--define" - RCPREPROCESSOR="--preprocessor \"\$(CC) -c -E -xc-header -DRC_INVOKED\"" - RCINPUTSWITCH="-i" - RCOUTPUTSWITCH="-o" - RESFLAGS="$RCPREPROCESSOR $RCINCSWITCH \$(top_srcdir)/include $RCINCSWITCH \$(top_srcdir)/\$(program_dir) $RCDEFSWITCH __WIN32__ $RCDEFSWITCH __WIN95__ $RCDEFSWITCH __GNUWIN32__" - - RESPROGRAM="\$(RES_PROGRAM)" + if test "$wxUSE_REGEX" = "builtin" ; then + REGEX_INCLUDE="-I\${top_srcdir}/src/regex" fi +fi - if test "$wxUSE_GTK" = 1; then - echo $ac_n "checking for GTK+ version""... $ac_c" 1>&6 -echo "configure:8533: 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 +ZLIB_INCLUDE= +ZLIB_LINK= +if test "$wxUSE_ZLIB" != "no" ; then + cat >> confdefs.h <<\EOF +#define wxUSE_ZLIB 1 +EOF + + + if test "$wxUSE_ZLIB" = "sys" -o "$wxUSE_ZLIB" = "yes" ; then + ac_safe=`echo "zlib.h" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for zlib.h""... $ac_c" 1>&6 +echo "configure:9071: 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:9081: \"$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 + echo $ac_n "checking for deflate in -lz""... $ac_c" 1>&6 +echo "configure:9098: checking for deflate in -lz" >&5 +ac_lib_var=`echo z'_'deflate | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + ac_save_LIBS="$LIBS" +LIBS="-lz $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" +fi +rm -f conftest* +LIBS="$ac_save_LIBS" + +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + ZLIB_LINK=" -lz" +else + echo "$ac_t""no" 1>&6 +fi + +else + echo "$ac_t""no" 1>&6 +fi + + + if test "x$ZLIB_LINK" = "x" ; then + if test "$wxUSE_ZLIB" = "sys" ; then + { echo "configure: error: system zlib compression library not found! Use --with-zlib=builtin to use built-in version" 1>&2; exit 1; } + else + echo "configure: warning: system zlib compression library not found, will use built-in instead" 1>&2 + wxUSE_ZLIB=builtin + fi + else + wxUSE_ZLIB=sys + fi + fi + + if test "$wxUSE_ZLIB" = "builtin" ; then + ZLIB_INCLUDE="-I\${top_srcdir}/src/zlib" + fi +fi + + +PNG_INCLUDE= +PNG_LINK= +if test "$wxUSE_LIBPNG" != "no" ; then + cat >> confdefs.h <<\EOF +#define wxUSE_LIBPNG 1 +EOF + + + if test "$wxUSE_LIBPNG" = "sys" -a "$wxUSE_ZLIB" != "sys" ; then + echo "configure: warning: system png library doesn't work without system zlib, will use built-in instead" 1>&2 + wxUSE_LIBPNG=builtin + fi + + if test "$wxUSE_LIBPNG" = "sys" -o "$wxUSE_LIBPNG" = "yes" ; then + ac_safe=`echo "png.h" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for png.h""... $ac_c" 1>&6 +echo "configure:9176: 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:9186: \"$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 + echo $ac_n "checking for png_check_sig in -lpng""... $ac_c" 1>&6 +echo "configure:9203: checking for png_check_sig in -lpng" >&5 +ac_lib_var=`echo png'_'png_check_sig | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + ac_save_LIBS="$LIBS" +LIBS="-lpng -lz -lm $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" +fi +rm -f conftest* +LIBS="$ac_save_LIBS" + +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + PNG_LINK=" -lpng" +else + echo "$ac_t""no" 1>&6 +fi + + +else + echo "$ac_t""no" 1>&6 +fi + + + if test "x$PNG_LINK" = "x" ; then + if test "$wxUSE_LIBPNG" = "sys" ; then + { echo "configure: error: system png library not found! Use --with-libpng=builtin to use built-in version" 1>&2; exit 1; } + else + echo "configure: warning: system png library not found, will use built-in instead" 1>&2 + wxUSE_LIBPNG=builtin + fi + else + wxUSE_LIBPNG=yes + fi + fi + + if test "$wxUSE_LIBPNG" = "builtin" ; then + PNG_INCLUDE="-I\${top_srcdir}/src/png" + fi + + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS png" +fi + + +JPEG_INCLUDE= +JPEG_LINK= +if test "$wxUSE_LIBJPEG" != "no" ; then + cat >> confdefs.h <<\EOF +#define wxUSE_LIBJPEG 1 +EOF + + + if test "$wxUSE_LIBJPEG" = "sys" -o "$wxUSE_LIBJPEG" = "yes" ; then + echo $ac_n "checking for jpeglib.h""... $ac_c" 1>&6 +echo "configure:9278: 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 < + #include + +int main() { + + +; return 0; } +EOF +if { (eval echo configure:9295: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_header_jpeglib_h=yes +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + ac_cv_header_jpeglib_h=no + +fi +rm -f conftest* + +fi + + 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:9313: checking for jpeg_read_header in -ljpeg" >&5 +ac_lib_var=`echo jpeg'_'jpeg_read_header | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + ac_save_LIBS="$LIBS" +LIBS="-ljpeg $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" +fi +rm -f conftest* +LIBS="$ac_save_LIBS" + +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + JPEG_LINK=" -ljpeg" +else + echo "$ac_t""no" 1>&6 +fi + + fi + + if test "x$JPEG_LINK" = "x" ; then + if test "$wxUSE_LIBJPEG" = "sys" ; then + { echo "configure: error: system jpeg library not found! Use --with-libjpeg=builtin to use built-in version" 1>&2; exit 1; } + else + echo "configure: warning: system jpeg library not found, will use built-in instead" 1>&2 + wxUSE_LIBJPEG=builtin + fi + else + wxUSE_LIBJPEG=sys + fi + fi + + if test "$wxUSE_LIBJPEG" = "builtin" ; then + JPEG_INCLUDE="-I\${top_srcdir}/src/jpeg" + fi +fi + + +TIFF_INCLUDE= +TIFF_LINK= +if test "$wxUSE_LIBTIFF" != "no" ; then + cat >> confdefs.h <<\EOF +#define wxUSE_LIBTIFF 1 +EOF + + + if test "$wxUSE_LIBTIFF" = "sys" -o "$wxUSE_LIBTIFF" = "yes" ; then + ac_safe=`echo "tiffio.h" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for tiffio.h""... $ac_c" 1>&6 +echo "configure:9383: 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:9393: \"$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 + echo $ac_n "checking for TIFFError in -ltiff""... $ac_c" 1>&6 +echo "configure:9410: checking for TIFFError in -ltiff" >&5 +ac_lib_var=`echo tiff'_'TIFFError | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + ac_save_LIBS="$LIBS" +LIBS="-ltiff -lm $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" +fi +rm -f conftest* +LIBS="$ac_save_LIBS" + +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + TIFF_LINK=" -ltiff" +else + echo "$ac_t""no" 1>&6 +fi + + +else + echo "$ac_t""no" 1>&6 +fi + + + if test "x$TIFF_LINK" = "x" ; then + if test "$wxUSE_LIBTIFF" = "sys" ; then + { echo "configure: error: system tiff library not found! Use --with-libtiff=builtin to use built-in version" 1>&2; exit 1; } + else + echo "configure: warning: system tiff library not found, will use built-in instead" 1>&2 + wxUSE_LIBTIFF=builtin + fi + else + wxUSE_LIBTIFF=sys + fi + fi + + if test "$wxUSE_LIBTIFF" = "builtin" ; then + TIFF_INCLUDE="-I\${top_srcdir}/src/tiff" + fi +fi + + +FREETYPE_INCLUDE= +FREETYPE_LINK= +if test "$wxUSE_FREETYPE" != "no" ; then + cat >> confdefs.h <<\EOF +#define wxUSE_FREETYPE 1 +EOF + + + if test "$wxUSE_FREETYPE" = "sys" -o "$wxUSE_FREETYPE" = "yes" ; then + ac_safe=`echo "freetype.h" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for freetype.h""... $ac_c" 1>&6 +echo "configure:9484: 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:9494: \"$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 + echo $ac_n "checking for FT_Render_Glyph in -lfreetype""... $ac_c" 1>&6 +echo "configure:9511: checking for FT_Render_Glyph in -lfreetype" >&5 +ac_lib_var=`echo freetype'_'FT_Render_Glyph | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + ac_save_LIBS="$LIBS" +LIBS="-lfreetype -lm $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" +fi +rm -f conftest* +LIBS="$ac_save_LIBS" + +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + FREETYPE_LINK=" -lfreetype" +else + echo "$ac_t""no" 1>&6 +fi + + +else + echo "$ac_t""no" 1>&6 +fi + + + if test "x$FREETYPE_LINK" = "x" ; then + if test "$wxUSE_FREETYPE" = "sys" ; then + { echo "configure: error: system freetype library not found! Use --with-freetype=builtin to use built-in version" 1>&2; exit 1; } + else + echo "configure: warning: system freetype library not found, will use built-in instead" 1>&2 + wxUSE_FREETYPE=builtin + fi + else + wxUSE_FREETYPE=sys + fi + fi + + if test "$wxUSE_FREETYPE" = "builtin" ; then + FREETYPE_INCLUDE="-I\${top_srcdir}/src/freetype" + fi +fi + + +AFMINSTALL= + +TOOLKIT= +TOOLKIT_INCLUDE= +WIDGET_SET= + +if test "$USE_WIN32" = 1 ; then + for ac_hdr in w32api.h +do +ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +echo "configure:9585: 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:9595: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` +if test -z "$ac_err"; then + rm -rf conftest* + eval "ac_cv_header_$ac_safe=yes" +else + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_header_$ac_safe=no" +fi +rm -f conftest* +fi +if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then + echo "$ac_t""yes" 1>&6 + ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` + cat >> confdefs.h <&6 +fi +done + + ac_safe=`echo "windows.h" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for windows.h""... $ac_c" 1>&6 +echo "configure:9623: 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:9633: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` +if test -z "$ac_err"; then + rm -rf conftest* + eval "ac_cv_header_$ac_safe=yes" +else + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_header_$ac_safe=no" +fi +rm -f conftest* +fi +if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then + echo "$ac_t""yes" 1>&6 + : +else + echo "$ac_t""no" 1>&6 + + { echo "configure: error: please set CFLAGS to contain the location of windows.h" 1>&2; exit 1; } + +fi + + + echo $ac_n "checking if w32api has good enough MSIE support""... $ac_c" 1>&6 +echo "configure:9659: checking if w32api has good enough MSIE support" >&5 +if eval "test \"`echo '$''{'wx_cv_w32api_win32_ie'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + + cat > conftest.$ac_ext < +int main() { + + #define wxCHECK_W32API_VERSION( major, minor ) \ + ( defined( __W32API_MAJOR_VERSION ) && defined( __W32API_MINOR_VERSION ) \ + && ( ( __W32API_MAJOR_VERSION > (major) ) \ + || ( __W32API_MAJOR_VERSION == (major) && __W32API_MINOR_VERSION >= (minor)))) + + #if !wxCHECK_W32API_VERSION(1,1) + #error You need w32api 1.1 or newer + #endif + +; return 0; } +EOF +if { (eval echo configure:9681: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + + wx_cv_w32api_win32_ie=yes + +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + + wx_cv_w32api_win32_ie=no + +fi +rm -f conftest* + +fi + +echo "$ac_t""$wx_cv_w32api_win32_ie" 1>&6 + if test "$wx_cv_w32api_win32_ie" = "yes" ; then + CPPFLAGS="$CPPFLAGS -D_WIN32_IE=0x400" + fi + + LIBS="$LIBS -lwinspool -lwinmm -lshell32 -lcomctl32 -lctl3d32 -ladvapi32 -lwsock32" + + case "${host}" in + *-*-cygwin* ) + LIBS="$LIBS -lkernel32 -luser32 -lgdi32 -lcomdlg32" + TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D__WIN95__" + esac + + if test "$wxUSE_ODBC" = "yes" ; then + LIBS=" -lodbc32 -lole32 -loleaut32$LIBS" + fi + + RESFLAGS="--include-dir \$(top_srcdir)/include --include-dir \$(top_srcdir)/\$(program_dir) --define __WIN32__ --define __WIN95__ --define __GNUWIN32__" + RESPROGRAMOBJ="\$(PROGRAM)_resources.o" +fi + +if test "$wxUSE_GUI" = "yes"; then + USE_GUI=1 + + GUI_TK_LIBRARY= + + WXGTK12= + WXGTK127= + WXGTK20= + + if test "$wxUSE_MSW" = 1 ; then + TOOLKIT=MSW + GUIDIST=MSW_DIST + + case "${host}" in + *-*-mingw32* ) + LDFLAGS="$LDFLAGS -Wl,--subsystem,windows -mwindows" + esac + fi + + if test "$wxUSE_GTK" = 1; then + echo $ac_n "checking for GTK+ version""... $ac_c" 1>&6 +echo "configure:9740: 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 + echo "$ac_t""" 1>&6 wx_cv_lib_gtk= if test "x$wxUSE_GTK2" = "xyes"; then @@ -8591,7 +9798,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:8595: checking for $ac_word" >&5 +echo "configure:9802: 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 @@ -8626,7 +9833,7 @@ fi min_gtk_version=1.3.1 echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6 -echo "configure:8630: checking for GTK - version >= $min_gtk_version" >&5 +echo "configure:9837: checking for GTK - version >= $min_gtk_version" >&5 no_gtk="" if test "$GTK_CONFIG_2_0" = "no" ; then no_gtk=yes @@ -8649,7 +9856,7 @@ echo "configure:8630: checking for GTK - version >= $min_gtk_version" >&5 echo $ac_n "cross compiling; assumed OK... $ac_c" else cat > conftest.$ac_ext < @@ -8727,7 +9934,7 @@ main () } EOF -if { (eval echo configure:8731: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:9938: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -8761,7 +9968,7 @@ fi CFLAGS="$CFLAGS $GTK_CFLAGS" LIBS="$LIBS $GTK_LIBS" cat > conftest.$ac_ext < @@ -8771,7 +9978,7 @@ int main() { return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); ; return 0; } EOF -if { (eval echo configure:8775: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9982: \"$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" @@ -8829,7 +10036,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:8833: checking for $ac_word" >&5 +echo "configure:10040: 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 @@ -8864,7 +10071,7 @@ fi min_gtk_version=1.2.7 echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6 -echo "configure:8868: checking for GTK - version >= $min_gtk_version" >&5 +echo "configure:10075: checking for GTK - version >= $min_gtk_version" >&5 no_gtk="" if test "$GTK_CONFIG" != "no" ; then GTK_CFLAGS=`$GTK_CONFIG --cflags` @@ -8877,7 +10084,7 @@ echo "configure:8868: checking for GTK - version >= $min_gtk_version" >&5 echo $ac_n "cross compiling; assumed OK... $ac_c" else cat > conftest.$ac_ext < @@ -8910,7 +10117,7 @@ main () } EOF -if { (eval echo configure:8914: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:10121: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -8959,7 +10166,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:8963: checking for $ac_word" >&5 +echo "configure:10170: 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 @@ -8994,7 +10201,7 @@ fi min_gtk_version=1.2.3 echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6 -echo "configure:8998: checking for GTK - version >= $min_gtk_version" >&5 +echo "configure:10205: checking for GTK - version >= $min_gtk_version" >&5 no_gtk="" if test "$GTK_CONFIG" != "no" ; then GTK_CFLAGS=`$GTK_CONFIG --cflags` @@ -9007,7 +10214,7 @@ echo "configure:8998: checking for GTK - version >= $min_gtk_version" >&5 echo $ac_n "cross compiling; assumed OK... $ac_c" else cat > conftest.$ac_ext < @@ -9040,7 +10247,7 @@ main () } EOF -if { (eval echo configure:9044: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:10251: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -9090,6 +10297,7 @@ fi 2.0) WXGTK20=1 ;; 1.2.7) WXGTK127=1 + WXGTK12=1 ;; 1.2.3) WXGTK12=1 ;; @@ -9110,7 +10318,7 @@ equivalent variable and GTK+ is version 1.2.3 or above. GUIDIST=GTK_DIST echo $ac_n "checking for gdk_im_open in -lgdk""... $ac_c" 1>&6 -echo "configure:9114: checking for gdk_im_open in -lgdk" >&5 +echo "configure:10322: 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 @@ -9118,7 +10326,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:10341: \"$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 @@ -9157,7 +10365,7 @@ fi if test "$wxUSE_MGL" = 1; then echo $ac_n "checking for SciTech MGL library""... $ac_c" 1>&6 -echo "configure:9161: checking for SciTech MGL library" >&5 +echo "configure:10369: 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; } @@ -9165,24 +10373,26 @@ echo "configure:9161: checking for SciTech MGL library" >&5 echo "$ac_t""$MGL_ROOT" 1>&6 fi - MGL_OS=linux/gcc/glibc - MGL_LIB_TYPE="" + mgl_os=linux/gcc/glibc + mgl_lib_type="" if test "$wxUSE_DEBUG_FLAG" = yes ; then - if test -f $MGL_ROOT/lib/debug/$MGL_OS/libmgl.a ; then - MGL_LIB_TYPE=debug + if test -f $MGL_ROOT/lib/debug/$mgl_os/libmgl.a -o \ + -f $MGL_ROOT/lib/debug/$mgl_os/libmgl.so; then + mgl_lib_type=debug fi fi - if test "x$MGL_LIB_TYPE" = x ; then - if test -f $MGL_ROOT/lib/release/$MGL_OS/libmgl.a ; then - MGL_LIB_TYPE=release + if test "x$mgl_lib_type" = x ; then + if test -f $MGL_ROOT/lib/release/$mgl_os/libmgl.a -o \ + -f $MGL_ROOT/lib/release/$mgl_os/libmgl.so; then + mgl_lib_type=release else { echo "configure: error: Cannot find MGL libraries, make sure they are compiled." 1>&2; exit 1; } fi fi TOOLKIT_INCLUDE="-I$MGL_ROOT/include" - GUI_TK_LIBRARY="-L$MGL_ROOT/lib/$MGL_LIB_TYPE/$MGL_OS -lmgl -lmglcpp -lpm" + GUI_TK_LIBRARY="-L$MGL_ROOT/lib/$mgl_lib_type/$mgl_os -lmgl -lmglcpp -lpm" AFMINSTALL=afminstall TOOLKIT=MGL @@ -9190,34 +10400,51 @@ echo "configure:9161: checking for SciTech MGL library" >&5 fi if test "$wxUSE_WINE" = 1; then - echo $ac_n "checking for WINE includes""... $ac_c" 1>&6 -echo "configure:9195: checking for WINE includes" >&5 - -ac_find_includes= -for ac_dir in $SEARCH_INCLUDE; - do - if test -f "$ac_dir/windows.h"; then - ac_find_includes=$ac_dir - break - fi - done + ac_safe=`echo "windows.h" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for windows.h""... $ac_c" 1>&6 +echo "configure:10406: 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:10416: \"$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 - XPM_LINK="" + + xpm_link= echo $ac_n "checking for Xpm library""... $ac_c" 1>&6 -echo "configure:9216: checking for Xpm library" >&5 +echo "configure:10443: checking for Xpm library" >&5 ac_find_libraries= for ac_dir in $SEARCH_LIB; do - for ac_extension in a so sl; do + for ac_extension in a so sl dylib; do if test -f "$ac_dir/libXpm.$ac_extension"; then ac_find_libraries=$ac_dir break 2 @@ -9227,7 +10454,7 @@ for ac_dir in $SEARCH_LIB; if test "$ac_find_libraries" != "" ; then GUI_TK_LIBRARY="-L$ac_find_libraries" - XPM_LINK="-lXpm" + xpm_link=" -lXpm" cat >> confdefs.h <<\EOF #define wxHAVE_LIB_XPM 1 EOF @@ -9238,14 +10465,14 @@ EOF echo "configure: warning: library will be compiled without support for images in XPM format" 1>&2 fi - MESA_LINK="" + mesa_link= echo $ac_n "checking for Mesa library""... $ac_c" 1>&6 -echo "configure:9244: checking for Mesa library" >&5 +echo "configure:10471: checking for Mesa library" >&5 ac_find_libraries= for ac_dir in $SEARCH_LIB; do - for ac_extension in a so sl; do + for ac_extension in a so sl dylib; do if test -f "$ac_dir/libMesaGL.$ac_extension"; then ac_find_libraries=$ac_dir break 2 @@ -9255,26 +10482,25 @@ for ac_dir in $SEARCH_LIB; if test "$ac_find_libraries" != "" ; then GUI_TK_LIBRARY="$GUI_TK_LIBRARY -L$ac_find_libraries" - MESA_LINK="-lMesaGL" + mesa_link=" -lMesaGL" echo "$ac_t""found at $ac_find_libraries" 1>&6 else { echo "configure: error: no" 1>&2; exit 1; } fi - GUI_TK_LINK="-lwine $MESA_LINK $XPM_LINK -lXxf86dga -lXxf86vm -lSM -lICE -lXext -lXmu -lX11 -lncurses" - GUI_TK_LIBRARY="$GUI_TK_LIBRARY $GUI_TK_LINK" - WXWINE=1 + GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lwine$mesa_link$xpm_link -lXxf86dga -lXxf86vm -lSM -lICE -lXext -lXmu -lX11 -lncurses" TOOLKIT=MSW GUIDIST=MSW_DIST + TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D__WXWINE__" fi - - # If we find X, set shell vars x_includes and x_libraries to the + if test "$wxUSE_MOTIF" = 1; then + # If we find X, set shell vars x_includes and x_libraries to the # paths, otherwise set no_x=yes. # Uses ac_ vars as temps to allow command line to override cache and checks. # --without-x overrides everything else, but does not touch the cache. echo $ac_n "checking for X""... $ac_c" 1>&6 -echo "configure:9278: checking for X" >&5 +echo "configure:10504: checking for X" >&5 # Check whether --with-x or --without-x was given. if test "${with_x+set}" = set; then @@ -9336,12 +10562,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:9345: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10571: \"$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* @@ -9410,14 +10636,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:10647: \"$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. @@ -9523,17 +10749,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:9527: checking whether -R must be followed by a space" >&5 +echo "configure:10753: 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:10763: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_R_nospace=yes else @@ -9549,14 +10775,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:10786: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_R_space=yes else @@ -9588,7 +10814,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:9592: checking for dnet_ntoa in -ldnet" >&5 +echo "configure:10818: 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 @@ -9596,7 +10822,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:10837: \"$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 @@ -9629,7 +10855,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:9633: checking for dnet_ntoa in -ldnet_stub" >&5 +echo "configure:10859: 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 @@ -9637,7 +10863,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:10878: \"$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 @@ -9677,12 +10903,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:9681: checking for gethostbyname" >&5 +echo "configure:10907: 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:10935: \"$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 @@ -9726,7 +10952,7 @@ fi if test $ac_cv_func_gethostbyname = no; then echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 -echo "configure:9730: checking for gethostbyname in -lnsl" >&5 +echo "configure:10956: 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 @@ -9734,7 +10960,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:10975: \"$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 @@ -9775,12 +11001,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:9779: checking for connect" >&5 +echo "configure:11005: 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:11033: \"$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 @@ -9824,7 +11050,7 @@ fi if test $ac_cv_func_connect = no; then echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6 -echo "configure:9828: checking for connect in -lsocket" >&5 +echo "configure:11054: 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 @@ -9832,7 +11058,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:11073: \"$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 @@ -9867,12 +11093,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:9871: checking for remove" >&5 +echo "configure:11097: 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:11125: \"$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 @@ -9916,7 +11142,7 @@ fi if test $ac_cv_func_remove = no; then echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6 -echo "configure:9920: checking for remove in -lposix" >&5 +echo "configure:11146: 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 @@ -9924,7 +11150,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:11165: \"$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 @@ -9959,12 +11185,12 @@ fi # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. echo $ac_n "checking for shmat""... $ac_c" 1>&6 -echo "configure:9963: checking for shmat" >&5 +echo "configure:11189: 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:11217: \"$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 @@ -10008,7 +11234,7 @@ fi if test $ac_cv_func_shmat = no; then echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6 -echo "configure:10012: checking for shmat in -lipc" >&5 +echo "configure:11238: 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 @@ -10016,7 +11242,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:11257: \"$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 @@ -10060,7 +11286,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:10064: checking for IceConnectionNumber in -lICE" >&5 +echo "configure:11290: 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 @@ -10068,7 +11294,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:11309: \"$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 @@ -10103,24 +11329,18 @@ fi fi - CPPFLAGS="$CPPFLAGS $X_CFLAGS" - LDFLAGS="$LDFLAGS $X_LIBS" - if test "$wxUSE_MOTIF" = 1; then if test "$no_x" = "yes"; then { echo "configure: error: X11 not found" 1>&2; exit 1; } fi GUI_TK_LIBRARY="$X_LIBS" TOOLKIT_INCLUDE="$X_CFLAGS" - AFMINSTALL=afminstall - - COMPILED_X_PROGRAM=0 echo $ac_n "checking for Motif/Lesstif headers""... $ac_c" 1>&6 -echo "configure:10124: checking for Motif/Lesstif headers" >&5 +echo "configure:11344: checking for Motif/Lesstif headers" >&5 ac_find_includes= for ac_dir in $SEARCH_INCLUDE; @@ -10135,7 +11355,7 @@ for ac_dir in $SEARCH_INCLUDE; echo "$ac_t""found $ac_find_includes" 1>&6 else cat > conftest.$ac_ext < @@ -10143,12 +11363,11 @@ for ac_dir in $SEARCH_INCLUDE; int main() { int version; - version = xmUseVersion; ; return 0; } EOF -if { (eval echo configure:10152: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:11371: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""found in default search path" 1>&6 @@ -10169,12 +11388,12 @@ rm -f conftest* if test "$COMPILED_X_PROGRAM" = 0; then echo $ac_n "checking for Motif/Lesstif library""... $ac_c" 1>&6 -echo "configure:10173: checking for Motif/Lesstif library" >&5 +echo "configure:11392: checking for Motif/Lesstif library" >&5 ac_find_libraries= for ac_dir in $SEARCH_LIB; do - for ac_extension in a so sl; do + for ac_extension in a so sl dylib; do if test -f "$ac_dir/libXm.$ac_extension"; then ac_find_libraries=$ac_dir break 2 @@ -10208,7 +11427,7 @@ for ac_dir in $SEARCH_LIB; echo "$ac_t""found at $ac_find_libraries" 1>&6 else cat > conftest.$ac_ext < @@ -10216,12 +11435,11 @@ for ac_dir in $SEARCH_LIB; int main() { int version; - version = xmUseVersion; ; return 0; } EOF -if { (eval echo configure:10225: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:11443: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""found in default search path" 1>&6 @@ -10241,15 +11459,14 @@ rm -f conftest* fi fi - - XPM_LINK="" + xpm_link= echo $ac_n "checking for Xpm library""... $ac_c" 1>&6 -echo "configure:10248: checking for Xpm library" >&5 +echo "configure:11465: checking for Xpm library" >&5 ac_find_libraries= for ac_dir in $SEARCH_LIB; do - for ac_extension in a so sl; do + for ac_extension in a so sl dylib; do if test -f "$ac_dir/libXpm.$ac_extension"; then ac_find_libraries=$ac_dir break 2 @@ -10268,7 +11485,7 @@ for ac_dir in $SEARCH_LIB; fi GUI_TK_LIBRARY="$GUI_TK_LIBRARY $ac_path_to_link" - XPM_LINK="-lXpm " + xpm_link=" -lXpm" cat >> confdefs.h <<\EOF #define wxHAVE_LIB_XPM 1 EOF @@ -10276,7 +11493,7 @@ EOF echo "$ac_t""found at $ac_find_libraries" 1>&6 else cat > conftest.$ac_ext < @@ -10284,16 +11501,15 @@ EOF int main() { int version; - version = XpmLibraryVersion(); ; return 0; } EOF -if { (eval echo configure:10293: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:11509: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* - XPM_LINK="-lXpm " - cat >> confdefs.h <<\EOF + xpm_link=" -lXpm" + cat >> confdefs.h <<\EOF #define wxHAVE_LIB_XPM 1 EOF @@ -10313,13 +11529,22 @@ fi rm -f conftest* fi - GUI_TK_LINK="-lXm $XPM_LINK -lXmu -lXext -lXt -lX11" - GUI_TK_LIBRARY="$GUI_TK_LIBRARY $GUI_TK_LINK" + GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lXm$xpm_link -lXmu -lXext -lXt -lX11" + TOOLKIT_VPATH="\${top_srcdir}/src/motif${PATH_IFS}\${top_srcdir}/src/motif/xmcombo" TOOLKIT=MOTIF GUIDIST=MOTIF_DIST fi if test "$wxUSE_MAC" = 1; then + if test "$wxUSE_PRECOMP" = "yes"; then + CPPFLAGS="$CPPFLAGS -cpp-precomp" + fi + CPPFLAGS="$CPPFLAGS -I/Developer/Headers/FlatCarbon -I\${top_srcdir}/src/mac/morefile" + CFLAGS="$CFLAGS -fpascal-strings" + CXXFLAGS="$CXXFLAGS -fpascal-strings" + TOOLCHAIN_DEFS="$TOOLCHAIN_DEFS -DTARGET_CARBON" + + TOOLKIT_VPATH="\${top_srcdir}/src/mac${PATH_IFS}\${top_srcdir}/src/mac/morefile" TOOLKIT=MAC GUIDIST=MACX_DIST fi @@ -10329,42 +11554,20 @@ rm -f conftest* GUIDIST=GTK_DIST fi - if test "$TOOLKIT" != "PM" ; then - TOOLKIT_DIR=`echo ${TOOLKIT} | tr "[A-Z]" "[a-z]"` - else + if test "$TOOLKIT" = "PM" ; then TOOLKIT_DIR="os2" - fi - - TOOLKIT_NAME="${TOOLKIT_DIR}" - - TOOLKIT_VPATH="\${top_srcdir}/src/${TOOLKIT_DIR}" - - if test "$TOOLKIT_NAME" = "motif"; then - TOOLKIT_VPATH="${TOOLKIT_VPATH}${PATH_IFS}\${top_srcdir}/src/motif/xmcombo" - fi - - if test "$wxUSE_UNIVERSAL" = "yes"; then - TOOLKIT_NAME="${TOOLKIT_NAME}univ" - UNIV_VPATH="\${top_srcdir}/src/univ${PATH_IFS}\${top_srcdir}/src/univ/themes" - TOOLKIT_VPATH="${UNIV_VPATH}${PATH_IFS}${TOOLKIT_VPATH}" - SETUPH_DIR="univ" else - SETUPH_DIR="${TOOLKIT_DIR}" + TOOLKIT_DIR=`echo ${TOOLKIT} | tr "[A-Z]" "[a-z]"` fi - if test "$wxUSE_DEBUG_FLAG" = "yes"; then - TOOLKIT_NAME="${TOOLKIT_NAME}d" - fi + PORT_FILES="\${top_srcdir}/src/\$(TOOLKITDIR)/files.lst" - TOOLKIT_DEF="-D__WX${TOOLKIT}__" if test "$wxUSE_UNIVERSAL" = "yes"; then - TOOLKIT_DEF="${TOOLKIT_DEF} -D__WXUNIVERSAL__" - fi - - WX_LIBRARY="wx_${TOOLKIT_NAME}" - - if test "$wxUSE_UNIVERSAL" = "yes"; then ALL_OBJECTS="\$(GUI_LOWLEVEL_OBJS) \${UNIVOBJS}" + PORT_FILES="${PORT_FILES} \${top_srcdir}/src/univ/files.lst" + TOOLKIT_VPATH="\${top_srcdir}/src/univ${PATH_IFS}\${top_srcdir}/src/univ/themes${PATH_IFS}\${top_srcdir}/src/${TOOLKIT_DIR}" + TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D__WXUNIVERSAL__" + WIDGET_SET=univ else ALL_OBJECTS="\$(GUIOBJS)" fi @@ -10379,48 +11582,22 @@ rm -f conftest* ALL_OBJECTS="${ALL_OBJECTS} \$(HTMLOBJS)" fi - if test "$TOOLKIT" != "MSW"; then - if test "$wxUSE_ODBC" = "yes" ; then - ALL_OBJECTS="${ALL_OBJECTS} \$(IODBCOBJS)" - fi + if test "$TOOLKIT" != "MSW" -a "$wxUSE_ODBC" = "yes" ; then + ALL_OBJECTS="${ALL_OBJECTS} \$(IODBCOBJS)" fi - - if test "$wxUSE_LIBJPEG" = "yes" ; then + if test "$wxUSE_LIBJPEG" = "builtin" ; then ALL_OBJECTS="${ALL_OBJECTS} \$(JPEGOBJS)" fi - if test "$wxUSE_LIBTIFF" = "yes" ; then + if test "$wxUSE_LIBTIFF" = "builtin" ; then ALL_OBJECTS="${ALL_OBJECTS} \$(TIFFOBJS)" fi - if test "$wxUSE_LIBPNG" = "yes" ; then + if test "$wxUSE_LIBPNG" = "builtin" ; then ALL_OBJECTS="${ALL_OBJECTS} \$(PNGOBJS)" fi - if test "$wxUSE_ZLIB" = "yes" ; then - ALL_OBJECTS="${ALL_OBJECTS} \$(ZLIBOBJS)" - fi - if test "$wxUSE_FREETYPE" = "yes" ; then + if test "$wxUSE_FREETYPE" = "builtin" ; then ALL_OBJECTS="${ALL_OBJECTS} \$(FREETYPEOBJS)" fi - if test "$wxUSE_UNIVERSAL" = "yes"; then - ALL_DEPFILES="\$(GUI_LOWLEVEL_DEPS) \$(UNIVDEPS)" - else - ALL_DEPFILES="\$(GUIDEPS)" - fi - - ALL_DEPFILES="${ALL_DEPFILES} \$(COMMONDEPS) \$(GENERICDEPS)" - - if test "$TOOLKIT" != "MSW"; then - ALL_DEPFILES="${ALL_DEPFILES} \$(UNIXDEPS)" - fi - - if test "$wxUSE_HTML" = "yes"; then - ALL_DEPFILES="${ALL_DEPFILES} \$(HTMLDEPS)" - fi - - PORT_FILES="src/\$(TOOLKITDIR)/files.lst" - if test "$wxUSE_UNIVERSAL" = "yes"; then - PORT_FILES="${PORT_FILES} \${top_srcdir}/src/univ/files.lst" - fi RPM_FILES="src/\$(TOOLKITDIR)/rpmfiles.lst" RPM_SPEC="wx\$(TOOLKIT).spec" @@ -10429,260 +11606,501 @@ rm -f conftest* else USE_GUI=0 - TOOLKIT_DIR="base" + TOOLKIT_DIR="base" + + if test "$USE_WIN32" = 1 ; then + ALL_OBJECTS="\${BASE_OBJS} \${BASE_MSW_OBJS}" + TOOLKIT_VPATH="\${top_srcdir}/src/msw" - if test "$wxUSE_DEBUG_FLAG" = "yes"; then - TOOLKIT_NAME="${TOOLKIT_DIR}d" + TOOLKIT="MSW" else - TOOLKIT_NAME="${TOOLKIT_DIR}" + ALL_OBJECTS="\${BASE_OBJS} \${BASE_UNIX_OBJS}" + TOOLKIT_VPATH="\${top_srcdir}/src/unix" fi - TOOLKIT_DEF="-D__WXBASE__" + PORT_FILES="\${top_srcdir}/src/files.lst" + RPM_FILES="src/rpmfiles.lst" + RPM_SPEC="wxBase.spec" + + GUIDIST="BASE_DIST" + DISTDIR="wxBase" +fi + +if test "$wxUSE_REGEX" = "builtin" ; then + ALL_OBJECTS="${ALL_OBJECTS} \$(REGEXOBJS)" +fi +if test "$wxUSE_ZLIB" = "builtin" ; then + ALL_OBJECTS="${ALL_OBJECTS} \$(ZLIBOBJS)" +fi + +if test "$wxUSE_OPENGL" = "yes"; then + if test "$wxUSE_MAC" = 1; then + OPENGL_LIBS="-framework OpenGL -framework AGL" + else + + + ac_safe=`echo "GL/gl.h" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for GL/gl.h""... $ac_c" 1>&6 +echo "configure:11645: 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:11655: \"$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 + + echo $ac_n "checking for glFlush in -lGL""... $ac_c" 1>&6 +echo "configure:11673: checking for glFlush in -lGL" >&5 +ac_lib_var=`echo GL'_'glFlush | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + ac_save_LIBS="$LIBS" +LIBS="-lGL -lm $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" +fi +rm -f conftest* +LIBS="$ac_save_LIBS" + +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + + OPENGL_LIBS="-lGL -lGLU" + +else + echo "$ac_t""no" 1>&6 + + echo $ac_n "checking for glFlush in -lMesaGL""... $ac_c" 1>&6 +echo "configure:11714: checking for glFlush in -lMesaGL" >&5 +ac_lib_var=`echo MesaGL'_'glFlush | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + ac_save_LIBS="$LIBS" +LIBS="-lMesaGL -lm $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" +fi +rm -f conftest* +LIBS="$ac_save_LIBS" + +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + + OPENGL_LIBS="-lMesaGL -lMesaGLU" + +else + echo "$ac_t""no" 1>&6 +fi + + +fi + + +else + echo "$ac_t""no" 1>&6 +fi - ALL_OBJECTS="\$(BASE_OBJS) \$(BASE_UNIX_OBJS)" - ALL_DEPFILES="\$(BASE_DEPS) \$(BASE_UNIX_DEPS)" - if test "$wxUSE_ZLIB" = "yes" ; then - ALL_OBJECTS="${ALL_OBJECTS} \$(ZLIBOBJS)" + if test "x$OPENGL_LIBS" = "x"; then + { echo "configure: error: OpenGL libraries not available" 1>&2; exit 1; } fi + fi - WX_LIBRARY="wx_${TOOLKIT_NAME}" + if test "$wxUSE_OPENGL" = "yes"; then + cat >> confdefs.h <<\EOF +#define wxUSE_OPENGL 1 +EOF - PORT_FILES="src/files.lst" - RPM_FILES="src/rpmfiles.lst" - RPM_SPEC="wxBase.spec" + cat >> confdefs.h <<\EOF +#define wxUSE_GLCANVAS 1 +EOF - GUIDIST="BASE_DIST" - DISTDIR="wxBase" + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS opengl" + fi +fi + +if test -z "$TOOLKIT_VPATH" ; then + TOOLKIT_VPATH="\${top_srcdir}/src/${TOOLKIT_DIR}" +fi + +if test -n "$TOOLKIT" ; then + TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D__WX${TOOLKIT}__" +fi + +lib_unicode_suffix= +if test "$wxUSE_UNICODE" = "yes"; then + lib_unicode_suffix=u +fi + +lib_debug_suffix= +if test "$wxUSE_DEBUG_FLAG" = "yes"; then + lib_debug_suffix=d +fi + +TOOLCHAIN_NAME="${TOOLKIT_DIR}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}-${WX_RELEASE}" +TOOLCHAIN_NAME_GL="${TOOLKIT_DIR}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}_gl-${WX_RELEASE}" + +if test "$cross_compiling" = "yes"; then + TOOLCHAIN_NAME="${TOOLCHAIN_NAME}-${host_alias}" + TOOLCHAIN_NAME_GL="${TOOLCHAIN_NAME_GL}-${host_alias}" +fi + +WX_LIBRARY="wx_${TOOLCHAIN_NAME}" +WX_LIBRARY_GL="wx_${TOOLCHAIN_NAME_GL}" + +WX_LIBRARY_NAME_SHARED="lib${WX_LIBRARY}.${SO_SUFFIX}.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}" +WX_LIBRARY_NAME_SHARED_GL="lib${WX_LIBRARY_GL}.${SO_SUFFIX}.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}" + +WX_LIBRARY_LINK1="lib${WX_LIBRARY}.${SO_SUFFIX}.${WX_CURRENT}" +WX_LIBRARY_LINK2="lib${WX_LIBRARY}.${SO_SUFFIX}" +WX_LIBRARY_LINK1_GL="lib${WX_LIBRARY_GL}.${SO_SUFFIX}.${WX_CURRENT}" +WX_LIBRARY_LINK2_GL="lib${WX_LIBRARY_GL}.${SO_SUFFIX}" + +WX_RESOURCES_MACOSX="lib${WX_LIBRARY}.rsrc" +WX_RESOURCES_MACOSX_COMPILED="lib${WX_LIBRARY}.r" + +case "${host}" in + *-*-cygwin* | *-*-mingw32* ) + + + + if test "$cross_compiling" != "yes"; then + WX_LIBRARY="wxmsw${WX_MSW_VERSION}${lib_unicode_suffix}${lib_debug_suffix}" + WX_LIBRARY_GL="wxmsw_gl${WX_MSW_VERSION}${lib_unicode_suffix}${lib_debug_suffix}" + WX_LIBRARY_NAME_SHARED="${WX_LIBRARY}.${SO_SUFFIX}" + WX_LIBRARY_NAME_SHARED_GL="${WX_LIBRARY_GL}.${SO_SUFFIX}" + else + WX_LIBRARY_NAME_SHARED="lib${WX_LIBRARY}.${SO_SUFFIX}" + WX_LIBRARY_NAME_SHARED_GL="lib${WX_LIBRARY_GL}.${SO_SUFFIX}" + fi + +esac + +WX_LIBRARY_NAME_STATIC="lib${WX_LIBRARY}.a" +WX_LIBRARY_NAME_STATIC_GL="lib${WX_LIBRARY_GL}.a" + +WXCONFIG_LIBS="-l${WX_LIBRARY}" + +if test "$wxUSE_OPENGL" = "yes"; then + WXCONFIG_LIBS_GL="-l${WX_LIBRARY_GL} $OPENGL_LIBS" fi -WX_LIBRARY_NAME="lib${WX_LIBRARY}.la" -WX_LIBRARY_NAME_GL="lib${WX_LIBRARY}_gl.la" -WX_LIBRARY_NAME_STATIC="lib${WX_LIBRARY}.a" -WX_LIBRARY_NAME_STATIC_GL="lib${WX_LIBRARY}_gl.a" -WX_LIBRARY_NAME_SHARED="lib${WX_LIBRARY}-${WX_RELEASE}.so.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}" -WX_LIBRARY_NAME_SHARED_GL="lib${WX_LIBRARY}_gl-${WX_RELEASE}.so.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}" +if test "$wxUSE_SHARED" = "yes"; then -WX_LIBRARY_LINK1="lib${WX_LIBRARY}-${WX_RELEASE}.so.${WX_CURRENT}" -WX_LIBRARY_LINK2="lib${WX_LIBRARY}-${WX_RELEASE}.so" -WX_LIBRARY_LINK3="lib${WX_LIBRARY}.so" -WX_LIBRARY_LINK1_GL="lib${WX_LIBRARY}_gl-${WX_RELEASE}.so.${WX_CURRENT}" -WX_LIBRARY_LINK2_GL="lib${WX_LIBRARY}_gl-${WX_RELEASE}.so" -WX_LIBRARY_LINK3_GL="lib${WX_LIBRARY}_gl.so" + if test "$wxUSE_OPENGL" = "yes"; then + WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS CREATE_INSTALLED_LINKS_GL" + WX_ALL="\$(build_libdir)/${WX_LIBRARY_LINK1} \$(build_libdir)/${WX_LIBRARY_LINK1_GL}" + else + WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS" + WX_ALL="\$(build_libdir)/${WX_LIBRARY_LINK1}" + fi -SHARED_LD= -PIC_FLAG= -WX_ALL= -WX_ALL_INSTALLED= -BURNT_LIBRARY_NAME= -WX_TARGET_LIBRARY_SONAME= + if test "$GCC" = "yes"; then + PIC_FLAG="-fPIC" + fi + SHARED_LD="${CXX} -shared -o" -if test "$wxUSE_SHARED" = "yes"; then case "${host}" in *-hp-hpux* ) - if test "$GCC" = yes ; then - SHARED_LD="${CC} -shared -fPIC -o" - PIC_FLAG="-fPIC" - else - LDFLAGS="-L/usr/lib" + if test "$GCC" != "yes"; then + LDFLAGS="$LDFLAGS -L/usr/lib" SHARED_LD="${CXX} -b -o" PIC_FLAG="+Z" fi - WX_LIBRARY_NAME_SHARED="libwx_${TOOLKIT_NAME}.sl" - WX_LIBRARY_NAME_SHARED_GL="libwx_${TOOLKIT_NAME}_gl.sl" - if test "$wxUSE_OPENGL" = "yes"; then + + if test "$wxUSE_OPENGL" = "yes"; then WX_ALL_INSTALLED="preinstall_gl" - WX_ALL="${WX_LIBRARY_NAME_SHARED} ${WX_LIBRARY_NAME_SHARED_GL}" + WX_ALL="\$(build_libdir)/${WX_LIBRARY_NAME_SHARED} \$(build_libdir)/${WX_LIBRARY_NAME_SHARED_GL}" else - WX_ALL="${WX_LIBRARY_NAME_SHARED}" + WX_ALL="\$(build_libdir)/${WX_LIBRARY_NAME_SHARED}" fi ;; - *-*-linux* ) - SHARED_LD="${CC} -shared -o" - PIC_FLAG="-fPIC" - if test "$wxUSE_BURNT_NAME" = "yes" ; then - BURNT_LIBRARY_NAME="-Wl,-soname,${WX_LIBRARY_LINK1}" - BURNT_LIBRARY_NAME_GL="-Wl,-soname,${WX_LIBRARY_LINK1_GL}" - WX_TARGET_LIBRARY_SONAME="-Wl,-soname,\$(TARGETLIB_LINK1)" - fi - if test "$wxUSE_OPENGL" = "yes"; then - WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS CREATE_INSTALLED_LINKS_GL" - WX_ALL="CREATE_LINKS CREATE_LINKS_GL" - else - WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS" - WX_ALL="CREATE_LINKS" - fi - ;; - *-*-irix5* | *-*-irix6* ) - if test "$GCC" = yes ; then - SHARED_LD="${CC} -shared -o" - PIC_FLAG="-fPIC" - else - SHARED_LD="${CXX} -shared -o" + *-*-linux* ) + if test "$GCC" != "yes"; then + echo $ac_n "checking for Intel compiler""... $ac_c" 1>&6 +echo "configure:11886: checking for Intel compiler" >&5 +if eval "test \"`echo '$''{'wx_cv_prog_icc'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + wx_cv_prog_icc=yes +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + wx_cv_prog_icc=no + +fi +rm -f conftest* + +fi + +echo "$ac_t""$wx_cv_prog_icc" 1>&6 + if test "$wx_cv_prog_icc" = "yes"; then + PIC_FLAG="-KPIC" + fi fi - if test "$wxUSE_OPENGL" = "yes"; then - WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS CREATE_INSTALLED_LINKS_GL" - WX_ALL="CREATE_LINKS CREATE_LINKS_GL" - else - WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS" - WX_ALL="CREATE_LINKS" + + if test "$wxUSE_SONAME" = "yes" ; then + SONAME_FLAGS="-Wl,-soname,${WX_LIBRARY_LINK1}" + SONAME_FLAGS_GL="-Wl,-soname,${WX_LIBRARY_LINK1_GL}" + WX_TARGET_LIBRARY_SONAME="-Wl,-soname,\$(TARGETLIB_LINK1)" fi ;; + *-*-solaris2* ) if test "$GCC" = yes ; then - SHARED_LD="${CC} -shared -o" - PIC_FLAG="-fPIC" - CPPFLAGS="$CPPFLAGS -isystem /usr/openwin/include" else SHARED_LD="${CXX} -G -o" PIC_FLAG="-KPIC" - fi - if test "$wxUSE_OPENGL" = "yes"; then - WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS CREATE_INSTALLED_LINKS_GL" - WX_ALL="CREATE_LINKS CREATE_LINKS_GL" - else - WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS" - WX_ALL="CREATE_LINKS" - fi - ;; - *-*-sunos4* ) - SHARED_LD="${CC} -shared -o" - PIC_FLAG="-fPIC" - WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS" - WX_ALL="CREATE_LINKS" - ;; - *-*-freebsd* | *-*-openbsd* | *-*-netbsd* ) - SHARED_LD="${CC} -shared -o" - PIC_FLAG="-fPIC" - if test "$wxUSE_OPENGL" = "yes"; then - WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS CREATE_INSTALLED_LINKS_GL" - WX_ALL="CREATE_LINKS CREATE_LINKS_GL" - else - WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS" - WX_ALL="CREATE_LINKS" + SONAME_FLAGS="-h ${WX_LIBRARY_NAME_SHARED}" + SONAME_FLAGS_GL="-h ${WX_LIBRARY_NAME_SHARED}" fi ;; + *-*-darwin* ) - SHARED_LD="${CXX} -dynamiclib -o" + CFLAGS="$CFLAGS -fno-common" + CXXFLAGS="$CXXFLAGS -fno-common" + SHARED_LD="$CXX -dynamiclib -o" PIC_FLAG="-dynamic -fPIC" - if test "$wxUSE_OPENGL" = "yes"; then - WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS CREATE_INSTALLED_LINKS_GL" - WX_ALL="CREATE_LINKS CREATE_LINKS_GL" - else - WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS" - WX_ALL="CREATE_LINKS" - fi - WX_ALL="${WX_ALL} ./lib/lib${WX_LIBRARY}-${WX_RELEASE}.r" - WX_LIBRARY_NAME_SHARED="lib${WX_LIBRARY}-${WX_RELEASE}.dylib.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}" - WX_LIBRARY_NAME_SHARED_GL="lib${WX_LIBRARY}_gl-${WX_RELEASE}.dylib.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}" - WX_LIBRARY_LINK1="lib${WX_LIBRARY}-${WX_RELEASE}.dylib.${WX_CURRENT}" - WX_LIBRARY_LINK2="lib${WX_LIBRARY}-${WX_RELEASE}.dylib" - WX_LIBRARY_LINK3="lib${WX_LIBRARY}.dylib" - WX_LIBRARY_LINK1_GL="lib${WX_LIBRARY}_gl-${WX_RELEASE}.dylib.${WX_CURRENT}" - WX_LIBRARY_LINK2_GL="lib${WX_LIBRARY}_gl-${WX_RELEASE}.dylib" - WX_LIBRARY_LINK3_GL="lib${WX_LIBRARY}_gl.dylib" - ;; - *-*-osf* ) - SHARED_LD="${CXX} -shared -o" - PIC_FLAG="-fPIC" - WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS" - WX_ALL="CREATE_LINKS" - ;; - *-*-dgux5* ) - SHARED_LD="${CXX} -shared -o" - PIC_FLAG="-fPIC" - WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS" - WX_ALL="CREATE_LINKS" - ;; - *-*-sysv5* ) - SHARED_LD="${CC} -shared -o" - PIC_FLAG="-fPIC" - WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS" - WX_ALL="CREATE_LINKS" ;; + *-*-aix* ) SHARED_LD="/usr/lpp/xlC/bin/makeC++SharedLib -p 0 -o" - WX_ALL=${WX_LIBRARY_NAME_SHARED} - ;; - *-*-cygwin* ) - WX_TARGET_LIBRARY="${WX_LIBRARY_NAME_STATIC}" - WX_TARGET_LIBRARY_GL="${WX_LIBRARY_NAME_STATIC_GL}" - if test "$wxUSE_OPENGL" = "yes"; then - WX_ALL_INSTALLED="preinstall_gl" - WX_ALL="${WX_LIBRARY_NAME_STATIC} ${WX_LIBRARY_NAME_STATIC_GL}" - else - WX_ALL="${WX_LIBRARY_NAME_STATIC}" - fi ;; - *-*-mingw32* ) - WX_TARGET_LIBRARY="${WX_LIBRARY_NAME_STATIC}" - WX_TARGET_LIBRARY_GL="${WX_LIBRARY_NAME_STATIC_GL}" - if test "$wxUSE_OPENGL" = "yes"; then + + *-*-cygwin* | *-*-mingw32* ) + + WX_LIBRARY_IMPORTLIB="${WX_LIBRARY_NAME_SHARED}.a" + + SHARED_LD="${CXX} -shared -Wl,--out-implib,lib/${WX_LIBRARY_IMPORTLIB} -o" + TOOLCHAIN_DLL_DEFS="${TOOLCHAIN_DLL_DEFS} -DWXUSINGDLL=1" + + PIC_FLAG="-UWXUSINGDLL -DWXMAKINGDLL=1 -D_DLL=1 -D_WINDLL=1" + + if test "$wxUSE_OPENGL" = "yes"; then WX_ALL_INSTALLED="preinstall_gl" - WX_ALL="${WX_LIBRARY_NAME_STATIC} ${WX_LIBRARY_NAME_STATIC_GL}" + WX_ALL="\$(build_libdir)/${WX_LIBRARY_NAME_SHARED} \$(build_libdir)/${WX_LIBRARY_NAME_SHARED_GL}" else - WX_ALL="${WX_LIBRARY_NAME_STATIC}" + WX_ALL="\$(build_libdir)/${WX_LIBRARY_NAME_SHARED}" fi ;; - *-pc-os2_emx ) - WX_TARGET_LIBRARY="${WX_LIBRARY_NAME_STATIC}" - WX_ALL="${WX_LIBRARY_NAME_STATIC}" + + *-pc-os2_emx | *-pc-os2-emx ) + wxUSE_SHARED=no ;; + *-*-beos* ) SHARED_LD="${LD} -shared -o" - PIC_FLAG="-fPIC" - WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS" - WX_ALL="CREATE_LINKS" ;; + + *-*-freebsd* | *-*-openbsd* | *-*-netbsd* | \ + *-*-sunos4* | \ + *-*-irix5* | *-*-irix6* | \ + *-*-osf* | \ + *-*-dgux5* | \ + *-*-sysv5* ) + ;; + *) - { echo "configure: error: unknown system type ${host}." 1>&2; exit 1; } + { echo "configure: error: unknown system type $host." 1>&2; exit 1; } esac if test "x$WX_TARGET_LIBRARY" = "x"; then WX_TARGET_LIBRARY="${WX_LIBRARY_NAME_SHARED}" WX_TARGET_LIBRARY_GL="${WX_LIBRARY_NAME_SHARED_GL}" fi + WX_TARGET_LIBRARY_TYPE="so" -else - WX_TARGET_LIBRARY="${WX_LIBRARY_NAME_STATIC}" - WX_TARGET_LIBRARY_GL="${WX_LIBRARY_NAME_STATIC_GL}" +fi + +if test "$wxUSE_SHARED" = "no"; then + + if test "$wxUSE_GUI" = "no" -o "$USE_WIN32" = 1 ; then + WX_ALL_INSTALLED="${WX_ALL_INSTALLED} preinstall" + fi + + if test "$wxUSE_MAC" = 1; then + WX_ALL_INSTALLED="${WX_ALL_INSTALLED} preinstall" + fi if test "$wxUSE_OPENGL" = "yes"; then - WX_ALL_INSTALLED="preinstall_gl" - WX_ALL="${WX_LIBRARY_NAME_STATIC} ${WX_LIBRARY_NAME_STATIC_GL}" + WX_ALL_INSTALLED="${WX_ALL_INSTALLED} preinstall_gl" + WX_ALL="\$(build_libdir)/${WX_LIBRARY_NAME_STATIC} \$(build_libdir)/${WX_LIBRARY_NAME_STATIC_GL}" else - WX_ALL="${WX_LIBRARY_NAME_STATIC}" + WX_ALL="\$(build_libdir)/${WX_LIBRARY_NAME_STATIC}" fi - if test "$wxUSE_GUI" = "no"; then - WX_ALL_INSTALLED="${WX_ALL_INSTALLED} preinstall" - fi + WX_TARGET_LIBRARY="${WX_LIBRARY_NAME_STATIC}" + WX_TARGET_LIBRARY_GL="${WX_LIBRARY_NAME_STATIC_GL}" WX_TARGET_LIBRARY_TYPE="a" fi +if test "$wxUSE_MAC" = 1; then + WX_ALL="${WX_ALL} \$(build_libdir)/lib${WX_LIBRARY}.r" + WX_ALL_INSTALLED="${WX_ALL_INSTALLED} preinstall_res" + # Extract the first word of "Rez", so it can be a program name with args. +set dummy Rez; ac_word=$2 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:12026: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_RESCOMP'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test -n "$RESCOMP"; then + ac_cv_prog_RESCOMP="$RESCOMP" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_RESCOMP="Rez" + break + fi + done + IFS="$ac_save_ifs" + test -z "$ac_cv_prog_RESCOMP" && ac_cv_prog_RESCOMP="/Developer/Tools/Rez" +fi +fi +RESCOMP="$ac_cv_prog_RESCOMP" +if test -n "$RESCOMP"; then + echo "$ac_t""$RESCOMP" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + + # Extract the first word of "Derez", so it can be a program name with args. +set dummy Derez; ac_word=$2 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:12056: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_DEREZ'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test -n "$DEREZ"; then + ac_cv_prog_DEREZ="$DEREZ" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_DEREZ="Derez" + break + fi + done + IFS="$ac_save_ifs" + test -z "$ac_cv_prog_DEREZ" && ac_cv_prog_DEREZ="/Developer/Tools/Derez" +fi +fi +DEREZ="$ac_cv_prog_DEREZ" +if test -n "$DEREZ"; then + echo "$ac_t""$DEREZ" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + + LIBWXMACRES="\$(top_builddir)/lib/lib${WX_LIBRARY}.r" + LIBWXMACRESCOMP="\$(RESCOMP) Carbon.r -t APPL ${LIBWXMACRES} -o \$(BIN_PROGRAM)" + LIBWXMACRESWXCONFIG="${RESCOMP} Carbon.r -t APPL \${prefix}/lib/${WX_RESOURCES_MACOSX_COMPILED} -o" +fi + -for ac_hdr in strings.h +if test "$wxUSE_MAC" != 1; then + 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:10676: checking for $ac_hdr" >&5 +echo "configure:12094: 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:10686: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12104: \"$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* @@ -10708,21 +12126,23 @@ else fi done +fi + 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:10716: checking for $ac_hdr" >&5 +echo "configure:12136: 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:10726: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12146: \"$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* @@ -10752,17 +12172,17 @@ for ac_hdr in unistd.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:10756: checking for $ac_hdr" >&5 +echo "configure:12176: 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:10766: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12186: \"$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* @@ -10792,17 +12212,17 @@ for ac_hdr in wchar.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:10796: checking for $ac_hdr" >&5 +echo "configure:12216: 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:10806: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12226: \"$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* @@ -10832,17 +12252,17 @@ for ac_hdr in wcstr.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:10836: checking for $ac_hdr" >&5 +echo "configure:12256: 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:10846: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12266: \"$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* @@ -10872,17 +12292,17 @@ 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:10876: checking for $ac_hdr" >&5 +echo "configure:12296: 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:10886: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12306: \"$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* @@ -10912,17 +12332,17 @@ 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:10916: checking for $ac_hdr" >&5 +echo "configure:12336: 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:10926: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12346: \"$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* @@ -10952,17 +12372,17 @@ 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:10956: checking for $ac_hdr" >&5 +echo "configure:12376: 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:10966: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12386: \"$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* @@ -10995,17 +12415,17 @@ if test "$wxUSE_GUI" = "yes"; then do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:10999: checking for $ac_hdr" >&5 +echo "configure:12419: 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:11009: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12429: \"$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* @@ -11036,12 +12456,12 @@ fi echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:11040: checking for ANSI C header files" >&5 +echo "configure:12460: 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 @@ -11049,7 +12469,7 @@ else #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:11053: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12473: \"$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* @@ -11066,7 +12486,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 @@ -11084,7 +12504,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 @@ -11105,7 +12525,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -11116,7 +12536,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } EOF -if { (eval echo configure:11120: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:12540: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -11140,12 +12560,12 @@ EOF fi echo $ac_n "checking for mode_t""... $ac_c" 1>&6 -echo "configure:11144: checking for mode_t" >&5 +echo "configure:12564: 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 @@ -11173,12 +12593,12 @@ EOF fi echo $ac_n "checking for off_t""... $ac_c" 1>&6 -echo "configure:11177: checking for off_t" >&5 +echo "configure:12597: 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 @@ -11206,12 +12626,12 @@ EOF fi echo $ac_n "checking for pid_t""... $ac_c" 1>&6 -echo "configure:11210: checking for pid_t" >&5 +echo "configure:12630: 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 @@ -11239,12 +12659,12 @@ EOF fi echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:11243: checking for size_t" >&5 +echo "configure:12663: 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 @@ -11272,12 +12692,12 @@ EOF fi echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6 -echo "configure:11276: checking for uid_t in sys/types.h" >&5 +echo "configure:12696: 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 @@ -11307,15 +12727,22 @@ fi echo $ac_n "checking for wchar_t""... $ac_c" 1>&6 -echo "configure:11311: checking for wchar_t" >&5 +echo "configure:12731: 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 < + + #ifdef HAVE_WCHAR_H + # include + #endif + #ifdef HAVE_STDLIB_H + # include + #endif + int main() { wchar_t wc, *ws; @@ -11324,26 +12751,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:11328: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - wx_cv_type_wchar_t=yes -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - cat > conftest.$ac_ext < -int main() { - - wchar_t wc, *ws; - wc = L'a'; - ws = L"Hello, world!"; - -; return 0; } -EOF -if { (eval echo configure:11347: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:12755: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_type_wchar_t=yes else @@ -11351,8 +12759,6 @@ else cat conftest.$ac_ext >&5 rm -rf conftest* wx_cv_type_wchar_t=no -fi -rm -f conftest* fi rm -f conftest* @@ -11377,12 +12783,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:11381: checking if size_t is unsigned int" >&5 +echo "configure:12787: 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() { @@ -11395,7 +12801,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:11399: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:12805: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_size_t_is_uint=no else @@ -11418,12 +12824,12 @@ EOF else echo $ac_n "checking if size_t is unsigned long""... $ac_c" 1>&6 -echo "configure:11422: checking if size_t is unsigned long" >&5 +echo "configure:12828: 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() { @@ -11436,7 +12842,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:11440: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:12846: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_size_t_is_ulong=no else @@ -11470,13 +12876,13 @@ cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking for pw_gecos in struct passwd""... $ac_c" 1>&6 -echo "configure:11474: checking for pw_gecos in struct passwd" >&5 +echo "configure:12880: 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() { @@ -11487,7 +12893,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:11491: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:12897: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_struct_pw_gecos=yes @@ -11517,12 +12923,12 @@ fi echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:11521: checking for working const" >&5 +echo "configure:12927: 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:12981: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -11592,21 +12998,21 @@ EOF fi echo $ac_n "checking for inline""... $ac_c" 1>&6 -echo "configure:11596: checking for inline" >&5 +echo "configure:13002: 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:13016: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_inline=$ac_kw; break else @@ -11633,7 +13039,7 @@ esac echo $ac_n "checking size of char""... $ac_c" 1>&6 -echo "configure:11637: checking size of char" >&5 +echo "configure:13043: 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 @@ -11641,9 +13047,10 @@ else ac_cv_sizeof_char=1 else cat > conftest.$ac_ext < +#include main() { FILE *f=fopen("conftestval", "w"); @@ -11652,7 +13059,7 @@ main() exit(0); } EOF -if { (eval echo configure:11656: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:13063: \"$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 @@ -11672,7 +13079,7 @@ EOF echo $ac_n "checking size of short""... $ac_c" 1>&6 -echo "configure:11676: checking size of short" >&5 +echo "configure:13083: 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 @@ -11680,9 +13087,10 @@ else ac_cv_sizeof_short=2 else cat > conftest.$ac_ext < +#include main() { FILE *f=fopen("conftestval", "w"); @@ -11691,7 +13099,7 @@ main() exit(0); } EOF -if { (eval echo configure:11695: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:13103: \"$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 @@ -11711,7 +13119,7 @@ EOF echo $ac_n "checking size of int *""... $ac_c" 1>&6 -echo "configure:11715: checking size of int *" >&5 +echo "configure:13123: 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 @@ -11719,9 +13127,10 @@ else ac_cv_sizeof_int_p=4 else cat > conftest.$ac_ext < +#include main() { FILE *f=fopen("conftestval", "w"); @@ -11730,7 +13139,7 @@ main() exit(0); } EOF -if { (eval echo configure:11734: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:13143: \"$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 @@ -11750,7 +13159,7 @@ EOF echo $ac_n "checking size of int""... $ac_c" 1>&6 -echo "configure:11754: checking size of int" >&5 +echo "configure:13163: 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 @@ -11758,9 +13167,10 @@ else ac_cv_sizeof_int=4 else cat > conftest.$ac_ext < +#include main() { FILE *f=fopen("conftestval", "w"); @@ -11769,7 +13179,7 @@ main() exit(0); } EOF -if { (eval echo configure:11773: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:13183: \"$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 @@ -11789,7 +13199,7 @@ EOF echo $ac_n "checking size of long""... $ac_c" 1>&6 -echo "configure:11793: checking size of long" >&5 +echo "configure:13203: 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 @@ -11797,9 +13207,10 @@ else ac_cv_sizeof_long=4 else cat > conftest.$ac_ext < +#include main() { FILE *f=fopen("conftestval", "w"); @@ -11808,7 +13219,7 @@ main() exit(0); } EOF -if { (eval echo configure:11812: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:13223: \"$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 @@ -11828,7 +13239,7 @@ EOF echo $ac_n "checking size of long long""... $ac_c" 1>&6 -echo "configure:11832: checking size of long long" >&5 +echo "configure:13243: 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 @@ -11836,9 +13247,10 @@ else ac_cv_sizeof_long_long=0 else cat > conftest.$ac_ext < +#include main() { FILE *f=fopen("conftestval", "w"); @@ -11847,7 +13259,7 @@ main() exit(0); } EOF -if { (eval echo configure:11851: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:13263: \"$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 @@ -11868,7 +13280,7 @@ EOF echo $ac_n "checking size of wchar_t""... $ac_c" 1>&6 -echo "configure:11872: checking size of wchar_t" >&5 +echo "configure:13284: 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 @@ -11878,7 +13290,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:13313: \"$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 @@ -11920,14 +13332,14 @@ EOF echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6 -echo "configure:11924: checking whether byte ordering is bigendian" >&5 +echo "configure:13336: 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 @@ -11938,11 +13350,11 @@ int main() { #endif ; return 0; } EOF -if { (eval echo configure:11942: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:13354: \"$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 @@ -11953,7 +13365,7 @@ int main() { #endif ; return 0; } EOF -if { (eval echo configure:11957: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:13369: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_bigendian=yes else @@ -11973,7 +13385,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:13402: \"$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 @@ -12013,6 +13425,49 @@ EOF fi +echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6 +echo "configure:13430: checking how to run the C++ preprocessor" >&5 +if test -z "$CXXCPP"; then +if eval "test \"`echo '$''{'ac_cv_prog_CXXCPP'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + ac_ext=C +# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' +ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' +cross_compiling=$ac_cv_prog_cxx_cross + CXXCPP="${CXX-g++} -E" + cat > conftest.$ac_ext < +EOF +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (eval echo configure:13448: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` +if test -z "$ac_err"; then + : +else + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + CXXCPP=/lib/cpp +fi +rm -f conftest* + ac_cv_prog_CXXCPP="$CXXCPP" +ac_ext=C +# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' +ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' +cross_compiling=$ac_cv_prog_cxx_cross +fi +fi +CXXCPP="$ac_cv_prog_CXXCPP" +echo "$ac_t""$CXXCPP" 1>&6 + if test "$cross_compiling" = "yes"; then cat >> confdefs.h <<\EOF @@ -12033,17 +13488,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:12037: checking for $ac_hdr" >&5 +echo "configure:13492: 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:12047: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:13502: \"$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* @@ -12091,7 +13546,7 @@ cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking if C++ compiler supports bool""... $ac_c" 1>&6 -echo "configure:12095: checking if C++ compiler supports bool" >&5 +echo "configure:13550: 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 @@ -12106,7 +13561,7 @@ cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:13577: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_cpp_bool=yes @@ -12155,16 +13610,61 @@ EOF -echo $ac_n "checking for wcslen in -lc""... $ac_c" 1>&6 -echo "configure:12160: checking for wcslen in -lc" >&5 -ac_lib_var=`echo c'_'wcslen | sed 'y%./+-%__p_%'` +echo $ac_n "checking for wcslen in -lc""... $ac_c" 1>&6 +echo "configure:13615: checking for wcslen in -lc" >&5 +ac_lib_var=`echo c'_'wcslen | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + ac_save_LIBS="$LIBS" +LIBS="-lc $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" +fi +rm -f conftest* +LIBS="$ac_save_LIBS" + +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + + cat >> confdefs.h <<\EOF +#define HAVE_WCSLEN 1 +EOF + + WCHAR_LINK= + +else + echo "$ac_t""no" 1>&6 + + echo $ac_n "checking for wcslen in -lw""... $ac_c" 1>&6 +echo "configure:13660: checking for wcslen in -lw" >&5 +ac_lib_var=`echo w'_'wcslen | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" -LIBS="-lc $LIBS" +LIBS="-lw $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13679: \"$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 @@ -12191,25 +13691,25 @@ fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 - cat >> confdefs.h <<\EOF + cat >> confdefs.h <<\EOF #define HAVE_WCSLEN 1 EOF - WCHAR_LINK="" - + WCHAR_LINK=" -lw" + else echo "$ac_t""no" 1>&6 - echo $ac_n "checking for wcslen in -lw""... $ac_c" 1>&6 -echo "configure:12205: checking for wcslen in -lw" >&5 -ac_lib_var=`echo w'_'wcslen | sed 'y%./+-%__p_%'` + echo $ac_n "checking for wcslen in -lmsvcrt""... $ac_c" 1>&6 +echo "configure:13705: checking for wcslen in -lmsvcrt" >&5 +ac_lib_var=`echo msvcrt'_'wcslen | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" -LIBS="-lw $LIBS" +LIBS="-lmsvcrt $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13724: \"$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 @@ -12236,27 +13736,86 @@ fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 - cat >> confdefs.h <<\EOF + cat >> confdefs.h <<\EOF #define HAVE_WCSLEN 1 EOF - WCHAR_LINK="-lw" - + WCHAR_LINK= + else echo "$ac_t""no" 1>&6 fi + +fi + fi +for ac_func in wcsrtombs +do +echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +echo "configure:13760: 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:13788: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_$ac_func=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_func_$ac_func=no" +fi +rm -f conftest* +fi + +if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then + echo "$ac_t""yes" 1>&6 + ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` + cat >> confdefs.h <&6 +fi +done + + echo $ac_n "checking for vprintf""... $ac_c" 1>&6 -echo "configure:12255: checking for vprintf" >&5 +echo "configure:13814: 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:13842: \"$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 @@ -12303,12 +13862,12 @@ fi if test "$ac_cv_func_vprintf" != yes; then echo $ac_n "checking for _doprnt""... $ac_c" 1>&6 -echo "configure:12307: checking for _doprnt" >&5 +echo "configure:13866: 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:13894: \"$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 @@ -12360,15 +13919,14 @@ fi - echo $ac_n "checking for vsnprintf""... $ac_c" 1>&6 -echo "configure:12366: checking for vsnprintf" >&5 +echo "configure:13924: 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 < @@ -12393,7 +13951,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:12397: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:13955: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_func_vsnprintf=yes @@ -12404,7 +13962,7 @@ else rm -rf conftest* cat > conftest.$ac_ext < @@ -12429,7 +13987,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:12433: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:13991: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_func_vsnprintf=yes @@ -12461,13 +14019,13 @@ else fi echo $ac_n "checking for vsscanf""... $ac_c" 1>&6 -echo "configure:12465: checking for vsscanf" >&5 +echo "configure:14023: 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 < @@ -12490,7 +14048,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:12494: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:14052: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_func_vsscanf=yes @@ -12528,13 +14086,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:12532: checking if iconv() takes char**" >&5 +echo "configure:14090: 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() { @@ -12546,7 +14104,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:12550: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:14108: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_iconv_takes_char=yes else @@ -12579,12 +14137,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:12583: checking for $ac_func" >&5 +echo "configure:14141: 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:14169: \"$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 @@ -12648,13 +14206,13 @@ cross_compiling=$ac_cv_prog_cxx_cross echo $ac_n "checking for sa_handler type""... $ac_c" 1>&6 -echo "configure:12652: checking for sa_handler type" >&5 +echo "configure:14210: 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() { @@ -12666,7 +14224,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:12670: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:14228: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_type_sa_handler=int @@ -12680,210 +14238,35 @@ else fi rm -f conftest* - -fi - -echo "$ac_t""$wx_cv_type_sa_handler" 1>&6 - - ac_ext=c -# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -ac_cpp='$CPP $CPPFLAGS' -ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -cross_compiling=$ac_cv_prog_cc_cross - - - cat >> confdefs.h <&6 -echo "configure:12707: 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:12735: \"$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 - - -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:12764: 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:12792: \"$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 - - - if test "$ac_cv_func_fcntl" != "yes" -a "$ac_cv_func_flock" != "yes"; then - echo "configure: warning: wxSingleInstanceChecker not available" 1>&2 - wxUSE_SNGLINST_CHECKER=no - fi -fi - -for ac_func in timegm -do -echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:12826: 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:12854: \"$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 + + ac_ext=c +# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. +ac_cpp='$CPP $CPPFLAGS' +ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' +ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' +cross_compiling=$ac_cv_prog_cc_cross + + + cat >> confdefs.h <&6 -fi -done + fi +fi -for ac_func in putenv setenv +for ac_func in vfork do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:12882: checking for $ac_func" >&5 +echo "configure:14265: 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:14293: \"$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 @@ -12924,141 +14307,128 @@ if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then cat >> confdefs.h <&6 fi done -HAVE_SOME_SLEEP_FUNC=0 -if test "$USE_BEOS" = 1; then - cat >> confdefs.h <<\EOF -#define HAVE_SLEEP 1 -EOF - - HAVE_SOME_SLEEP_FUNC=1 -fi - -if test "$USE_MAC" = 1; then - cat >> confdefs.h <<\EOF -#define HAVE_USLEEP 1 -EOF - - HAVE_SOME_SLEEP_FUNC=1 -fi - -if test "$HAVE_SOME_SLEEP_FUNC" != 1; then - POSIX4_LINK= - for ac_func in nanosleep -do -echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:12957: checking for $ac_func" >&5 -if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then +echo $ac_n "checking for statfs""... $ac_c" 1>&6 +echo "configure:14319: checking for statfs" >&5 +if eval "test \"`echo '$''{'wx_cv_func_statfs'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < -/* Override any gcc2 internal prototype to avoid an error. */ -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char $ac_func(); + #if defined(__BSD__) + #include + #include + #else + #include + #endif + 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 - + long l; + struct statfs fs; + statfs("/", &fs); + l = fs.f_bsize; + l += fs.f_blocks; + l += fs.f_bavail; + ; return 0; } EOF -if { (eval echo configure:12985: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14345: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" + + wx_cv_func_statfs=yes + else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* - eval "ac_cv_func_$ac_func=no" + + wx_cv_func_statfs=no + + fi rm -f conftest* + fi -if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` - cat >> confdefs.h <> confdefs.h <<\EOF -#define HAVE_NANOSLEEP 1 +echo "$ac_t""$wx_cv_func_statfs" 1>&6 + +if test "$wx_cv_func_statfs" = "yes"; then + cat >> confdefs.h <<\EOF +#define HAVE_STATFS 1 EOF else - echo "$ac_t""no" 1>&6 -echo $ac_n "checking for nanosleep in -lposix4""... $ac_c" 1>&6 -echo "configure:13010: 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 "checking for statvfs""... $ac_c" 1>&6 +echo "configure:14372: checking for statvfs" >&5 +if eval "test \"`echo '$''{'wx_cv_func_statvfs'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - ac_save_LIBS="$LIBS" -LIBS="-lposix4 $LIBS" -cat > conftest.$ac_ext < conftest.$ac_ext < + int main() { -nanosleep() + + long l; + struct statvfs fs; + statvfs("/", &fs); + l = fs.f_bsize; + l += fs.f_blocks; + l += fs.f_bavail; + ; return 0; } EOF -if { (eval echo configure:13029: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14393: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" + + wx_cv_func_statvfs=yes + else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" + + wx_cv_func_statvfs=no + + fi rm -f conftest* -LIBS="$ac_save_LIBS" - + fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - - cat >> confdefs.h <<\EOF -#define HAVE_NANOSLEEP 1 + +echo "$ac_t""$wx_cv_func_statvfs" 1>&6 + + if test "$wx_cv_func_statvfs" = "yes"; then + cat >> confdefs.h <<\EOF +#define HAVE_STATVFS 1 EOF - POSIX4_LINK="-lposix4" - -else - echo "$ac_t""no" 1>&6 + else + echo "configure: warning: wxGetDiskSpace() function won't work without statfs()" 1>&2 + fi +fi - for ac_func in usleep +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:13057: checking for $ac_func" >&5 +echo "configure:14427: 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:14455: \"$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 @@ -13099,37 +14469,28 @@ if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then cat >> confdefs.h <> confdefs.h <<\EOF -#define HAVE_USLEEP 1 -EOF - + break else echo "$ac_t""no" 1>&6 -echo "configure: warning: wxSleep() function will not work" 1>&2 - fi done - - -fi - - - -fi -done + if test "$ac_cv_func_fcntl" != "yes" -a "$ac_cv_func_flock" != "yes"; then + echo "configure: warning: wxSingleInstanceChecker not available" 1>&2 + wxUSE_SNGLINST_CHECKER=no + fi fi -for ac_func in uname gethostname +for ac_func in timegm do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:13128: checking for $ac_func" >&5 +echo "configure:14489: 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:14517: \"$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 @@ -13170,39 +14531,27 @@ if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then cat >> confdefs.h <&6 fi done - -ac_ext=C -# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -cross_compiling=$ac_cv_prog_cxx_cross - - -for ac_func in strtok_r +for ac_func in putenv setenv do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:13193: checking for $ac_func" >&5 +echo "configure:14545: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < /* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char $ac_func(); @@ -13220,7 +14569,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:13224: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14573: \"$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 @@ -13238,31 +14587,41 @@ if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then cat >> confdefs.h <&6 fi done -ac_ext=c -# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -ac_cpp='$CPP $CPPFLAGS' -ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -cross_compiling=$ac_cv_prog_cc_cross +HAVE_SOME_SLEEP_FUNC=0 +if test "$USE_BEOS" = 1; then + cat >> confdefs.h <<\EOF +#define HAVE_SLEEP 1 +EOF + HAVE_SOME_SLEEP_FUNC=1 +fi -INET_LINK= -for ac_func in inet_addr +if test "$USE_DARWIN" = 1; then + cat >> confdefs.h <<\EOF +#define HAVE_USLEEP 1 +EOF + + HAVE_SOME_SLEEP_FUNC=1 +fi + +if test "$HAVE_SOME_SLEEP_FUNC" != 1; then + POSIX4_LINK= + for ac_func in nanosleep do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:13261: checking for $ac_func" >&5 +echo "configure:14620: 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:14648: \"$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 @@ -13304,32 +14663,32 @@ if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then #define $ac_tr_func 1 EOF cat >> confdefs.h <<\EOF -#define HAVE_INET_ADDR 1 +#define HAVE_NANOSLEEP 1 EOF else echo "$ac_t""no" 1>&6 -echo $ac_n "checking for inet_addr in -lnsl""... $ac_c" 1>&6 -echo "configure:13314: checking for inet_addr in -lnsl" >&5 -ac_lib_var=`echo nsl'_'inet_addr | sed 'y%./+-%__p_%'` +echo $ac_n "checking for nanosleep in -lposix4""... $ac_c" 1>&6 +echo "configure:14673: checking for nanosleep in -lposix4" >&5 +ac_lib_var=`echo posix4'_'nanosleep | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" -LIBS="-lnsl $LIBS" +LIBS="-lposix4 $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14692: \"$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 @@ -13344,68 +14703,96 @@ LIBS="$ac_save_LIBS" fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 - INET_LINK="nsl" + + cat >> confdefs.h <<\EOF +#define HAVE_NANOSLEEP 1 +EOF + + POSIX4_LINK=" -lposix4" + else echo "$ac_t""no" 1>&6 -echo $ac_n "checking for inet_addr in -lresolv""... $ac_c" 1>&6 -echo "configure:13352: 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 + + for ac_func in usleep +do +echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +echo "configure:14720: checking for $ac_func" >&5 +if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - ac_save_LIBS="$LIBS" -LIBS="-lresolv $LIBS" -cat > conftest.$ac_ext < 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 inet_addr(); +char $ac_func(); int main() { -inet_addr() + +/* 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:13371: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14748: \"$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" + 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_lib_$ac_lib_var=no" + eval "ac_cv_func_$ac_func=no" fi rm -f conftest* -LIBS="$ac_save_LIBS" - fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + +if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then echo "$ac_t""yes" 1>&6 - INET_LINK="resolv" - + ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` + cat >> confdefs.h <> confdefs.h <<\EOF +#define HAVE_USLEEP 1 +EOF + else echo "$ac_t""no" 1>&6 +echo "configure: warning: wxSleep() function will not work" 1>&2 + fi +done - + + fi + - fi done +fi -for ac_func in inet_aton +for ac_func in uname gethostname do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:13404: checking for $ac_func" >&5 +echo "configure:14791: 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:14819: \"$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 @@ -13446,286 +14833,99 @@ if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then cat >> confdefs.h <> confdefs.h <<\EOF -#define HAVE_INET_ATON 1 -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:13457: checking for inet_aton in -l$INET_LINK" >&5 -ac_lib_var=`echo $INET_LINK'_'inet_aton | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - ac_save_LIBS="$LIBS" -LIBS="-l$INET_LINK $LIBS" -cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" - -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - cat >> confdefs.h <<\EOF -#define HAVE_INET_ATON 1 -EOF - + break else echo "$ac_t""no" 1>&6 fi - - -fi done -if test "x$INET_LINK" != "x"; then - cat >> confdefs.h <<\EOF -#define HAVE_INET_ADDR 1 -EOF - - INET_LINK="-l$INET_LINK" -fi - -fi - - -cat > confcache <<\EOF -# This file is a shell script that caches the results of configure -# tests run on this system so they can be shared between configure -# scripts and configure runs. It is not useful on other systems. -# If it contains results you don't want to keep, you may remove or edit it. -# -# By default, configure uses ./config.cache as the cache file, -# creating it if it does not exist already. You can give configure -# the --cache-file=FILE option to use a different cache file; that is -# what configure does when it calls configure scripts in -# subdirectories, so they share the cache. -# Giving --cache-file=/dev/null disables caching, for debugging configure. -# config.status only pays attention to the cache file if you give it the -# --recheck option to rerun configure. -# -EOF -# The following way of writing the cache mishandles newlines in values, -# but we know of no workaround that is simple, portable, and efficient. -# So, don't put newlines in cache variables' values. -# Ultrix sh set writes to stderr and can't be redirected directly, -# and sets the high bit in the cache file unless we assign to the vars. -(set) 2>&1 | - case `(ac_space=' '; set | grep ac_space) 2>&1` in - *ac_space=\ *) - # `set' does not quote correctly, so add quotes (double-quote substitution - # turns \\\\ into \\, and sed turns \\ into \). - sed -n \ - -e "s/'/'\\\\''/g" \ - -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p" - ;; - *) - # `set' quotes correctly as required by POSIX, so do not add quotes. - sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p' - ;; - esac >> confcache -if cmp -s $cache_file confcache; then - : -else - if test -w $cache_file; then - echo "updating cache $cache_file" - cat confcache > $cache_file - else - echo "not updating unwritable cache $cache_file" - fi -fi -rm -f confcache - - -if test "$TOOLKIT" != "MSW"; then - - -THREADS_LINK="" -THREADS_OBJ="" - -if test "$wxUSE_THREADS" = "yes" ; then - if test "$wxUSE_WINE" = 1 ; then - echo "configure: warning: Threads are not supported under WINE" 1>&2 - wxUSE_THREADS="no" - elif test "$USE_BEOS" = 1; then - echo "configure: warning: BeOS threads are not yet supported" 1>&2 - wxUSE_THREADS="no" - fi -fi +ac_ext=C +# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' +ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' +cross_compiling=$ac_cv_prog_cxx_cross -if test "$wxUSE_THREADS" = "yes" ; then - - if test "$USE_AIX" = 1; then - THREADS_LIB=pthreads - else - THREADS_LIB=pthread - fi - echo $ac_n "checking for pthread_create in -l$THREADS_LIB""... $ac_c" 1>&6 -echo "configure:13589: 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 +for ac_func in strtok_r +do +echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +echo "configure:14856: checking for $ac_func" >&5 +if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - ac_save_LIBS="$LIBS" -LIBS="-l$THREADS_LIB $LIBS" -cat > conftest.$ac_ext < conftest.$ac_ext < /* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char pthread_create(); +char $ac_func(); int main() { -pthread_create() -; return 0; } -EOF -if { (eval echo configure:13608: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" - -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - - THREADS_OBJ="threadpsx.lo" - THREADS_LINK=$THREADS_LIB - -else - echo "$ac_t""no" 1>&6 - echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6 -echo "configure:13631: checking for pthread_create in -lc_r" >&5 -ac_lib_var=`echo c_r'_'pthread_create | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - ac_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:14887: \"$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" + 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_lib_$ac_lib_var=no" + eval "ac_cv_func_$ac_func=no" fi rm -f conftest* -LIBS="$ac_save_LIBS" - fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - - THREADS_OBJ="threadpsx.lo" - THREADS_LINK="c_r" - -else - echo "$ac_t""no" 1>&6 - ac_safe=`echo "sys/prctl.h" | sed 'y%./+-%__p_%'` -echo $ac_n "checking for sys/prctl.h""... $ac_c" 1>&6 -echo "configure:13674: 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:13684: \"$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 +if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then echo "$ac_t""yes" 1>&6 - - THREADS_OBJ="threadsgi.lo" - + ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` + cat >> confdefs.h <&6 fi +done - -fi - - -fi +ac_ext=c +# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. +ac_cpp='$CPP $CPPFLAGS' +ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' +ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' +cross_compiling=$ac_cv_prog_cc_cross - if test -z "$THREADS_OBJ" ; then - wxUSE_THREADS=no - echo "configure: warning: No thread support on this system" 1>&2 - fi -fi -if test "$wxUSE_THREADS" = "yes" ; then - for ac_func in thr_setconcurrency +INET_LINK= +for ac_func in inet_addr do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:13724: checking for $ac_func" >&5 +echo "configure:14924: 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:14952: \"$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 @@ -13766,76 +14966,33 @@ if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then cat >> confdefs.h <&6 -fi -done - - - - for ac_hdr in sched.h -do -ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` -echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:13782: 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:13792: \"$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 <> confdefs.h <<\EOF +#define HAVE_INET_ADDR 1 EOF - + else echo "$ac_t""no" 1>&6 -fi -done - - - echo $ac_n "checking for sched_yield in -l$THREADS_LINK""... $ac_c" 1>&6 -echo "configure:13820: checking for sched_yield in -l$THREADS_LINK" >&5 -ac_lib_var=`echo $THREADS_LINK'_'sched_yield | sed 'y%./+-%__p_%'` +echo $ac_n "checking for inet_addr in -lnsl""... $ac_c" 1>&6 +echo "configure:14977: checking for inet_addr in -lnsl" >&5 +ac_lib_var=`echo nsl'_'inet_addr | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" -LIBS="-l$THREADS_LINK $LIBS" +LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14996: \"$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 @@ -13850,33 +15007,30 @@ LIBS="$ac_save_LIBS" fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 - cat >> confdefs.h <<\EOF -#define HAVE_SCHED_YIELD 1 -EOF - + INET_LINK="nsl" else echo "$ac_t""no" 1>&6 -echo $ac_n "checking for sched_yield in -lposix4""... $ac_c" 1>&6 -echo "configure:13861: checking for sched_yield in -lposix4" >&5 -ac_lib_var=`echo posix4'_'sched_yield | sed 'y%./+-%__p_%'` +echo $ac_n "checking for inet_addr in -lresolv""... $ac_c" 1>&6 +echo "configure:15015: checking for inet_addr in -lresolv" >&5 +ac_lib_var=`echo resolv'_'inet_addr | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" -LIBS="-lposix4 $LIBS" +LIBS="-lresolv $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15034: \"$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 @@ -13891,150 +15045,97 @@ LIBS="$ac_save_LIBS" fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 - cat >> confdefs.h <<\EOF -#define HAVE_SCHED_YIELD 1 -EOF - POSIX4_LINK="-lposix4" + INET_LINK="resolv" + else echo "$ac_t""no" 1>&6 -echo "configure: warning: wxThread::Yield will not work properly" 1>&2 - fi - + fi + - HAVE_PRIOR_FUNCS=0 - echo $ac_n "checking for pthread_attr_getschedpolicy in -l$THREADS_LINK""... $ac_c" 1>&6 -echo "configure:13911: checking for pthread_attr_getschedpolicy in -l$THREADS_LINK" >&5 -ac_lib_var=`echo $THREADS_LINK'_'pthread_attr_getschedpolicy | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - ac_save_LIBS="$LIBS" -LIBS="-l$THREADS_LINK $LIBS" -cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" fi -rm -f conftest* -LIBS="$ac_save_LIBS" +done -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:13946: 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 + +for ac_func in inet_aton +do +echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +echo "configure:15067: checking for $ac_func" >&5 +if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - ac_save_LIBS="$LIBS" -LIBS="-l$THREADS_LINK $LIBS" -cat > conftest.$ac_ext < 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 pthread_attr_setschedparam(); +char $ac_func(); int main() { -pthread_attr_setschedparam() -; return 0; } -EOF -if { (eval echo configure:13965: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - echo $ac_n "checking for sched_get_priority_max in -l$THREADS_LINK""... $ac_c" 1>&6 -echo "configure:13981: checking for sched_get_priority_max in -l$THREADS_LINK" >&5 -ac_lib_var=`echo $THREADS_LINK'_'sched_get_priority_max | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - ac_save_LIBS="$LIBS" -LIBS="-l$THREADS_LINK $LIBS" -cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15095: \"$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" + 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_lib_$ac_lib_var=no" + eval "ac_cv_func_$ac_func=no" fi rm -f conftest* -LIBS="$ac_save_LIBS" - fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + +if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then echo "$ac_t""yes" 1>&6 - HAVE_PRIOR_FUNCS=1 + ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` + cat >> confdefs.h <> confdefs.h <<\EOF +#define HAVE_INET_ATON 1 +EOF + else echo "$ac_t""no" 1>&6 -echo $ac_n "checking for sched_get_priority_max in -lposix4""... $ac_c" 1>&6 -echo "configure:14019: checking for sched_get_priority_max in -lposix4" >&5 -ac_lib_var=`echo posix4'_'sched_get_priority_max | sed 'y%./+-%__p_%'` + echo $ac_n "checking for inet_aton in -l$INET_LINK""... $ac_c" 1>&6 +echo "configure:15120: checking for inet_aton in -l$INET_LINK" >&5 +ac_lib_var=`echo $INET_LINK'_'inet_aton | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" -LIBS="-lposix4 $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:15139: \"$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 @@ -14049,58 +15150,126 @@ LIBS="$ac_save_LIBS" fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 - - HAVE_PRIOR_FUNCS=1 - POSIX4_LINK="-lposix4" - + cat >> confdefs.h <<\EOF +#define HAVE_INET_ATON 1 +EOF + else echo "$ac_t""no" 1>&6 fi - + fi +done - + +if test "x$INET_LINK" != "x"; then + cat >> confdefs.h <<\EOF +#define HAVE_INET_ADDR 1 +EOF + + INET_LINK=" -l$INET_LINK" +fi + +fi + + +cat > confcache <<\EOF +# This file is a shell script that caches the results of configure +# tests run on this system so they can be shared between configure +# scripts and configure runs. It is not useful on other systems. +# If it contains results you don't want to keep, you may remove or edit it. +# +# By default, configure uses ./config.cache as the cache file, +# creating it if it does not exist already. You can give configure +# the --cache-file=FILE option to use a different cache file; that is +# what configure does when it calls configure scripts in +# subdirectories, so they share the cache. +# Giving --cache-file=/dev/null disables caching, for debugging configure. +# config.status only pays attention to the cache file if you give it the +# --recheck option to rerun configure. +# +EOF +# The following way of writing the cache mishandles newlines in values, +# but we know of no workaround that is simple, portable, and efficient. +# So, don't put newlines in cache variables' values. +# Ultrix sh set writes to stderr and can't be redirected directly, +# and sets the high bit in the cache file unless we assign to the vars. +(set) 2>&1 | + case `(ac_space=' '; set | grep ac_space) 2>&1` in + *ac_space=\ *) + # `set' does not quote correctly, so add quotes (double-quote substitution + # turns \\\\ into \\, and sed turns \\ into \). + sed -n \ + -e "s/'/'\\\\''/g" \ + -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p" + ;; + *) + # `set' quotes correctly as required by POSIX, so do not add quotes. + sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p' + ;; + esac >> confcache +if cmp -s $cache_file confcache; then + : else - echo "$ac_t""no" 1>&6 + if test -w $cache_file; then + echo "updating cache $cache_file" + cat confcache > $cache_file + else + echo "not updating unwritable cache $cache_file" + fi fi +rm -f confcache - -else - echo "$ac_t""no" 1>&6 -fi - if test "$HAVE_PRIOR_FUNCS" = 1; then - cat >> confdefs.h <<\EOF -#define HAVE_THREAD_PRIORITY_FUNCTIONS 1 -EOF +if test "$TOOLKIT" != "MSW"; then - else - echo "configure: warning: Setting thread priority will not work" 1>&2 - fi + + THREADS_LINK= + THREADS_OBJ= + CODE_GEN_FLAGS= + CODE_GEN_FLAGS_CXX= + + if test "$wxUSE_THREADS" = "yes" ; then + if test "$wxUSE_WINE" = 1 ; then + echo "configure: warning: Threads are not supported under WINE" 1>&2 + wxUSE_THREADS="no" + elif test "$USE_BEOS" = 1; then + echo "configure: warning: BeOS threads are not yet supported" 1>&2 + wxUSE_THREADS="no" + fi + fi - echo $ac_n "checking for pthread_cancel in -l$THREADS_LINK""... $ac_c" 1>&6 -echo "configure:14085: checking for pthread_cancel in -l$THREADS_LINK" >&5 -ac_lib_var=`echo $THREADS_LINK'_'pthread_cancel | sed 'y%./+-%__p_%'` + if test "$wxUSE_THREADS" = "yes" ; then + + if test "$USE_AIX" = 1; then + THREADS_LIB=pthreads + else + THREADS_LIB=pthread + fi + + echo $ac_n "checking for pthread_create in -l$THREADS_LIB""... $ac_c" 1>&6 +echo "configure:15254: checking for pthread_create in -l$THREADS_LIB" >&5 +ac_lib_var=`echo $THREADS_LIB'_'pthread_create | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" -LIBS="-l$THREADS_LINK $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:15273: \"$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 @@ -14115,412 +15284,176 @@ LIBS="$ac_save_LIBS" fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 - cat >> confdefs.h <<\EOF -#define HAVE_PTHREAD_CANCEL 1 -EOF - + + THREADS_OBJ="threadpsx.lo" + THREADS_LINK=$THREADS_LIB + else echo "$ac_t""no" 1>&6 -echo "configure: warning: wxThread::Kill() will not work properly" 1>&2 -fi - - echo $ac_n "checking for pthread_cleanup_push/pop""... $ac_c" 1>&6 -echo "configure:14130: checking for pthread_cleanup_push/pop" >&5 -if eval "test \"`echo '$''{'wx_cv_func_pthread_cleanup_push'+set}'`\" = set"; then + echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6 +echo "configure:15296: checking for pthread_create in -lc_r" >&5 +ac_lib_var=`echo c_r'_'pthread_create | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - - cat > conftest.$ac_ext < conftest.$ac_ext < -int main() { +/* Override any gcc2 internal prototype to avoid an error. */ +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char pthread_create(); - pthread_cleanup_push(NULL, NULL); - pthread_cleanup_pop(0); - +int main() { +pthread_create() ; return 0; } EOF -if { (eval echo configure:14146: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:15315: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* - - wx_cv_func_pthread_cleanup_push=yes - + eval "ac_cv_lib_$ac_lib_var=yes" else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* - - wx_cv_func_pthread_cleanup_push=no - + eval "ac_cv_lib_$ac_lib_var=no" fi rm -f conftest* - -fi - -echo "$ac_t""$wx_cv_func_pthread_cleanup_push" 1>&6 - - if test "$wx_cv_func_pthread_cleanup_push" = "yes"; then - cat >> confdefs.h <<\EOF -#define HAVE_THREAD_CLEANUP_FUNCTIONS 1 -EOF - - fi - - - echo $ac_n "checking for pthread_mutexattr_t""... $ac_c" 1>&6 -echo "configure:14174: 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() { +LIBS="$ac_save_LIBS" - pthread_mutexattr_t attr; - pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE); - -; return 0; } -EOF -if { (eval echo configure:14190: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - - wx_cv_type_pthread_mutexattr_t=yes - -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - - wx_cv_type_pthread_mutexattr_t=no - - fi -rm -f conftest* +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 -fi - -echo "$ac_t""$wx_cv_type_pthread_mutexattr_t" 1>&6 - - if test "$wx_cv_type_pthread_mutexattr_t" = "yes"; then - cat >> confdefs.h <<\EOF -#define HAVE_PTHREAD_MUTEXATTR_T 1 -EOF + THREADS_OBJ="threadpsx.lo" + THREADS_LINK="c_r" + +else + echo "$ac_t""no" 1>&6 - else - echo $ac_n "checking for PTHREAD_RECURSIVE_MUTEX_INITIALIZER""... $ac_c" 1>&6 -echo "configure:14217: checking for PTHREAD_RECURSIVE_MUTEX_INITIALIZER" >&5 -if eval "test \"`echo '$''{'wx_cv_type_pthread_rec_mutex_init'+set}'`\" = set"; then + ac_safe=`echo "sys/prctl.h" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for sys/prctl.h""... $ac_c" 1>&6 +echo "configure:15339: 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 < conftest.$ac_ext < -int main() { - - pthread_mutex_t attr = PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP; - -; return 0; } +#include EOF -if { (eval echo configure:14232: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (eval echo configure:15349: \"$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* - - wx_cv_type_pthread_rec_mutex_init=yes - + 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* - - wx_cv_type_pthread_rec_mutex_init=no - - -fi -rm -f conftest* - -fi - -echo "$ac_t""$wx_cv_type_pthread_rec_mutex_init" 1>&6 - if test "$wx_cv_type_pthread_rec_mutex_init" = "yes"; then - cat >> confdefs.h <<\EOF -#define HAVE_PTHREAD_RECURSIVE_MUTEX_INITIALIZER 1 -EOF - - else - echo "configure: warning: wxMutex won't be recursive on this platform" 1>&2 - fi - fi - - THREADS_LINK="-l$THREADS_LINK" - - if test "$USE_SOLARIS" = "yes" -a "$GCC" != "yes"; then - CFLAGS="${CFLAGS} -mt" - CXXFLAGS="${CXXFLAGS} -mt" - LDFLAGS="${LDFLAGS} -mt" - fi -fi - -fi - -if test "$wxUSE_THREADS" = "yes"; then - cat >> confdefs.h <<\EOF -#define wxUSE_THREADS 1 -EOF - - - if test "$wxUSE_MAC" = "0"; then - CFLAGS="${CFLAGS} -D_REENTRANT" - CXXFLAGS="${CXXFLAGS} -D_REENTRANT" - fi - - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS thread" -else - if test "$ac_cv_func_strtok_r" = "yes"; then - echo $ac_n "checking if -D_REENTRANT is needed""... $ac_c" 1>&6 -echo "configure:14287: checking if -D_REENTRANT is needed" >&5 - if test "$NEEDS_D_REENTRANT_FOR_R_FUNCS" = 1; then - CFLAGS="${CFLAGS} -D_REENTRANT" - CXXFLAGS="${CXXFLAGS} -D_REENTRANT" - echo "$ac_t""yes" 1>&6 - else - echo "$ac_t""no" 1>&6 - fi - fi -fi - -if test "$WXGTK20" = 1 ; then - cat >> confdefs.h <> confdefs.h <> confdefs.h <&6 -echo "configure:14331: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_REZ'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test -n "$REZ"; then - ac_cv_prog_REZ="$REZ" # Let the user override the test. -else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_REZ="Rez" - break - fi - done - IFS="$ac_save_ifs" - test -z "$ac_cv_prog_REZ" && ac_cv_prog_REZ="/Developer/Tools/Rez" -fi -fi -REZ="$ac_cv_prog_REZ" -if test -n "$REZ"; then - echo "$ac_t""$REZ" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi - - # Extract the first word of "Derez", so it can be a program name with args. -set dummy Derez; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:14361: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_DEREZ'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test -n "$DEREZ"; then - ac_cv_prog_DEREZ="$DEREZ" # Let the user override the test. -else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_DEREZ="Derez" - break - fi - done - IFS="$ac_save_ifs" - test -z "$ac_cv_prog_DEREZ" && ac_cv_prog_DEREZ="/Developer/Tools/Derez" -fi -fi -DEREZ="$ac_cv_prog_DEREZ" -if test -n "$DEREZ"; then - echo "$ac_t""$DEREZ" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi - - RESCOMP=${REZ} - REZFLAGS="-d __UNIX__ -useDF" - DEREZFLAGS="Carbon.r -useDF" - RESFLAGS="Carbon.r -t APPL" - LIBWXMACRES="\$(LIBWX_MACRES)" - LIBWXMACRESCOMP="\$(LIBWX_MACRESCOMP)" -fi - -if test "$wxUSE_CYGWIN" = 1 ; then - TOOLKIT_DEF="${TOOLKIT_DEF} -D__WIN95__" -fi - -WXDEBUG= - -if test "$wxUSE_DEBUG_INFO" = "yes" ; then - WXDEBUG="-g" - wxUSE_OPTIMISE=no + eval "ac_cv_header_$ac_safe=no" fi - -if test "$wxUSE_DEBUG_GDB" = "yes" ; then - wxUSE_DEBUG_INFO=yes - WXDEBUG="-ggdb" +rm -f conftest* fi - -if test "$wxUSE_DEBUG_FLAG" = "yes" ; then - cat >> confdefs.h <<\EOF -#define WXDEBUG 1 -EOF - - WXDEBUG_DEFINE="-D__WXDEBUG__" +if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then + echo "$ac_t""yes" 1>&6 + + THREADS_OBJ="threadsgi.lo" + else - if test "$wxUSE_GTK" = 1 ; then - WXDEBUG_DEFINE="-DGTK_NO_CHECK_CASTS" - fi + echo "$ac_t""no" 1>&6 fi -if test "$wxUSE_MEM_TRACING" = "yes" ; then - cat >> confdefs.h <<\EOF -#define wxUSE_MEMORY_TRACING 1 -EOF - - cat >> confdefs.h <<\EOF -#define wxUSE_GLOBAL_MEMORY_OPERATORS 1 -EOF - - cat >> confdefs.h <<\EOF -#define wxUSE_DEBUG_NEW_ALWAYS 1 -EOF - - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS memcheck" + fi -if test "$wxUSE_DMALLOC" = "yes" ; then - DMALLOC_LINK="-ldmalloc" + fi -PROFILE= -if test "$wxUSE_PROFILE" = "yes" ; then - PROFILE="-pg" -fi -DEP_INFO_FLAGS= -CODE_GEN_FLAGS= -CODE_GEN_FLAGS_CXX= -if test "$GCC" = yes ; then - if test "$wxUSE_NO_RTTI" = "yes" ; then - CODE_GEN_FLAGS_CXX="$CODE_GEN_FLAGS -fno-rtti" - fi - if test "$wxUSE_NO_EXCEPTIONS" = "yes" ; then - CODE_GEN_FLAGS_CXX="$CODE_GEN_FLAGS -fno-exceptions" - fi - if test "$wxUSE_PERMISSIVE" = "yes" ; then - CODE_GEN_FLAGS="$CODE_GEN_FLAGS -fpermissive" - fi - if test "$wxUSE_NO_DEPS" = "no" ; then - DEP_INFO_FLAGS="-MMD" + if test -z "$THREADS_OBJ" ; then + wxUSE_THREADS=no + echo "configure: warning: No thread support on this system" 1>&2 + fi fi -fi - -CXXFLAGS=`echo "${CXXFLAGS}" | sed "s/\-O.//g" ` -CFLAGS=`echo "${CFLAGS}" | sed "s/\-O.//g" ` -if test "$wxUSE_OPTIMISE" = "no" ; then - OPTIMISE= + 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:15389: 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 - if test "$GCC" = yes ; then - OPTIMISE="-O2" - case "${host}" in - i586-*-*|i686-*-* ) - OPTIMISE="${OPTIMISE} " - ;; - esac - else - OPTIMISE="-O" - fi -fi + cat > conftest.$ac_ext < +/* Override any gcc2 internal prototype to avoid an error. */ +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char $ac_func(); -if test "$WXWIN_COMPATIBILITY_2" = "yes"; then - cat >> confdefs.h <<\EOF -#define WXWIN_COMPATIBILITY_2 1 -EOF +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 - WXWIN_COMPATIBILITY_2_2="yes" +; return 0; } +EOF +if { (eval echo configure:15417: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_$ac_func=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_func_$ac_func=no" +fi +rm -f conftest* fi -if test "$WXWIN_COMPATIBILITY_2_2" = "yes"; then - cat >> confdefs.h <<\EOF -#define WXWIN_COMPATIBILITY_2_2 1 +if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then + echo "$ac_t""yes" 1>&6 + ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` + cat >> confdefs.h <&6 fi +done -ZLIB_INCLUDE= -if test "$wxUSE_ZLIB" = "yes" -o "$wxUSE_ZLIB" = "sys" ; then - cat >> confdefs.h <<\EOF -#define wxUSE_ZLIB 1 -EOF - - if test "$wxUSE_ZLIB" = "yes" ; then - ZLIB_INCLUDE="-I\${top_srcdir}/src/zlib" - else - ZLIB_LINK= - ac_safe=`echo "zlib.h" | sed 'y%./+-%__p_%'` -echo $ac_n "checking for zlib.h""... $ac_c" 1>&6 -echo "configure:14514: checking for zlib.h" >&5 + + for ac_hdr in sched.h +do +ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +echo "configure:15447: 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 < +#include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:14524: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:15457: \"$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* @@ -14536,27 +15469,38 @@ rm -f conftest* fi if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then echo "$ac_t""yes" 1>&6 - echo $ac_n "checking for deflate in -lz""... $ac_c" 1>&6 -echo "configure:14541: checking for deflate in -lz" >&5 -ac_lib_var=`echo z'_'deflate | sed 'y%./+-%__p_%'` + ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` + cat >> confdefs.h <&6 +fi +done + + + echo $ac_n "checking for sched_yield in -l$THREADS_LINK""... $ac_c" 1>&6 +echo "configure:15485: checking for sched_yield in -l$THREADS_LINK" >&5 +ac_lib_var=`echo $THREADS_LINK'_'sched_yield | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" -LIBS="-lz $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:15504: \"$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 @@ -14571,85 +15515,118 @@ LIBS="$ac_save_LIBS" fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 - ZLIB_LINK="-lz" + cat >> confdefs.h <<\EOF +#define HAVE_SCHED_YIELD 1 +EOF + else echo "$ac_t""no" 1>&6 -fi +echo $ac_n "checking for sched_yield in -lposix4""... $ac_c" 1>&6 +echo "configure:15526: checking for sched_yield in -lposix4" >&5 +ac_lib_var=`echo posix4'_'sched_yield | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + ac_save_LIBS="$LIBS" +LIBS="-lposix4 $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" else - echo "$ac_t""no" 1>&6 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" fi +rm -f conftest* +LIBS="$ac_save_LIBS" - if test "x$ZLIB_LINK" = "x" ; then - { echo "configure: error: system zlib compression library not found! Use --with-zlib=yes to use built-in zlib" 1>&2; exit 1; } - fi - fi fi - -PNG_INCLUDE= -if test "$wxUSE_LIBPNG" = "yes" -o "$wxUSE_LIBPNG" = "sys" ; then +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 cat >> confdefs.h <<\EOF -#define wxUSE_LIBPNG 1 +#define HAVE_SCHED_YIELD 1 EOF + POSIX4_LINK=" -lposix4" +else + echo "$ac_t""no" 1>&6 +echo "configure: warning: wxThread::Yield will not work properly" 1>&2 + +fi - if test "$wxUSE_LIBPNG" = "sys" -a "$wxUSE_ZLIB" != "sys" ; then - echo "configure: warning: --with-libpng=sys doesn't work without --with-zlib=sys, will compile the built-in libpng instead" 1>&2 - wxUSE_LIBPNG=yes - fi + +fi - if test "$wxUSE_LIBPNG" = "yes" ; then - PNG_INCLUDE="-I\${top_srcdir}/src/png" - else - PNG_LINK= - ac_safe=`echo "png.h" | sed 'y%./+-%__p_%'` -echo $ac_n "checking for png.h""... $ac_c" 1>&6 -echo "configure:14607: checking for png.h" >&5 -if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + + HAVE_PRIOR_FUNCS=0 + echo $ac_n "checking for pthread_attr_getschedpolicy in -l$THREADS_LINK""... $ac_c" 1>&6 +echo "configure:15576: checking for pthread_attr_getschedpolicy in -l$THREADS_LINK" >&5 +ac_lib_var=`echo $THREADS_LINK'_'pthread_attr_getschedpolicy | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - cat > conftest.$ac_ext < 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 pthread_attr_getschedpolicy(); + +int main() { +pthread_attr_getschedpolicy() +; return 0; } EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:14617: \"$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:15595: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* - eval "ac_cv_header_$ac_safe=yes" + eval "ac_cv_lib_$ac_lib_var=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" + eval "ac_cv_lib_$ac_lib_var=no" fi rm -f conftest* +LIBS="$ac_save_LIBS" + fi -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 - echo $ac_n "checking for png_check_sig in -lpng""... $ac_c" 1>&6 -echo "configure:14634: checking for png_check_sig in -lpng" >&5 -ac_lib_var=`echo png'_'png_check_sig | sed 'y%./+-%__p_%'` + echo $ac_n "checking for pthread_attr_setschedparam in -l$THREADS_LINK""... $ac_c" 1>&6 +echo "configure:15611: checking for pthread_attr_setschedparam in -l$THREADS_LINK" >&5 +ac_lib_var=`echo $THREADS_LINK'_'pthread_attr_setschedparam | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" -LIBS="-lpng -lz -lm $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:15630: \"$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 @@ -14664,90 +15641,65 @@ LIBS="$ac_save_LIBS" fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 - PNG_LINK="-lpng" -else - echo "$ac_t""no" 1>&6 -fi - - -else - echo "$ac_t""no" 1>&6 -fi - - if test "x$PNG_LINK" = "x" ; then - { echo "configure: error: system png library not found! Use --with-libpng=yes to use the built-in libpng" 1>&2; exit 1; } - fi - fi - - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS png" -fi - -JPEG_INCLUDE= -if test "$wxUSE_LIBJPEG" = "yes" -o "$wxUSE_LIBJPEG" = "sys" ; then - cat >> confdefs.h <<\EOF -#define wxUSE_LIBJPEG 1 -EOF - - if test "$wxUSE_LIBJPEG" = "yes" ; then - JPEG_INCLUDE="-I\${top_srcdir}/src/jpeg" - else - JPEG_LINK= - echo $ac_n "checking for jpeglib.h""... $ac_c" 1>&6 -echo "configure:14697: checking for jpeglib.h" >&5 - if eval "test \"`echo '$''{'ac_cv_header_jpeglib_h'+set}'`\" = set"; then + echo $ac_n "checking for sched_get_priority_max in -l$THREADS_LINK""... $ac_c" 1>&6 +echo "configure:15646: checking for sched_get_priority_max in -l$THREADS_LINK" >&5 +ac_lib_var=`echo $THREADS_LINK'_'sched_get_priority_max | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - cat > conftest.$ac_ext < conftest.$ac_ext < - #include - int main() { - - +sched_get_priority_max() ; return 0; } EOF -if { (eval echo configure:14714: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:15665: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* - ac_cv_header_jpeglib_h=yes + eval "ac_cv_lib_$ac_lib_var=yes" else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* - ac_cv_header_jpeglib_h=no - + eval "ac_cv_lib_$ac_lib_var=no" fi rm -f conftest* - -fi - - echo "$ac_t""$ac_cv_header_jpeglib_h" 1>&6 +LIBS="$ac_save_LIBS" - 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:14732: checking for jpeg_read_header in -ljpeg" >&5 -ac_lib_var=`echo jpeg'_'jpeg_read_header | sed 'y%./+-%__p_%'` +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + HAVE_PRIOR_FUNCS=1 +else + echo "$ac_t""no" 1>&6 +echo $ac_n "checking for sched_get_priority_max in -lposix4""... $ac_c" 1>&6 +echo "configure:15684: checking for sched_get_priority_max in -lposix4" >&5 +ac_lib_var=`echo posix4'_'sched_get_priority_max | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" -LIBS="-ljpeg $LIBS" +LIBS="-lposix4 $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15703: \"$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 @@ -14762,78 +15714,58 @@ LIBS="$ac_save_LIBS" fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 - JPEG_LINK="-ljpeg" + + HAVE_PRIOR_FUNCS=1 + POSIX4_LINK=" -lposix4" + 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; } - fi - fi + fi -TIFF_INCLUDE= -if test "$wxUSE_LIBTIFF" = "yes" -o "$wxUSE_LIBTIFF" = "sys" ; then - cat >> confdefs.h <<\EOF -#define wxUSE_LIBTIFF 1 -EOF - - if test "$wxUSE_LIBTIFF" = "yes" ; then - TIFF_INCLUDE="-I\${top_srcdir}/src/tiff" - else - TIFF_LINK= - ac_safe=`echo "tiffio.h" | sed 'y%./+-%__p_%'` -echo $ac_n "checking for tiffio.h""... $ac_c" 1>&6 -echo "configure:14791: 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:14801: \"$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" + echo "$ac_t""no" 1>&6 fi -rm -f conftest* + + +else + echo "$ac_t""no" 1>&6 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:14818: checking for TIFFError in -ltiff" >&5 -ac_lib_var=`echo tiff'_'TIFFError | sed 'y%./+-%__p_%'` + + + if test "$HAVE_PRIOR_FUNCS" = 1; then + cat >> confdefs.h <<\EOF +#define HAVE_THREAD_PRIORITY_FUNCTIONS 1 +EOF + + else + echo "configure: warning: Setting thread priority will not work" 1>&2 + fi + + echo $ac_n "checking for pthread_cancel in -l$THREADS_LINK""... $ac_c" 1>&6 +echo "configure:15750: checking for pthread_cancel in -l$THREADS_LINK" >&5 +ac_lib_var=`echo $THREADS_LINK'_'pthread_cancel | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" -LIBS="-ltiff -lm $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:15769: \"$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 @@ -14848,240 +15780,308 @@ LIBS="$ac_save_LIBS" fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 - TIFF_LINK="-ltiff" + cat >> confdefs.h <<\EOF +#define HAVE_PTHREAD_CANCEL 1 +EOF + else echo "$ac_t""no" 1>&6 +echo "configure: warning: wxThread::Kill() will not work properly" 1>&2 fi + + echo $ac_n "checking for pthread_cleanup_push/pop""... $ac_c" 1>&6 +echo "configure:15795: 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 - echo "$ac_t""no" 1>&6 -fi + + cat > conftest.$ac_ext < +int main() { - if test "x$TIFF_LINK" = "x" ; then - { echo "configure: error: system tiff library not found! Use --with-libtiff=yes to use the built-in one" 1>&2; exit 1; } - fi - fi + pthread_cleanup_push(NULL, NULL); + pthread_cleanup_pop(0); + +; return 0; } +EOF +if { (eval echo configure:15811: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + + wx_cv_func_pthread_cleanup_push=yes + +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + + wx_cv_func_pthread_cleanup_push=no + +fi +rm -f conftest* + fi -FREETYPE_INCLUDE= -if test "$wxUSE_FREETYPE" = "yes" -o "$wxUSE_FREETYPE" = "sys" ; then - cat >> confdefs.h <<\EOF -#define wxUSE_FREETYPE 1 +echo "$ac_t""$wx_cv_func_pthread_cleanup_push" 1>&6 + + if test "$wx_cv_func_pthread_cleanup_push" = "yes"; then + cat >> confdefs.h <<\EOF +#define HAVE_THREAD_CLEANUP_FUNCTIONS 1 EOF - if test "$wxUSE_FREETYPE" = "yes" ; then - FREETYPE_INCLUDE="-I\${top_srcdir}/src/freetype" - else - FREETYPE_LINK= - ac_safe=`echo "freetype.h" | sed 'y%./+-%__p_%'` -echo $ac_n "checking for freetype.h""... $ac_c" 1>&6 -echo "configure:14879: checking for freetype.h" >&5 -if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + fi + + + if test "x$wx_lib_glibc21" = "xyes"; then + CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE" + fi + + echo $ac_n "checking for pthread_mutexattr_t""... $ac_c" 1>&6 +echo "configure:15843: 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 < conftest.$ac_ext < +#include +int main() { + + pthread_mutexattr_t attr; + pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE); + +; return 0; } EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:14889: \"$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:15859: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* - eval "ac_cv_header_$ac_safe=yes" + + wx_cv_type_pthread_mutexattr_t=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" + + wx_cv_type_pthread_mutexattr_t=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 FT_Render_Glyph in -lfreetype""... $ac_c" 1>&6 -echo "configure:14906: 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_t""$wx_cv_type_pthread_mutexattr_t" 1>&6 + + if test "$wx_cv_type_pthread_mutexattr_t" = "yes"; then + cat >> confdefs.h <<\EOF +#define HAVE_PTHREAD_MUTEXATTR_T 1 +EOF + + else + echo $ac_n "checking for PTHREAD_RECURSIVE_MUTEX_INITIALIZER""... $ac_c" 1>&6 +echo "configure:15886: 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 - ac_save_LIBS="$LIBS" -LIBS="-lfreetype -lm $LIBS" -cat > conftest.$ac_ext < conftest.$ac_ext < int main() { -FT_Render_Glyph() + + pthread_mutex_t attr = PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP; + ; return 0; } EOF -if { (eval echo configure:14925: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15901: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" + + wx_cv_type_pthread_rec_mutex_init=yes + else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" + + wx_cv_type_pthread_rec_mutex_init=no + + fi rm -f conftest* -LIBS="$ac_save_LIBS" + +fi + +echo "$ac_t""$wx_cv_type_pthread_rec_mutex_init" 1>&6 + if test "$wx_cv_type_pthread_rec_mutex_init" = "yes"; then + cat >> confdefs.h <<\EOF +#define HAVE_PTHREAD_RECURSIVE_MUTEX_INITIALIZER 1 +EOF + + else + echo "configure: warning: wxMutex won't be recursive on this platform" 1>&2 + fi + fi + + THREADS_LINK=" -l$THREADS_LINK" + + if test "$USE_SOLARIS" = "yes" -a "$GCC" != "yes"; then + CPPFLAGS="$CFLAGS -mt" + CXXFLAGS="$CXXFLAGS -mt" + LDFLAGS="$LDFLAGS -mt" + fi + fi fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - FREETYPE_LINK="-lfreetype" + +if test "$wxUSE_THREADS" = "yes"; then + cat >> confdefs.h <<\EOF +#define wxUSE_THREADS 1 +EOF + + + if test "$USE_DARWIN" != 1; then + TOOLCHAIN_DEFS="$TOOLCHAIN_DEFS -D_REENTRANT" + fi + + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS thread" else - echo "$ac_t""no" 1>&6 + if test "$ac_cv_func_strtok_r" = "yes"; then + echo $ac_n "checking if -D_REENTRANT is needed""... $ac_c" 1>&6 +echo "configure:15955: checking if -D_REENTRANT is needed" >&5 + if test "$NEEDS_D_REENTRANT_FOR_R_FUNCS" = 1; then + TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D_REENTRANT" + echo "$ac_t""yes" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + fi fi - -else - echo "$ac_t""no" 1>&6 +if test "$WXGTK20" = 1 ; then + cat >> confdefs.h <> confdefs.h <> confdefs.h <&2; exit 1; } - fi - fi +if test "$wxUSE_DEBUG_GDB" = "yes" ; then + wxUSE_DEBUG_INFO=yes + WXDEBUG="-ggdb" 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:14959: 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 < +if test "$wxUSE_DEBUG_FLAG" = "yes" ; then + cat >> confdefs.h <<\EOF +#define WXDEBUG 1 EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:14969: \"$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" + + WXDEBUG_DEFINE="-D__WXDEBUG__" 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* + if test "$wxUSE_GTK" = 1 ; then + WXDEBUG_DEFINE="-DGTK_NO_CHECK_CASTS" + fi fi -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then - echo "$ac_t""yes" 1>&6 - + +if test "$wxUSE_MEM_TRACING" = "yes" ; then cat >> confdefs.h <<\EOF -#define wxUSE_OPENGL 1 +#define wxUSE_MEMORY_TRACING 1 EOF cat >> confdefs.h <<\EOF -#define wxUSE_GLCANVAS 1 +#define wxUSE_GLOBAL_MEMORY_OPERATORS 1 EOF - echo $ac_n "checking for glFlush in -lGL""... $ac_c" 1>&6 -echo "configure:14995: checking for glFlush in -lGL" >&5 -ac_lib_var=`echo GL'_'glFlush | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - ac_save_LIBS="$LIBS" -LIBS="-lGL $LIBS" -cat > conftest.$ac_ext <> confdefs.h <<\EOF +#define wxUSE_DEBUG_NEW_ALWAYS 1 EOF -if { (eval echo configure:15014: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS memcheck" fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - - OPENGL_LINK="-lGL -lGLU" - -else - echo "$ac_t""no" 1>&6 - echo $ac_n "checking for glFlush in -lMesaGL""... $ac_c" 1>&6 -echo "configure:15036: checking for glFlush in -lMesaGL" >&5 -ac_lib_var=`echo MesaGL'_'glFlush | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - ac_save_LIBS="$LIBS" -LIBS="-lMesaGL $LIBS" -cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" +PROFILE= +if test "$wxUSE_PROFILE" = "yes" ; then + PROFILE=" -pg" fi -rm -f conftest* -LIBS="$ac_save_LIBS" +if test "$GCC" = "yes" ; then + if test "$wxUSE_NO_RTTI" = "yes" ; then + CODE_GEN_FLAGS_CXX="$CODE_GEN_FLAGS_CXX -fno-rtti" + fi + if test "$wxUSE_NO_EXCEPTIONS" = "yes" ; then + CODE_GEN_FLAGS_CXX="$CODE_GEN_FLAGS_CXX -fno-exceptions" + fi + if test "$wxUSE_PERMISSIVE" = "yes" ; then + CODE_GEN_FLAGS="$CODE_GEN_FLAGS -fpermissive" + fi + if test "$USE_WIN32" = 1 ; then + # I'm not even really sure what this was ever added to solve, + # but someone added it for mingw native builds, so I guess + # they had a reason, right?? + CODE_GEN_FLAGS="$CODE_GEN_FLAGS -fno-pcc-struct-return" + fi fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - - OPENGL_LINK="-lMesaGL -lMesaGLU" - + + +CXXFLAGS=`echo "${CXXFLAGS}" | sed "s/\-O.//g" ` +CFLAGS=`echo "${CFLAGS}" | sed "s/\-O.//g" ` +if test "$wxUSE_OPTIMISE" = "no" ; then + OPTIMISE= else - echo "$ac_t""no" 1>&6 + if test "$GCC" = yes ; then + OPTIMISE="-O2" + case "${host}" in + i586-*-*|i686-*-* ) + OPTIMISE="${OPTIMISE} " + ;; + esac + else + OPTIMISE="-O" + fi fi - -fi +if test "$WXWIN_COMPATIBILITY_2" = "yes"; then + cat >> confdefs.h <<\EOF +#define WXWIN_COMPATIBILITY_2 1 +EOF - -else - echo "$ac_t""no" 1>&6 -wxUSE_OPENGL=0 + + 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 @@ -15226,9 +16226,16 @@ EOF fi +if test "$wxUSE_TEXTBUFFER" = "yes"; then + cat >> confdefs.h <<\EOF +#define wxUSE_TEXTBUFFER 1 +EOF + +fi + if test "$wxUSE_TEXTFILE" = "yes"; then - if test "$wxUSE_FILE" != "yes"; then - echo "configure: warning: wxTextFile requires wxFile and it won't be compiled without it" 1>&2 + if test "$wxUSE_FILE" != "yes" -o "$wxUSE_TEXTBUFFER" != "yes" ; then + echo "configure: warning: wxTextFile requires wxFile and wxTextBuffer and won't be compiled without them" 1>&2 else cat >> confdefs.h <<\EOF #define wxUSE_TEXTFILE 1 @@ -15317,12 +16324,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:15321: checking for $ac_func" >&5 +echo "configure:16328: 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:16356: \"$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 @@ -15371,13 +16378,13 @@ done echo $ac_n "checking for timezone variable in ""... $ac_c" 1>&6 -echo "configure:15375: checking for timezone variable in " >&5 +echo "configure:16382: 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 < @@ -15385,14 +16392,14 @@ else int main() { int tz; - tz = __timezone; + tz = timezone; ; return 0; } EOF -if { (eval echo configure:15393: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:16400: \"$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 @@ -15400,7 +16407,7 @@ else rm -rf conftest* cat > conftest.$ac_ext < @@ -15412,7 +16419,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:15416: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:16423: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_var_timezone=_timezone @@ -15423,7 +16430,7 @@ else rm -rf conftest* cat > conftest.$ac_ext < @@ -15431,14 +16438,14 @@ else int main() { int tz; - tz = timezone; + tz = __timezone; ; return 0; } EOF -if { (eval echo configure:15439: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:16446: \"$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 @@ -15470,12 +16477,12 @@ EOF for ac_func in localtime do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:15474: checking for $ac_func" >&5 +echo "configure:16481: 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:16509: \"$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 @@ -15525,13 +16532,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:15529: checking for tm_gmtoff in struct tm" >&5 +echo "configure:16536: 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 < @@ -15543,7 +16550,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:15547: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:16554: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_struct_tm_has_gmtoff=yes @@ -15572,12 +16579,12 @@ EOF for ac_func in gettimeofday ftime do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:15576: checking for $ac_func" >&5 +echo "configure:16583: 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:16611: \"$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 @@ -15627,7 +16634,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:15631: checking whether gettimeofday takes two arguments" >&5 +echo "configure:16638: 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 @@ -15642,7 +16649,7 @@ cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext < @@ -15651,12 +16658,11 @@ cross_compiling=$ac_cv_prog_cxx_cross int main() { struct timeval tv; - struct timezone tz; - gettimeofday(&tv, &tz); + gettimeofday(&tv, NULL); ; return 0; } EOF -if { (eval echo configure:15660: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:16666: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_func_gettimeofday_has_2_args=yes else @@ -15664,7 +16670,7 @@ else cat conftest.$ac_ext >&5 rm -rf conftest* cat > conftest.$ac_ext < @@ -15677,14 +16683,17 @@ int main() { ; return 0; } EOF -if { (eval echo configure:15681: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:16687: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_func_gettimeofday_has_2_args=no else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* - wx_cv_func_gettimeofday_has_2_args=unknown + + echo "configure: warning: failed to determine number of gettimeofday() arguments" 1>&2 + wx_cv_func_gettimeofday_has_2_args=unknown + fi rm -f conftest* @@ -15721,14 +16730,14 @@ fi if test "$TOOLKIT" != "MSW"; then -if test "$wxUSE_SOCKETS" = "yes"; then - echo $ac_n "checking for socket""... $ac_c" 1>&6 -echo "configure:15727: checking for socket" >&5 + if test "$wxUSE_SOCKETS" = "yes"; then + echo $ac_n "checking for socket""... $ac_c" 1>&6 +echo "configure:16736: 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:16764: \"$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 @@ -15769,7 +16778,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:15773: checking for socket in -lsocket" >&5 +echo "configure:16782: 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 @@ -15777,7 +16786,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:16801: \"$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 @@ -15807,27 +16816,27 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then else echo "$ac_t""no" 1>&6 - echo "configure: warning: socket library not found - sockets will be disabled" 1>&2 - wxUSE_SOCKETS=no + echo "configure: warning: socket library not found - sockets will be disabled" 1>&2 + wxUSE_SOCKETS=no + - -fi - - fi + fi + fi -if test "$wxUSE_SOCKETS" = "yes" ; then - echo $ac_n "checking what is the type of the third argument of getsockname""... $ac_c" 1>&6 -echo "configure:15825: checking what is the type of the third argument of getsockname" >&5 + + 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:16834: checking what is the type of the third argument of getsockname" >&5 if eval "test \"`echo '$''{'wx_cv_type_getsockname3'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - - ac_ext=C + + ac_ext=C # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' @@ -15835,21 +16844,21 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross - cat > conftest.$ac_ext < conftest.$ac_ext < - #include - + #include + #include + int main() { - socklen_t len; - getsockname(0, 0, &len); - + socklen_t len; + getsockname(0, 0, &len); + ; return 0; } EOF -if { (eval echo configure:15853: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:16862: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_type_getsockname3=socklen_t else @@ -15857,20 +16866,20 @@ else cat conftest.$ac_ext >&5 rm -rf conftest* cat > conftest.$ac_ext < - #include - + #include + #include + int main() { - size_t len; - getsockname(0, 0, &len); - + size_t len; + getsockname(0, 0, &len); + ; return 0; } EOF -if { (eval echo configure:15874: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:16883: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_type_getsockname3=size_t else @@ -15878,20 +16887,20 @@ else cat conftest.$ac_ext >&5 rm -rf conftest* cat > conftest.$ac_ext < - #include - + #include + #include + int main() { - int len; - getsockname(0, 0, &len); - + int len; + getsockname(0, 0, &len); + ; return 0; } EOF -if { (eval echo configure:15895: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:16904: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_type_getsockname3=int else @@ -15899,71 +16908,68 @@ else cat conftest.$ac_ext >&5 rm -rf conftest* wx_cv_type_getsockname3=unknown - + fi rm -f conftest* - + fi rm -f conftest* - + fi rm -f conftest* - ac_ext=c + ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CPP $CPPFLAGS' ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' cross_compiling=$ac_cv_prog_cc_cross - + fi echo "$ac_t""$wx_cv_type_getsockname3" 1>&6 - if test "$wx_cv_type_getsockname3" = "unknown"; then - wxUSE_SOCKETS=no - echo "configure: warning: Couldn't find socklen_t synonym for this system" 1>&2 - else - cat >> confdefs.h <&2 + else + cat >> confdefs.h <> confdefs.h <<\EOF #define wxUSE_SOCKETS 1 EOF SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS sockets" - INCLUDE_SUBDIRS="$INCLUDE_SUBDIRS protocol" fi if test "$wxUSE_GUI" = "yes"; then -if test "$TOOLKIT" != "MSW"; then - -if test "$wxUSE_JOYSTICK" = "yes"; then - for ac_hdr in linux/joystick.h + if test "$TOOLKIT" != "MSW"; then + if test "$wxUSE_JOYSTICK" = "yes"; then + for ac_hdr in linux/joystick.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:15957: checking for $ac_hdr" >&5 +echo "configure:16963: 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:15967: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:16973: \"$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* @@ -15989,42 +16995,40 @@ else fi done - if test "$ac_cv_header_linux_joystick_h" != "yes"; then - wxUSE_JOYSTICK=no - echo "configure: warning: Joystick not supported by this system" 1>&2 - fi -fi - -fi + if test "$ac_cv_header_linux_joystick_h" != "yes"; then + wxUSE_JOYSTICK=no + echo "configure: warning: Joystick not supported by this system" 1>&2 + fi + fi + fi -if test "$wxUSE_JOYSTICK" = "yes"; then - cat >> confdefs.h <<\EOF + if test "$wxUSE_JOYSTICK" = "yes"; then + cat >> confdefs.h <<\EOF #define wxUSE_JOYSTICK 1 EOF - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS joytest" -fi - + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS joytest" + fi fi if test "$TOOLKIT" != "MSW"; then -HAVE_DL_FUNCS=0 -HAVE_SHL_FUNCS=0 -if test "$wxUSE_DYNLIB_CLASS" = "yes"; then - if test "$USE_MAC" = 1; then - HAVE_DL_FUNCS=1 - else - for ac_func in dlopen + HAVE_DL_FUNCS=0 + HAVE_SHL_FUNCS=0 + if test "$wxUSE_DYNLIB_CLASS" = "yes"; then + if test "$USE_DARWIN" = 1; then + HAVE_DL_FUNCS=1 + else + for ac_func in dlopen do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:16023: checking for $ac_func" >&5 +echo "configure:17027: 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:17055: \"$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 @@ -16066,16 +17070,16 @@ if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then #define $ac_tr_func 1 EOF - cat >> confdefs.h <<\EOF + cat >> confdefs.h <<\EOF #define HAVE_DLOPEN 1 EOF - HAVE_DL_FUNCS=1 - + HAVE_DL_FUNCS=1 + else echo "$ac_t""no" 1>&6 echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 -echo "configure:16079: checking for dlopen in -ldl" >&5 +echo "configure:17083: 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 @@ -16083,7 +17087,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:17102: \"$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 @@ -16110,25 +17114,25 @@ fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 - cat >> confdefs.h <<\EOF + cat >> confdefs.h <<\EOF #define HAVE_DLOPEN 1 EOF - HAVE_DL_FUNCS=1 - LIBS="$LIBS -ldl" - + HAVE_DL_FUNCS=1 + DL_LINK=" -ldl$DL_LINK" + else echo "$ac_t""no" 1>&6 - for ac_func in shl_load + for ac_func in shl_load do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:16127: checking for $ac_func" >&5 +echo "configure:17131: 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:17159: \"$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 @@ -16170,16 +17174,16 @@ if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then #define $ac_tr_func 1 EOF - cat >> confdefs.h <<\EOF + cat >> confdefs.h <<\EOF #define HAVE_SHL_LOAD 1 EOF - HAVE_SHL_FUNCS=1 - + HAVE_SHL_FUNCS=1 + else echo "$ac_t""no" 1>&6 echo $ac_n "checking for dld in -lshl_load""... $ac_c" 1>&6 -echo "configure:16183: checking for dld in -lshl_load" >&5 +echo "configure:17187: 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 @@ -16187,7 +17191,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:17206: \"$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 @@ -16214,35 +17218,35 @@ fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 - HAVE_SHL_FUNCS=1 - LIBS="$LIBS -ldld" - + HAVE_SHL_FUNCS=1 + DL_LINK=" -ldld$DL_LINK" + else echo "$ac_t""no" 1>&6 fi - + fi done - + fi - + fi done - if test "$HAVE_DL_FUNCS" = 1; then - for ac_func in dlerror + if test "$HAVE_DL_FUNCS" = 1; then + for ac_func in dlerror do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:16241: checking for $ac_func" >&5 +echo "configure:17245: 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:17273: \"$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 @@ -16290,7 +17294,7 @@ EOF else echo "$ac_t""no" 1>&6 echo $ac_n "checking for dlerror in -ldl""... $ac_c" 1>&6 -echo "configure:16294: checking for dlerror in -ldl" >&5 +echo "configure:17298: 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 @@ -16298,7 +17302,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:17317: \"$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 @@ -16335,23 +17339,22 @@ fi fi done - fi - fi + fi + fi - if test "$HAVE_DL_FUNCS" = 0; then - if test "$HAVE_SHL_FUNCS" = 0; then - if test "$USE_UNIX" = 1; then - echo "configure: warning: Missing dynamic loading support, several features will be disabled" 1>&2 - wxUSE_DYNLIB_CLASS=no - else - echo "configure: warning: Assuming wxLibrary class works on this platform" 1>&2 - fi + if test "$HAVE_DL_FUNCS" = 0; then + if test "$HAVE_SHL_FUNCS" = 0; then + if test "$USE_UNIX" = 1; then + echo "configure: warning: Missing dynamic loading support, several features will be disabled" 1>&2 + wxUSE_DYNLIB_CLASS=no + else + echo "configure: warning: Assuming wxLibrary class works on this platform" 1>&2 + fi + fi fi fi fi -fi - if test "$wxUSE_DYNLIB_CLASS" = "yes" ; then cat >> confdefs.h <<\EOF #define wxUSE_DYNLIB_CLASS 1 @@ -16377,13 +17380,6 @@ EOF fi -if test "$wxUSE_WCSRTOMBS" = "yes" ; then - cat >> confdefs.h <<\EOF -#define wxUSE_WCSRTOMBS 1 -EOF - -fi - if test "$wxUSE_wxUSE_EXPERIMENTAL_PRINTF" = "yes"; then cat >> confdefs.h <<\EOF #define wxUSE_EXPERIMENTAL_PRINTF 1 @@ -16437,12 +17433,19 @@ EOF SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS layout" fi -if test "$wxUSE_MDI_ARCHITECTURE" = "yes"; then - cat >> confdefs.h <<\EOF +if test "$wxUSE_MDI_ARCHITECTURE" = "yes"; then + if test "$wxUSE_UNIVERSAL" = "yes"; then + echo "configure: warning: MDI is not supported for wxUNIVERSAL yet... disabled" 1>&2 + wxUSE_MDI_ARCHITECTURE=no + fi + + if test "$wxUSE_MDI_ARCHITECTURE" = "yes"; then + cat >> confdefs.h <<\EOF #define wxUSE_MDI_ARCHITECTURE 1 EOF - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS mdi" + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS mdi" + fi fi if test "$wxUSE_DOC_VIEW_ARCHITECTURE" = "yes" ; then @@ -16462,6 +17465,65 @@ if test "$wxUSE_HELP" = "yes"; then EOF SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS help" + + if test "$wxUSE_MSW" = 1; then + if test "$wxUSE_MS_HTML_HELP" = "yes"; then + ac_safe=`echo "htmlhelp.h" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for htmlhelp.h""... $ac_c" 1>&6 +echo "configure:17474: 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:17484: \"$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... disabled" 1>&2 + wxUSE_MS_HTML_HELP=no + +fi + + fi + fi + + if test "$wxUSE_WXHTML_HELP" = "yes"; then + if test "$wxUSE_HTML" = "yes"; then + cat >> confdefs.h <<\EOF +#define wxUSE_WXHTML_HELP 1 +EOF + + else + echo "configure: warning: Cannot use wxHTML-based help without wxHTML so it won't be compiled" 1>&2 + wxUSE_WXHTML_HELP=no + fi + fi fi if test "$wxUSE_PRINTING_ARCHITECTURE" = "yes" ; then @@ -16484,15 +17546,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 @@ -16503,63 +17561,24 @@ EOF fi -if test "$wxUSE_IPC" = "yes"; then - if test "$wxUSE_SOCKETS" != "yes"; then - echo "configure: warning: wxWindows IPC classes require sockets" 1>&2 - fi - - cat >> confdefs.h <<\EOF -#define wxUSE_IPC 1 -EOF - -fi - -if test "$wxUSE_CLIPBOARD" = "yes"; then - cat >> confdefs.h <<\EOF -#define wxUSE_CLIPBOARD 1 -EOF - - cat >> confdefs.h <<\EOF -#define wxUSE_DATAOBJ 1 -EOF - -fi - -if test "$wxUSE_DRAG_AND_DROP" = "yes" ; then - if test "$wxUSE_GTK" = 1; then - if test "$WXGTK12" != 1; then - echo "configure: warning: Drag and drop is only supported under GTK+ 1.2" 1>&2 - wxUSE_DRAG_AND_DROP=no - fi - fi - - if test "$wxUSE_MOTIF" = 1; then - echo "configure: warning: Drag and drop is not yet supported under Motif" 1>&2 - wxUSE_DRAG_AND_DROP=no - fi - - if test "$wxUSE_MAC" = 1; then - echo "configure: warning: Drag and drop is not yet supported under Mac OS X" 1>&2 - wxUSE_DRAG_AND_DROP=no - fi - - if test "$USE_WIN32" = 1; then - - for ac_hdr in ole2.h +if test "$wxUSE_MSW" = 1 -a \( "$wxUSE_DATAOBJ" = "yes" \ + -o "$wxUSE_CLIPBOARD" = "yes" \ + -o "$wxUSE_DRAG_AND_DROP" = "yes" \) ; then + for ac_hdr in ole2.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:16553: checking for $ac_hdr" >&5 +echo "configure:17572: 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:16563: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:17582: \"$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* @@ -16586,30 +17605,84 @@ fi done - if test "$ac_cv_header_ole2_h" = "yes" ; then - if test "$GCC" = yes ; then - ALL_OBJECTS="$ALL_OBJECTS \$(OLEOBJS)" - ALL_DEPFILES="$ALL_DEPFILES \$(OLEDEPS)" - CODE_GEN_FLAGS_CXX="$CODE_GEN_FLAGS_CXX -fvtable-thunks" - LIBS="$LIBS -lole32 -luuid" + if test "$ac_cv_header_ole2_h" = "yes" ; then + if test "$GCC" = yes ; then + ALL_OBJECTS="$ALL_OBJECTS \$(OLEOBJS)" + CODE_GEN_FLAGS_CXX="$CODE_GEN_FLAGS_CXX -fvtable-thunks" + LIBS=" -lrpcrt4 -loleaut32 -lole32 -luuid$LIBS" + cat >> confdefs.h <<\EOF +#define wxUSE_OLE 1 +EOF + + + fi - if test "$wxUSE_METAFILE" = "yes"; then - cat >> confdefs.h <<\EOF + cat >> confdefs.h <<\EOF +#define wxUSE_DATAOBJ 1 +EOF + + else + echo "configure: warning: Some features disabled because OLE headers not found" 1>&2 + + wxUSE_CLIPBOARD=no + wxUSE_DRAG_AND_DROP=no + wxUSE_DATAOBJ=no + fi + + if test "$wxUSE_METAFILE" = "yes"; then + cat >> confdefs.h <<\EOF #define wxUSE_METAFILE 1 EOF - cat >> confdefs.h <<\EOF + + cat >> confdefs.h <<\EOF #define wxUSE_ENH_METAFILE 1 EOF - fi - fi - else - echo "configure: warning: Drag and drop disabled because OLE headers not found" 1>&2 + fi +fi + +if test "$wxUSE_IPC" = "yes"; then + if test "$wxUSE_SOCKETS" != "yes"; then + echo "configure: warning: wxWindows IPC classes require sockets" 1>&2 + fi + + cat >> confdefs.h <<\EOF +#define wxUSE_IPC 1 +EOF + +fi + +if test "$wxUSE_CLIPBOARD" = "yes"; then + cat >> confdefs.h <<\EOF +#define wxUSE_CLIPBOARD 1 +EOF + + + cat >> confdefs.h <<\EOF +#define wxUSE_DATAOBJ 1 +EOF + +fi + +if test "$wxUSE_DRAG_AND_DROP" = "yes" ; then + if test "$wxUSE_GTK" = 1; then + if test "$WXGTK12" != 1; then + echo "configure: warning: Drag and drop is only supported under GTK+ 1.2" 1>&2 wxUSE_DRAG_AND_DROP=no fi fi + if test "$wxUSE_MOTIF" = 1; then + echo "configure: warning: Drag and drop is not yet supported under Motif" 1>&2 + wxUSE_DRAG_AND_DROP=no + fi + + if test "$wxUSE_MAC" = 1; then + echo "configure: warning: Drag and drop is not yet supported under Mac OS X" 1>&2 + wxUSE_DRAG_AND_DROP=no + fi + if test "$wxUSE_DRAG_AND_DROP" = "yes"; then cat >> confdefs.h <<\EOF #define wxUSE_DRAG_AND_DROP 1 @@ -16772,6 +17845,15 @@ EOF SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS notebook" fi +if test "$wxUSE_PROPSHEET" = "yes"; then + cat >> confdefs.h <<\EOF +#define wxUSE_PROPSHEET 1 +EOF + + USES_CONTROLS=1 + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS proplist" +fi + if test "$wxUSE_RADIOBOX" = "yes"; then cat >> confdefs.h <<\EOF #define wxUSE_RADIOBOX 1 @@ -16901,8 +17983,8 @@ EOF fi if test "$wxUSE_TOGGLEBTN" = "yes"; then - if test "$wxUSE_MAC" = 1; then - echo "configure: warning: Toggle button is not yet supported under Mac OS X" 1>&2 + if test "$wxUSE_MAC" = 1 -o "$wxUSE_UNIVERSAL" = "yes"; then + echo "configure: warning: Toggle button not yet supported under Mac OS X or wxUNIVERSAL... disabled" 1>&2 wxUSE_TOGGLEBTN=no fi @@ -16974,6 +18056,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 @@ -16982,6 +18076,13 @@ EOF fi +if test "$wxUSE_TREELAYOUT" = "yes"; then + cat >> confdefs.h <<\EOF +#define wxUSE_TREELAYOUT 1 +EOF + + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS treelay" +fi if test "$wxUSE_DRAGIMAGE" = "yes"; then cat >> confdefs.h <<\EOF @@ -17013,6 +18114,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 @@ -17027,7 +18135,6 @@ if test "$wxUSE_HTML" = "yes"; then EOF SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS html" - INCLUDE_SUBDIRS="$INCLUDE_SUBDIRS html" fi if test "$wxUSE_VALIDATORS" = "yes"; then @@ -17038,6 +18145,13 @@ EOF SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS validate" fi +if test "$wxUSE_PALETTE" = "yes" ; then + cat >> confdefs.h <<\EOF +#define wxUSE_PALETTE 1 +EOF + +fi + if test "$wxUSE_IMAGE" = "yes" ; then cat >> confdefs.h <<\EOF #define wxUSE_IMAGE 1 @@ -17095,6 +18209,13 @@ EOF fi +if test "$wxUSE_FINDREPLDLG" = "yes"; then + cat >> confdefs.h <<\EOF +#define wxUSE_FINDREPLDLG 1 +EOF + +fi + if test "$wxUSE_FONTDLG" = "yes"; then cat >> confdefs.h <<\EOF #define wxUSE_FONTDLG 1 @@ -17142,6 +18263,13 @@ EOF fi fi +if test "$wxUSE_SPLASH" = "yes"; then + cat >> confdefs.h <<\EOF +#define wxUSE_SPLASH 1 +EOF + +fi + if test "$wxUSE_STARTUP_TIPS" = "yes"; then if test "$wxUSE_CONSTRAINTS" != "yes"; then echo "configure: warning: Startup tips requires constraints and won't be compiled without them" 1>&2 @@ -17160,6 +18288,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\"" @@ -17174,63 +18310,69 @@ EOF -GUILIBS="$GUI_TK_LIBRARY $TOOLKIT_LINK" -OPENGL_LIBS="$OPENGL_LINK" - -EXTRA_LIBS="$LIBS $POSIX4_LINK $INET_LINK $WCHAR_LINK $THREADS_LINK $DMALLOC_LINK $DL_LINK $ZLIB_LINK -lm" -if test "$USE_MAC" = 1 ; then - EXTRA_LIBS="$EXTRA_LIBS -framework Carbon -framework System" -fi -if test "$wxUSE_GUI" = "yes"; then - EXTRA_LIBS="$GUILIBS $PNG_LINK $JPEG_LINK $TIFF_LINK $FREETYPE_LINK $EXTRA_LIBS" +if test "x$prefix" != "xNONE"; then + wxPREFIX=$prefix +else + wxPREFIX=$ac_default_prefix fi -LD_LIBS="\${top_builddir}/lib/${WX_LIBRARY_NAME_STATIC} $EXTRA_LIBS" +cat >> confdefs.h <&6 -echo "configure:17320: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:18462: 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 @@ -17343,14 +18485,8 @@ else fi -if test -d include; then - if test -d include/wx; then - if test -d include/wx/${SETUPH_DIR}; then - if test -f include/wx/${SETUPH_DIR}/setup.h; then - mv -f include/wx/${SETUPH_DIR}/setup.h setup.h - fi - fi - fi +if test -f lib/wx/include/${TOOLCHAIN_NAME}/wx/setup.h; then + mv -f lib/wx/include/${TOOLCHAIN_NAME}/wx/setup.h setup.h fi @@ -17360,9 +18496,10 @@ if test "$wxUSE_GUI" = "yes"; then wx_cv_path_ifs=$PATH_IFS wx_cv_program_ext=$PROGRAM_EXT wx_cv_target_library=$WX_TARGET_LIBRARY + wx_cv_target_library_gl=$WX_TARGET_LIBRARY_GL wx_cv_target_libtype=$WX_TARGET_LIBRARY_TYPE export wx_cv_path_samplesubdirs wx_cv_path_ifs wx_cv_program_ext \ - wx_cv_target_library wx_cv_target_libtype + wx_cv_target_library wx_cv_target_library_gl wx_cv_target_libtype subdirs="demos samples utils contrib" fi @@ -17524,7 +18661,6 @@ s%@build_os@%$build_os%g s%@CC@%$CC%g s%@CPP@%$CPP%g s%@CXX@%$CXX%g -s%@CXXCPP@%$CXXCPP%g s%@RANLIB@%$RANLIB%g s%@AR@%$AR%g s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g @@ -17543,78 +18679,66 @@ s%@X_CFLAGS@%$X_CFLAGS%g s%@X_PRE_LIBS@%$X_PRE_LIBS%g s%@X_LIBS@%$X_LIBS%g s%@X_EXTRA_LIBS@%$X_EXTRA_LIBS%g -s%@REZ@%$REZ%g +s%@RESCOMP@%$RESCOMP%g s%@DEREZ@%$DEREZ%g +s%@CXXCPP@%$CXXCPP%g s%@LEX_STEM@%$LEX_STEM%g s%@PATH_IFS@%$PATH_IFS%g s%@WX_MAJOR_VERSION_NUMBER@%$WX_MAJOR_VERSION_NUMBER%g s%@WX_MINOR_VERSION_NUMBER@%$WX_MINOR_VERSION_NUMBER%g s%@WX_RELEASE_NUMBER@%$WX_RELEASE_NUMBER%g -s%@WX_LIBRARY_NAME@%$WX_LIBRARY_NAME%g s%@WX_LIBRARY_NAME_STATIC@%$WX_LIBRARY_NAME_STATIC%g s%@WX_LIBRARY_NAME_SHARED@%$WX_LIBRARY_NAME_SHARED%g -s%@WX_LIBRARY@%$WX_LIBRARY%g +s%@WX_LIBRARY_IMPORTLIB@%$WX_LIBRARY_IMPORTLIB%g s%@WX_TARGET_LIBRARY@%$WX_TARGET_LIBRARY%g s%@WX_LIBRARY_LINK1@%$WX_LIBRARY_LINK1%g s%@WX_LIBRARY_LINK2@%$WX_LIBRARY_LINK2%g -s%@WX_LIBRARY_LINK3@%$WX_LIBRARY_LINK3%g s%@PROGRAM_EXT@%$PROGRAM_EXT%g -s%@WX_LIBRARY_NAME_GL@%$WX_LIBRARY_NAME_GL%g s%@WX_LIBRARY_NAME_STATIC_GL@%$WX_LIBRARY_NAME_STATIC_GL%g s%@WX_LIBRARY_NAME_SHARED_GL@%$WX_LIBRARY_NAME_SHARED_GL%g -s%@WX_LIBRARY_GL@%$WX_LIBRARY_GL%g s%@WX_TARGET_LIBRARY_GL@%$WX_TARGET_LIBRARY_GL%g s%@WX_LIBRARY_LINK1_GL@%$WX_LIBRARY_LINK1_GL%g s%@WX_LIBRARY_LINK2_GL@%$WX_LIBRARY_LINK2_GL%g -s%@WX_LIBRARY_LINK3_GL@%$WX_LIBRARY_LINK3_GL%g s%@WX_ALL@%$WX_ALL%g s%@WX_ALL_INSTALLED@%$WX_ALL_INSTALLED%g s%@SHARED_LD@%$SHARED_LD%g s%@PIC_FLAG@%$PIC_FLAG%g -s%@DEP_INFO_FLAGS@%$DEP_INFO_FLAGS%g s%@CODE_GEN_FLAGS@%$CODE_GEN_FLAGS%g s%@CODE_GEN_FLAGS_CXX@%$CODE_GEN_FLAGS_CXX%g -s%@BURNT_LIBRARY_NAME@%$BURNT_LIBRARY_NAME%g -s%@BURNT_LIBRARY_NAME_GL@%$BURNT_LIBRARY_NAME_GL%g +s%@SONAME_FLAGS@%$SONAME_FLAGS%g +s%@SONAME_FLAGS_GL@%$SONAME_FLAGS_GL%g s%@WX_TARGET_LIBRARY_SONAME@%$WX_TARGET_LIBRARY_SONAME%g s%@WX_TARGET_LIBRARY_TYPE@%$WX_TARGET_LIBRARY_TYPE%g s%@WXDEBUG_DEFINE@%$WXDEBUG_DEFINE%g s%@USE_GUI@%$USE_GUI%g s%@AFMINSTALL@%$AFMINSTALL%g -s%@SETUPH_DIR@%$SETUPH_DIR%g s%@TOOLKIT@%$TOOLKIT%g -s%@TOOLKIT_DEF@%$TOOLKIT_DEF%g s%@TOOLKIT_DIR@%$TOOLKIT_DIR%g -s%@TOOLKIT_NAME@%$TOOLKIT_NAME%g -s%@TOOLKIT_INCLUDE@%$TOOLKIT_INCLUDE%g s%@TOOLKIT_VPATH@%$TOOLKIT_VPATH%g +s%@TOOLCHAIN_NAME@%$TOOLCHAIN_NAME%g +s%@TOOLCHAIN_DEFS@%$TOOLCHAIN_DEFS%g +s%@TOOLCHAIN_DLL_DEFS@%$TOOLCHAIN_DLL_DEFS%g +s%@cross_compiling@%$cross_compiling%g +s%@WXCONFIG_LIBS@%$WXCONFIG_LIBS%g +s%@WXCONFIG_LIBS_GL@%$WXCONFIG_LIBS_GL%g s%@WXCONFIG_INCLUDE@%$WXCONFIG_INCLUDE%g s%@ALL_OBJECTS@%$ALL_OBJECTS%g -s%@ALL_DEPFILES@%$ALL_DEPFILES%g s%@GUIDIST@%$GUIDIST%g s%@PORT_FILES@%$PORT_FILES%g s%@DISTDIR@%$DISTDIR%g s%@RPM_SPEC@%$RPM_SPEC%g s%@RPM_FILES@%$RPM_FILES%g -s%@SRC_SUBDIRS@%$SRC_SUBDIRS%g -s%@INCLUDE_SUBDIRS@%$INCLUDE_SUBDIRS%g -s%@UTILS_SUBDIRS@%$UTILS_SUBDIRS%g -s%@DOCS_SUBDIRS@%$DOCS_SUBDIRS%g s%@SAMPLES_SUBDIRS@%$SAMPLES_SUBDIRS%g -s%@USER_SUBDIRS@%$USER_SUBDIRS%g -s%@EXTRA_LIBS@%$EXTRA_LIBS%g s%@OPENGL_LIBS@%$OPENGL_LIBS%g +s%@DMALLOC_LIBS@%$DMALLOC_LIBS%g s%@EXTRADEFS@%$EXTRADEFS%g -s%@LD_LIBS@%$LD_LIBS%g -s%@RCINPUTSWITCH@%$RCINPUTSWITCH%g -s%@RCOUTPUTSWITCH@%$RCOUTPUTSWITCH%g -s%@RESPROGRAM@%$RESPROGRAM%g -s%@RESCOMP@%$RESCOMP%g s%@RESFLAGS@%$RESFLAGS%g -s%@REZFLAGS@%$REZFLAGS%g -s%@DEREZFLAGS@%$DEREZFLAGS%g +s%@RESPROGRAMOBJ@%$RESPROGRAMOBJ%g +s%@WX_RESOURCES_MACOSX@%$WX_RESOURCES_MACOSX%g +s%@WX_RESOURCES_MACOSX_COMPILED@%$WX_RESOURCES_MACOSX_COMPILED%g s%@LIBWXMACRES@%$LIBWXMACRES%g s%@LIBWXMACRESCOMP@%$LIBWXMACRESCOMP%g +s%@LIBWXMACRESWXCONFIG@%$LIBWXMACRESWXCONFIG%g s%@DLLTOOL@%$DLLTOOL%g s%@AS@%$AS%g s%@NM@%$NM%g @@ -17837,21 +18961,19 @@ fi; done EOF cat >> $CONFIG_STATUS <> $CONFIG_STATUS <<\EOF - if test ! -f wx${TOOLKIT_NAME}-config; then + if test ! -h wx-config; then chmod +x wx-config - mv wx-config wx${TOOLKIT_NAME}-config - ${LN_S} wx${TOOLKIT_NAME}-config wx-config + mv wx-config wx${TOOLCHAIN_NAME}-config + ${LN_S} wx${TOOLCHAIN_NAME}-config wx-config fi - if test ! -d lib; then mkdir lib fi @@ -17861,30 +18983,15 @@ cat >> $CONFIG_STATUS <<\EOF if test ! -d lib/wx/include; then mkdir lib/wx/include fi - if test ! -d lib/wx/include/wx; then - mkdir lib/wx/include/wx + if test ! -d lib/wx/include/${TOOLCHAIN_NAME}; then + mkdir lib/wx/include/${TOOLCHAIN_NAME} fi - if test ! -d lib/wx/include/wx/${TOOLKIT_NAME}; then - mkdir lib/wx/include/wx/${TOOLKIT_NAME} + if test ! -d lib/wx/include/${TOOLCHAIN_NAME}/wx; then + mkdir lib/wx/include/${TOOLCHAIN_NAME}/wx fi if test -f setup.h; then - cp -fp setup.h lib/wx/include/wx/${TOOLKIT_NAME}/setup.h + mv -f setup.h lib/wx/include/${TOOLCHAIN_NAME}/wx/setup.h fi - - - if test ! -d include; then - mkdir include - fi - if test ! -d include/wx; then - mkdir include/wx - fi - if test ! -d include/wx/${SETUPH_DIR}; then - mkdir include/wx/${SETUPH_DIR} - fi - if test -f setup.h; then - cp -fp setup.h include/wx/${SETUPH_DIR}/setup.h - fi - exit 0 EOF