X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d64af447da77391881b8bbf06d89dcede2129412..336e2d442411a3594ff8a24dda22cfe906e038c1:/configure diff --git a/configure b/configure index 000fdcc9fd..43530ae03b 100755 --- a/configure +++ b/configure @@ -33,9 +33,6 @@ - - - @@ -76,6 +73,8 @@ ac_help="$ac_help 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-odbc use the IODBC and wxODBC classes" @@ -222,6 +221,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" @@ -236,6 +237,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, ...)" @@ -265,6 +270,8 @@ 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" # Initialize some variables set by options. # The variables have the same names as the options, with @@ -823,7 +830,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:827: checking host system type" >&5 +echo "configure:834: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -844,7 +851,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:848: checking target system type" >&5 +echo "configure:855: checking target system type" >&5 target_alias=$target case "$target_alias" in @@ -862,7 +869,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:866: checking build system type" >&5 +echo "configure:873: checking build system type" >&5 build_alias=$build case "$build_alias" in @@ -888,7 +895,7 @@ test "$host_alias" != "$target_alias" && WX_MAJOR_VERSION_NUMBER=2 WX_MINOR_VERSION_NUMBER=1 -WX_RELEASE_NUMBER=10 +WX_RELEASE_NUMBER=12 WX_INTERFACE_AGE=0 WX_BINARY_AGE=0 @@ -922,6 +929,8 @@ USE_CYGWIN= USE_MINGW= USE_DATA_GENERAL= +NEEDS_D_REENTRANT_FOR_R_FUNCS=0 + ALL_TOOLKITS="CYGWIN GTK MINGW MOTIF WINE" DEFAULT_wxUSE_GTK=0 @@ -938,6 +947,7 @@ 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 @@ -989,6 +999,7 @@ EOF EOF DEFAULT_DEFAULT_wxUSE_MOTIF=1 + NEEDS_D_REENTRANT_FOR_R_FUNCS=1 ;; *-*-sunos4* ) USE_SUN=1 @@ -1079,36 +1090,7 @@ EOF DEFAULT_DEFAULT_wxUSE_MOTIF=1 ;; - *-*-cygwin32* ) - USE_UNIX=0 - USE_WIN32=1 - 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 -EOF - - cat >> confdefs.h <<\EOF -#define STRICT 1 -EOF - - cat >> confdefs.h <<\EOF -#define WINVER 0x0400 -EOF - - DEFAULT_DEFAULT_wxUSE_MSW=1 - ;; - *-*-mingw32* ) + *-*-cygwin32* | *-*-mingw32* ) USE_UNIX=0 USE_WIN32=1 cat >> confdefs.h <<\EOF @@ -1161,7 +1143,7 @@ fi if test "$USE_LINUX" = 1; then echo $ac_n "checking for gettext in -lc""... $ac_c" 1>&6 -echo "configure:1165: checking for gettext in -lc" >&5 +echo "configure:1147: 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 @@ -1169,7 +1151,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:1166: \"$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 @@ -1241,6 +1223,7 @@ if test $DEBUG_CONFIGURE = 1; then DEFAULT_wxUSE_ZLIB=no DEFAULT_wxUSE_LIBPNG=no DEFAULT_wxUSE_LIBJPEG=no + DEFAULT_wxUSE_LIBTIFF=no DEFAULT_wxUSE_ODBC=no DEFAULT_wxUSE_STD_IOSTREAM=no @@ -1313,6 +1296,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 @@ -1320,6 +1304,8 @@ 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 @@ -1353,6 +1339,7 @@ else DEFAULT_wxUSE_ZLIB=yes DEFAULT_wxUSE_LIBPNG=yes DEFAULT_wxUSE_LIBJPEG=yes + DEFAULT_wxUSE_LIBTIFF=yes DEFAULT_wxUSE_ODBC=yes DEFAULT_wxUSE_STD_IOSTREAM=no @@ -1368,7 +1355,7 @@ else 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 @@ -1414,7 +1401,7 @@ else DEFAULT_wxUSE_COMBOBOX=yes DEFAULT_wxUSE_GAUGE=yes DEFAULT_wxUSE_GRID=yes - DEFAULT_wxUSE_NEW_GRID=yes + DEFAULT_wxUSE_NEW_GRID=no DEFAULT_wxUSE_IMAGLIST=yes DEFAULT_wxUSE_LISTBOX=yes DEFAULT_wxUSE_LISTCTRL=yes @@ -1425,6 +1412,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 @@ -1432,6 +1420,8 @@ 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 @@ -1456,7 +1446,7 @@ done echo $ac_n "checking "for --enable-gui"""... $ac_c" 1>&6 -echo "configure:1460: checking "for --enable-gui"" >&5 +echo "configure:1450: checking "for --enable-gui"" >&5 no_cache=0 # Check whether --enable-gui or --disable-gui was given. if test "${enable_gui+set}" = set; then @@ -1498,6 +1488,7 @@ if test "$wxUSE_GUI" = "no"; then DEFAULT_wxUSE_ZLIB=no DEFAULT_wxUSE_LIBPNG=no DEFAULT_wxUSE_LIBJPEG=no + DEFAULT_wxUSE_LIBTIFF=no DEFAULT_wxUSE_SOCKETS=no DEFAULT_wxUSE_JOYSTICK=no DEFAULT_wxUSE_AFM_FOR_POSTSCRIPT=no @@ -1529,13 +1520,13 @@ if test "$wxUSE_GUI" = "no"; then DEFAULT_wxUSE_FS_ZIP=no DEFAULT_wxUSE_BUSYINFO=no DEFAULT_wxUSE_ZIPSTREAM=no - DEFAULT_wxUSE_VALIDATORS=yes + DEFAULT_wxUSE_VALIDATORS=no DEFAULT_wxUSE_ACCEL=no DEFAULT_wxUSE_CARET=no DEFAULT_wxUSE_BMPBUTTON=no DEFAULT_wxUSE_CHECKBOX=no DEFAULT_wxUSE_CHECKLST=no - DEFAULT_wxUSE_CHOICE=yes + DEFAULT_wxUSE_CHOICE=no DEFAULT_wxUSE_COMBOBOX=no DEFAULT_wxUSE_GAUGE=no DEFAULT_wxUSE_GRID=no @@ -1550,13 +1541,16 @@ if test "$wxUSE_GUI" = "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 DEFAULT_wxUSE_STATLINE=no - DEFAULT_wxUSE_STATUSBAR=yes + DEFAULT_wxUSE_STATUSBAR=no DEFAULT_wxUSE_TABDIALOG=no DEFAULT_wxUSE_TOOLBAR=no + DEFAULT_wxUSE_TOOLBAR_NATIVE=no + DEFAULT_wxUSE_TOOLBAR_SIMPLE=no DEFAULT_wxUSE_TREECTRL=no DEFAULT_wxUSE_GIF=no DEFAULT_wxUSE_PCX=no @@ -1613,7 +1607,7 @@ fi echo $ac_n "checking "for --with-dmalloc"""... $ac_c" 1>&6 -echo "configure:1617: checking "for --with-dmalloc"" >&5 +echo "configure:1611: checking "for --with-dmalloc"" >&5 no_cache=0 # Check whether --with-dmalloc or --without-dmalloc was given. if test "${with_dmalloc+set}" = set; then @@ -1652,7 +1646,7 @@ fi echo $ac_n "checking "for --with-zlib"""... $ac_c" 1>&6 -echo "configure:1656: checking "for --with-zlib"" >&5 +echo "configure:1650: checking "for --with-zlib"" >&5 no_cache=0 # Check whether --with-zlib or --without-zlib was given. if test "${with_zlib+set}" = set; then @@ -1691,7 +1685,7 @@ fi echo $ac_n "checking "for --with-libpng"""... $ac_c" 1>&6 -echo "configure:1695: checking "for --with-libpng"" >&5 +echo "configure:1689: checking "for --with-libpng"" >&5 no_cache=0 # Check whether --with-libpng or --without-libpng was given. if test "${with_libpng+set}" = set; then @@ -1730,7 +1724,7 @@ fi echo $ac_n "checking "for --with-libjpeg"""... $ac_c" 1>&6 -echo "configure:1734: checking "for --with-libjpeg"" >&5 +echo "configure:1728: checking "for --with-libjpeg"" >&5 no_cache=0 # Check whether --with-libjpeg or --without-libjpeg was given. if test "${with_libjpeg+set}" = set; then @@ -1768,8 +1762,47 @@ fi fi + echo $ac_n "checking "for --with-libtiff"""... $ac_c" 1>&6 +echo "configure:1767: checking "for --with-libtiff"" >&5 + no_cache=0 + # Check whether --with-libtiff or --without-libtiff was given. +if test "${with_libtiff+set}" = set; then + withval="$with_libtiff" + + if test "$withval" = yes; then + ac_cv_use_libtiff='wxUSE_LIBTIFF=yes' + else + ac_cv_use_libtiff='wxUSE_LIBTIFF=no' + fi + +else + + 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_libtiff='wxUSE_LIBTIFF='$DEFAULT_wxUSE_LIBTIFF + +fi + + + eval "$ac_cv_use_libtiff" + if test "$no_cache" != 1; then + echo $ac_cv_use_libtiff >> ${wx_arg_cache_file}.tmp + fi + + 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-opengl"""... $ac_c" 1>&6 -echo "configure:1773: checking "for --with-opengl"" >&5 +echo "configure:1806: checking "for --with-opengl"" >&5 no_cache=0 # Check whether --with-opengl or --without-opengl was given. if test "${with_opengl+set}" = set; then @@ -1808,7 +1841,7 @@ fi echo $ac_n "checking "for --with-odbc"""... $ac_c" 1>&6 -echo "configure:1812: checking "for --with-odbc"" >&5 +echo "configure:1845: checking "for --with-odbc"" >&5 no_cache=0 # Check whether --with-odbc or --without-odbc was given. if test "${with_odbc+set}" = set; then @@ -1850,7 +1883,7 @@ fi echo $ac_n "checking "for --enable-shared"""... $ac_c" 1>&6 -echo "configure:1854: checking "for --enable-shared"" >&5 +echo "configure:1887: checking "for --enable-shared"" >&5 no_cache=0 # Check whether --enable-shared or --disable-shared was given. if test "${enable_shared+set}" = set; then @@ -1889,7 +1922,7 @@ fi echo $ac_n "checking "for --enable-optimise"""... $ac_c" 1>&6 -echo "configure:1893: checking "for --enable-optimise"" >&5 +echo "configure:1926: checking "for --enable-optimise"" >&5 no_cache=0 # Check whether --enable-optimise or --disable-optimise was given. if test "${enable_optimise+set}" = set; then @@ -1928,7 +1961,7 @@ fi echo $ac_n "checking "for --enable-debug"""... $ac_c" 1>&6 -echo "configure:1932: checking "for --enable-debug"" >&5 +echo "configure:1965: checking "for --enable-debug"" >&5 no_cache=0 # Check whether --enable-debug or --disable-debug was given. if test "${enable_debug+set}" = set; then @@ -1976,7 +2009,7 @@ fi echo $ac_n "checking "for --enable-debug_flag"""... $ac_c" 1>&6 -echo "configure:1980: checking "for --enable-debug_flag"" >&5 +echo "configure:2013: 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 @@ -2015,7 +2048,7 @@ fi echo $ac_n "checking "for --enable-debug_info"""... $ac_c" 1>&6 -echo "configure:2019: checking "for --enable-debug_info"" >&5 +echo "configure:2052: 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 @@ -2054,7 +2087,7 @@ fi echo $ac_n "checking "for --enable-debug_gdb"""... $ac_c" 1>&6 -echo "configure:2058: checking "for --enable-debug_gdb"" >&5 +echo "configure:2091: 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 @@ -2093,7 +2126,7 @@ fi echo $ac_n "checking "for --enable-debug_cntxt"""... $ac_c" 1>&6 -echo "configure:2097: checking "for --enable-debug_cntxt"" >&5 +echo "configure:2130: 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 @@ -2132,7 +2165,7 @@ fi echo $ac_n "checking "for --enable-mem_tracing"""... $ac_c" 1>&6 -echo "configure:2136: checking "for --enable-mem_tracing"" >&5 +echo "configure:2169: 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 @@ -2171,7 +2204,7 @@ fi echo $ac_n "checking "for --enable-profile"""... $ac_c" 1>&6 -echo "configure:2175: checking "for --enable-profile"" >&5 +echo "configure:2208: checking "for --enable-profile"" >&5 no_cache=0 # Check whether --enable-profile or --disable-profile was given. if test "${enable_profile+set}" = set; then @@ -2210,7 +2243,7 @@ fi echo $ac_n "checking "for --enable-no_rtti"""... $ac_c" 1>&6 -echo "configure:2214: checking "for --enable-no_rtti"" >&5 +echo "configure:2247: 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 @@ -2249,7 +2282,7 @@ fi echo $ac_n "checking "for --enable-no_exceptions"""... $ac_c" 1>&6 -echo "configure:2253: checking "for --enable-no_exceptions"" >&5 +echo "configure:2286: 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 @@ -2288,7 +2321,7 @@ fi echo $ac_n "checking "for --enable-permissive"""... $ac_c" 1>&6 -echo "configure:2292: checking "for --enable-permissive"" >&5 +echo "configure:2325: checking "for --enable-permissive"" >&5 no_cache=0 # Check whether --enable-permissive or --disable-permissive was given. if test "${enable_permissive+set}" = set; then @@ -2327,7 +2360,7 @@ fi echo $ac_n "checking "for --enable-no_deps"""... $ac_c" 1>&6 -echo "configure:2331: checking "for --enable-no_deps"" >&5 +echo "configure:2364: checking "for --enable-no_deps"" >&5 no_cache=0 # Check whether --enable-no_deps or --disable-no_deps was given. if test "${enable_no_deps+set}" = set; then @@ -2368,7 +2401,7 @@ fi echo $ac_n "checking "for --enable-intl"""... $ac_c" 1>&6 -echo "configure:2372: checking "for --enable-intl"" >&5 +echo "configure:2405: checking "for --enable-intl"" >&5 no_cache=0 # Check whether --enable-intl or --disable-intl was given. if test "${enable_intl+set}" = set; then @@ -2407,7 +2440,7 @@ fi echo $ac_n "checking "for --enable-config"""... $ac_c" 1>&6 -echo "configure:2411: checking "for --enable-config"" >&5 +echo "configure:2444: checking "for --enable-config"" >&5 no_cache=0 # Check whether --enable-config or --disable-config was given. if test "${enable_config+set}" = set; then @@ -2446,7 +2479,7 @@ fi echo $ac_n "checking "for --enable-sockets"""... $ac_c" 1>&6 -echo "configure:2450: checking "for --enable-sockets"" >&5 +echo "configure:2483: checking "for --enable-sockets"" >&5 no_cache=0 # Check whether --enable-sockets or --disable-sockets was given. if test "${enable_sockets+set}" = set; then @@ -2485,7 +2518,7 @@ fi echo $ac_n "checking "for --enable-dialupman"""... $ac_c" 1>&6 -echo "configure:2489: checking "for --enable-dialupman"" >&5 +echo "configure:2522: checking "for --enable-dialupman"" >&5 no_cache=0 # Check whether --enable-dialupman or --disable-dialupman was given. if test "${enable_dialupman+set}" = set; then @@ -2524,7 +2557,7 @@ fi echo $ac_n "checking "for --enable-ipc"""... $ac_c" 1>&6 -echo "configure:2528: checking "for --enable-ipc"" >&5 +echo "configure:2561: checking "for --enable-ipc"" >&5 no_cache=0 # Check whether --enable-ipc or --disable-ipc was given. if test "${enable_ipc+set}" = set; then @@ -2563,7 +2596,7 @@ fi echo $ac_n "checking "for --enable-apple_ieee"""... $ac_c" 1>&6 -echo "configure:2567: checking "for --enable-apple_ieee"" >&5 +echo "configure:2600: 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 @@ -2602,7 +2635,7 @@ fi echo $ac_n "checking "for --enable-timedate"""... $ac_c" 1>&6 -echo "configure:2606: checking "for --enable-timedate"" >&5 +echo "configure:2639: checking "for --enable-timedate"" >&5 no_cache=0 # Check whether --enable-timedate or --disable-timedate was given. if test "${enable_timedate+set}" = set; then @@ -2641,7 +2674,7 @@ fi echo $ac_n "checking "for --enable-wave"""... $ac_c" 1>&6 -echo "configure:2645: checking "for --enable-wave"" >&5 +echo "configure:2678: checking "for --enable-wave"" >&5 no_cache=0 # Check whether --enable-wave or --disable-wave was given. if test "${enable_wave+set}" = set; then @@ -2680,7 +2713,7 @@ fi echo $ac_n "checking "for --enable-fraction"""... $ac_c" 1>&6 -echo "configure:2684: checking "for --enable-fraction"" >&5 +echo "configure:2717: checking "for --enable-fraction"" >&5 no_cache=0 # Check whether --enable-fraction or --disable-fraction was given. if test "${enable_fraction+set}" = set; then @@ -2719,7 +2752,7 @@ fi echo $ac_n "checking "for --enable-dynlib"""... $ac_c" 1>&6 -echo "configure:2723: checking "for --enable-dynlib"" >&5 +echo "configure:2756: checking "for --enable-dynlib"" >&5 no_cache=0 # Check whether --enable-dynlib or --disable-dynlib was given. if test "${enable_dynlib+set}" = set; then @@ -2758,7 +2791,7 @@ fi echo $ac_n "checking "for --enable-longlong"""... $ac_c" 1>&6 -echo "configure:2762: checking "for --enable-longlong"" >&5 +echo "configure:2795: checking "for --enable-longlong"" >&5 no_cache=0 # Check whether --enable-longlong or --disable-longlong was given. if test "${enable_longlong+set}" = set; then @@ -2797,7 +2830,7 @@ fi echo $ac_n "checking "for --enable-log"""... $ac_c" 1>&6 -echo "configure:2801: checking "for --enable-log"" >&5 +echo "configure:2834: checking "for --enable-log"" >&5 no_cache=0 # Check whether --enable-log or --disable-log was given. if test "${enable_log+set}" = set; then @@ -2836,7 +2869,7 @@ fi echo $ac_n "checking "for --enable-streams"""... $ac_c" 1>&6 -echo "configure:2840: checking "for --enable-streams"" >&5 +echo "configure:2873: checking "for --enable-streams"" >&5 no_cache=0 # Check whether --enable-streams or --disable-streams was given. if test "${enable_streams+set}" = set; then @@ -2875,7 +2908,7 @@ fi echo $ac_n "checking "for --enable-file"""... $ac_c" 1>&6 -echo "configure:2879: checking "for --enable-file"" >&5 +echo "configure:2912: checking "for --enable-file"" >&5 no_cache=0 # Check whether --enable-file or --disable-file was given. if test "${enable_file+set}" = set; then @@ -2914,7 +2947,7 @@ fi echo $ac_n "checking "for --enable-textfile"""... $ac_c" 1>&6 -echo "configure:2918: checking "for --enable-textfile"" >&5 +echo "configure:2951: checking "for --enable-textfile"" >&5 no_cache=0 # Check whether --enable-textfile or --disable-textfile was given. if test "${enable_textfile+set}" = set; then @@ -2953,7 +2986,7 @@ fi echo $ac_n "checking "for --enable-unicode"""... $ac_c" 1>&6 -echo "configure:2957: checking "for --enable-unicode"" >&5 +echo "configure:2990: checking "for --enable-unicode"" >&5 no_cache=0 # Check whether --enable-unicode or --disable-unicode was given. if test "${enable_unicode+set}" = set; then @@ -2992,7 +3025,7 @@ fi echo $ac_n "checking "for --enable-wcsrtombs"""... $ac_c" 1>&6 -echo "configure:2996: checking "for --enable-wcsrtombs"" >&5 +echo "configure:3029: checking "for --enable-wcsrtombs"" >&5 no_cache=0 # Check whether --enable-wcsrtombs or --disable-wcsrtombs was given. if test "${enable_wcsrtombs+set}" = set; then @@ -3031,7 +3064,7 @@ fi echo $ac_n "checking "for --enable-wxprintfv"""... $ac_c" 1>&6 -echo "configure:3035: checking "for --enable-wxprintfv"" >&5 +echo "configure:3068: checking "for --enable-wxprintfv"" >&5 no_cache=0 # Check whether --enable-wxprintfv or --disable-wxprintfv was given. if test "${enable_wxprintfv+set}" = set; then @@ -3070,7 +3103,7 @@ fi echo $ac_n "checking "for --enable-joystick"""... $ac_c" 1>&6 -echo "configure:3074: checking "for --enable-joystick"" >&5 +echo "configure:3107: checking "for --enable-joystick"" >&5 no_cache=0 # Check whether --enable-joystick or --disable-joystick was given. if test "${enable_joystick+set}" = set; then @@ -3109,7 +3142,7 @@ fi echo $ac_n "checking "for --enable-std_iostreams"""... $ac_c" 1>&6 -echo "configure:3113: checking "for --enable-std_iostreams"" >&5 +echo "configure:3146: 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 @@ -3148,7 +3181,7 @@ fi echo $ac_n "checking "for --enable-fs_inet"""... $ac_c" 1>&6 -echo "configure:3152: checking "for --enable-fs_inet"" >&5 +echo "configure:3185: 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 @@ -3187,7 +3220,7 @@ fi echo $ac_n "checking "for --enable-fs_zip"""... $ac_c" 1>&6 -echo "configure:3191: checking "for --enable-fs_zip"" >&5 +echo "configure:3224: 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 @@ -3226,7 +3259,7 @@ fi echo $ac_n "checking "for --enable-zipstream"""... $ac_c" 1>&6 -echo "configure:3230: checking "for --enable-zipstream"" >&5 +echo "configure:3263: checking "for --enable-zipstream"" >&5 no_cache=0 # Check whether --enable-zipstream or --disable-zipstream was given. if test "${enable_zipstream+set}" = set; then @@ -3267,7 +3300,7 @@ fi echo $ac_n "checking "for --enable-threads"""... $ac_c" 1>&6 -echo "configure:3271: checking "for --enable-threads"" >&5 +echo "configure:3304: checking "for --enable-threads"" >&5 no_cache=0 # Check whether --enable-threads or --disable-threads was given. if test "${enable_threads+set}" = set; then @@ -3306,7 +3339,7 @@ fi echo $ac_n "checking "for --enable-serial"""... $ac_c" 1>&6 -echo "configure:3310: checking "for --enable-serial"" >&5 +echo "configure:3343: checking "for --enable-serial"" >&5 no_cache=0 # Check whether --enable-serial or --disable-serial was given. if test "${enable_serial+set}" = set; then @@ -3347,7 +3380,7 @@ fi echo $ac_n "checking "for --enable-docview"""... $ac_c" 1>&6 -echo "configure:3351: checking "for --enable-docview"" >&5 +echo "configure:3384: checking "for --enable-docview"" >&5 no_cache=0 # Check whether --enable-docview or --disable-docview was given. if test "${enable_docview+set}" = set; then @@ -3386,7 +3419,7 @@ fi echo $ac_n "checking "for --enable-help"""... $ac_c" 1>&6 -echo "configure:3390: checking "for --enable-help"" >&5 +echo "configure:3423: checking "for --enable-help"" >&5 no_cache=0 # Check whether --enable-help or --disable-help was given. if test "${enable_help+set}" = set; then @@ -3425,7 +3458,7 @@ fi echo $ac_n "checking "for --enable-constraints"""... $ac_c" 1>&6 -echo "configure:3429: checking "for --enable-constraints"" >&5 +echo "configure:3462: checking "for --enable-constraints"" >&5 no_cache=0 # Check whether --enable-constraints or --disable-constraints was given. if test "${enable_constraints+set}" = set; then @@ -3464,7 +3497,7 @@ fi echo $ac_n "checking "for --enable-printarch"""... $ac_c" 1>&6 -echo "configure:3468: checking "for --enable-printarch"" >&5 +echo "configure:3501: checking "for --enable-printarch"" >&5 no_cache=0 # Check whether --enable-printarch or --disable-printarch was given. if test "${enable_printarch+set}" = set; then @@ -3503,7 +3536,7 @@ fi echo $ac_n "checking "for --enable-mdi"""... $ac_c" 1>&6 -echo "configure:3507: checking "for --enable-mdi"" >&5 +echo "configure:3540: checking "for --enable-mdi"" >&5 no_cache=0 # Check whether --enable-mdi or --disable-mdi was given. if test "${enable_mdi+set}" = set; then @@ -3543,7 +3576,7 @@ fi echo $ac_n "checking "for --enable-postscript"""... $ac_c" 1>&6 -echo "configure:3547: checking "for --enable-postscript"" >&5 +echo "configure:3580: checking "for --enable-postscript"" >&5 no_cache=0 # Check whether --enable-postscript or --disable-postscript was given. if test "${enable_postscript+set}" = set; then @@ -3584,7 +3617,7 @@ fi echo $ac_n "checking "for --enable-prologio"""... $ac_c" 1>&6 -echo "configure:3588: checking "for --enable-prologio"" >&5 +echo "configure:3621: checking "for --enable-prologio"" >&5 no_cache=0 # Check whether --enable-prologio or --disable-prologio was given. if test "${enable_prologio+set}" = set; then @@ -3623,7 +3656,7 @@ fi echo $ac_n "checking "for --enable-resources"""... $ac_c" 1>&6 -echo "configure:3627: checking "for --enable-resources"" >&5 +echo "configure:3660: checking "for --enable-resources"" >&5 no_cache=0 # Check whether --enable-resources or --disable-resources was given. if test "${enable_resources+set}" = set; then @@ -3663,7 +3696,7 @@ fi echo $ac_n "checking "for --enable-xresources"""... $ac_c" 1>&6 -echo "configure:3667: checking "for --enable-xresources"" >&5 +echo "configure:3700: checking "for --enable-xresources"" >&5 no_cache=0 # Check whether --enable-xresources or --disable-xresources was given. if test "${enable_xresources+set}" = set; then @@ -3704,7 +3737,7 @@ fi echo $ac_n "checking "for --enable-clipboard"""... $ac_c" 1>&6 -echo "configure:3708: checking "for --enable-clipboard"" >&5 +echo "configure:3741: checking "for --enable-clipboard"" >&5 no_cache=0 # Check whether --enable-clipboard or --disable-clipboard was given. if test "${enable_clipboard+set}" = set; then @@ -3743,7 +3776,7 @@ fi echo $ac_n "checking "for --enable-dnd"""... $ac_c" 1>&6 -echo "configure:3747: checking "for --enable-dnd"" >&5 +echo "configure:3780: checking "for --enable-dnd"" >&5 no_cache=0 # Check whether --enable-dnd or --disable-dnd was given. if test "${enable_dnd+set}" = set; then @@ -3783,7 +3816,7 @@ fi echo $ac_n "checking "for --enable-wxtree"""... $ac_c" 1>&6 -echo "configure:3787: checking "for --enable-wxtree"" >&5 +echo "configure:3820: checking "for --enable-wxtree"" >&5 no_cache=0 # Check whether --enable-wxtree or --disable-wxtree was given. if test "${enable_wxtree+set}" = set; then @@ -3824,7 +3857,7 @@ fi echo $ac_n "checking "for --enable-controls"""... $ac_c" 1>&6 -echo "configure:3828: checking "for --enable-controls"" >&5 +echo "configure:3861: checking "for --enable-controls"" >&5 no_cache=0 # Check whether --enable-controls or --disable-controls was given. if test "${enable_controls+set}" = set; then @@ -3872,7 +3905,7 @@ if test "$wxUSE_CONTROLS" = "yes"; then DEFAULT_wxUSE_CHOICE=yes DEFAULT_wxUSE_GAUGE=yes DEFAULT_wxUSE_GRID=yes - DEFAULT_wxUSE_NEW_GRID=yes + DEFAULT_wxUSE_NEW_GRID=no DEFAULT_wxUSE_IMAGLIST=yes DEFAULT_wxUSE_LISTBOX=yes DEFAULT_wxUSE_LISTCTRL=yes @@ -3883,6 +3916,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 @@ -3890,6 +3924,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 @@ -3913,6 +3949,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 @@ -3920,13 +3957,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:3930: checking "for --enable-accel"" >&5 +echo "configure:3969: checking "for --enable-accel"" >&5 no_cache=0 # Check whether --enable-accel or --disable-accel was given. if test "${enable_accel+set}" = set; then @@ -3965,7 +4004,7 @@ fi echo $ac_n "checking "for --enable-caret"""... $ac_c" 1>&6 -echo "configure:3969: checking "for --enable-caret"" >&5 +echo "configure:4008: checking "for --enable-caret"" >&5 no_cache=0 # Check whether --enable-caret or --disable-caret was given. if test "${enable_caret+set}" = set; then @@ -4004,7 +4043,7 @@ fi echo $ac_n "checking "for --enable-bmpbutton"""... $ac_c" 1>&6 -echo "configure:4008: checking "for --enable-bmpbutton"" >&5 +echo "configure:4047: checking "for --enable-bmpbutton"" >&5 no_cache=0 # Check whether --enable-bmpbutton or --disable-bmpbutton was given. if test "${enable_bmpbutton+set}" = set; then @@ -4043,7 +4082,7 @@ fi echo $ac_n "checking "for --enable-checkbox"""... $ac_c" 1>&6 -echo "configure:4047: checking "for --enable-checkbox"" >&5 +echo "configure:4086: checking "for --enable-checkbox"" >&5 no_cache=0 # Check whether --enable-checkbox or --disable-checkbox was given. if test "${enable_checkbox+set}" = set; then @@ -4082,7 +4121,7 @@ fi echo $ac_n "checking "for --enable-checklst"""... $ac_c" 1>&6 -echo "configure:4086: checking "for --enable-checklst"" >&5 +echo "configure:4125: checking "for --enable-checklst"" >&5 no_cache=0 # Check whether --enable-checklst or --disable-checklst was given. if test "${enable_checklst+set}" = set; then @@ -4121,7 +4160,7 @@ fi echo $ac_n "checking "for --enable-choice"""... $ac_c" 1>&6 -echo "configure:4125: checking "for --enable-choice"" >&5 +echo "configure:4164: checking "for --enable-choice"" >&5 no_cache=0 # Check whether --enable-choice or --disable-choice was given. if test "${enable_choice+set}" = set; then @@ -4160,7 +4199,7 @@ fi echo $ac_n "checking "for --enable-combobox"""... $ac_c" 1>&6 -echo "configure:4164: checking "for --enable-combobox"" >&5 +echo "configure:4203: checking "for --enable-combobox"" >&5 no_cache=0 # Check whether --enable-combobox or --disable-combobox was given. if test "${enable_combobox+set}" = set; then @@ -4199,7 +4238,7 @@ fi echo $ac_n "checking "for --enable-gauge"""... $ac_c" 1>&6 -echo "configure:4203: checking "for --enable-gauge"" >&5 +echo "configure:4242: checking "for --enable-gauge"" >&5 no_cache=0 # Check whether --enable-gauge or --disable-gauge was given. if test "${enable_gauge+set}" = set; then @@ -4238,7 +4277,7 @@ fi echo $ac_n "checking "for --enable-grid"""... $ac_c" 1>&6 -echo "configure:4242: checking "for --enable-grid"" >&5 +echo "configure:4281: checking "for --enable-grid"" >&5 no_cache=0 # Check whether --enable-grid or --disable-grid was given. if test "${enable_grid+set}" = set; then @@ -4277,7 +4316,7 @@ fi echo $ac_n "checking "for --enable-newgrid"""... $ac_c" 1>&6 -echo "configure:4281: checking "for --enable-newgrid"" >&5 +echo "configure:4320: checking "for --enable-newgrid"" >&5 no_cache=0 # Check whether --enable-newgrid or --disable-newgrid was given. if test "${enable_newgrid+set}" = set; then @@ -4316,7 +4355,7 @@ fi echo $ac_n "checking "for --enable-imaglist"""... $ac_c" 1>&6 -echo "configure:4320: checking "for --enable-imaglist"" >&5 +echo "configure:4359: checking "for --enable-imaglist"" >&5 no_cache=0 # Check whether --enable-imaglist or --disable-imaglist was given. if test "${enable_imaglist+set}" = set; then @@ -4355,7 +4394,7 @@ fi echo $ac_n "checking "for --enable-listbox"""... $ac_c" 1>&6 -echo "configure:4359: checking "for --enable-listbox"" >&5 +echo "configure:4398: checking "for --enable-listbox"" >&5 no_cache=0 # Check whether --enable-listbox or --disable-listbox was given. if test "${enable_listbox+set}" = set; then @@ -4394,7 +4433,7 @@ fi echo $ac_n "checking "for --enable-listctrl"""... $ac_c" 1>&6 -echo "configure:4398: checking "for --enable-listctrl"" >&5 +echo "configure:4437: checking "for --enable-listctrl"" >&5 no_cache=0 # Check whether --enable-listctrl or --disable-listctrl was given. if test "${enable_listctrl+set}" = set; then @@ -4433,7 +4472,7 @@ fi echo $ac_n "checking "for --enable-notebook"""... $ac_c" 1>&6 -echo "configure:4437: checking "for --enable-notebook"" >&5 +echo "configure:4476: checking "for --enable-notebook"" >&5 no_cache=0 # Check whether --enable-notebook or --disable-notebook was given. if test "${enable_notebook+set}" = set; then @@ -4472,7 +4511,7 @@ fi echo $ac_n "checking "for --enable-radiobox"""... $ac_c" 1>&6 -echo "configure:4476: checking "for --enable-radiobox"" >&5 +echo "configure:4515: checking "for --enable-radiobox"" >&5 no_cache=0 # Check whether --enable-radiobox or --disable-radiobox was given. if test "${enable_radiobox+set}" = set; then @@ -4511,7 +4550,7 @@ fi echo $ac_n "checking "for --enable-radiobtn"""... $ac_c" 1>&6 -echo "configure:4515: checking "for --enable-radiobtn"" >&5 +echo "configure:4554: checking "for --enable-radiobtn"" >&5 no_cache=0 # Check whether --enable-radiobtn or --disable-radiobtn was given. if test "${enable_radiobtn+set}" = set; then @@ -4550,7 +4589,7 @@ fi echo $ac_n "checking "for --enable-sash"""... $ac_c" 1>&6 -echo "configure:4554: checking "for --enable-sash"" >&5 +echo "configure:4593: checking "for --enable-sash"" >&5 no_cache=0 # Check whether --enable-sash or --disable-sash was given. if test "${enable_sash+set}" = set; then @@ -4589,7 +4628,7 @@ fi echo $ac_n "checking "for --enable-scrollbar"""... $ac_c" 1>&6 -echo "configure:4593: checking "for --enable-scrollbar"" >&5 +echo "configure:4632: checking "for --enable-scrollbar"" >&5 no_cache=0 # Check whether --enable-scrollbar or --disable-scrollbar was given. if test "${enable_scrollbar+set}" = set; then @@ -4628,7 +4667,7 @@ fi echo $ac_n "checking "for --enable-slider"""... $ac_c" 1>&6 -echo "configure:4632: checking "for --enable-slider"" >&5 +echo "configure:4671: checking "for --enable-slider"" >&5 no_cache=0 # Check whether --enable-slider or --disable-slider was given. if test "${enable_slider+set}" = set; then @@ -4667,7 +4706,7 @@ fi echo $ac_n "checking "for --enable-spinbtn"""... $ac_c" 1>&6 -echo "configure:4671: checking "for --enable-spinbtn"" >&5 +echo "configure:4710: checking "for --enable-spinbtn"" >&5 no_cache=0 # Check whether --enable-spinbtn or --disable-spinbtn was given. if test "${enable_spinbtn+set}" = set; then @@ -4705,8 +4744,47 @@ fi fi + echo $ac_n "checking "for --enable-spinctrl"""... $ac_c" 1>&6 +echo "configure:4749: 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:4710: checking "for --enable-splitter"" >&5 +echo "configure:4788: checking "for --enable-splitter"" >&5 no_cache=0 # Check whether --enable-splitter or --disable-splitter was given. if test "${enable_splitter+set}" = set; then @@ -4745,7 +4823,7 @@ fi echo $ac_n "checking "for --enable-statbmp"""... $ac_c" 1>&6 -echo "configure:4749: checking "for --enable-statbmp"" >&5 +echo "configure:4827: checking "for --enable-statbmp"" >&5 no_cache=0 # Check whether --enable-statbmp or --disable-statbmp was given. if test "${enable_statbmp+set}" = set; then @@ -4784,7 +4862,7 @@ fi echo $ac_n "checking "for --enable-statbox"""... $ac_c" 1>&6 -echo "configure:4788: checking "for --enable-statbox"" >&5 +echo "configure:4866: checking "for --enable-statbox"" >&5 no_cache=0 # Check whether --enable-statbox or --disable-statbox was given. if test "${enable_statbox+set}" = set; then @@ -4823,7 +4901,7 @@ fi echo $ac_n "checking "for --enable-statline"""... $ac_c" 1>&6 -echo "configure:4827: checking "for --enable-statline"" >&5 +echo "configure:4905: checking "for --enable-statline"" >&5 no_cache=0 # Check whether --enable-statline or --disable-statline was given. if test "${enable_statline+set}" = set; then @@ -4862,7 +4940,7 @@ fi echo $ac_n "checking "for --enable-statusbar"""... $ac_c" 1>&6 -echo "configure:4866: checking "for --enable-statusbar"" >&5 +echo "configure:4944: checking "for --enable-statusbar"" >&5 no_cache=0 # Check whether --enable-statusbar or --disable-statusbar was given. if test "${enable_statusbar+set}" = set; then @@ -4901,7 +4979,7 @@ fi echo $ac_n "checking "for --enable-tabdialog"""... $ac_c" 1>&6 -echo "configure:4905: checking "for --enable-tabdialog"" >&5 +echo "configure:4983: checking "for --enable-tabdialog"" >&5 no_cache=0 # Check whether --enable-tabdialog or --disable-tabdialog was given. if test "${enable_tabdialog+set}" = set; then @@ -4940,7 +5018,7 @@ fi echo $ac_n "checking "for --enable-toolbar"""... $ac_c" 1>&6 -echo "configure:4944: checking "for --enable-toolbar"" >&5 +echo "configure:5022: checking "for --enable-toolbar"" >&5 no_cache=0 # Check whether --enable-toolbar or --disable-toolbar was given. if test "${enable_toolbar+set}" = set; then @@ -4978,8 +5056,86 @@ fi fi + echo $ac_n "checking "for --enable-tbarnative"""... $ac_c" 1>&6 +echo "configure:5061: 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:5100: 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:4983: checking "for --enable-treectrl"" >&5 +echo "configure:5139: checking "for --enable-treectrl"" >&5 no_cache=0 # Check whether --enable-treectrl or --disable-treectrl was given. if test "${enable_treectrl+set}" = set; then @@ -5020,7 +5176,7 @@ fi echo $ac_n "checking "for --enable-commondlg"""... $ac_c" 1>&6 -echo "configure:5024: checking "for --enable-commondlg"" >&5 +echo "configure:5180: checking "for --enable-commondlg"" >&5 no_cache=0 # Check whether --enable-commondlg or --disable-commondlg was given. if test "${enable_commondlg+set}" = set; then @@ -5059,7 +5215,7 @@ fi echo $ac_n "checking "for --enable-dirdlg"""... $ac_c" 1>&6 -echo "configure:5063: checking "for --enable-dirdlg"" >&5 +echo "configure:5219: checking "for --enable-dirdlg"" >&5 no_cache=0 # Check whether --enable-dirdlg or --disable-dirdlg was given. if test "${enable_dirdlg+set}" = set; then @@ -5098,7 +5254,7 @@ fi echo $ac_n "checking "for --enable-textdlg"""... $ac_c" 1>&6 -echo "configure:5102: checking "for --enable-textdlg"" >&5 +echo "configure:5258: checking "for --enable-textdlg"" >&5 no_cache=0 # Check whether --enable-textdlg or --disable-textdlg was given. if test "${enable_textdlg+set}" = set; then @@ -5137,7 +5293,7 @@ fi echo $ac_n "checking "for --enable-tipdlg"""... $ac_c" 1>&6 -echo "configure:5141: checking "for --enable-tipdlg"" >&5 +echo "configure:5297: checking "for --enable-tipdlg"" >&5 no_cache=0 # Check whether --enable-tipdlg or --disable-tipdlg was given. if test "${enable_tipdlg+set}" = set; then @@ -5176,7 +5332,7 @@ fi echo $ac_n "checking "for --enable-progressdlg"""... $ac_c" 1>&6 -echo "configure:5180: checking "for --enable-progressdlg"" >&5 +echo "configure:5336: checking "for --enable-progressdlg"" >&5 no_cache=0 # Check whether --enable-progressdlg or --disable-progressdlg was given. if test "${enable_progressdlg+set}" = set; then @@ -5215,7 +5371,7 @@ fi echo $ac_n "checking "for --enable-miniframe"""... $ac_c" 1>&6 -echo "configure:5219: checking "for --enable-miniframe"" >&5 +echo "configure:5375: checking "for --enable-miniframe"" >&5 no_cache=0 # Check whether --enable-miniframe or --disable-miniframe was given. if test "${enable_miniframe+set}" = set; then @@ -5254,7 +5410,7 @@ fi echo $ac_n "checking "for --enable-html"""... $ac_c" 1>&6 -echo "configure:5258: checking "for --enable-html"" >&5 +echo "configure:5414: checking "for --enable-html"" >&5 no_cache=0 # Check whether --enable-html or --disable-html was given. if test "${enable_html+set}" = set; then @@ -5293,7 +5449,7 @@ fi echo $ac_n "checking "for --enable-tooltips"""... $ac_c" 1>&6 -echo "configure:5297: checking "for --enable-tooltips"" >&5 +echo "configure:5453: checking "for --enable-tooltips"" >&5 no_cache=0 # Check whether --enable-tooltips or --disable-tooltips was given. if test "${enable_tooltips+set}" = set; then @@ -5332,7 +5488,7 @@ fi echo $ac_n "checking "for --enable-splines"""... $ac_c" 1>&6 -echo "configure:5336: checking "for --enable-splines"" >&5 +echo "configure:5492: checking "for --enable-splines"" >&5 no_cache=0 # Check whether --enable-splines or --disable-splines was given. if test "${enable_splines+set}" = set; then @@ -5371,7 +5527,7 @@ fi echo $ac_n "checking "for --enable-validators"""... $ac_c" 1>&6 -echo "configure:5375: checking "for --enable-validators"" >&5 +echo "configure:5531: checking "for --enable-validators"" >&5 no_cache=0 # Check whether --enable-validators or --disable-validators was given. if test "${enable_validators+set}" = set; then @@ -5410,7 +5566,7 @@ fi echo $ac_n "checking "for --enable-busyinfo"""... $ac_c" 1>&6 -echo "configure:5414: checking "for --enable-busyinfo"" >&5 +echo "configure:5570: checking "for --enable-busyinfo"" >&5 no_cache=0 # Check whether --enable-busyinfo or --disable-busyinfo was given. if test "${enable_busyinfo+set}" = set; then @@ -5451,7 +5607,7 @@ fi echo $ac_n "checking "for --enable-gif"""... $ac_c" 1>&6 -echo "configure:5455: checking "for --enable-gif"" >&5 +echo "configure:5611: checking "for --enable-gif"" >&5 no_cache=0 # Check whether --enable-gif or --disable-gif was given. if test "${enable_gif+set}" = set; then @@ -5490,7 +5646,7 @@ fi echo $ac_n "checking "for --enable-pcx"""... $ac_c" 1>&6 -echo "configure:5494: checking "for --enable-pcx"" >&5 +echo "configure:5650: checking "for --enable-pcx"" >&5 no_cache=0 # Check whether --enable-pcx or --disable-pcx was given. if test "${enable_pcx+set}" = set; then @@ -5529,7 +5685,7 @@ fi echo $ac_n "checking "for --enable-pnm"""... $ac_c" 1>&6 -echo "configure:5533: checking "for --enable-pnm"" >&5 +echo "configure:5689: checking "for --enable-pnm"" >&5 no_cache=0 # Check whether --enable-pnm or --disable-pnm was given. if test "${enable_pnm+set}" = set; then @@ -5574,7 +5730,7 @@ fi echo $ac_n "checking for toolkit""... $ac_c" 1>&6 -echo "configure:5578: checking for toolkit" >&5 +echo "configure:5734: checking for toolkit" >&5 if test "$wxUSE_GUI" = "yes"; then @@ -5691,7 +5847,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:5695: checking for $ac_word" >&5 +echo "configure:5851: 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 @@ -5721,7 +5877,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:5725: checking for $ac_word" >&5 +echo "configure:5881: 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 @@ -5772,7 +5928,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:5776: checking for $ac_word" >&5 +echo "configure:5932: 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 @@ -5804,7 +5960,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:5808: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:5964: 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. @@ -5815,12 +5971,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 5819 "configure" +#line 5975 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:5824: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5980: \"$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 @@ -5846,12 +6002,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:5850: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:6006: 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:5855: checking whether we are using GNU C" >&5 +echo "configure:6011: 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 @@ -5860,7 +6016,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:5864: \"$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:6020: \"$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 @@ -5879,7 +6035,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:5883: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:6039: 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 @@ -5914,7 +6070,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:5918: checking how to run the C preprocessor" >&5 +echo "configure:6074: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -5929,13 +6085,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:5939: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6095: \"$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 : @@ -5946,13 +6102,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:5956: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6112: \"$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 : @@ -5963,13 +6119,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:5973: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6129: \"$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 : @@ -5996,13 +6152,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:6000: checking whether ${CC-cc} needs -traditional" >&5 +echo "configure:6156: 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 @@ -6020,7 +6176,7 @@ rm -f conftest* if test $ac_cv_prog_gcc_traditional = no; then cat > conftest.$ac_ext < Autoconf TCGETA @@ -6056,7 +6212,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:6060: checking for $ac_word" >&5 +echo "configure:6216: 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 @@ -6088,7 +6244,7 @@ test -n "$CXX" || CXX="gcc" echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:6092: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 +echo "configure:6248: 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. @@ -6099,12 +6255,12 @@ cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext << EOF -#line 6103 "configure" +#line 6259 "configure" #include "confdefs.h" int main(){return(0);} EOF -if { (eval echo configure:6108: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6264: \"$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 @@ -6130,12 +6286,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:6134: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:6290: 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:6139: checking whether we are using GNU C++" >&5 +echo "configure:6295: 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 @@ -6144,7 +6300,7 @@ else yes; #endif EOF -if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:6148: \"$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:6304: \"$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 @@ -6163,7 +6319,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:6167: checking whether ${CXX-g++} accepts -g" >&5 +echo "configure:6323: 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 @@ -6196,7 +6352,7 @@ fi echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6 -echo "configure:6200: checking how to run the C++ preprocessor" >&5 +echo "configure:6356: 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 @@ -6209,12 +6365,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:6218: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6374: \"$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 : @@ -6252,7 +6408,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:6256: checking for $ac_word" >&5 +echo "configure:6412: 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 @@ -6283,7 +6439,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:6287: checking for $ac_word" >&5 +echo "configure:6443: 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 @@ -6323,7 +6479,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:6327: checking for a BSD compatible install" >&5 +echo "configure:6483: 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 @@ -6379,7 +6535,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:6383: checking for $ac_word" >&5 +echo "configure:6539: 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 @@ -6408,7 +6564,7 @@ fi echo $ac_n "checking "make for VPATH support"""... $ac_c" 1>&6 -echo "configure:6412: checking "make for VPATH support"" >&5 +echo "configure:6568: checking "make for VPATH support"" >&5 cat - << EOF > confMake check : file cp \$? \$@ @@ -6437,7 +6593,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:6441: checking for $ac_word" >&5 +echo "configure:6597: 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 @@ -6471,7 +6627,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:6475: checking for $ac_word" >&5 +echo "configure:6631: 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 @@ -6505,7 +6661,7 @@ then *) ac_lib=l ;; esac echo $ac_n "checking for yywrap in -l$ac_lib""... $ac_c" 1>&6 -echo "configure:6509: checking for yywrap in -l$ac_lib" >&5 +echo "configure:6665: 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 @@ -6513,7 +6669,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:6684: \"$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 @@ -6548,7 +6704,7 @@ fi echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:6552: checking whether ln -s works" >&5 +echo "configure:6708: 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 @@ -6571,6 +6727,8 @@ fi SEARCH_INCLUDE="\ + /usr/local/include \ + \ /usr/Motif-1.2/include \ /usr/Motif-2.1/include \ \ @@ -6581,16 +6739,15 @@ SEARCH_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 \ @@ -6612,9 +6769,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 \ @@ -6632,9 +6786,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` " @@ -6711,7 +6865,7 @@ if test "$wxUSE_CYGWIN" = 1 || test "$wxUSE_MINGW" = 1 ; 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:6715: checking for Windows headers" >&5 +echo "configure:6869: checking for Windows headers" >&5 ac_find_includes= for ac_dir in $SEARCH_INCLUDE; @@ -6767,7 +6921,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:6771: checking for $ac_word" >&5 +echo "configure:6925: 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 @@ -6802,7 +6956,7 @@ fi min_gtk_version=1.2.1 echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6 -echo "configure:6806: checking for GTK - version >= $min_gtk_version" >&5 +echo "configure:6960: checking for GTK - version >= $min_gtk_version" >&5 no_gtk="" if test "$GTK_CONFIG" != "no" ; then GTK_CFLAGS=`$GTK_CONFIG --cflags` @@ -6815,10 +6969,11 @@ echo "configure:6806: 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 @@ -6831,6 +6986,13 @@ 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) || @@ -6839,7 +7001,7 @@ main () } EOF -if { (eval echo configure:6843: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:7005: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -6881,12 +7043,58 @@ fi 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:7051: checking for gdk_im_open in -lgdk" >&5 +ac_lib_var=`echo gdk'_'gdk_im_open | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + ac_save_LIBS="$LIBS" +LIBS="-lgdk $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_XIM 1 +EOF + +else + echo "$ac_t""no" 1>&6 +fi + + fi if test "$wxUSE_WINE" = 1; then echo $ac_n "checking for WINE includes""... $ac_c" 1>&6 -echo "configure:6890: checking for WINE includes" >&5 +echo "configure:7098: checking for WINE includes" >&5 ac_find_includes= for ac_dir in $SEARCH_INCLUDE; @@ -6907,7 +7115,7 @@ for ac_dir in $SEARCH_INCLUDE; XPM_LINK="" echo $ac_n "checking for Xpm library""... $ac_c" 1>&6 -echo "configure:6911: checking for Xpm library" >&5 +echo "configure:7119: checking for Xpm library" >&5 ac_find_libraries= for ac_dir in $SEARCH_LIB; @@ -6935,7 +7143,7 @@ EOF MESA_LINK="" echo $ac_n "checking for Mesa library""... $ac_c" 1>&6 -echo "configure:6939: checking for Mesa library" >&5 +echo "configure:7147: checking for Mesa library" >&5 ac_find_libraries= for ac_dir in $SEARCH_LIB; @@ -6969,1317 +7177,2560 @@ for ac_dir in $SEARCH_LIB; COMMONDEPS="\$(MSW_COMMONDEPS)" GENERICDEPS="\$(MSW_GENERICDEPS)" UNIXOBJS="\$(UNIX_OBJS)" + UNIXDEPS="\$(UNIX_DEPS)" GUIDIST=MSW_DIST fi if test "$wxUSE_MOTIF" = 1; then - echo $ac_n "checking for X11 headers""... $ac_c" 1>&6 -echo "configure:6978: checking for X11 headers" >&5 - -ac_find_includes= -for ac_dir in $SEARCH_INCLUDE; - do - if test -f "$ac_dir/X11/Intrinsic.h"; then - ac_find_includes=$ac_dir - break - fi - done - - if test "$ac_find_includes" != "" ; then - echo "$ac_t""found $ac_find_includes" 1>&6 - else - echo "$ac_t""no" 1>&6 - { echo "configure: error: please set CFLAGS to contain the location of Xm/Xm.h" 1>&2; exit 1; } - fi + # If we find X, set shell vars x_includes and x_libraries to the +# paths, otherwise set no_x=yes. +# Uses ac_ vars as temps to allow command line to override cache and checks. +# --without-x overrides everything else, but does not touch the cache. +echo $ac_n "checking for X""... $ac_c" 1>&6 +echo "configure:7191: checking for X" >&5 + +# Check whether --with-x or --without-x was given. +if test "${with_x+set}" = set; then + withval="$with_x" + : +fi - echo $ac_n "checking for X11 libraries""... $ac_c" 1>&6 -echo "configure:6997: checking for X11 libraries" >&5 - -ac_find_libraries= -for ac_dir in $SEARCH_LIB; - do +# $have_x is `yes', `no', `disabled', or empty when we do not yet know. +if test "x$with_x" = xno; then + # The user explicitly disabled X. + have_x=disabled +else + if test "x$x_includes" != xNONE && test "x$x_libraries" != xNONE; then + # Both variables are already set. + have_x=yes + else +if eval "test \"`echo '$''{'ac_cv_have_x'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + # One or both of the vars are not set, and there is no cached value. +ac_x_includes=NO ac_x_libraries=NO +rm -fr conftestdir +if mkdir conftestdir; then + cd conftestdir + # Make sure to not put "make" in the Imakefile rules, since we grep it out. + cat > Imakefile <<'EOF' +acfindx: + @echo 'ac_im_incroot="${INCROOT}"; ac_im_usrlibdir="${USRLIBDIR}"; ac_im_libdir="${LIBDIR}"' +EOF + if (xmkmf) >/dev/null 2>/dev/null && test -f Makefile; then + # GNU make sometimes prints "make[1]: Entering...", which would confuse us. + eval `${MAKE-make} acfindx 2>/dev/null | grep -v make` + # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR. for ac_extension in a so sl; do - if test -f "$ac_dir/libX11.$ac_extension"; then - ac_find_libraries=$ac_dir - break 2 + if test ! -f $ac_im_usrlibdir/libX11.$ac_extension && + test -f $ac_im_libdir/libX11.$ac_extension; then + ac_im_usrlibdir=$ac_im_libdir; break fi done - done - - if test "$ac_find_libraries" != "" ; then - - ac_path_to_include=$ac_find_includes - echo "$TOOLKIT_INCLUDE" | grep "\-I$ac_find_includes" > /dev/null - result=$? - if test $result = 0; then - ac_path_to_include="" - else - ac_path_to_include="-I$ac_find_includes" - fi - - - echo "$GUI_TK_LIBRARY" | grep "\-L$ac_find_libraries" > /dev/null - result=$? - if test $result = 0; then - ac_path_to_link="" - else - ac_path_to_link="-L$ac_find_libraries" + # Screen out bogus values from the imake configuration. They are + # bogus both because they are the default anyway, and because + # using them would break gcc on systems where it needs fixed includes. + case "$ac_im_incroot" in + /usr/include) ;; + *) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes="$ac_im_incroot" ;; + esac + case "$ac_im_usrlibdir" in + /usr/lib | /lib) ;; + *) test -d "$ac_im_usrlibdir" && ac_x_libraries="$ac_im_usrlibdir" ;; + esac fi + cd .. + rm -fr conftestdir +fi +if test "$ac_x_includes" = NO; then + # Guess where to find include files, by looking for this one X11 .h file. + test -z "$x_direct_test_include" && x_direct_test_include=X11/Intrinsic.h - 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 - echo "$ac_t""no" 1>&6 - { echo "configure: error: please set LDFLAGS to contain the location of libXm" 1>&2; exit 1; } - fi - - echo $ac_n "checking for Motif/Lesstif headers""... $ac_c" 1>&6 -echo "configure:7040: checking for Motif/Lesstif headers" >&5 - -ac_find_includes= -for ac_dir in $SEARCH_INCLUDE; + # 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:7258: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` +if test -z "$ac_err"; then + rm -rf conftest* + # We can compile using X headers with no special include directory. +ac_x_includes= +else + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + # Look for the header file in a standard set of common directories. +# Check X11 before X11Rn because it is often a symlink to the current release. + for ac_dir in \ + /usr/X11/include \ + /usr/X11R6/include \ + /usr/X11R5/include \ + /usr/X11R4/include \ + \ + /usr/include/X11 \ + /usr/include/X11R6 \ + /usr/include/X11R5 \ + /usr/include/X11R4 \ + \ + /usr/local/X11/include \ + /usr/local/X11R6/include \ + /usr/local/X11R5/include \ + /usr/local/X11R4/include \ + \ + /usr/local/include/X11 \ + /usr/local/include/X11R6 \ + /usr/local/include/X11R5 \ + /usr/local/include/X11R4 \ + \ + /usr/X386/include \ + /usr/x386/include \ + /usr/XFree86/include/X11 \ + \ + /usr/include \ + /usr/local/include \ + /usr/unsupported/include \ + /usr/athena/include \ + /usr/local/x11r5/include \ + /usr/lpp/Xamples/include \ + \ + /usr/openwin/include \ + /usr/openwin/share/include \ + ; \ do - if test -f "$ac_dir/Xm/Xm.h"; then - ac_find_includes=$ac_dir + if test -r "$ac_dir/$x_direct_test_include"; then + ac_x_includes=$ac_dir break fi done +fi +rm -f conftest* +fi # $ac_x_includes = NO - if test "$ac_find_includes" != "" ; then - echo "$ac_t""found $ac_find_includes" 1>&6 - else - echo "$ac_t""no" 1>&6 - { echo "configure: error: please set CFLAGS to contain the location of Xm/Xm.h" 1>&2; exit 1; } - fi - - echo $ac_n "checking for Motif/Lesstif library""... $ac_c" 1>&6 -echo "configure:7059: checking for Motif/Lesstif library" >&5 - -ac_find_libraries= -for ac_dir in $SEARCH_LIB; - do - for ac_extension in a so sl; do - if test -f "$ac_dir/libXm.$ac_extension"; then - ac_find_libraries=$ac_dir - break 2 - fi - done - done - - if test "$ac_find_libraries" != "" ; then - - ac_path_to_include=$ac_find_includes - echo "$TOOLKIT_INCLUDE" | grep "\-I$ac_find_includes" > /dev/null - result=$? - if test $result = 0; then - ac_path_to_include="" - else - ac_path_to_include="-I$ac_find_includes" - fi +if test "$ac_x_libraries" = NO; then + # Check for the libraries. - - echo "$GUI_TK_LIBRARY" | grep "\-L$ac_find_libraries" > /dev/null - result=$? - if test $result = 0; then - ac_path_to_link="" - else - ac_path_to_link="-L$ac_find_libraries" - fi + test -z "$x_direct_test_library" && x_direct_test_library=Xt + test -z "$x_direct_test_function" && x_direct_test_function=XtMalloc + # See if we find them without any special options. + # Don't add to $LIBS permanently. + ac_save_LIBS="$LIBS" + LIBS="-l$x_direct_test_library $LIBS" +cat > conftest.$ac_ext <&6 - else - echo "$ac_t""no" 1>&6 - { echo "configure: error: please set LDFLAGS to contain the location of libXm" 1>&2; exit 1; } +int main() { +${x_direct_test_function}() +; return 0; } +EOF +if { (eval echo configure:7334: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + LIBS="$ac_save_LIBS" +# We can link X programs with no special library path. +ac_x_libraries= +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + LIBS="$ac_save_LIBS" +# First see if replacing the include by lib works. +# Check X11 before X11Rn because it is often a symlink to the current release. +for ac_dir in `echo "$ac_x_includes" | sed s/include/lib/` \ + /usr/X11/lib \ + /usr/X11R6/lib \ + /usr/X11R5/lib \ + /usr/X11R4/lib \ + \ + /usr/lib/X11 \ + /usr/lib/X11R6 \ + /usr/lib/X11R5 \ + /usr/lib/X11R4 \ + \ + /usr/local/X11/lib \ + /usr/local/X11R6/lib \ + /usr/local/X11R5/lib \ + /usr/local/X11R4/lib \ + \ + /usr/local/lib/X11 \ + /usr/local/lib/X11R6 \ + /usr/local/lib/X11R5 \ + /usr/local/lib/X11R4 \ + \ + /usr/X386/lib \ + /usr/x386/lib \ + /usr/XFree86/lib/X11 \ + \ + /usr/lib \ + /usr/local/lib \ + /usr/unsupported/lib \ + /usr/athena/lib \ + /usr/local/x11r5/lib \ + /usr/lpp/Xamples/lib \ + /lib/usr/lib/X11 \ + \ + /usr/openwin/lib \ + /usr/openwin/share/lib \ + ; \ +do + for ac_extension in a so sl; do + if test -r $ac_dir/lib${x_direct_test_library}.$ac_extension; then + ac_x_libraries=$ac_dir + break 2 fi - - echo $ac_n "checking for Xt library""... $ac_c" 1>&6 -echo "configure:7102: checking for Xt library" >&5 - -ac_find_libraries= -for ac_dir in $SEARCH_LIB; - do - for ac_extension in a so sl; do - if test -f "$ac_dir/libXt.$ac_extension"; then - ac_find_libraries=$ac_dir - break 2 - fi - done done +done +fi +rm -f conftest* +fi # $ac_x_libraries = NO - if test "$ac_find_libraries" != "" ; then - - echo "$GUI_TK_LIBRARY" | grep "\-L$ac_find_libraries" > /dev/null - result=$? - if test $result = 0; then - ac_path_to_link="" - else - ac_path_to_link="-L$ac_find_libraries" +if test "$ac_x_includes" = NO || test "$ac_x_libraries" = NO; then + # Didn't find X anywhere. Cache the known absence of X. + ac_cv_have_x="have_x=no" +else + # Record where we found X for the cache. + ac_cv_have_x="have_x=yes \ + ac_x_includes=$ac_x_includes ac_x_libraries=$ac_x_libraries" +fi +fi fi + eval "$ac_cv_have_x" +fi # $with_x != no - 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 - { echo "configure: error: please set LDFLAGS to contain the location of libXt" 1>&2; exit 1; } - fi +if test "$have_x" != yes; then + echo "$ac_t""$have_x" 1>&6 + no_x=yes +else + # If each of the values was on the command line, it overrides each guess. + test "x$x_includes" = xNONE && x_includes=$ac_x_includes + test "x$x_libraries" = xNONE && x_libraries=$ac_x_libraries + # Update the cache value to reflect the command line values. + ac_cv_have_x="have_x=yes \ + ac_x_includes=$x_includes ac_x_libraries=$x_libraries" + echo "$ac_t""libraries $x_libraries, headers $x_includes" 1>&6 +fi - XPM_LINK="" - echo $ac_n "checking for Xpm library""... $ac_c" 1>&6 -echo "configure:7134: checking for Xpm library" >&5 - -ac_find_libraries= -for ac_dir in $SEARCH_LIB; - do - for ac_extension in a so sl; do - if test -f "$ac_dir/libXpm.$ac_extension"; then - ac_find_libraries=$ac_dir - break 2 - fi - done - done +if test "$no_x" = yes; then + # Not all programs may use this symbol, but it does not hurt to define it. + cat >> confdefs.h <<\EOF +#define X_DISPLAY_MISSING 1 +EOF - if test "$ac_find_libraries" != "" ; then - - echo "$GUI_TK_LIBRARY" | grep "\-L$ac_find_libraries" > /dev/null - result=$? - if test $result = 0; then - ac_path_to_link="" - else - ac_path_to_link="-L$ac_find_libraries" + X_CFLAGS= X_PRE_LIBS= X_LIBS= X_EXTRA_LIBS= +else + if test -n "$x_includes"; then + X_CFLAGS="$X_CFLAGS -I$x_includes" fi - GUI_TK_LIBRARY="$GUI_TK_LIBRARY $ac_path_to_link" - XPM_LINK="-lXpm " - cat >> confdefs.h <<\EOF -#define wxHAVE_LIB_XPM 1 -EOF - - echo "$ac_t""found at $ac_find_libraries" 1>&6 - else - echo "$ac_t""no" 1>&6 - echo "configure: warning: library will be compiled without support for images in XPM format" 1>&2 - fi + # It would also be nice to do this for all -L options, not just this one. + if test -n "$x_libraries"; then + X_LIBS="$X_LIBS -L$x_libraries" + # For Solaris; some versions of Sun CC require a space after -R and + # others require no space. Words are not sufficient . . . . + case "`(uname -sr) 2>/dev/null`" in + "SunOS 5"*) + echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6 +echo "configure:7440: 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 + rm -rf conftest* + ac_R_nospace=yes +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + ac_R_nospace=no fi +rm -f conftest* + if test $ac_R_nospace = yes; then + echo "$ac_t""no" 1>&6 + X_LIBS="$X_LIBS -R$x_libraries" + else + LIBS="$ac_xsave_LIBS -R $x_libraries" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + ac_R_space=yes +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + ac_R_space=no +fi +rm -f conftest* + if test $ac_R_space = yes; then + echo "$ac_t""yes" 1>&6 + X_LIBS="$X_LIBS -R $x_libraries" + else + echo "$ac_t""neither works" 1>&6 + fi + fi + LIBS="$ac_xsave_LIBS" + esac + fi -WX_LIBRARY="wx_${TOOLKIT_DIR}" + # Check for system-dependent libraries X programs must link with. + # Do this before checking for the system-independent R6 libraries + # (-lICE), since we may need -lsocket or whatever for X linking. - ALL_OBJECTS="\$(GUIOBJS) \$(COMMONOBJS) \$(GENERICOBJS) \$(UNIXOBJS) \$(HTMLOBJS) \$(JPEGOBJS) \$(PNGOBJS) \$(ZLIBOBJS) \$(IODBCOBJS)" - ALL_DEPFILES="\$(GUIDEPS) \$(COMMONDEPS) \$(GENERICDEPS) \$(UNIXDEPS) \$(HTMLDEPS)" - ALL_HEADERS="\$(GUIHEADERS) \$(HTML_HEADERS) \$(UNIX_HEADERS) \$(PROTOCOL_HEADERS) \$(GENERIC_HEADERS) \$(WX_HEADERS)" + if test "$ISC" = yes; then + X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl_s -linet" + else + # Martyn.Johnson@cl.cam.ac.uk says this is needed for Ultrix, if the X + # libraries were built with DECnet support. And karl@cs.umb.edu says + # the Alpha needs dnet_stub (dnet does not exist). + echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6 +echo "configure:7505: checking for dnet_ntoa in -ldnet" >&5 +ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 else - - ALL_OBJECTS="\$(BASE_OBJS)" - ALL_DEPFILES="\${BASE_DEPS}" - ALL_HEADERS="\${BASE_HEADERS}" + ac_save_LIBS="$LIBS" +LIBS="-ldnet $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" -WX_LIBRARY_NAME="lib${WX_LIBRARY}.la" +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet" +else + echo "$ac_t""no" 1>&6 +fi -WX_LIBRARY_NAME_STATIC="lib${WX_LIBRARY}.a" + 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:7546: checking for dnet_ntoa in -ldnet_stub" >&5 +ac_lib_var=`echo dnet_stub'_'dnet_ntoa | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + ac_save_LIBS="$LIBS" +LIBS="-ldnet_stub $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 + X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub" +else + echo "$ac_t""no" 1>&6 +fi + + fi + + # msh@cis.ufl.edu says -lnsl (and -lsocket) are needed for his 386/AT, + # to get the SysV transport functions. + # chad@anasazi.com says the Pyramis MIS-ES running DC/OSx (SVR4) + # needs -lnsl. + # The nsl library prevents programs from opening the X display + # on Irix 5.2, according to dickey@clark.net. + echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6 +echo "configure:7594: checking for gethostbyname" >&5 +if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext < +/* Override any gcc2 internal prototype to avoid an error. */ +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char gethostbyname(); + +int main() { + +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_gethostbyname) || defined (__stub___gethostbyname) +choke me +#else +gethostbyname(); +#endif + +; return 0; } +EOF +if { (eval echo configure:7622: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_gethostbyname=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_func_gethostbyname=no" +fi +rm -f conftest* +fi + +if eval "test \"`echo '$ac_cv_func_'gethostbyname`\" = yes"; then + echo "$ac_t""yes" 1>&6 + : +else + echo "$ac_t""no" 1>&6 +fi + + if test $ac_cv_func_gethostbyname = no; then + echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 +echo "configure:7643: checking for gethostbyname in -lnsl" >&5 +ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + ac_save_LIBS="$LIBS" +LIBS="-lnsl $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 + X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl" +else + echo "$ac_t""no" 1>&6 +fi + + fi + + # lieder@skyler.mavd.honeywell.com says without -lsocket, + # socket/setsockopt and other routines are undefined under SCO ODT + # 2.0. But -lsocket is broken on IRIX 5.2 (and is not necessary + # on later versions), says simon@lia.di.epfl.ch: it contains + # gethostby* variants that don't use the nameserver (or something). + # -lsocket must be given before -lnsl if both are needed. + # We assume that if connect needs -lnsl, so does gethostbyname. + echo $ac_n "checking for connect""... $ac_c" 1>&6 +echo "configure:7692: checking for connect" >&5 +if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext < +/* Override any gcc2 internal prototype to avoid an error. */ +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char connect(); + +int main() { + +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_connect) || defined (__stub___connect) +choke me +#else +connect(); +#endif + +; return 0; } +EOF +if { (eval echo configure:7720: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_connect=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_func_connect=no" +fi +rm -f conftest* +fi + +if eval "test \"`echo '$ac_cv_func_'connect`\" = yes"; then + echo "$ac_t""yes" 1>&6 + : +else + echo "$ac_t""no" 1>&6 +fi + + if test $ac_cv_func_connect = no; then + echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6 +echo "configure:7741: checking for connect in -lsocket" >&5 +ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + ac_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 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" +fi +rm -f conftest* +LIBS="$ac_save_LIBS" + +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS" +else + echo "$ac_t""no" 1>&6 +fi + + fi + + # gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX. + echo $ac_n "checking for remove""... $ac_c" 1>&6 +echo "configure:7784: 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 < +/* 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 remove(); + +int main() { + +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_remove) || defined (__stub___remove) +choke me +#else +remove(); +#endif + +; return 0; } +EOF +if { (eval echo configure:7812: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_remove=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_func_remove=no" +fi +rm -f conftest* +fi + +if eval "test \"`echo '$ac_cv_func_'remove`\" = yes"; then + echo "$ac_t""yes" 1>&6 + : +else + echo "$ac_t""no" 1>&6 +fi + + if test $ac_cv_func_remove = no; then + echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6 +echo "configure:7833: checking for remove in -lposix" >&5 +ac_lib_var=`echo posix'_'remove | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + ac_save_LIBS="$LIBS" +LIBS="-lposix $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 + X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix" +else + echo "$ac_t""no" 1>&6 +fi + + fi + + # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. + echo $ac_n "checking for shmat""... $ac_c" 1>&6 +echo "configure:7876: 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 < +/* 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 shmat(); + +int main() { + +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_shmat) || defined (__stub___shmat) +choke me +#else +shmat(); +#endif + +; return 0; } +EOF +if { (eval echo configure:7904: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_shmat=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_func_shmat=no" +fi +rm -f conftest* +fi + +if eval "test \"`echo '$ac_cv_func_'shmat`\" = yes"; then + echo "$ac_t""yes" 1>&6 + : +else + echo "$ac_t""no" 1>&6 +fi + + if test $ac_cv_func_shmat = no; then + echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6 +echo "configure:7925: checking for shmat in -lipc" >&5 +ac_lib_var=`echo ipc'_'shmat | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + ac_save_LIBS="$LIBS" +LIBS="-lipc $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 + X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc" +else + echo "$ac_t""no" 1>&6 +fi + + fi + fi + + # Check for libraries that X11R6 Xt/Xaw programs need. + ac_save_LDFLAGS="$LDFLAGS" + test -n "$x_libraries" && LDFLAGS="$LDFLAGS -L$x_libraries" + # SM needs ICE to (dynamically) link under SunOS 4.x (so we have to + # check for ICE first), but we must link in the order -lSM -lICE or + # we get undefined symbols. So assume we have SM if we have ICE. + # These have to be linked with before -lX11, unlike the other + # libraries we check for below, so use a different variable. + # --interran@uluru.Stanford.EDU, kb@cs.umb.edu. + echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6 +echo "configure:7977: checking for IceConnectionNumber in -lICE" >&5 +ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + ac_save_LIBS="$LIBS" +LIBS="-lICE $X_EXTRA_LIBS $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" +fi +rm -f conftest* +LIBS="$ac_save_LIBS" + +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE" +else + echo "$ac_t""no" 1>&6 +fi + + LDFLAGS="$ac_save_LDFLAGS" + +fi + + + if test "$no_x" = "yes"; then + { echo "configure: error: X11 not found" 1>&2; exit 1; } + fi + + GUI_TK_LIBRARY="$X_LIBS" + TOOLKIT_INCLUDE="$X_CFLAGS" + + + echo $ac_n "checking for Motif/Lesstif headers""... $ac_c" 1>&6 +echo "configure:8030: checking for Motif/Lesstif headers" >&5 + +ac_find_includes= +for ac_dir in $SEARCH_INCLUDE; + do + if test -f "$ac_dir/Xm/Xm.h"; then + ac_find_includes=$ac_dir + break + fi + done + + if test "$ac_find_includes" != "" ; then + echo "$ac_t""found $ac_find_includes" 1>&6 + else + echo "$ac_t""no" 1>&6 + { echo "configure: error: please set CFLAGS to contain the location of Xm/Xm.h" 1>&2; exit 1; } + fi + + echo $ac_n "checking for Motif/Lesstif library""... $ac_c" 1>&6 +echo "configure:8049: checking for Motif/Lesstif library" >&5 + +ac_find_libraries= +for ac_dir in $SEARCH_LIB; + do + for ac_extension in a so sl; do + if test -f "$ac_dir/libXm.$ac_extension"; then + ac_find_libraries=$ac_dir + break 2 + fi + done + done + + if test "$ac_find_libraries" != "" ; then + + ac_path_to_include=$ac_find_includes + echo "$TOOLKIT_INCLUDE" | grep "\-I$ac_find_includes" > /dev/null + result=$? + if test $result = 0; then + ac_path_to_include="" + else + ac_path_to_include="-I$ac_find_includes" + fi + + + echo "$GUI_TK_LIBRARY" | grep "\-L$ac_find_libraries" > /dev/null + result=$? + if test $result = 0; then + ac_path_to_link="" + else + ac_path_to_link="-L$ac_find_libraries" + fi + + + GUI_TK_LIBRARY="$GUI_TK_LIBRARY $ac_path_to_link" + TOOLKIT_INCLUDE="$TOOLKIT_INCLUDE $ac_path_to_include" + echo "$ac_t""found at $ac_find_libraries" 1>&6 + else + echo "$ac_t""no" 1>&6 + { echo "configure: error: please set LDFLAGS to contain the location of libXm" 1>&2; exit 1; } + fi + + echo $ac_n "checking for Xt library""... $ac_c" 1>&6 +echo "configure:8092: checking for Xt library" >&5 + +ac_find_libraries= +for ac_dir in $SEARCH_LIB; + do + for ac_extension in a so sl; do + if test -f "$ac_dir/libXt.$ac_extension"; then + ac_find_libraries=$ac_dir + break 2 + fi + done + done + + if test "$ac_find_libraries" != "" ; then + + echo "$GUI_TK_LIBRARY" | grep "\-L$ac_find_libraries" > /dev/null + result=$? + if test $result = 0; then + ac_path_to_link="" + else + ac_path_to_link="-L$ac_find_libraries" + fi + + 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 + { echo "configure: error: please set LDFLAGS to contain the location of libXt" 1>&2; exit 1; } + fi + + XPM_LINK="" + echo $ac_n "checking for Xpm library""... $ac_c" 1>&6 +echo "configure:8124: checking for Xpm library" >&5 + +ac_find_libraries= +for ac_dir in $SEARCH_LIB; + do + for ac_extension in a so sl; do + if test -f "$ac_dir/libXpm.$ac_extension"; then + ac_find_libraries=$ac_dir + break 2 + fi + done + done + + if test "$ac_find_libraries" != "" ; then + + echo "$GUI_TK_LIBRARY" | grep "\-L$ac_find_libraries" > /dev/null + result=$? + if test $result = 0; then + ac_path_to_link="" + else + ac_path_to_link="-L$ac_find_libraries" + fi + + GUI_TK_LIBRARY="$GUI_TK_LIBRARY $ac_path_to_link" + XPM_LINK="-lXpm " + cat >> confdefs.h <<\EOF +#define wxHAVE_LIB_XPM 1 +EOF + + echo "$ac_t""found at $ac_find_libraries" 1>&6 + else + echo "$ac_t""no" 1>&6 + echo "configure: warning: library will be compiled without support for images in XPM format" 1>&2 + fi + + GUI_TK_LINK="-lXm $XPM_LINK -lXmu -lXext -lXt -lX11 -lm" + GUI_TK_LIBRARY="$GUI_TK_LIBRARY $GUI_TK_LINK" + TOOLKIT=MOTIF + + 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"` + +TOOLKIT_DEF="-D__WX${TOOLKIT}__" + +WX_LIBRARY="wx_${TOOLKIT_DIR}" + + 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="lib${WX_LIBRARY}.a" + +WX_LIBRARY_NAME_SHARED="lib${WX_LIBRARY}-${WX_RELEASE}.so.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}" + +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_ALL= +WX_ALL_INSTALLED= +BURNT_LIBRARY_NAME= + +if test "$wxUSE_SHARED" = "yes"; then + case "${host}" in + *-hp-hpux* ) + if test "$GCC" = yes ; then + SHARED_LD="${CC} -shared -fPIC -o" + PIC_FLAG="-fPIC" + else + SHARED_LD="${CXX} -b -o" + PIC_FLAG="+Z" + fi + WX_LIBRARY_NAME_SHARED="libwx_${TOOLKIT_DIR}.sl" + WX_ALL=${WX_LIBRARY_NAME_SHARED} + ;; + *-*-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 ) + ;; + *) + { 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 + + +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:8322: 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:8332: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` +if test -z "$ac_err"; then + rm -rf conftest* + eval "ac_cv_header_$ac_safe=yes" +else + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_header_$ac_safe=no" +fi +rm -f conftest* +fi +if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then + echo "$ac_t""yes" 1>&6 + ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` + cat >> confdefs.h <&6 +fi +done + +for ac_hdr in unistd.h +do +ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +echo "configure:8362: 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:8372: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` +if test -z "$ac_err"; then + rm -rf conftest* + eval "ac_cv_header_$ac_safe=yes" +else + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_header_$ac_safe=no" +fi +rm -f conftest* +fi +if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then + echo "$ac_t""yes" 1>&6 + ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` + cat >> confdefs.h <&6 +fi +done + +for ac_hdr in wchar.h +do +ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +echo "configure:8402: 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:8412: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` +if test -z "$ac_err"; then + rm -rf conftest* + eval "ac_cv_header_$ac_safe=yes" +else + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_header_$ac_safe=no" +fi +rm -f conftest* +fi +if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then + echo "$ac_t""yes" 1>&6 + ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` + cat >> confdefs.h <&6 +fi +done + +for ac_hdr in wcstr.h +do +ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +echo "configure:8442: 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:8452: \"$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 -WX_LIBRARY_NAME_SHARED="lib${WX_LIBRARY}-${WX_RELEASE}.so.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}" +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:8482: 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:8492: \"$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 -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_ALL= -WX_ALL_INSTALLED= +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:8524: 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:8534: \"$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 "$wxUSE_SHARED" = "yes"; then - case "${host}" in - *-hp-hpux* ) - if test "$GCC" = yes ; then - SHARED_LD="${CC} -shared -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} - ;; - *-*-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="PIC" - 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 ) - ;; - *) - { echo "configure: error: unknown system type ${host}." 1>&2; exit 1; } - esac +fi + + +echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 +echo "configure:8564: 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 +#include +#include +EOF +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (eval echo configure:8577: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` +if test -z "$ac_err"; then + rm -rf conftest* + ac_cv_header_stdc=yes +else + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + ac_cv_header_stdc=no +fi +rm -f conftest* + +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 +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + egrep "memchr" >/dev/null 2>&1; then + : +else + rm -rf conftest* + ac_cv_header_stdc=no +fi +rm -f conftest* + +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 +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + egrep "free" >/dev/null 2>&1; then + : +else + rm -rf conftest* + ac_cv_header_stdc=no +fi +rm -f conftest* + +fi + +if test $ac_cv_header_stdc = yes; then + # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. +if test "$cross_compiling" = yes; then + : +else + cat > conftest.$ac_ext < +#define ISLOWER(c) ('a' <= (c) && (c) <= 'z') +#define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) +#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) +int main () { int i; for (i = 0; i < 256; i++) +if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); +exit (0); } + +EOF +if { (eval echo configure:8644: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +then + : +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -fr conftest* + ac_cv_header_stdc=no +fi +rm -fr conftest* +fi - WX_TARGET_LIBRARY="${WX_LIBRARY_NAME_SHARED}" -else - WX_TARGET_LIBRARY="${WX_LIBRARY_NAME_STATIC}" - WX_ALL="${WX_LIBRARY_NAME_STATIC}" +fi fi +echo "$ac_t""$ac_cv_header_stdc" 1>&6 +if test $ac_cv_header_stdc = yes; then + cat >> confdefs.h <<\EOF +#define STDC_HEADERS 1 +EOF -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:7316: checking for $ac_hdr" >&5 -if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then +fi + +echo $ac_n "checking for mode_t""... $ac_c" 1>&6 +echo "configure:8668: 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 < +#include +#if STDC_HEADERS +#include +#include +#endif EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7326: \"$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 "$ac_cpp conftest.$ac_ext") 2>&5 | + egrep "(^|[^a-zA-Z_0-9])mode_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then rm -rf conftest* - eval "ac_cv_header_$ac_safe=yes" + ac_cv_type_mode_t=yes else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 rm -rf conftest* - eval "ac_cv_header_$ac_safe=no" + ac_cv_type_mode_t=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 +if test $ac_cv_type_mode_t = no; then + cat >> confdefs.h <<\EOF +#define mode_t int EOF - -else - echo "$ac_t""no" 1>&6 + fi -done -for ac_hdr in unistd.h -do -ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` -echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:7356: checking for $ac_hdr" >&5 -if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then +echo $ac_n "checking for off_t""... $ac_c" 1>&6 +echo "configure:8701: 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 < +#include +#if STDC_HEADERS +#include +#include +#endif EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7366: \"$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 "$ac_cpp conftest.$ac_ext") 2>&5 | + egrep "(^|[^a-zA-Z_0-9])off_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then rm -rf conftest* - eval "ac_cv_header_$ac_safe=yes" + ac_cv_type_off_t=yes else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 rm -rf conftest* - eval "ac_cv_header_$ac_safe=no" + ac_cv_type_off_t=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 +if test $ac_cv_type_off_t = no; then + cat >> confdefs.h <<\EOF +#define off_t long EOF - -else - echo "$ac_t""no" 1>&6 + fi -done -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:7396: checking for $ac_hdr" >&5 -if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then +echo $ac_n "checking for pid_t""... $ac_c" 1>&6 +echo "configure:8734: 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 < +#include +#if STDC_HEADERS +#include +#include +#endif EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7406: \"$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 "$ac_cpp conftest.$ac_ext") 2>&5 | + egrep "(^|[^a-zA-Z_0-9])pid_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then rm -rf conftest* - eval "ac_cv_header_$ac_safe=yes" + ac_cv_type_pid_t=yes else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 rm -rf conftest* - eval "ac_cv_header_$ac_safe=no" + ac_cv_type_pid_t=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 +if test $ac_cv_type_pid_t = no; then + cat >> confdefs.h <<\EOF +#define pid_t int EOF - -else - echo "$ac_t""no" 1>&6 + fi -done -for ac_hdr in wcstr.h -do -ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` -echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:7436: checking for $ac_hdr" >&5 -if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then +echo $ac_n "checking for size_t""... $ac_c" 1>&6 +echo "configure:8767: 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 < +#include +#if STDC_HEADERS +#include +#include +#endif EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7446: \"$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 "$ac_cpp conftest.$ac_ext") 2>&5 | + egrep "(^|[^a-zA-Z_0-9])size_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then rm -rf conftest* - eval "ac_cv_header_$ac_safe=yes" + ac_cv_type_size_t=yes else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 rm -rf conftest* - eval "ac_cv_header_$ac_safe=no" + ac_cv_type_size_t=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 +if test $ac_cv_type_size_t = no; then + cat >> confdefs.h <<\EOF +#define size_t unsigned EOF - -else - echo "$ac_t""no" 1>&6 + fi -done -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:7476: checking for $ac_hdr" >&5 -if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then +echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6 +echo "configure:8800: 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 < +#include EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7486: \"$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 "$ac_cpp conftest.$ac_ext") 2>&5 | + egrep "uid_t" >/dev/null 2>&1; then rm -rf conftest* - eval "ac_cv_header_$ac_safe=yes" + ac_cv_type_uid_t=yes else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 rm -rf conftest* - eval "ac_cv_header_$ac_safe=no" + ac_cv_type_uid_t=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 +if test $ac_cv_type_uid_t = no; then + cat >> confdefs.h <<\EOF +#define uid_t int EOF - -else - echo "$ac_t""no" 1>&6 + + cat >> confdefs.h <<\EOF +#define gid_t int +EOF + fi -done -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:7518: 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 < + + +echo $ac_n "checking for working const""... $ac_c" 1>&6 +echo "configure:8837: 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 <j = 5; +} +{ /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */ + const int foo = 10; +} + +; return 0; } EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7528: \"$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:8891: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* - eval "ac_cv_header_$ac_safe=yes" + ac_cv_c_const=yes else - echo "$ac_err" >&5 echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* - eval "ac_cv_header_$ac_safe=no" + ac_cv_c_const=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 +if test $ac_cv_c_const = no; then + cat >> confdefs.h <<\EOF +#define const EOF - -else - echo "$ac_t""no" 1>&6 -fi -done fi - -echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:7558: checking for ANSI C header files" >&5 -if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then +echo $ac_n "checking for inline""... $ac_c" 1>&6 +echo "configure:8912: 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 < -#include -#include -#include + +int main() { +} $ac_kw foo() { +; return 0; } EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7571: \"$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:8926: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* - ac_cv_header_stdc=yes + ac_cv_c_inline=$ac_kw; break else - echo "$ac_err" >&5 echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* - ac_cv_header_stdc=no -fi -rm -f conftest* - -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 -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "memchr" >/dev/null 2>&1; then - : -else - rm -rf conftest* - ac_cv_header_stdc=no fi rm -f conftest* +done 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 < +echo "$ac_t""$ac_cv_c_inline" 1>&6 +case "$ac_cv_c_inline" in + inline | yes) ;; + no) cat >> confdefs.h <<\EOF +#define inline EOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "free" >/dev/null 2>&1; then - : -else - rm -rf conftest* - ac_cv_header_stdc=no -fi -rm -f conftest* + ;; + *) cat >> confdefs.h <&6 +echo "configure:8953: checking size of char" >&5 +if eval "test \"`echo '$''{'ac_cv_sizeof_char'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test "$cross_compiling" = yes; then + ac_cv_sizeof_char=1 else cat > conftest.$ac_ext < -#define ISLOWER(c) ('a' <= (c) && (c) <= 'z') -#define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) -#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) -int main () { int i; for (i = 0; i < 256; i++) -if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); -exit (0); } - +#include +main() +{ + FILE *f=fopen("conftestval", "w"); + if (!f) exit(1); + fprintf(f, "%d\n", sizeof(char)); + exit(0); +} EOF -if { (eval echo configure:7638: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:8972: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then - : + ac_cv_sizeof_char=`cat conftestval` else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -fr conftest* - ac_cv_header_stdc=no + ac_cv_sizeof_char=0 fi rm -fr conftest* fi fi -fi - -echo "$ac_t""$ac_cv_header_stdc" 1>&6 -if test $ac_cv_header_stdc = yes; then - cat >> confdefs.h <<\EOF -#define STDC_HEADERS 1 +echo "$ac_t""$ac_cv_sizeof_char" 1>&6 +cat >> confdefs.h <&6 -echo "configure:7662: checking for mode_t" >&5 -if eval "test \"`echo '$''{'ac_cv_type_mode_t'+set}'`\" = set"; then +echo $ac_n "checking size of short""... $ac_c" 1>&6 +echo "configure:8992: checking size of short" >&5 +if eval "test \"`echo '$''{'ac_cv_sizeof_short'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - cat > conftest.$ac_ext < -#if STDC_HEADERS -#include -#include -#endif -EOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "(^|[^a-zA-Z_0-9])mode_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then - rm -rf conftest* - ac_cv_type_mode_t=yes -else - rm -rf conftest* - ac_cv_type_mode_t=no -fi -rm -f conftest* - -fi -echo "$ac_t""$ac_cv_type_mode_t" 1>&6 -if test $ac_cv_type_mode_t = no; then - cat >> confdefs.h <<\EOF -#define mode_t int -EOF - -fi - -echo $ac_n "checking for off_t""... $ac_c" 1>&6 -echo "configure:7695: 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 + if test "$cross_compiling" = yes; then + ac_cv_sizeof_short=2 else cat > conftest.$ac_ext < -#if STDC_HEADERS -#include -#include -#endif +#include +main() +{ + FILE *f=fopen("conftestval", "w"); + if (!f) exit(1); + fprintf(f, "%d\n", sizeof(short)); + exit(0); +} EOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "(^|[^a-zA-Z_0-9])off_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then - rm -rf conftest* - ac_cv_type_off_t=yes +if { (eval echo configure:9011: \"$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 - rm -rf conftest* - ac_cv_type_off_t=no + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -fr conftest* + ac_cv_sizeof_short=0 +fi +rm -fr conftest* fi -rm -f conftest* fi -echo "$ac_t""$ac_cv_type_off_t" 1>&6 -if test $ac_cv_type_off_t = no; then - cat >> confdefs.h <<\EOF -#define off_t long +echo "$ac_t""$ac_cv_sizeof_short" 1>&6 +cat >> confdefs.h <&6 -echo "configure:7728: checking for pid_t" >&5 -if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then +echo $ac_n "checking size of int *""... $ac_c" 1>&6 +echo "configure:9031: checking size of int *" >&5 +if eval "test \"`echo '$''{'ac_cv_sizeof_int_p'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 +else + if test "$cross_compiling" = yes; then + ac_cv_sizeof_int_p=4 else cat > conftest.$ac_ext < -#if STDC_HEADERS -#include -#include -#endif +#include +main() +{ + FILE *f=fopen("conftestval", "w"); + if (!f) exit(1); + fprintf(f, "%d\n", sizeof(int *)); + exit(0); +} EOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "(^|[^a-zA-Z_0-9])pid_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then - rm -rf conftest* - ac_cv_type_pid_t=yes +if { (eval echo configure:9050: \"$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 - rm -rf conftest* - ac_cv_type_pid_t=no + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -fr conftest* + ac_cv_sizeof_int_p=0 +fi +rm -fr conftest* fi -rm -f conftest* fi -echo "$ac_t""$ac_cv_type_pid_t" 1>&6 -if test $ac_cv_type_pid_t = no; then - cat >> confdefs.h <<\EOF -#define pid_t int +echo "$ac_t""$ac_cv_sizeof_int_p" 1>&6 +cat >> confdefs.h <&6 -echo "configure:7761: checking for size_t" >&5 -if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then +echo $ac_n "checking size of int""... $ac_c" 1>&6 +echo "configure:9070: 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 + if test "$cross_compiling" = yes; then + ac_cv_sizeof_int=4 else cat > conftest.$ac_ext < -#if STDC_HEADERS -#include -#include -#endif +#include +main() +{ + FILE *f=fopen("conftestval", "w"); + if (!f) exit(1); + fprintf(f, "%d\n", sizeof(int)); + exit(0); +} EOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "(^|[^a-zA-Z_0-9])size_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then - rm -rf conftest* - ac_cv_type_size_t=yes +if { (eval echo configure:9089: \"$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 - rm -rf conftest* - ac_cv_type_size_t=no + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -fr conftest* + ac_cv_sizeof_int=0 +fi +rm -fr conftest* fi -rm -f conftest* fi -echo "$ac_t""$ac_cv_type_size_t" 1>&6 -if test $ac_cv_type_size_t = no; then - cat >> confdefs.h <<\EOF -#define size_t unsigned +echo "$ac_t""$ac_cv_sizeof_int" 1>&6 +cat >> confdefs.h <&6 -echo "configure:7794: checking for uid_t in sys/types.h" >&5 -if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then +echo $ac_n "checking size of long""... $ac_c" 1>&6 +echo "configure:9109: checking size of long" >&5 +if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 +else + if test "$cross_compiling" = yes; then + ac_cv_sizeof_long=4 else cat > conftest.$ac_ext < +#include +main() +{ + FILE *f=fopen("conftestval", "w"); + if (!f) exit(1); + fprintf(f, "%d\n", sizeof(long)); + exit(0); +} EOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "uid_t" >/dev/null 2>&1; then - rm -rf conftest* - ac_cv_type_uid_t=yes +if { (eval echo configure:9128: \"$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 - rm -rf conftest* - ac_cv_type_uid_t=no + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -fr conftest* + ac_cv_sizeof_long=0 fi -rm -f conftest* - +rm -fr conftest* fi -echo "$ac_t""$ac_cv_type_uid_t" 1>&6 -if test $ac_cv_type_uid_t = no; then - cat >> confdefs.h <<\EOF -#define uid_t int -EOF - - cat >> confdefs.h <<\EOF -#define gid_t int -EOF - fi +echo "$ac_t""$ac_cv_sizeof_long" 1>&6 +cat >> confdefs.h <&6 -echo "configure:7831: checking for working const" >&5 -if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then +echo $ac_n "checking size of long long""... $ac_c" 1>&6 +echo "configure:9148: checking size of long long" >&5 +if eval "test \"`echo '$''{'ac_cv_sizeof_long_long'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 +else + if test "$cross_compiling" = yes; then + ac_cv_sizeof_long_long=0 else cat > conftest.$ac_ext <j = 5; -} -{ /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */ - const int foo = 10; +#include +main() +{ + FILE *f=fopen("conftestval", "w"); + if (!f) exit(1); + fprintf(f, "%d\n", sizeof(long long)); + exit(0); } - -; return 0; } EOF -if { (eval echo configure:7885: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_c_const=yes +if { (eval echo configure:9167: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +then + ac_cv_sizeof_long_long=`cat conftestval` else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* - ac_cv_c_const=no + rm -fr conftest* + ac_cv_sizeof_long_long=0 fi -rm -f conftest* +rm -fr conftest* fi -echo "$ac_t""$ac_cv_c_const" 1>&6 -if test $ac_cv_c_const = no; then - cat >> confdefs.h <<\EOF -#define const +fi +echo "$ac_t""$ac_cv_sizeof_long_long" 1>&6 +cat >> confdefs.h <&6 -echo "configure:7906: checking for inline" >&5 -if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then + +echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6 +echo "configure:9188: 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_inline=no -for ac_kw in inline __inline__ __inline; do - cat > conftest.$ac_ext < conftest.$ac_ext < +#include +int main() { +#if !BYTE_ORDER || !BIG_ENDIAN || !LITTLE_ENDIAN + bogus endian macros +#endif +; return 0; } +EOF +if { (eval echo configure:9206: \"$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 int main() { -} $ac_kw foo() { + +#if BYTE_ORDER != BIG_ENDIAN + not big endian +#endif ; return 0; } EOF -if { (eval echo configure:7920: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9221: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* - ac_cv_c_inline=$ac_kw; break + ac_cv_c_bigendian=yes else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 + rm -rf conftest* + ac_cv_c_bigendian=no fi rm -f conftest* -done - -fi - -echo "$ac_t""$ac_cv_c_inline" 1>&6 -case "$ac_cv_c_inline" in - inline | yes) ;; - no) cat >> confdefs.h <<\EOF -#define inline -EOF - ;; - *) cat >> confdefs.h <&6 -echo "configure:7947: checking size of char" >&5 -if eval "test \"`echo '$''{'ac_cv_sizeof_char'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 else - if test "$cross_compiling" = yes; then - ac_cv_sizeof_char=1 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 +fi +rm -f conftest* +if test $ac_cv_c_bigendian = unknown; then +if test "$cross_compiling" = yes; then + ac_cv_c_bigendian=unknown else cat > conftest.$ac_ext < -main() -{ - FILE *f=fopen("conftestval", "w"); - if (!f) exit(1); - fprintf(f, "%d\n", sizeof(char)); - exit(0); +main () { + /* Are we little or big endian? From Harbison&Steele. */ + union + { + long l; + char c[sizeof (long)]; + } u; + u.l = 1; + exit (u.c[sizeof (long) - 1] == 1); } EOF -if { (eval echo configure:7966: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:9254: \"$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` + ac_cv_c_bigendian=no else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -fr conftest* - ac_cv_sizeof_char=0 + ac_cv_c_bigendian=yes fi rm -fr conftest* fi fi -echo "$ac_t""$ac_cv_sizeof_char" 1>&6 -cat >> confdefs.h <&6 +if test $ac_cv_c_bigendian = unknown; then + echo "configure: warning: Assuming little-endian target machine - this may be overriden by adding the line "ac_cv_c_bigendian=${ac_cv_c_bigendian='yes'}" to config.cache file" 1>&2 +fi +if test $ac_cv_c_bigendian = yes; then + cat >> confdefs.h <<\EOF +#define WORDS_BIGENDIAN 1 EOF +fi -echo $ac_n "checking size of short""... $ac_c" 1>&6 -echo "configure:7986: checking size of short" >&5 -if eval "test \"`echo '$''{'ac_cv_sizeof_short'+set}'`\" = set"; then + + + if test "$cross_compiling" = "yes"; then + cat >> confdefs.h <<\EOF +#define wxUSE_IOSTREAMH 1 +EOF + + 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 + + + for ac_hdr in iostream +do +ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +echo "configure:9301: 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 - if test "$cross_compiling" = yes; then - ac_cv_sizeof_short=2 else cat > conftest.$ac_ext < -main() -{ - FILE *f=fopen("conftestval", "w"); - if (!f) exit(1); - fprintf(f, "%d\n", sizeof(short)); - exit(0); -} +#include <$ac_hdr> EOF -if { (eval echo configure:8005: \"$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` +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (eval echo configure:9311: \"$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 -fr conftest* - ac_cv_sizeof_short=0 + rm -rf conftest* + eval "ac_cv_header_$ac_safe=no" fi -rm -fr conftest* +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 -echo "$ac_t""$ac_cv_sizeof_short" 1>&6 -cat >> confdefs.h <> confdefs.h <<\EOF +#define wxUSE_IOSTREAMH 1 EOF + else + : + fi -echo $ac_n "checking size of int *""... $ac_c" 1>&6 -echo "configure:8025: checking size of int *" >&5 -if eval "test \"`echo '$''{'ac_cv_sizeof_int_p'+set}'`\" = set"; then + ac_ext=c +# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. +ac_cpp='$CPP $CPPFLAGS' +ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' +ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' +cross_compiling=$ac_cv_prog_cc_cross + + fi + + + + echo $ac_n "checking if C++ compiler supports bool""... $ac_c" 1>&6 +echo "configure:9359: 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 - if test "$cross_compiling" = yes; then - ac_cv_sizeof_int_p=4 -else - cat > conftest.$ac_ext < conftest.$ac_ext < -main() -{ - FILE *f=fopen("conftestval", "w"); - if (!f) exit(1); - fprintf(f, "%d\n", sizeof(int *)); - exit(0); -} + + +int main() { + + bool b = true; + + return 0; + +; return 0; } EOF -if { (eval echo configure:8044: \"$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` +if { (eval echo configure:9386: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + + cat >> confdefs.h <<\EOF +#define HAVE_BOOL 1 +EOF + + wx_cv_cpp_bool=yes + else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -fr conftest* - ac_cv_sizeof_int_p=0 -fi -rm -fr conftest* + rm -rf conftest* + + wx_cv_cpp_bool=no + + 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""$ac_cv_sizeof_int_p" 1>&6 -cat >> confdefs.h <&6 + + if test "$wx_cv_cpp_bool" = "yes"; then + cat >> confdefs.h <<\EOF +#define HAVE_BOOL 1 EOF + fi + -echo $ac_n "checking size of int""... $ac_c" 1>&6 -echo "configure:8064: checking size of int" >&5 -if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then + +echo $ac_n "checking if you need GNU extensions""... $ac_c" 1>&6 +echo "configure:9428: 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 - if test "$cross_compiling" = yes; then - ac_cv_sizeof_int=4 -else - cat > conftest.$ac_ext < conftest.$ac_ext < -main() -{ - FILE *f=fopen("conftestval", "w"); - if (!f) exit(1); - fprintf(f, "%d\n", sizeof(int)); - exit(0); -} +#include +int main() { + + +#ifndef __GNU_LIBRARY__ + Compile error wanted +#endif + + +; return 0; } EOF -if { (eval echo configure:8083: \"$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` +if { (eval echo configure:9447: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + wx_cv_gnu_extensions=yes else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -fr conftest* - ac_cv_sizeof_int=0 -fi -rm -fr conftest* + rm -rf conftest* + wx_cv_gnu_extensions=no fi +rm -f conftest* fi -echo "$ac_t""$ac_cv_sizeof_int" 1>&6 -cat >> confdefs.h <&6 +if test "$wx_cv_gnu_extensions" = "yes"; then + cat >> confdefs.h <&6 -echo "configure:8103: checking size of long" >&5 -if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then + + +echo $ac_n "checking for wcslen in -lc""... $ac_c" 1>&6 +echo "configure:9472: checking for wcslen in -lc" >&5 +ac_lib_var=`echo c'_'wcslen | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - if test "$cross_compiling" = yes; then - ac_cv_sizeof_long=4 -else - cat > conftest.$ac_ext < conftest.$ac_ext < -main() -{ - FILE *f=fopen("conftestval", "w"); - if (!f) exit(1); - fprintf(f, "%d\n", sizeof(long)); - exit(0); -} +/* Override any gcc2 internal prototype to avoid an error. */ +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char wcslen(); + +int main() { +wcslen() +; return 0; } EOF -if { (eval echo configure:8122: \"$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` +if { (eval echo configure:9491: \"$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* - ac_cv_sizeof_long=0 -fi -rm -fr conftest* + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" fi +rm -f conftest* +LIBS="$ac_save_LIBS" fi -echo "$ac_t""$ac_cv_sizeof_long" 1>&6 -cat >> confdefs.h <&6 + + cat >> confdefs.h <<\EOF +#define HAVE_WCSLEN 1 EOF + WCHAR_LINK="" + +else + echo "$ac_t""no" 1>&6 -echo $ac_n "checking size of long long""... $ac_c" 1>&6 -echo "configure:8142: checking size of long long" >&5 -if eval "test \"`echo '$''{'ac_cv_sizeof_long_long'+set}'`\" = set"; then + echo $ac_n "checking for wcslen in -lw""... $ac_c" 1>&6 +echo "configure:9517: checking for wcslen in -lw" >&5 +ac_lib_var=`echo w'_'wcslen | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - if test "$cross_compiling" = yes; then - ac_cv_sizeof_long_long=0 -else - cat > conftest.$ac_ext < conftest.$ac_ext < -main() -{ - FILE *f=fopen("conftestval", "w"); - if (!f) exit(1); - fprintf(f, "%d\n", sizeof(long long)); - exit(0); -} +/* Override any gcc2 internal prototype to avoid an error. */ +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char wcslen(); + +int main() { +wcslen() +; return 0; } EOF -if { (eval echo configure:8161: \"$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` +if { (eval echo configure:9536: \"$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* - ac_cv_sizeof_long_long=0 -fi -rm -fr conftest* + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" fi +rm -f conftest* +LIBS="$ac_save_LIBS" fi -echo "$ac_t""$ac_cv_sizeof_long_long" 1>&6 -cat >> confdefs.h <&6 + + cat >> confdefs.h <<\EOF +#define HAVE_WCSLEN 1 EOF + WCHAR_LINK="-lw" + +else + echo "$ac_t""no" 1>&6 +fi + + +fi -echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6 -echo "configure:8182: checking whether byte ordering is bigendian" >&5 -if eval "test \"`echo '$''{'ac_cv_c_bigendian'+set}'`\" = set"; then +echo $ac_n "checking for vprintf""... $ac_c" 1>&6 +echo "configure:9567: checking for vprintf" >&5 +if eval "test \"`echo '$''{'ac_cv_func_vprintf'+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 < conftest.$ac_ext < -#include +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char vprintf(); below. */ +#include +/* Override any gcc2 internal prototype to avoid an error. */ +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char vprintf(); + int main() { -#if !BYTE_ORDER || !BIG_ENDIAN || !LITTLE_ENDIAN - bogus endian macros +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_vprintf) || defined (__stub___vprintf) +choke me +#else +vprintf(); #endif + ; return 0; } EOF -if { (eval echo configure:8200: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9595: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* - # It does; now see whether it defined to BIG_ENDIAN or not. -cat > conftest.$ac_ext <&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_func_vprintf=no" +fi +rm -f conftest* +fi + +if eval "test \"`echo '$ac_cv_func_'vprintf`\" = yes"; then + echo "$ac_t""yes" 1>&6 + cat >> confdefs.h <<\EOF +#define HAVE_VPRINTF 1 +EOF + +else + echo "$ac_t""no" 1>&6 +fi + +if test "$ac_cv_func_vprintf" != yes; then +echo $ac_n "checking for _doprnt""... $ac_c" 1>&6 +echo "configure:9619: 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 < -#include +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char _doprnt(); below. */ +#include +/* Override any gcc2 internal prototype to avoid an error. */ +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char _doprnt(); + int main() { -#if BYTE_ORDER != BIG_ENDIAN - not big endian +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub__doprnt) || defined (__stub____doprnt) +choke me +#else +_doprnt(); #endif + ; return 0; } EOF -if { (eval echo configure:8215: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9647: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* - ac_cv_c_bigendian=yes + eval "ac_cv_func__doprnt=yes" else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* - ac_cv_c_bigendian=no + eval "ac_cv_func__doprnt=no" fi rm -f conftest* +fi + +if eval "test \"`echo '$ac_cv_func_'_doprnt`\" = yes"; then + echo "$ac_t""yes" 1>&6 + cat >> confdefs.h <<\EOF +#define HAVE_DOPRNT 1 +EOF + else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 + echo "$ac_t""no" 1>&6 fi -rm -f conftest* -if test $ac_cv_c_bigendian = unknown; then -if test "$cross_compiling" = yes; then - ac_cv_c_bigendian=unknown + +fi + + +for ac_func in vsnprintf +do +echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +echo "configure:9675: checking for $ac_func" >&5 +if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < +/* Override any gcc2 internal prototype to avoid an error. */ +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char $ac_func(); + +int main() { + +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_$ac_func) || defined (__stub___$ac_func) +choke me +#else +$ac_func(); +#endif + +; return 0; } EOF -if { (eval echo configure:8248: \"$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 +if { (eval echo configure:9703: \"$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 -fr conftest* - ac_cv_c_bigendian=yes -fi -rm -fr conftest* -fi - + rm -rf conftest* + eval "ac_cv_func_$ac_func=no" fi +rm -f conftest* fi -echo "$ac_t""$ac_cv_c_bigendian" 1>&6 -if test $ac_cv_c_bigendian = unknown; then - echo "configure: warning: Assuming little-endian target machine - this may be overriden by adding the line "ac_cv_c_bigendian=${ac_cv_c_bigendian='yes'}" to config.cache file" 1>&2 -fi -if test $ac_cv_c_bigendian = yes; then - cat >> confdefs.h <<\EOF -#define WORDS_BIGENDIAN 1 +if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then + echo "$ac_t""yes" 1>&6 + ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` + cat >> confdefs.h <> confdefs.h <<\EOF +#define HAVE_VSNPRINTF 1 EOF +else + echo "$ac_t""no" 1>&6 +echo "configure: warning: unsafe function sprintf will be used instead of snprintf" 1>&2 + fi +done - if test "$cross_compiling" = "yes"; then - cat >> confdefs.h <<\EOF -#define wxUSE_IOSTREAMH 1 -EOF - - else - - ac_ext=C +ac_ext=C # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' @@ -8287,281 +9738,266 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross - for ac_hdr in iostream -do -ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` -echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:8295: checking for $ac_hdr" >&5 -if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then +echo $ac_n "checking for vsscanf""... $ac_c" 1>&6 +echo "configure:9743: checking for vsscanf" >&5 +if eval "test \"`echo '$''{'wx_cv_func_vsscanf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 +else + + if test "$cross_compiling" = yes; then + wx_cv_func_vsscanf=no + else cat > conftest.$ac_ext < +#ifdef __cplusplus +extern "C" void exit(int); +#endif + + #include + #include + + int try_vsscanf(const char *format, ...) + { + va_list ap; + va_start(ap, format); + + vsscanf("17", format, ap); + + va_end(ap); + } + + int main() + { + int i; + try_vsscanf("%d", &i); + return i == 17 ? 0 : 1; + } + EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8305: \"$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" +if { (eval echo configure:9780: \"$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 HAVE_VSSCANF 1 +EOF + + wx_cv_func_vsscanf=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* + rm -fr conftest* + wx_cv_func_vsscanf=no 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 +rm -fr conftest* fi -done - if test "x$HAVE_IOSTREAM" = x ; then - cat >> confdefs.h <<\EOF -#define wxUSE_IOSTREAMH 1 -EOF +fi - else - : - fi +echo "$ac_t""$wx_cv_func_vsscanf" 1>&6 - ac_ext=c +ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CPP $CPPFLAGS' ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' cross_compiling=$ac_cv_prog_cc_cross - fi - +if test "$USE_UNIX" = 1; then - echo $ac_n "checking if C++ compiler supports bool""... $ac_c" 1>&6 -echo "configure:8353: checking if C++ compiler supports bool" >&5 -if eval "test \"`echo '$''{'wx_cv_cpp_bool'+set}'`\" = set"; then +for ac_func in vfork +do +echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +echo "configure:9816: 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_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 < conftest.$ac_ext < +/* Override any gcc2 internal prototype to avoid an error. */ +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char $ac_func(); - int main() { - bool b = true; +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_$ac_func) || defined (__stub___$ac_func) +choke me +#else +$ac_func(); +#endif - return 0; - ; return 0; } EOF -if { (eval echo configure:8380: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9844: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* - - cat >> confdefs.h <<\EOF -#define HAVE_BOOL 1 -EOF - - wx_cv_cpp_bool=yes - + eval "ac_cv_func_$ac_func=yes" else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* - - wx_cv_cpp_bool=no - - + eval "ac_cv_func_$ac_func=no" 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_cpp_bool" 1>&6 - - if test "$wx_cv_cpp_bool" = "yes"; then - cat >> confdefs.h <<\EOF -#define HAVE_BOOL 1 +if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then + echo "$ac_t""yes" 1>&6 + ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` + cat >> confdefs.h <&6 -echo "configure:8422: 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 + echo "$ac_t""no" 1>&6 +fi +done - if test "$cross_compiling" = yes; then - wx_cv_cpp_sizet_not_int=no - +for ac_func in timegm +do +echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +echo "configure:9872: 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 < - - 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]; } +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func(); below. */ +#include +/* Override any gcc2 internal prototype to avoid an error. */ +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char $ac_func(); - private: - char *m_s; - }; +int main() { - int main() - { - S s("dummy"); - size_t n1 = 2; - int n2 = 3; +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_$ac_func) || defined (__stub___$ac_func) +choke me +#else +$ac_func(); +#endif - return s[n1] == s[n2]; - } - -EOF -if { (eval echo configure:8471: \"$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 +; return 0; } EOF - wx_cv_cpp_sizet_not_int=yes +if { (eval echo configure:9900: \"$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 -fr conftest* - wx_cv_cpp_sizet_not_int=no + rm -rf conftest* + eval "ac_cv_func_$ac_func=no" fi -rm -fr conftest* +rm -f 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 - - +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 - -echo "$ac_t""$wx_cv_cpp_sizet_not_int" 1>&6 - +done -echo $ac_n "checking if you need GNU extensions""... $ac_c" 1>&6 -echo "configure:8502: checking if you need GNU extensions" >&5 -if eval "test \"`echo '$''{'wx_cv_gnu_extensions'+set}'`\" = set"; then +POSIX4_LINK= +for ac_func in nanosleep +do +echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +echo "configure:9929: 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 < conftest.$ac_ext < -int main() { +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func(); below. */ +#include +/* Override any gcc2 internal prototype to avoid an error. */ +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char $ac_func(); +int main() { -#ifndef __GNU_LIBRARY__ - Compile error wanted +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_$ac_func) || defined (__stub___$ac_func) +choke me +#else +$ac_func(); #endif - ; return 0; } EOF -if { (eval echo configure:8521: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9957: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* - wx_cv_gnu_extensions=yes + eval "ac_cv_func_$ac_func=yes" else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* - wx_cv_gnu_extensions=no + eval "ac_cv_func_$ac_func=no" fi rm -f conftest* - fi - -echo "$ac_t""$wx_cv_gnu_extensions" 1>&6 -if test "$wx_cv_gnu_extensions" = "yes"; then +if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then + echo "$ac_t""yes" 1>&6 + ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` cat >> confdefs.h <> confdefs.h <<\EOF +#define HAVE_NANOSLEEP 1 EOF -fi - - - -echo $ac_n "checking for wcslen in -lc""... $ac_c" 1>&6 -echo "configure:8546: checking for wcslen in -lc" >&5 -ac_lib_var=`echo c'_'wcslen | sed 'y%./+-%__p_%'` +else + echo "$ac_t""no" 1>&6 +echo $ac_n "checking for nanosleep in -lposix4""... $ac_c" 1>&6 +echo "configure:9982: checking for nanosleep in -lposix4" >&5 +ac_lib_var=`echo posix4'_'nanosleep | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" -LIBS="-lc $LIBS" +LIBS="-lposix4 $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10001: \"$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 @@ -8577,180 +10013,347 @@ fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 - cat >> confdefs.h <<\EOF -#define HAVE_WCSLEN 1 + cat >> confdefs.h <<\EOF +#define HAVE_NANOSLEEP 1 EOF - WCHAR_LINK="" - + POSIX4_LINK="-lposix4" + else echo "$ac_t""no" 1>&6 - echo $ac_n "checking for wcslen in -lw""... $ac_c" 1>&6 -echo "configure:8591: 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 + for ac_func in usleep +do +echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +echo "configure:10029: 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="-lw $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 wcslen(); +char $ac_func(); int main() { -wcslen() + +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_$ac_func) || defined (__stub___$ac_func) +choke me +#else +$ac_func(); +#endif + ; return 0; } EOF -if { (eval echo configure:8610: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10057: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" + eval "ac_cv_func_$ac_func=yes" else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" + eval "ac_cv_func_$ac_func=no" fi rm -f conftest* -LIBS="$ac_save_LIBS" - fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + +if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then echo "$ac_t""yes" 1>&6 - - cat >> confdefs.h <<\EOF -#define HAVE_WCSLEN 1 + ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` + cat >> confdefs.h <> confdefs.h <<\EOF +#define HAVE_USLEEP 1 EOF - WCHAR_LINK="-lw" - else echo "$ac_t""no" 1>&6 +echo "configure: warning: wxSleep() function will not work" 1>&2 fi +done - + fi -echo $ac_n "checking for vprintf""... $ac_c" 1>&6 -echo "configure:8641: checking for vprintf" >&5 -if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then +fi +done + + +for ac_func in uname gethostname +do +echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +echo "configure:10096: 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 vprintf(); +char $ac_func(); int main() { /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ -#if defined (__stub_vprintf) || defined (__stub___vprintf) +#if defined (__stub_$ac_func) || defined (__stub___$ac_func) choke me #else -vprintf(); +$ac_func(); #endif ; return 0; } EOF -if { (eval echo configure:8669: \"$ac_link\") 1>&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_vprintf=yes" + eval "ac_cv_func_$ac_func=yes" else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* - eval "ac_cv_func_vprintf=no" + eval "ac_cv_func_$ac_func=no" fi rm -f conftest* fi -if eval "test \"`echo '$ac_cv_func_'vprintf`\" = yes"; then +if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then echo "$ac_t""yes" 1>&6 - cat >> confdefs.h <<\EOF -#define HAVE_VPRINTF 1 + ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` + cat >> confdefs.h <&6 +fi +done + + +for ac_func in strtok_r +do +echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +echo "configure:10152: checking for $ac_func" >&5 +if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext < +/* Override any gcc2 internal prototype to avoid an error. */ +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char $ac_func(); + +int main() { + +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_$ac_func) || defined (__stub___$ac_func) +choke me +#else +$ac_func(); +#endif + +; return 0; } EOF +if { (eval echo configure:10180: \"$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_vprintf" != yes; then -echo $ac_n "checking for _doprnt""... $ac_c" 1>&6 -echo "configure:8693: checking for _doprnt" >&5 -if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then + +INET_LINK= +for ac_func in inet_addr +do +echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +echo "configure:10209: 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 _doprnt(); +char $ac_func(); int main() { /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ -#if defined (__stub__doprnt) || defined (__stub____doprnt) +#if defined (__stub_$ac_func) || defined (__stub___$ac_func) choke me #else -_doprnt(); +$ac_func(); #endif ; return 0; } EOF -if { (eval echo configure:8721: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10237: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_$ac_func=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_func_$ac_func=no" +fi +rm -f conftest* +fi + +if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then + echo "$ac_t""yes" 1>&6 + ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` + cat >> confdefs.h <> confdefs.h <<\EOF +#define HAVE_INET_ADDR 1 +EOF + +else + echo "$ac_t""no" 1>&6 +echo $ac_n "checking for inet_addr in -lnsl""... $ac_c" 1>&6 +echo "configure:10262: 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="-lnsl $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="nsl" +else + echo "$ac_t""no" 1>&6 +echo $ac_n "checking for inet_addr in -lresolv""... $ac_c" 1>&6 +echo "configure:10300: 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="-lresolv $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* - eval "ac_cv_func__doprnt=yes" + 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_func__doprnt=no" + eval "ac_cv_lib_$ac_lib_var=no" fi rm -f conftest* -fi +LIBS="$ac_save_LIBS" -if eval "test \"`echo '$ac_cv_func_'_doprnt`\" = yes"; then +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_DOPRNT 1 -EOF - + INET_LINK="resolv" + else echo "$ac_t""no" 1>&6 fi + fi + + +fi +done -for ac_func in vsnprintf + +for ac_func in inet_aton do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:8749: checking for $ac_func" >&5 +echo "configure:10352: 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:10380: \"$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 @@ -8792,106 +10395,276 @@ if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then #define $ac_tr_func 1 EOF cat >> confdefs.h <<\EOF -#define HAVE_VSNPRINTF 1 +#define HAVE_INET_ATON 1 EOF else echo "$ac_t""no" 1>&6 -echo "configure: warning: unsafe function sprintf will be used instead of snprintf" 1>&2 - + echo $ac_n "checking for inet_aton in -l$INET_LINK""... $ac_c" 1>&6 +echo "configure:10405: checking for inet_aton in -l$INET_LINK" >&5 +ac_lib_var=`echo $INET_LINK'_'inet_aton | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + ac_save_LIBS="$LIBS" +LIBS="-l$INET_LINK $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" +fi +rm -f conftest* +LIBS="$ac_save_LIBS" + +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + cat >> confdefs.h <<\EOF +#define HAVE_INET_ATON 1 +EOF + +else + echo "$ac_t""no" 1>&6 +fi + + fi done +if test "x$INET_LINK" != "x"; then + cat >> confdefs.h <<\EOF +#define HAVE_INET_ADDR 1 +EOF -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 + INET_LINK="-l$INET_LINK" +fi +fi -echo $ac_n "checking for vsscanf""... $ac_c" 1>&6 -echo "configure:8817: checking for vsscanf" >&5 -if eval "test \"`echo '$''{'wx_cv_func_vsscanf'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - - if test "$cross_compiling" = yes; then - wx_cv_func_vsscanf=no - + +cat > confcache <<\EOF +# This file is a shell script that caches the results of configure +# tests run on this system so they can be shared between configure +# scripts and configure runs. It is not useful on other systems. +# If it contains results you don't want to keep, you may remove or edit it. +# +# By default, configure uses ./config.cache as the cache file, +# creating it if it does not exist already. You can give configure +# the --cache-file=FILE option to use a different cache file; that is +# what configure does when it calls configure scripts in +# subdirectories, so they share the cache. +# Giving --cache-file=/dev/null disables caching, for debugging configure. +# config.status only pays attention to the cache file if you give it the +# --recheck option to rerun configure. +# +EOF +# The following way of writing the cache mishandles newlines in values, +# but we know of no workaround that is simple, portable, and efficient. +# So, don't put newlines in cache variables' values. +# Ultrix sh set writes to stderr and can't be redirected directly, +# and sets the high bit in the cache file unless we assign to the vars. +(set) 2>&1 | + case `(ac_space=' '; set | grep ac_space) 2>&1` in + *ac_space=\ *) + # `set' does not quote correctly, so add quotes (double-quote substitution + # turns \\\\ into \\, and sed turns \\ into \). + sed -n \ + -e "s/'/'\\\\''/g" \ + -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p" + ;; + *) + # `set' quotes correctly as required by POSIX, so do not add quotes. + sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p' + ;; + esac >> confcache +if cmp -s $cache_file confcache; then + : else - cat > conftest.$ac_ext < $cache_file + else + echo "not updating unwritable cache $cache_file" + fi +fi +rm -f confcache - #include - #include - int try_vsscanf(const char *format, ...) - { - va_list ap; - va_start(ap, format); - vsscanf("17", format, ap); +if test "$USE_UNIX" = 1; then - va_end(ap); - } - int main() - { - int i; - try_vsscanf("%d", &i); - return i == 17 ? 0 : 1; - } - +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:10528: 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="-lpthread $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then +if { (eval echo configure:10547: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" +fi +rm -f conftest* +LIBS="$ac_save_LIBS" + +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 - cat >> confdefs.h <<\EOF -#define HAVE_VSSCANF 1 + THREADS_OBJ="threadpsx.lo" + THREADS_LINK="pthread" + +else + echo "$ac_t""no" 1>&6 + + echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6 +echo "configure:10570: checking for pthread_create in -lc_r" >&5 +ac_lib_var=`echo c_r'_'pthread_create | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + ac_save_LIBS="$LIBS" +LIBS="-lc_r $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + 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" - wx_cv_func_vsscanf=yes - +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + + THREADS_OBJ="threadpsx.lo" + THREADS_LINK="c_r" + +else + echo "$ac_t""no" 1>&6 + + ac_safe=`echo "sys/prctl.h" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for sys/prctl.h""... $ac_c" 1>&6 +echo "configure:10613: 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:10623: \"$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 -fr conftest* - wx_cv_func_vsscanf=no + rm -rf conftest* + eval "ac_cv_header_$ac_safe=no" fi -rm -fr conftest* +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 -echo "$ac_t""$wx_cv_func_vsscanf" 1>&6 + +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 -if test "$USE_UNIX" = 1; then + if test -z "$THREADS_OBJ" ; then + wxUSE_THREADS=no + echo "configure: warning: No thread support on this system" 1>&2 + fi +fi -for ac_func in vfork +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:8890: checking for $ac_func" >&5 +echo "configure:10663: 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:10691: \"$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 @@ -8939,83 +10712,110 @@ fi done -POSIX4_LINK= -for ac_func in nanosleep + + for ac_hdr in sched.h do -echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:8947: checking for $ac_func" >&5 -if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then +ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +echo "configure:10721: 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:10731: \"$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:10759: 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 < /* 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 sched_yield(); int main() { - -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_$ac_func) || defined (__stub___$ac_func) -choke me -#else -$ac_func(); -#endif - +sched_yield() ; return 0; } EOF -if { (eval echo configure:8975: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10778: \"$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" + 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_func_$ac_func=no" + eval "ac_cv_lib_$ac_lib_var=no" fi rm -f conftest* -fi +LIBS="$ac_save_LIBS" -if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 - ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` - cat >> confdefs.h <> confdefs.h <<\EOF -#define HAVE_NANOSLEEP 1 + cat >> confdefs.h <<\EOF +#define HAVE_SCHED_YIELD 1 EOF else echo "$ac_t""no" 1>&6 -echo $ac_n "checking for nanosleep in -lposix4""... $ac_c" 1>&6 -echo "configure:9000: checking for nanosleep in -lposix4" >&5 -ac_lib_var=`echo posix4'_'nanosleep | sed 'y%./+-%__p_%'` +echo $ac_n "checking for sched_yield in -l"posix4"""... $ac_c" 1>&6 +echo "configure:10800: 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="-lposix4 $LIBS" +LIBS="-l"posix4" $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10819: \"$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 @@ -9030,326 +10830,408 @@ LIBS="$ac_save_LIBS" fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 - - cat >> confdefs.h <<\EOF -#define HAVE_NANOSLEEP 1 + cat >> confdefs.h <<\EOF +#define HAVE_SCHED_YIELD 1 EOF - - POSIX4_LINK="-lposix4" - + POSIX4_LINK="-lposix4" else echo "$ac_t""no" 1>&6 +echo "configure: warning: wxThread::Yield will not work properly" 1>&2 + +fi - for ac_func in usleep -do -echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:9047: checking for $ac_func" >&5 -if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then + +fi + + + echo $ac_n "checking for pthread_attr_getschedpolicy in -l$THREADS_LINK""... $ac_c" 1>&6 +echo "configure:10849: checking for pthread_attr_getschedpolicy in -l$THREADS_LINK" >&5 +ac_lib_var=`echo $THREADS_LINK'_'pthread_attr_getschedpolicy | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - cat > conftest.$ac_ext < conftest.$ac_ext < /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char $ac_func(); +char pthread_attr_getschedpolicy(); int main() { - -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_$ac_func) || defined (__stub___$ac_func) -choke me -#else -$ac_func(); -#endif - +pthread_attr_getschedpolicy() ; return 0; } EOF -if { (eval echo configure:9075: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10868: \"$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" + 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_func_$ac_func=no" + eval "ac_cv_lib_$ac_lib_var=no" fi rm -f conftest* -fi +LIBS="$ac_save_LIBS" -if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 - ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` - cat >> confdefs.h <> confdefs.h <<\EOF -#define HAVE_USLEEP 1 + cat >> confdefs.h <<\EOF +#define HAVE_THREAD_PRIORITY_FUNCTIONS 1 EOF else echo "$ac_t""no" 1>&6 -echo "configure: warning: wxSleep() function will not work" 1>&2 -fi -done +echo $ac_n "checking for pthread_attr_getschedpolicy in -l"posix4"""... $ac_c" 1>&6 +echo "configure:10890: 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 -done -for ac_func in uname gethostname -do -echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:9114: checking for $ac_func" >&5 -if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then + echo $ac_n "checking for pthread_cancel in -l$THREADS_LINK""... $ac_c" 1>&6 +echo "configure:10939: 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 - 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 $ac_func(); - -int main() { - -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_$ac_func) || defined (__stub___$ac_func) -choke me -#else -$ac_func(); -#endif +char pthread_cancel(); +int main() { +pthread_cancel() ; return 0; } EOF -if { (eval echo configure:9142: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10958: \"$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" + 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_func_$ac_func=no" + eval "ac_cv_lib_$ac_lib_var=no" fi rm -f conftest* -fi +LIBS="$ac_save_LIBS" -if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 - ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` - cat >> confdefs.h <> confdefs.h <<\EOF +#define HAVE_PTHREAD_CANCEL 1 EOF - break + else echo "$ac_t""no" 1>&6 +echo "configure: warning: wxThread::Kill() will not work properly" 1>&2 fi -done -for ac_func in strtok_r -do -echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:9170: checking for $ac_func" >&5 -if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then + echo $ac_n "checking for pthread_cleanup_push/pop""... $ac_c" 1>&6 +echo "configure:10984: 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 < 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(); - +#include int main() { -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_$ac_func) || defined (__stub___$ac_func) -choke me -#else -$ac_func(); -#endif - + pthread_cleanup_push(NULL, NULL); + pthread_cleanup_pop(0); + ; return 0; } EOF -if { (eval echo configure:9198: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11000: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" + + 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* - eval "ac_cv_func_$ac_func=no" + + wx_cv_func_pthread_cleanup_push=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'` +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:11041: 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 "$WXGTK12" = 1 ; then cat >> confdefs.h <> confdefs.h <<\EOF +#define WXDEBUG 1 +EOF + + WXDEBUG_DEFINE="-D__WXDEBUG__" else - echo "$ac_t""no" 1>&6 + if test "$wxUSE_GTK" = 1 ; then + WXDEBUG_DEFINE="-DGTK_NO_CHECK_CASTS" + fi fi -done +if test "$wxUSE_MEM_TRACING" = "yes" ; then + cat >> confdefs.h <<\EOF +#define wxUSE_MEMORY_TRACING 1 +EOF -for ac_func in inet_addr -do -echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:9226: 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 + cat >> confdefs.h <<\EOF +#define wxUSE_GLOBAL_MEMORY_OPERATORS 1 +EOF + + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS memcheck" +fi + +if test "$wxUSE_DMALLOC" = "yes" ; then + DMALLOC_LINK="-ldmalloc" +fi + +PROFILE= +if test "$wxUSE_PROFILE" = "yes" ; then + PROFILE="-pg" +fi + +DEP_INFO_FLAGS= +if test "$GCC" = yes ; then + if test "$wxUSE_NO_RTTI" = "yes" ; then + WXDEBUG_DEFINE="$WXDEBUG_DEFINE -fno-rtti" + fi + if test "$wxUSE_NO_EXCEPTIONS" = "yes" ; then + WXDEBUG_DEFINE="$WXDEBUG_DEFINE -fno-exceptions" + fi + if test "$wxUSE_PERMISSIVE" = "yes" ; then + CFLAGS="${CFLAGS} -fpermissive" + CXXFLAGS="${CXXFLAGS} -fpermissive" + 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 + OPTIMISE= else - cat > conftest.$ac_ext < -/* Override any gcc2 internal prototype to avoid an error. */ -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char $ac_func(); + if test "$GCC" = yes ; then + OPTIMISE="-O2" + case "${host}" in + i586-*-*|i686-*-* ) + OPTIMISE="${OPTIMISE} " + ;; + esac + else + OPTIMISE="-O" + fi +fi -int main() { -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_$ac_func) || defined (__stub___$ac_func) -choke me -#else -$ac_func(); -#endif +ZLIB_INCLUDE= +if test "$wxUSE_ZLIB" = "yes" ; then + cat >> confdefs.h <<\EOF +#define wxUSE_ZLIB 1 +EOF -; return 0; } + ZLIB_INCLUDE="-I\${top_srcdir}/src/zlib" +fi + +PNG_INCLUDE= +if test "$wxUSE_LIBPNG" = "yes" ; then + cat >> confdefs.h <<\EOF +#define wxUSE_LIBPNG 1 EOF -if { (eval echo configure:9254: \"$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" + + PNG_INCLUDE="-I\${top_srcdir}/src/png" + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS png" fi -rm -f conftest* + +JPEG_INCLUDE= +if test "$wxUSE_LIBJPEG" = "yes" ; then + cat >> confdefs.h <<\EOF +#define wxUSE_LIBJPEG 1 +EOF + + JPEG_INCLUDE="-I\${top_srcdir}/src/jpeg" fi -if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` - cat >> confdefs.h <> confdefs.h <<\EOF +#define wxUSE_LIBTIFF 1 EOF - -else - echo "$ac_t""no" 1>&6 + + TIFF_INCLUDE="-I\${top_srcdir}/src/tiff" fi -done -for ac_func in inet_aton -do -echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:9281: checking for $ac_func" >&5 -if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then +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:11188: 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 < -/* Override any gcc2 internal prototype to avoid an error. */ -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char $ac_func(); - -int main() { - -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_$ac_func) || defined (__stub___$ac_func) -choke me -#else -$ac_func(); -#endif - -; return 0; } +#include EOF -if { (eval echo configure:9309: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (eval echo configure:11198: \"$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_func_$ac_func=yes" + eval "ac_cv_header_$ac_safe=yes" else + echo "$ac_err" >&5 echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* - eval "ac_cv_func_$ac_func=no" + eval "ac_cv_header_$ac_safe=no" fi rm -f conftest* fi - -if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then +if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = 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 inet_aton in -lresolv""... $ac_c" 1>&6 -echo "configure:9334: checking for inet_aton in -lresolv" >&5 -ac_lib_var=`echo resolv'_'inet_aton | sed 'y%./+-%__p_%'` + + echo $ac_n "checking for glInitNames in -lGL""... $ac_c" 1>&6 +echo "configure:11216: 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 else ac_save_LIBS="$LIBS" -LIBS="-lresolv $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:11235: \"$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 @@ -9364,107 +11246,38 @@ 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 <> confdefs.h <<\EOF +#define wxUSE_OPENGL 1 EOF - LIBS="-lresolv $LIBS" - + UTILS_SUBDIRS="$UTILS_SUBDIRS glcanvas/src" + else echo "$ac_t""no" 1>&6 -fi - - -fi - -cat > confcache <<\EOF -# This file is a shell script that caches the results of configure -# tests run on this system so they can be shared between configure -# scripts and configure runs. It is not useful on other systems. -# If it contains results you don't want to keep, you may remove or edit it. -# -# By default, configure uses ./config.cache as the cache file, -# creating it if it does not exist already. You can give configure -# the --cache-file=FILE option to use a different cache file; that is -# what configure does when it calls configure scripts in -# subdirectories, so they share the cache. -# Giving --cache-file=/dev/null disables caching, for debugging configure. -# config.status only pays attention to the cache file if you give it the -# --recheck option to rerun configure. -# -EOF -# The following way of writing the cache mishandles newlines in values, -# but we know of no workaround that is simple, portable, and efficient. -# So, don't put newlines in cache variables' values. -# Ultrix sh set writes to stderr and can't be redirected directly, -# and sets the high bit in the cache file unless we assign to the vars. -(set) 2>&1 | - case `(ac_space=' '; set | grep ac_space) 2>&1` in - *ac_space=\ *) - # `set' does not quote correctly, so add quotes (double-quote substitution - # turns \\\\ into \\, and sed turns \\ into \). - sed -n \ - -e "s/'/'\\\\''/g" \ - -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p" - ;; - *) - # `set' quotes correctly as required by POSIX, so do not add quotes. - sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p' - ;; - esac >> confcache -if cmp -s $cache_file confcache; then - : -else - if test -w $cache_file; then - echo "updating cache $cache_file" - cat confcache > $cache_file - else - echo "not updating unwritable cache $cache_file" - fi -fi -rm -f confcache - - - -if test "$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:9449: checking for pthread_create in -lpthread" >&5 -ac_lib_var=`echo pthread'_'pthread_create | sed 'y%./+-%__p_%'` + echo $ac_n "checking for glInitNames in -lMesaGL""... $ac_c" 1>&6 +echo "configure:11262: 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 else ac_save_LIBS="$LIBS" -LIBS="-lpthread $LIBS" +LIBS="-lMesaGL $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11281: \"$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 @@ -9480,653 +11293,537 @@ 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" - + OPENGL_LINK="-lMesaGL" + cat >> confdefs.h <<\EOF +#define wxUSE_OPENGL 1 +EOF + + UTILS_SUBDIRS="$UTILS_SUBDIRS glcanvas/src" + else echo "$ac_t""no" 1>&6 +wxUSE_OPENGL=0 +fi - echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6 -echo "configure:9491: 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 + +fi + + else - ac_save_LIBS="$LIBS" -LIBS="-lc_r $LIBS" -cat > conftest.$ac_ext <&6 +wxUSE_OPENGL=0 +fi -int main() { -pthread_create() -; return 0; } +fi + + +if test "$wxUSE_GUI" = "yes"; then + cat >> confdefs.h <<\EOF +#define wxUSE_GUI 1 EOF -if { (eval echo configure:9510: \"$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" + + + else + cat >> confdefs.h <<\EOF +#define wxUSE_NOGUI 1 +EOF + fi -rm -f conftest* -LIBS="$ac_save_LIBS" + + +if test "$wxUSE_UNIX" = "yes"; then + cat >> confdefs.h <<\EOF +#define wxUSE_UNIX 1 +EOF fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - - THREADS_OBJ="threadpsx.lo" - THREADS_LINK="c_r" - -else - echo "$ac_t""no" 1>&6 - ac_safe=`echo "sys/prctl.h" | sed 'y%./+-%__p_%'` -echo $ac_n "checking for sys/prctl.h""... $ac_c" 1>&6 -echo "configure:9534: 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 < + +if test "$wxUSE_APPLE_IEEE" = "yes"; then + cat >> confdefs.h <<\EOF +#define wxUSE_APPLE_IEEE 1 EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9544: \"$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* + +if test "$wxUSE_WAVE" = "yes"; then + cat >> confdefs.h <<\EOF +#define wxUSE_WAVE 1 +EOF + 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 + +if test "$wxUSE_FILE" = "yes"; then + cat >> confdefs.h <<\EOF +#define wxUSE_FILE 1 +EOF + fi - +if test "$wxUSE_FS_INET" = "yes"; then + cat >> confdefs.h <<\EOF +#define wxUSE_FS_INET 1 +EOF + fi - +if test "$wxUSE_FS_ZIP" = "yes"; then + cat >> confdefs.h <<\EOF +#define wxUSE_FS_ZIP 1 +EOF + fi +if test "$wxUSE_ZIPSTREAM" = "yes"; then + cat >> confdefs.h <<\EOF +#define wxUSE_ZIPSTREAM 1 +EOF - 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:9586: 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 < +if test "$wxUSE_BUSYINFO" = "yes"; then + cat >> confdefs.h <<\EOF +#define wxUSE_BUSYINFO 1 EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9596: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -if test -z "$ac_err"; then - rm -rf conftest* - eval "ac_cv_header_$ac_safe=yes" -else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_header_$ac_safe=no" -fi -rm -f conftest* + fi -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` - cat >> confdefs.h <> confdefs.h <<\EOF +#define wxUSE_STD_IOSTREAM 1 EOF - -else - echo "$ac_t""no" 1>&6 + fi -done +if test "$wxUSE_TEXTFILE" = "yes"; then + if test "$wxUSE_FILE" != "yes"; then + echo "configure: warning: wxTextFile requires wxFile and it won't be compiled without it" 1>&2 + else + cat >> confdefs.h <<\EOF +#define wxUSE_TEXTFILE 1 +EOF - echo $ac_n "checking for sched_yield in -l$THREADS_LINK""... $ac_c" 1>&6 -echo "configure:9624: 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 <&2 + else + cat >> confdefs.h <<\EOF +#define wxUSE_CONFIG 1 EOF -if { (eval echo configure:9643: \"$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" + + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS config" + fi fi -rm -f conftest* -LIBS="$ac_save_LIBS" +if test "$wxUSE_INTL" = "yes" ; then + if test "$wxUSE_FILE" != "yes"; then + echo "configure: warning: I18n code requires wxFile and it won't be compiled without it" 1>&2 + else + cat >> confdefs.h <<\EOF +#define wxUSE_INTL 1 +EOF + + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS internat" + fi fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 + +if test "$wxUSE_LOG" = "yes"; then cat >> confdefs.h <<\EOF -#define HAVE_SCHED_YIELD 1 +#define wxUSE_LOG 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:9665: 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 wxUSE_LONGLONG 1 EOF -if { (eval echo configure:9684: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" + fi -rm -f conftest* -LIBS="$ac_save_LIBS" +if test "$wxUSE_DIALUP_MANAGER" = "yes" ; then + cat >> confdefs.h <<\EOF +#define wxUSE_DIALUP_MANAGER 1 +EOF + + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS nettest" fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 + +if test "$wxUSE_STREAMS" = "yes" ; then cat >> confdefs.h <<\EOF -#define HAVE_SCHED_YIELD 1 +#define wxUSE_STREAMS 1 EOF - POSIX4_LINK="-lposix4" -else - echo "$ac_t""no" 1>&6 -echo "configure: warning: wxThread::Yield will not work properly" 1>&2 - + fi - +if test "$wxUSE_SERIAL" = "yes" ; then + cat >> confdefs.h <<\EOF +#define wxUSE_SERIAL 1 +EOF + fi - echo $ac_n "checking for pthread_attr_getschedpolicy in -l$THREADS_LINK""... $ac_c" 1>&6 -echo "configure:9714: 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 +if test "$wxUSE_TIMEDATE" = "yes"; then + echo $ac_n "checking for timezone variable in ""... $ac_c" 1>&6 +echo "configure:11473: 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 - ac_save_LIBS="$LIBS" -LIBS="-l$THREADS_LINK $LIBS" -cat > conftest.$ac_ext < conftest.$ac_ext < + int main() { -pthread_attr_getschedpolicy() + + int tz; + tz = __timezone; + ; return 0; } EOF -if { (eval echo configure:9733: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11491: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" + + wx_cv_var_timezone=__timezone + 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" + + cat > conftest.$ac_ext <&6 - cat >> confdefs.h <<\EOF -#define HAVE_THREAD_PRIORITY_FUNCTIONS 1 -EOF + #include + +int main() { + int tz; + tz = _timezone; + +; return 0; } +EOF +if { (eval echo configure:11514: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + + wx_cv_var_timezone=_timezone + else - echo "$ac_t""no" 1>&6 -echo $ac_n "checking for pthread_attr_getschedpolicy in -l"posix4"""... $ac_c" 1>&6 -echo "configure:9755: 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 + cat conftest.$ac_ext >&5 + rm -rf conftest* + + cat > conftest.$ac_ext < + int main() { -pthread_attr_getschedpolicy() + + int tz; + tz = timezone; + ; return 0; } EOF -if { (eval echo configure:9774: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11537: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" + + wx_cv_var_timezone=timezone + else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" + { echo "configure: error: no timezone variable" 1>&2; exit 1; } + 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 - +rm -f conftest* + + fi - - +rm -f conftest* + + fi +echo "$ac_t""$wx_cv_var_timezone" 1>&6 - echo $ac_n "checking for pthread_cancel in -l$THREADS_LINK""... $ac_c" 1>&6 -echo "configure:9804: 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 + cat >> confdefs.h <&6 +echo "configure:11572: checking for $ac_func" >&5 +if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - ac_save_LIBS="$LIBS" -LIBS="-l$THREADS_LINK $LIBS" -cat > conftest.$ac_ext < conftest.$ac_ext < /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char pthread_cancel(); +char $ac_func(); int main() { -pthread_cancel() + +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_$ac_func) || defined (__stub___$ac_func) +choke me +#else +$ac_func(); +#endif + ; return 0; } EOF -if { (eval echo configure:9823: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11600: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" + eval "ac_cv_func_$ac_func=yes" else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" + eval "ac_cv_func_$ac_func=no" fi rm -f conftest* -LIBS="$ac_save_LIBS" - fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + +if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then echo "$ac_t""yes" 1>&6 - cat >> confdefs.h <<\EOF -#define HAVE_PTHREAD_CANCEL 1 + ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` + cat >> confdefs.h <&6 -echo "configure: warning: wxThread::Kill() will not work properly" 1>&2 fi +done - echo $ac_n "checking for pthread_cleanup_push/pop""... $ac_c" 1>&6 -echo "configure:9849: checking for pthread_cleanup_push/pop" >&5 -if eval "test \"`echo '$''{'wx_cv_func_pthread_cleanup_push'+set}'`\" = set"; then + if test "$ac_cv_func_localtime" = "yes"; then + echo $ac_n "checking for tm_gmtoff in struct tm""... $ac_c" 1>&6 +echo "configure:11627: 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 < conftest.$ac_ext < + + #include + int main() { - pthread_cleanup_push(NULL, NULL); - pthread_cleanup_pop(0); - + struct tm tm; + tm.tm_gmtoff++; + ; return 0; } EOF -if { (eval echo configure:9865: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:11645: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* - wx_cv_func_pthread_cleanup_push=yes + wx_cv_struct_tm_has_gmtoff=yes cat >> confdefs.h <<\EOF -#define HAVE_THREAD_CLEANUP_FUNCTIONS 1 +#define WX_GMTOFF_IN_TM 1 EOF - + else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* - - wx_cv_func_pthread_cleanup_push=no - + wx_cv_struct_tm_has_gmtoff=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" +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:11668: 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 - if test "$ac_cv_func_strtok_r" = "yes"; then - CFLAGS="${CFLAGS} -D_REENTRANT" - CXXFLAGS="${CXXFLAGS} -D_REENTRANT" - fi -fi - -if test "$WXGTK12" = 1 ; then - cat >> confdefs.h < conftest.$ac_ext < + #include + +int main() { -if test "$wxUSE_DEBUG_FLAG" = "yes" ; then - cat >> confdefs.h <<\EOF -#define WXDEBUG 1 + struct timeval tv; + struct timezone tz; + gettimeofday(&tv, &tz); + +; return 0; } EOF - - WXDEBUG_DEFINE="-D__WXDEBUG__" +if { (eval echo configure:11697: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + wx_cv_func_gettimeofday_has_2_args=yes else - if test "$wxUSE_GTK" = 1 ; then - WXDEBUG_DEFINE="-DGTK_NO_CHECK_CASTS" - fi -fi + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + cat > conftest.$ac_ext <> confdefs.h <<\EOF -#define wxUSE_MEMORY_TRACING 1 -EOF + #include + #include + +int main() { - cat >> confdefs.h <<\EOF -#define wxUSE_GLOBAL_MEMORY_OPERATORS 1 + struct timeval tv; + gettimeofday(&tv); + +; return 0; } EOF - - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS memcheck" -fi - -if test "$wxUSE_DMALLOC" = "yes" ; then - DMALLOC_LINK="-ldmalloc" -fi - -PROFILE= -if test "$wxUSE_PROFILE" = "yes" ; then - PROFILE="-pg" +if { (eval echo configure:11718: \"$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 - -DEP_INFO_FLAGS= -if test "$GCC" = yes ; then - if test "$wxUSE_NO_RTTI" = "yes" ; then - WXDEBUG_DEFINE="$WXDEBUG_DEFINE -fno-rtti" - fi - if test "$wxUSE_NO_EXCEPTIONS" = "yes" ; then - WXDEBUG_DEFINE="$WXDEBUG_DEFINE -fno-exceptions" - fi - if test "$wxUSE_PERMISSIVE" = "yes" ; then - CFLAGS="${CFLAGS} -fpermissive" - CXXFLAGS="${CXXFLAGS} -fpermissive" - fi - if test "$wxUSE_NO_DEPS" = "no" ; then - DEP_INFO_FLAGS="-MMD" - 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 - -CXXFLAGS=`echo "${CXXFLAGS}" | sed "s/\-O.//g" ` -CFLAGS=`echo "${CFLAGS}" | sed "s/\-O.//g" ` -if test "$wxUSE_OPTIMISE" = "no" ; then - OPTIMISE= -else - if test "$GCC" = yes ; then - OPTIMISE="-O2" - case "${host}" in - i586-*-*|i686-*-* ) - OPTIMISE="${OPTIMISE} " - ;; - esac - else - OPTIMISE="-O" - fi + fi +echo "$ac_t""$wx_cv_func_gettimeofday_has_2_args" 1>&6 -ZLIB_INCLUDE= -if test "$wxUSE_ZLIB" = "yes" ; then - cat >> confdefs.h <<\EOF -#define wxUSE_ZLIB 1 + if test "$wx_cv_func_gettimeofday_has_2_args" != "yes"; then + cat >> confdefs.h <<\EOF +#define WX_GETTIMEOFDAY_NO_TZ 1 EOF - ZLIB_INCLUDE="-I\${top_srcdir}/src/zlib" -fi + fi + fi -PNG_INCLUDE= -if test "$wxUSE_LIBPNG" = "yes" ; then - cat >> confdefs.h <<\EOF -#define wxUSE_LIBPNG 1 + cat >> confdefs.h <<\EOF +#define wxUSE_TIMEDATE 1 EOF - PNG_INCLUDE="-I\${top_srcdir}/src/png" - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS png" + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS typetest" fi -JPEG_INCLUDE= -if test "$wxUSE_LIBJPEG" = "yes" ; then - cat >> confdefs.h <<\EOF -#define wxUSE_LIBJPEG 1 -EOF - - JPEG_INCLUDE="-I\${top_srcdir}/src/jpeg" -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:10037: 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:10047: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -if test -z "$ac_err"; then - rm -rf conftest* - eval "ac_cv_header_$ac_safe=yes" -else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_header_$ac_safe=no" -fi -rm -f conftest* -fi -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then - echo "$ac_t""yes" 1>&6 - - echo $ac_n "checking for glInitNames in -lGL""... $ac_c" 1>&6 -echo "configure:10065: 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 +if test "$wxUSE_SOCKETS" = "yes"; then + echo $ac_n "checking for socket""... $ac_c" 1>&6 +echo "configure:11762: checking for socket" >&5 +if eval "test \"`echo '$''{'ac_cv_func_socket'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - ac_save_LIBS="$LIBS" -LIBS="-lGL wxUSE_OPENGL=0 $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 glInitNames(); +char socket(); int main() { -glInitNames() + +/* 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 +socket(); +#endif + ; return 0; } EOF -if { (eval echo configure:10084: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11790: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" + eval "ac_cv_func_socket=yes" else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" + eval "ac_cv_func_socket=no" fi rm -f conftest* -LIBS="$ac_save_LIBS" - fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - - OPENGL_LINK="-lGL" - cat >> confdefs.h <<\EOF -#define wxUSE_OPENGL 1 -EOF - UTILS_SUBDIRS="$UTILS_SUBDIRS glcanvas/src" - +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 glInitNames in -lMesaGL""... $ac_c" 1>&6 -echo "configure:10111: checking for glInitNames in -lMesaGL" >&5 -ac_lib_var=`echo MesaGL'_'glInitNames | sed 'y%./+-%__p_%'` +echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6 +echo "configure:11808: 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="-lMesaGL $LIBS" +LIBS="-lsocket $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11827: \"$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 @@ -10141,198 +11838,22 @@ LIBS="$ac_save_LIBS" fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 - - OPENGL_LINK="-lMesaGL" - cat >> confdefs.h <<\EOF -#define wxUSE_OPENGL 1 -EOF - - UTILS_SUBDIRS="$UTILS_SUBDIRS glcanvas/src" - + INET_LINK="$INET_LINK -lsocket" else echo "$ac_t""no" 1>&6 -wxUSE_OPENGL=0 -fi - + echo "configure: warning: socket library not found - sockets will be disabled" 1>&2 + wxUSE_SOCKETS=no + + fi -else - echo "$ac_t""no" 1>&6 -wxUSE_OPENGL=0 -fi - -fi - - -if test "$wxUSE_GUI" = "yes"; then - cat >> confdefs.h <<\EOF -#define wxUSE_GUI 1 -EOF - - - else - cat >> confdefs.h <<\EOF -#define wxUSE_NOGUI 1 -EOF - -fi - - -if test "$wxUSE_UNIX" = "yes"; then - cat >> confdefs.h <<\EOF -#define wxUSE_UNIX 1 -EOF - -fi - - -if test "$wxUSE_APPLE_IEEE" = "yes"; then - cat >> confdefs.h <<\EOF -#define wxUSE_APPLE_IEEE 1 -EOF - -fi - -if test "$wxUSE_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 -EOF - -fi - -if test "$wxUSE_FILE" = "yes"; then - cat >> confdefs.h <<\EOF -#define wxUSE_FILE 1 -EOF - -fi - -if test "$wxUSE_FS_INET" = "yes"; then - cat >> confdefs.h <<\EOF -#define wxUSE_FS_INET 1 -EOF - -fi - -if test "$wxUSE_FS_ZIP" = "yes"; then - cat >> confdefs.h <<\EOF -#define wxUSE_FS_ZIP 1 -EOF - -fi - -if test "$wxUSE_ZIPSTREAM" = "yes"; then - cat >> confdefs.h <<\EOF -#define wxUSE_ZIPSTREAM 1 -EOF - fi -if test "$wxUSE_BUSYINFO" = "yes"; then - cat >> confdefs.h <<\EOF -#define wxUSE_BUSYINFO 1 -EOF - -fi - -if test "$wxUSE_STD_IOSTREAM" = "yes"; then - cat >> confdefs.h <<\EOF -#define wxUSE_STD_IOSTREAM 1 -EOF - -fi - -if test "$wxUSE_TEXTFILE" = "yes"; then - if test "$wxUSE_FILE" != "yes"; then - echo "configure: warning: wxTextFile requires wxFile and it won't be compiled without it" 1>&2 - else - cat >> confdefs.h <<\EOF -#define wxUSE_TEXTFILE 1 -EOF - - fi -fi - -if test "$wxUSE_CONFIG" = "yes" ; then - if test "$wxUSE_TEXTFILE" != "yes"; then - echo "configure: warning: wxConfig requires wxTextFile and it won't be compiled without it" 1>&2 - else - cat >> confdefs.h <<\EOF -#define wxUSE_CONFIG 1 -EOF - - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS config" - fi -fi - -if test "$wxUSE_INTL" = "yes" ; then - if test "$wxUSE_FILE" != "yes"; then - echo "configure: warning: I18n code requires wxFile and it won't be compiled without it" 1>&2 - else - cat >> confdefs.h <<\EOF -#define wxUSE_INTL 1 -EOF - - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS internat" - fi -fi - -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_SOCKETS" = "yes" ; then - cat >> confdefs.h <<\EOF -#define wxUSE_SOCKETS 1 -EOF - - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS wxsocket" - INCLUDE_SUBDIRS="$INCLUDE_SUBDIRS protocol" -fi - -if test "$wxUSE_DIALUP_MANAGER" = "yes" ; then - cat >> confdefs.h <<\EOF -#define wxUSE_DIALUP_MANAGER 1 -EOF - -fi - -if test "$wxUSE_STREAMS" = "yes" ; then - cat >> confdefs.h <<\EOF -#define wxUSE_STREAMS 1 -EOF - -fi - -if test "$wxUSE_SERIAL" = "yes" ; then - cat >> confdefs.h <<\EOF -#define wxUSE_SERIAL 1 -EOF - -fi - - -if test "$wxUSE_SOCKETS" = "yes"; then ac_ext=C # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -10342,16 +11863,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:10346: checking the type of the third argument of getsockname" >&5 +echo "configure:11867: checking the type of the third argument of getsockname" >&5 cat > conftest.$ac_ext < int main() { socklen_t len; getsockname(0, 0, &len); ; return 0; } EOF -if { (eval echo configure:10355: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:11876: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF #define SOCKLEN_T socklen_t @@ -10362,14 +11883,14 @@ else cat conftest.$ac_ext >&5 rm -rf conftest* cat > conftest.$ac_ext < int main() { size_t len; getsockname(0, 0, &len); ; return 0; } EOF -if { (eval echo configure:10373: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:11894: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF #define SOCKLEN_T size_t @@ -10380,14 +11901,14 @@ else cat conftest.$ac_ext >&5 rm -rf conftest* cat > conftest.$ac_ext < int main() { int len; getsockname(0, 0, &len); ; return 0; } EOF -if { (eval echo configure:10391: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:11912: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF #define SOCKLEN_T int @@ -10398,7 +11919,7 @@ else cat conftest.$ac_ext >&5 rm -rf conftest* echo "$ac_t""unknown" 1>&6 - + fi rm -f conftest* @@ -10414,6 +11935,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 @@ -10422,17 +11950,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:10426: checking for $ac_hdr" >&5 +echo "configure:11954: 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:10436: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:11964: \"$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* @@ -10474,12 +12002,12 @@ if test "$wxUSE_DYNLIB_CLASS" = "yes"; then for ac_func in dlopen do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:10478: checking for $ac_func" >&5 +echo "configure:12006: 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:12034: \"$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 @@ -10530,7 +12058,7 @@ EOF else echo "$ac_t""no" 1>&6 echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 -echo "configure:10534: checking for dlopen in -ldl" >&5 +echo "configure:12062: 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 @@ -10538,7 +12066,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:12081: \"$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 @@ -10578,12 +12106,12 @@ else for ac_func in shl_load do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:10582: checking for $ac_func" >&5 +echo "configure:12110: 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:12138: \"$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 @@ -10825,17 +12353,17 @@ if test "$wxUSE_DRAG_AND_DROP" = "yes" ; then do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:10829: checking for $ac_hdr" >&5 +echo "configure:12357: 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:10839: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12367: \"$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* @@ -11020,7 +12548,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 @@ -11037,6 +12565,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 @@ -11085,14 +12620,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 @@ -11220,30 +12775,39 @@ EOF fi +OSINFO=`uname -s -r -m` +OSINFO="\"$OSINFO\"" +cat >> confdefs.h <&6 -echo "configure:11308: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:12874: 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 @@ -11453,6 +13019,7 @@ trap 'rm -fr `echo " samples/checklst/Makefile samples/config/Makefile samples/controls/Makefile + samples/console/Makefile samples/db/Makefile samples/dialogs/Makefile samples/docview/Makefile @@ -11460,6 +13027,7 @@ trap 'rm -fr `echo " samples/dnd/Makefile samples/drawing/Makefile samples/forty/Makefile + samples/font/Makefile samples/fractal/Makefile samples/image/Makefile samples/internat/Makefile @@ -11467,13 +13035,13 @@ trap 'rm -fr `echo " samples/listctrl/Makefile samples/mdi/Makefile samples/minifram/Makefile - samples/minimal/Makefile + samples/minimal/Makefile samples/nettest/Makefile samples/newgrid/Makefile samples/notebook/Makefile samples/png/Makefile samples/printing/Makefile - samples/proplist/Makefile + samples/proplist/Makefile samples/richedit/Makefile samples/resource/Makefile samples/sashtest/Makefile @@ -11493,6 +13061,7 @@ trap 'rm -fr `echo " 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 @@ -11569,6 +13138,10 @@ s%@LN_S@%$LN_S%g s%@GTK_CONFIG@%$GTK_CONFIG%g s%@GTK_CFLAGS@%$GTK_CFLAGS%g s%@GTK_LIBS@%$GTK_LIBS%g +s%@X_CFLAGS@%$X_CFLAGS%g +s%@X_PRE_LIBS@%$X_PRE_LIBS%g +s%@X_LIBS@%$X_LIBS%g +s%@X_EXTRA_LIBS@%$X_EXTRA_LIBS%g s%@WX_MAJOR_VERSION_NUMBER@%$WX_MAJOR_VERSION_NUMBER%g s%@WX_MINOR_VERSION_NUMBER@%$WX_MINOR_VERSION_NUMBER%g s%@WX_RELEASE_NUMBER@%$WX_RELEASE_NUMBER%g @@ -11586,6 +13159,7 @@ s%@WX_ALL_INSTALLED@%$WX_ALL_INSTALLED%g s%@SHARED_LD@%$SHARED_LD%g s%@PIC_FLAG@%$PIC_FLAG%g s%@DEP_INFO_FLAGS@%$DEP_INFO_FLAGS%g +s%@BURNT_LIBRARY_NAME@%$BURNT_LIBRARY_NAME%g s%@WXDEBUG_DEFINE@%$WXDEBUG_DEFINE%g s%@TOOLKIT@%$TOOLKIT%g s%@TOOLKIT_DEF@%$TOOLKIT_DEF%g @@ -11667,6 +13241,7 @@ CONFIG_FILES=\${CONFIG_FILES-"wx-config samples/checklst/Makefile samples/config/Makefile samples/controls/Makefile + samples/console/Makefile samples/db/Makefile samples/dialogs/Makefile samples/docview/Makefile @@ -11674,6 +13249,7 @@ CONFIG_FILES=\${CONFIG_FILES-"wx-config samples/dnd/Makefile samples/drawing/Makefile samples/forty/Makefile + samples/font/Makefile samples/fractal/Makefile samples/image/Makefile samples/internat/Makefile @@ -11681,13 +13257,13 @@ CONFIG_FILES=\${CONFIG_FILES-"wx-config samples/listctrl/Makefile samples/mdi/Makefile samples/minifram/Makefile - samples/minimal/Makefile + samples/minimal/Makefile samples/nettest/Makefile samples/newgrid/Makefile samples/notebook/Makefile samples/png/Makefile samples/printing/Makefile - samples/proplist/Makefile + samples/proplist/Makefile samples/richedit/Makefile samples/resource/Makefile samples/sashtest/Makefile @@ -11707,6 +13283,7 @@ CONFIG_FILES=\${CONFIG_FILES-"wx-config 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 @@ -11888,7 +13465,6 @@ fi; done EOF cat >> $CONFIG_STATUS <> $CONFIG_STATUS <<\EOF 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 -f setup.h; then + mv -f setup.h include/wx/${TOOLKIT_DIR}/setup.h + fi exit 0 EOF