diff --git a/icu4c/source/aclocal.m4 b/icu4c/source/aclocal.m4 index 28c6d739c56..722ab6bdb19 100644 --- a/icu4c/source/aclocal.m4 +++ b/icu4c/source/aclocal.m4 @@ -38,7 +38,8 @@ case "${host}" in esac;; *-*-os390*) icu_cv_host_frag=$srcdir/config/mh-os390 ;; *-*-os400*) icu_cv_host_frag=$srcdir/config/mh-os400 ;; -*-apple-rhapsody*) icu_cv_host_frag=$srcdir/config/mh-rhapsody ;; +*-apple-rhapsody*) icu_cv_host_frag=$srcdir/config/mh-darwin ;; +*-apple-darwin*) icu_cv_host_frag=$srcdir/config/mh-darwin ;; *) icu_cv_host_frag=$srcdir/config/mh-unknown ;; esac ] diff --git a/icu4c/source/config/mh-darwin b/icu4c/source/config/mh-darwin new file mode 100644 index 00000000000..fd8a8f9d5af --- /dev/null +++ b/icu4c/source/config/mh-darwin @@ -0,0 +1,72 @@ +## -*-makefile-*- +## Darwin-specific setup (Darwin is the Mac OS X developer preview, successor +## to Rhapsody, aka Mac OS X Server) +## Copyright (c) 1999-2000, International Business Machines Corporation and +## others. All Rights Reserved. + +## Commands to generate dependency files +GEN_DEPS.c= $(CC) -E -MM $(DEFS) $(CPPFLAGS) +GEN_DEPS.cc= $(CXX) -E -MM $(DEFS) $(CPPFLAGS) + +## Commands to compile +COMPILE.c= $(CC) $(DEFS) $(CPPFLAGS) $(CFLAGS) -dynamic -c +COMPILE.cc= $(CXX) $(DEFS) $(CPPFLAGS) $(CXXFLAGS) -dynamic -c + +## Extra commands to build and link +LIBTOOL= /usr/bin/libtool + +## Commands to link +LINK.c= $(LIBTOOL) $(LDFLAGS) -static +LINK.cc= $(LIBTOOL) $(LDFLAGS) -static + +## Commands to make a shared library +SHLIB.c= $(LIBTOOL) $(LDFLAGS) -dynamic +#SHLIB.cc= $(CXX) $(DEFS) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -dynamic +SHLIB.cc= $(LIBTOOL) $(LDFLAGS) -dynamic + +## Compiler switch to embed a runtime search path +LD_RPATH= +LD_RPATH_PRE= -Wl,-rpath, + +### How ICU libraries are named... ex. $(LIBICU)uc$(SO) +## Prefix for the ICU library names +LIBICU = libicu- +## Shared object suffix +SO= dylib + +## Force removal [for make clean] +RMV = rm -rf +## Platform command to move executable target +INSTALL-S = $(INSTALL) + +## Link commands to link to ICU libs +LIBICU-UC= -L$(top_builddir)/common -licu-uc +LIBICU-I18N= -L$(top_builddir)/i18n -licu-i18n +LIBCTESTFW= -L$(top_builddir)/tools/ctestfw -lctestfw +LIBICU-TOOLUTIL=-L$(top_builddir)/tools/toolutil -licu-toolutil +LIBUSTDIO= -L$(top_builddir)/extra/ustdio -lustdio + +## Compilation rules +%.o : $(srcdir)/%.c + $(COMPILE.c) -o $@ $< + +%.o : $(srcdir)/%.cpp + $(COMPILE.cc) -o $@ $< + +../data/%.o : ../data/%.c + $(COMPILE.c) -o $@ $< + +## Dependency rules +%.d : $(srcdir)/%.c + @echo "Generating dependency information for $<" + @$(SHELL) -ec '$(GEN_DEPS.c) $< \ + | sed '\''s/\($*\)\.o[ :]*/\1.o $@ : /g'\'' > $@; \ + [ -s $@ ] || rm -f $@' + +%.d : $(srcdir)/%.cpp + @echo "Generating dependency information for $<" + @$(SHELL) -ec '$(GEN_DEPS.cc) $< \ + | sed '\''s/\($*\)\.o[ :]*/\1.o $@ : /g'\'' > $@; \ + [ -s $@ ] || rm -f $@' + +## End Darwin-specific setup diff --git a/icu4c/source/configure b/icu4c/source/configure index cf616e80163..2ea35008adf 100755 --- a/icu4c/source/configure +++ b/icu4c/source/configure @@ -1156,7 +1156,11 @@ case "${host}" in *-*-mips*) icu_cv_host_frag=$srcdir/config/mh-irix ;; *-*-linux*) icu_cv_host_frag=$srcdir/config/mh-linux ;; *-*-freebsd*) icu_cv_host_frag=$srcdir/config/mh-freebsd ;; -*-*-aix*) icu_cv_host_frag=$srcdir/config/mh-aix ;; +*-*-aix*) + case "$CXX" in + *vacpp*)icu_cv_host_frag=$srcdir/config/mh-aix-va ;; + *) icu_cv_host_frag=$srcdir/config/mh-aix ;; + esac;; *-sequent-*) icu_cv_host_frag=$srcdir/config/mh-ptx ;; *-*-hpux*) case "$CXX" in @@ -1165,7 +1169,8 @@ case "${host}" in esac;; *-*-os390*) icu_cv_host_frag=$srcdir/config/mh-os390 ;; *-*-os400*) icu_cv_host_frag=$srcdir/config/mh-os400 ;; -*-apple-rhapsody*) icu_cv_host_frag=$srcdir/config/mh-rhapsody ;; +*-apple-rhapsody*) icu_cv_host_frag=$srcdir/config/mh-darwin ;; +*-apple-darwin*) icu_cv_host_frag=$srcdir/config/mh-darwin ;; *) icu_cv_host_frag=$srcdir/config/mh-unknown ;; esac @@ -1180,7 +1185,7 @@ hpuxcma=false case "${host}" in *-*-hpux10*) hpuxcma=true echo $ac_n "checking for floor in -lm""... $ac_c" 1>&6 -echo "configure:1184: checking for floor in -lm" >&5 +echo "configure:1189: 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 @@ -1188,7 +1193,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:1208: \"$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 @@ -1220,7 +1225,7 @@ else fi ;; *-*-hpux*) echo $ac_n "checking for floor in -lm""... $ac_c" 1>&6 -echo "configure:1224: checking for floor in -lm" >&5 +echo "configure:1229: 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 @@ -1228,7 +1233,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:1248: \"$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 @@ -1261,7 +1266,7 @@ fi ;; *) echo $ac_n "checking for floor in -lm""... $ac_c" 1>&6 -echo "configure:1265: checking for floor in -lm" >&5 +echo "configure:1270: 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 @@ -1269,7 +1274,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:1289: \"$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 @@ -1371,7 +1376,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:1375: checking for pthread_create in -lcma" >&5 +echo "configure:1380: 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 @@ -1379,7 +1384,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:1399: \"$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 @@ -1425,7 +1430,7 @@ else if test $threads = true; then echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6 -echo "configure:1429: checking for pthread_create in -lpthread" >&5 +echo "configure:1434: checking for pthread_create in -lpthread" >&5 ac_lib_var=`echo pthread'_'pthread_create | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1433,7 +1438,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:1453: \"$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 @@ -1476,7 +1481,7 @@ fi ICU_USE_THREADS=1 else echo $ac_n "checking for pthread_mutex_init in -lpthread""... $ac_c" 1>&6 -echo "configure:1480: checking for pthread_mutex_init in -lpthread" >&5 +echo "configure:1485: 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 @@ -1484,7 +1489,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:1504: \"$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 @@ -1530,7 +1535,7 @@ fi if test $ICU_USE_THREADS = 0; then echo $ac_n "checking for pthread_create in -lpthreads""... $ac_c" 1>&6 -echo "configure:1534: checking for pthread_create in -lpthreads" >&5 +echo "configure:1539: checking for pthread_create in -lpthreads" >&5 ac_lib_var=`echo pthreads'_'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 @@ -1538,7 +1543,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpthreads $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1558: \"$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 @@ -1583,7 +1588,7 @@ fi if test $ICU_USE_THREADS = 0; then echo $ac_n "checking for pthread_create in -lcma""... $ac_c" 1>&6 -echo "configure:1587: checking for pthread_create in -lcma" >&5 +echo "configure:1592: 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 @@ -1591,7 +1596,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:1611: \"$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 @@ -1636,14 +1641,14 @@ fi if test $ICU_USE_THREADS = 0; then echo $ac_n "checking if we need -pthread for threads""... $ac_c" 1>&6 -echo "configure:1640: checking if we need -pthread for threads" >&5 +echo "configure:1645: checking if we need -pthread for threads" >&5 if eval "test \"`echo '$''{'ac_ldflag_pthread'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LDFLAGS="$LDFLAGS" LDFLAGS="-pthread $LDFLAGS" 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_ldflag_pthread=yes" else @@ -1675,12 +1680,12 @@ fi fi echo $ac_n "checking for pthread_mutex_lock""... $ac_c" 1>&6 -echo "configure:1679: checking for pthread_mutex_lock" >&5 +echo "configure:1684: 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:1712: \"$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 @@ -1733,7 +1738,7 @@ fi echo $ac_n "checking for wcscpy in -lwcs""... $ac_c" 1>&6 -echo "configure:1737: checking for wcscpy in -lwcs" >&5 +echo "configure:1742: checking for wcscpy in -lwcs" >&5 ac_lib_var=`echo wcs'_'wcscpy | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1741,7 +1746,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lwcs $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1761: \"$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 @@ -1786,7 +1791,7 @@ HAVE_DLOPEN=0 #add more libs here.. echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 -echo "configure:1790: checking for dlopen in -ldl" >&5 +echo "configure:1795: checking for dlopen in -ldl" >&5 ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1794,7 +1799,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1814: \"$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 @@ -1839,7 +1844,7 @@ fi if test $HAVE_DLOPEN = 0; then echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6 -echo "configure:1843: checking for shl_load in -ldld" >&5 +echo "configure:1848: 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 @@ -1847,7 +1852,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:1867: \"$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 @@ -1894,12 +1899,12 @@ fi if test $HAVE_DLOPEN = 0; then echo $ac_n "checking for dllload""... $ac_c" 1>&6 -echo "configure:1898: checking for dllload" >&5 +echo "configure:1903: 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:1931: \"$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 @@ -1948,7 +1953,7 @@ fi echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:1952: checking how to run the C preprocessor" >&5 +echo "configure:1957: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -1963,13 +1968,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:1973: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1978: \"$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 : @@ -1980,13 +1985,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:1990: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1995: \"$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 : @@ -1997,13 +2002,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:2007: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2012: \"$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 : @@ -2031,17 +2036,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:2035: checking for $ac_hdr" >&5 +echo "configure:2040: 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:2045: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2050: \"$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* @@ -2086,7 +2091,7 @@ 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:2090: checking how to run the C++ preprocessor" >&5 +echo "configure:2095: 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 @@ -2099,12 +2104,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:2108: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2113: \"$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 : @@ -2130,17 +2135,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:2134: checking for iostream" >&5 +echo "configure:2139: 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:2144: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2149: \"$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* @@ -2167,17 +2172,17 @@ fi else ac_safe=`echo "iostream.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for iostream.h""... $ac_c" 1>&6 -echo "configure:2171: checking for iostream.h" >&5 +echo "configure:2176: 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:2181: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2186: \"$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* @@ -2200,19 +2205,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:2204: checking whether ostream is really defined" >&5 +echo "configure:2209: 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:2216: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2221: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_iostream_ok=yes else @@ -2242,14 +2247,14 @@ cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6 -echo "configure:2246: checking whether byte ordering is bigendian" >&5 +echo "configure:2251: 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 @@ -2260,11 +2265,11 @@ int main() { #endif ; return 0; } EOF -if { (eval echo configure:2264: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2269: \"$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 @@ -2275,7 +2280,7 @@ int main() { #endif ; return 0; } EOF -if { (eval echo configure:2279: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2284: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_bigendian=yes else @@ -2295,7 +2300,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:2317: \"$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 @@ -2340,17 +2345,17 @@ fi ac_safe=`echo "wchar.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for wchar.h""... $ac_c" 1>&6 -echo "configure:2344: checking for wchar.h" >&5 +echo "configure:2349: 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:2354: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2359: \"$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* @@ -2385,7 +2390,7 @@ fi ac_default_sizeof_wchar_t=4 echo $ac_n "checking size of wchar_t""... $ac_c" 1>&6 -echo "configure:2389: checking size of wchar_t" >&5 +echo "configure:2394: 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 @@ -2393,7 +2398,7 @@ else ac_cv_sizeof_wchar_t=$ac_default_sizeof_wchar_t else cat > conftest.$ac_ext < @@ -2410,7 +2415,7 @@ main() exit(0); } EOF -if { (eval echo configure:2414: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2419: \"$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 @@ -2433,12 +2438,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:2437: checking for ANSI C header files" >&5 +echo "configure:2442: 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 @@ -2446,7 +2451,7 @@ else #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2450: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2455: \"$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* @@ -2463,7 +2468,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 @@ -2481,7 +2486,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 @@ -2502,7 +2507,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -2513,7 +2518,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } EOF -if { (eval echo configure:2517: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2522: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -2537,12 +2542,12 @@ EOF fi echo $ac_n "checking for int8_t""... $ac_c" 1>&6 -echo "configure:2541: checking for int8_t" >&5 +echo "configure:2546: 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 @@ -2570,12 +2575,12 @@ EOF fi echo $ac_n "checking for uint8_t""... $ac_c" 1>&6 -echo "configure:2574: checking for uint8_t" >&5 +echo "configure:2579: 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 @@ -2603,12 +2608,12 @@ EOF fi echo $ac_n "checking for int16_t""... $ac_c" 1>&6 -echo "configure:2607: checking for int16_t" >&5 +echo "configure:2612: 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 @@ -2636,12 +2641,12 @@ EOF fi echo $ac_n "checking for uint16_t""... $ac_c" 1>&6 -echo "configure:2640: checking for uint16_t" >&5 +echo "configure:2645: 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 @@ -2669,12 +2674,12 @@ EOF fi echo $ac_n "checking for int32_t""... $ac_c" 1>&6 -echo "configure:2673: checking for int32_t" >&5 +echo "configure:2678: 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 @@ -2702,12 +2707,12 @@ EOF fi echo $ac_n "checking for uint32_t""... $ac_c" 1>&6 -echo "configure:2706: checking for uint32_t" >&5 +echo "configure:2711: 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 @@ -2735,12 +2740,12 @@ EOF fi echo $ac_n "checking for bool_t""... $ac_c" 1>&6 -echo "configure:2739: checking for bool_t" >&5 +echo "configure:2744: checking for bool_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_bool_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -2912,11 +2917,13 @@ case "${host}" in *-*-linux*) platform=U_LINUX ;; *-*-freebsd*) platform=U_LINUX ;; *-*-aix*) platform=AIX ;; + *-sequent-*) platform=PTX ;; *-*-hpux*) platform=HPUX ;; *-*-irix*) platform=IRIX ;; *-*-os390*) platform=OS390 ;; *-*-os400*) platform=OS400 ;; *-apple-rhapsody*) platform=U_RHAPSODY ;; + *-apple-darwin*) platform=U_DARWIN ;; *) platform=U_UNKNOWN_PLATFORM ;; esac @@ -2928,6 +2935,7 @@ case "${host}" in *-*-linux*) ld_rpath_suf=" " ;; *-*-freebsd*) ld_rpath_suf=" " ;; *-*-aix*) ld_rpath_suf="" ;; + *-sequent-*) ld_rpath_suf="" ;; *-*-hpux*) ld_rpath_suf=":" ;; *-*-irix*) ld_rpath_suf=" " ;; *-*-os390*) ld_rpath_suf="" ;; diff --git a/icu4c/source/configure.in b/icu4c/source/configure.in index a1ad5a73434..715736a21a4 100644 --- a/icu4c/source/configure.in +++ b/icu4c/source/configure.in @@ -380,6 +380,7 @@ case "${host}" in *-*-os390*) platform=OS390 ;; *-*-os400*) platform=OS400 ;; *-apple-rhapsody*) platform=U_RHAPSODY ;; + *-apple-darwin*) platform=U_DARWIN ;; *) platform=U_UNKNOWN_PLATFORM ;; esac AC_SUBST(platform)