From 8492d2095ebf6d2057c5547885ab646b460859c5 Mon Sep 17 00:00:00 2001 From: Eric Mader Date: Tue, 1 Jun 2004 22:55:03 +0000 Subject: [PATCH] ICU-3466 Clean up hdrtst, only work w/ installed ICU, add Makefile.in. X-SVN-Rev: 15665 --- icu4c/source/config/Makefile.inc.in | 4 - icu4c/source/configure | 371 +++++++++++++++----------- icu4c/source/configure.in | 1 + icu4c/source/test/hdrtst/Makefile | 108 +++----- icu4c/source/test/hdrtst/Makefile.in | 114 ++++++++ icu4c/source/test/hdrtst/cxxfiles.txt | 12 +- icu4c/source/test/hdrtst/pfiles.txt | 5 + 7 files changed, 383 insertions(+), 232 deletions(-) create mode 100644 icu4c/source/test/hdrtst/Makefile.in create mode 100644 icu4c/source/test/hdrtst/pfiles.txt diff --git a/icu4c/source/config/Makefile.inc.in b/icu4c/source/config/Makefile.inc.in index b8ce6a53b9..71eac41996 100644 --- a/icu4c/source/config/Makefile.inc.in +++ b/icu4c/source/config/Makefile.inc.in @@ -116,10 +116,6 @@ ICULIBS = $(ICULIBS_BASE) $(ICULIBS_I18N) $(ICULIBS_COMMON) $(ICULIBS_DATA) # (Overridden when necessary in -mh files) LDLIBRARYPATH_ENVVAR = LD_LIBRARY_PATH -# Versioned target for a shared library -FINAL_SO_TARGET = $(SO_TARGET).$(SO_TARGET_VERSION) -MIDDLE_SO_TARGET = $(SO_TARGET).$(SO_TARGET_VERSION_MAJOR) - # Access to important ICU tools. # Use as follows: $(INVOKE) $(GENRB) arguments .. INVOKE = $(LDLIBRARYPATH_ENVVAR)=$(libdir):$$$(LDLIBRARYPATH_ENVVAR) $(LEAK_CHECKER) diff --git a/icu4c/source/configure b/icu4c/source/configure index 5951d99689..7831146d4a 100755 --- a/icu4c/source/configure +++ b/icu4c/source/configure @@ -956,6 +956,57 @@ else fi fi +for ac_declaration in \ + ''\ + '#include ' \ + 'extern "C" void std::exit (int) throw (); using std::exit;' \ + 'extern "C" void std::exit (int); using std::exit;' \ + 'extern "C" void exit (int) throw ();' \ + 'extern "C" void exit (int);' \ + 'void exit (int);' +do + cat > conftest.$ac_ext < +$ac_declaration +int main() { +exit (42); +; return 0; } +EOF +if { (eval echo configure:978: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + : +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + continue +fi +rm -f conftest* + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + break +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 +fi +rm -f conftest* +done +if test -n "$ac_declaration"; then + echo '#ifdef __cplusplus' >>confdefs.h + echo $ac_declaration >>confdefs.h + echo '#endif' >>confdefs.h +fi + + ac_aux_dir= for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do if test -f $ac_dir/install-sh; then @@ -987,7 +1038,7 @@ ac_configure=$ac_aux_dir/configure # This should be Cygnus configure. # 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:991: checking for a BSD compatible install" >&5 +echo "configure:1042: 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 @@ -1052,7 +1103,7 @@ fi # 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:1056: checking for $ac_word" >&5 +echo "configure:1107: 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 @@ -1085,7 +1136,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:1089: checking for $ac_word" >&5 +echo "configure:1140: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_U_MAKE'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1126,7 +1177,7 @@ test -n "$U_MAKE" || U_MAKE="make" # Extract the first word of "doxygen", so it can be a program name with args. set dummy doxygen; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1130: checking for $ac_word" >&5 +echo "configure:1181: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_DOXYGEN'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1166,7 +1217,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:1170: checking host system type" >&5 +echo "configure:1221: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -1187,12 +1238,12 @@ host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` echo "$ac_t""$host" 1>&6 echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6 -echo "configure:1191: checking for Cygwin environment" >&5 +echo "configure:1242: checking for Cygwin environment" >&5 if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1258: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cygwin=yes else @@ -1220,19 +1271,19 @@ echo "$ac_t""$ac_cv_cygwin" 1>&6 CYGWIN= test "$ac_cv_cygwin" = yes && CYGWIN=yes echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6 -echo "configure:1224: checking for mingw32 environment" >&5 +echo "configure:1275: checking for mingw32 environment" >&5 if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1287: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_mingw32=yes else @@ -1251,7 +1302,7 @@ test "$ac_cv_mingw32" = yes && MINGW32=yes echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:1255: checking for executable suffix" >&5 +echo "configure:1306: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1261,7 +1312,7 @@ else rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= - if { (eval echo configure:1265: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + if { (eval echo configure:1316: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in *.c | *.o | *.obj) ;; @@ -1284,7 +1335,7 @@ ac_exeext=$EXEEXT echo $ac_n "checking whether strict compiling is on""... $ac_c" 1>&6 -echo "configure:1288: checking whether strict compiling is on" >&5 +echo "configure:1339: checking whether strict compiling is on" >&5 # Check whether --enable-strict or --disable-strict was given. if test "${enable_strict+set}" = set; then enableval="$enable_strict" @@ -1350,7 +1401,7 @@ else fi echo $ac_n "checking for 64-bit executable support""... $ac_c" 1>&6 -echo "configure:1354: checking for 64-bit executable support" >&5 +echo "configure:1405: checking for 64-bit executable support" >&5 if test "$ENABLE_64BIT_LIBS" = no; then case "${host}" in *-*-hpux*) @@ -1427,11 +1478,11 @@ echo "configure:1354: checking for 64-bit executable support" >&5 ENABLE_64BIT_LIBS=no 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:1486: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ENABLE_64BIT_LIBS=yes else @@ -1462,11 +1513,11 @@ fi ENABLE_64BIT_LIBS=no 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:1521: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ENABLE_64BIT_LIBS=yes else @@ -1487,11 +1538,11 @@ fi ENABLE_64BIT_LIBS=no 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:1546: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ENABLE_64BIT_LIBS=yes else @@ -1521,7 +1572,7 @@ fi echo $ac_n "checking which Makefile fragment to use""... $ac_c" 1>&6 -echo "configure:1525: checking which Makefile fragment to use" >&5 +echo "configure:1576: 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 @@ -1587,7 +1638,7 @@ echo "$ac_t""$icu_cv_host_frag" 1>&6 case "${host}" in *-*-hpux*) echo $ac_n "checking for floor in -lm""... $ac_c" 1>&6 -echo "configure:1591: checking for floor in -lm" >&5 +echo "configure:1642: 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 @@ -1595,7 +1646,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:1661: \"$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 @@ -1628,7 +1679,7 @@ fi ;; *) echo $ac_n "checking for floor in -lm""... $ac_c" 1>&6 -echo "configure:1632: checking for floor in -lm" >&5 +echo "configure:1683: 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 @@ -1636,7 +1687,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:1702: \"$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 @@ -1679,7 +1730,7 @@ esac echo $ac_n "checking whether to build shared libraries""... $ac_c" 1>&6 -echo "configure:1683: checking whether to build shared libraries" >&5 +echo "configure:1734: 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 @@ -1698,7 +1749,7 @@ echo "$ac_t""$enabled" 1>&6 echo $ac_n "checking whether to build static libraries""... $ac_c" 1>&6 -echo "configure:1702: checking whether to build static libraries" >&5 +echo "configure:1753: 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 @@ -1714,7 +1765,7 @@ echo "$ac_t""$enabled" 1>&6 echo $ac_n "checking whether to build debug libraries""... $ac_c" 1>&6 -echo "configure:1718: checking whether to build debug libraries" >&5 +echo "configure:1769: checking whether to build debug libraries" >&5 enabled=no ENABLE_DEBUG=0 # Check whether --enable-debug or --disable-debug was given. @@ -1730,7 +1781,7 @@ echo "$ac_t""$enabled" 1>&6 echo $ac_n "checking whether to build release libraries""... $ac_c" 1>&6 -echo "configure:1734: checking whether to build release libraries" >&5 +echo "configure:1785: checking whether to build release libraries" >&5 enabled=yes ENABLE_RELEASE=1 # Check whether --enable-release or --disable-release was given. @@ -1748,7 +1799,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:1752: checking for $ac_word" >&5 +echo "configure:1803: 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 @@ -1778,7 +1829,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:1782: checking for $ac_word" >&5 +echo "configure:1833: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_AR'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1813,7 +1864,7 @@ fi echo $ac_n "checking whether to enable renaming of symbols""... $ac_c" 1>&6 -echo "configure:1817: checking whether to enable renaming of symbols" >&5 +echo "configure:1868: checking whether to enable renaming of symbols" >&5 enabled=yes U_DISABLE_RENAMING=0 # Check whether --enable-renaming or --disable-renaming was given. @@ -1830,7 +1881,7 @@ echo "$ac_t""$enabled" 1>&6 echo $ac_n "checking whether to enable function and data tracing""... $ac_c" 1>&6 -echo "configure:1834: checking whether to enable function and data tracing" >&5 +echo "configure:1885: checking whether to enable function and data tracing" >&5 enabled=yes U_ENABLE_TRACING=1 # Check whether --enable-tracing or --disable-tracing was given. @@ -1863,21 +1914,21 @@ fi echo $ac_n "checking for definition of U_INLINE for C""... $ac_c" 1>&6 -echo "configure:1867: checking for definition of U_INLINE for C" >&5 +echo "configure:1918: 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:1932: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_inline=$ac_kw; break else @@ -1923,7 +1974,7 @@ ICU_USE_THREADS=0 if test $threads = true; then echo $ac_n "checking for pthread_attr_init in -lpthread""... $ac_c" 1>&6 -echo "configure:1927: checking for pthread_attr_init in -lpthread" >&5 +echo "configure:1978: 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 @@ -1931,7 +1982,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:1997: \"$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 @@ -1975,7 +2026,7 @@ fi echo $ac_n "checking for library containing pthread_mutex_destroy""... $ac_c" 1>&6 -echo "configure:1979: checking for library containing pthread_mutex_destroy" >&5 +echo "configure:2030: 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 @@ -1984,7 +2035,7 @@ ac_cv_search_pthread_mutex_destroy="no" for i in pthread pthreads c_r ; 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:2050: \"$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 @@ -2007,7 +2058,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:2073: \"$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 @@ -2042,7 +2093,7 @@ fi ICU_USE_THREADS=1 else echo $ac_n "checking for pthread_mutex_init in -lpthread""... $ac_c" 1>&6 -echo "configure:2046: checking for pthread_mutex_init in -lpthread" >&5 +echo "configure:2097: 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 @@ -2050,7 +2101,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:2116: \"$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 @@ -2094,12 +2145,12 @@ fi fi echo $ac_n "checking for pthread_mutex_lock""... $ac_c" 1>&6 -echo "configure:2098: checking for pthread_mutex_lock" >&5 +echo "configure:2149: 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:2177: \"$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 @@ -2172,12 +2223,12 @@ fi # Do this check instead. HAVE_MMAP=0 echo $ac_n "checking for mmap""... $ac_c" 1>&6 -echo "configure:2176: checking for mmap" >&5 +echo "configure:2227: 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 < @@ -2189,7 +2240,7 @@ int main() { mmap((void *)0, 0, PROT_READ, 0, 0, 0); ; return 0; } EOF -if { (eval echo configure:2193: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2244: \"$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 @@ -2216,7 +2267,7 @@ fi echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:2220: checking how to run the C preprocessor" >&5 +echo "configure:2271: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -2231,13 +2282,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:2241: \"$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 : @@ -2248,13 +2299,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:2258: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2309: \"$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 : @@ -2265,13 +2316,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:2275: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2326: \"$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 : @@ -2299,17 +2350,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:2303: checking for $ac_hdr" >&5 +echo "configure:2354: 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:2313: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2364: \"$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* @@ -2382,16 +2433,16 @@ cross_compiling=$ac_cv_prog_cxx_cross ;; esac echo $ac_n "checking iostream usability""... $ac_c" 1>&6 -echo "configure:2386: checking iostream usability" >&5 +echo "configure:2437: checking iostream usability" >&5 cat > conftest.$ac_ext < int main() { ; return 0; } EOF -if { (eval echo configure:2395: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2446: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_iostream=yes else @@ -2412,7 +2463,7 @@ rm -f conftest* else CXXFLAGS="${OLD_CXXFLAGS}" echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6 -echo "configure:2416: checking how to run the C++ preprocessor" >&5 +echo "configure:2467: 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 @@ -2425,12 +2476,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:2434: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2485: \"$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 : @@ -2456,17 +2507,17 @@ echo "$ac_t""$CXXCPP" 1>&6 ac_safe=`echo "iostream.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for iostream.h""... $ac_c" 1>&6 -echo "configure:2460: checking for iostream.h" >&5 +echo "configure:2511: 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:2470: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2521: \"$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* @@ -2489,19 +2540,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:2493: checking whether ostream is really defined" >&5 +echo "configure:2544: 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:2505: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2556: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_iostream_ok=yes else @@ -2547,14 +2598,14 @@ cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6 -echo "configure:2551: checking whether byte ordering is bigendian" >&5 +echo "configure:2602: 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 @@ -2565,11 +2616,11 @@ int main() { #endif ; return 0; } EOF -if { (eval echo configure:2569: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2620: \"$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 @@ -2580,7 +2631,7 @@ int main() { #endif ; return 0; } EOF -if { (eval echo configure:2584: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2635: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_bigendian=yes else @@ -2600,7 +2651,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:2668: \"$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 @@ -2648,12 +2699,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:2652: checking for nl_langinfo" >&5 +echo "configure:2703: 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:2731: \"$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 @@ -2699,21 +2750,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:2703: checking for nl_langinfo's argument to obtain the codeset" >&5 +echo "configure:2754: 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:2717: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2768: \"$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 @@ -2742,12 +2793,12 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross echo $ac_n "checking for namespace support""... $ac_c" 1>&6 -echo "configure:2746: checking for namespace support" >&5 +echo "configure:2797: 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:2812: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_namespace_ok=yes else @@ -2778,14 +2829,14 @@ fi echo $ac_n "checking for properly overriding new and delete""... $ac_c" 1>&6 -echo "configure:2782: checking for properly overriding new and delete" >&5 +echo "configure:2833: checking for properly overriding new and delete" >&5 U_OVERRIDE_CXX_ALLOCATION=0 U_HAVE_PLACEMENT_NEW=0 if eval "test \"`echo '$''{'ac_cv_override_cxx_allocation_ok'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < class UObject { @@ -2799,7 +2850,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:2803: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2854: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_override_cxx_allocation_ok=yes else @@ -2816,12 +2867,12 @@ if test $ac_cv_override_cxx_allocation_ok = yes then U_OVERRIDE_CXX_ALLOCATION=1 echo $ac_n "checking for placement new and delete""... $ac_c" 1>&6 -echo "configure:2820: checking for placement new and delete" >&5 +echo "configure:2871: checking for placement new and delete" >&5 if eval "test \"`echo '$''{'ac_cv_override_placement_new_ok'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < class UObject { @@ -2837,7 +2888,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:2841: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2892: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_override_placement_new_ok=yes else @@ -2866,12 +2917,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 popen""... $ac_c" 1>&6 -echo "configure:2870: checking for popen" >&5 +echo "configure:2921: checking for popen" >&5 if eval "test \"`echo '$''{'ac_cv_func_popen'+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:2949: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_popen=yes" else @@ -2922,12 +2973,12 @@ fi echo $ac_n "checking for tzset""... $ac_c" 1>&6 -echo "configure:2926: checking for tzset" >&5 +echo "configure:2977: 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:3005: \"$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 @@ -2974,12 +3025,12 @@ then U_TZSET=tzset else echo $ac_n "checking for _tzset""... $ac_c" 1>&6 -echo "configure:2978: checking for _tzset" >&5 +echo "configure:3029: 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:3057: \"$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 @@ -3028,12 +3079,12 @@ fi fi echo $ac_n "checking for tzname""... $ac_c" 1>&6 -echo "configure:3032: checking for tzname" >&5 +echo "configure:3083: 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:3101: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_var_tzname=yes else @@ -3063,12 +3114,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:3067: checking for _tzname" >&5 +echo "configure:3118: 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[]; @@ -3077,7 +3128,7 @@ int main() { atoi(*_tzname); ; return 0; } EOF -if { (eval echo configure:3081: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3132: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_var__tzname=yes else @@ -3097,12 +3148,12 @@ fi echo $ac_n "checking for timezone""... $ac_c" 1>&6 -echo "configure:3101: checking for timezone" >&5 +echo "configure:3152: 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:3171: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_var_timezone=yes else @@ -3135,12 +3186,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:3139: checking for __timezone" >&5 +echo "configure:3190: 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 < @@ -3148,7 +3199,7 @@ int main() { __timezone = 1; ; return 0; } EOF -if { (eval echo configure:3152: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3203: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_var___timezone=yes else @@ -3166,12 +3217,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:3170: checking for _timezone" >&5 +echo "configure:3221: 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 < @@ -3179,7 +3230,7 @@ int main() { _timezone = 1; ; return 0; } EOF -if { (eval echo configure:3183: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3234: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_var__timezone=yes else @@ -3202,12 +3253,12 @@ fi echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:3206: checking for ANSI C header files" >&5 +echo "configure:3257: 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 @@ -3215,7 +3266,7 @@ else #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3219: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3270: \"$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* @@ -3232,7 +3283,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 @@ -3250,7 +3301,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 @@ -3271,7 +3322,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -3282,7 +3333,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } EOF -if { (eval echo configure:3286: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3337: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -3306,12 +3357,12 @@ EOF fi echo $ac_n "checking for int8_t""... $ac_c" 1>&6 -echo "configure:3310: checking for int8_t" >&5 +echo "configure:3361: 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 @@ -3339,12 +3390,12 @@ EOF fi echo $ac_n "checking for uint8_t""... $ac_c" 1>&6 -echo "configure:3343: checking for uint8_t" >&5 +echo "configure:3394: 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 @@ -3372,12 +3423,12 @@ EOF fi echo $ac_n "checking for int16_t""... $ac_c" 1>&6 -echo "configure:3376: checking for int16_t" >&5 +echo "configure:3427: 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 @@ -3405,12 +3456,12 @@ EOF fi echo $ac_n "checking for uint16_t""... $ac_c" 1>&6 -echo "configure:3409: checking for uint16_t" >&5 +echo "configure:3460: 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 @@ -3438,12 +3489,12 @@ EOF fi echo $ac_n "checking for int32_t""... $ac_c" 1>&6 -echo "configure:3442: checking for int32_t" >&5 +echo "configure:3493: 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 @@ -3471,12 +3522,12 @@ EOF fi echo $ac_n "checking for uint32_t""... $ac_c" 1>&6 -echo "configure:3475: checking for uint32_t" >&5 +echo "configure:3526: 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 @@ -3504,12 +3555,12 @@ EOF fi echo $ac_n "checking for int64_t""... $ac_c" 1>&6 -echo "configure:3508: checking for int64_t" >&5 +echo "configure:3559: 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 @@ -3537,12 +3588,12 @@ EOF fi echo $ac_n "checking for uint64_t""... $ac_c" 1>&6 -echo "configure:3541: checking for uint64_t" >&5 +echo "configure:3592: 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 @@ -3628,17 +3679,17 @@ fi ac_safe=`echo "wchar.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for wchar.h""... $ac_c" 1>&6 -echo "configure:3632: checking for wchar.h" >&5 +echo "configure:3683: 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:3642: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3693: \"$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* @@ -3671,14 +3722,14 @@ EOF U_HAVE_WCHAR_H=1 echo $ac_n "checking for library containing wcscpy""... $ac_c" 1>&6 -echo "configure:3675: checking for library containing wcscpy" >&5 +echo "configure:3726: 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:3744: \"$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 @@ -3700,7 +3751,7 @@ rm -f conftest* test "$ac_cv_search_wcscpy" = "no" && for i in wcs w; 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:3766: \"$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 @@ -3742,7 +3793,7 @@ fi ac_default_sizeof_wchar_t=4 echo $ac_n "checking size of wchar_t""... $ac_c" 1>&6 -echo "configure:3746: checking size of wchar_t" >&5 +echo "configure:3797: 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 @@ -3750,7 +3801,7 @@ else ac_cv_sizeof_wchar_t=$ac_default_sizeof_wchar_t else cat > conftest.$ac_ext < @@ -3768,7 +3819,7 @@ main() exit(0); } EOF -if { (eval echo configure:3772: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3823: \"$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 @@ -3935,7 +3986,7 @@ esac echo $ac_n "checking for a library suffix to use""... $ac_c" 1>&6 -echo "configure:3939: checking for a library suffix to use" >&5 +echo "configure:3990: 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" @@ -4216,6 +4267,7 @@ trap 'rm -fr `echo "icudefs.mk \ tools/toolutil/Makefile \ tools/dumpce/Makefile \ test/Makefile test/testdata/Makefile \ + test/hdrtst/Makefile \ test/intltest/Makefile \ test/cintltst/Makefile \ test/iotest/Makefile \ @@ -4410,6 +4462,7 @@ CONFIG_FILES=\${CONFIG_FILES-"icudefs.mk \ tools/toolutil/Makefile \ tools/dumpce/Makefile \ test/Makefile test/testdata/Makefile \ + test/hdrtst/Makefile \ test/intltest/Makefile \ test/cintltst/Makefile \ test/iotest/Makefile \ diff --git a/icu4c/source/configure.in b/icu4c/source/configure.in index fb9cd656e5..a7a0388e7b 100644 --- a/icu4c/source/configure.in +++ b/icu4c/source/configure.in @@ -981,6 +981,7 @@ AC_OUTPUT([icudefs.mk \ tools/toolutil/Makefile \ tools/dumpce/Makefile \ test/Makefile test/testdata/Makefile \ + test/hdrtst/Makefile \ test/intltest/Makefile \ test/cintltst/Makefile \ test/iotest/Makefile \ diff --git a/icu4c/source/test/hdrtst/Makefile b/icu4c/source/test/hdrtst/Makefile index f768129001..55557fc015 100644 --- a/icu4c/source/test/hdrtst/Makefile +++ b/icu4c/source/test/hdrtst/Makefile @@ -1,43 +1,40 @@ -# -# Copyright (c) 1999-2003, International Business Machines Corporation and -# others. All Rights Reserved. -# -# -# THE PURPOSE OF THIS TEST -# -# This tests all public header files ( -# -# To run it simply type 'make check'. You SHOULD see: -# -# unicode/uchar.h - 0 -# unicode/uchriter.h - 0 -# unicode/ucnv.h - 0 -# -# .. etc. Anything other than zero is an error. (except for the deprecation tests, where '1' is the correct value) -# -# -# If a header fails the C compile because it's a C++ header, add it to the -# file named 'cxxfiles.txt' in this directory. -# -# If a header fails because it is deprecated, add it to the 'dfiles.txt' -# -# +# Generated automatically from Makefile.in by configure. +## +## Copyright (c) 1999-2004, International Business Machines Corporation and +## others. All Rights Reserved. +## +## +## THE PURPOSE OF THIS TEST +## +## This tests all public header files ( +## +## To run it simply type 'make check'. You SHOULD see: +## +## unicode/uchar.h - 0 +## unicode/uchriter.h - 0 +## unicode/ucnv.h - 0 +## +## .. etc. Anything other than zero is an error. (except for the deprecation tests, where '1' is the correct value) +## +## +## If a header fails the C compile because it's a C++ header, add it to the +## file named 'cxxfiles.txt' in this directory. +## +## If a header fails because it is deprecated, add it to the 'dfiles.txt' +## +## -ifeq ($(USE_ICU_CONFIG),1) - include $(shell icu-config --incfile) - DIRS=$(shell icu-config --prefix)/include/unicode - LDIRS=$(shell icu-config --prefix)/include/layout -else - include ../../config/Makefile.inc - DIRS=../../../common/unicode ../../../i18n/unicode ../../../extra/ustdio/unicode - LDIRS=../../../layout/layout ../../../layoutex/layout -endif + +include $(shell icu-config --incfile) +srcdir=. +DIRS=$(prefix)/include/unicode +LDIRS=$(prefix)/include/layout all: @echo Please read this Makefile for more information. @echo run \'$(MAKE) check\' to run the test -check: hdrdir lodir dtest ctest cpptest lotest doclean +check: dtest ctest cpptest lotest doclean @echo "All header tests have finished. If deprecation #errors appeared, " @echo " add files to hdrtst/dfiles.txt" @echo "#################################################################" @@ -47,41 +44,17 @@ check: hdrdir lodir dtest ctest cpptest lotest doclean doclean: make clean -#layout not tested due to path dependencies - -hdrdir: - @echo CPPFLAGS are $(CPPFLAGS) - @-$(RMV) ./unicode - @mkdir ./unicode - @echo Preparing unicode/ directory .. - @cd ./unicode ; \ - for dir in $(DIRS); do \ - echo "linking from " $$dir '(' `ls $$dir/*.h | wc -l` 'headers )' ; \ - ln -s $$dir/*.h . ; \ - done - rm unicode/pwin32.h - -lodir: - @-$(RMV) ./layout - @mkdir ./layout - @echo Preparing layout/ directory .. - @cd ./layout ; \ - for dir in $(LDIRS); do \ - echo "linking from " $$dir '(' `ls $$dir/*.h | wc -l` 'headers )' ; \ - ln -s $$dir/*.h . ; \ - done - cpptest: @echo "C++ test #######################################################" @rm -f Makefile.sub @echo 'Testing all header files under C++' @echo 'the number after the hyphen (-) refers to the exit code - should be zero!' - @for file in unicode/*.h; do \ + @for file in `ls $(prefix)/include/unicode/*.h | fgrep -v -f $(srcdir)/pfiles.txt`; do \ incfile=`basename $$file .h` ; \ echo -n "C++ unicode/$$incfile.h - " ; \ echo '#include "'unicode/$$incfile'.h"' > ht_$$incfile.cpp ; \ echo 'void junk(){}' >> ht_$$incfile.cpp ; \ - $(COMPILE.cc) -c -I. ht_$$incfile.cpp ; \ + $(COMPILE.cc) -c $(cppflags) ht_$$incfile.cpp ; \ echo $$? ; \ done @@ -90,12 +63,12 @@ lotest: @rm -f Makefile.sub @echo 'Testing all layout files under C++' @echo 'the number after the hyphen (-) refers to the exit code - should be zero!' - @for file in layout/*.h; do \ + @for file in $(prefix)/include/layout/*.h; do \ incfile=`basename $$file .h` ; \ echo -n "C++ layout/$$incfile.h - " ; \ echo '#include "'layout/$$incfile'.h"' > ht_$$incfile.cpp ; \ echo 'void junk(){}' >> ht_$$incfile.cpp ; \ - $(COMPILE.cc) -c -I. ht_$$incfile.cpp ; \ + $(COMPILE.cc) -c $(cppflags) -I$(prefix)/include/layout ht_$$incfile.cpp ; \ echo $$? ; \ done @@ -103,14 +76,14 @@ dtest: @rm -f Makefile.sub @echo "Deprecation #######################################################" @echo 'Should be 1 in each case if file is properly obsoleted.' - @for stub in `cat dfiles.txt | grep -v '^#'` ; do \ + @for stub in `cat $(srcdir)/dfiles.txt | grep -v '^#'` ; do \ file=unicode/$$stub \ incfile=`basename $$file .h` ; \ echo -n "C++ unicode/$$incfile.h - " ; \ echo '#include "'unicode/$$incfile'.h"' > ht_$$incfile.cpp ; \ echo 'void junk(){}' >> ht_$$incfile.cpp ; \ echo > ht_dep.junk ; \ - $(COMPILE.cc) -c -I. ht_$$incfile.cpp 2>&1 | sed -e 's/^.*#error[^"]*"//' | fgrep -v ht_ | tee ht_dep.junk | fgrep -v "$$incfile.h header is obsolete" ; \ + $(COMPILE.cc) -c $(cppflags) ht_$$incfile.cpp 2>&1 | sed -e 's/^.*#error[^"]*"//' | fgrep -v ht_ | tee ht_dep.junk | fgrep -v "$$incfile.h header is obsolete" ; \ RES=$$? ; \ echo $$RES ; \ fgrep -q "$$incfile.h header is obsolete" ht_dep.junk || echo "** FAIL Header unicode/$$incfile.h is not obsoleted properly" ; \ @@ -126,18 +99,17 @@ ctest: @rm -f Makefile.sub @echo Building test harness for header files in ../../common and ../../i18n @echo 'the number after the hyphen (-) refers to the exit code - should be zero!' - @for file in `ls unicode/*.h | fgrep -v -f ./cxxfiles.txt | tee cfiles.txt`; do \ + @for file in `ls $(prefix)/include/unicode/*.h | fgrep -v -f $(srcdir)/cxxfiles.txt | tee cfiles.txt`; do \ incfile=`basename $$file .h` ; \ echo -n "C unicode/$$incfile.h - " ; \ echo '#include "'unicode/$$incfile'.h"' > ht_$$incfile.c ; \ + echo 'void junk(void);' >> ht_$$incfile.c ; \ echo 'void junk(){}' >> ht_$$incfile.c ; \ - $(COMPILE.c) -c -I. ht_$$incfile.c ; \ + $(COMPILE.c) -c $(cppflags) ht_$$incfile.c ; \ RES=$$? ; \ echo $$RES ; \ done distclean clean: -@rm -f *.h *.c *.cpp *.o *.junk - -@$(RMV) ./unicode - -@$(RMV) ./layout diff --git a/icu4c/source/test/hdrtst/Makefile.in b/icu4c/source/test/hdrtst/Makefile.in new file mode 100644 index 0000000000..e0eaee2d80 --- /dev/null +++ b/icu4c/source/test/hdrtst/Makefile.in @@ -0,0 +1,114 @@ +## +## Copyright (c) 1999-2004, International Business Machines Corporation and +## others. All Rights Reserved. +## +## +## THE PURPOSE OF THIS TEST +## +## This tests all public header files ( +## +## To run it simply type 'make check'. You SHOULD see: +## +## unicode/uchar.h - 0 +## unicode/uchriter.h - 0 +## unicode/ucnv.h - 0 +## +## .. etc. Anything other than zero is an error. (except for the deprecation tests, where '1' is the correct value) +## +## +## If a header fails the C compile because it's a C++ header, add it to the +## file named 'cxxfiles.txt' in this directory. +## +## If a header fails because it is deprecated, add it to the 'dfiles.txt' +## +## + + +include $(shell icu-config --incfile) +srcdir=@srcdir@ +DIRS=$(prefix)/include/unicode +LDIRS=$(prefix)/include/layout + +all: + @echo Please read this Makefile for more information. + @echo run \'$(MAKE) check\' to run the test + +check: dtest ctest cpptest lotest doclean + @echo "All header tests have finished. If deprecation #errors appeared, " + @echo " add files to hdrtst/dfiles.txt" + @echo "#################################################################" + @echo + +# break dependency +doclean: + make clean + +cpptest: + @echo "C++ test #######################################################" + @rm -f Makefile.sub + @echo 'Testing all header files under C++' + @echo 'the number after the hyphen (-) refers to the exit code - should be zero!' + @for file in `ls $(prefix)/include/unicode/*.h | fgrep -v -f $(srcdir)/pfiles.txt`; do \ + incfile=`basename $$file .h` ; \ + echo -n "C++ unicode/$$incfile.h - " ; \ + echo '#include "'unicode/$$incfile'.h"' > ht_$$incfile.cpp ; \ + echo 'void junk(){}' >> ht_$$incfile.cpp ; \ + $(COMPILE.cc) -c $(cppflags) ht_$$incfile.cpp ; \ + echo $$? ; \ + done + +lotest: + @echo "Layout test #######################################################" + @rm -f Makefile.sub + @echo 'Testing all layout files under C++' + @echo 'the number after the hyphen (-) refers to the exit code - should be zero!' + @for file in $(prefix)/include/layout/*.h; do \ + incfile=`basename $$file .h` ; \ + echo -n "C++ layout/$$incfile.h - " ; \ + echo '#include "'layout/$$incfile'.h"' > ht_$$incfile.cpp ; \ + echo 'void junk(){}' >> ht_$$incfile.cpp ; \ + $(COMPILE.cc) -c $(cppflags) -I$(prefix)/include/layout ht_$$incfile.cpp ; \ + echo $$? ; \ + done + +dtest: + @rm -f Makefile.sub + @echo "Deprecation #######################################################" + @echo 'Should be 1 in each case if file is properly obsoleted.' + @for stub in `cat $(srcdir)/dfiles.txt | grep -v '^#'` ; do \ + file=unicode/$$stub \ + incfile=`basename $$file .h` ; \ + echo -n "C++ unicode/$$incfile.h - " ; \ + echo '#include "'unicode/$$incfile'.h"' > ht_$$incfile.cpp ; \ + echo 'void junk(){}' >> ht_$$incfile.cpp ; \ + echo > ht_dep.junk ; \ + $(COMPILE.cc) -c $(cppflags) ht_$$incfile.cpp 2>&1 | sed -e 's/^.*#error[^"]*"//' | fgrep -v ht_ | tee ht_dep.junk | fgrep -v "$$incfile.h header is obsolete" ; \ + RES=$$? ; \ + echo $$RES ; \ + fgrep -q "$$incfile.h header is obsolete" ht_dep.junk || echo "** FAIL Header unicode/$$incfile.h is not obsoleted properly" ; \ + rm -f unicode/$$stub ; \ + done + +# < ht_dep.junk && ; \ + + +ctest: + @echo "C Test #######################################################" + @echo " (if any C++ files show up here, stop the test and add them to hdrtst/cxxfiles.txt) " + @rm -f Makefile.sub + @echo Building test harness for header files in ../../common and ../../i18n + @echo 'the number after the hyphen (-) refers to the exit code - should be zero!' + @for file in `ls $(prefix)/include/unicode/*.h | fgrep -v -f $(srcdir)/cxxfiles.txt | tee cfiles.txt`; do \ + incfile=`basename $$file .h` ; \ + echo -n "C unicode/$$incfile.h - " ; \ + echo '#include "'unicode/$$incfile'.h"' > ht_$$incfile.c ; \ + echo 'void junk(void);' >> ht_$$incfile.c ; \ + echo 'void junk(){}' >> ht_$$incfile.c ; \ + $(COMPILE.c) -c $(cppflags) ht_$$incfile.c ; \ + RES=$$? ; \ + echo $$RES ; \ + done + +distclean clean: + -@rm -f *.h *.c *.cpp *.o *.junk + diff --git a/icu4c/source/test/hdrtst/cxxfiles.txt b/icu4c/source/test/hdrtst/cxxfiles.txt index ea433f56f5..87e2fc2216 100644 --- a/icu4c/source/test/hdrtst/cxxfiles.txt +++ b/icu4c/source/test/hdrtst/cxxfiles.txt @@ -1,4 +1,4 @@ -# Copyright (c) 2001-2003 International Business Machines +# Copyright (c) 2001-2004 International Business Machines # Corporation and others. All Rights Reserved. bidi.h brkiter.h @@ -69,3 +69,13 @@ LESwaps.h LETypes.h ParagraphLayout.h RunArrays.h +# currency... +curramt.h +currunit.h +measfmt.h +measunit.h +measure.h +# platform specific +pmacos.h +pos400.h +pwin32.h diff --git a/icu4c/source/test/hdrtst/pfiles.txt b/icu4c/source/test/hdrtst/pfiles.txt new file mode 100644 index 0000000000..5415909d03 --- /dev/null +++ b/icu4c/source/test/hdrtst/pfiles.txt @@ -0,0 +1,5 @@ +# Copyright (c) 2001-2004 International Business Machines +# Corporation and others. All Rights Reserved. +pmacos.h +pos400.h +pwin32.h