From 88a3210dadc35cbe4f8820b1622904b8f4acdb6a Mon Sep 17 00:00:00 2001 From: George Rhoten Date: Thu, 29 Nov 2001 00:29:20 +0000 Subject: [PATCH] ICU-1460 Several fixes for HP/UX. One of them is the +DAportable option. X-SVN-Rev: 7153 --- icu4c/source/configure | 325 +++++++++++++++++++------------------- icu4c/source/configure.in | 46 +++--- 2 files changed, 192 insertions(+), 179 deletions(-) diff --git a/icu4c/source/configure b/icu4c/source/configure index 917d2cf701..3de7b7c309 100755 --- a/icu4c/source/configure +++ b/icu4c/source/configure @@ -1160,7 +1160,7 @@ else fi -for ac_prog in gmake +for ac_prog in gmake gnumake do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -1315,11 +1315,20 @@ echo "configure:1315: checking for 64-bit executable support" >&5 if eval "test \"`echo '$''{'ac_cv_64bit_ok'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - if test "$ENABLE_64BIT_LIBS" != no; then + if test "$ENABLE_64BIT_LIBS" = no; then + case "${host}" in + *-*-hpux*) + case "${CXX}" in + *CC) + CPPFLAGS="${CPPFLAGS} +DAportable" + ;; + esac;; + esac + else case "${host}" in *-*-solaris*) - SOL64=`$CXX -xarch=v9 && $CC -xarch=v9 2>&1 |grep -v usage:` - SPARCV9=`isainfo -n | grep sparcv9` + SOL64=`$CXX -xarch=v9 && $CC -xarch=v9 2>&1 | grep -v usage:` + SPARCV9=`isainfo -n 2>&1 | grep sparcv9` if test -z "$SOL64" && test -n "$SPARCV9"; then CPPFLAGS="${CPPFLAGS} -xtarget=ultra -xarch=v9" ENABLE_64BIT_LIBS=yes @@ -1332,6 +1341,9 @@ else # AC_TRY_RUN(int main(void) {return 0;}, # ENABLE_64BIT_LIBS=yes, ENABLE_64BIT_LIBS=no, ENABLE_64BIT_LIBS=no) # ;; + *-*-hpux*) + ENABLE_64BIT_LIBS=unknown + ;; *) ENABLE_64BIT_LIBS=no ;; @@ -1343,16 +1355,14 @@ else fi echo "$ac_t""$ac_cv_64bit_ok" 1>&6 -if test "$ENABLE_64BIT_LIBS" = no; then - CPPFLAGS="${OLD_CPPFLAGS}" -else - ENABLE_64BIT_LIBS="${ac_cv_64bit_ok}" -fi +# Don't reset the CPPFLAGS here because of HP/UX +# Individual tests that fail should reset it to OLD_CPPFLAGS. +ENABLE_64BIT_LIBS="${ac_cv_64bit_ok}" echo $ac_n "checking which Makefile fragment to use""... $ac_c" 1>&6 -echo "configure:1356: checking which Makefile fragment to use" >&5 +echo "configure:1366: checking which Makefile fragment to use" >&5 if eval "test \"`echo '$''{'icu_cv_host_frag'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1404,7 +1414,7 @@ hpuxcma=false case "${host}" in *-*-hpux10*) hpuxcma=true echo $ac_n "checking for floor in -lm""... $ac_c" 1>&6 -echo "configure:1408: checking for floor in -lm" >&5 +echo "configure:1418: checking for floor in -lm" >&5 ac_lib_var=`echo m'_'floor | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1412,7 +1422,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1437: \"$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 @@ -1444,7 +1454,7 @@ else fi ;; *-*-hpux*) echo $ac_n "checking for floor in -lm""... $ac_c" 1>&6 -echo "configure:1448: checking for floor in -lm" >&5 +echo "configure:1458: checking for floor in -lm" >&5 ac_lib_var=`echo m'_'floor | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1452,7 +1462,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1477: \"$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 @@ -1485,7 +1495,7 @@ fi ;; *) echo $ac_n "checking for floor in -lm""... $ac_c" 1>&6 -echo "configure:1489: checking for floor in -lm" >&5 +echo "configure:1499: checking for floor in -lm" >&5 ac_lib_var=`echo m'_'floor | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1493,7 +1503,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1518: \"$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 @@ -1567,7 +1577,7 @@ if test $hpuxcma = true; then fi echo $ac_n "checking whether to build shared libraries""... $ac_c" 1>&6 -echo "configure:1571: checking whether to build shared libraries" >&5 +echo "configure:1581: checking whether to build shared libraries" >&5 enabled=no # Check whether --enable-shared or --disable-shared was given. if test "${enable_shared+set}" = set; then @@ -1586,7 +1596,7 @@ echo "$ac_t""$enabled" 1>&6 echo $ac_n "checking whether to build static libraries""... $ac_c" 1>&6 -echo "configure:1590: checking whether to build static libraries" >&5 +echo "configure:1600: checking whether to build static libraries" >&5 enabled=no # Check whether --enable-static or --disable-static was given. if test "${enable_static+set}" = set; then @@ -1604,7 +1614,7 @@ echo "$ac_t""$enabled" 1>&6 # 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:1608: checking for $ac_word" >&5 +echo "configure:1618: 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 @@ -1649,24 +1659,22 @@ fi -echo $ac_n "checking for definition of U_INLINE""... $ac_c" 1>&6 -echo "configure:1654: checking for definition of U_INLINE" >&5 -echo $ac_n "checking for inline""... $ac_c" 1>&6 -echo "configure:1656: checking for inline" >&5 +echo $ac_n "checking for definition of U_INLINE for C""... $ac_c" 1>&6 +echo "configure:1664: checking for definition of U_INLINE for C" >&5 if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_cv_c_inline=no for ac_kw in inline __inline__ __inline; do cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1678: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_inline=$ac_kw; break else @@ -1715,7 +1723,7 @@ ICU_USE_THREADS=0 if test $hpuxcma = true; then if test $threads = true; then echo $ac_n "checking for pthread_create in -lcma""... $ac_c" 1>&6 -echo "configure:1719: checking for pthread_create in -lcma" >&5 +echo "configure:1727: checking for pthread_create in -lcma" >&5 ac_lib_var=`echo cma'_'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 @@ -1723,7 +1731,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lcma $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1746: \"$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 @@ -1768,7 +1776,7 @@ fi else echo $ac_n "checking for pthread_attr_init in -lpthread""... $ac_c" 1>&6 -echo "configure:1772: checking for pthread_attr_init in -lpthread" >&5 +echo "configure:1780: checking for pthread_attr_init in -lpthread" >&5 ac_lib_var=`echo pthread'_'pthread_attr_init | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1776,7 +1784,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpthread $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1799: \"$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 @@ -1822,7 +1830,7 @@ fi echo $ac_n "checking for library containing pthread_mutex_destroy""... $ac_c" 1>&6 -echo "configure:1826: checking for library containing pthread_mutex_destroy" >&5 +echo "configure:1834: checking for library containing pthread_mutex_destroy" >&5 if eval "test \"`echo '$''{'ac_cv_search_pthread_mutex_destroy'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1831,7 +1839,7 @@ ac_cv_search_pthread_mutex_destroy="no" for i in pthread pthreads c_r cma; do LIBS="-l$i $ac_func_search_save_LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1854: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_search_pthread_mutex_destroy="-l$i" break @@ -1854,7 +1862,7 @@ rm -f conftest* done if test "$ac_cv_search_pthread_mutex_destroy" = "no"; then cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1877: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_search_pthread_mutex_destroy="none required" else @@ -1889,7 +1897,7 @@ fi ICU_USE_THREADS=1 else echo $ac_n "checking for pthread_mutex_init in -lpthread""... $ac_c" 1>&6 -echo "configure:1893: checking for pthread_mutex_init in -lpthread" >&5 +echo "configure:1901: checking for pthread_mutex_init in -lpthread" >&5 ac_lib_var=`echo pthread'_'pthread_mutex_init | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1897,7 +1905,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpthread $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1920: \"$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 @@ -1941,12 +1949,12 @@ fi fi echo $ac_n "checking for pthread_mutex_lock""... $ac_c" 1>&6 -echo "configure:1945: checking for pthread_mutex_lock" >&5 +echo "configure:1953: checking for pthread_mutex_lock" >&5 if eval "test \"`echo '$''{'ac_cv_func_pthread_mutex_lock'+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:1981: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_pthread_mutex_lock=yes" else @@ -2005,14 +2013,14 @@ HAVE_DLOPEN=0 #add more libs here.. echo $ac_n "checking for library containing dlopen""... $ac_c" 1>&6 -echo "configure:2009: checking for library containing dlopen" >&5 +echo "configure:2017: checking for library containing dlopen" >&5 if eval "test \"`echo '$''{'ac_cv_search_dlopen'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_func_search_save_LIBS="$LIBS" ac_cv_search_dlopen="no" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2035: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_search_dlopen="none required" else @@ -2034,7 +2042,7 @@ rm -f conftest* test "$ac_cv_search_dlopen" = "no" && for i in c dl; do LIBS="-l$i $ac_func_search_save_LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2057: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_search_dlopen="-l$i" break @@ -2072,7 +2080,7 @@ fi if test $HAVE_DLOPEN = 0; then echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6 -echo "configure:2076: checking for shl_load in -ldld" >&5 +echo "configure:2084: checking for shl_load in -ldld" >&5 ac_lib_var=`echo dld'_'shl_load | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2080,7 +2088,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldld $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2103: \"$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 @@ -2127,12 +2135,12 @@ fi if test $HAVE_DLOPEN = 0; then echo $ac_n "checking for dllload""... $ac_c" 1>&6 -echo "configure:2131: checking for dllload" >&5 +echo "configure:2139: checking for dllload" >&5 if eval "test \"`echo '$''{'ac_cv_func_dllload'+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:2167: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_dllload=yes" else @@ -2188,27 +2196,24 @@ fi #fi HAVE_MMAP=0 echo $ac_n "checking for mmap""... $ac_c" 1>&6 -echo "configure:2192: checking for mmap" >&5 +echo "configure:2200: checking for mmap" >&5 if eval "test \"`echo '$''{'ac_cv_func_mmap_ok'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include #include #include -void uprv_mapFile(void) { - mmap((void *)0, 0, PROT_READ, 0, 0, 0); -} int main() { - uprv_mapFile(); + mmap((void *)0, 0, PROT_READ, 0, 0, 0); ; return 0; } EOF -if { (eval echo configure:2212: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2217: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_func_mmap_ok=yes else @@ -2228,7 +2233,7 @@ fi echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:2232: checking how to run the C preprocessor" >&5 +echo "configure:2237: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -2243,13 +2248,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:2253: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2258: \"$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 : @@ -2260,13 +2265,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:2270: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2275: \"$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 : @@ -2277,13 +2282,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:2287: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2292: \"$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 : @@ -2311,17 +2316,17 @@ for ac_hdr in inttypes.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2315: checking for $ac_hdr" >&5 +echo "configure:2320: 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:2325: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2330: \"$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* @@ -2365,10 +2370,10 @@ fi if test "${with_iostream+set}" = set; then withval="$with_iostream" case "${withval}" in - none) streams=none ;; + none) streams=none ;; old) streams=198506 ;; std) streams=199711 ;; - auto) streams= ;; + auto) streams= ;; *) { echo "configure: error: bad value ${withval} for --with-iostream" 1>&2; exit 1; } ;; esac else @@ -2376,6 +2381,7 @@ else fi +U_IOSTREAM_SOURCE=0 if test x$streams != xnone then @@ -2386,9 +2392,8 @@ 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 - U_IOSTREAM_SOURCE=0 echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6 -echo "configure:2392: checking how to run the C++ preprocessor" >&5 +echo "configure:2397: 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 @@ -2401,12 +2406,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:2410: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2415: \"$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 : @@ -2432,17 +2437,17 @@ echo "$ac_t""$CXXCPP" 1>&6 ac_safe=`echo "iostream" | sed 'y%./+-%__p_%'` echo $ac_n "checking for iostream""... $ac_c" 1>&6 -echo "configure:2436: checking for iostream" >&5 +echo "configure:2441: checking for iostream" >&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:2446: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2451: \"$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* @@ -2469,17 +2474,17 @@ fi else ac_safe=`echo "iostream.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for iostream.h""... $ac_c" 1>&6 -echo "configure:2473: checking for iostream.h" >&5 +echo "configure:2478: checking for iostream.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:2483: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2488: \"$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* @@ -2502,19 +2507,19 @@ fi if test $ac_cv_header_iostream_h = yes; then echo $ac_n "checking whether ostream is really defined""... $ac_c" 1>&6 -echo "configure:2506: checking whether ostream is really defined" >&5 +echo "configure:2511: checking whether ostream is really defined" >&5 if eval "test \"`echo '$''{'ac_cv_iostream_ok'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { ostream &testout = cout; testout << "test" << endl; ; return 0; } EOF -if { (eval echo configure:2518: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2523: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_iostream_ok=yes else @@ -2553,14 +2558,14 @@ cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6 -echo "configure:2557: checking whether byte ordering is bigendian" >&5 +echo "configure:2562: checking whether byte ordering is bigendian" >&5 if eval "test \"`echo '$''{'ac_cv_c_bigendian'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_cv_c_bigendian=unknown # See if sys/param.h defines the BYTE_ORDER macro. cat > conftest.$ac_ext < #include @@ -2571,11 +2576,11 @@ int main() { #endif ; return 0; } EOF -if { (eval echo configure:2575: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2580: \"$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 @@ -2586,7 +2591,7 @@ int main() { #endif ; return 0; } EOF -if { (eval echo configure:2590: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2595: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_bigendian=yes else @@ -2606,7 +2611,7 @@ if test "$cross_compiling" = yes; then { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2628: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_c_bigendian=no else @@ -2653,17 +2658,17 @@ fi ac_safe=`echo "wchar.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for wchar.h""... $ac_c" 1>&6 -echo "configure:2657: checking for wchar.h" >&5 +echo "configure:2662: checking for wchar.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:2667: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2672: \"$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* @@ -2696,14 +2701,14 @@ EOF U_HAVE_WCHAR_H=1 echo $ac_n "checking for library containing wcscpy""... $ac_c" 1>&6 -echo "configure:2700: checking for library containing wcscpy" >&5 +echo "configure:2705: checking for library containing wcscpy" >&5 if eval "test \"`echo '$''{'ac_cv_search_wcscpy'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_func_search_save_LIBS="$LIBS" ac_cv_search_wcscpy="no" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2723: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_search_wcscpy="none required" else @@ -2725,7 +2730,7 @@ rm -f conftest* test "$ac_cv_search_wcscpy" = "no" && for i in wcs; do LIBS="-l$i $ac_func_search_save_LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2745: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_search_wcscpy="-l$i" break @@ -2768,12 +2773,12 @@ fi U_HAVE_NL_LANGINFO_CODESET=0 U_NL_LANGINFO_CODESET=-1 echo $ac_n "checking for nl_langinfo""... $ac_c" 1>&6 -echo "configure:2772: checking for nl_langinfo" >&5 +echo "configure:2777: checking for nl_langinfo" >&5 if eval "test \"`echo '$''{'ac_cv_func_nl_langinfo'+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:2805: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_nl_langinfo=yes" else @@ -2819,21 +2824,21 @@ fi if test $U_HAVE_NL_LANGINFO -eq 1; then echo $ac_n "checking for nl_langinfo's argument to obtain the codeset""... $ac_c" 1>&6 -echo "configure:2823: checking for nl_langinfo's argument to obtain the codeset" >&5 +echo "configure:2828: checking for nl_langinfo's argument to obtain the codeset" >&5 if eval "test \"`echo '$''{'ac_cv_nl_langinfo_codeset'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_cv_nl_langinfo_codeset="unknown" for a in CODESET _NL_CTYPE_CODESET_NAME; do cat > conftest.$ac_ext < int main() { nl_langinfo($a); ; return 0; } EOF -if { (eval echo configure:2837: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2842: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_nl_langinfo_codeset="$a"; break else @@ -2863,12 +2868,12 @@ cross_compiling=$ac_cv_prog_cxx_cross U_HAVE_NAMESPACE=0 echo $ac_n "checking for namespace support""... $ac_c" 1>&6 -echo "configure:2867: checking for namespace support" >&5 +echo "configure:2872: checking for namespace support" >&5 if eval "test \"`echo '$''{'ac_cv_namespace_ok'+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:2887: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_namespace_ok=yes else @@ -2906,12 +2911,12 @@ ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$a cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking for tzset""... $ac_c" 1>&6 -echo "configure:2910: checking for tzset" >&5 +echo "configure:2915: checking for tzset" >&5 if eval "test \"`echo '$''{'ac_cv_func_tzset'+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:2943: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_tzset=yes" else @@ -2958,12 +2963,12 @@ then U_TZSET=tzset else echo $ac_n "checking for _tzset""... $ac_c" 1>&6 -echo "configure:2962: checking for _tzset" >&5 +echo "configure:2967: checking for _tzset" >&5 if eval "test \"`echo '$''{'ac_cv_func__tzset'+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:2995: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func__tzset=yes" else @@ -3012,12 +3017,12 @@ fi fi echo $ac_n "checking for tzname""... $ac_c" 1>&6 -echo "configure:3016: checking for tzname" >&5 +echo "configure:3021: checking for tzname" >&5 if eval "test \"`echo '$''{'ac_cv_var_tzname'+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:3039: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_var_tzname=yes else @@ -3047,12 +3052,12 @@ if test $ac_cv_var_tzname = yes; then U_TZNAME=tzname else echo $ac_n "checking for _tzname""... $ac_c" 1>&6 -echo "configure:3051: checking for _tzname" >&5 +echo "configure:3056: checking for _tzname" >&5 if eval "test \"`echo '$''{'ac_cv_var__tzname'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < extern char *_tzname[]; @@ -3061,7 +3066,7 @@ int main() { atoi(*_tzname); ; return 0; } EOF -if { (eval echo configure:3065: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3070: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_var__tzname=yes else @@ -3081,12 +3086,12 @@ fi echo $ac_n "checking for timezone""... $ac_c" 1>&6 -echo "configure:3085: checking for timezone" >&5 +echo "configure:3090: checking for timezone" >&5 if eval "test \"`echo '$''{'ac_cv_var_timezone'+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:3109: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_var_timezone=yes else @@ -3119,12 +3124,12 @@ if test $ac_cv_var_timezone = yes; then U_HAVE_TIMEZONE=1 else echo $ac_n "checking for __timezone""... $ac_c" 1>&6 -echo "configure:3123: checking for __timezone" >&5 +echo "configure:3128: checking for __timezone" >&5 if eval "test \"`echo '$''{'ac_cv_var___timezone'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -3132,7 +3137,7 @@ int main() { __timezone = 1; ; return 0; } EOF -if { (eval echo configure:3136: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3141: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_var___timezone=yes else @@ -3150,12 +3155,12 @@ echo "$ac_t""$ac_cv_var___timezone" 1>&6 U_HAVE_TIMEZONE=1 else echo $ac_n "checking for _timezone""... $ac_c" 1>&6 -echo "configure:3154: checking for _timezone" >&5 +echo "configure:3159: checking for _timezone" >&5 if eval "test \"`echo '$''{'ac_cv_var__timezone'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -3163,7 +3168,7 @@ int main() { _timezone = 1; ; return 0; } EOF -if { (eval echo configure:3167: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3172: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_var__timezone=yes else @@ -3187,7 +3192,7 @@ fi ac_default_sizeof_wchar_t=4 echo $ac_n "checking size of wchar_t""... $ac_c" 1>&6 -echo "configure:3191: checking size of wchar_t" >&5 +echo "configure:3196: checking size of wchar_t" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_wchar_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3195,7 +3200,7 @@ else ac_cv_sizeof_wchar_t=$ac_default_sizeof_wchar_t else cat > conftest.$ac_ext < @@ -3212,7 +3217,7 @@ main() exit(0); } EOF -if { (eval echo configure:3216: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3221: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_wchar_t=`cat conftestval` else @@ -3235,12 +3240,12 @@ U_SIZEOF_WCHAR_T=$ac_cv_sizeof_wchar_t echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:3239: checking for ANSI C header files" >&5 +echo "configure:3244: 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 @@ -3248,7 +3253,7 @@ else #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3252: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3257: \"$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* @@ -3265,7 +3270,7 @@ rm -f conftest* if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -3283,7 +3288,7 @@ fi if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -3304,7 +3309,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -3315,7 +3320,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } EOF -if { (eval echo configure:3319: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3324: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -3339,12 +3344,12 @@ EOF fi echo $ac_n "checking for int8_t""... $ac_c" 1>&6 -echo "configure:3343: checking for int8_t" >&5 +echo "configure:3348: checking for int8_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_int8_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -3372,12 +3377,12 @@ EOF fi echo $ac_n "checking for uint8_t""... $ac_c" 1>&6 -echo "configure:3376: checking for uint8_t" >&5 +echo "configure:3381: checking for uint8_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_uint8_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -3405,12 +3410,12 @@ EOF fi echo $ac_n "checking for int16_t""... $ac_c" 1>&6 -echo "configure:3409: checking for int16_t" >&5 +echo "configure:3414: checking for int16_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_int16_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -3438,12 +3443,12 @@ EOF fi echo $ac_n "checking for uint16_t""... $ac_c" 1>&6 -echo "configure:3442: checking for uint16_t" >&5 +echo "configure:3447: checking for uint16_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_uint16_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -3471,12 +3476,12 @@ EOF fi echo $ac_n "checking for int32_t""... $ac_c" 1>&6 -echo "configure:3475: checking for int32_t" >&5 +echo "configure:3480: checking for int32_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_int32_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -3504,12 +3509,12 @@ EOF fi echo $ac_n "checking for uint32_t""... $ac_c" 1>&6 -echo "configure:3508: checking for uint32_t" >&5 +echo "configure:3513: checking for uint32_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_uint32_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -3537,12 +3542,12 @@ EOF fi echo $ac_n "checking for int64_t""... $ac_c" 1>&6 -echo "configure:3541: checking for int64_t" >&5 +echo "configure:3546: checking for int64_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_int64_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -3570,12 +3575,12 @@ EOF fi echo $ac_n "checking for uint64_t""... $ac_c" 1>&6 -echo "configure:3574: checking for uint64_t" >&5 +echo "configure:3579: checking for uint64_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_uint64_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -3793,7 +3798,7 @@ esac echo $ac_n "checking for a library suffix to use""... $ac_c" 1>&6 -echo "configure:3797: checking for a library suffix to use" >&5 +echo "configure:3802: checking for a library suffix to use" >&5 # Check whether --with-library-suffix or --without-library-suffix was given. if test "${with_library_suffix+set}" = set; then withval="$with_library_suffix" diff --git a/icu4c/source/configure.in b/icu4c/source/configure.in index 592d09f346..0284acbad8 100644 --- a/icu4c/source/configure.in +++ b/icu4c/source/configure.in @@ -4,7 +4,7 @@ dnl Copyright (c) 1999-2000, International Business Machines Corporation and dnl others. All Rights Reserved. dnl Stephen F. Booth, heavily modified by Yves and others -dnl $Id: configure.in,v 1.140 2001/11/28 04:10:53 grhoten-oss Exp $ +dnl $Id: configure.in,v 1.141 2001/11/29 00:29:20 grhoten-oss Exp $ dnl Process this file with autoconf to produce a configure script AC_INIT(common/unicode/utypes.h) @@ -68,7 +68,7 @@ AC_CHECK_PROG(AUTOCONF, autoconf, autoconf, true) AC_CHECK_PROG(STRIP, strip, strip, true) dnl Check for the platform make -AC_PATH_PROGS(U_MAKE, gmake, make) +AC_PATH_PROGS(U_MAKE, gmake gnumake, make) AC_SUBST(U_MAKE) dnl Check for doxygen to generate documentation @@ -88,11 +88,20 @@ AC_ARG_ENABLE(64bit-libs, [ENABLE_64BIT_LIBS=yes] ) AC_CACHE_CHECK([for 64-bit executable support], ac_cv_64bit_ok, - [ if test "$ENABLE_64BIT_LIBS" != no; then + [ if test "$ENABLE_64BIT_LIBS" = no; then + case "${host}" in + *-*-hpux*) + case "${CXX}" in + *CC) + CPPFLAGS="${CPPFLAGS} +DAportable" + ;; + esac;; + esac + else case "${host}" in *-*-solaris*) - SOL64=`$CXX -xarch=v9 && $CC -xarch=v9 2>&1 |grep -v usage:` - SPARCV9=`isainfo -n | grep sparcv9` + SOL64=`$CXX -xarch=v9 && $CC -xarch=v9 2>&1 | grep -v usage:` + SPARCV9=`isainfo -n 2>&1 | grep sparcv9` if test -z "$SOL64" && test -n "$SPARCV9"; then CPPFLAGS="${CPPFLAGS} -xtarget=ultra -xarch=v9" ENABLE_64BIT_LIBS=yes @@ -105,6 +114,9 @@ AC_CACHE_CHECK([for 64-bit executable support], ac_cv_64bit_ok, # AC_TRY_RUN(int main(void) {return 0;}, # ENABLE_64BIT_LIBS=yes, ENABLE_64BIT_LIBS=no, ENABLE_64BIT_LIBS=no) # ;; + *-*-hpux*) + ENABLE_64BIT_LIBS=unknown + ;; *) ENABLE_64BIT_LIBS=no ;; @@ -113,11 +125,9 @@ AC_CACHE_CHECK([for 64-bit executable support], ac_cv_64bit_ok, ac_cv_64bit_ok="${ENABLE_64BIT_LIBS}" ] ) -if test "$ENABLE_64BIT_LIBS" = no; then - CPPFLAGS="${OLD_CPPFLAGS}" -else - ENABLE_64BIT_LIBS="${ac_cv_64bit_ok}" -fi +# Don't reset the CPPFLAGS here because of HP/UX +# Individual tests that fail should reset it to OLD_CPPFLAGS. +ENABLE_64BIT_LIBS="${ac_cv_64bit_ok}" AC_SUBST(ENABLE_64BIT_LIBS) ICU_CHECK_MH_FRAG @@ -209,8 +219,7 @@ AC_SUBST(ENABLE_RPATH) dnl set up U_INLINE. dnl Copy the definition of AC_C_INLINE, with slight mods. dnl -AC_MSG_CHECKING([for definition of U_INLINE]) -AC_CACHE_CHECK([for inline], ac_cv_c_inline, +AC_CACHE_CHECK([for definition of U_INLINE for C], ac_cv_c_inline, [ac_cv_c_inline=no for ac_kw in inline __inline__ __inline; do AC_TRY_COMPILE(, [} $ac_kw foo() {], [ac_cv_c_inline=$ac_kw; break]) @@ -336,12 +345,11 @@ AC_CACHE_VAL(ac_cv_func_mmap_ok, #include #include #include -void uprv_mapFile(void) { - mmap((void *)0, 0, PROT_READ, 0, 0, 0); -} >>, changequote([, ])dnl - [uprv_mapFile();], ac_cv_func_mmap_ok=yes, ac_cv_func_mmap_ok=no)] ) + [mmap((void *)0, 0, PROT_READ, 0, 0, 0);], + ac_cv_func_mmap_ok=yes, + ac_cv_func_mmap_ok=no)] ) AC_MSG_RESULT($ac_cv_func_mmap_ok) if test $ac_cv_func_mmap_ok = yes then @@ -368,19 +376,19 @@ AC_SUBST(U_HAVE_INTTYPES_H) AC_ARG_WITH(iostream, [ --with-iostream=version specify the version of iostream to use (none, old, std, auto) [default=auto]], [case "${withval}" in - none) streams=none ;; + none) streams=none ;; old) streams=198506 ;; std) streams=199711 ;; - auto) streams= ;; + auto) streams= ;; *) AC_MSG_ERROR(bad value ${withval} for --with-iostream) ;; esac], [streams=]) +U_IOSTREAM_SOURCE=0 if test x$streams != xnone then AC_LANG_SAVE AC_LANG_CPLUSPLUS - U_IOSTREAM_SOURCE=0 AC_CHECK_HEADER(iostream) if test $ac_cv_header_iostream = yes then