X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9c8849722a71ee7139e035bca5fdb2ae7b0af570..44762a6a87805bc36b653225828657ec98b66757:/configure diff --git a/configure b/configure index 75130071e8..7077f949cd 100755 --- a/configure +++ b/configure @@ -33,9 +33,6 @@ - - - @@ -51,6 +48,8 @@ ac_help= ac_default_prefix=/usr/local # Any additions from configure.in: +ac_help="$ac_help +--enable-gui use GUI classes" ac_help="$ac_help --with-gtk use GTK+" ac_help="$ac_help @@ -61,23 +60,25 @@ ac_help="$ac_help --with-cygwin use Cygwin for MS-Windows" ac_help="$ac_help --with-mingw use GCC Minimal MS-Windows" +ac_help="$ac_help + --with-pm use OS/2 Presentation Manager" ac_help="$ac_help --with-gtk-prefix=PFX Prefix where GTK is installed" ac_help="$ac_help --with-gtk-exec-prefix=PFX Exec prefix where GTK is installed" ac_help="$ac_help ---with-dmalloc use dmalloc library (www.letters.com/dmalloc)" -ac_help="$ac_help ---with-zlib use zlib for LZW compression" -ac_help="$ac_help --with-libpng use libpng (PNG image format)" ac_help="$ac_help ---with-libgif use libgif (GIF file format)" -ac_help="$ac_help --with-libjpeg use libjpeg (JPEG file format)" ac_help="$ac_help +--with-libtiff use libtiff (TIFF file format)" +ac_help="$ac_help --with-opengl use OpenGL (or Mesa)" ac_help="$ac_help +--with-dmalloc use dmalloc library (www.letters.com/dmalloc)" +ac_help="$ac_help +--with-zlib use zlib for LZW compression" +ac_help="$ac_help --with-odbc use the IODBC and wxODBC classes" ac_help="$ac_help --enable-shared create shared library code" @@ -102,7 +103,9 @@ ac_help="$ac_help ac_help="$ac_help --enable-no_exceptions create code without exceptions information" ac_help="$ac_help ---enable-gui use GUI classes" +--enable-permissive compile code disregarding strict ANSI" +ac_help="$ac_help +--enable-no_deps create code without dependency information" ac_help="$ac_help --enable-intl use internationalization system" ac_help="$ac_help @@ -110,6 +113,8 @@ ac_help="$ac_help ac_help="$ac_help --enable-sockets use socket/network classes" ac_help="$ac_help +--enable-dialupman use dialup network classes" +ac_help="$ac_help --enable-ipc use interprocess communication (wxSocket etc.)" ac_help="$ac_help --enable-apple_ieee use the Apple IEEE codec" @@ -196,6 +201,8 @@ ac_help="$ac_help ac_help="$ac_help --enable-grid use wxGrid class" ac_help="$ac_help +--enable-newgrid use new wxGrid class" +ac_help="$ac_help --enable-imaglist use wxImageList class" ac_help="$ac_help --enable-listbox use wxListBox class" @@ -216,6 +223,8 @@ ac_help="$ac_help ac_help="$ac_help --enable-spinbtn use wxSpinButton class" ac_help="$ac_help +--enable-spinctrl use wxSpinCtrl class" +ac_help="$ac_help --enable-splitter use wxSplitterWindow class" ac_help="$ac_help --enable-statbmp use wxStaticBitmap class" @@ -230,6 +239,10 @@ ac_help="$ac_help ac_help="$ac_help --enable-toolbar use wxToolBar class" ac_help="$ac_help +--enable-tbarnative use native wxToolBar class" +ac_help="$ac_help +--enable-tbarsmpl use wxToolBarSimple class" +ac_help="$ac_help --enable-treectrl use wxTreeCtrl class" ac_help="$ac_help --enable-commondlg use common dialogs (wxDirDialog, wxProgressDialog, wxTextDialog, ...)" @@ -253,6 +266,12 @@ ac_help="$ac_help --enable-validators use wxValidator and derived classes" ac_help="$ac_help --enable-busyinfo use wxBusyInfo" +ac_help="$ac_help +--enable-gif use gif images (GIF file format)" +ac_help="$ac_help +--enable-pcx use pcx images (PCX file format)" +ac_help="$ac_help +--enable-pnm use pnm images (PNM file format)" ac_help="$ac_help --with-x use the X Window System" @@ -813,7 +832,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:817: checking host system type" >&5 +echo "configure:836: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -834,7 +853,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:838: checking target system type" >&5 +echo "configure:857: checking target system type" >&5 target_alias=$target case "$target_alias" in @@ -852,7 +871,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:856: checking build system type" >&5 +echo "configure:875: checking build system type" >&5 build_alias=$build case "$build_alias" in @@ -878,7 +897,7 @@ test "$host_alias" != "$target_alias" && WX_MAJOR_VERSION_NUMBER=2 WX_MINOR_VERSION_NUMBER=1 -WX_RELEASE_NUMBER=0 +WX_RELEASE_NUMBER=12 WX_INTERFACE_AGE=0 WX_BINARY_AGE=0 @@ -892,6 +911,9 @@ WX_AGE=`expr $WX_BINARY_AGE - $WX_INTERFACE_AGE` USE_UNIX=1 +USE_WIN32=0 +USE_BEOS=0 + USE_LINUX= USE_SGI= USE_HPUX= @@ -911,22 +933,27 @@ USE_CYGWIN= USE_MINGW= USE_DATA_GENERAL= -ALL_TOOLKITS="CYGWIN GTK MINGW MOTIF WINE" +NEEDS_D_REENTRANT_FOR_R_FUNCS=0 + +ALL_TOOLKITS="CYGWIN GTK MINGW MOTIF WINE PM" DEFAULT_wxUSE_GTK=0 DEFAULT_wxUSE_MOTIF=0 DEFAULT_wxUSE_MSW=0 DEFAULT_wxUSE_WINE=0 +DEFAULT_wxUSE_PM=0 DEFAULT_DEFAULT_wxUSE_GTK=0 DEFAULT_DEFAULT_wxUSE_MOTIF=0 DEFAULT_DEFAULT_wxUSE_MSW=0 DEFAULT_DEFAULT_wxUSE_WINE=0 +DEFAULT_DEFAULT_wxUSE_PM=0 case "${host}" in *-hp-hpux* ) USE_HPUX=1 DEFAULT_DEFAULT_wxUSE_MOTIF=1 + NEEDS_D_REENTRANT_FOR_R_FUNCS=1 cat >> confdefs.h <<\EOF #define __HPUX__ 1 EOF @@ -978,6 +1005,7 @@ EOF EOF DEFAULT_DEFAULT_wxUSE_MOTIF=1 + NEEDS_D_REENTRANT_FOR_R_FUNCS=1 ;; *-*-sunos4* ) USE_SUN=1 @@ -1068,8 +1096,9 @@ EOF DEFAULT_DEFAULT_wxUSE_MOTIF=1 ;; - *-*-cygwin32* ) + *-*-cygwin32* | *-*-mingw32* ) USE_UNIX=0 + USE_WIN32=1 cat >> confdefs.h <<\EOF #define __WIN32__ 1 EOF @@ -1087,27 +1116,7 @@ EOF EOF cat >> confdefs.h <<\EOF -#define WINVER 0x0400 -EOF - - DEFAULT_DEFAULT_wxUSE_MSW=1 - ;; - *-*-mingw32* ) - USE_UNIX=0 - cat >> confdefs.h <<\EOF -#define __WIN32__ 1 -EOF - - cat >> confdefs.h <<\EOF -#define __WIN95__ 1 -EOF - - cat >> confdefs.h <<\EOF -#define __WINDOWS__ 1 -EOF - - cat >> confdefs.h <<\EOF -#define __GNUWIN32__ 1 +#define STRICT 1 EOF cat >> confdefs.h <<\EOF @@ -1120,6 +1129,15 @@ EOF *-pc-os2_emx ) cat >> confdefs.h <<\EOF #define __EMX__ 1 +EOF + + DEFAULT_DEFAULT_wxUSE_PM=1 + ;; + + *-*-beos* ) + USE_BEOS=1 + cat >> confdefs.h <<\EOF +#define __BEOS__ 1 EOF ;; @@ -1129,18 +1147,24 @@ EOF esac if test "$USE_UNIX" = 1 ; then - wxUSE_UNIX=yes - cat >> confdefs.h <<\EOF + wxUSE_UNIX=yes + cat >> confdefs.h <<\EOF #define __UNIX__ 1 EOF - SRC_SUBDIRS="$SRC_SUBDIRS unix" - INCLUDE_SUBDIRS="$INCLUDE_SUBDIRS unix" + + 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:1144: checking for gettext in -lc" >&5 +echo "configure:1168: checking for gettext in -lc" >&5 ac_lib_var=`echo c'_'gettext | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1148,7 +1172,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lc $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1187: \"$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 @@ -1201,8 +1225,10 @@ if test $DEBUG_CONFIGURE = 1; then DEFAULT_wxUSE_SHARED=yes 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_PERMISSIVE=no DEFAULT_wxUSE_DEBUG_FLAG=yes DEFAULT_wxUSE_DEBUG_INFO=yes DEFAULT_wxUSE_DEBUG_GDB=yes @@ -1217,8 +1243,8 @@ if test $DEBUG_CONFIGURE = 1; then DEFAULT_wxUSE_ZLIB=no DEFAULT_wxUSE_LIBPNG=no - DEFAULT_wxUSE_LIBGIF=no DEFAULT_wxUSE_LIBJPEG=no + DEFAULT_wxUSE_LIBTIFF=no DEFAULT_wxUSE_ODBC=no DEFAULT_wxUSE_STD_IOSTREAM=no @@ -1230,6 +1256,7 @@ if test $DEBUG_CONFIGURE = 1; then DEFAULT_wxUSE_CONFIG=no DEFAULT_wxUSE_STREAMS=no DEFAULT_wxUSE_SOCKETS=no + DEFAULT_wxUSE_DIALUP_MANAGER=no DEFAULT_wxUSE_SERIAL=no DEFAULT_wxUSE_JOYSTICK=no DEFAULT_wxUSE_DYNLIB_CLASS=no @@ -1279,6 +1306,7 @@ if test $DEBUG_CONFIGURE = 1; then DEFAULT_wxUSE_COMBOBOX=no DEFAULT_wxUSE_GAUGE=no DEFAULT_wxUSE_GRID=no + DEFAULT_wxUSE_NEW_GRID=no DEFAULT_wxUSE_IMAGLIST=no DEFAULT_wxUSE_LISTBOX=no DEFAULT_wxUSE_LISTCTRL=no @@ -1289,6 +1317,7 @@ if test $DEBUG_CONFIGURE = 1; then DEFAULT_wxUSE_SCROLLBAR=no DEFAULT_wxUSE_SLIDER=no DEFAULT_wxUSE_SPINBTN=no + DEFAULT_wxUSE_SPINCTRL=no DEFAULT_wxUSE_SPLITTER=no DEFAULT_wxUSE_STATBMP=no DEFAULT_wxUSE_STATBOX=no @@ -1296,18 +1325,26 @@ if test $DEBUG_CONFIGURE = 1; then DEFAULT_wxUSE_STATUSBAR=yes DEFAULT_wxUSE_TABDIALOG=no DEFAULT_wxUSE_TOOLBAR=no + DEFAULT_wxUSE_TOOLBAR_NATIVE=no + DEFAULT_wxUSE_TOOLBAR_SIMPLE=no DEFAULT_wxUSE_TREECTRL=no DEFAULT_wxUSE_UNICODE=no DEFAULT_wxUSE_WCSRTOMBS=no + + DEFAULT_wxUSE_GIF=no + DEFAULT_wxUSE_PCX=no + DEFAULT_wxUSE_PNM=no else DEFAULT_wxUSE_THREADS=yes DEFAULT_wxUSE_SHARED=yes 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_PERMISSIVE=no DEFAULT_wxUSE_DEBUG_FLAG=no DEFAULT_wxUSE_DEBUG_INFO=no DEFAULT_wxUSE_DEBUG_GDB=no @@ -1322,9 +1359,9 @@ else DEFAULT_wxUSE_ZLIB=yes DEFAULT_wxUSE_LIBPNG=yes - DEFAULT_wxUSE_LIBGIF=yes DEFAULT_wxUSE_LIBJPEG=yes - DEFAULT_wxUSE_ODBC=no + DEFAULT_wxUSE_LIBTIFF=yes + DEFAULT_wxUSE_ODBC=yes DEFAULT_wxUSE_STD_IOSTREAM=no DEFAULT_wxUSE_FILE=yes @@ -1335,10 +1372,11 @@ else DEFAULT_wxUSE_CONFIG=yes DEFAULT_wxUSE_STREAMS=yes DEFAULT_wxUSE_SOCKETS=yes + DEFAULT_wxUSE_DIALUP_MANAGER=yes DEFAULT_wxUSE_SERIAL=yes DEFAULT_wxUSE_JOYSTICK=yes DEFAULT_wxUSE_DYNLIB_CLASS=yes - DEFAULT_wxUSE_LONGLONG=no + DEFAULT_wxUSE_LONGLONG=yes DEFAULT_wxUSE_AFM_FOR_POSTSCRIPT=yes DEFAULT_wxUSE_NORMALIZED_PS_FONTS=yes @@ -1384,6 +1422,7 @@ else DEFAULT_wxUSE_COMBOBOX=yes DEFAULT_wxUSE_GAUGE=yes DEFAULT_wxUSE_GRID=yes + DEFAULT_wxUSE_NEW_GRID=no DEFAULT_wxUSE_IMAGLIST=yes DEFAULT_wxUSE_LISTBOX=yes DEFAULT_wxUSE_LISTCTRL=yes @@ -1394,6 +1433,7 @@ else DEFAULT_wxUSE_SCROLLBAR=yes DEFAULT_wxUSE_SLIDER=yes DEFAULT_wxUSE_SPINBTN=yes + DEFAULT_wxUSE_SPINCTRL=yes DEFAULT_wxUSE_SPLITTER=yes DEFAULT_wxUSE_STATBMP=yes DEFAULT_wxUSE_STATBOX=yes @@ -1401,10 +1441,16 @@ else DEFAULT_wxUSE_STATUSBAR=yes DEFAULT_wxUSE_TABDIALOG=no DEFAULT_wxUSE_TOOLBAR=yes + DEFAULT_wxUSE_TOOLBAR_NATIVE=yes + DEFAULT_wxUSE_TOOLBAR_SIMPLE=yes DEFAULT_wxUSE_TREECTRL=yes DEFAULT_wxUSE_UNICODE=no DEFAULT_wxUSE_WCSRTOMBS=no + + DEFAULT_wxUSE_GIF=yes + DEFAULT_wxUSE_PCX=yes + DEFAULT_wxUSE_PNM=yes fi @@ -1418,6 +1464,49 @@ for toolkit in `echo $ALL_TOOLKITS`; do fi done + + + echo $ac_n "checking "for --enable-gui"""... $ac_c" 1>&6 +echo "configure:1471: checking "for --enable-gui"" >&5 + no_cache=0 + # Check whether --enable-gui or --disable-gui was given. +if test "${enable_gui+set}" = set; then + enableval="$enable_gui" + + if test "$enableval" = yes; then + ac_cv_use_gui='wxUSE_GUI=yes' + else + ac_cv_use_gui='wxUSE_GUI=no' + fi + +else + + LINE=`grep "wxUSE_GUI" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_gui='wxUSE_GUI='$DEFAULT_wxUSE_GUI + +fi + + + eval "$ac_cv_use_gui" + if test "$no_cache" != 1; then + echo $ac_cv_use_gui >> ${wx_arg_cache_file}.tmp + fi + + if test "$wxUSE_GUI" = yes; then + echo "$ac_t""yes" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + + +if test "$wxUSE_GUI" = "yes"; then + # Check whether --with-gtk or --without-gtk was given. if test "${with_gtk+set}" = set; then withval="$with_gtk" @@ -1448,6 +1537,12 @@ if test "${with_mingw+set}" = set; then wxUSE_MINGW="$withval" CACHE_MINGW=1 TOOLKIT_GIVEN=1 fi +# Check whether --with-pm or --without-pm was given. +if test "${with_pm+set}" = set; then + withval="$with_pm" + wxUSE_PM="$withval" CACHE_PM=1 TOOLKIT_GIVEN=1 +fi + # Check whether --with-gtk-prefix or --without-gtk-prefix was given. if test "${with_gtk_prefix+set}" = set; then @@ -1467,234 +1562,237 @@ fi - echo $ac_n "checking "for --with-dmalloc"""... $ac_c" 1>&6 -echo "configure:1472: checking "for --with-dmalloc"" >&5 + echo $ac_n "checking "for --with-libpng"""... $ac_c" 1>&6 +echo "configure:1567: checking "for --with-libpng"" >&5 no_cache=0 - # Check whether --with-dmalloc or --without-dmalloc was given. -if test "${with_dmalloc+set}" = set; then - withval="$with_dmalloc" + # Check whether --with-libpng or --without-libpng was given. +if test "${with_libpng+set}" = set; then + withval="$with_libpng" if test "$withval" = yes; then - ac_cv_use_dmalloc='wxUSE_DMALLOC=yes' + ac_cv_use_libpng='wxUSE_LIBPNG=yes' else - ac_cv_use_dmalloc='wxUSE_DMALLOC=no' + ac_cv_use_libpng='wxUSE_LIBPNG=no' fi else - LINE=`grep "wxUSE_DMALLOC" ${wx_arg_cache_file}` + LINE=`grep "wxUSE_LIBPNG" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_dmalloc='wxUSE_DMALLOC='$DEFAULT_wxUSE_DMALLOC + ac_cv_use_libpng='wxUSE_LIBPNG='$DEFAULT_wxUSE_LIBPNG fi - eval "$ac_cv_use_dmalloc" + eval "$ac_cv_use_libpng" if test "$no_cache" != 1; then - echo $ac_cv_use_dmalloc >> ${wx_arg_cache_file}.tmp + echo $ac_cv_use_libpng >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_DMALLOC" = yes; then + if test "$wxUSE_LIBPNG" = yes; then echo "$ac_t""yes" 1>&6 else echo "$ac_t""no" 1>&6 fi - echo $ac_n "checking "for --with-zlib"""... $ac_c" 1>&6 -echo "configure:1511: checking "for --with-zlib"" >&5 + echo $ac_n "checking "for --with-libjpeg"""... $ac_c" 1>&6 +echo "configure:1606: checking "for --with-libjpeg"" >&5 no_cache=0 - # Check whether --with-zlib or --without-zlib was given. -if test "${with_zlib+set}" = set; then - withval="$with_zlib" + # Check whether --with-libjpeg or --without-libjpeg was given. +if test "${with_libjpeg+set}" = set; then + withval="$with_libjpeg" if test "$withval" = yes; then - ac_cv_use_zlib='wxUSE_ZLIB=yes' + ac_cv_use_libjpeg='wxUSE_LIBJPEG=yes' else - ac_cv_use_zlib='wxUSE_ZLIB=no' + ac_cv_use_libjpeg='wxUSE_LIBJPEG=no' fi else - LINE=`grep "wxUSE_ZLIB" ${wx_arg_cache_file}` + LINE=`grep "wxUSE_LIBJPEG" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_zlib='wxUSE_ZLIB='$DEFAULT_wxUSE_ZLIB + ac_cv_use_libjpeg='wxUSE_LIBJPEG='$DEFAULT_wxUSE_LIBJPEG fi - eval "$ac_cv_use_zlib" + eval "$ac_cv_use_libjpeg" if test "$no_cache" != 1; then - echo $ac_cv_use_zlib >> ${wx_arg_cache_file}.tmp + echo $ac_cv_use_libjpeg >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_ZLIB" = yes; then + if test "$wxUSE_LIBJPEG" = yes; then echo "$ac_t""yes" 1>&6 else echo "$ac_t""no" 1>&6 fi - echo $ac_n "checking "for --with-libpng"""... $ac_c" 1>&6 -echo "configure:1550: checking "for --with-libpng"" >&5 + echo $ac_n "checking "for --with-libtiff"""... $ac_c" 1>&6 +echo "configure:1645: checking "for --with-libtiff"" >&5 no_cache=0 - # Check whether --with-libpng or --without-libpng was given. -if test "${with_libpng+set}" = set; then - withval="$with_libpng" + # Check whether --with-libtiff or --without-libtiff was given. +if test "${with_libtiff+set}" = set; then + withval="$with_libtiff" if test "$withval" = yes; then - ac_cv_use_libpng='wxUSE_LIBPNG=yes' + ac_cv_use_libtiff='wxUSE_LIBTIFF=yes' else - ac_cv_use_libpng='wxUSE_LIBPNG=no' + ac_cv_use_libtiff='wxUSE_LIBTIFF=no' fi else - LINE=`grep "wxUSE_LIBPNG" ${wx_arg_cache_file}` + LINE=`grep "wxUSE_LIBTIFF" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_libpng='wxUSE_LIBPNG='$DEFAULT_wxUSE_LIBPNG + ac_cv_use_libtiff='wxUSE_LIBTIFF='$DEFAULT_wxUSE_LIBTIFF fi - eval "$ac_cv_use_libpng" + eval "$ac_cv_use_libtiff" if test "$no_cache" != 1; then - echo $ac_cv_use_libpng >> ${wx_arg_cache_file}.tmp + echo $ac_cv_use_libtiff >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_LIBPNG" = yes; then + if test "$wxUSE_LIBTIFF" = yes; then echo "$ac_t""yes" 1>&6 else echo "$ac_t""no" 1>&6 fi - echo $ac_n "checking "for --with-libgif"""... $ac_c" 1>&6 -echo "configure:1589: checking "for --with-libgif"" >&5 + echo $ac_n "checking "for --with-opengl"""... $ac_c" 1>&6 +echo "configure:1684: checking "for --with-opengl"" >&5 no_cache=0 - # Check whether --with-libgif or --without-libgif was given. -if test "${with_libgif+set}" = set; then - withval="$with_libgif" + # Check whether --with-opengl or --without-opengl was given. +if test "${with_opengl+set}" = set; then + withval="$with_opengl" if test "$withval" = yes; then - ac_cv_use_libgif='wxUSE_LIBGIF=yes' + ac_cv_use_opengl='wxUSE_OPENGL=yes' else - ac_cv_use_libgif='wxUSE_LIBGIF=no' + ac_cv_use_opengl='wxUSE_OPENGL=no' fi else - LINE=`grep "wxUSE_LIBGIF" ${wx_arg_cache_file}` + LINE=`grep "wxUSE_OPENGL" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_libgif='wxUSE_LIBGIF='$DEFAULT_wxUSE_LIBGIF + ac_cv_use_opengl='wxUSE_OPENGL='$DEFAULT_wxUSE_OPENGL fi - eval "$ac_cv_use_libgif" + eval "$ac_cv_use_opengl" if test "$no_cache" != 1; then - echo $ac_cv_use_libgif >> ${wx_arg_cache_file}.tmp + echo $ac_cv_use_opengl >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_LIBGIF" = yes; then + if test "$wxUSE_OPENGL" = yes; then echo "$ac_t""yes" 1>&6 else echo "$ac_t""no" 1>&6 fi - echo $ac_n "checking "for --with-libjpeg"""... $ac_c" 1>&6 -echo "configure:1628: checking "for --with-libjpeg"" >&5 +fi + + + echo $ac_n "checking "for --with-dmalloc"""... $ac_c" 1>&6 +echo "configure:1726: checking "for --with-dmalloc"" >&5 no_cache=0 - # Check whether --with-libjpeg or --without-libjpeg was given. -if test "${with_libjpeg+set}" = set; then - withval="$with_libjpeg" + # Check whether --with-dmalloc or --without-dmalloc was given. +if test "${with_dmalloc+set}" = set; then + withval="$with_dmalloc" if test "$withval" = yes; then - ac_cv_use_libjpeg='wxUSE_LIBJPEG=yes' + ac_cv_use_dmalloc='wxUSE_DMALLOC=yes' else - ac_cv_use_libjpeg='wxUSE_LIBJPEG=no' + ac_cv_use_dmalloc='wxUSE_DMALLOC=no' fi else - LINE=`grep "wxUSE_LIBJPEG" ${wx_arg_cache_file}` + LINE=`grep "wxUSE_DMALLOC" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_libjpeg='wxUSE_LIBJPEG='$DEFAULT_wxUSE_LIBJPEG + ac_cv_use_dmalloc='wxUSE_DMALLOC='$DEFAULT_wxUSE_DMALLOC fi - eval "$ac_cv_use_libjpeg" + eval "$ac_cv_use_dmalloc" if test "$no_cache" != 1; then - echo $ac_cv_use_libjpeg >> ${wx_arg_cache_file}.tmp + echo $ac_cv_use_dmalloc >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_LIBJPEG" = yes; then + if test "$wxUSE_DMALLOC" = yes; then echo "$ac_t""yes" 1>&6 else echo "$ac_t""no" 1>&6 fi - echo $ac_n "checking "for --with-opengl"""... $ac_c" 1>&6 -echo "configure:1667: checking "for --with-opengl"" >&5 + echo $ac_n "checking "for --with-zlib"""... $ac_c" 1>&6 +echo "configure:1765: checking "for --with-zlib"" >&5 no_cache=0 - # Check whether --with-opengl or --without-opengl was given. -if test "${with_opengl+set}" = set; then - withval="$with_opengl" + # Check whether --with-zlib or --without-zlib was given. +if test "${with_zlib+set}" = set; then + withval="$with_zlib" if test "$withval" = yes; then - ac_cv_use_opengl='wxUSE_OPENGL=yes' + ac_cv_use_zlib='wxUSE_ZLIB=yes' else - ac_cv_use_opengl='wxUSE_OPENGL=no' + ac_cv_use_zlib='wxUSE_ZLIB=no' fi else - LINE=`grep "wxUSE_OPENGL" ${wx_arg_cache_file}` + LINE=`grep "wxUSE_ZLIB" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_opengl='wxUSE_OPENGL='$DEFAULT_wxUSE_OPENGL + ac_cv_use_zlib='wxUSE_ZLIB='$DEFAULT_wxUSE_ZLIB fi - eval "$ac_cv_use_opengl" + eval "$ac_cv_use_zlib" if test "$no_cache" != 1; then - echo $ac_cv_use_opengl >> ${wx_arg_cache_file}.tmp + echo $ac_cv_use_zlib >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_OPENGL" = yes; then + if test "$wxUSE_ZLIB" = yes; then echo "$ac_t""yes" 1>&6 else echo "$ac_t""no" 1>&6 @@ -1702,7 +1800,7 @@ fi echo $ac_n "checking "for --with-odbc"""... $ac_c" 1>&6 -echo "configure:1706: checking "for --with-odbc"" >&5 +echo "configure:1804: checking "for --with-odbc"" >&5 no_cache=0 # Check whether --with-odbc or --without-odbc was given. if test "${with_odbc+set}" = set; then @@ -1744,7 +1842,7 @@ fi echo $ac_n "checking "for --enable-shared"""... $ac_c" 1>&6 -echo "configure:1748: checking "for --enable-shared"" >&5 +echo "configure:1846: checking "for --enable-shared"" >&5 no_cache=0 # Check whether --enable-shared or --disable-shared was given. if test "${enable_shared+set}" = set; then @@ -1783,7 +1881,7 @@ fi echo $ac_n "checking "for --enable-optimise"""... $ac_c" 1>&6 -echo "configure:1787: checking "for --enable-optimise"" >&5 +echo "configure:1885: checking "for --enable-optimise"" >&5 no_cache=0 # Check whether --enable-optimise or --disable-optimise was given. if test "${enable_optimise+set}" = set; then @@ -1822,7 +1920,7 @@ fi echo $ac_n "checking "for --enable-debug"""... $ac_c" 1>&6 -echo "configure:1826: checking "for --enable-debug"" >&5 +echo "configure:1924: checking "for --enable-debug"" >&5 no_cache=0 # Check whether --enable-debug or --disable-debug was given. if test "${enable_debug+set}" = set; then @@ -1870,7 +1968,7 @@ fi echo $ac_n "checking "for --enable-debug_flag"""... $ac_c" 1>&6 -echo "configure:1874: checking "for --enable-debug_flag"" >&5 +echo "configure:1972: 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 @@ -1909,7 +2007,7 @@ fi echo $ac_n "checking "for --enable-debug_info"""... $ac_c" 1>&6 -echo "configure:1913: checking "for --enable-debug_info"" >&5 +echo "configure:2011: 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 @@ -1948,7 +2046,7 @@ fi echo $ac_n "checking "for --enable-debug_gdb"""... $ac_c" 1>&6 -echo "configure:1952: checking "for --enable-debug_gdb"" >&5 +echo "configure:2050: 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 @@ -1987,7 +2085,7 @@ fi echo $ac_n "checking "for --enable-debug_cntxt"""... $ac_c" 1>&6 -echo "configure:1991: checking "for --enable-debug_cntxt"" >&5 +echo "configure:2089: 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 @@ -2026,7 +2124,7 @@ fi echo $ac_n "checking "for --enable-mem_tracing"""... $ac_c" 1>&6 -echo "configure:2030: checking "for --enable-mem_tracing"" >&5 +echo "configure:2128: 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 @@ -2065,7 +2163,7 @@ fi echo $ac_n "checking "for --enable-profile"""... $ac_c" 1>&6 -echo "configure:2069: checking "for --enable-profile"" >&5 +echo "configure:2167: checking "for --enable-profile"" >&5 no_cache=0 # Check whether --enable-profile or --disable-profile was given. if test "${enable_profile+set}" = set; then @@ -2104,7 +2202,7 @@ fi echo $ac_n "checking "for --enable-no_rtti"""... $ac_c" 1>&6 -echo "configure:2108: checking "for --enable-no_rtti"" >&5 +echo "configure:2206: 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 @@ -2143,7 +2241,7 @@ fi echo $ac_n "checking "for --enable-no_exceptions"""... $ac_c" 1>&6 -echo "configure:2147: checking "for --enable-no_exceptions"" >&5 +echo "configure:2245: 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 @@ -2181,41 +2279,78 @@ fi fi + echo $ac_n "checking "for --enable-permissive"""... $ac_c" 1>&6 +echo "configure:2284: checking "for --enable-permissive"" >&5 + no_cache=0 + # Check whether --enable-permissive or --disable-permissive was given. +if test "${enable_permissive+set}" = set; then + enableval="$enable_permissive" + + if test "$enableval" = yes; then + ac_cv_use_permissive='wxUSE_PERMISSIVE=yes' + else + ac_cv_use_permissive='wxUSE_PERMISSIVE=no' + fi + +else + + LINE=`grep "wxUSE_PERMISSIVE" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_permissive='wxUSE_PERMISSIVE='$DEFAULT_wxUSE_PERMISSIVE + +fi - echo $ac_n "checking "for --enable-gui"""... $ac_c" 1>&6 -echo "configure:2188: checking "for --enable-gui"" >&5 + eval "$ac_cv_use_permissive" + if test "$no_cache" != 1; then + echo $ac_cv_use_permissive >> ${wx_arg_cache_file}.tmp + fi + + if test "$wxUSE_PERMISSIVE" = yes; then + echo "$ac_t""yes" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + + + echo $ac_n "checking "for --enable-no_deps"""... $ac_c" 1>&6 +echo "configure:2323: checking "for --enable-no_deps"" >&5 no_cache=0 - # Check whether --enable-gui or --disable-gui was given. -if test "${enable_gui+set}" = set; then - enableval="$enable_gui" + # Check whether --enable-no_deps or --disable-no_deps was given. +if test "${enable_no_deps+set}" = set; then + enableval="$enable_no_deps" if test "$enableval" = yes; then - ac_cv_use_gui='wxUSE_GUI=yes' + ac_cv_use_no_deps='wxUSE_NO_DEPS=yes' else - ac_cv_use_gui='wxUSE_GUI=no' + ac_cv_use_no_deps='wxUSE_NO_DEPS=no' fi else - LINE=`grep "wxUSE_GUI" ${wx_arg_cache_file}` + LINE=`grep "wxUSE_NO_DEPS" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_gui='wxUSE_GUI='$DEFAULT_wxUSE_GUI + ac_cv_use_no_deps='wxUSE_NO_DEPS='$DEFAULT_wxUSE_NO_DEPS fi - eval "$ac_cv_use_gui" + eval "$ac_cv_use_no_deps" if test "$no_cache" != 1; then - echo $ac_cv_use_gui >> ${wx_arg_cache_file}.tmp + echo $ac_cv_use_no_deps >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_GUI" = yes; then + if test "$wxUSE_NO_DEPS" = yes; then echo "$ac_t""yes" 1>&6 else echo "$ac_t""no" 1>&6 @@ -2225,7 +2360,7 @@ fi echo $ac_n "checking "for --enable-intl"""... $ac_c" 1>&6 -echo "configure:2229: checking "for --enable-intl"" >&5 +echo "configure:2364: checking "for --enable-intl"" >&5 no_cache=0 # Check whether --enable-intl or --disable-intl was given. if test "${enable_intl+set}" = set; then @@ -2264,7 +2399,7 @@ fi echo $ac_n "checking "for --enable-config"""... $ac_c" 1>&6 -echo "configure:2268: checking "for --enable-config"" >&5 +echo "configure:2403: checking "for --enable-config"" >&5 no_cache=0 # Check whether --enable-config or --disable-config was given. if test "${enable_config+set}" = set; then @@ -2302,8 +2437,10 @@ fi fi - echo $ac_n "checking "for --enable-sockets"""... $ac_c" 1>&6 -echo "configure:2307: checking "for --enable-sockets"" >&5 +if test "$wxUSE_GUI" = "yes"; then + + echo $ac_n "checking "for --enable-sockets"""... $ac_c" 1>&6 +echo "configure:2444: checking "for --enable-sockets"" >&5 no_cache=0 # Check whether --enable-sockets or --disable-sockets was given. if test "${enable_sockets+set}" = set; then @@ -2340,9 +2477,52 @@ fi echo "$ac_t""no" 1>&6 fi +else +wxUSE_SOCKETS=no +fi + + + echo $ac_n "checking "for --enable-dialupman"""... $ac_c" 1>&6 +echo "configure:2487: checking "for --enable-dialupman"" >&5 + no_cache=0 + # Check whether --enable-dialupman or --disable-dialupman was given. +if test "${enable_dialupman+set}" = set; then + enableval="$enable_dialupman" + + if test "$enableval" = yes; then + ac_cv_use_dialupman='wxUSE_DIALUP_MANAGER=yes' + else + ac_cv_use_dialupman='wxUSE_DIALUP_MANAGER=no' + fi + +else + + LINE=`grep "wxUSE_DIALUP_MANAGER" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_dialupman='wxUSE_DIALUP_MANAGER='$DEFAULT_wxUSE_DIALUP_MANAGER + +fi + + + eval "$ac_cv_use_dialupman" + if test "$no_cache" != 1; then + echo $ac_cv_use_dialupman >> ${wx_arg_cache_file}.tmp + fi + + if test "$wxUSE_DIALUP_MANAGER" = yes; then + echo "$ac_t""yes" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + echo $ac_n "checking "for --enable-ipc"""... $ac_c" 1>&6 -echo "configure:2346: checking "for --enable-ipc"" >&5 +echo "configure:2526: checking "for --enable-ipc"" >&5 no_cache=0 # Check whether --enable-ipc or --disable-ipc was given. if test "${enable_ipc+set}" = set; then @@ -2381,7 +2561,7 @@ fi echo $ac_n "checking "for --enable-apple_ieee"""... $ac_c" 1>&6 -echo "configure:2385: checking "for --enable-apple_ieee"" >&5 +echo "configure:2565: 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 @@ -2420,7 +2600,7 @@ fi echo $ac_n "checking "for --enable-timedate"""... $ac_c" 1>&6 -echo "configure:2424: checking "for --enable-timedate"" >&5 +echo "configure:2604: checking "for --enable-timedate"" >&5 no_cache=0 # Check whether --enable-timedate or --disable-timedate was given. if test "${enable_timedate+set}" = set; then @@ -2459,7 +2639,7 @@ fi echo $ac_n "checking "for --enable-wave"""... $ac_c" 1>&6 -echo "configure:2463: checking "for --enable-wave"" >&5 +echo "configure:2643: checking "for --enable-wave"" >&5 no_cache=0 # Check whether --enable-wave or --disable-wave was given. if test "${enable_wave+set}" = set; then @@ -2498,7 +2678,7 @@ fi echo $ac_n "checking "for --enable-fraction"""... $ac_c" 1>&6 -echo "configure:2502: checking "for --enable-fraction"" >&5 +echo "configure:2682: checking "for --enable-fraction"" >&5 no_cache=0 # Check whether --enable-fraction or --disable-fraction was given. if test "${enable_fraction+set}" = set; then @@ -2537,7 +2717,7 @@ fi echo $ac_n "checking "for --enable-dynlib"""... $ac_c" 1>&6 -echo "configure:2541: checking "for --enable-dynlib"" >&5 +echo "configure:2721: checking "for --enable-dynlib"" >&5 no_cache=0 # Check whether --enable-dynlib or --disable-dynlib was given. if test "${enable_dynlib+set}" = set; then @@ -2576,7 +2756,7 @@ fi echo $ac_n "checking "for --enable-longlong"""... $ac_c" 1>&6 -echo "configure:2580: checking "for --enable-longlong"" >&5 +echo "configure:2760: checking "for --enable-longlong"" >&5 no_cache=0 # Check whether --enable-longlong or --disable-longlong was given. if test "${enable_longlong+set}" = set; then @@ -2615,7 +2795,7 @@ fi echo $ac_n "checking "for --enable-log"""... $ac_c" 1>&6 -echo "configure:2619: checking "for --enable-log"" >&5 +echo "configure:2799: checking "for --enable-log"" >&5 no_cache=0 # Check whether --enable-log or --disable-log was given. if test "${enable_log+set}" = set; then @@ -2654,7 +2834,7 @@ fi echo $ac_n "checking "for --enable-streams"""... $ac_c" 1>&6 -echo "configure:2658: checking "for --enable-streams"" >&5 +echo "configure:2838: checking "for --enable-streams"" >&5 no_cache=0 # Check whether --enable-streams or --disable-streams was given. if test "${enable_streams+set}" = set; then @@ -2693,7 +2873,7 @@ fi echo $ac_n "checking "for --enable-file"""... $ac_c" 1>&6 -echo "configure:2697: checking "for --enable-file"" >&5 +echo "configure:2877: checking "for --enable-file"" >&5 no_cache=0 # Check whether --enable-file or --disable-file was given. if test "${enable_file+set}" = set; then @@ -2732,7 +2912,7 @@ fi echo $ac_n "checking "for --enable-textfile"""... $ac_c" 1>&6 -echo "configure:2736: checking "for --enable-textfile"" >&5 +echo "configure:2916: checking "for --enable-textfile"" >&5 no_cache=0 # Check whether --enable-textfile or --disable-textfile was given. if test "${enable_textfile+set}" = set; then @@ -2771,7 +2951,7 @@ fi echo $ac_n "checking "for --enable-unicode"""... $ac_c" 1>&6 -echo "configure:2775: checking "for --enable-unicode"" >&5 +echo "configure:2955: checking "for --enable-unicode"" >&5 no_cache=0 # Check whether --enable-unicode or --disable-unicode was given. if test "${enable_unicode+set}" = set; then @@ -2810,7 +2990,7 @@ fi echo $ac_n "checking "for --enable-wcsrtombs"""... $ac_c" 1>&6 -echo "configure:2814: checking "for --enable-wcsrtombs"" >&5 +echo "configure:2994: checking "for --enable-wcsrtombs"" >&5 no_cache=0 # Check whether --enable-wcsrtombs or --disable-wcsrtombs was given. if test "${enable_wcsrtombs+set}" = set; then @@ -2849,7 +3029,7 @@ fi echo $ac_n "checking "for --enable-wxprintfv"""... $ac_c" 1>&6 -echo "configure:2853: checking "for --enable-wxprintfv"" >&5 +echo "configure:3033: checking "for --enable-wxprintfv"" >&5 no_cache=0 # Check whether --enable-wxprintfv or --disable-wxprintfv was given. if test "${enable_wxprintfv+set}" = set; then @@ -2888,7 +3068,7 @@ fi echo $ac_n "checking "for --enable-joystick"""... $ac_c" 1>&6 -echo "configure:2892: checking "for --enable-joystick"" >&5 +echo "configure:3072: checking "for --enable-joystick"" >&5 no_cache=0 # Check whether --enable-joystick or --disable-joystick was given. if test "${enable_joystick+set}" = set; then @@ -2927,7 +3107,7 @@ fi echo $ac_n "checking "for --enable-std_iostreams"""... $ac_c" 1>&6 -echo "configure:2931: checking "for --enable-std_iostreams"" >&5 +echo "configure:3111: 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 @@ -2966,7 +3146,7 @@ fi echo $ac_n "checking "for --enable-fs_inet"""... $ac_c" 1>&6 -echo "configure:2970: checking "for --enable-fs_inet"" >&5 +echo "configure:3150: 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 @@ -3005,7 +3185,7 @@ fi echo $ac_n "checking "for --enable-fs_zip"""... $ac_c" 1>&6 -echo "configure:3009: checking "for --enable-fs_zip"" >&5 +echo "configure:3189: 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 @@ -3044,7 +3224,7 @@ fi echo $ac_n "checking "for --enable-zipstream"""... $ac_c" 1>&6 -echo "configure:3048: checking "for --enable-zipstream"" >&5 +echo "configure:3228: checking "for --enable-zipstream"" >&5 no_cache=0 # Check whether --enable-zipstream or --disable-zipstream was given. if test "${enable_zipstream+set}" = set; then @@ -3085,7 +3265,7 @@ fi echo $ac_n "checking "for --enable-threads"""... $ac_c" 1>&6 -echo "configure:3089: checking "for --enable-threads"" >&5 +echo "configure:3269: checking "for --enable-threads"" >&5 no_cache=0 # Check whether --enable-threads or --disable-threads was given. if test "${enable_threads+set}" = set; then @@ -3124,7 +3304,7 @@ fi echo $ac_n "checking "for --enable-serial"""... $ac_c" 1>&6 -echo "configure:3128: checking "for --enable-serial"" >&5 +echo "configure:3308: checking "for --enable-serial"" >&5 no_cache=0 # Check whether --enable-serial or --disable-serial was given. if test "${enable_serial+set}" = set; then @@ -3162,10 +3342,12 @@ fi fi +if test "$wxUSE_GUI" = "yes"; then + echo $ac_n "checking "for --enable-docview"""... $ac_c" 1>&6 -echo "configure:3169: checking "for --enable-docview"" >&5 +echo "configure:3351: checking "for --enable-docview"" >&5 no_cache=0 # Check whether --enable-docview or --disable-docview was given. if test "${enable_docview+set}" = set; then @@ -3204,7 +3386,7 @@ fi echo $ac_n "checking "for --enable-help"""... $ac_c" 1>&6 -echo "configure:3208: checking "for --enable-help"" >&5 +echo "configure:3390: checking "for --enable-help"" >&5 no_cache=0 # Check whether --enable-help or --disable-help was given. if test "${enable_help+set}" = set; then @@ -3243,7 +3425,7 @@ fi echo $ac_n "checking "for --enable-constraints"""... $ac_c" 1>&6 -echo "configure:3247: checking "for --enable-constraints"" >&5 +echo "configure:3429: checking "for --enable-constraints"" >&5 no_cache=0 # Check whether --enable-constraints or --disable-constraints was given. if test "${enable_constraints+set}" = set; then @@ -3282,7 +3464,7 @@ fi echo $ac_n "checking "for --enable-printarch"""... $ac_c" 1>&6 -echo "configure:3286: checking "for --enable-printarch"" >&5 +echo "configure:3468: checking "for --enable-printarch"" >&5 no_cache=0 # Check whether --enable-printarch or --disable-printarch was given. if test "${enable_printarch+set}" = set; then @@ -3321,7 +3503,7 @@ fi echo $ac_n "checking "for --enable-mdi"""... $ac_c" 1>&6 -echo "configure:3325: checking "for --enable-mdi"" >&5 +echo "configure:3507: checking "for --enable-mdi"" >&5 no_cache=0 # Check whether --enable-mdi or --disable-mdi was given. if test "${enable_mdi+set}" = set; then @@ -3361,7 +3543,7 @@ fi echo $ac_n "checking "for --enable-postscript"""... $ac_c" 1>&6 -echo "configure:3365: checking "for --enable-postscript"" >&5 +echo "configure:3547: checking "for --enable-postscript"" >&5 no_cache=0 # Check whether --enable-postscript or --disable-postscript was given. if test "${enable_postscript+set}" = set; then @@ -3402,7 +3584,7 @@ fi echo $ac_n "checking "for --enable-prologio"""... $ac_c" 1>&6 -echo "configure:3406: checking "for --enable-prologio"" >&5 +echo "configure:3588: checking "for --enable-prologio"" >&5 no_cache=0 # Check whether --enable-prologio or --disable-prologio was given. if test "${enable_prologio+set}" = set; then @@ -3441,7 +3623,7 @@ fi echo $ac_n "checking "for --enable-resources"""... $ac_c" 1>&6 -echo "configure:3445: checking "for --enable-resources"" >&5 +echo "configure:3627: checking "for --enable-resources"" >&5 no_cache=0 # Check whether --enable-resources or --disable-resources was given. if test "${enable_resources+set}" = set; then @@ -3481,7 +3663,7 @@ fi echo $ac_n "checking "for --enable-xresources"""... $ac_c" 1>&6 -echo "configure:3485: checking "for --enable-xresources"" >&5 +echo "configure:3667: checking "for --enable-xresources"" >&5 no_cache=0 # Check whether --enable-xresources or --disable-xresources was given. if test "${enable_xresources+set}" = set; then @@ -3522,7 +3704,7 @@ fi echo $ac_n "checking "for --enable-clipboard"""... $ac_c" 1>&6 -echo "configure:3526: checking "for --enable-clipboard"" >&5 +echo "configure:3708: checking "for --enable-clipboard"" >&5 no_cache=0 # Check whether --enable-clipboard or --disable-clipboard was given. if test "${enable_clipboard+set}" = set; then @@ -3561,7 +3743,7 @@ fi echo $ac_n "checking "for --enable-dnd"""... $ac_c" 1>&6 -echo "configure:3565: checking "for --enable-dnd"" >&5 +echo "configure:3747: checking "for --enable-dnd"" >&5 no_cache=0 # Check whether --enable-dnd or --disable-dnd was given. if test "${enable_dnd+set}" = set; then @@ -3601,7 +3783,7 @@ fi echo $ac_n "checking "for --enable-wxtree"""... $ac_c" 1>&6 -echo "configure:3605: checking "for --enable-wxtree"" >&5 +echo "configure:3787: checking "for --enable-wxtree"" >&5 no_cache=0 # Check whether --enable-wxtree or --disable-wxtree was given. if test "${enable_wxtree+set}" = set; then @@ -3642,7 +3824,7 @@ fi echo $ac_n "checking "for --enable-controls"""... $ac_c" 1>&6 -echo "configure:3646: checking "for --enable-controls"" >&5 +echo "configure:3828: checking "for --enable-controls"" >&5 no_cache=0 # Check whether --enable-controls or --disable-controls was given. if test "${enable_controls+set}" = set; then @@ -3690,6 +3872,7 @@ if test "$wxUSE_CONTROLS" = "yes"; then DEFAULT_wxUSE_CHOICE=yes DEFAULT_wxUSE_GAUGE=yes DEFAULT_wxUSE_GRID=yes + DEFAULT_wxUSE_NEW_GRID=no DEFAULT_wxUSE_IMAGLIST=yes DEFAULT_wxUSE_LISTBOX=yes DEFAULT_wxUSE_LISTCTRL=yes @@ -3700,6 +3883,7 @@ if test "$wxUSE_CONTROLS" = "yes"; then DEFAULT_wxUSE_SCROLLBAR=yes DEFAULT_wxUSE_SLIDER=yes DEFAULT_wxUSE_SPINBTN=yes + DEFAULT_wxUSE_SPINCTRL=yes DEFAULT_wxUSE_SPLITTER=yes DEFAULT_wxUSE_STATBMP=yes DEFAULT_wxUSE_STATBOX=yes @@ -3707,6 +3891,8 @@ if test "$wxUSE_CONTROLS" = "yes"; then DEFAULT_wxUSE_STATUSBAR=yes DEFAULT_wxUSE_TAB_DIALOG=yes DEFAULT_wxUSE_TOOLBAR=yes + DEFAULT_wxUSE_TOOLBAR_NATIVE=yes + DEFAULT_wxUSE_TOOLBAR_SIMPLE=yes DEFAULT_wxUSE_TOOLTIPS=yes DEFAULT_wxUSE_TREECTRL=yes elif test "$wxUSE_CONTROLS" = "no"; then @@ -3719,6 +3905,7 @@ elif test "$wxUSE_CONTROLS" = "no"; then DEFAULT_wxUSE_CHOICE=no DEFAULT_wxUSE_GAUGE=no DEFAULT_wxUSE_GRID=no + DEFAULT_wxUSE_NEW_GRID=no DEFAULT_wxUSE_IMAGLIST=no DEFAULT_wxUSE_LISTBOX=no DEFAULT_wxUSE_LISTCTRL=no @@ -3729,6 +3916,7 @@ elif test "$wxUSE_CONTROLS" = "no"; then DEFAULT_wxUSE_SCROLLBAR=no DEFAULT_wxUSE_SLIDER=no DEFAULT_wxUSE_SPINBTN=no + DEFAULT_wxUSE_SPINCTRL=no DEFAULT_wxUSE_SPLITTER=no DEFAULT_wxUSE_STATBMP=no DEFAULT_wxUSE_STATBOX=no @@ -3736,13 +3924,15 @@ elif test "$wxUSE_CONTROLS" = "no"; then DEFAULT_wxUSE_STATUSBAR=no DEFAULT_wxUSE_TAB_DIALOG=no DEFAULT_wxUSE_TOOLBAR=no + DEFAULT_wxUSE_TOOLBAR_NATIVE=no + DEFAULT_wxUSE_TOOLBAR_SIMPLE=no DEFAULT_wxUSE_TOOLTIPS=no DEFAULT_wxUSE_TREECTRL=no fi echo $ac_n "checking "for --enable-accel"""... $ac_c" 1>&6 -echo "configure:3746: checking "for --enable-accel"" >&5 +echo "configure:3936: checking "for --enable-accel"" >&5 no_cache=0 # Check whether --enable-accel or --disable-accel was given. if test "${enable_accel+set}" = set; then @@ -3781,7 +3971,7 @@ fi echo $ac_n "checking "for --enable-caret"""... $ac_c" 1>&6 -echo "configure:3785: checking "for --enable-caret"" >&5 +echo "configure:3975: checking "for --enable-caret"" >&5 no_cache=0 # Check whether --enable-caret or --disable-caret was given. if test "${enable_caret+set}" = set; then @@ -3820,7 +4010,7 @@ fi echo $ac_n "checking "for --enable-bmpbutton"""... $ac_c" 1>&6 -echo "configure:3824: checking "for --enable-bmpbutton"" >&5 +echo "configure:4014: checking "for --enable-bmpbutton"" >&5 no_cache=0 # Check whether --enable-bmpbutton or --disable-bmpbutton was given. if test "${enable_bmpbutton+set}" = set; then @@ -3859,7 +4049,7 @@ fi echo $ac_n "checking "for --enable-checkbox"""... $ac_c" 1>&6 -echo "configure:3863: checking "for --enable-checkbox"" >&5 +echo "configure:4053: checking "for --enable-checkbox"" >&5 no_cache=0 # Check whether --enable-checkbox or --disable-checkbox was given. if test "${enable_checkbox+set}" = set; then @@ -3898,7 +4088,7 @@ fi echo $ac_n "checking "for --enable-checklst"""... $ac_c" 1>&6 -echo "configure:3902: checking "for --enable-checklst"" >&5 +echo "configure:4092: checking "for --enable-checklst"" >&5 no_cache=0 # Check whether --enable-checklst or --disable-checklst was given. if test "${enable_checklst+set}" = set; then @@ -3937,7 +4127,7 @@ fi echo $ac_n "checking "for --enable-choice"""... $ac_c" 1>&6 -echo "configure:3941: checking "for --enable-choice"" >&5 +echo "configure:4131: checking "for --enable-choice"" >&5 no_cache=0 # Check whether --enable-choice or --disable-choice was given. if test "${enable_choice+set}" = set; then @@ -3976,7 +4166,7 @@ fi echo $ac_n "checking "for --enable-combobox"""... $ac_c" 1>&6 -echo "configure:3980: checking "for --enable-combobox"" >&5 +echo "configure:4170: checking "for --enable-combobox"" >&5 no_cache=0 # Check whether --enable-combobox or --disable-combobox was given. if test "${enable_combobox+set}" = set; then @@ -4015,7 +4205,7 @@ fi echo $ac_n "checking "for --enable-gauge"""... $ac_c" 1>&6 -echo "configure:4019: checking "for --enable-gauge"" >&5 +echo "configure:4209: checking "for --enable-gauge"" >&5 no_cache=0 # Check whether --enable-gauge or --disable-gauge was given. if test "${enable_gauge+set}" = set; then @@ -4054,7 +4244,7 @@ fi echo $ac_n "checking "for --enable-grid"""... $ac_c" 1>&6 -echo "configure:4058: checking "for --enable-grid"" >&5 +echo "configure:4248: checking "for --enable-grid"" >&5 no_cache=0 # Check whether --enable-grid or --disable-grid was given. if test "${enable_grid+set}" = set; then @@ -4092,8 +4282,47 @@ fi fi + echo $ac_n "checking "for --enable-newgrid"""... $ac_c" 1>&6 +echo "configure:4287: checking "for --enable-newgrid"" >&5 + no_cache=0 + # Check whether --enable-newgrid or --disable-newgrid was given. +if test "${enable_newgrid+set}" = set; then + enableval="$enable_newgrid" + + if test "$enableval" = yes; then + ac_cv_use_newgrid='wxUSE_NEW_GRID=yes' + else + ac_cv_use_newgrid='wxUSE_NEW_GRID=no' + fi + +else + + LINE=`grep "wxUSE_NEW_GRID" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_newgrid='wxUSE_NEW_GRID='$DEFAULT_wxUSE_NEW_GRID + +fi + + + eval "$ac_cv_use_newgrid" + if test "$no_cache" != 1; then + echo $ac_cv_use_newgrid >> ${wx_arg_cache_file}.tmp + fi + + if test "$wxUSE_NEW_GRID" = yes; then + echo "$ac_t""yes" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + + echo $ac_n "checking "for --enable-imaglist"""... $ac_c" 1>&6 -echo "configure:4097: checking "for --enable-imaglist"" >&5 +echo "configure:4326: checking "for --enable-imaglist"" >&5 no_cache=0 # Check whether --enable-imaglist or --disable-imaglist was given. if test "${enable_imaglist+set}" = set; then @@ -4132,7 +4361,7 @@ fi echo $ac_n "checking "for --enable-listbox"""... $ac_c" 1>&6 -echo "configure:4136: checking "for --enable-listbox"" >&5 +echo "configure:4365: checking "for --enable-listbox"" >&5 no_cache=0 # Check whether --enable-listbox or --disable-listbox was given. if test "${enable_listbox+set}" = set; then @@ -4171,7 +4400,7 @@ fi echo $ac_n "checking "for --enable-listctrl"""... $ac_c" 1>&6 -echo "configure:4175: checking "for --enable-listctrl"" >&5 +echo "configure:4404: checking "for --enable-listctrl"" >&5 no_cache=0 # Check whether --enable-listctrl or --disable-listctrl was given. if test "${enable_listctrl+set}" = set; then @@ -4210,7 +4439,7 @@ fi echo $ac_n "checking "for --enable-notebook"""... $ac_c" 1>&6 -echo "configure:4214: checking "for --enable-notebook"" >&5 +echo "configure:4443: checking "for --enable-notebook"" >&5 no_cache=0 # Check whether --enable-notebook or --disable-notebook was given. if test "${enable_notebook+set}" = set; then @@ -4249,7 +4478,7 @@ fi echo $ac_n "checking "for --enable-radiobox"""... $ac_c" 1>&6 -echo "configure:4253: checking "for --enable-radiobox"" >&5 +echo "configure:4482: checking "for --enable-radiobox"" >&5 no_cache=0 # Check whether --enable-radiobox or --disable-radiobox was given. if test "${enable_radiobox+set}" = set; then @@ -4288,7 +4517,7 @@ fi echo $ac_n "checking "for --enable-radiobtn"""... $ac_c" 1>&6 -echo "configure:4292: checking "for --enable-radiobtn"" >&5 +echo "configure:4521: checking "for --enable-radiobtn"" >&5 no_cache=0 # Check whether --enable-radiobtn or --disable-radiobtn was given. if test "${enable_radiobtn+set}" = set; then @@ -4327,7 +4556,7 @@ fi echo $ac_n "checking "for --enable-sash"""... $ac_c" 1>&6 -echo "configure:4331: checking "for --enable-sash"" >&5 +echo "configure:4560: checking "for --enable-sash"" >&5 no_cache=0 # Check whether --enable-sash or --disable-sash was given. if test "${enable_sash+set}" = set; then @@ -4366,7 +4595,7 @@ fi echo $ac_n "checking "for --enable-scrollbar"""... $ac_c" 1>&6 -echo "configure:4370: checking "for --enable-scrollbar"" >&5 +echo "configure:4599: checking "for --enable-scrollbar"" >&5 no_cache=0 # Check whether --enable-scrollbar or --disable-scrollbar was given. if test "${enable_scrollbar+set}" = set; then @@ -4405,7 +4634,7 @@ fi echo $ac_n "checking "for --enable-slider"""... $ac_c" 1>&6 -echo "configure:4409: checking "for --enable-slider"" >&5 +echo "configure:4638: checking "for --enable-slider"" >&5 no_cache=0 # Check whether --enable-slider or --disable-slider was given. if test "${enable_slider+set}" = set; then @@ -4444,7 +4673,7 @@ fi echo $ac_n "checking "for --enable-spinbtn"""... $ac_c" 1>&6 -echo "configure:4448: checking "for --enable-spinbtn"" >&5 +echo "configure:4677: checking "for --enable-spinbtn"" >&5 no_cache=0 # Check whether --enable-spinbtn or --disable-spinbtn was given. if test "${enable_spinbtn+set}" = set; then @@ -4482,8 +4711,47 @@ fi fi + echo $ac_n "checking "for --enable-spinctrl"""... $ac_c" 1>&6 +echo "configure:4716: checking "for --enable-spinctrl"" >&5 + no_cache=0 + # Check whether --enable-spinctrl or --disable-spinctrl was given. +if test "${enable_spinctrl+set}" = set; then + enableval="$enable_spinctrl" + + if test "$enableval" = yes; then + ac_cv_use_spinctrl='wxUSE_SPINCTRL=yes' + else + ac_cv_use_spinctrl='wxUSE_SPINCTRL=no' + fi + +else + + LINE=`grep "wxUSE_SPINCTRL" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_spinctrl='wxUSE_SPINCTRL='$DEFAULT_wxUSE_SPINCTRL + +fi + + + eval "$ac_cv_use_spinctrl" + if test "$no_cache" != 1; then + echo $ac_cv_use_spinctrl >> ${wx_arg_cache_file}.tmp + fi + + if test "$wxUSE_SPINCTRL" = yes; then + echo "$ac_t""yes" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + + echo $ac_n "checking "for --enable-splitter"""... $ac_c" 1>&6 -echo "configure:4487: checking "for --enable-splitter"" >&5 +echo "configure:4755: checking "for --enable-splitter"" >&5 no_cache=0 # Check whether --enable-splitter or --disable-splitter was given. if test "${enable_splitter+set}" = set; then @@ -4522,7 +4790,7 @@ fi echo $ac_n "checking "for --enable-statbmp"""... $ac_c" 1>&6 -echo "configure:4526: checking "for --enable-statbmp"" >&5 +echo "configure:4794: checking "for --enable-statbmp"" >&5 no_cache=0 # Check whether --enable-statbmp or --disable-statbmp was given. if test "${enable_statbmp+set}" = set; then @@ -4561,7 +4829,7 @@ fi echo $ac_n "checking "for --enable-statbox"""... $ac_c" 1>&6 -echo "configure:4565: checking "for --enable-statbox"" >&5 +echo "configure:4833: checking "for --enable-statbox"" >&5 no_cache=0 # Check whether --enable-statbox or --disable-statbox was given. if test "${enable_statbox+set}" = set; then @@ -4600,7 +4868,7 @@ fi echo $ac_n "checking "for --enable-statline"""... $ac_c" 1>&6 -echo "configure:4604: checking "for --enable-statline"" >&5 +echo "configure:4872: checking "for --enable-statline"" >&5 no_cache=0 # Check whether --enable-statline or --disable-statline was given. if test "${enable_statline+set}" = set; then @@ -4639,7 +4907,7 @@ fi echo $ac_n "checking "for --enable-statusbar"""... $ac_c" 1>&6 -echo "configure:4643: checking "for --enable-statusbar"" >&5 +echo "configure:4911: checking "for --enable-statusbar"" >&5 no_cache=0 # Check whether --enable-statusbar or --disable-statusbar was given. if test "${enable_statusbar+set}" = set; then @@ -4678,7 +4946,7 @@ fi echo $ac_n "checking "for --enable-tabdialog"""... $ac_c" 1>&6 -echo "configure:4682: checking "for --enable-tabdialog"" >&5 +echo "configure:4950: checking "for --enable-tabdialog"" >&5 no_cache=0 # Check whether --enable-tabdialog or --disable-tabdialog was given. if test "${enable_tabdialog+set}" = set; then @@ -4717,7 +4985,7 @@ fi echo $ac_n "checking "for --enable-toolbar"""... $ac_c" 1>&6 -echo "configure:4721: checking "for --enable-toolbar"" >&5 +echo "configure:4989: checking "for --enable-toolbar"" >&5 no_cache=0 # Check whether --enable-toolbar or --disable-toolbar was given. if test "${enable_toolbar+set}" = set; then @@ -4755,8 +5023,86 @@ fi fi + echo $ac_n "checking "for --enable-tbarnative"""... $ac_c" 1>&6 +echo "configure:5028: checking "for --enable-tbarnative"" >&5 + no_cache=0 + # Check whether --enable-tbarnative or --disable-tbarnative was given. +if test "${enable_tbarnative+set}" = set; then + enableval="$enable_tbarnative" + + if test "$enableval" = yes; then + ac_cv_use_tbarnative='wxUSE_TOOLBAR_NATIVE=yes' + else + ac_cv_use_tbarnative='wxUSE_TOOLBAR_NATIVE=no' + fi + +else + + LINE=`grep "wxUSE_TOOLBAR_NATIVE" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_tbarnative='wxUSE_TOOLBAR_NATIVE='$DEFAULT_wxUSE_TOOLBAR_NATIVE + +fi + + + eval "$ac_cv_use_tbarnative" + if test "$no_cache" != 1; then + echo $ac_cv_use_tbarnative >> ${wx_arg_cache_file}.tmp + fi + + if test "$wxUSE_TOOLBAR_NATIVE" = yes; then + echo "$ac_t""yes" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + + + echo $ac_n "checking "for --enable-tbarsmpl"""... $ac_c" 1>&6 +echo "configure:5067: checking "for --enable-tbarsmpl"" >&5 + no_cache=0 + # Check whether --enable-tbarsmpl or --disable-tbarsmpl was given. +if test "${enable_tbarsmpl+set}" = set; then + enableval="$enable_tbarsmpl" + + if test "$enableval" = yes; then + ac_cv_use_tbarsmpl='wxUSE_TOOLBAR_SIMPLE=yes' + else + ac_cv_use_tbarsmpl='wxUSE_TOOLBAR_SIMPLE=no' + fi + +else + + LINE=`grep "wxUSE_TOOLBAR_SIMPLE" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_tbarsmpl='wxUSE_TOOLBAR_SIMPLE='$DEFAULT_wxUSE_TOOLBAR_SIMPLE + +fi + + + eval "$ac_cv_use_tbarsmpl" + if test "$no_cache" != 1; then + echo $ac_cv_use_tbarsmpl >> ${wx_arg_cache_file}.tmp + fi + + if test "$wxUSE_TOOLBAR_SIMPLE" = yes; then + echo "$ac_t""yes" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + + echo $ac_n "checking "for --enable-treectrl"""... $ac_c" 1>&6 -echo "configure:4760: checking "for --enable-treectrl"" >&5 +echo "configure:5106: checking "for --enable-treectrl"" >&5 no_cache=0 # Check whether --enable-treectrl or --disable-treectrl was given. if test "${enable_treectrl+set}" = set; then @@ -4797,7 +5143,7 @@ fi echo $ac_n "checking "for --enable-commondlg"""... $ac_c" 1>&6 -echo "configure:4801: checking "for --enable-commondlg"" >&5 +echo "configure:5147: checking "for --enable-commondlg"" >&5 no_cache=0 # Check whether --enable-commondlg or --disable-commondlg was given. if test "${enable_commondlg+set}" = set; then @@ -4836,7 +5182,7 @@ fi echo $ac_n "checking "for --enable-dirdlg"""... $ac_c" 1>&6 -echo "configure:4840: checking "for --enable-dirdlg"" >&5 +echo "configure:5186: checking "for --enable-dirdlg"" >&5 no_cache=0 # Check whether --enable-dirdlg or --disable-dirdlg was given. if test "${enable_dirdlg+set}" = set; then @@ -4875,7 +5221,7 @@ fi echo $ac_n "checking "for --enable-textdlg"""... $ac_c" 1>&6 -echo "configure:4879: checking "for --enable-textdlg"" >&5 +echo "configure:5225: checking "for --enable-textdlg"" >&5 no_cache=0 # Check whether --enable-textdlg or --disable-textdlg was given. if test "${enable_textdlg+set}" = set; then @@ -4914,7 +5260,7 @@ fi echo $ac_n "checking "for --enable-tipdlg"""... $ac_c" 1>&6 -echo "configure:4918: checking "for --enable-tipdlg"" >&5 +echo "configure:5264: checking "for --enable-tipdlg"" >&5 no_cache=0 # Check whether --enable-tipdlg or --disable-tipdlg was given. if test "${enable_tipdlg+set}" = set; then @@ -4953,7 +5299,7 @@ fi echo $ac_n "checking "for --enable-progressdlg"""... $ac_c" 1>&6 -echo "configure:4957: checking "for --enable-progressdlg"" >&5 +echo "configure:5303: checking "for --enable-progressdlg"" >&5 no_cache=0 # Check whether --enable-progressdlg or --disable-progressdlg was given. if test "${enable_progressdlg+set}" = set; then @@ -4992,7 +5338,7 @@ fi echo $ac_n "checking "for --enable-miniframe"""... $ac_c" 1>&6 -echo "configure:4996: checking "for --enable-miniframe"" >&5 +echo "configure:5342: checking "for --enable-miniframe"" >&5 no_cache=0 # Check whether --enable-miniframe or --disable-miniframe was given. if test "${enable_miniframe+set}" = set; then @@ -5031,7 +5377,7 @@ fi echo $ac_n "checking "for --enable-html"""... $ac_c" 1>&6 -echo "configure:5035: checking "for --enable-html"" >&5 +echo "configure:5381: checking "for --enable-html"" >&5 no_cache=0 # Check whether --enable-html or --disable-html was given. if test "${enable_html+set}" = set; then @@ -5070,7 +5416,7 @@ fi echo $ac_n "checking "for --enable-tooltips"""... $ac_c" 1>&6 -echo "configure:5074: checking "for --enable-tooltips"" >&5 +echo "configure:5420: checking "for --enable-tooltips"" >&5 no_cache=0 # Check whether --enable-tooltips or --disable-tooltips was given. if test "${enable_tooltips+set}" = set; then @@ -5109,7 +5455,7 @@ fi echo $ac_n "checking "for --enable-splines"""... $ac_c" 1>&6 -echo "configure:5113: checking "for --enable-splines"" >&5 +echo "configure:5459: checking "for --enable-splines"" >&5 no_cache=0 # Check whether --enable-splines or --disable-splines was given. if test "${enable_splines+set}" = set; then @@ -5148,7 +5494,7 @@ fi echo $ac_n "checking "for --enable-validators"""... $ac_c" 1>&6 -echo "configure:5152: checking "for --enable-validators"" >&5 +echo "configure:5498: checking "for --enable-validators"" >&5 no_cache=0 # Check whether --enable-validators or --disable-validators was given. if test "${enable_validators+set}" = set; then @@ -5187,7 +5533,7 @@ fi echo $ac_n "checking "for --enable-busyinfo"""... $ac_c" 1>&6 -echo "configure:5191: checking "for --enable-busyinfo"" >&5 +echo "configure:5537: checking "for --enable-busyinfo"" >&5 no_cache=0 # Check whether --enable-busyinfo or --disable-busyinfo was given. if test "${enable_busyinfo+set}" = set; then @@ -5226,13 +5572,140 @@ fi + + echo $ac_n "checking "for --enable-gif"""... $ac_c" 1>&6 +echo "configure:5578: checking "for --enable-gif"" >&5 + no_cache=0 + # Check whether --enable-gif or --disable-gif was given. +if test "${enable_gif+set}" = set; then + enableval="$enable_gif" + + if test "$enableval" = yes; then + ac_cv_use_gif='wxUSE_GIF=yes' + else + ac_cv_use_gif='wxUSE_GIF=no' + fi + +else + + LINE=`grep "wxUSE_GIF" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_gif='wxUSE_GIF='$DEFAULT_wxUSE_GIF + +fi + + + eval "$ac_cv_use_gif" + if test "$no_cache" != 1; then + echo $ac_cv_use_gif >> ${wx_arg_cache_file}.tmp + fi + + if test "$wxUSE_GIF" = yes; then + echo "$ac_t""yes" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + + + echo $ac_n "checking "for --enable-pcx"""... $ac_c" 1>&6 +echo "configure:5617: checking "for --enable-pcx"" >&5 + no_cache=0 + # Check whether --enable-pcx or --disable-pcx was given. +if test "${enable_pcx+set}" = set; then + enableval="$enable_pcx" + + if test "$enableval" = yes; then + ac_cv_use_pcx='wxUSE_PCX=yes' + else + ac_cv_use_pcx='wxUSE_PCX=no' + fi + +else + + LINE=`grep "wxUSE_PCX" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_pcx='wxUSE_PCX='$DEFAULT_wxUSE_PCX + +fi + + + eval "$ac_cv_use_pcx" + if test "$no_cache" != 1; then + echo $ac_cv_use_pcx >> ${wx_arg_cache_file}.tmp + fi + + if test "$wxUSE_PCX" = yes; then + echo "$ac_t""yes" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + + + echo $ac_n "checking "for --enable-pnm"""... $ac_c" 1>&6 +echo "configure:5656: checking "for --enable-pnm"" >&5 + no_cache=0 + # Check whether --enable-pnm or --disable-pnm was given. +if test "${enable_pnm+set}" = set; then + enableval="$enable_pnm" + + if test "$enableval" = yes; then + ac_cv_use_pnm='wxUSE_PNM=yes' + else + ac_cv_use_pnm='wxUSE_PNM=no' + fi + +else + + LINE=`grep "wxUSE_PNM" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_pnm='wxUSE_PNM='$DEFAULT_wxUSE_PNM + +fi + + + eval "$ac_cv_use_pnm" + if test "$no_cache" != 1; then + echo $ac_cv_use_pnm >> ${wx_arg_cache_file}.tmp + fi + + if test "$wxUSE_PNM" = yes; then + echo "$ac_t""yes" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + + +fi + + echo "saving argument cache $wx_arg_cache_file" mv ${wx_arg_cache_file}.tmp ${wx_arg_cache_file} echo $ac_n "checking for toolkit""... $ac_c" 1>&6 -echo "configure:5236: checking for toolkit" >&5 +echo "configure:5703: checking for toolkit" >&5 + +if test "$wxUSE_GUI" = "yes"; then + +if test "$USE_BEOS" = 1; then + { echo "configure: error: BeOS GUI is not supported yet, use --disable-gui" 1>&2; exit 1; } +fi if test "$TOOLKIT_GIVEN" = 1; then for toolkit in `echo $ALL_TOOLKITS`; do @@ -5251,7 +5724,7 @@ else done fi -NUM_TOOLKITS=`expr ${wxUSE_GTK:-0} + ${wxUSE_MOTIF:-0} + ${wxUSE_WINE:-0} + ${wxUSE_MINGW:-0} + ${wxUSE_CYGWIN:-0}` +NUM_TOOLKITS=`expr ${wxUSE_GTK:-0} + ${wxUSE_MOTIF:-0} + ${wxUSE_WINE:-0} + ${wxUSE_MINGW:-0} + ${wxUSE_CYGWIN:-0} + ${wxUSE_PM:-0}` case "$NUM_TOOLKITS" in 1) @@ -5278,6 +5751,10 @@ for toolkit in `echo $ALL_TOOLKITS`; do fi done +else + echo "$ac_t""base only" 1>&6 +fi + cat > confcache <<\EOF # This file is a shell script that caches the results of configure @@ -5329,12 +5806,12 @@ rm -f confcache if eval "test $host != $build"; then if eval "test $host_alias != NONE"; then - CC=$host_alias-gcc - CXX=$host_alias-c++ + CC=$host_alias-gcc + CXX=$host_alias-c++ AR=$host_alias-ar RANLIB=$host_alias-ranlib - DLLTOOL=$host_alias-dlltool - LD=$host_alias-ld + DLLTOOL=$host_alias-dlltool + LD=$host_alias-ld NM=$host_alias-nm STRIP=$host_alias-strip fi @@ -5343,7 +5820,7 @@ fi # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:5347: checking for $ac_word" >&5 +echo "configure:5824: 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 @@ -5373,7 +5850,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:5377: checking for $ac_word" >&5 +echo "configure:5854: 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 @@ -5424,7 +5901,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:5428: checking for $ac_word" >&5 +echo "configure:5905: 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 @@ -5456,7 +5933,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:5460: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:5937: 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. @@ -5467,12 +5944,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 5471 "configure" +#line 5948 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:5476: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5953: \"$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 @@ -5498,12 +5975,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:5502: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:5979: 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:5507: checking whether we are using GNU C" >&5 +echo "configure:5984: 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 @@ -5512,7 +5989,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:5516: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:5993: \"$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 @@ -5531,7 +6008,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:5535: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:6012: 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 @@ -5566,7 +6043,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:5570: checking how to run the C preprocessor" >&5 +echo "configure:6047: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -5581,13 +6058,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:5591: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6068: \"$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 : @@ -5598,13 +6075,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:5608: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6085: \"$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 : @@ -5615,13 +6092,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:5625: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6102: \"$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 : @@ -5648,13 +6125,13 @@ echo "$ac_t""$CPP" 1>&6 if test $ac_cv_prog_gcc = yes; then echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6 -echo "configure:5652: checking whether ${CC-cc} needs -traditional" >&5 +echo "configure:6129: 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 @@ -5672,7 +6149,7 @@ rm -f conftest* if test $ac_cv_prog_gcc_traditional = no; then cat > conftest.$ac_ext < Autoconf TCGETA @@ -5708,7 +6185,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:5712: checking for $ac_word" >&5 +echo "configure:6189: 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 @@ -5740,7 +6217,7 @@ test -n "$CXX" || CXX="gcc" echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:5744: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 +echo "configure:6221: 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. @@ -5751,12 +6228,12 @@ cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext << EOF -#line 5755 "configure" +#line 6232 "configure" #include "confdefs.h" int main(){return(0);} EOF -if { (eval echo configure:5760: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6237: \"$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 @@ -5782,12 +6259,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:5786: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:6263: 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:5791: checking whether we are using GNU C++" >&5 +echo "configure:6268: 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 @@ -5796,7 +6273,7 @@ else yes; #endif EOF -if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:5800: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:6277: \"$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 @@ -5815,7 +6292,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:5819: checking whether ${CXX-g++} accepts -g" >&5 +echo "configure:6296: 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 @@ -5848,7 +6325,7 @@ fi echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6 -echo "configure:5852: checking how to run the C++ preprocessor" >&5 +echo "configure:6329: 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 @@ -5861,12 +6338,12 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross CXXCPP="${CXX-g++} -E" cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5870: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6347: \"$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 : @@ -5904,7 +6381,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:5908: checking for $ac_word" >&5 +echo "configure:6385: 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 @@ -5935,7 +6412,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:5939: checking for $ac_word" >&5 +echo "configure:6416: 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 @@ -5975,7 +6452,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:5979: checking for a BSD compatible install" >&5 +echo "configure:6456: 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 @@ -6031,7 +6508,7 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' # Extract the first word of "strip", so it can be a program name with args. set dummy strip; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:6035: checking for $ac_word" >&5 +echo "configure:6512: 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 @@ -6060,7 +6537,7 @@ fi echo $ac_n "checking "make for VPATH support"""... $ac_c" 1>&6 -echo "configure:6064: checking "make for VPATH support"" >&5 +echo "configure:6541: checking "make for VPATH support"" >&5 cat - << EOF > confMake check : file cp \$? \$@ @@ -6089,7 +6566,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:6093: checking for $ac_word" >&5 +echo "configure:6570: 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 @@ -6123,7 +6600,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:6127: checking for $ac_word" >&5 +echo "configure:6604: 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 @@ -6157,7 +6634,7 @@ then *) ac_lib=l ;; esac echo $ac_n "checking for yywrap in -l$ac_lib""... $ac_c" 1>&6 -echo "configure:6161: checking for yywrap in -l$ac_lib" >&5 +echo "configure:6638: 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 @@ -6165,7 +6642,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:6657: \"$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 @@ -6200,7 +6677,7 @@ fi echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:6204: checking whether ln -s works" >&5 +echo "configure:6681: 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 @@ -6223,24 +6700,27 @@ fi SEARCH_INCLUDE="\ + /usr/local/include \ + \ /usr/Motif-1.2/include \ /usr/Motif-2.1/include \ \ /usr/include/Motif1.2 \ /opt/xpm/include/X11 \ + /opt/GBxpm/include/ \ + /opt/GBxpm/X11/include/ \ \ /usr/Motif1.2/include \ /usr/dt/include \ + /usr/openwin/include \ + \ /usr/include/Xm \ \ /usr/X11R6/include \ + /usr/X11R6.4/include \ /usr/X11R5/include \ /usr/X11R4/include \ \ - /usr/X11R6/lib \ - /usr/X11R5/lib \ - /usr/X11R4/lib \ - \ /usr/include/X11R6 \ /usr/include/X11R5 \ /usr/include/X11R4 \ @@ -6262,9 +6742,6 @@ SEARCH_INCLUDE="\ /usr/x386/include \ /usr/XFree86/include/X11 \ \ - /usr/include \ - /usr/local/include \ - \ /usr/include/gtk \ /usr/local/include/gtk \ /usr/include/glib \ @@ -6282,9 +6759,9 @@ SEARCH_INCLUDE="\ /usr/local/x11r5/include \ /usr/lpp/Xamples/include \ \ - /usr/openwin/include \ /usr/openwin/share/include \ - " + \ + /usr/include" SEARCH_LIB="`echo "$SEARCH_INCLUDE" | sed s/include/lib/g` " @@ -6338,6 +6815,8 @@ rm -f confcache +if test "$wxUSE_GUI" = "yes"; then + TOOLKIT= TOOLKIT_INCLUDE= @@ -6349,13 +6828,19 @@ GUI_TK_LIBRARY= GUI_TK_LINK= WXGTK12= +WXGTK13= WXWINE= +PROGRAM_EXT= + if test "$wxUSE_CYGWIN" = 1 || test "$wxUSE_MINGW" = 1 ; then - echo $ac_n "checking for Windows headers""... $ac_c" 1>&6 -echo "configure:6358: checking for Windows headers" >&5 - + if test "$cross_compiling" = "yes" ; then + echo "configure: warning: Cross compiling --- skipping windows.h check" 1>&2 + else + echo $ac_n "checking for Windows headers""... $ac_c" 1>&6 +echo "configure:6843: checking for Windows headers" >&5 + ac_find_includes= for ac_dir in $SEARCH_INCLUDE; do @@ -6365,28 +6850,31 @@ for ac_dir in $SEARCH_INCLUDE; fi done + if test "$ac_find_includes" != "" ; then + echo "$ac_t""found $ac_find_includes" 1>&6 + TOOLKIT_INCLUDE="$TOOLKIT_INCLUDE -I$ac_find_includes" + else + echo "$ac_t""no" 1>&6 + { echo "configure: error: please set CFLAGS to contain the location of windows.h" 1>&2; exit 1; } + fi + fi + INCLUDE_SUBDIRS="$INCLUDE_SUBDIRS msw" - - LIBS="$LIBS -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -loldnames -lcomctl32 -lctl3d32 -lcrtdll -ladvapi32 -lwsock32" + LIBS="$LIBS -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lctl3d32 -lcrtdll -ladvapi32 -lwsock32" - if test "$ac_find_includes" != "" ; then - echo "$ac_t""found $ac_find_includes" 1>&6 - TOOLKIT_INCLUDE="$TOOLKIT_INCLUDE -I$ac_find_includes" - else - echo "$ac_t""no" 1>&6 - if test "$cross_compiling" != "yes" ; then - { echo "configure: error: please set CFLAGS to contain the location of windows.h" 1>&2; exit 1; } - fi + if test "$wxUSE_MINGW" = 1; then + LDFLAGS="$LDFLAGS -mwindows" fi TOOLKIT=MSW - - GUIOBJS=MSW_GUIOBJS - GUIHEADERS=MSW_HEADERS - COMMONOBJS=MSW_COMMONOBJS - GENERICOBJS=MSW_GENERICOBJS + + GUIOBJS="\$(MSW_GUIOBJS)" + GUIHEADERS="\$(MSW_HEADERS)" + COMMONOBJS="\$(MSW_COMMONOBJS)" + GENERICOBJS="\$(MSW_GENERICOBJS)" UNIXOBJS= GUIDIST=MSW_DIST + PROGRAM_EXT=.exe fi if test "$wxUSE_GTK" = 1; then @@ -6407,7 +6895,7 @@ if test "$wxUSE_GTK" = 1; then # Extract the first word of "gtk-config", so it can be a program name with args. set dummy gtk-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:6411: checking for $ac_word" >&5 +echo "configure:6899: 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 @@ -6440,9 +6928,9 @@ else echo "$ac_t""no" 1>&6 fi - min_gtk_version=1.2.0 + min_gtk_version=1.2.1 echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6 -echo "configure:6446: checking for GTK - version >= $min_gtk_version" >&5 +echo "configure:6934: checking for GTK - version >= $min_gtk_version" >&5 no_gtk="" if test "$GTK_CONFIG" != "no" ; then GTK_CFLAGS=`$GTK_CONFIG --cflags` @@ -6455,10 +6943,11 @@ echo "configure:6446: checking for GTK - version >= $min_gtk_version" >&5 echo $ac_n "cross compiling; assumed OK... $ac_c" else cat > conftest.$ac_ext < +#include #include int @@ -6471,15 +6960,22 @@ main () exit(1); } + if ((GTK_MAJOR_VERSION != gtk_major_version) || + (GTK_MINOR_VERSION != gtk_minor_version) || + (GTK_MICRO_VERSION != gtk_micro_version)) { + printf("Headers vs. library version mismatch!\n"); + exit(1); + } + if (gtk_minor_version == 1) return FALSE; return !((gtk_major_version > major) || - ((gtk_major_version == major) && (gtk_minor_version > minor)) || - ((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro))); + ((gtk_major_version == major) && (gtk_minor_version > minor)) || + ((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro))); } EOF -if { (eval echo configure:6483: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:6979: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -6503,147 +6999,76 @@ fi echo "$ac_t""no" 1>&6 GTK_CFLAGS="" GTK_LIBS="" - : + { echo "configure: error: Is gtk-config in path and GTK+ is version 1.2.1 or above?" 1>&2; exit 1; } fi - if test "$WXGTK12" != 1; then - - if test x$gtk_config_exec_prefix != x ; then - gtk_config_args="$gtk_config_args --exec-prefix=$gtk_config_exec_prefix" - if test x${GTK_CONFIG+set} != xset ; then - GTK_CONFIG=$gtk_config_exec_prefix/bin/gtk-config - fi - fi - if test x$gtk_config_prefix != x ; then - gtk_config_args="$gtk_config_args --prefix=$gtk_config_prefix" - if test x${GTK_CONFIG+set} != xset ; then - GTK_CONFIG=$gtk_config_prefix/bin/gtk-config - fi - fi - # Extract the first word of "gtk-config", so it can be a program name with args. -set dummy gtk-config; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:6530: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_path_GTK_CONFIG'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - case "$GTK_CONFIG" in - /*) - ac_cv_path_GTK_CONFIG="$GTK_CONFIG" # Let the user override the test with a path. - ;; - ?:/*) - ac_cv_path_GTK_CONFIG="$GTK_CONFIG" # Let the user override the test with a dos path. - ;; - *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_path_GTK_CONFIG="$ac_dir/$ac_word" - break - fi - done - IFS="$ac_save_ifs" - test -z "$ac_cv_path_GTK_CONFIG" && ac_cv_path_GTK_CONFIG="no" - ;; -esac -fi -GTK_CONFIG="$ac_cv_path_GTK_CONFIG" -if test -n "$GTK_CONFIG"; then - echo "$ac_t""$GTK_CONFIG" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi + TOOLKIT_INCLUDE="$GTK_CFLAGS" + GUI_TK_LIBRARY="$GTK_LIBS -lgthread" + TOOLKIT=GTK - min_gtk_version=1.0.0 - echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6 -echo "configure:6565: checking for GTK - version >= $min_gtk_version" >&5 - no_gtk="" - if test "$GTK_CONFIG" != "no" ; then - GTK_CFLAGS=`$GTK_CONFIG --cflags` - GTK_LIBS=`$GTK_CONFIG --libs` - ac_save_CFLAGS="$CFLAGS" - ac_save_LIBS="$LIBS" - CFLAGS="$CFLAGS $GTK_CFLAGS" - LIBS="$LIBS $GTK_LIBS" - if test "$cross_compiling" = yes; then - echo $ac_n "cross compiling; assumed OK... $ac_c" + GUIOBJS="\$(GTK_GUIOBJS)" + GUIHEADERS="\$(GTK_HEADERS)" + COMMONOBJS="\$(GTK_COMMONOBJS)" + GENERICOBJS="\$(GTK_GENERICOBJS)" + GUIDEPS="\$(GTK_GUIDEPS)" + COMMONDEPS="\$(GTK_COMMONDEPS)" + GENERICDEPS="\$(GTK_GENERICDEPS)" + UNIXOBJS="\$(UNIX_OBJS)" + UNIXDEPS="\$(UNIX_DEPS)" + GUIDIST=GTK_DIST + +echo $ac_n "checking for gdk_im_open in -lgdk""... $ac_c" 1>&6 +echo "configure:7025: checking for gdk_im_open in -lgdk" >&5 +ac_lib_var=`echo gdk'_'gdk_im_open | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 else - cat > conftest.$ac_ext < conftest.$ac_ext < -#include - -int -main () -{ - int major, minor, micro; - - if (sscanf("$min_gtk_version", "%d.%d.%d", &major, &minor, µ) != 3) { - printf("%s, bad version string\n", "$min_gtk_version"); - exit(1); - } - - if (gtk_minor_version == 1) return FALSE; - - return !((gtk_major_version > major) || - ((gtk_major_version == major) && (gtk_minor_version > minor)) || - ((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro))); -} - +int main() { +gdk_im_open() +; return 0; } EOF -if { (eval echo configure:6602: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then - : +if { (eval echo configure:7044: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -fr conftest* - no_gtk=yes + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" fi -rm -fr conftest* +rm -f conftest* +LIBS="$ac_save_LIBS" + fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + cat >> confdefs.h <<\EOF +#define HAVE_XIM 1 +EOF - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - else - no_gtk=yes - fi - if test "x$no_gtk" = x ; then - echo "$ac_t""yes" 1>&6 - : - else - echo "$ac_t""no" 1>&6 - GTK_CFLAGS="" - GTK_LIBS="" - { echo "configure: error: Is gtk-config in path and GTK+ is version 1.2.X or 1.0.X?" 1>&2; exit 1; } - fi - - +else + echo "$ac_t""no" 1>&6 +fi - fi - TOOLKIT_INCLUDE="$GTK_CFLAGS" - GUI_TK_LIBRARY="$GTK_LIBS -ldl" - TOOLKIT=GTK - - GUIOBJS=GTK_GUIOBJS - GUIHEADERS=GTK_HEADERS - COMMONOBJS=GTK_COMMONOBJS - GENERICOBJS=GTK_GENERICOBJS - UNIXOBJS=UNIXOBJS - GUIDIST=GTK_DIST fi if test "$wxUSE_WINE" = 1; then echo $ac_n "checking for WINE includes""... $ac_c" 1>&6 -echo "configure:6647: checking for WINE includes" >&5 +echo "configure:7072: checking for WINE includes" >&5 ac_find_includes= for ac_dir in $SEARCH_INCLUDE; @@ -6664,7 +7089,7 @@ for ac_dir in $SEARCH_INCLUDE; XPM_LINK="" echo $ac_n "checking for Xpm library""... $ac_c" 1>&6 -echo "configure:6668: checking for Xpm library" >&5 +echo "configure:7093: checking for Xpm library" >&5 ac_find_libraries= for ac_dir in $SEARCH_LIB; @@ -6689,10 +7114,10 @@ EOF echo "$ac_t""no" 1>&6 echo "configure: warning: library will be compiled without support for images in XPM format" 1>&2 fi - + MESA_LINK="" echo $ac_n "checking for Mesa library""... $ac_c" 1>&6 -echo "configure:6696: checking for Mesa library" >&5 +echo "configure:7121: checking for Mesa library" >&5 ac_find_libraries= for ac_dir in $SEARCH_LIB; @@ -6713,16 +7138,20 @@ for ac_dir in $SEARCH_LIB; { 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 -ldl -lm" + GUI_TK_LINK="-lwine $MESA_LINK $XPM_LINK -lXxf86dga -lXxf86vm -lSM -lICE -lXext -lXmu -lX11 -lncurses -lm" GUI_TK_LIBRARY="$GUI_TK_LIBRARY $GUI_TK_LINK" WXWINE=1 TOOLKIT=MSW - - GUIOBJS=MSW_GUIOBJS - GUIHEADERS=MSW_HEADERS - COMMONOBJS=MSW_COMMONOBJS - GENERICOBJS=MSW_GENERICOBJS - UNIXOBJS=UNIXOBJS + + GUIHEADERS="\$(MSW_HEADERS)" + GUIOBJS="\$(MSW_GUIOBJS)" + COMMONOBJS="\$(MSW_COMMONOBJS)" + GENERICOBJS="\$(MSW_GENERICOBJS)" + GUIDEPS="\$(MSW_GUIDEPS)" + COMMONDEPS="\$(MSW_COMMONDEPS)" + GENERICDEPS="\$(MSW_GENERICDEPS)" + UNIXOBJS="\$(UNIX_OBJS)" + UNIXDEPS="\$(UNIX_DEPS)" GUIDIST=MSW_DIST fi @@ -6732,7 +7161,7 @@ if test "$wxUSE_MOTIF" = 1; then # Uses ac_ vars as temps to allow command line to override cache and checks. # --without-x overrides everything else, but does not touch the cache. echo $ac_n "checking for X""... $ac_c" 1>&6 -echo "configure:6736: checking for X" >&5 +echo "configure:7165: checking for X" >&5 # Check whether --with-x or --without-x was given. if test "${with_x+set}" = set; then @@ -6794,12 +7223,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:6803: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7232: \"$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* @@ -6868,14 +7297,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:7308: \"$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. @@ -6981,17 +7410,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:6985: checking whether -R must be followed by a space" >&5 +echo "configure:7414: 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:7424: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_R_nospace=yes else @@ -7007,14 +7436,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:7447: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_R_space=yes else @@ -7046,7 +7475,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:7050: checking for dnet_ntoa in -ldnet" >&5 +echo "configure:7479: 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 @@ -7054,7 +7483,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:7498: \"$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 @@ -7087,7 +7516,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:7091: checking for dnet_ntoa in -ldnet_stub" >&5 +echo "configure:7520: 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 @@ -7095,7 +7524,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:7539: \"$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 @@ -7135,12 +7564,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:7139: checking for gethostbyname" >&5 +echo "configure:7568: 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:7597: \"$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 @@ -7185,7 +7614,7 @@ fi if test $ac_cv_func_gethostbyname = no; then echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 -echo "configure:7189: checking for gethostbyname in -lnsl" >&5 +echo "configure:7618: 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 @@ -7193,7 +7622,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:7637: \"$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 @@ -7234,12 +7663,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:7238: checking for connect" >&5 +echo "configure:7667: 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:7696: \"$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 @@ -7284,7 +7713,7 @@ fi if test $ac_cv_func_connect = no; then echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6 -echo "configure:7288: checking for connect in -lsocket" >&5 +echo "configure:7717: 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 @@ -7292,7 +7721,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:7736: \"$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 @@ -7327,12 +7756,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:7331: checking for remove" >&5 +echo "configure:7760: 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:7789: \"$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 @@ -7377,7 +7806,7 @@ fi if test $ac_cv_func_remove = no; then echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6 -echo "configure:7381: checking for remove in -lposix" >&5 +echo "configure:7810: 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 @@ -7385,7 +7814,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:7829: \"$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 @@ -7420,12 +7849,12 @@ fi # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. echo $ac_n "checking for shmat""... $ac_c" 1>&6 -echo "configure:7424: checking for shmat" >&5 +echo "configure:7853: 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:7882: \"$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 @@ -7470,7 +7899,7 @@ fi if test $ac_cv_func_shmat = no; then echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6 -echo "configure:7474: checking for shmat in -lipc" >&5 +echo "configure:7903: 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 @@ -7478,7 +7907,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:7922: \"$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 @@ -7522,7 +7951,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:7526: checking for IceConnectionNumber in -lICE" >&5 +echo "configure:7955: 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 @@ -7530,7 +7959,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:7974: \"$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 @@ -7567,14 +7996,15 @@ fi if test "$no_x" = "yes"; then - { echo "configure: error: X11 libraries not found" 1>&2; exit 1; } + { echo "configure: error: X11 not found" 1>&2; exit 1; } fi - TOOLKIT_INCLUDE="$X_CFLAGS" GUI_TK_LIBRARY="$X_LIBS" + TOOLKIT_INCLUDE="$X_CFLAGS" - echo $ac_n "checking for Motif/Lesstif includes""... $ac_c" 1>&6 -echo "configure:7578: checking for Motif/Lesstif includes" >&5 + + echo $ac_n "checking for Motif/Lesstif headers""... $ac_c" 1>&6 +echo "configure:8008: checking for Motif/Lesstif headers" >&5 ac_find_includes= for ac_dir in $SEARCH_INCLUDE; @@ -7593,7 +8023,7 @@ for ac_dir in $SEARCH_INCLUDE; fi echo $ac_n "checking for Motif/Lesstif library""... $ac_c" 1>&6 -echo "configure:7597: checking for Motif/Lesstif library" >&5 +echo "configure:8027: checking for Motif/Lesstif library" >&5 ac_find_libraries= for ac_dir in $SEARCH_LIB; @@ -7627,7 +8057,7 @@ for ac_dir in $SEARCH_LIB; fi - CHECK_LINK="$GUI_TK_LIBRARY $ac_path_to_link" + GUI_TK_LIBRARY="$GUI_TK_LIBRARY $ac_path_to_link" TOOLKIT_INCLUDE="$TOOLKIT_INCLUDE $ac_path_to_include" echo "$ac_t""found at $ac_find_libraries" 1>&6 else @@ -7636,7 +8066,7 @@ for ac_dir in $SEARCH_LIB; fi echo $ac_n "checking for Xt library""... $ac_c" 1>&6 -echo "configure:7640: checking for Xt library" >&5 +echo "configure:8070: checking for Xt library" >&5 ac_find_libraries= for ac_dir in $SEARCH_LIB; @@ -7659,7 +8089,7 @@ for ac_dir in $SEARCH_LIB; ac_path_to_link="-L$ac_find_libraries" fi - CHECK_LINK="$GUI_TK_LIBRARY $ac_path_to_link" + GUI_TK_LIBRARY="$GUI_TK_LIBRARY $ac_path_to_link" echo "$ac_t""found at $ac_find_libraries" 1>&6 else echo "$ac_t""no" 1>&6 @@ -7668,7 +8098,7 @@ for ac_dir in $SEARCH_LIB; XPM_LINK="" echo $ac_n "checking for Xpm library""... $ac_c" 1>&6 -echo "configure:7672: checking for Xpm library" >&5 +echo "configure:8102: checking for Xpm library" >&5 ac_find_libraries= for ac_dir in $SEARCH_LIB; @@ -7691,7 +8121,7 @@ for ac_dir in $SEARCH_LIB; ac_path_to_link="-L$ac_find_libraries" fi - CHECK_LINK="$GUI_TK_LIBRARY $ac_path_to_link" + GUI_TK_LIBRARY="$GUI_TK_LIBRARY $ac_path_to_link" XPM_LINK="-lXpm " cat >> confdefs.h <<\EOF #define wxHAVE_LIB_XPM 1 @@ -7703,121 +8133,191 @@ EOF echo "configure: warning: library will be compiled without support for images in XPM format" 1>&2 fi - GUI_TK_LINK="-lXm $XPM_LINK -lXmu -lXt -lX11 -ldl -lm" + GUI_TK_LINK="-lXm $XPM_LINK -lXmu -lXext -lXt -lX11 -lm" GUI_TK_LIBRARY="$GUI_TK_LIBRARY $GUI_TK_LINK" TOOLKIT=MOTIF - - GUIOBJS=MOTIF_GUIOBJS - GUIHEADERS=MOTIF_HEADERS - COMMONOBJS=MOTIF_COMMONOBJS - GENERICOBJS=MOTIF_GENERICOBJS - UNIXOBJS=UNIXOBJS + + GUIHEADERS="\$(MOTIF_HEADERS)" + GUIOBJS="\$(MOTIF_GUIOBJS)" + COMMONOBJS="\$(MOTIF_COMMONOBJS)" + GENERICOBJS="\$(MOTIF_GENERICOBJS)" + GUIDEPS="\$(MOTIF_GUIDEPS)" + COMMONDEPS="\$(MOTIF_COMMONDEPS)" + GENERICDEPS="\$(MOTIF_GENERICDEPS)" + UNIXOBJS="\$(UNIX_OBJS)" + UNIXDEPS="\$(UNIX_DEPS)" GUIDIST=MOTIF_DIST fi -TOOLKIT_DIR=`echo ${TOOLKIT} | tr "A-Z" "a-z"` +if test "$wxUSE_PM" = 1; then + TOOLKIT=PM + + GUIOBJS="\$(PM_GUIOBJS)" + GUIHEADERS="\$(PM_HEADERS)" + COMMONOBJS="\$(PM_COMMONOBJS)" + GENERICOBJS="\$(PM_GENERICOBJS)" + GUIDEPS="\$(PM_GUIDEPS)" + COMMONDEPS="\$(PM_COMMONDEPS)" + GENERICDEPS="\$(PM_GENERICDEPS)" + UNIXOBJS= + UNIXDEPS= + GUIDIST=GTK_DIST +fi + +if test "$TOOLKIT" != "PM" ; then + TOOLKIT_DIR=`echo ${TOOLKIT} | tr "A-Z" "a-z"` +else + TOOLKIT_DIR="os2" +fi TOOLKIT_DEF="-D__WX${TOOLKIT}__" WX_LIBRARY="wx_${TOOLKIT_DIR}" -WX_LIBRARY_NAME="libwx_${TOOLKIT_DIR}.la" + ALL_OBJECTS="\$(GUIOBJS) \$(COMMONOBJS) \$(GENERICOBJS) \$(UNIXOBJS) \$(HTMLOBJS) \$(IODBCOBJS)" + if test "$wxUSE_LIBJPEG" = "yes" ; then + ALL_OBJECTS="${ALL_OBJECTS} \$(JPEGOBJS)" + fi + if test "$wxUSE_LIBTIFF" = "yes" ; then + ALL_OBJECTS="${ALL_OBJECTS} \$(TIFFOBJS)" + fi + if test "$wxUSE_LIBPNG" = "yes" ; then + ALL_OBJECTS="${ALL_OBJECTS} \$(PNGOBJS)" + fi + if test "$wxUSE_ZLIB" = "yes" ; then + ALL_OBJECTS="${ALL_OBJECTS} \$(ZLIBOBJS)" + fi + ALL_DEPFILES="\$(GUIDEPS) \$(COMMONDEPS) \$(GENERICDEPS) \$(UNIXDEPS) \$(HTMLDEPS)" + ALL_HEADERS="\$(GUIHEADERS) \$(HTML_HEADERS) \$(UNIX_HEADERS) \$(PROTOCOL_HEADERS) \$(GENERIC_HEADERS) \$(WX_HEADERS)" +else + + ALL_OBJECTS="\$(BASE_OBJS)" + ALL_DEPFILES="\${BASE_DEPS}" + ALL_HEADERS="\${BASE_HEADERS}" + + WX_LIBRARY="wxbase" +fi + +WX_LIBRARY_NAME="lib${WX_LIBRARY}.la" -WX_LIBRARY_NAME_STATIC="libwx_${TOOLKIT_DIR}.a" +WX_LIBRARY_NAME_STATIC="lib${WX_LIBRARY}.a" -WX_LIBRARY_NAME_SHARED="libwx_${TOOLKIT_DIR}-${WX_RELEASE}.so.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}" +WX_LIBRARY_NAME_SHARED="lib${WX_LIBRARY}-${WX_RELEASE}.so.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}" -WX_LIBRARY_LINK1="libwx_${TOOLKIT_DIR}-${WX_RELEASE}.so.${WX_CURRENT}" -WX_LIBRARY_LINK2="libwx_${TOOLKIT_DIR}-${WX_RELEASE}.so" -WX_LIBRARY_LINK3="libwx_${TOOLKIT_DIR}.so" +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" SHARED_LD= PIC_FLAG= -WX_CREATE_LINKS= +WX_ALL= +WX_ALL_INSTALLED= +BURNT_LIBRARY_NAME= + if test "$wxUSE_SHARED" = "yes"; then - WX_TARGET_LIBRARY="${WX_LIBRARY_NAME_SHARED}" + case "${host}" in + *-hp-hpux* ) + if test "$GCC" = yes ; then + SHARED_LD="${CC} -shared -fPIC -o" + PIC_FLAG="-fPIC" + else + SHARED_LD="${CXX} -b -o" + PIC_FLAG="+Z" + fi + WX_LIBRARY_NAME_SHARED="libwx_${TOOLKIT_DIR}.sl" + WX_ALL=${WX_LIBRARY_NAME_SHARED} + ;; -case "${host}" in - *-hp-hpux* ) - WX_LIBRARY_NAME_SHARED="libwx_${TOOLKIT_DIR}.sl" - SHARED_LD="${CXX} -b -o" - PIC_FLAG="+Z" - ;; - *-*-linux* ) - SHARED_LD="${CC} -shared -o" - PIC_FLAG="-fPIC" - WX_CREATE_INSTALLED_LINKS="CREATE_INSTALLED_LINKS" - WX_CREATE_LINKS="CREATE_LINKS" - ;; - *-*-irix5* | *-*-irix6* ) - if test "$GCC" = yes ; then - SHARED_LD="${CC} -shared -o" - PIC_FLAG="-fPIC" - else - SHARED_LD="${CXX} -shared -o" - fi - WX_CREATE_INSTALLED_LINKS="CREATE_INSTALLED_LINKS" - WX_CREATE_LINKS="CREATE_LINKS" - ;; - *-*-solaris2* ) - if test "$GCC" = yes ; then - SHARED_LD="${CC} -shared -o" - PIC_FLAG="-fPIC" - else - SHARED_LD="${CXX} -G -o" - PIC_FLAG="PIC" - fi - WX_CREATE_INSTALLED_LINKS="CREATE_INSTALLED_LINKS" - WX_CREATE_LINKS="CREATE_LINKS" - ;; - *-*-sunos4* ) - SHARED_LD="${CC} -shared -o" - PIC_FLAG="-fPIC" - WX_CREATE_INSTALLED_LINKS="CREATE_INSTALLED_LINKS" - WX_CREATE_LINKS="CREATE_LINKS" - ;; - *-*-freebsd* | *-*-netbsd*) - SHARED_LD="${CC} -shared -o" - PIC_FLAG="-fPIC" - WX_CREATE_INSTALLED_LINKS="CREATE_INSTALLED_LINKS" - WX_CREATE_LINKS="CREATE_LINKS" - ;; - *-*-osf* ) - SHARED_LD="${CXX} -shared -o" - PIC_FLAG="-fPIC" - WX_CREATE_INSTALLED_LINKS="CREATE_INSTALLED_LINKS" - WX_CREATE_LINKS="CREATE_LINKS" - ;; - *-*-dgux5* ) - SHARED_LD="${CXX} -shared -o" - PIC_FLAG="-fPIC" - WX_CREATE_INSTALLED_LINKS="CREATE_INSTALLED_LINKS" - WX_CREATE_LINKS="CREATE_LINKS" - ;; - *-*-sysv5* ) - SHARED_LD="${CC} -shared -o" - PIC_FLAG="-fPIC" - WX_CREATE_INSTALLED_LINKS="CREATE_INSTALLED_LINKS" - WX_CREATE_LINKS="CREATE_LINKS" - ;; - *-*-aix* ) - SHARED_LD="/usr/lpp/xlC/bin/makeC++SharedLib -p 0 -o" - ;; - *-*-cygwin32* ) - WX_TARGET_LIBRARY="${WX_LIBRARY_NAME_STATIC}" - ;; - *-*-mingw32* ) - WX_TARGET_LIBRARY="${WX_LIBRARY_NAME_STATIC}" - ;; - *-pc-os2_emx ) - ;; - *) - { echo "configure: error: unknown system type ${host}." 1>&2; exit 1; } -esac + *-*-linux* ) + SHARED_LD="${CC} -shared -o" + PIC_FLAG="-fPIC" + WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS" + WX_ALL="CREATE_LINKS" + ;; + *-*-irix5* | *-*-irix6* ) + if test "$GCC" = yes ; then + SHARED_LD="${CC} -shared -o" + PIC_FLAG="-fPIC" + else + SHARED_LD="${CXX} -shared -o" + fi + WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS" + WX_ALL="CREATE_LINKS" + ;; + *-*-solaris2* ) + if test "$GCC" = yes ; then + SHARED_LD="${CC} -shared -o" + PIC_FLAG="-fPIC" + else + SHARED_LD="${CXX} -G -o" + PIC_FLAG="-KPIC" + fi + WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS" + WX_ALL="CREATE_LINKS" + ;; + *-*-sunos4* ) + SHARED_LD="${CC} -shared -o" + PIC_FLAG="-fPIC" + WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS" + WX_ALL="CREATE_LINKS" + ;; + *-*-freebsd* | *-*-netbsd*) + SHARED_LD="${CC} -shared -o" + PIC_FLAG="-fPIC" + WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS" + WX_ALL="CREATE_LINKS" + ;; + *-*-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} + ;; + *-*-cygwin32* ) + WX_TARGET_LIBRARY="${WX_LIBRARY_NAME_STATIC}" + WX_ALL="${WX_LIBRARY_NAME_STATIC}" + ;; + *-*-mingw32* ) + WX_TARGET_LIBRARY="${WX_LIBRARY_NAME_STATIC}" + WX_ALL="${WX_LIBRARY_NAME_STATIC}" + ;; + *-pc-os2_emx ) + WX_TARGET_LIBRARY="${WX_LIBRARY_NAME_STATIC}" + WX_ALL="${WX_LIBRARY_NAME_STATIC}" + ;; + *-*-beos* ) + SHARED_LD="${LD} -shared -o" + PIC_FLAG="-fPIC" + WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS" + WX_ALL="CREATE_LINKS" + ;; + *) + { 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}" + fi else WX_TARGET_LIBRARY="${WX_LIBRARY_NAME_STATIC}" + WX_ALL="${WX_LIBRARY_NAME_STATIC}" fi @@ -7825,17 +8325,17 @@ for ac_hdr in strings.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:7829: checking for $ac_hdr" >&5 +echo "configure:8329: 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:7839: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8339: \"$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* @@ -7865,17 +8365,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:7869: checking for $ac_hdr" >&5 +echo "configure:8369: 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:7879: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8379: \"$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* @@ -7905,17 +8405,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:7909: checking for $ac_hdr" >&5 +echo "configure:8409: 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:7919: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8419: \"$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* @@ -7945,17 +8445,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:7949: checking for $ac_hdr" >&5 +echo "configure:8449: 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:7959: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8459: \"$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* @@ -7985,17 +8485,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:7989: checking for $ac_hdr" >&5 +echo "configure:8489: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7999: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8499: \"$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* @@ -8021,21 +8521,23 @@ else fi done -for ac_hdr in X11/XKBlib.h + +if test "$wxUSE_GUI" = "yes"; then + for ac_hdr in X11/XKBlib.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:8029: checking for $ac_hdr" >&5 +echo "configure:8531: 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:8039: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8541: \"$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* @@ -8061,15 +8563,16 @@ else fi done +fi echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:8068: checking for ANSI C header files" >&5 +echo "configure:8571: 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 @@ -8077,7 +8580,7 @@ else #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8081: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8584: \"$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* @@ -8094,7 +8597,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 @@ -8112,7 +8615,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 @@ -8133,7 +8636,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -8144,7 +8647,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } EOF -if { (eval echo configure:8148: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:8651: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -8168,12 +8671,12 @@ EOF fi echo $ac_n "checking for mode_t""... $ac_c" 1>&6 -echo "configure:8172: checking for mode_t" >&5 +echo "configure:8675: 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 @@ -8201,12 +8704,12 @@ EOF fi echo $ac_n "checking for off_t""... $ac_c" 1>&6 -echo "configure:8205: checking for off_t" >&5 +echo "configure:8708: 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 @@ -8234,12 +8737,12 @@ EOF fi echo $ac_n "checking for pid_t""... $ac_c" 1>&6 -echo "configure:8238: checking for pid_t" >&5 +echo "configure:8741: 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 @@ -8267,12 +8770,12 @@ EOF fi echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:8271: checking for size_t" >&5 +echo "configure:8774: 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 @@ -8300,12 +8803,12 @@ EOF fi echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6 -echo "configure:8304: checking for uid_t in sys/types.h" >&5 +echo "configure:8807: 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 @@ -8335,14 +8838,57 @@ fi +echo $ac_n "checking for pw_gecos in struct passwd""... $ac_c" 1>&6 +echo "configure:8843: 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() { + + char *p; + struct passwd *pw; + p = pw->pw_gecos; + +; return 0; } +EOF +if { (eval echo configure:8860: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + + wx_cv_struct_pw_gecos=yes + cat >> confdefs.h <<\EOF +#define HAVE_PW_GECOS 1 +EOF + + +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + + wx_cv_struct_pw_gecos=no + + +fi +rm -f conftest* + + +fi + +echo "$ac_t""$wx_cv_struct_pw_gecos" 1>&6 + echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:8341: checking for working const" >&5 +echo "configure:8887: 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:8941: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -8412,21 +8958,21 @@ EOF fi echo $ac_n "checking for inline""... $ac_c" 1>&6 -echo "configure:8416: checking for inline" >&5 +echo "configure:8962: 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:8976: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_inline=$ac_kw; break else @@ -8453,7 +8999,7 @@ esac echo $ac_n "checking size of char""... $ac_c" 1>&6 -echo "configure:8457: checking size of char" >&5 +echo "configure:9003: 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 @@ -8461,7 +9007,7 @@ else ac_cv_sizeof_char=1 else cat > conftest.$ac_ext < main() @@ -8472,7 +9018,7 @@ main() exit(0); } EOF -if { (eval echo configure:8476: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:9022: \"$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 @@ -8492,7 +9038,7 @@ EOF echo $ac_n "checking size of short""... $ac_c" 1>&6 -echo "configure:8496: checking size of short" >&5 +echo "configure:9042: 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 @@ -8500,7 +9046,7 @@ else ac_cv_sizeof_short=2 else cat > conftest.$ac_ext < main() @@ -8511,7 +9057,7 @@ main() exit(0); } EOF -if { (eval echo configure:8515: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:9061: \"$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 @@ -8531,7 +9077,7 @@ EOF echo $ac_n "checking size of int *""... $ac_c" 1>&6 -echo "configure:8535: checking size of int *" >&5 +echo "configure:9081: 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 @@ -8539,7 +9085,7 @@ else ac_cv_sizeof_int_p=4 else cat > conftest.$ac_ext < main() @@ -8550,7 +9096,7 @@ main() exit(0); } EOF -if { (eval echo configure:8554: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:9100: \"$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 @@ -8570,7 +9116,7 @@ EOF echo $ac_n "checking size of int""... $ac_c" 1>&6 -echo "configure:8574: checking size of int" >&5 +echo "configure:9120: 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 @@ -8578,7 +9124,7 @@ else ac_cv_sizeof_int=4 else cat > conftest.$ac_ext < main() @@ -8589,7 +9135,7 @@ main() exit(0); } EOF -if { (eval echo configure:8593: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:9139: \"$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 @@ -8609,7 +9155,7 @@ EOF echo $ac_n "checking size of long""... $ac_c" 1>&6 -echo "configure:8613: checking size of long" >&5 +echo "configure:9159: 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 @@ -8617,7 +9163,7 @@ else ac_cv_sizeof_long=4 else cat > conftest.$ac_ext < main() @@ -8628,7 +9174,7 @@ main() exit(0); } EOF -if { (eval echo configure:8632: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:9178: \"$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 @@ -8648,7 +9194,7 @@ EOF echo $ac_n "checking size of long long""... $ac_c" 1>&6 -echo "configure:8652: checking size of long long" >&5 +echo "configure:9198: 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 @@ -8656,7 +9202,7 @@ else ac_cv_sizeof_long_long=0 else cat > conftest.$ac_ext < main() @@ -8667,7 +9213,7 @@ main() exit(0); } EOF -if { (eval echo configure:8671: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:9217: \"$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 @@ -8688,14 +9234,14 @@ EOF echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6 -echo "configure:8692: checking whether byte ordering is bigendian" >&5 +echo "configure:9238: 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 @@ -8706,11 +9252,11 @@ int main() { #endif ; return 0; } EOF -if { (eval echo configure:8710: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9256: \"$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 @@ -8721,7 +9267,7 @@ int main() { #endif ; return 0; } EOF -if { (eval echo configure:8725: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9271: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_bigendian=yes else @@ -8741,7 +9287,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:9304: \"$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 @@ -8801,17 +9347,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:8805: checking for $ac_hdr" >&5 +echo "configure:9351: 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:8815: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9361: \"$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* @@ -8859,7 +9405,7 @@ cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking if C++ compiler supports bool""... $ac_c" 1>&6 -echo "configure:8863: checking if C++ compiler supports bool" >&5 +echo "configure:9409: 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 @@ -8874,7 +9420,7 @@ cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9436: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF @@ -8927,94 +9473,14 @@ EOF - echo $ac_n "checking if size_t and int are different types""... $ac_c" 1>&6 -echo "configure:8932: checking if size_t and int are different types" >&5 -if eval "test \"`echo '$''{'wx_cv_cpp_sizet_not_int'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - - - 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 "$cross_compiling" = yes; then - wx_cv_cpp_sizet_not_int=no - -else - cat > conftest.$ac_ext < - - class S - { - public: - S(char *s) { m_s = s; } - - char operator[](size_t n) const { return m_s[n]; } - char operator[](int n) const { return m_s[n]; } - - private: - char *m_s; - }; - - int main() - { - S s("dummy"); - size_t n1 = 2; - int n2 = 3; - - return s[n1] == s[n2]; - } - -EOF -if { (eval echo configure:8981: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then - cat >> confdefs.h <<\EOF -#define wxUSE_SIZE_T_STRING_OPERATOR 1 -EOF - wx_cv_cpp_sizet_not_int=yes -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - wx_cv_cpp_sizet_not_int=no -fi -rm -fr conftest* -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 - - -fi - -echo "$ac_t""$wx_cv_cpp_sizet_not_int" 1>&6 - - - echo $ac_n "checking if you need GNU extensions""... $ac_c" 1>&6 -echo "configure:9012: checking if you need GNU extensions" >&5 +echo "configure:9478: checking if you need GNU extensions" >&5 if eval "test \"`echo '$''{'wx_cv_gnu_extensions'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { @@ -9027,7 +9493,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:9031: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9497: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_gnu_extensions=yes else @@ -9052,7 +9518,7 @@ fi echo $ac_n "checking for wcslen in -lc""... $ac_c" 1>&6 -echo "configure:9056: checking for wcslen in -lc" >&5 +echo "configure:9522: 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 @@ -9060,7 +9526,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lc $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9541: \"$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 @@ -9097,7 +9563,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for wcslen in -lw""... $ac_c" 1>&6 -echo "configure:9101: checking for wcslen in -lw" >&5 +echo "configure:9567: 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 @@ -9105,7 +9571,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lw $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9586: \"$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 @@ -9147,12 +9613,12 @@ fi echo $ac_n "checking for vprintf""... $ac_c" 1>&6 -echo "configure:9151: checking for vprintf" >&5 +echo "configure:9617: 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:9646: \"$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 @@ -9200,12 +9666,12 @@ fi if test "$ac_cv_func_vprintf" != yes; then echo $ac_n "checking for _doprnt""... $ac_c" 1>&6 -echo "configure:9204: checking for _doprnt" >&5 +echo "configure:9670: 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:9699: \"$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 @@ -9257,12 +9723,12 @@ fi for ac_func in vsnprintf do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:9261: checking for $ac_func" >&5 +echo "configure:9727: 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:9756: \"$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 @@ -9326,7 +9792,7 @@ cross_compiling=$ac_cv_prog_cxx_cross echo $ac_n "checking for vsscanf""... $ac_c" 1>&6 -echo "configure:9330: checking for vsscanf" >&5 +echo "configure:9796: checking for vsscanf" >&5 if eval "test \"`echo '$''{'wx_cv_func_vsscanf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -9336,7 +9802,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:9833: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then cat >> confdefs.h <<\EOF @@ -9394,15 +9860,74 @@ ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$a cross_compiling=$ac_cv_prog_cc_cross +if test "$USE_UNIX" = 1; then + for ac_func in vfork do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:9401: checking for $ac_func" >&5 +echo "configure:9869: checking for $ac_func" >&5 +if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext < +/* Override any gcc2 internal prototype to avoid an error. */ +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char $ac_func(); +char (*f)(); + +int main() { + +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_$ac_func) || defined (__stub___$ac_func) +choke me +#else +f = $ac_func; +#endif + +; return 0; } +EOF +if { (eval echo configure:9898: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_$ac_func=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_func_$ac_func=no" +fi +rm -f conftest* +fi + +if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then + echo "$ac_t""yes" 1>&6 + ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` + cat >> confdefs.h <&6 +fi +done + + +for ac_func in timegm +do +echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +echo "configure:9926: 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:9955: \"$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 @@ -9451,16 +9976,26 @@ fi done -POSIX4_LINK= -for ac_func in nanosleep +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 "$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:9459: checking for $ac_func" >&5 +echo "configure:9994: 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:10023: \"$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 @@ -9509,7 +10044,7 @@ EOF else echo "$ac_t""no" 1>&6 echo $ac_n "checking for nanosleep in -lposix4""... $ac_c" 1>&6 -echo "configure:9513: checking for nanosleep in -lposix4" >&5 +echo "configure:10048: 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 @@ -9517,7 +10052,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lposix4 $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10067: \"$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 @@ -9544,24 +10079,24 @@ 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_NANOSLEEP 1 EOF - POSIX4_LINK="-lposix4" - + POSIX4_LINK="-lposix4" + else echo "$ac_t""no" 1>&6 - for ac_func in usleep + for ac_func in usleep do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:9560: checking for $ac_func" >&5 +echo "configure:10095: 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:10124: \"$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 @@ -9603,33 +10138,33 @@ if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then 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 - + echo "configure: warning: wxSleep() function will not work" 1>&2 + + fi - + + fi done +fi for ac_func in uname gethostname do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:9628: checking for $ac_func" >&5 +echo "configure:10163: 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:10192: \"$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 @@ -9678,15 +10213,15 @@ fi done -for ac_func in inet_addr +for ac_func in strtok_r do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:9685: checking for $ac_func" >&5 +echo "configure:10220: 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:10249: \"$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 @@ -9734,15 +10269,17 @@ else fi done -for ac_func in inet_aton + +INET_LINK= +for ac_func in inet_addr do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:9741: checking for $ac_func" >&5 +echo "configure:10278: 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:10307: \"$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 @@ -9784,33 +10321,33 @@ if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then 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 inet_aton in -lresolv""... $ac_c" 1>&6 -echo "configure:9795: checking for inet_aton in -lresolv" >&5 -ac_lib_var=`echo resolv'_'inet_aton | sed 'y%./+-%__p_%'` +echo $ac_n "checking for inet_addr in -lnsl""... $ac_c" 1>&6 +echo "configure:10332: 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="-lresolv $LIBS" +LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10351: \"$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 @@ -9825,105 +10362,30 @@ LIBS="$ac_save_LIBS" fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 - ac_tr_lib=HAVE_LIB`echo resolv | sed -e 's/[^a-zA-Z0-9_]/_/g' \ - -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` - cat >> confdefs.h <&6 -fi - - - -cat > confcache <<\EOF -# This file is a shell script that caches the results of configure -# 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 "$USE_UNIX" = 1; 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" - fi -fi - -if test "$wxUSE_THREADS" = "yes" ; then - - echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6 -echo "configure:9908: checking for pthread_create in -lpthread" >&5 -ac_lib_var=`echo pthread'_'pthread_create | sed 'y%./+-%__p_%'` +echo $ac_n "checking for inet_addr in -lresolv""... $ac_c" 1>&6 +echo "configure:10370: 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="-lpthread $LIBS" +LIBS="-lresolv $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10389: \"$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 @@ -9938,167 +10400,98 @@ 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="pthread" - + INET_LINK="resolv" + else echo "$ac_t""no" 1>&6 +fi - echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6 -echo "configure:9950: checking for pthread_create in -lc_r" >&5 -ac_lib_var=`echo c_r'_'pthread_create | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + +fi + + + +fi +done + + +for ac_func in inet_aton +do +echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +echo "configure:10422: 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="-lc_r $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_create(); +char $ac_func(); +char (*f)(); int main() { -pthread_create() -; return 0; } -EOF -if { (eval echo configure:9969: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - - THREADS_OBJ="threadpsx.lo" - THREADS_LINK="c_r" - -else - echo "$ac_t""no" 1>&6 +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_$ac_func) || defined (__stub___$ac_func) +choke me +#else +f = $ac_func; +#endif - ac_safe=`echo "sys/prctl.h" | sed 'y%./+-%__p_%'` -echo $ac_n "checking for sys/prctl.h""... $ac_c" 1>&6 -echo "configure:9993: checking for sys/prctl.h" >&5 -if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < +; return 0; } EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10003: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -if test -z "$ac_err"; then +if { (eval echo configure:10451: \"$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_func_$ac_func=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_func_$ac_func=no" fi rm -f conftest* fi -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then - echo "$ac_t""yes" 1>&6 - - THREADS_OBJ="threadsgi.lo" - -else - echo "$ac_t""no" 1>&6 -fi - - -fi - - -fi - - - if test -z "$THREADS_OBJ" ; then - wxUSE_THREADS=no - echo "configure: warning: No thread support on this system" 1>&2 - fi -fi -if test "$wxUSE_THREADS" = "yes" ; then - - for ac_hdr in sched.h -do -ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` -echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:10045: checking for $ac_hdr" >&5 -if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10055: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -if test -z "$ac_err"; then - rm -rf conftest* - 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 - ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` + 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 -fi -done - - - echo $ac_n "checking for sched_yield in -l$THREADS_LINK""... $ac_c" 1>&6 -echo "configure:10083: 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_aton in -l$INET_LINK""... $ac_c" 1>&6 +echo "configure:10476: 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$THREADS_LINK $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:10495: \"$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 @@ -10114,81 +10507,117 @@ 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 +#define HAVE_INET_ATON 1 EOF else echo "$ac_t""no" 1>&6 -echo $ac_n "checking for sched_yield in -l"posix4"""... $ac_c" 1>&6 -echo "configure:10124: checking for sched_yield in -l"posix4"" >&5 -ac_lib_var=`echo "posix4"'_'sched_yield | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - ac_save_LIBS="$LIBS" -LIBS="-l"posix4" $LIBS" -cat > conftest.$ac_ext <> confdefs.h <<\EOF +#define HAVE_INET_ADDR 1 EOF -if { (eval echo configure:10143: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" + + INET_LINK="-l$INET_LINK" fi -rm -f conftest* -LIBS="$ac_save_LIBS" fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - cat >> confdefs.h <<\EOF -#define HAVE_SCHED_YIELD 1 + + +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 - POSIX4_LINK="-lposix4" +# 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 -echo "configure: warning: wxThread::Yield will not work properly" 1>&2 - + 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 - -fi - echo $ac_n "checking for pthread_attr_getschedpolicy in -l$THREADS_LINK""... $ac_c" 1>&6 -echo "configure:10173: checking for pthread_attr_getschedpolicy in -l$THREADS_LINK" >&5 -ac_lib_var=`echo $THREADS_LINK'_'pthread_attr_getschedpolicy | sed 'y%./+-%__p_%'` +if test "$USE_UNIX" = 1; 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 + +if test "$wxUSE_THREADS" = "yes" ; then + + echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6 +echo "configure:10602: checking for pthread_create in -lpthread" >&5 +ac_lib_var=`echo pthread'_'pthread_create | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" -LIBS="-l$THREADS_LINK $LIBS" +LIBS="-lpthread $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10621: \"$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 @@ -10203,33 +10632,34 @@ 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_THREAD_PRIORITY_FUNCTIONS 1 -EOF - + + THREADS_OBJ="threadpsx.lo" + THREADS_LINK="pthread" + else echo "$ac_t""no" 1>&6 -echo $ac_n "checking for pthread_attr_getschedpolicy in -l"posix4"""... $ac_c" 1>&6 -echo "configure:10214: checking for pthread_attr_getschedpolicy in -l"posix4"" >&5 -ac_lib_var=`echo "posix4"'_'pthread_attr_getschedpolicy | sed 'y%./+-%__p_%'` + + echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6 +echo "configure:10644: 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="-l"posix4" $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:10663: \"$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 @@ -10244,41 +10674,182 @@ 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_THREAD_PRIORITY_FUNCTIONS 1 -EOF - POSIX4_LINK="-lposix4" + + THREADS_OBJ="threadpsx.lo" + THREADS_LINK="c_r" + else echo "$ac_t""no" 1>&6 -echo "configure: warning: Setting thread priority will not work" 1>&2 + + ac_safe=`echo "sys/prctl.h" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for sys/prctl.h""... $ac_c" 1>&6 +echo "configure:10687: 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:10697: \"$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 + + THREADS_OBJ="threadsgi.lo" +else + echo "$ac_t""no" 1>&6 fi - + fi + +fi - echo $ac_n "checking for pthread_cancel in -l$THREADS_LINK""... $ac_c" 1>&6 -echo "configure:10263: checking for pthread_cancel in -l$THREADS_LINK" >&5 -ac_lib_var=`echo $THREADS_LINK'_'pthread_cancel | sed 'y%./+-%__p_%'` + + 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 +do +echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +echo "configure:10737: checking for $ac_func" >&5 +if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext < +/* Override any gcc2 internal prototype to avoid an error. */ +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char $ac_func(); +char (*f)(); + +int main() { + +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_$ac_func) || defined (__stub___$ac_func) +choke me +#else +f = $ac_func; +#endif + +; return 0; } +EOF +if { (eval echo configure:10766: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_$ac_func=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_func_$ac_func=no" +fi +rm -f conftest* +fi + +if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then + echo "$ac_t""yes" 1>&6 + ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` + cat >> confdefs.h <&6 +fi +done + + + + for ac_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:10796: 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; } +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 + + + echo $ac_n "checking for sched_yield in -l$THREADS_LINK""... $ac_c" 1>&6 +echo "configure:10834: 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="-l$THREADS_LINK $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10853: \"$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 @@ -10294,101 +10865,302 @@ 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 +#define HAVE_SCHED_YIELD 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:10308: 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 sched_yield in -l"posix4"""... $ac_c" 1>&6 +echo "configure:10875: checking for sched_yield in -l"posix4"" >&5 +ac_lib_var=`echo "posix4"'_'sched_yield | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 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 sched_yield(); - pthread_cleanup_push(NULL, NULL); - pthread_cleanup_pop(0); - +int main() { +sched_yield() ; return 0; } EOF -if { (eval echo configure:10324: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:10894: \"$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 - cat >> confdefs.h <<\EOF -#define HAVE_THREAD_CLEANUP_FUNCTIONS 1 -EOF - - + 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 - - THREADS_LINK="-l$THREADS_LINK" -fi +LIBS="$ac_save_LIBS" fi - -if test "$wxUSE_THREADS" = "yes"; 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_THREADS 1 +#define HAVE_SCHED_YIELD 1 EOF - - - CFLAGS="${CFLAGS} -D_REENTRANT" - CXXFLAGS="${CXXFLAGS} -D_REENTRANT" - - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS thread" + POSIX4_LINK="-lposix4" +else + echo "$ac_t""no" 1>&6 +echo "configure: warning: wxThread::Yield will not work properly" 1>&2 + fi -if test "$WXGTK12" = 1 ; then - cat >> confdefs.h <&6 +echo "configure:10924: 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" -if test "$wxUSE_DEBUG_INFO" = "yes" ; then - WXDEBUG="-g" - wxUSE_OPTIMISE=no fi - -if test "$wxUSE_DEBUG_FLAG" = "yes" ; then - cat >> confdefs.h <<\EOF -#define WXDEBUG 1 +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + cat >> confdefs.h <<\EOF +#define HAVE_THREAD_PRIORITY_FUNCTIONS 1 +EOF + +else + echo "$ac_t""no" 1>&6 +echo $ac_n "checking for pthread_attr_getschedpolicy in -l"posix4"""... $ac_c" 1>&6 +echo "configure:10965: checking for pthread_attr_getschedpolicy in -l"posix4"" >&5 +ac_lib_var=`echo "posix4"'_'pthread_attr_getschedpolicy | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + ac_save_LIBS="$LIBS" +LIBS="-l"posix4" $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + 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_THREAD_PRIORITY_FUNCTIONS 1 +EOF + POSIX4_LINK="-lposix4" +else + echo "$ac_t""no" 1>&6 +echo "configure: warning: Setting thread priority will not work" 1>&2 + +fi + + +fi + + + echo $ac_n "checking for pthread_cancel in -l$THREADS_LINK""... $ac_c" 1>&6 +echo "configure:11014: 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="-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" + +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + cat >> confdefs.h <<\EOF +#define HAVE_PTHREAD_CANCEL 1 +EOF + +else + echo "$ac_t""no" 1>&6 +echo "configure: warning: wxThread::Kill() will not work properly" 1>&2 +fi + + + echo $ac_n "checking for pthread_cleanup_push/pop""... $ac_c" 1>&6 +echo "configure:11059: checking for pthread_cleanup_push/pop" >&5 +if eval "test \"`echo '$''{'wx_cv_func_pthread_cleanup_push'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + + cat > conftest.$ac_ext < +int main() { + + pthread_cleanup_push(NULL, NULL); + pthread_cleanup_pop(0); + +; return 0; } +EOF +if { (eval echo configure:11075: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + + wx_cv_func_pthread_cleanup_push=yes + cat >> confdefs.h <<\EOF +#define HAVE_THREAD_CLEANUP_FUNCTIONS 1 +EOF + + +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + + wx_cv_func_pthread_cleanup_push=no + +fi +rm -f conftest* + +fi + +echo "$ac_t""$wx_cv_func_pthread_cleanup_push" 1>&6 + + THREADS_LINK="-l$THREADS_LINK" +fi + +fi + +if test "$wxUSE_THREADS" = "yes"; then + cat >> confdefs.h <<\EOF +#define wxUSE_THREADS 1 +EOF + + + CFLAGS="${CFLAGS} -D_REENTRANT" + CXXFLAGS="${CXXFLAGS} -D_REENTRANT" + + 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:11116: 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 "$WXGTK13" = 1 ; then + cat >> confdefs.h <> confdefs.h <> confdefs.h <<\EOF +#define WXDEBUG 1 EOF WXDEBUG_DEFINE="-D__WXDEBUG__" @@ -10419,16 +11191,24 @@ if test "$wxUSE_PROFILE" = "yes" ; then PROFILE="-pg" fi +DEP_INFO_FLAGS= if test "$GCC" = yes ; then if test "$wxUSE_NO_RTTI" = "yes" ; then - WXDEBUG_DEFINE="$WXDEBUG_DEFINE -fno-rtti" + WXDEBUG_DEFINE="$WXDEBUG_DEFINE -fno-rtti" fi if test "$wxUSE_NO_EXCEPTIONS" = "yes" ; then - WXDEBUG_DEFINE="$WXDEBUG_DEFINE -fno-exceptions" + WXDEBUG_DEFINE="$WXDEBUG_DEFINE -fno-exceptions" + fi + if test "$wxUSE_PERMISSIVE" = "yes" ; then + CFLAGS="${CFLAGS} -fpermissive" + CXXFLAGS="${CXXFLAGS} -fpermissive" fi -fi - - + if test "$wxUSE_NO_DEPS" = "no" ; then + DEP_INFO_FLAGS="-MMD" + fi +fi + + CXXFLAGS=`echo "${CXXFLAGS}" | sed "s/\-O.//g" ` CFLAGS=`echo "${CFLAGS}" | sed "s/\-O.//g" ` if test "$wxUSE_OPTIMISE" = "no" ; then @@ -10466,36 +11246,38 @@ EOF SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS png" fi -if test "$wxUSE_LIBGIF" = "yes" ; then +JPEG_INCLUDE= +if test "$wxUSE_LIBJPEG" = "yes" ; then cat >> confdefs.h <<\EOF -#define wxUSE_LIBGIF 1 +#define wxUSE_LIBJPEG 1 EOF + JPEG_INCLUDE="-I\${top_srcdir}/src/jpeg" fi -JPEG_INCLUDE= -if test "$wxUSE_LIBJPEG" = "yes" ; then +TIFF_INCLUDE= +if test "$wxUSE_LIBTIFF" = "yes" ; then cat >> confdefs.h <<\EOF -#define wxUSE_LIBJPEG 1 +#define wxUSE_LIBTIFF 1 EOF - JPEG_INCLUDE="-I\${top_srcdir}/src/jpeg" + TIFF_INCLUDE="-I\${top_srcdir}/src/tiff" 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:10489: checking for GL/gl.h" >&5 +echo "configure:11271: 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:10499: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:11281: \"$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* @@ -10513,7 +11295,7 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then echo "$ac_t""yes" 1>&6 echo $ac_n "checking for glInitNames in -lGL""... $ac_c" 1>&6 -echo "configure:10517: checking for glInitNames in -lGL" >&5 +echo "configure:11299: checking for glInitNames in -lGL" >&5 ac_lib_var=`echo GL'_'glInitNames | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -10521,7 +11303,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lGL wxUSE_OPENGL=0 $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11318: \"$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 @@ -10559,7 +11341,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for glInitNames in -lMesaGL""... $ac_c" 1>&6 -echo "configure:10563: checking for glInitNames in -lMesaGL" >&5 +echo "configure:11345: checking for glInitNames in -lMesaGL" >&5 ac_lib_var=`echo MesaGL'_'glInitNames | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -10567,7 +11349,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lMesaGL $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11364: \"$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 @@ -10647,14 +11429,6 @@ EOF fi -if test "$wxUSE_TIMEDATE" = "yes"; then - cat >> confdefs.h <<\EOF -#define wxUSE_TIMEDATE 1 -EOF - - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS typetest" -fi - if test "$wxUSE_WAVE" = "yes"; then cat >> confdefs.h <<\EOF #define wxUSE_WAVE 1 @@ -10739,50 +11513,482 @@ EOF fi fi -if test "$wxUSE_LOG" = "yes"; then - cat >> confdefs.h <<\EOF -#define wxUSE_LOG 1 +if test "$wxUSE_LOG" = "yes"; then + cat >> confdefs.h <<\EOF +#define wxUSE_LOG 1 +EOF + +fi + +if test "$wxUSE_LONGLONG" = "yes"; then + cat >> confdefs.h <<\EOF +#define wxUSE_LONGLONG 1 +EOF + +fi + +if test "$wxUSE_DIALUP_MANAGER" = "yes" ; then + cat >> confdefs.h <<\EOF +#define wxUSE_DIALUP_MANAGER 1 +EOF + + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS nettest" +fi + +if test "$wxUSE_STREAMS" = "yes" ; then + cat >> confdefs.h <<\EOF +#define wxUSE_STREAMS 1 +EOF + +fi + + +if test "$wxUSE_TIMEDATE" = "yes"; then + for ac_func in strptime +do +echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +echo "configure:11551: checking for $ac_func" >&5 +if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext < +/* Override any gcc2 internal prototype to avoid an error. */ +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char $ac_func(); +char (*f)(); + +int main() { + +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_$ac_func) || defined (__stub___$ac_func) +choke me +#else +f = $ac_func; +#endif + +; return 0; } +EOF +if { (eval echo configure:11580: \"$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 timezone variable in ""... $ac_c" 1>&6 +echo "configure:11606: 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 < + +int main() { + + int tz; + tz = __timezone; + +; return 0; } +EOF +if { (eval echo configure:11624: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + + wx_cv_var_timezone=__timezone + +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + + cat > conftest.$ac_ext < + +int main() { + + int tz; + tz = _timezone; + +; return 0; } +EOF +if { (eval echo configure:11647: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + + wx_cv_var_timezone=_timezone + +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + + cat > conftest.$ac_ext < + +int main() { + + int tz; + tz = timezone; + +; return 0; } +EOF +if { (eval echo configure:11670: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + + wx_cv_var_timezone=timezone + +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + { echo "configure: error: no timezone variable" 1>&2; exit 1; } + +fi +rm -f conftest* + + +fi +rm -f conftest* + + +fi +rm -f conftest* + + +fi + +echo "$ac_t""$wx_cv_var_timezone" 1>&6 + + cat >> confdefs.h <&6 +echo "configure:11705: checking for $ac_func" >&5 +if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext < +/* Override any gcc2 internal prototype to avoid an error. */ +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char $ac_func(); +char (*f)(); + +int main() { + +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_$ac_func) || defined (__stub___$ac_func) +choke me +#else +f = $ac_func; +#endif + +; return 0; } +EOF +if { (eval echo configure:11734: \"$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_localtime" = "yes"; then + echo $ac_n "checking for tm_gmtoff in struct tm""... $ac_c" 1>&6 +echo "configure:11761: checking for tm_gmtoff in struct tm" >&5 +if eval "test \"`echo '$''{'wx_cv_struct_tm_has_gmtoff'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + + cat > conftest.$ac_ext < + +int main() { + + struct tm tm; + tm.tm_gmtoff++; + +; return 0; } +EOF +if { (eval echo configure:11779: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + + wx_cv_struct_tm_has_gmtoff=yes + cat >> confdefs.h <<\EOF +#define WX_GMTOFF_IN_TM 1 +EOF + + +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + wx_cv_struct_tm_has_gmtoff=no + +fi +rm -f conftest* + +fi + +echo "$ac_t""$wx_cv_struct_tm_has_gmtoff" 1>&6 + elif test "$ac_cv_func_gettimeofday" = "yes"; then + echo $ac_n "checking whether gettimeofday takes two arguments""... $ac_c" 1>&6 +echo "configure:11802: checking whether gettimeofday takes two arguments" >&5 +if eval "test \"`echo '$''{'wx_cv_func_gettimeofday_has_2_args'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + + + ac_ext=C +# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' +ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' +cross_compiling=$ac_cv_prog_cxx_cross + + + cat > conftest.$ac_ext < + #include + +int main() { + + struct timeval tv; + struct timezone tz; + gettimeofday(&tv, &tz); + +; return 0; } +EOF +if { (eval echo configure:11831: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + wx_cv_func_gettimeofday_has_2_args=yes +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + cat > conftest.$ac_ext < + #include + +int main() { + + struct timeval tv; + gettimeofday(&tv); + +; return 0; } +EOF +if { (eval echo configure:11852: \"$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 + +fi +rm -f conftest* + +fi +rm -f conftest* + ac_ext=c +# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. +ac_cpp='$CPP $CPPFLAGS' +ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' +ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' +cross_compiling=$ac_cv_prog_cc_cross + + +fi + +echo "$ac_t""$wx_cv_func_gettimeofday_has_2_args" 1>&6 + + if test "$wx_cv_func_gettimeofday_has_2_args" != "yes"; then + cat >> confdefs.h <<\EOF +#define WX_GETTIMEOFDAY_NO_TZ 1 EOF -fi + fi + fi -if test "$wxUSE_LONGLONG" = "yes"; then - cat >> confdefs.h <<\EOF -#define wxUSE_LONGLONG 1 + cat >> confdefs.h <<\EOF +#define wxUSE_TIMEDATE 1 EOF + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS typetest" fi -if test "$wxUSE_SOCKETS" = "yes" ; then - if test "$wxUSE_THREADS" = "yes" ; then - cat >> confdefs.h <<\EOF -#define wxUSE_SOCKETS 1 -EOF - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS wxsocket" - INCLUDE_SUBDIRS="$INCLUDE_SUBDIRS protocol" - else - echo "configure: warning: Socket classes require --with-threads and won't be compiled without it" 1>&2 - wxUSE_SOCKETS=0 - fi +if test "$wxUSE_SOCKETS" = "yes"; then + echo $ac_n "checking for socket""... $ac_c" 1>&6 +echo "configure:11896: checking for socket" >&5 +if eval "test \"`echo '$''{'ac_cv_func_socket'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext < +/* Override any gcc2 internal prototype to avoid an error. */ +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char socket(); +char (*f)(); + +int main() { + +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_socket) || defined (__stub___socket) +choke me +#else +f = socket; +#endif + +; return 0; } +EOF +if { (eval echo configure:11925: \"$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 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_func_socket=no" +fi +rm -f conftest* fi -if test "$wxUSE_STREAMS" = "yes" ; then - cat >> confdefs.h <<\EOF -#define wxUSE_STREAMS 1 +if eval "test \"`echo '$ac_cv_func_'socket`\" = yes"; then + echo "$ac_t""yes" 1>&6 + : +else + echo "$ac_t""no" 1>&6 +echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6 +echo "configure:11943: checking for socket in -lsocket" >&5 +ac_lib_var=`echo socket'_'socket | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + ac_save_LIBS="$LIBS" +LIBS="-lsocket $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" +fi +rm -f conftest* +LIBS="$ac_save_LIBS" fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + INET_LINK="$INET_LINK -lsocket" +else + echo "$ac_t""no" 1>&6 -if test "$wxUSE_SERIAL" = "yes" ; then - cat >> confdefs.h <<\EOF -#define wxUSE_SERIAL 1 -EOF + echo "configure: warning: socket library not found - sockets will be disabled" 1>&2 + wxUSE_SOCKETS=no + + +fi + fi +fi -if test "$wxUSE_SOCKETS" = "yes"; then +if test "$wxUSE_SOCKETS" = "yes" ; then ac_ext=C # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -10792,16 +11998,16 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross echo $ac_n "checking the type of the third argument of getsockname""... $ac_c" 1>&6 -echo "configure:10796: checking the type of the third argument of getsockname" >&5 +echo "configure:12002: checking the type of the third argument of getsockname" >&5 cat > conftest.$ac_ext < int main() { -socklen_t len; getsockname(0, NULL, &len); +socklen_t len; getsockname(0, 0, &len); ; return 0; } EOF -if { (eval echo configure:10805: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:12011: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF #define SOCKLEN_T socklen_t @@ -10812,14 +12018,14 @@ else cat conftest.$ac_ext >&5 rm -rf conftest* cat > conftest.$ac_ext < int main() { -size_t len; getsockname(0, NULL, &len); +size_t len; getsockname(0, 0, &len); ; return 0; } EOF -if { (eval echo configure:10823: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:12029: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF #define SOCKLEN_T size_t @@ -10830,14 +12036,14 @@ else cat conftest.$ac_ext >&5 rm -rf conftest* cat > conftest.$ac_ext < int main() { -int len; getsockname(0, NULL, &len); +int len; getsockname(0, 0, &len); ; return 0; } EOF -if { (eval echo configure:10841: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:12047: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF #define SOCKLEN_T int @@ -10848,7 +12054,7 @@ else cat conftest.$ac_ext >&5 rm -rf conftest* echo "$ac_t""unknown" 1>&6 - + fi rm -f conftest* @@ -10864,6 +12070,13 @@ 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 <<\EOF +#define wxUSE_SOCKETS 1 +EOF + + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS wxsocket" + INCLUDE_SUBDIRS="$INCLUDE_SUBDIRS protocol" fi @@ -10872,17 +12085,17 @@ if test "$wxUSE_JOYSTICK" = 1; then do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:10876: checking for $ac_hdr" >&5 +echo "configure:12089: 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:12099: \"$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* @@ -10921,15 +12134,15 @@ fi HAVE_DL_FUNCS=0 HAVE_SHL_FUNCS=0 if test "$wxUSE_DYNLIB_CLASS" = "yes"; then - for ac_func in dlopen + for ac_func in dlopen do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:10928: checking for $ac_func" >&5 +echo "configure:12141: 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:12170: \"$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 @@ -10971,14 +12184,17 @@ if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then cat >> confdefs.h <> 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:10982: checking for dlopen in -ldl" >&5 +echo "configure:12198: 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 @@ -10986,7 +12202,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:12217: \"$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 @@ -11012,26 +12228,26 @@ 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 + + cat >> confdefs.h <<\EOF #define HAVE_DLOPEN 1 EOF - HAVE_DL_FUNCS=1 + + HAVE_DL_FUNCS=1 + LIBS="$LIBS -ldl" + else echo "$ac_t""no" 1>&6 -fi - -fi -done - 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:11030: checking for $ac_func" >&5 +echo "configure:12246: 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:12275: \"$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 @@ -11073,32 +12289,46 @@ if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then cat >> confdefs.h <> confdefs.h <<\EOF + + cat >> confdefs.h <<\EOF #define HAVE_SHL_LOAD 1 EOF - HAVE_DL_FUNCS=1 HAVE_SHL_FUNCS=1 + + HAVE_SHL_FUNCS=1 + else echo "$ac_t""no" 1>&6 fi done + +fi + + +fi +done + if test "$HAVE_DL_FUNCS" = 0; then - if test "$USE_UNIX" = 1; then - echo "configure: warning: "--with-dynlib and --with-odbc will be disabled due to missing shared library support"" 1>&2 - wxUSE_ODBC=no - wxUSE_DYNLIB_CLASS=no - else - echo "configure: warning: "Cannot check dynlib requirements on non-Unix platforms. dynlib remains enabled."" 1>&2 - fi + 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 if test "$wxUSE_DYNLIB_CLASS" = "yes" ; then - cat >> confdefs.h <<\EOF + cat >> confdefs.h <<\EOF #define wxUSE_DYNLIB_CLASS 1 EOF +else + wxUSE_ODBC=no + wxUSE_SERIAL=no fi @@ -11124,13 +12354,25 @@ EOF fi +if test "$wxUSE_SERIAL" = "yes" ; then + cat >> confdefs.h <<\EOF +#define wxUSE_SERIAL 1 +EOF + +fi + + IODBC_C_SRC="" if test "$wxUSE_ODBC" = "yes" ; then - cat >> confdefs.h <<\EOF + cat >> confdefs.h <<\EOF #define wxUSE_ODBC 1 EOF - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS db" + WXODBCFLAG="-D_IODBC_" + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS db" + IODBCOBJS="\$(IODBC_OBJS)" +else + IODBCOBJS= fi @@ -11244,13 +12486,60 @@ 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 + 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 + wxUSE_DRAG_AND_DROP=no + fi + + if test "$USE_WIN32" = 1; 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:12504: 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:12514: \"$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 + + if test "x$HAVE_OLE2_H" = x ; then + echo "configure: warning: Drag and drop disabled because OLE headers not found" 1>&2 + wxUSE_DRAG_AND_DROP=no + fi fi if test "$wxUSE_DRAG_AND_DROP" = "yes"; then @@ -11260,6 +12549,7 @@ EOF SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS dnd" fi + fi if test "$wxUSE_SPLINES" = "yes" ; then @@ -11336,6 +12626,14 @@ EOF SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS grid" fi +if test "$wxUSE_NEW_GRID" = "yes"; then + cat >> confdefs.h <<\EOF +#define wxUSE_NEW_GRID 1 +EOF + + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS newgrid" +fi + if test "$wxUSE_IMAGLIST" = "yes"; then cat >> confdefs.h <<\EOF #define wxUSE_IMAGLIST 1 @@ -11397,7 +12695,7 @@ if test "$wxUSE_SCROLLBAR" = "yes"; then #define wxUSE_SCROLLBAR 1 EOF - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS scroll" + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS scroll scrollsub" fi if test "$wxUSE_SLIDER" = "yes"; then @@ -11414,6 +12712,13 @@ EOF fi +if test "$wxUSE_SPINCTRL" = "yes"; then + cat >> confdefs.h <<\EOF +#define wxUSE_SPINCTRL 1 +EOF + +fi + if test "$wxUSE_SPLITTER" = "yes"; then cat >> confdefs.h <<\EOF #define wxUSE_SPLITTER 1 @@ -11440,14 +12745,10 @@ if test "$wxUSE_STATLINE" = "yes"; then if test "$wxUSE_WINE" = 1 ; then echo "configure: warning: wxStaticLine is not supported under WINE" 1>&2 else - if test "$wxUSE_MOTIF" = 1 ; then - echo "configure: warning: wxStaticLine is not supported under Motif" 1>&2 - else - cat >> confdefs.h <<\EOF + cat >> confdefs.h <<\EOF #define wxUSE_STATLINE 1 EOF - fi fi fi @@ -11466,14 +12767,34 @@ EOF SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS tab" fi +if test "$wxUSE_TOOLBAR_SIMPLE" = "yes"; then + cat >> confdefs.h <<\EOF +#define wxUSE_TOOLBAR_SIMPLE 1 +EOF + + wxUSE_TOOLBAR="yes" +fi + if test "$wxUSE_TOOLBAR" = "yes"; then cat >> confdefs.h <<\EOF #define wxUSE_TOOLBAR 1 EOF + + if test "$wxUSE_TOOLBAR_SIMPLE" != "yes"; then + wxUSE_TOOLBAR_NATIVE="yes" + fi + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS toolbar" fi +if test "$wxUSE_TOOLBAR_NATIVE" = "yes"; then + cat >> confdefs.h <<\EOF +#define wxUSE_TOOLBAR_NATIVE 1 +EOF + +fi + if test "$wxUSE_TOOLTIPS" = "yes"; then if test "$wxUSE_MOTIF" = 1; then echo "configure: warning: wxTooltip not supported yet under Motif" 1>&2 @@ -11579,30 +12900,65 @@ EOF SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS validate" fi +if test "$wxUSE_GIF" = "yes" ; then + cat >> confdefs.h <<\EOF +#define wxUSE_GIF 1 +EOF + +fi + +if test "$wxUSE_PCX" = "yes" ; then + cat >> confdefs.h <<\EOF +#define wxUSE_PCX 1 +EOF + +fi + +if test "$wxUSE_PNM" = "yes" ; then + cat >> confdefs.h <<\EOF +#define wxUSE_PNM 1 +EOF + +fi + + +OSINFO=`uname -s -r -m` +OSINFO="\"$OSINFO\"" +cat >> confdefs.h <&6 -echo "configure:11655: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:13024: 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 @@ -11680,6 +13049,12 @@ fi +if test "${TOOLKIT_DIR}" = "msw" ; then + GL_TOOLKIT_DIR="win" +else + GL_TOOLKIT_DIR="${TOOLKIT_DIR}" +fi + trap '' 1 2 15 cat > confcache <<\EOF @@ -11784,55 +13159,75 @@ ac_given_INSTALL="$INSTALL" trap 'rm -fr `echo " wx-config - src/make.env - src/makeprog.env - src/makelib.env + src/make.env + src/makeprog.env + src/makelib.env Makefile samples/Makefile samples/bombs/Makefile samples/caret/Makefile + samples/calendar/Makefile samples/checklst/Makefile samples/config/Makefile samples/controls/Makefile - samples/dialogs/Makefile - samples/docview/Makefile - samples/docvwmdi/Makefile - samples/dnd/Makefile - samples/drawing/Makefile - samples/dynamic/Makefile - samples/image/Makefile - samples/layout/Makefile - samples/listctrl/Makefile - samples/mdi/Makefile - samples/minifram/Makefile - samples/minimal/Makefile - samples/notebook/Makefile + samples/console/Makefile + samples/db/Makefile + samples/dialogs/Makefile + samples/docview/Makefile + samples/docvwmdi/Makefile + samples/dnd/Makefile + samples/drawing/Makefile + samples/forty/Makefile + samples/font/Makefile + samples/fractal/Makefile + samples/grid/Makefile + samples/help/Makefile + samples/image/Makefile + samples/internat/Makefile + samples/layout/Makefile + samples/life/Makefile + samples/listctrl/Makefile + samples/mdi/Makefile + samples/minifram/Makefile + samples/minimal/Makefile + samples/nettest/Makefile + samples/newgrid/Makefile + samples/notebook/Makefile + samples/png/Makefile samples/printing/Makefile samples/proplist/Makefile - samples/sashtest/Makefile - samples/scroll/Makefile - samples/splitter/Makefile - samples/text/Makefile - samples/thread/Makefile - samples/toolbar/Makefile - samples/treectrl/Makefile - samples/typetest/Makefile - samples/validate/Makefile - samples/wxpoem/Makefile - samples/wxsocket/Makefile - samples/wizard/Makefile - samples/html/Makefile - samples/html/about/Makefile - samples/html/help/Makefile - samples/html/printing/Makefile - samples/html/test/Makefile - samples/html/zip/Makefile - samples/html/virtual/Makefile - samples/html/widget/Makefile - utils/Makefile - utils/wxMMedia2/Makefile - utils/wxMMedia2/lib/Makefile - utils/wxMMedia2/sample/Makefile + samples/richedit/Makefile + samples/resource/Makefile + samples/sashtest/Makefile + samples/scroll/Makefile + samples/scrollsub/Makefile + samples/splitter/Makefile + samples/text/Makefile + samples/thread/Makefile + samples/toolbar/Makefile + samples/treectrl/Makefile + samples/typetest/Makefile + samples/validate/Makefile + samples/wxpoem/Makefile + samples/wxsocket/Makefile + samples/wizard/Makefile + samples/html/Makefile + samples/html/about/Makefile + samples/html/help/Makefile + samples/html/printing/Makefile + samples/html/helpview/Makefile + samples/html/test/Makefile + samples/html/zip/Makefile + samples/html/virtual/Makefile + samples/html/widget/Makefile + utils/Makefile + utils/wxMMedia2/Makefile + utils/wxMMedia2/lib/Makefile + utils/wxMMedia2/sample/Makefile + utils/glcanvas/Makefile + utils/glcanvas/${GL_TOOLKIT_DIR}/Makefile + utils/ogl/Makefile + utils/ogl/src/Makefile setup.h:setup.h.in" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 EOF cat >> $CONFIG_STATUS <> $CONFIG_STATUS <> $CONFIG_STATUS <<\EOF @@ -12196,7 +13624,6 @@ fi; done EOF cat >> $CONFIG_STATUS <> $CONFIG_STATUS <<\EOF chmod +x wx-config - if test ! -d include; then - mkdir include - fi - if test ! -d include/wx; then - mkdir include/wx - fi - if test ! -d include/wx/${TOOLKIT_DIR}; then - mkdir include/wx/${TOOLKIT_DIR} - fi - cp -f setup.h include/wx/${TOOLKIT_DIR}/setup.h + if test ! -d include; then + mkdir include + fi + if test ! -d include/wx; then + mkdir include/wx + fi + if test ! -d include/wx/${TOOLKIT_DIR}; then + mkdir include/wx/${TOOLKIT_DIR} + fi + if test -f setup.h; then + mv -f setup.h include/wx/${TOOLKIT_DIR}/setup.h + fi exit 0 EOF