AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Another try to detect alpha systems and fix string.h for it.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1093 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Karsten Ballüder 1998-12-01 15:51:49 +00:00
parent ec758a20a2
commit e0e680d2e3
3 changed files with 94 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

163
configure vendored
View File

@ -4390,6 +4390,15 @@ EOF
#define __LINUX__ 1
EOF
TMP=`uname -m`
if test "x$TMP" = "xalpha"
then
USE_ALPHA=1
cat >> confdefs.h <<\EOF
#define __ALPHA__ 1
EOF
fi
;;
*-*-irix5* | *-*-irix6* )
USE_SGI=1
@ -4582,7 +4591,7 @@ DEFAULT_wxUSE_WCSRTOMBS=0
echo $ac_n "checking "for gtk"""... $ac_c" 1>&6
echo "configure:4586: checking "for gtk"" >&5
echo "configure:4595: checking "for gtk"" >&5
# Check whether --with-gtk or --without-gtk was given.
if test "${with_gtk+set}" = set; then
withval="$with_gtk"
@ -4612,7 +4621,7 @@ fi
echo $ac_n "checking "for qt"""... $ac_c" 1>&6
echo "configure:4616: checking "for qt"" >&5
echo "configure:4625: checking "for qt"" >&5
# Check whether --with-qt or --without-qt was given.
if test "${with_qt+set}" = set; then
withval="$with_qt"
@ -4642,7 +4651,7 @@ fi
echo $ac_n "checking "for motif"""... $ac_c" 1>&6
echo "configure:4646: checking "for motif"" >&5
echo "configure:4655: checking "for motif"" >&5
# Check whether --with-motif or --without-motif was given.
if test "${with_motif+set}" = set; then
withval="$with_motif"
@ -4673,7 +4682,7 @@ fi
echo $ac_n "checking "for shared"""... $ac_c" 1>&6
echo "configure:4677: checking "for shared"" >&5
echo "configure:4686: checking "for shared"" >&5
# Check whether --with-shared or --without-shared was given.
if test "${with_shared+set}" = set; then
withval="$with_shared"
@ -4703,7 +4712,7 @@ fi
echo $ac_n "checking "for optimise"""... $ac_c" 1>&6
echo "configure:4707: checking "for optimise"" >&5
echo "configure:4716: checking "for optimise"" >&5
# Check whether --with-optimise or --without-optimise was given.
if test "${with_optimise+set}" = set; then
withval="$with_optimise"
@ -4733,7 +4742,7 @@ fi
echo $ac_n "checking "for debug_flag"""... $ac_c" 1>&6
echo "configure:4737: checking "for debug_flag"" >&5
echo "configure:4746: checking "for debug_flag"" >&5
# Check whether --with-debug_flag or --without-debug_flag was given.
if test "${with_debug_flag+set}" = set; then
withval="$with_debug_flag"
@ -4763,7 +4772,7 @@ fi
echo $ac_n "checking "for debug_info"""... $ac_c" 1>&6
echo "configure:4767: checking "for debug_info"" >&5
echo "configure:4776: checking "for debug_info"" >&5
# Check whether --with-debug_info or --without-debug_info was given.
if test "${with_debug_info+set}" = set; then
withval="$with_debug_info"
@ -4793,7 +4802,7 @@ fi
echo $ac_n "checking "for mem_tracing"""... $ac_c" 1>&6
echo "configure:4797: checking "for mem_tracing"" >&5
echo "configure:4806: checking "for mem_tracing"" >&5
# Check whether --with-mem_tracing or --without-mem_tracing was given.
if test "${with_mem_tracing+set}" = set; then
withval="$with_mem_tracing"
@ -4823,7 +4832,7 @@ fi
echo $ac_n "checking "for dmalloc"""... $ac_c" 1>&6
echo "configure:4827: checking "for dmalloc"" >&5
echo "configure:4836: checking "for dmalloc"" >&5
# Check whether --with-dmalloc or --without-dmalloc was given.
if test "${with_dmalloc+set}" = set; then
withval="$with_dmalloc"
@ -4853,7 +4862,7 @@ fi
echo $ac_n "checking "for profile"""... $ac_c" 1>&6
echo "configure:4857: checking "for profile"" >&5
echo "configure:4866: checking "for profile"" >&5
# Check whether --with-profile or --without-profile was given.
if test "${with_profile+set}" = set; then
withval="$with_profile"
@ -4883,7 +4892,7 @@ fi
echo $ac_n "checking "for apple_ieee"""... $ac_c" 1>&6
echo "configure:4887: checking "for apple_ieee"" >&5
echo "configure:4896: checking "for apple_ieee"" >&5
# Check whether --with-apple_ieee or --without-apple_ieee was given.
if test "${with_apple_ieee+set}" = set; then
withval="$with_apple_ieee"
@ -4914,7 +4923,7 @@ fi
echo $ac_n "checking "for zlib"""... $ac_c" 1>&6
echo "configure:4918: checking "for zlib"" >&5
echo "configure:4927: checking "for zlib"" >&5
# Check whether --with-zlib or --without-zlib was given.
if test "${with_zlib+set}" = set; then
withval="$with_zlib"
@ -4944,7 +4953,7 @@ fi
echo $ac_n "checking "for libpng"""... $ac_c" 1>&6
echo "configure:4948: checking "for libpng"" >&5
echo "configure:4957: checking "for libpng"" >&5
# Check whether --with-libpng or --without-libpng was given.
if test "${with_libpng+set}" = set; then
withval="$with_libpng"
@ -4974,7 +4983,7 @@ fi
echo $ac_n "checking "for odbc"""... $ac_c" 1>&6
echo "configure:4978: checking "for odbc"" >&5
echo "configure:4987: checking "for odbc"" >&5
# Check whether --with-odbc or --without-odbc was given.
if test "${with_odbc+set}" = set; then
withval="$with_odbc"
@ -5004,7 +5013,7 @@ fi
echo $ac_n "checking "for opengl"""... $ac_c" 1>&6
echo "configure:5008: checking "for opengl"" >&5
echo "configure:5017: checking "for opengl"" >&5
# Check whether --with-opengl or --without-opengl was given.
if test "${with_opengl+set}" = set; then
withval="$with_opengl"
@ -5035,7 +5044,7 @@ fi
echo $ac_n "checking "for gauge"""... $ac_c" 1>&6
echo "configure:5039: checking "for gauge"" >&5
echo "configure:5048: checking "for gauge"" >&5
# Check whether --with-gauge or --without-gauge was given.
if test "${with_gauge+set}" = set; then
withval="$with_gauge"
@ -5065,7 +5074,7 @@ fi
echo $ac_n "checking "for combobox"""... $ac_c" 1>&6
echo "configure:5069: checking "for combobox"" >&5
echo "configure:5078: checking "for combobox"" >&5
# Check whether --with-combobox or --without-combobox was given.
if test "${with_combobox+set}" = set; then
withval="$with_combobox"
@ -5095,7 +5104,7 @@ fi
echo $ac_n "checking "for scrollbar"""... $ac_c" 1>&6
echo "configure:5099: checking "for scrollbar"" >&5
echo "configure:5108: checking "for scrollbar"" >&5
# Check whether --with-scrollbar or --without-scrollbar was given.
if test "${with_scrollbar+set}" = set; then
withval="$with_scrollbar"
@ -5125,7 +5134,7 @@ fi
echo $ac_n "checking "for listctrl"""... $ac_c" 1>&6
echo "configure:5129: checking "for listctrl"" >&5
echo "configure:5138: checking "for listctrl"" >&5
# Check whether --with-listctrl or --without-listctrl was given.
if test "${with_listctrl+set}" = set; then
withval="$with_listctrl"
@ -5155,7 +5164,7 @@ fi
echo $ac_n "checking "for treectrl"""... $ac_c" 1>&6
echo "configure:5159: checking "for treectrl"" >&5
echo "configure:5168: checking "for treectrl"" >&5
# Check whether --with-treectrl or --without-treectrl was given.
if test "${with_treectrl+set}" = set; then
withval="$with_treectrl"
@ -5185,7 +5194,7 @@ fi
echo $ac_n "checking "for grid"""... $ac_c" 1>&6
echo "configure:5189: checking "for grid"" >&5
echo "configure:5198: checking "for grid"" >&5
# Check whether --with-grid or --without-grid was given.
if test "${with_grid+set}" = set; then
withval="$with_grid"
@ -5215,7 +5224,7 @@ fi
echo $ac_n "checking "for tab_dialog"""... $ac_c" 1>&6
echo "configure:5219: checking "for tab_dialog"" >&5
echo "configure:5228: checking "for tab_dialog"" >&5
# Check whether --with-tab_dialog or --without-tab_dialog was given.
if test "${with_tab_dialog+set}" = set; then
withval="$with_tab_dialog"
@ -5245,7 +5254,7 @@ fi
echo $ac_n "checking "for notebook"""... $ac_c" 1>&6
echo "configure:5249: checking "for notebook"" >&5
echo "configure:5258: checking "for notebook"" >&5
# Check whether --with-notebook or --without-notebook was given.
if test "${with_notebook+set}" = set; then
withval="$with_notebook"
@ -5276,7 +5285,7 @@ fi
echo $ac_n "checking "for timedate"""... $ac_c" 1>&6
echo "configure:5280: checking "for timedate"" >&5
echo "configure:5289: checking "for timedate"" >&5
# Check whether --with-timedate or --without-timedate was given.
if test "${with_timedate+set}" = set; then
withval="$with_timedate"
@ -5306,7 +5315,7 @@ fi
echo $ac_n "checking "for fraction"""... $ac_c" 1>&6
echo "configure:5310: checking "for fraction"" >&5
echo "configure:5319: checking "for fraction"" >&5
# Check whether --with-fraction or --without-fraction was given.
if test "${with_fraction+set}" = set; then
withval="$with_fraction"
@ -5336,7 +5345,7 @@ fi
echo $ac_n "checking "for log"""... $ac_c" 1>&6
echo "configure:5340: checking "for log"" >&5
echo "configure:5349: checking "for log"" >&5
# Check whether --with-log or --without-log was given.
if test "${with_log+set}" = set; then
withval="$with_log"
@ -5366,7 +5375,7 @@ fi
echo $ac_n "checking "for intl"""... $ac_c" 1>&6
echo "configure:5370: checking "for intl"" >&5
echo "configure:5379: checking "for intl"" >&5
# Check whether --with-intl or --without-intl was given.
if test "${with_intl+set}" = set; then
withval="$with_intl"
@ -5396,7 +5405,7 @@ fi
echo $ac_n "checking "for config"""... $ac_c" 1>&6
echo "configure:5400: checking "for config"" >&5
echo "configure:5409: checking "for config"" >&5
# Check whether --with-config or --without-config was given.
if test "${with_config+set}" = set; then
withval="$with_config"
@ -5426,7 +5435,7 @@ fi
echo $ac_n "checking "for streams"""... $ac_c" 1>&6
echo "configure:5430: checking "for streams"" >&5
echo "configure:5439: checking "for streams"" >&5
# Check whether --with-streams or --without-streams was given.
if test "${with_streams+set}" = set; then
withval="$with_streams"
@ -5456,7 +5465,7 @@ fi
echo $ac_n "checking "for serial"""... $ac_c" 1>&6
echo "configure:5460: checking "for serial"" >&5
echo "configure:5469: checking "for serial"" >&5
# Check whether --with-serial or --without-serial was given.
if test "${with_serial+set}" = set; then
withval="$with_serial"
@ -5486,7 +5495,7 @@ fi
echo $ac_n "checking "for file"""... $ac_c" 1>&6
echo "configure:5490: checking "for file"" >&5
echo "configure:5499: checking "for file"" >&5
# Check whether --with-file or --without-file was given.
if test "${with_file+set}" = set; then
withval="$with_file"
@ -5516,7 +5525,7 @@ fi
echo $ac_n "checking "for textfile"""... $ac_c" 1>&6
echo "configure:5520: checking "for textfile"" >&5
echo "configure:5529: checking "for textfile"" >&5
# Check whether --with-textfile or --without-textfile was given.
if test "${with_textfile+set}" = set; then
withval="$with_textfile"
@ -5547,7 +5556,7 @@ fi
echo $ac_n "checking "for afmfonts"""... $ac_c" 1>&6
echo "configure:5551: checking "for afmfonts"" >&5
echo "configure:5560: checking "for afmfonts"" >&5
# Check whether --with-afmfonts or --without-afmfonts was given.
if test "${with_afmfonts+set}" = set; then
withval="$with_afmfonts"
@ -5577,7 +5586,7 @@ fi
echo $ac_n "checking "for normalized"""... $ac_c" 1>&6
echo "configure:5581: checking "for normalized"" >&5
echo "configure:5590: checking "for normalized"" >&5
# Check whether --with-normalized or --without-normalized was given.
if test "${with_normalized+set}" = set; then
withval="$with_normalized"
@ -5607,7 +5616,7 @@ fi
echo $ac_n "checking "for postscript"""... $ac_c" 1>&6
echo "configure:5611: checking "for postscript"" >&5
echo "configure:5620: checking "for postscript"" >&5
# Check whether --with-postscript or --without-postscript was given.
if test "${with_postscript+set}" = set; then
withval="$with_postscript"
@ -5638,7 +5647,7 @@ fi
echo $ac_n "checking "for unicode"""... $ac_c" 1>&6
echo "configure:5642: checking "for unicode"" >&5
echo "configure:5651: checking "for unicode"" >&5
# Check whether --with-unicode or --without-unicode was given.
if test "${with_unicode+set}" = set; then
withval="$with_unicode"
@ -5668,7 +5677,7 @@ fi
echo $ac_n "checking "for wcsrtombs"""... $ac_c" 1>&6
echo "configure:5672: checking "for wcsrtombs"" >&5
echo "configure:5681: checking "for wcsrtombs"" >&5
# Check whether --with-wcsrtombs or --without-wcsrtombs was given.
if test "${with_wcsrtombs+set}" = set; then
withval="$with_wcsrtombs"
@ -5699,7 +5708,7 @@ fi
echo $ac_n "checking "for wxresources"""... $ac_c" 1>&6
echo "configure:5703: checking "for wxresources"" >&5
echo "configure:5712: checking "for wxresources"" >&5
# Check whether --with-wxresources or --without-wxresources was given.
if test "${with_wxresources+set}" = set; then
withval="$with_wxresources"
@ -5729,7 +5738,7 @@ fi
echo $ac_n "checking "for prologio"""... $ac_c" 1>&6
echo "configure:5733: checking "for prologio"" >&5
echo "configure:5742: checking "for prologio"" >&5
# Check whether --with-prologio or --without-prologio was given.
if test "${with_prologio+set}" = set; then
withval="$with_prologio"
@ -5759,7 +5768,7 @@ fi
echo $ac_n "checking "for RPC"""... $ac_c" 1>&6
echo "configure:5763: checking "for RPC"" >&5
echo "configure:5772: checking "for RPC"" >&5
# Check whether --with-rpc or --without-rpc was given.
if test "${with_rpc+set}" = set; then
withval="$with_rpc"
@ -5790,7 +5799,7 @@ fi
echo $ac_n "checking "for IPC"""... $ac_c" 1>&6
echo "configure:5794: checking "for IPC"" >&5
echo "configure:5803: checking "for IPC"" >&5
# Check whether --with-ipc or --without-ipc was given.
if test "${with_ipc+set}" = set; then
withval="$with_ipc"
@ -5820,7 +5829,7 @@ fi
echo $ac_n "checking "for resources"""... $ac_c" 1>&6
echo "configure:5824: checking "for resources"" >&5
echo "configure:5833: checking "for resources"" >&5
# Check whether --with-resources or --without-resources was given.
if test "${with_resources+set}" = set; then
withval="$with_resources"
@ -5850,7 +5859,7 @@ fi
echo $ac_n "checking "for clipboard"""... $ac_c" 1>&6
echo "configure:5854: checking "for clipboard"" >&5
echo "configure:5863: checking "for clipboard"" >&5
# Check whether --with-clipboard or --without-clipboard was given.
if test "${with_clipboard+set}" = set; then
withval="$with_clipboard"
@ -5880,7 +5889,7 @@ fi
echo $ac_n "checking "for dnd"""... $ac_c" 1>&6
echo "configure:5884: checking "for dnd"" >&5
echo "configure:5893: checking "for dnd"" >&5
# Check whether --with-dnd or --without-dnd was given.
if test "${with_dnd+set}" = set; then
withval="$with_dnd"
@ -5910,7 +5919,7 @@ fi
echo $ac_n "checking "for constrains"""... $ac_c" 1>&6
echo "configure:5914: checking "for constrains"" >&5
echo "configure:5923: checking "for constrains"" >&5
# Check whether --with-constraints or --without-constraints was given.
if test "${with_constraints+set}" = set; then
withval="$with_constraints"
@ -5941,7 +5950,7 @@ fi
echo $ac_n "checking "for mdi"""... $ac_c" 1>&6
echo "configure:5945: checking "for mdi"" >&5
echo "configure:5954: checking "for mdi"" >&5
# Check whether --with-mdi or --without-mdi was given.
if test "${with_mdi+set}" = set; then
withval="$with_mdi"
@ -5971,7 +5980,7 @@ fi
echo $ac_n "checking "for docview"""... $ac_c" 1>&6
echo "configure:5975: checking "for docview"" >&5
echo "configure:5984: checking "for docview"" >&5
# Check whether --with-docview or --without-docview was given.
if test "${with_docview+set}" = set; then
withval="$with_docview"
@ -6001,7 +6010,7 @@ fi
echo $ac_n "checking "for printarch"""... $ac_c" 1>&6
echo "configure:6005: checking "for printarch"" >&5
echo "configure:6014: checking "for printarch"" >&5
# Check whether --with-printarch or --without-printarch was given.
if test "${with_printarch+set}" = set; then
withval="$with_printarch"
@ -6031,7 +6040,7 @@ fi
echo $ac_n "checking "for help"""... $ac_c" 1>&6
echo "configure:6035: checking "for help"" >&5
echo "configure:6044: checking "for help"" >&5
# Check whether --with-help or --without-help was given.
if test "${with_help+set}" = set; then
withval="$with_help"
@ -6113,7 +6122,7 @@ fi
# Extract the first word of "gtk-config", so it can be a program name with args.
set dummy gtk-config; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:6117: checking for $ac_word" >&5
echo "configure:6126: 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
@ -6144,7 +6153,7 @@ fi
min_gtk_version=1.0.4
echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6
echo "configure:6148: checking for GTK - version >= $min_gtk_version" >&5
echo "configure:6157: checking for GTK - version >= $min_gtk_version" >&5
no_gtk=""
if test "$GTK_CONFIG" != "no" ; then
GTK_CFLAGS=`$GTK_CONFIG --cflags`
@ -6157,7 +6166,7 @@ echo "configure:6148: checking for GTK - version >= $min_gtk_version" >&5
echo $ac_n "cross compiling; assumed OK... $ac_c"
else
cat > conftest.$ac_ext <<EOF
#line 6161 "configure"
#line 6170 "configure"
#include "confdefs.h"
#include <gtk/gtk.h>
@ -6179,7 +6188,7 @@ main ()
}
EOF
if { (eval echo configure:6183: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
if { (eval echo configure:6192: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
then
:
else
@ -6219,7 +6228,7 @@ fi
if test "$wxUSE_QT" = 1; then
echo $ac_n "checking for Qt includes""... $ac_c" 1>&6
echo "configure:6223: checking for Qt includes" >&5
echo "configure:6232: checking for Qt includes" >&5
ac_find_includes=
for ac_dir in $SEARCH_INCLUDE;
@ -6233,7 +6242,7 @@ for ac_dir in $SEARCH_INCLUDE;
if test "$ac_find_includes" != "" ; then
echo "$ac_t""found $ac_find_includes" 1>&6
echo $ac_n "checking for Qt library""... $ac_c" 1>&6
echo "configure:6237: checking for Qt library" >&5
echo "configure:6246: checking for Qt library" >&5
ac_find_libraries=
for ac_dir in $SEARCH_LIB;
@ -6284,7 +6293,7 @@ fi
if test "$wxUSE_MOTIF" = 1; then
echo $ac_n "checking for Motif/Lesstif includes""... $ac_c" 1>&6
echo "configure:6288: checking for Motif/Lesstif includes" >&5
echo "configure:6297: checking for Motif/Lesstif includes" >&5
ac_find_includes=
for ac_dir in $SEARCH_INCLUDE;
@ -6298,7 +6307,7 @@ for ac_dir in $SEARCH_INCLUDE;
if test "$ac_find_includes" != "" ; then
echo "$ac_t""found $ac_find_includes" 1>&6
echo $ac_n "checking for Motif/Lesstif library""... $ac_c" 1>&6
echo "configure:6302: checking for Motif/Lesstif library" >&5
echo "configure:6311: checking for Motif/Lesstif library" >&5
ac_find_libraries=
for ac_dir in $SEARCH_LIB;
@ -6335,7 +6344,7 @@ for ac_dir in $SEARCH_LIB;
CHECK_INCLUDE="$CHECK_INCLUDE $ac_path_to_include"
echo "$ac_t""found at $ac_find_libraries" 1>&6
echo $ac_n "checking for Xt library""... $ac_c" 1>&6
echo "configure:6339: checking for Xt library" >&5
echo "configure:6348: checking for Xt library" >&5
ac_find_libraries=
for ac_dir in $SEARCH_LIB;
@ -6361,7 +6370,7 @@ for ac_dir in $SEARCH_LIB;
CHECK_LINK="$CHECK_LIB $ac_path_to_link"
echo "$ac_t""found at $ac_find_libraries" 1>&6
echo $ac_n "checking for Xpm library""... $ac_c" 1>&6
echo "configure:6365: checking for Xpm library" >&5
echo "configure:6374: checking for Xpm library" >&5
ac_find_libraries=
for ac_dir in $SEARCH_LIB;
@ -6803,7 +6812,7 @@ fi
echo $ac_n "checking for main in -ldl""... $ac_c" 1>&6
echo "configure:6807: checking for main in -ldl" >&5
echo "configure:6816: checking for main in -ldl" >&5
ac_lib_var=`echo dl'_'main | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@ -6811,14 +6820,14 @@ else
ac_save_LIBS="$LIBS"
LIBS="-ldl $LIBS"
cat > conftest.$ac_ext <<EOF
#line 6815 "configure"
#line 6824 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
if { (eval echo configure:6822: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
if { (eval echo configure:6831: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@ -6848,7 +6857,7 @@ UNIX_THREAD="gtk/threadno.cpp"
echo $ac_n "checking "for threads"""... $ac_c" 1>&6
echo "configure:6852: checking "for threads"" >&5
echo "configure:6861: checking "for threads"" >&5
# Check whether --with-threads or --without-threads was given.
if test "${with_threads+set}" = set; then
withval="$with_threads"
@ -6882,7 +6891,7 @@ if test "$wxUSE_THREADS" = "1"; then
echo $ac_n "checking for pthread_create in -lpthread-0.7""... $ac_c" 1>&6
echo "configure:6886: checking for pthread_create in -lpthread-0.7" >&5
echo "configure:6895: checking for pthread_create in -lpthread-0.7" >&5
ac_lib_var=`echo pthread-0.7'_'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
@ -6890,7 +6899,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lpthread-0.7 $LIBS"
cat > conftest.$ac_ext <<EOF
#line 6894 "configure"
#line 6903 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@ -6901,7 +6910,7 @@ int main() {
pthread_create()
; return 0; }
EOF
if { (eval echo configure:6905: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
if { (eval echo configure:6914: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@ -6925,17 +6934,17 @@ else
ac_safe=`echo "sys/prctl.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for sys/prctl.h""... $ac_c" 1>&6
echo "configure:6929: checking for sys/prctl.h" >&5
echo "configure:6938: checking for sys/prctl.h" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
#line 6934 "configure"
#line 6943 "configure"
#include "confdefs.h"
#include <sys/prctl.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:6939: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
{ (eval echo configure:6948: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then
rm -rf conftest*
@ -6961,7 +6970,7 @@ fi
echo $ac_n "checking for pthread_setcanceltype in -lpthread""... $ac_c" 1>&6
echo "configure:6965: checking for pthread_setcanceltype in -lpthread" >&5
echo "configure:6974: checking for pthread_setcanceltype in -lpthread" >&5
ac_lib_var=`echo pthread'_'pthread_setcanceltype | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@ -6969,7 +6978,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lpthread $LIBS"
cat > conftest.$ac_ext <<EOF
#line 6973 "configure"
#line 6982 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@ -6980,7 +6989,7 @@ int main() {
pthread_setcanceltype()
; return 0; }
EOF
if { (eval echo configure:6984: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
if { (eval echo configure:6993: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@ -7007,7 +7016,7 @@ fi
fi
echo $ac_n "checking for pthread_setcanceltype in -lpthreads""... $ac_c" 1>&6
echo "configure:7011: checking for pthread_setcanceltype in -lpthreads" >&5
echo "configure:7020: checking for pthread_setcanceltype in -lpthreads" >&5
ac_lib_var=`echo pthreads'_'pthread_setcanceltype | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@ -7015,7 +7024,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lpthreads $LIBS"
cat > conftest.$ac_ext <<EOF
#line 7019 "configure"
#line 7028 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@ -7026,7 +7035,7 @@ int main() {
pthread_setcanceltype()
; return 0; }
EOF
if { (eval echo configure:7030: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
if { (eval echo configure:7039: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@ -7074,7 +7083,7 @@ OPENGL_LINK=
if test "$wxUSE_OPENGL" = 1; then
echo $ac_n "checking for OpenGL includes""... $ac_c" 1>&6
echo "configure:7078: checking for OpenGL includes" >&5
echo "configure:7087: checking for OpenGL includes" >&5
ac_find_includes=
for ac_dir in $SEARCH_INCLUDE;
@ -7089,7 +7098,7 @@ for ac_dir in $SEARCH_INCLUDE;
OPENGL_INCLUDE="-I$ac_find_includes"
echo "$ac_t""found $ac_find_includes" 1>&6
echo $ac_n "checking for OpenGL library""... $ac_c" 1>&6
echo "configure:7093: checking for OpenGL library" >&5
echo "configure:7102: checking for OpenGL library" >&5
ac_find_libraries=
for ac_dir in $SEARCH_LIB;

6
configure.in
View File

@ -600,6 +600,12 @@ case "${canonical}" in
*-*-linux* )
USE_LINUX=1
AC_DEFINE(__LINUX__)
TMP=`uname -m`
if test "x$TMP" = "xalpha"
then
USE_ALPHA=1
AC_DEFINE(__ALPHA__)
fi
;;
*-*-irix5* | *-*-irix6* )
USE_SGI=1

4
include/wx/string.h
View File

@ -303,8 +303,8 @@ public:
char& Last()
{ wxASSERT( !IsEmpty() ); CopyBeforeWrite(); return m_pchData[Len()-1]; }
// on 64bit systems, this gives overload problems:
#if SIZEOF_INT <= 4
// on alpha-linux this gives overload problems:
#if ! defined(__ALPHA__)
/// operator version of GetChar
char operator[](size_t n) const
{ ASSERT_VALID_INDEX( n ); return m_pchData[n]; }