diff --git a/icu4c/source/configure b/icu4c/source/configure index 498d315279a..3fb1b636f1f 100755 --- a/icu4c/source/configure +++ b/icu4c/source/configure @@ -539,7 +539,7 @@ if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu. if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then ac_n= ac_c=' -' ac_t=' ' +' ac_t=' ' else ac_n=-n ac_c= ac_t= fi @@ -556,7 +556,7 @@ PACKAGE="icu" echo $ac_n "checking for ICU version numbers""... $ac_c" 1>&6 echo "configure:558: checking for ICU version numbers" >&5 -VERSION=`sed -n 's/^[ ]*#[ ]*define[ ]*U_ICU_VERSION[ ]*"\([^"]*\)".*/\1/p' $srcdir/common/unicode/utypes.h` +VERSION=`sed -n 's/^[ ]*#[ ]*define[ ]*U_ICU_VERSION[ ]*"\([^"]*\)".*/\1/p' $srcdir/common/unicode/utypes.h` LIB_VERSION=`echo $VERSION | sed -e 's/\.//' -e 's/^\([^.]*\)$/\1.0/'` LIB_VERSION_MAJOR=`echo $LIB_VERSION | sed 's/\..*//'` @@ -623,7 +623,7 @@ else if test -x $ac_dir/$ac_word; then if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then ac_prog_rejected=yes - continue + continue fi ac_cv_prog_CC="cc" break @@ -987,15 +987,15 @@ else # by default. for ac_prog in ginstall scoinst install; do if test -f $ac_dir/$ac_prog; then - if test $ac_prog = install && + if test $ac_prog = install && grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then - # AIX install. It has an incompatible calling convention. - : - else - ac_cv_path_install="$ac_dir/$ac_prog -c" - break 2 - fi - fi + # AIX install. It has an incompatible calling convention. + : + else + ac_cv_path_install="$ac_dir/$ac_prog -c" + break 2 + fi + fi done ;; esac @@ -1106,7 +1106,7 @@ else /*) ac_cv_path_U_MAKE="$U_MAKE" # Let the user override the test with a path. ;; - ?:/*) + ?:/*) ac_cv_path_U_MAKE="$U_MAKE" # Let the user override the test with a dos path. ;; *) @@ -1143,11 +1143,11 @@ echo "configure:1142: checking whether strict compiling is on" >&5 if test "${enable_strict+set}" = set; then enableval="$enable_strict" - if test "$enableval" = no - then - ac_use_strict_options=no + if test "$enableval" = no + then + ac_use_strict_options=no else - ac_use_strict_options=yes + ac_use_strict_options=yes fi else @@ -1160,11 +1160,11 @@ fi then if test "$GCC" = yes then - CFLAGS="$CFLAGS -Wall -ansi -pedantic -Wshadow -Wpointer-arith -Wmissing-prototypes -Wwrite-strings" + CFLAGS="$CFLAGS -Wall -ansi -pedantic -Wshadow -Wpointer-arith -Wmissing-prototypes -Wwrite-strings" fi if test "$GXX" = yes then - CXXFLAGS="$CXXFLAGS -Wall -ansi -pedantic -W -Wpointer-arith -Wmissing-prototypes -Wwrite-strings" + CXXFLAGS="$CXXFLAGS -Wall -ansi -pedantic -W -Wpointer-arith -Wmissing-prototypes -Wwrite-strings" fi fi @@ -1200,26 +1200,26 @@ echo "$ac_t""$host" 1>&6 SOL64=no case "${host}" in *-*-solaris*) - if test "$ac_cv_prog_gcc" = no; then - echo $ac_n "checking if we have a 64-bit (sparcv9) compiler""... $ac_c" 1>&6 + if test "$ac_cv_prog_gcc" = no; then + echo $ac_n "checking if we have a 64-bit (sparcv9) compiler""... $ac_c" 1>&6 echo "configure:1206: checking if we have a 64-bit (sparcv9) compiler" >&5 - SOL64=`$CXX -xarch=v9 && $CC -xarch=v9 2>&1 |grep -v usage:` - if test -z "$SOL64"; then - echo "$ac_t""yes" 1>&6 - SOL64=yes - else - echo "$ac_t""no" 1>&6 - SOL64=no - fi - fi ;; + SOL64=`$CXX -xarch=v9 && $CC -xarch=v9 2>&1 |grep -v usage:` + if test -z "$SOL64"; then + echo "$ac_t""yes" 1>&6 + SOL64=yes + else + echo "$ac_t""no" 1>&6 + SOL64=no + fi + fi ;; alpha*-*-linux-gnu) - CFLAGS="${CFLAGS} -mieee -O2" - CXXFLAGS="${CXXFLAGS} -mieee -O2" - ;; + CFLAGS="${CFLAGS} -mieee -O2" + CXXFLAGS="${CXXFLAGS} -mieee -O2" + ;; esac - echo $ac_n "checking which Makefile fragment to use""... $ac_c" 1>&6 + echo $ac_n "checking which Makefile fragment to use""... $ac_c" 1>&6 echo "configure:1224: 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 @@ -1227,37 +1227,37 @@ else case "${host}" in *-*-solaris*) - if test "$ac_cv_prog_gcc" = yes; then - icu_cv_host_frag=mh-solaris-gcc - else - if test "$SOL64" = yes; then - icu_cv_host_frag=mh-solaris-sparcv9 - else - icu_cv_host_frag=mh-solaris - fi - fi ;; -*-*-mips*) icu_cv_host_frag=mh-irix ;; -*-*-linux*) icu_cv_host_frag=mh-linux ;; -*-*-freebsd*|*-*-netbsd*) icu_cv_host_frag=mh-bsd-gcc ;; -*-*-aix*) - case "$CXX" in - *vacpp*)icu_cv_host_frag=mh-aix-va ;; - *) icu_cv_host_frag=mh-aix ;; - esac;; -*-sequent-*) icu_cv_host_frag=mh-ptx ;; + if test "$ac_cv_prog_gcc" = yes; then + icu_cv_host_frag=mh-solaris-gcc + else + if test "$SOL64" = yes; then + icu_cv_host_frag=mh-solaris-sparcv9 + else + icu_cv_host_frag=mh-solaris + fi + fi ;; +*-*-mips*) icu_cv_host_frag=mh-irix ;; +*-*-linux*) icu_cv_host_frag=mh-linux ;; +*-*-freebsd*|*-*-netbsd*) icu_cv_host_frag=mh-bsd-gcc ;; +*-*-aix*) + case "$CXX" in + *vacpp*)icu_cv_host_frag=mh-aix-va ;; + *) icu_cv_host_frag=mh-aix ;; + esac;; +*-sequent-*) icu_cv_host_frag=mh-ptx ;; *-*-hpux*) - case "$CXX" in - *aCC) icu_cv_host_frag=mh-hpux-acc ;; - *CC) icu_cv_host_frag=mh-hpux-cc ;; - esac;; -*-*-os390*) icu_cv_host_frag=mh-os390 ;; -*-*-os400*) icu_cv_host_frag=mh-os400 ;; -*-apple-rhapsody*) icu_cv_host_frag=mh-darwin ;; -*-apple-darwin*) icu_cv_host_frag=mh-darwin ;; -*) icu_cv_host_frag=mh-unknown ;; + case "$CXX" in + *aCC) icu_cv_host_frag=mh-hpux-acc ;; + *CC) icu_cv_host_frag=mh-hpux-cc ;; + esac;; +*-*-os390*) icu_cv_host_frag=mh-os390 ;; +*-*-os400*) icu_cv_host_frag=mh-os400 ;; +*-apple-rhapsody*) icu_cv_host_frag=mh-darwin ;; +*-apple-darwin*) icu_cv_host_frag=mh-darwin ;; +*) icu_cv_host_frag=mh-unknown ;; esac - - + + fi echo "$ac_t""$icu_cv_host_frag" 1>&6 @@ -1266,8 +1266,8 @@ echo "$ac_t""$icu_cv_host_frag" 1>&6 hpuxcma=false case "${host}" in - *-*-hpux10*) hpuxcma=true - echo $ac_n "checking for floor in -lm""... $ac_c" 1>&6 + *-*-hpux10*) hpuxcma=true + echo $ac_n "checking for floor in -lm""... $ac_c" 1>&6 echo "configure:1272: 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 @@ -1307,7 +1307,7 @@ else echo "$ac_t""no" 1>&6 fi ;; - *-*-hpux*) echo $ac_n "checking for floor in -lm""... $ac_c" 1>&6 + *-*-hpux*) echo $ac_n "checking for floor in -lm""... $ac_c" 1>&6 echo "configure:1312: 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 @@ -1347,8 +1347,8 @@ else echo "$ac_t""no" 1>&6 fi ;; - - *) echo $ac_n "checking for floor in -lm""... $ac_c" 1>&6 + + *) echo $ac_n "checking for floor in -lm""... $ac_c" 1>&6 echo "configure:1353: 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 @@ -1395,7 +1395,7 @@ else echo "$ac_t""no" 1>&6 fi - LIB_M="" ;; + LIB_M="" ;; esac @@ -1405,10 +1405,10 @@ if test $hpuxcma = false; then if test "${enable_hpuxcma+set}" = set; then enableval="$enable_hpuxcma" case "${enableval}" in - yes) hpuxcma=true;; - no) hpuxcma=false;; - *) { echo "configure: error: bad value ${enableval} for --enable-hpuxcma" 1>&2; exit 1; } ;; - esac + yes) hpuxcma=true;; + no) hpuxcma=false;; + *) { echo "configure: error: bad value ${enableval} for --enable-hpuxcma" 1>&2; exit 1; } ;; + esac fi fi @@ -1425,8 +1425,8 @@ fi if test $hpuxcma = true; then case "${host}" in - *-*-hpux*) hpuxcma=true ;; - *) { echo "configure: error: --enable-hpuxcma is not valid on this platform ${host}" 1>&2; exit 1; } ;; + *-*-hpux*) hpuxcma=true ;; + *) { echo "configure: error: --enable-hpuxcma is not valid on this platform ${host}" 1>&2; exit 1; } ;; esac fi @@ -1437,9 +1437,9 @@ enabled=no if test "${enable_shared+set}" = set; then enableval="$enable_shared" case "${enableval}" in - yes|"") enabled=yes; ENABLE_SHARED=YES ;; - no) ;; - *) ;; + yes|"") enabled=yes; ENABLE_SHARED=YES ;; + no) ;; + *) ;; esac else ENABLE_SHARED=YES @@ -1456,9 +1456,9 @@ enabled=no if test "${enable_static+set}" = set; then enableval="$enable_static" case "${enableval}" in - yes|"") enabled=yes; ENABLE_STATIC=YES ;; - no) ;; - *) ;; + yes|"") enabled=yes; ENABLE_STATIC=YES ;; + no) ;; + *) ;; esac fi @@ -1500,9 +1500,9 @@ fi if test "${enable_rpath+set}" = set; then enableval="$enable_rpath" case "${enableval}" in - yes|"") ENABLE_RPATH=YES ;; - no) ;; - *) ;; + yes|"") ENABLE_RPATH=YES ;; + no) ;; + *) ;; esac else ENABLE_RPATH=NO @@ -1517,10 +1517,10 @@ threads=true if test "${enable_threads+set}" = set; then enableval="$enable_threads" case "${enableval}" in - yes) threads=true ;; - no) threads=false ;; - *) { echo "configure: error: bad value ${enableval} for --enable-threads" 1>&2; exit 1; } ;; - esac + yes) threads=true ;; + no) threads=false ;; + *) { echo "configure: error: bad value ${enableval} for --enable-threads" 1>&2; exit 1; } ;; + esac else threads=true fi @@ -1845,7 +1845,7 @@ HAVE_DLOPEN=1 fi if test $HAVE_DLOPEN = 0; then - echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6 + echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6 echo "configure:1850: 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 @@ -1892,9 +1892,9 @@ else echo "$ac_t""no" 1>&6 fi - if test $ac_cv_lib_dld_shl_load = yes; then - HAVE_DLOPEN=1 - + if test $ac_cv_lib_dld_shl_load = yes; then + HAVE_DLOPEN=1 + fi fi @@ -2144,12 +2144,12 @@ else /* Thanks to Mike Haertel and Jim Avera for this test. Here is a matrix of mmap possibilities: - mmap private not fixed - mmap private fixed at somewhere currently unmapped - mmap private fixed at somewhere already mapped - mmap shared not fixed - mmap shared fixed at somewhere currently unmapped - mmap shared fixed at somewhere already mapped + mmap private not fixed + mmap private fixed at somewhere currently unmapped + mmap private fixed at somewhere already mapped + mmap shared not fixed + mmap shared fixed at somewhere currently unmapped + mmap shared fixed at somewhere already mapped For private mappings, we should verify that changes cannot be read() back from the file, nor mmap's back from the file at a different address. (There have been systems where private was not correctly @@ -2202,7 +2202,7 @@ else # endif /* no NBPG */ # endif /* no EXEC_PAGESIZE */ # else /* no HAVE_SYS_PARAM_H */ -# define getpagesize() 8192 /* punt totally */ +# define getpagesize() 8192 /* punt totally */ # endif /* no HAVE_SYS_PARAM_H */ # endif /* no _SC_PAGESIZE */ @@ -2217,65 +2217,65 @@ char *malloc(); int main() { - char *data, *data2, *data3; - int i, pagesize; - int fd; + char *data, *data2, *data3; + int i, pagesize; + int fd; - pagesize = getpagesize(); + pagesize = getpagesize(); - /* - * First, make a file with some known garbage in it. - */ - data = malloc(pagesize); - if (!data) - exit(1); - for (i = 0; i < pagesize; ++i) - *(data + i) = rand(); - umask(0); - fd = creat("conftestmmap", 0600); - if (fd < 0) - exit(1); - if (write(fd, data, pagesize) != pagesize) - exit(1); - close(fd); + /* + * First, make a file with some known garbage in it. + */ + data = malloc(pagesize); + if (!data) + exit(1); + for (i = 0; i < pagesize; ++i) + *(data + i) = rand(); + umask(0); + fd = creat("conftestmmap", 0600); + if (fd < 0) + exit(1); + if (write(fd, data, pagesize) != pagesize) + exit(1); + close(fd); - /* - * Next, try to mmap the file at a fixed address which - * already has something else allocated at it. If we can, - * also make sure that we see the same garbage. - */ - fd = open("conftestmmap", O_RDWR); - if (fd < 0) - exit(1); - data2 = malloc(2 * pagesize); - if (!data2) - exit(1); - data2 += (pagesize - ((int) data2 & (pagesize - 1))) & (pagesize - 1); - if (data2 != mmap(data2, pagesize, PROT_READ | PROT_WRITE, - MAP_PRIVATE | MAP_FIXED, fd, 0L)) - exit(1); - for (i = 0; i < pagesize; ++i) - if (*(data + i) != *(data2 + i)) - exit(1); + /* + * Next, try to mmap the file at a fixed address which + * already has something else allocated at it. If we can, + * also make sure that we see the same garbage. + */ + fd = open("conftestmmap", O_RDWR); + if (fd < 0) + exit(1); + data2 = malloc(2 * pagesize); + if (!data2) + exit(1); + data2 += (pagesize - ((int) data2 & (pagesize - 1))) & (pagesize - 1); + if (data2 != mmap(data2, pagesize, PROT_READ | PROT_WRITE, + MAP_PRIVATE | MAP_FIXED, fd, 0L)) + exit(1); + for (i = 0; i < pagesize; ++i) + if (*(data + i) != *(data2 + i)) + exit(1); - /* - * Finally, make sure that changes to the mapped area - * do not percolate back to the file as seen by read(). - * (This is a bug on some variants of i386 svr4.0.) - */ - for (i = 0; i < pagesize; ++i) - *(data2 + i) = *(data2 + i) + 1; - data3 = malloc(pagesize); - if (!data3) - exit(1); - if (read(fd, data3, pagesize) != pagesize) - exit(1); - for (i = 0; i < pagesize; ++i) - if (*(data + i) != *(data3 + i)) - exit(1); - close(fd); - unlink("conftestmmap"); - exit(0); + /* + * Finally, make sure that changes to the mapped area + * do not percolate back to the file as seen by read(). + * (This is a bug on some variants of i386 svr4.0.) + */ + for (i = 0; i < pagesize; ++i) + *(data2 + i) = *(data2 + i) + 1; + data3 = malloc(pagesize); + if (!data3) + exit(1); + if (read(fd, data3, pagesize) != pagesize) + exit(1); + for (i = 0; i < pagesize; ++i) + if (*(data + i) != *(data3 + i)) + exit(1); + close(fd); + unlink("conftestmmap"); + exit(0); } EOF @@ -2358,11 +2358,11 @@ if test "${with_iostream+set}" = set; then withval="$with_iostream" case "${withval}" in none) streams=none ;; - old) streams=198506 ;; - std) streams=199711 ;; + old) streams=198506 ;; + std) streams=199711 ;; auto) streams= ;; - *) { echo "configure: error: bad value ${withval} for --with-iostream" 1>&2; exit 1; } ;; - esac + *) { echo "configure: error: bad value ${withval} for --with-iostream" 1>&2; exit 1; } ;; + esac else streams= fi @@ -2947,7 +2947,7 @@ fi if test x$ac_cv_func__tzset = xyes then - U_TZSET=_tzset + U_TZSET=_tzset fi fi @@ -3562,10 +3562,10 @@ ECHO_C=$ac_c if test "${enable_extras+set}" = set; then enableval="$enable_extras" case "${enableval}" in - yes) extras=true ;; - no) extras=false ;; - *) { echo "configure: error: bad value ${enableval} for --enable-extras" 1>&2; exit 1; } ;; - esac + yes) extras=true ;; + no) extras=false ;; + *) { echo "configure: error: bad value ${enableval} for --enable-extras" 1>&2; exit 1; } ;; + esac else extras=true fi @@ -3584,10 +3584,10 @@ fi if test "${enable_layout+set}" = set; then enableval="$enable_layout" case "${enableval}" in - yes) layout=true ;; - no) layout=false ;; - *) { echo "configure: error: bad value ${enableval} for --enable-layout" 1>&2; exit 1; } ;; - esac + yes) layout=true ;; + no) layout=false ;; + *) { echo "configure: error: bad value ${enableval} for --enable-layout" 1>&2; exit 1; } ;; + esac else layout=false fi @@ -3607,9 +3607,9 @@ if test "${with_data_packaging+set}" = set; then withval="$with_data_packaging" case "${withval}" in files|archive|library) datapackaging=$withval ;; - auto) datapackaging=$withval ;; - *) { echo "configure: error: bad value ${withval} for --with-iostream" 1>&2; exit 1; } ;; - esac + auto) datapackaging=$withval ;; + *) { echo "configure: error: bad value ${withval} for --with-iostream" 1>&2; exit 1; } ;; + esac else datapackaging= fi @@ -3623,7 +3623,7 @@ if test "${enable_mapped+set}" = set; then yes) mapped=archive ;; no) mapped=library ;; *) { echo "configure: error: bad value ${enableval} for --enable-mapped; use --with-data-packaging now" 1>&2; exit 1; } ;; - esac + esac else mapped= fi @@ -3631,39 +3631,39 @@ fi if test x"$mapped" != x; then case $mapped in - archive) - echo "configure: warning: use --with-data-packaging=archive instead of --enable-mapped" 1>&2 - ;; - library) - echo "configure: warning: use --with-data-packaging=library instead of --disable-mapped" 1>&2 - ;; + archive) + echo "configure: warning: use --with-data-packaging=archive instead of --enable-mapped" 1>&2 + ;; + library) + echo "configure: warning: use --with-data-packaging=library instead of --disable-mapped" 1>&2 + ;; esac if test x"$datapackaging" != x -a x"$mapped" != x"$datapackaging"; then - { echo "configure: error: conflicting values used for --with-data-packaging and deprecated --enable-mapped" 1>&2; exit 1; } + { echo "configure: error: conflicting values used for --with-data-packaging and deprecated --enable-mapped" 1>&2; exit 1; } fi datapackaging=$mapped fi if test x"$datapackaging" = x -o x"$datapackaging" = xauto; then if test "$HAVE_DLOPEN" -eq 1; then - datapackaging=library + datapackaging=library else - datapackaging=archive + datapackaging=archive fi fi case "$datapackaging" in files) - DATA_PACKAGING_MODE=files - ;; + DATA_PACKAGING_MODE=files + ;; archive) - DATA_PACKAGING_CPPFLAGS=-DUDATA_MAP - DATA_PACKAGING_MODE=common - ;; + DATA_PACKAGING_CPPFLAGS=-DUDATA_MAP + DATA_PACKAGING_MODE=common + ;; library) - DATA_PACKAGING_CPPFLAGS=-DUDATA_DLL - DATA_PACKAGING_MODE=dll - ;; + DATA_PACKAGING_CPPFLAGS=-DUDATA_DLL + DATA_PACKAGING_MODE=dll + ;; esac @@ -3672,10 +3672,10 @@ esac if test "${enable_tests+set}" = set; then enableval="$enable_tests" case "${enableval}" in - yes) tests=true ;; - no) tests=false ;; - *) { echo "configure: error: bad value ${enableval} for --enable-tests" 1>&2; exit 1; } ;; - esac + yes) tests=true ;; + no) tests=false ;; + *) { echo "configure: error: bad value ${enableval} for --enable-tests" 1>&2; exit 1; } ;; + esac else tests=true fi @@ -3694,10 +3694,10 @@ fi if test "${enable_samples+set}" = set; then enableval="$enable_samples" case "${enableval}" in - yes) samples=true ;; - no) samples=false ;; - *) { echo "configure: error: bad value ${enableval} for --enable-samples" 1>&2; exit 1; } ;; - esac + yes) samples=true ;; + no) samples=false ;; + *) { echo "configure: error: bad value ${enableval} for --enable-samples" 1>&2; exit 1; } ;; + esac else samples=true fi @@ -3715,19 +3715,19 @@ fi ICUDATA_CHAR=$U_ENDIAN_CHAR case "${host}" in - *-*-solaris*) platform=U_SOLARIS ;; - *-*-linux*) platform=U_LINUX ;; - *-*-freebsd*) platform=U_LINUX ;; - *-*-aix*) platform=AIX ;; - *-sequent-*) platform=PTX ;; - *-*-hpux*) platform=HPUX ;; - *-*-irix*) platform=IRIX ;; - *-*-os390*) platform=OS390 - ICUDATA_CHAR="e" ;; - *-*-os400*) platform=OS400 - ICUDATA_CHAR="e" ;; - *-apple-darwin*|*-apple-rhapsody*) platform=U_DARWIN ;; - *) platform=U_UNKNOWN_PLATFORM ;; + *-*-solaris*) platform=U_SOLARIS ;; + *-*-linux*) platform=U_LINUX ;; + *-*-freebsd*) platform=U_LINUX ;; + *-*-aix*) platform=AIX ;; + *-sequent-*) platform=PTX ;; + *-*-hpux*) platform=HPUX ;; + *-*-irix*) platform=IRIX ;; + *-*-os390*) platform=OS390 + ICUDATA_CHAR="e" ;; + *-*-os400*) platform=OS400 + ICUDATA_CHAR="e" ;; + *-apple-darwin*|*-apple-rhapsody*) platform=U_DARWIN ;; + *) platform=U_UNKNOWN_PLATFORM ;; esac @@ -3737,36 +3737,36 @@ platform_make_fragment='$(top_srcdir)/config/'"$platform_make_fragment_name" case "${host}" in - *-*-solaris*) ld_rpath_suf=":" ;; - *-*-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="" ;; - *-*-os400*) ld_rpath_suf=" " ;; - *) ld_rpath_suf="" ;; + *-*-solaris*) ld_rpath_suf=":" ;; + *-*-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="" ;; + *-*-os400*) ld_rpath_suf=" " ;; + *) ld_rpath_suf="" ;; esac case "${host}" in - *-*-hpux*) - for file in samples/date/date \ - samples/cal/cal test/cintltst/cintltst \ - tools/makeconv/makeconv tools/genrb/genrb \ - tools/rbdump/read tools/genccode/genccode \ - tools/gencmn/gencmn tools/gencnval/gencnval \ - tools/gennames/gennames tools/gentest/gentest \ - tools/pkgdata/pkgdata tools/genprops/genprops - do - if test -f $file.c; then - mv $file.c $file.cpp + *-*-hpux*) + for file in samples/date/date \ + samples/cal/cal test/cintltst/cintltst \ + tools/makeconv/makeconv tools/genrb/genrb \ + tools/rbdump/read tools/genccode/genccode \ + tools/gencmn/gencmn tools/gencmn/decmn tools/gencnval/gencnval \ + tools/gennames/gennames tools/gentest/gentest \ + tools/pkgdata/pkgdata tools/genprops/genprops + do + if test -f $file.c; then + mv $file.c $file.cpp else - echo "# $file.c does not exist or is already renamed [warning]" - fi - done - ;; + echo "# $file.c does not exist or is already renamed [warning]" + fi + done + ;; esac if test "${FORCE_LIBS}" != ""; then @@ -3775,7 +3775,7 @@ if test "${FORCE_LIBS}" != ""; then fi if test $hpuxcma = true; then - CPPFLAGS="${CPPFLAGS} -D_PTHREADS_DRAFT_4 -DHPUX_CMA" + CPPFLAGS="${CPPFLAGS} -D_PTHREADS_DRAFT_4 -DHPUX_CMA" fi @@ -3787,7 +3787,7 @@ then fi if test "$ac_cv_lib_dld_shl_load" = "yes"; then - CPPFLAGS="${CPPFLAGS} -DICU_USE_SHL_LOAD" + CPPFLAGS="${CPPFLAGS} -DICU_USE_SHL_LOAD" fi @@ -3853,7 +3853,7 @@ test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' # the first set of double-colon rules, so remove it if not needed. # If there is a colon in the path, we need to keep it. if test "x$srcdir" = x.; then - ac_vpsub='/^[ ]*VPATH[ ]*=[^:]*$/d' + ac_vpsub='/^[ ]*VPATH[ ]*=[^:]*$/d' fi trap 'rm -rf $CONFIG_STATUS conftest*; exit 1' 1 2 15 @@ -3897,30 +3897,30 @@ ac_given_srcdir=$srcdir ac_given_INSTALL="$INSTALL" trap 'rm -rf `echo "README icudefs.mk \ - Makefile \ - data/Makefile data/build/Makefile \ - common/Makefile config/Makefile.inc i18n/Makefile \ - layout/Makefile \ - extra/Makefile extra/ustdio/Makefile \ - tools/Makefile \ - tools/makeconv/Makefile \ - tools/genrb/Makefile \ - tools/genuca/Makefile \ - tools/pkgdata/Makefile tools/pkgdata/icupkg.inc \ - tools/genccode/Makefile \ - tools/gencmn/Makefile \ - tools/gencnval/Makefile \ - tools/gentz/Makefile \ - tools/gennames/Makefile \ - tools/toolutil/Makefile \ - tools/gentest/Makefile \ - tools/genprops/Makefile \ - tools/ctestfw/Makefile \ - test/Makefile test/testdata/Makefile \ - test/intltest/Makefile test/cintltst/Makefile \ - test/ieeetest/Makefile \ - samples/Makefile samples/date/Makefile samples/cal/Makefile \ - common/unicode/platform.h common/icucfg.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 + Makefile \ + data/Makefile data/build/Makefile \ + common/Makefile config/Makefile.inc i18n/Makefile \ + layout/Makefile \ + extra/Makefile extra/ustdio/Makefile \ + tools/Makefile \ + tools/makeconv/Makefile \ + tools/genrb/Makefile \ + tools/genuca/Makefile \ + tools/pkgdata/Makefile tools/pkgdata/icupkg.inc \ + tools/genccode/Makefile \ + tools/gencmn/Makefile \ + tools/gencnval/Makefile \ + tools/gentz/Makefile \ + tools/gennames/Makefile \ + tools/toolutil/Makefile \ + tools/gentest/Makefile \ + tools/genprops/Makefile \ + tools/ctestfw/Makefile \ + test/Makefile test/testdata/Makefile \ + test/intltest/Makefile test/cintltst/Makefile \ + test/ieeetest/Makefile \ + samples/Makefile samples/date/Makefile samples/cal/Makefile \ + common/unicode/platform.h common/icucfg.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 EOF cat >> $CONFIG_STATUS <> $CONFIG_STATUS <> $CONFIG_STATUS <<\EOF for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then @@ -4150,17 +4150,17 @@ rm -rf conftest.s* # NAME is the cpp macro being defined and VALUE is the value it is being given. # # ac_d sets the value in "#define NAME VALUE" lines. -ac_dA='s%^\([ ]*\)#\([ ]*define[ ][ ]*\)' -ac_dB='\([ ][ ]*\)[^ ]*%\1#\2' +ac_dA='s%^\([ ]*\)#\([ ]*define[ ][ ]*\)' +ac_dB='\([ ][ ]*\)[^ ]*%\1#\2' ac_dC='\3' ac_dD='%g' # ac_u turns "#undef NAME" with trailing blanks into "#define NAME VALUE". -ac_uA='s%^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)' -ac_uB='\([ ]\)%\1#\2define\3' +ac_uA='s%^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)' +ac_uB='\([ ]\)%\1#\2define\3' ac_uC=' ' ac_uD='\4%g' # ac_e turns "#undef NAME" without trailing blanks into "#define NAME VALUE". -ac_eA='s%^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)' +ac_eA='s%^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)' ac_eB='$%\1#\2define\3' ac_eC=' ' ac_eD='%g' @@ -4207,7 +4207,7 @@ rm -rf conftest.hdr # example, in the case of _POSIX_SOURCE, which is predefined and required # on some systems where configure will not decide to define it. cat >> conftest.vals <<\EOF -s%^[ ]*#[ ]*undef[ ][ ]*[a-zA-Z_][a-zA-Z_0-9]*%/* & */% +s%^[ ]*#[ ]*undef[ ][ ]*[a-zA-Z_][a-zA-Z_0-9]*%/* & */% EOF # Break up conftest.vals because some shells have a limit on