From 9d8d0d394051fe2133b803a08ba066b686354e5d Mon Sep 17 00:00:00 2001 From: George Rhoten Date: Wed, 1 May 2002 23:48:15 +0000 Subject: [PATCH] ICU-1868 Make DEFS be used for macros and includes only for compile time, not for link time, and other various fixes. X-SVN-Rev: 8562 --- icu4c/source/common/Makefile.in | 4 +- icu4c/source/config/mh-aix | 16 +- icu4c/source/config/mh-aix-va | 16 +- icu4c/source/config/mh-bsd-gcc | 12 +- icu4c/source/config/mh-hpux-acc | 12 +- icu4c/source/config/mh-solaris | 14 +- icu4c/source/config/mh-solaris-gcc | 12 +- icu4c/source/configure | 344 ++++++++++++------------ icu4c/source/configure.in | 3 +- icu4c/source/extra/uconv/Makefile.in | 14 +- icu4c/source/extra/ustdio/Makefile.in | 3 +- icu4c/source/i18n/Makefile.in | 3 +- icu4c/source/icudefs.mk.in | 14 +- icu4c/source/layout/Makefile.in | 21 +- icu4c/source/stubdata/Makefile.in | 3 +- icu4c/source/test/cintltst/Makefile.in | 2 +- icu4c/source/test/ieeetest/Makefile.in | 2 +- icu4c/source/test/intltest/Makefile.in | 2 +- icu4c/source/test/iotest/Makefile.in | 8 +- icu4c/source/tools/ctestfw/Makefile.in | 15 +- icu4c/source/tools/genccode/Makefile.in | 3 +- icu4c/source/tools/gencmn/Makefile.in | 3 +- icu4c/source/tools/gencnval/Makefile.in | 2 +- icu4c/source/tools/gennames/Makefile.in | 2 +- icu4c/source/tools/gennorm/Makefile.in | 2 +- icu4c/source/tools/genprops/Makefile.in | 2 +- icu4c/source/tools/genrb/Makefile.in | 2 +- icu4c/source/tools/gentest/Makefile.in | 2 +- icu4c/source/tools/gentz/Makefile.in | 2 +- icu4c/source/tools/genuca/Makefile.in | 2 +- icu4c/source/tools/makeconv/Makefile.in | 2 +- icu4c/source/tools/pkgdata/Makefile.in | 2 +- icu4c/source/tools/toolutil/Makefile.in | 3 +- 33 files changed, 257 insertions(+), 292 deletions(-) diff --git a/icu4c/source/common/Makefile.in b/icu4c/source/common/Makefile.in index a76da68721..72667d2253 100644 --- a/icu4c/source/common/Makefile.in +++ b/icu4c/source/common/Makefile.in @@ -45,10 +45,10 @@ DYNAMICCPPFLAGS = $(SHAREDLIBCPPFLAGS) DYNAMICCFLAGS = $(SHAREDLIBCFLAGS) DYNAMICCXXFLAGS = $(SHAREDLIBCXXFLAGS) -CPPFLAGS += $(LIBCPPFLAGS) -I. -I$(srcdir) -DICU_DATA_DIR=\"$(ICUDATA_DIR)/\" -DUDATA_SO_SUFFIX=\".$(SO)\" -DU_COMMON_LIBNAME=\"$(FINAL_SO_TARGET)\" +CPPFLAGS += $(LIBCPPFLAGS) # Data packaging options are set at configure time with --with-data-packaging. -CPPFLAGS += @DATA_PACKAGING_CPPFLAGS@ +DEFS += -I. -I$(srcdir) -DICU_DATA_DIR=\"$(ICUDATA_DIR)/\" -DUDATA_SO_SUFFIX=\".$(SO)\" -DU_COMMON_LIBNAME=\"$(FINAL_SO_TARGET)\" @DATA_PACKAGING_CPPFLAGS@ # todo: need t make $(LIBICUDT) conditional on using dll-based data. LIBS = $(LIBICUDT) $(DEFAULT_LIBS) diff --git a/icu4c/source/config/mh-aix b/icu4c/source/config/mh-aix index 6448fd042e..eb1ec3cd8e 100644 --- a/icu4c/source/config/mh-aix +++ b/icu4c/source/config/mh-aix @@ -3,7 +3,7 @@ ## Copyright (c) 1999-2002, International Business Machines Corporation and ## others. All Rights Reserved. ## -## $Id: mh-aix,v 1.28 2002/03/21 01:26:39 grhoten-oss Exp $ +## $Id: mh-aix,v 1.29 2002/05/01 23:48:08 grhoten-oss Exp $ ## ## Please note: AIX does NOT have library versioning per se (there is no 'SONAME' capability). ## So, we are using 'windows' style library names, that is, libicuuc20.1.so instead of libicuuc.so.20.1 @@ -13,18 +13,20 @@ GEN_DEPS.c= $(CC) -E -M $(DEFS) $(CPPFLAGS) GEN_DEPS.cc= $(CXX) -E -M $(DEFS) $(CPPFLAGS) ## Commands to compile -COMPILE.c= $(CC) $(DEFS) $(CPPFLAGS) $(CFLAGS) -qroconst -c -COMPILE.cc= $(CXX) $(DEFS) $(CPPFLAGS) $(CXXFLAGS) -qroconst -c +COMPILE.c= $(CC) -qroconst $(CPPFLAGS) $(CFLAGS) $(DEFS) -c +COMPILE.cc= $(CXX) -qroconst $(CPPFLAGS) $(CXXFLAGS) $(DEFS) -c + +LDFLAGS += -brtl ## Commands to link ## We need to use the C++ linker, even when linking C programs, since ## our libraries contain C++ code (C++ static init not called) -LINK.c= $(CXX) -brtl $(DEFS) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -LINK.cc= $(CXX) -brtl $(DEFS) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) +LINK.c= $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) +LINK.cc= $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) ## Commands to make a shared library -SHLIB.c= $(AIX_SHLIB) -p 5000 -brtl $(LDFLAGS) -SHLIB.cc= $(AIX_SHLIB) -p 5000 -brtl $(LDFLAGS) +SHLIB.c= $(AIX_SHLIB) -p 5000 $(LDFLAGS) +SHLIB.cc= $(AIX_SHLIB) -p 5000 $(LDFLAGS) ## Compiler switch to embed a runtime search path LD_RPATH= -I diff --git a/icu4c/source/config/mh-aix-va b/icu4c/source/config/mh-aix-va index ff3053cc8a..6f2751cedd 100644 --- a/icu4c/source/config/mh-aix-va +++ b/icu4c/source/config/mh-aix-va @@ -3,28 +3,30 @@ ## Copyright (c) 1999-2002, International Business Machines Corporation and ## others. All Rights Reserved. ## -## $Id: mh-aix-va,v 1.21 2002/03/21 01:26:39 grhoten-oss Exp $ +## $Id: mh-aix-va,v 1.22 2002/05/01 23:48:08 grhoten-oss Exp $ ## Commands to generate dependency files GEN_DEPS.c= $(CC) -E -M $(DEFS) $(CPPFLAGS) GEN_DEPS.cc= $(CXX) -E -M $(DEFS) $(CPPFLAGS) ## Commands to compile -COMPILE.c= $(CC) $(DEFS) $(CPPFLAGS) $(CFLAGS) -qroconst -c -COMPILE.cc= $(CXX) $(DEFS) $(CPPFLAGS) $(CXXFLAGS) -qroconst -c +COMPILE.c= $(CC) -qroconst $(CPPFLAGS) $(CFLAGS) $(DEFS) -c +COMPILE.cc= $(CXX) -qroconst $(CPPFLAGS) $(CXXFLAGS) $(DEFS) -c + +LDFLAGS += -brtl -bh:5 ## Commands to link ## We need to use the C++ linker, even when linking C programs, since ## our libraries contain C++ code (C++ static init not called) -LINK.c= $(CXX) -brtl $(DEFS) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -LINK.cc= $(CXX) -brtl -bh:5 $(DEFS) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) +LINK.c= $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) +LINK.cc= $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) ## Commands to make a shared library ## -G means -berok -brtl -bnortllib -bnosymbolic -bnoautoexp ## -bh:8 means halt on errors or worse. We don't display warnings about ## duplicate inline symbols. -SHLIB.c= $(CXX) -qmkshrobj -G -brtl $(LDFLAGS) -SHLIB.cc= $(CXX) -qmkshrobj -G -brtl -bh:5 $(LDFLAGS) +SHLIB.c= $(CXX) -qmkshrobj -G $(LDFLAGS) +SHLIB.cc= $(CXX) -qmkshrobj -G $(LDFLAGS) ## Compiler switch to embed a runtime search path LD_RPATH= -I diff --git a/icu4c/source/config/mh-bsd-gcc b/icu4c/source/config/mh-bsd-gcc index d30527848a..2e1d6eabd8 100644 --- a/icu4c/source/config/mh-bsd-gcc +++ b/icu4c/source/config/mh-bsd-gcc @@ -3,7 +3,7 @@ ## Copyright (c) 1999-2000, International Business Machines Corporation and ## others. All Rights Reserved. ## -## $Id: mh-bsd-gcc,v 1.5 2002/01/04 23:48:42 yves-oss Exp $ +## $Id: mh-bsd-gcc,v 1.6 2002/05/01 23:48:09 grhoten-oss Exp $ ## Commands to generate dependency files GEN_DEPS.c= $(CC) -E -MM $(DEFS) $(CPPFLAGS) @@ -14,10 +14,6 @@ SHAREDLIBCFLAGS = -fPIC SHAREDLIBCXXFLAGS = -fPIC SHAREDLIBCPPFLAGS = -DPIC -## Commands to make a shared library -SHLIB.c= $(CC) $(DEFS) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -shared -SHLIB.cc= $(CXX) $(DEFS) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -shared - ## Compiler switch to embed a runtime search path LD_RPATH= LD_RPATH_PRE= -Wl,-rpath, @@ -26,7 +22,7 @@ LD_RPATH_PRE= -Wl,-rpath, LD_SONAME = -Wl,-soname -Wl,$(MIDDLE_SO_TARGET) ## Shared object suffix -SO= so +SO = so ## Non-shared intermediate object suffix STATIC_O = ao @@ -45,13 +41,13 @@ STATIC_O = ao $(COMPILE.c) $(DYNAMICCPPFLAGS) $(DYNAMICCFLAGS) -o $@ $< ## Dependency rules -%.d : $(srcdir)/%.c +%.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 +%.d: $(srcdir)/%.cpp @echo "generating dependency information for $<" @$(SHELL) -ec '$(GEN_DEPS.cc) $< \ | sed '\''s/\($*\)\.o[ :]*/\1.o $@ : /g'\'' > $@; \ diff --git a/icu4c/source/config/mh-hpux-acc b/icu4c/source/config/mh-hpux-acc index e68df0e6d5..6587864155 100644 --- a/icu4c/source/config/mh-hpux-acc +++ b/icu4c/source/config/mh-hpux-acc @@ -3,14 +3,14 @@ ## Copyright (c) 1999-2002, International Business Machines Corporation and ## others. All Rights Reserved. ## -## $Id: mh-hpux-acc,v 1.27 2002/03/14 02:00:36 srl Exp $ +## $Id: mh-hpux-acc,v 1.28 2002/05/01 23:48:10 grhoten-oss Exp $ ## Commands to generate dependency files GEN_DEPS.c= : GEN_DEPS.cc= : ## Commands to compile -COMPILE.c= $(CC) +z -Ae $(DEFS) $(CPPFLAGS) $(CFLAGS) -c +ESlit +COMPILE.c= $(CC) +z -Ae $(DEFS) $(CPPFLAGS) $(CFLAGS) -c +ESlit COMPILE.cc= $(CXX) +z $(DEFS) $(CPPFLAGS) $(CXXFLAGS) -c ## Common 'default' path to ensure the sanity of users. Search the current @@ -20,13 +20,13 @@ LD_DEFAULTPATH= -Wl,+b,.:'$$'ORIGIN/ ## Commands to link ## For aCC, use the C++ linker so that __shlinit gets defined #LINK.c= $(CC) +z -Ae $(DEFS) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -LINK.c= $(CXX) +z $(DEFS) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -Wl,+s $(LD_DEFAULTPATH) -LINK.cc= $(CXX) +z $(DEFS) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -Wl,+s $(LD_DEFAULTPATH) +LINK.c= $(CXX) +z $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -Wl,+s $(LD_DEFAULTPATH) +LINK.cc= $(CXX) +z $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -Wl,+s $(LD_DEFAULTPATH) ## Commands to make a shared library #SHLIB.c= $(LD) $(LDFLAGS) -b -SHLIB.c= $(CXX) $(DEFS) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -b -Wl,+s $(LD_DEFAULTPATH) -SHLIB.cc= $(CXX) $(DEFS) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -b -Wl,+s $(LD_DEFAULTPATH) +SHLIB.c= $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -b -Wl,+s $(LD_DEFAULTPATH) +SHLIB.cc= $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -b -Wl,+s $(LD_DEFAULTPATH) ## Compiler switch to embed a runtime search path LD_RPATH= -Wl,+b, diff --git a/icu4c/source/config/mh-solaris b/icu4c/source/config/mh-solaris index cb2591d164..2f2e355b01 100644 --- a/icu4c/source/config/mh-solaris +++ b/icu4c/source/config/mh-solaris @@ -3,7 +3,7 @@ ## Copyright (c) 1999-2000, International Business Machines Corporation and ## others. All Rights Reserved. ## -## $Id: mh-solaris,v 1.27 2002/03/12 03:51:04 srl Exp $ +## $Id: mh-solaris,v 1.28 2002/05/01 23:48:08 grhoten-oss Exp $ ## Flags for position independent code SHAREDLIBCFLAGS = -KPIC @@ -15,18 +15,18 @@ GEN_DEPS.c= $(CC) -xM $(DEFS) $(CPPFLAGS) GEN_DEPS.cc= $(CXX) -xM $(DEFS) $(CPPFLAGS) ## Commands to compile -COMPILE.c= $(CC) -mt $(DEFS) $(CPPFLAGS) $(CFLAGS) -c -COMPILE.cc= $(CXX) -mt $(DEFS) $(CPPFLAGS) $(CXXFLAGS) -c +COMPILE.c= $(CC) -mt $(CPPFLAGS) $(CFLAGS) $(DEFS) -c +COMPILE.cc= $(CXX) -mt $(CPPFLAGS) $(CXXFLAGS) $(DEFS) -c ## Commands to link #LINK.c= $(CC) -mt $(DEFS) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) ## For Sun Workshop, use CC to link to bring in C++ runtime -LINK.c= $(CXX) -mt $(DEFS) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -LINK.cc= $(CXX) -mt $(DEFS) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) +LINK.c= $(CXX) -mt $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) +LINK.cc= $(CXX) -mt $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) ## Commands to make a shared library -SHLIB.c= $(CC) $(DEFS) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -G -SHLIB.cc= $(CXX) $(DEFS) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -G +SHLIB.c= $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -G +SHLIB.cc= $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -G ## Compiler switch to embed a runtime search path LD_RPATH= -R diff --git a/icu4c/source/config/mh-solaris-gcc b/icu4c/source/config/mh-solaris-gcc index bb4e4f65cc..48b92964df 100644 --- a/icu4c/source/config/mh-solaris-gcc +++ b/icu4c/source/config/mh-solaris-gcc @@ -3,7 +3,7 @@ ## Copyright (c) 1999-2000, International Business Machines Corporation and ## others. All Rights Reserved. ## -## $Id: mh-solaris-gcc,v 1.25 2002/01/04 23:48:43 yves-oss Exp $ +## $Id: mh-solaris-gcc,v 1.26 2002/05/01 23:48:09 grhoten-oss Exp $ ## Flags for position independent code SHAREDLIBCFLAGS = -fPIC @@ -11,16 +11,12 @@ SHAREDLIBCXXFLAGS = -fPIC SHAREDLIBCPPFLAGS = -DPIC ## Commands to generate dependency files -GEN_DEPS.c= $(CC) -E -MM $(DEFS) $(CPPFLAGS) +GEN_DEPS.c= $(CC) -E -MM $(DEFS) $(CPPFLAGS) GEN_DEPS.cc= $(CXX) -E -MM $(DEFS) $(CPPFLAGS) -# Commands to link -LINK.c= $(CC) $(DEFS) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -LINK.cc= $(CXX) $(DEFS) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) - ## Commands to make a shared library -SHLIB.c= $(CC) $(DEFS) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -G -SHLIB.cc= $(CXX) $(DEFS) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -G +SHLIB.c= $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -G +SHLIB.cc= $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -G ## Compiler switch to embed a runtime search path LD_RPATH= -R diff --git a/icu4c/source/configure b/icu4c/source/configure index 22d577eb55..a984df4943 100755 --- a/icu4c/source/configure +++ b/icu4c/source/configure @@ -584,13 +584,12 @@ echo "$ac_t""release $VERSION, library $LIB_VERSION" 1>&6 UNICODE_VERSION="3.1.1" -CPPFLAGS="${CPPFLAGS} -I." # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:594: checking for $ac_word" >&5 +echo "configure:593: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -620,7 +619,7 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:624: checking for $ac_word" >&5 +echo "configure:623: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -671,7 +670,7 @@ fi # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:675: checking for $ac_word" >&5 +echo "configure:674: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -703,7 +702,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:707: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:706: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -714,12 +713,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 718 "configure" +#line 717 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:723: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:722: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -745,12 +744,12 @@ if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:749: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:748: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:754: checking whether we are using GNU C" >&5 +echo "configure:753: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -759,7 +758,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:763: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:762: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -778,7 +777,7 @@ ac_test_CFLAGS="${CFLAGS+set}" ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:782: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:781: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -814,7 +813,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:818: checking for $ac_word" >&5 +echo "configure:817: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -846,7 +845,7 @@ test -n "$CXX" || CXX="gcc" echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:850: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 +echo "configure:849: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 ac_ext=C # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -857,12 +856,12 @@ cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext << EOF -#line 861 "configure" +#line 860 "configure" #include "confdefs.h" int main(){return(0);} EOF -if { (eval echo configure:866: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:865: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cxx_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -888,12 +887,12 @@ if test $ac_cv_prog_cxx_works = no; then { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:892: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:891: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6 cross_compiling=$ac_cv_prog_cxx_cross echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6 -echo "configure:897: checking whether we are using GNU C++" >&5 +echo "configure:896: checking whether we are using GNU C++" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -902,7 +901,7 @@ else yes; #endif EOF -if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:906: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:905: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gxx=yes else ac_cv_prog_gxx=no @@ -921,7 +920,7 @@ ac_test_CXXFLAGS="${CXXFLAGS+set}" ac_save_CXXFLAGS="$CXXFLAGS" CXXFLAGS= echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6 -echo "configure:925: checking whether ${CXX-g++} accepts -g" >&5 +echo "configure:924: checking whether ${CXX-g++} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -983,7 +982,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:987: checking for a BSD compatible install" >&5 +echo "configure:986: 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 @@ -1047,7 +1046,7 @@ fi # Extract the first word of "autoconf", so it can be a program name with args. set dummy autoconf; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1051: checking for $ac_word" >&5 +echo "configure:1050: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AUTOCONF'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1077,7 +1076,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:1081: checking for $ac_word" >&5 +echo "configure:1080: 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 @@ -1110,7 +1109,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:1114: checking for $ac_word" >&5 +echo "configure:1113: 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 @@ -1151,7 +1150,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:1155: checking for $ac_word" >&5 +echo "configure:1154: 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 @@ -1186,7 +1185,7 @@ fi echo $ac_n "checking whether strict compiling is on""... $ac_c" 1>&6 -echo "configure:1190: checking whether strict compiling is on" >&5 +echo "configure:1189: 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" @@ -1224,7 +1223,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:1228: checking host system type" >&5 +echo "configure:1227: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -1245,12 +1244,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:1249: checking for Cygwin environment" >&5 +echo "configure:1248: 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:1264: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cygwin=yes else @@ -1278,19 +1277,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:1282: checking for mingw32 environment" >&5 +echo "configure:1281: 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:1293: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_mingw32=yes else @@ -1309,7 +1308,7 @@ test "$ac_cv_mingw32" = yes && MINGW32=yes echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:1313: checking for executable suffix" >&5 +echo "configure:1312: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1319,10 +1318,10 @@ else rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= - if { (eval echo configure:1323: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + if { (eval echo configure:1322: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in - *.$ac_ext | *.c | *.o | *.obj) ;; + *.c | *.o | *.obj) ;; *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;; esac done @@ -1351,7 +1350,7 @@ else fi echo $ac_n "checking for 64-bit executable support""... $ac_c" 1>&6 -echo "configure:1355: checking for 64-bit executable support" >&5 +echo "configure:1354: checking for 64-bit executable support" >&5 if test "$ENABLE_64BIT_LIBS" = no; then case "${host}" in *-*-hpux*) @@ -1390,11 +1389,11 @@ echo "configure:1355: 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:1397: \"$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 @@ -1423,13 +1422,13 @@ fi esac fi echo "$ac_t""$ENABLE_64BIT_LIBS" 1>&6 - unset ENABLE_64BIT_LIBS + echo $ac_n "checking which Makefile fragment to use""... $ac_c" 1>&6 -echo "configure:1433: checking which Makefile fragment to use" >&5 +echo "configure:1432: 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 @@ -1462,6 +1461,9 @@ alpha*-*-linux-gnu) case "$CXX" in *aCC) icu_cv_host_frag=mh-hpux-acc ;; *CC) icu_cv_host_frag=mh-hpux-cc ;; + *) if test "$ac_cv_prog_gcc" = yes; then + icu_cv_host_frag=mh-hpux-gcc + fi;; esac;; *-*ibm-openedition*|*-*-os390*) icu_cv_host_frag=mh-os390 ;; *-*-os400*) icu_cv_host_frag=mh-os400 ;; @@ -1481,7 +1483,7 @@ hpuxcma=false case "${host}" in *-*-hpux10*) hpuxcma=true echo $ac_n "checking for floor in -lm""... $ac_c" 1>&6 -echo "configure:1485: checking for floor in -lm" >&5 +echo "configure:1487: 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 @@ -1489,7 +1491,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:1506: \"$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 @@ -1521,7 +1523,7 @@ else fi ;; *-*-hpux*) echo $ac_n "checking for floor in -lm""... $ac_c" 1>&6 -echo "configure:1525: checking for floor in -lm" >&5 +echo "configure:1527: 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 @@ -1529,7 +1531,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:1546: \"$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 @@ -1562,7 +1564,7 @@ fi ;; *) echo $ac_n "checking for floor in -lm""... $ac_c" 1>&6 -echo "configure:1566: checking for floor in -lm" >&5 +echo "configure:1568: 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 @@ -1570,7 +1572,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:1587: \"$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 @@ -1644,7 +1646,7 @@ if test $hpuxcma = true; then fi echo $ac_n "checking whether to build shared libraries""... $ac_c" 1>&6 -echo "configure:1648: checking whether to build shared libraries" >&5 +echo "configure:1650: 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 @@ -1663,7 +1665,7 @@ echo "$ac_t""$enabled" 1>&6 echo $ac_n "checking whether to build static libraries""... $ac_c" 1>&6 -echo "configure:1667: checking whether to build static libraries" >&5 +echo "configure:1669: 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 @@ -1681,7 +1683,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:1685: checking for $ac_word" >&5 +echo "configure:1687: 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 @@ -1711,7 +1713,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:1715: checking for $ac_word" >&5 +echo "configure:1717: 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 @@ -1746,7 +1748,7 @@ fi echo $ac_n "checking whether to enable renaming of symbols""... $ac_c" 1>&6 -echo "configure:1750: checking whether to enable renaming of symbols" >&5 +echo "configure:1752: checking whether to enable renaming of symbols" >&5 enabled=yes U_DISABLE_RENAMING=0 # Check whether --enable-renaming or --disable-renaming was given. @@ -1779,21 +1781,21 @@ fi echo $ac_n "checking for definition of U_INLINE for C""... $ac_c" 1>&6 -echo "configure:1783: checking for definition of U_INLINE for C" >&5 +echo "configure:1785: 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:1799: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_inline=$ac_kw; break else @@ -1842,7 +1844,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:1846: checking for pthread_create in -lcma" >&5 +echo "configure:1848: 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 @@ -1850,7 +1852,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: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 @@ -1895,7 +1897,7 @@ fi else echo $ac_n "checking for pthread_attr_init in -lpthread""... $ac_c" 1>&6 -echo "configure:1899: checking for pthread_attr_init in -lpthread" >&5 +echo "configure:1901: 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 @@ -1903,7 +1905,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpthread $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1920: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1949,7 +1951,7 @@ fi echo $ac_n "checking for library containing pthread_mutex_destroy""... $ac_c" 1>&6 -echo "configure:1953: checking for library containing pthread_mutex_destroy" >&5 +echo "configure:1955: 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 @@ -1958,7 +1960,7 @@ ac_cv_search_pthread_mutex_destroy="no" for i in pthread pthreads c_r cma; do LIBS="-l$i $ac_func_search_save_LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1975: \"$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 @@ -1981,7 +1983,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:1998: \"$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 @@ -2016,7 +2018,7 @@ fi ICU_USE_THREADS=1 else echo $ac_n "checking for pthread_mutex_init in -lpthread""... $ac_c" 1>&6 -echo "configure:2020: checking for pthread_mutex_init in -lpthread" >&5 +echo "configure:2022: 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 @@ -2024,7 +2026,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:2041: \"$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 @@ -2068,12 +2070,12 @@ fi fi echo $ac_n "checking for pthread_mutex_lock""... $ac_c" 1>&6 -echo "configure:2072: checking for pthread_mutex_lock" >&5 +echo "configure:2074: 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:2102: \"$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 @@ -2130,12 +2132,12 @@ fi # Do this check instead. HAVE_MMAP=0 echo $ac_n "checking for mmap""... $ac_c" 1>&6 -echo "configure:2134: checking for mmap" >&5 +echo "configure:2136: 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 < @@ -2147,7 +2149,7 @@ int main() { mmap((void *)0, 0, PROT_READ, 0, 0, 0); ; return 0; } EOF -if { (eval echo configure:2151: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2153: \"$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 @@ -2167,7 +2169,7 @@ fi echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:2171: checking how to run the C preprocessor" >&5 +echo "configure:2173: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -2182,13 +2184,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:2192: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2194: \"$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 : @@ -2199,13 +2201,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:2209: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2211: \"$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 : @@ -2216,13 +2218,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:2226: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2228: \"$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 : @@ -2250,17 +2252,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:2254: checking for $ac_hdr" >&5 +echo "configure:2256: 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:2264: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2266: \"$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* @@ -2327,16 +2329,16 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross echo $ac_n "checking iostream usability""... $ac_c" 1>&6 -echo "configure:2331: checking iostream usability" >&5 +echo "configure:2333: checking iostream usability" >&5 cat > conftest.$ac_ext < int main() { ; return 0; } EOF -if { (eval echo configure:2340: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2342: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_iostream=yes else @@ -2352,7 +2354,7 @@ rm -f conftest* U_IOSTREAM_SOURCE=199711 else echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6 -echo "configure:2356: checking how to run the C++ preprocessor" >&5 +echo "configure:2358: 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 @@ -2365,12 +2367,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:2374: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2376: \"$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 : @@ -2396,17 +2398,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:2400: checking for iostream.h" >&5 +echo "configure:2402: 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:2410: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2412: \"$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* @@ -2429,19 +2431,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:2433: checking whether ostream is really defined" >&5 +echo "configure:2435: 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:2445: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2447: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_iostream_ok=yes else @@ -2480,14 +2482,14 @@ cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6 -echo "configure:2484: checking whether byte ordering is bigendian" >&5 +echo "configure:2486: 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 @@ -2498,11 +2500,11 @@ int main() { #endif ; return 0; } EOF -if { (eval echo configure:2502: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2504: \"$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 @@ -2513,7 +2515,7 @@ int main() { #endif ; return 0; } EOF -if { (eval echo configure:2517: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2519: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_bigendian=yes else @@ -2533,7 +2535,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:2552: \"$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 @@ -2581,12 +2583,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:2585: checking for nl_langinfo" >&5 +echo "configure:2587: 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:2615: \"$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 @@ -2632,21 +2634,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:2636: checking for nl_langinfo's argument to obtain the codeset" >&5 +echo "configure:2638: 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:2650: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2652: \"$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 @@ -2676,12 +2678,12 @@ cross_compiling=$ac_cv_prog_cxx_cross U_HAVE_NAMESPACE=0 echo $ac_n "checking for namespace support""... $ac_c" 1>&6 -echo "configure:2680: checking for namespace support" >&5 +echo "configure:2682: 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:2697: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_namespace_ok=yes else @@ -2719,12 +2721,12 @@ ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$a cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking for tzset""... $ac_c" 1>&6 -echo "configure:2723: checking for tzset" >&5 +echo "configure:2725: 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:2753: \"$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 @@ -2771,12 +2773,12 @@ then U_TZSET=tzset else echo $ac_n "checking for _tzset""... $ac_c" 1>&6 -echo "configure:2775: checking for _tzset" >&5 +echo "configure:2777: 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:2805: \"$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 @@ -2825,12 +2827,12 @@ fi fi echo $ac_n "checking for tzname""... $ac_c" 1>&6 -echo "configure:2829: checking for tzname" >&5 +echo "configure:2831: 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:2849: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_var_tzname=yes else @@ -2860,12 +2862,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:2864: checking for _tzname" >&5 +echo "configure:2866: 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[]; @@ -2874,7 +2876,7 @@ int main() { atoi(*_tzname); ; return 0; } EOF -if { (eval echo configure:2878: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2880: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_var__tzname=yes else @@ -2894,12 +2896,12 @@ fi echo $ac_n "checking for timezone""... $ac_c" 1>&6 -echo "configure:2898: checking for timezone" >&5 +echo "configure:2900: 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:2919: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_var_timezone=yes else @@ -2932,12 +2934,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:2936: checking for __timezone" >&5 +echo "configure:2938: 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 < @@ -2945,7 +2947,7 @@ int main() { __timezone = 1; ; return 0; } EOF -if { (eval echo configure:2949: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2951: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_var___timezone=yes else @@ -2963,12 +2965,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:2967: checking for _timezone" >&5 +echo "configure:2969: 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 < @@ -2976,7 +2978,7 @@ int main() { _timezone = 1; ; return 0; } EOF -if { (eval echo configure:2980: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2982: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_var__timezone=yes else @@ -2999,12 +3001,12 @@ fi echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:3003: checking for ANSI C header files" >&5 +echo "configure:3005: 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 @@ -3012,7 +3014,7 @@ else #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3016: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3018: \"$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* @@ -3029,7 +3031,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 @@ -3047,7 +3049,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 @@ -3068,7 +3070,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -3079,7 +3081,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } EOF -if { (eval echo configure:3083: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3085: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -3103,12 +3105,12 @@ EOF fi echo $ac_n "checking for int8_t""... $ac_c" 1>&6 -echo "configure:3107: checking for int8_t" >&5 +echo "configure:3109: 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 @@ -3136,12 +3138,12 @@ EOF fi echo $ac_n "checking for uint8_t""... $ac_c" 1>&6 -echo "configure:3140: checking for uint8_t" >&5 +echo "configure:3142: 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 @@ -3169,12 +3171,12 @@ EOF fi echo $ac_n "checking for int16_t""... $ac_c" 1>&6 -echo "configure:3173: checking for int16_t" >&5 +echo "configure:3175: 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 @@ -3202,12 +3204,12 @@ EOF fi echo $ac_n "checking for uint16_t""... $ac_c" 1>&6 -echo "configure:3206: checking for uint16_t" >&5 +echo "configure:3208: 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 @@ -3235,12 +3237,12 @@ EOF fi echo $ac_n "checking for int32_t""... $ac_c" 1>&6 -echo "configure:3239: checking for int32_t" >&5 +echo "configure:3241: 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 @@ -3268,12 +3270,12 @@ EOF fi echo $ac_n "checking for uint32_t""... $ac_c" 1>&6 -echo "configure:3272: checking for uint32_t" >&5 +echo "configure:3274: 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 @@ -3301,12 +3303,12 @@ EOF fi echo $ac_n "checking for int64_t""... $ac_c" 1>&6 -echo "configure:3305: checking for int64_t" >&5 +echo "configure:3307: 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 @@ -3334,12 +3336,12 @@ EOF fi echo $ac_n "checking for uint64_t""... $ac_c" 1>&6 -echo "configure:3338: checking for uint64_t" >&5 +echo "configure:3340: 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 @@ -3425,17 +3427,17 @@ fi ac_safe=`echo "wchar.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for wchar.h""... $ac_c" 1>&6 -echo "configure:3429: checking for wchar.h" >&5 +echo "configure:3431: 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:3439: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3441: \"$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* @@ -3468,14 +3470,14 @@ EOF U_HAVE_WCHAR_H=1 echo $ac_n "checking for library containing wcscpy""... $ac_c" 1>&6 -echo "configure:3472: checking for library containing wcscpy" >&5 +echo "configure:3474: 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:3492: \"$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 @@ -3497,7 +3499,7 @@ rm -f conftest* test "$ac_cv_search_wcscpy" = "no" && for i in wcs; do LIBS="-l$i $ac_func_search_save_LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3514: \"$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 @@ -3539,7 +3541,7 @@ fi ac_default_sizeof_wchar_t=4 echo $ac_n "checking size of wchar_t""... $ac_c" 1>&6 -echo "configure:3543: checking size of wchar_t" >&5 +echo "configure:3545: 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 @@ -3547,7 +3549,7 @@ else ac_cv_sizeof_wchar_t=$ac_default_sizeof_wchar_t else cat > conftest.$ac_ext < @@ -3565,7 +3567,7 @@ main() exit(0); } EOF -if { (eval echo configure:3569: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3571: \"$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 @@ -3747,7 +3749,7 @@ esac echo $ac_n "checking for a library suffix to use""... $ac_c" 1>&6 -echo "configure:3751: checking for a library suffix to use" >&5 +echo "configure:3753: checking for a library suffix to use" >&5 # Check whether --with-library-suffix or --without-library-suffix was given. if test "${with_library_suffix+set}" = set; then withval="$with_library_suffix" diff --git a/icu4c/source/configure.in b/icu4c/source/configure.in index 3ec2af8b12..28dde7aab3 100644 --- a/icu4c/source/configure.in +++ b/icu4c/source/configure.in @@ -4,7 +4,7 @@ dnl Copyright (c) 1999-2000, International Business Machines Corporation and dnl others. All Rights Reserved. dnl Stephen F. Booth, heavily modified by Yves and others -dnl $Id: configure.in,v 1.167 2002/04/26 18:45:16 yves-oss Exp $ +dnl $Id: configure.in,v 1.168 2002/05/01 23:48:08 grhoten-oss Exp $ dnl Process this file with autoconf to produce a configure script AC_INIT(common/unicode/utypes.h) @@ -39,7 +39,6 @@ AC_MSG_RESULT([release $VERSION, library $LIB_VERSION]) UNICODE_VERSION="3.1.1" AC_SUBST(UNICODE_VERSION) -CPPFLAGS="${CPPFLAGS} -I." AC_SUBST(CPPFLAGS) dnl Checks for programs diff --git a/icu4c/source/extra/uconv/Makefile.in b/icu4c/source/extra/uconv/Makefile.in index 6521d7a1c2..5ed997b61e 100644 --- a/icu4c/source/extra/uconv/Makefile.in +++ b/icu4c/source/extra/uconv/Makefile.in @@ -43,20 +43,12 @@ CLEANFILES = *~ $(DEPS) $(ALL_MAN_FILES) ## Target information TARGET = uconv -DEFS = @DEFS@ -CPPFLAGS = @CPPFLAGS@ -I$(top_builddir)/common -I$(top_srcdir)/common -I$(top_srcdir)/i18n -I$(srcdir)/../toolutil -CFLAGS = @CFLAGS@ -CXXFLAGS = @CXXFLAGS@ -ENABLE_RPATH = @ENABLE_RPATH@ -ifeq ($(ENABLE_RPATH),YES) -RPATHLDFLAGS = $(LD_RPATH)$(LD_RPATH_PRE)$(libdir) -endif -LDFLAGS = @LDFLAGS@ $(RPATHLDFLAGS) -LIBS = $(LIBICUI18N) $(LIBICUUC) @LIBS@ @LIB_M@ +DEFS += -I$(top_builddir)/common -I$(top_srcdir)/common -I$(top_srcdir)/i18n -I$(srcdir)/../toolutil +LIBS = $(LIBICUI18N) $(LIBICUUC) $(DEFAULT_LIBS) $(LIB_M) ifeq ($(UCONVMSG_STATIC),YES) LIBS += -L$(MSGNAME) -l$(MSGNAME) -CPPFLAGS += -DUCONVMSG_STATIC=$(MSGNAME) +DEFS += -DUCONVMSG_STATIC=$(MSGNAME) UCONVMSG_LIB = $(RESDIR)/lib$(MSGNAME).a PKGMODE = static diff --git a/icu4c/source/extra/ustdio/Makefile.in b/icu4c/source/extra/ustdio/Makefile.in index 391a2e4524..e25eeb473c 100644 --- a/icu4c/source/extra/ustdio/Makefile.in +++ b/icu4c/source/extra/ustdio/Makefile.in @@ -39,7 +39,8 @@ DYNAMICCPPFLAGS = $(SHAREDLIBCPPFLAGS) DYNAMICCFLAGS = $(SHAREDLIBCFLAGS) DYNAMICCXXFLAGS = $(SHAREDLIBCXXFLAGS) -CPPFLAGS += $(LIBCPPFLAGS) -I$(top_builddir)/common -I$(top_srcdir)/common -I$(top_srcdir)/i18n +CPPFLAGS += $(LIBCPPFLAGS) +DEFS += -I$(top_builddir)/common -I$(top_srcdir)/common -I$(top_srcdir)/i18n LIBS = $(LIBICUUC) $(LIBICUI18N) $(DEFAULT_LIBS) OBJECTS = locbund.o loccache.o ufile.o ufmt_cmn.o uprintf.o uprntf_p.o \ diff --git a/icu4c/source/i18n/Makefile.in b/icu4c/source/i18n/Makefile.in index 0df07a48be..6f62a3e901 100644 --- a/icu4c/source/i18n/Makefile.in +++ b/icu4c/source/i18n/Makefile.in @@ -39,7 +39,8 @@ DYNAMICCPPFLAGS = $(SHAREDLIBCPPFLAGS) DYNAMICCFLAGS = $(SHAREDLIBCFLAGS) DYNAMICCXXFLAGS = $(SHAREDLIBCXXFLAGS) -CPPFLAGS += $(LIBCPPFLAGS) -I$(srcdir) -I$(top_builddir)/common -I$(top_srcdir)/common +CPPFLAGS += $(LIBCPPFLAGS) +DEFS += -I$(srcdir) -I$(top_builddir)/common -I$(top_srcdir)/common LIBS = $(LIBICUUC) $(DEFAULT_LIBS) OBJECTS = ucln_in.o \ diff --git a/icu4c/source/icudefs.mk.in b/icu4c/source/icudefs.mk.in index 5521b714b6..8769e6c609 100644 --- a/icu4c/source/icudefs.mk.in +++ b/icu4c/source/icudefs.mk.in @@ -92,7 +92,7 @@ RANLIB = @RANLIB@ # Various flags for the tools -DEFS = @DEFS@ +DEFS = -I. @DEFS@ CFLAGS = @CFLAGS@ CPPFLAGS = @CPPFLAGS@ CXXFLAGS = @CXXFLAGS@ @@ -115,16 +115,16 @@ ECHO_N = @ECHO_N@ ECHO_C = @ECHO_C@ # Commands to compile -COMPILE.c= $(CC) $(DEFS) $(CPPFLAGS) $(CFLAGS) -c -COMPILE.cc= $(CXX) $(DEFS) $(CPPFLAGS) $(CXXFLAGS) -c +COMPILE.c= $(CC) $(CPPFLAGS) $(CFLAGS) $(DEFS) -c +COMPILE.cc= $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(DEFS) -c # Commands to link -LINK.c= $(CC) $(DEFS) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -LINK.cc= $(CXX) $(DEFS) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) +LINK.c= $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) +LINK.cc= $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) # Commands to make a shared library -SHLIB.c= $(CC) $(DEFS) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -shared -SHLIB.cc= $(CXX) $(DEFS) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -shared +SHLIB.c= $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -shared +SHLIB.cc= $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -shared # Environment variable to set a runtime search path LDLIBRARYPATH_ENVVAR = LD_LIBRARY_PATH diff --git a/icu4c/source/layout/Makefile.in b/icu4c/source/layout/Makefile.in index 6799f45fb2..ae75527cac 100644 --- a/icu4c/source/layout/Makefile.in +++ b/icu4c/source/layout/Makefile.in @@ -11,9 +11,6 @@ top_builddir = .. include $(top_builddir)/icudefs.mk -## Platform-specific setup -include @platform_make_fragment@ - ## Build directory information subdir = layout @@ -22,14 +19,10 @@ CLEANFILES = *~ $(DEPS) ## Target information -ENABLE_STATIC = @ENABLE_STATIC@ -ENABLE_SHARED = @ENABLE_SHARED@ - TARGET_STUBNAME=le ifneq ($(ENABLE_STATIC),) TARGET = $(LIBICU)$(TARGET_STUBNAME)$(ICULIBSUFFIX).a -RANLIB = @RANLIB@ endif ifneq ($(ENABLE_SHARED),) @@ -43,17 +36,9 @@ DYNAMICCPPFLAGS = $(SHAREDLIBCPPFLAGS) DYNAMICCFLAGS = $(SHAREDLIBCFLAGS) DYNAMICCXXFLAGS = $(SHAREDLIBCXXFLAGS) -DEFS = @DEFS@ -CPPFLAGS = @CPPFLAGS@ $(LIBCPPFLAGS) -I$(srcdir) -I$(top_builddir)/common -I$(srcdir)/unicode -I$(srcdir)/.. -I$(top_builddir)/common -I$(top_srcdir)/common -CFLAGS = @CFLAGS@ -CXXFLAGS = @CXXFLAGS@ -ENABLE_RPATH = @ENABLE_RPATH@ -ifeq ($(ENABLE_RPATH),YES) -RPATHLDFLAGS = $(LD_RPATH)$(LD_RPATH_PRE)$(libdir) -endif -LDFLAGS = @LDFLAGS@ $(RPATHLDFLAGS) -#LIBS = $(LIBICUUC) @LIBS@ -LIBS= @LIBS@ +CPPFLAGS += $(LIBCPPFLAGS) +DEFS += -I$(srcdir) -I$(top_builddir)/common -I$(srcdir)/unicode -I$(srcdir)/.. -I$(top_builddir)/common -I$(top_srcdir)/common +LIBS = $(DEFAULT_LIBS) OBJECTS = loengine.o \ diff --git a/icu4c/source/stubdata/Makefile.in b/icu4c/source/stubdata/Makefile.in index b8d4f4e90d..313ceadf5a 100644 --- a/icu4c/source/stubdata/Makefile.in +++ b/icu4c/source/stubdata/Makefile.in @@ -39,7 +39,8 @@ DYNAMICCPPFLAGS = $(SHAREDLIBCPPFLAGS) DYNAMICCFLAGS = $(SHAREDLIBCFLAGS) DYNAMICCXXFLAGS = $(SHAREDLIBCXXFLAGS) -CPPFLAGS += $(LIBCPPFLAGS) -I$(top_builddir)/common -I$(top_srcdir)/common +CPPFLAGS += $(LIBCPPFLAGS) +DEFS += -I$(top_builddir)/common -I$(top_srcdir)/common OBJECTS = stubdata.o diff --git a/icu4c/source/test/cintltst/Makefile.in b/icu4c/source/test/cintltst/Makefile.in index 939c4f1a03..a02e1e19e2 100644 --- a/icu4c/source/test/cintltst/Makefile.in +++ b/icu4c/source/test/cintltst/Makefile.in @@ -32,7 +32,7 @@ endif BUILDDIR := $(shell pwd)/../.. # we define ICU_UNICODE_VERSION so we can test it -CPPFLAGS += -I$(top_builddir)/common -I$(top_srcdir)/common -I$(top_srcdir)/i18n -I$(top_srcdir)/tools/ctestfw -I$(top_srcdir)/tools/toolutil \ +DEFS += -I$(top_builddir)/common -I$(top_srcdir)/common -I$(top_srcdir)/i18n -I$(top_srcdir)/tools/ctestfw -I$(top_srcdir)/tools/toolutil \ -DICU_UNICODE_VERSION=\"$(UNICODE_VERSION)\" -DICU_VERSION=\"@VERSION@\" -DICUDATA_NAME=\"$(ICUDATA_PLATFORM_NAME)\" -DU_TOPSRCDIR=\"$(top_srcdir)/\" -DU_TOPBUILDDIR=\"$(BUILDDIR)\" LIBS = $(LIBCTESTFW) $(LIBICUI18N) $(LIBICUUC) $(LIBICUTOOLUTIL) $(DEFAULT_LIBS) $(LIB_M) diff --git a/icu4c/source/test/ieeetest/Makefile.in b/icu4c/source/test/ieeetest/Makefile.in index 0d93073eea..e70e018aff 100644 --- a/icu4c/source/test/ieeetest/Makefile.in +++ b/icu4c/source/test/ieeetest/Makefile.in @@ -19,7 +19,7 @@ CLEANFILES = *~ $(DEPS) ## Target information TARGET = ieeetest -CPPFLAGS += -I$(top_builddir)/common -I$(top_srcdir)/common +DEFS += -I$(top_builddir)/common -I$(top_srcdir)/common LIBS = $(LIBICUUC) $(DEFAULT_LIBS) $(LIB_M) OBJECTS = ieeetest.o diff --git a/icu4c/source/test/intltest/Makefile.in b/icu4c/source/test/intltest/Makefile.in index 1a45131c9f..02dff89f2a 100644 --- a/icu4c/source/test/intltest/Makefile.in +++ b/icu4c/source/test/intltest/Makefile.in @@ -20,7 +20,7 @@ CLEANFILES = *~ $(DEPS) TARGET = intltest BUILDDIR := $(shell pwd)/../.. -CPPFLAGS += -I$(top_builddir)/common -I$(top_srcdir)/common -I$(top_srcdir)/i18n -I$(top_srcdir)/tools/toolutil -D'U_TOPSRCDIR="$(top_srcdir)/"' -D'U_TOPBUILDDIR="$(BUILDDIR)"' +DEFS += -I$(top_builddir)/common -I$(top_srcdir)/common -I$(top_srcdir)/i18n -I$(top_srcdir)/tools/toolutil -D'U_TOPSRCDIR="$(top_srcdir)/"' -D'U_TOPBUILDDIR="$(BUILDDIR)"' LIBS = $(LIBICUI18N) $(LIBICUUC) $(LIBICUTOOLUTIL) $(DEFAULT_LIBS) $(LIB_M) OBJECTS = allcoll.o apicoll.o callimts.o calregts.o caltest.o \ diff --git a/icu4c/source/test/iotest/Makefile.in b/icu4c/source/test/iotest/Makefile.in index 1cffb29c2b..6f5eec6379 100644 --- a/icu4c/source/test/iotest/Makefile.in +++ b/icu4c/source/test/iotest/Makefile.in @@ -19,10 +19,8 @@ CLEANFILES = *~ $(DEPS) ## Target information TARGET = iotest -BUILDDIR := $(shell pwd)/../.. - -# we define ICU_UNICODE_VERSION so we can test it -CPPFLAGS += -I$(top_builddir)/common -I$(top_srcdir)/common -I$(top_srcdir)/i18n -I$(top_srcdir)/tools/ctestfw -I$(top_srcdir)/tools/toolutil \ +DEFS += -I$(top_builddir)/common -I$(top_srcdir)/common -I$(top_srcdir)/i18n \ +-I$(top_srcdir)/tools/ctestfw -I$(top_srcdir)/tools/toolutil \ -I$(top_srcdir)/extra/ustdio LIBS = $(LIBCTESTFW) $(LIBICUI18N) $(LIBICUUC) $(LIBICUTOOLUTIL) $(LIBUSTDIO) $(DEFAULT_LIBS) $(LIB_M) @@ -61,7 +59,7 @@ distclean-local: clean-local -include Makefile.local check-local: all-local - TZ=PST8PDT $(INVOKE) ./$(TARGET) $(CINTLTEST_OPTS) + TZ=PST8PDT $(INVOKE) ./$(TARGET) $(IOTEST_OPTS) Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ diff --git a/icu4c/source/tools/ctestfw/Makefile.in b/icu4c/source/tools/ctestfw/Makefile.in index 14661b71e7..c9285a967d 100644 --- a/icu4c/source/tools/ctestfw/Makefile.in +++ b/icu4c/source/tools/ctestfw/Makefile.in @@ -11,9 +11,6 @@ top_builddir = ../.. include $(top_builddir)/icudefs.mk -## Platform-specific setup -include @platform_make_fragment@ - ## Build directory information subdir = tools/ctestfw @@ -21,14 +18,9 @@ subdir = tools/ctestfw CLEANFILES = *~ $(DEPS) $(ALL_TARGETS) ## Target information -#TARGET = libctestfw.$(SO) - -ENABLE_STATIC = @ENABLE_STATIC@ -ENABLE_SHARED = @ENABLE_SHARED@ ifneq ($(ENABLE_STATIC),) TARGET = $(LIBICU)ctestfw$(ICULIBSUFFIX).a -RANLIB = @RANLIB@ endif ifneq ($(ENABLE_SHARED),) @@ -42,12 +34,7 @@ DYNAMICCPPFLAGS = $(SHAREDLIBCPPFLAGS) DYNAMICCFLAGS = $(SHAREDLIBCFLAGS) DYNAMICCXXFLAGS = $(SHAREDLIBCXXFLAGS) -DEFS = @DEFS@ -CPPFLAGS = @CPPFLAGS@ -CFLAGS = @CFLAGS@ -CXXFLAGS = @CXXFLAGS@ -LDFLAGS = @LDFLAGS@ -LIBS = @LIBS@ +LIBS = $(DEFAULT_LIBS) OBJECTS = ctest.o diff --git a/icu4c/source/tools/genccode/Makefile.in b/icu4c/source/tools/genccode/Makefile.in index 79ab6e315f..47716bea7d 100644 --- a/icu4c/source/tools/genccode/Makefile.in +++ b/icu4c/source/tools/genccode/Makefile.in @@ -28,7 +28,8 @@ CLEANFILES = *~ $(DEPS) $(RES_FILES) $(TEST_FILES) $(ALL_MAN_FILES) ## Target information TARGET = genccode -CPPFLAGS += -I$(top_builddir)/common -I$(top_srcdir)/common -I$(srcdir)/../toolutil $(BIR_CPPFLAGS) +CPPFLAGS += $(BIR_CPPFLAGS) +DEFS += -I$(top_builddir)/common -I$(top_srcdir)/common -I$(srcdir)/../toolutil LIBS = $(LIBICUUC) $(DEFAULT_LIBS) $(LIB_M) $(LIBICUTOOLUTIL) OBJECTS = genccode.o diff --git a/icu4c/source/tools/gencmn/Makefile.in b/icu4c/source/tools/gencmn/Makefile.in index d05fce4b2f..1b078e1834 100644 --- a/icu4c/source/tools/gencmn/Makefile.in +++ b/icu4c/source/tools/gencmn/Makefile.in @@ -29,7 +29,8 @@ CLEANFILES = *~ mkmap.tmp $(DEPS) $(RES_FILES) $(TEST_FILES) $(DECMN_DEP) $(ALL_ TARGET = gencmn DECMN = decmn -CPPFLAGS += -I$(top_builddir)/common -I$(top_srcdir)/common -I$(srcdir)/../toolutil $(BIR_CPPFLAGS) +CPPFLAGS += $(BIR_CPPFLAGS) +DEFS += -I$(top_builddir)/common -I$(top_srcdir)/common -I$(srcdir)/../toolutil LIBS = $(LIBICUTOOLUTIL) $(LIBICUUC) $(DEFAULT_LIBS) $(LIB_M) OBJECTS = gencmn.o diff --git a/icu4c/source/tools/gencnval/Makefile.in b/icu4c/source/tools/gencnval/Makefile.in index ce8f9c2af9..79409b31c4 100644 --- a/icu4c/source/tools/gencnval/Makefile.in +++ b/icu4c/source/tools/gencnval/Makefile.in @@ -34,7 +34,7 @@ CLEANFILES = *~ $(GENERATED_MAN_FILES) $(DEPS) $(RES_FILES) $(TEST_FILES) ## Target information TARGET = gencnval -CPPFLAGS += -I$(top_builddir)/common -I$(top_srcdir)/common -I$(srcdir)/../toolutil +DEFS += -I$(top_builddir)/common -I$(top_srcdir)/common -I$(srcdir)/../toolutil LIBS = $(LIBICUTOOLUTIL) $(LIBICUUC) $(DEFAULT_LIBS) $(LIB_M) OBJECTS = gencnval.o diff --git a/icu4c/source/tools/gennames/Makefile.in b/icu4c/source/tools/gennames/Makefile.in index 86b9297d5a..39bf37eb10 100644 --- a/icu4c/source/tools/gennames/Makefile.in +++ b/icu4c/source/tools/gennames/Makefile.in @@ -34,7 +34,7 @@ CLEANFILES = *~ $(DEPS) $(RES_FILES) $(TEST_FILES) $(ALL_MAN_FILES) ## Target information TARGET = gennames -CPPFLAGS += -I$(top_builddir)/common -I$(top_srcdir)/common -I$(srcdir)/../toolutil +DEFS += -I$(top_builddir)/common -I$(top_srcdir)/common -I$(srcdir)/../toolutil LIBS = $(LIBICUTOOLUTIL) $(LIBICUUC) $(DEFAULT_LIBS) $(LIB_M) OBJECTS = gennames.o diff --git a/icu4c/source/tools/gennorm/Makefile.in b/icu4c/source/tools/gennorm/Makefile.in index 92fd25b06e..a7d2755f22 100644 --- a/icu4c/source/tools/gennorm/Makefile.in +++ b/icu4c/source/tools/gennorm/Makefile.in @@ -29,7 +29,7 @@ CLEANFILES = *~ $(DEPS) $(RES_FILES) $(TEST_FILES) $(MAN_FILES) ## Target information TARGET = gennorm -CPPFLAGS += -I$(top_builddir)/common -I$(top_srcdir)/common -I$(srcdir)/../toolutil +DEFS += -I$(top_builddir)/common -I$(top_srcdir)/common -I$(srcdir)/../toolutil LIBS = $(LIBICUTOOLUTIL) $(LIBICUUC) $(DEFAULT_LIBS) $(LIB_M) OBJECTS = gennorm.o store.o diff --git a/icu4c/source/tools/genprops/Makefile.in b/icu4c/source/tools/genprops/Makefile.in index 3a58c93a51..a2c27c9d9e 100644 --- a/icu4c/source/tools/genprops/Makefile.in +++ b/icu4c/source/tools/genprops/Makefile.in @@ -29,7 +29,7 @@ CLEANFILES = *~ $(DEPS) $(RES_FILES) $(TEST_FILES) $(MAN_FILES) ## Target information TARGET = genprops -CPPFLAGS += -I$(top_builddir)/common -I$(top_srcdir)/common -I$(srcdir)/../toolutil +DEFS += -I$(top_builddir)/common -I$(top_srcdir)/common -I$(srcdir)/../toolutil LIBS = $(LIBICUTOOLUTIL) $(LIBICUUC) $(DEFAULT_LIBS) $(LIB_M) OBJECTS = genprops.o props2.o propsvec.o store.o diff --git a/icu4c/source/tools/genrb/Makefile.in b/icu4c/source/tools/genrb/Makefile.in index e478beba13..3f731a64cb 100644 --- a/icu4c/source/tools/genrb/Makefile.in +++ b/icu4c/source/tools/genrb/Makefile.in @@ -26,7 +26,7 @@ CLEANFILES = *~ $(MAN_FILES) $(DEPS) TARGET = genrb DERB = derb -CPPFLAGS += -I$(top_builddir)/common -I$(top_srcdir)/common -I$(top_srcdir)/i18n -I$(srcdir)/../toolutil +DEFS += -I$(top_builddir)/common -I$(top_srcdir)/common -I$(top_srcdir)/i18n -I$(srcdir)/../toolutil LIBS = $(LIBICUI18N) $(LIBICUTOOLUTIL) $(LIBICUUC) $(DEFAULT_LIBS) $(LIB_M) OBJECTS = errmsg.o genrb.o parse.o read.o reslist.o ustr.o util.o \ diff --git a/icu4c/source/tools/gentest/Makefile.in b/icu4c/source/tools/gentest/Makefile.in index ea86e4ec7f..7e30818ded 100644 --- a/icu4c/source/tools/gentest/Makefile.in +++ b/icu4c/source/tools/gentest/Makefile.in @@ -25,7 +25,7 @@ CLEANFILES = *~ $(DEPS) $(RES_FILES) $(TEST_FILES) ## Target information TARGET = gentest -CPPFLAGS += -I$(top_builddir)/common -I$(top_srcdir)/common -I$(srcdir)/../toolutil +DEFS += -I$(top_builddir)/common -I$(top_srcdir)/common -I$(srcdir)/../toolutil LIBS = $(LIBICUTOOLUTIL) $(LIBICUUC) $(DEFAULT_LIBS) $(LIB_M) OBJECTS = gentest.o diff --git a/icu4c/source/tools/gentz/Makefile.in b/icu4c/source/tools/gentz/Makefile.in index 48a95710e8..c81427ebb9 100644 --- a/icu4c/source/tools/gentz/Makefile.in +++ b/icu4c/source/tools/gentz/Makefile.in @@ -31,7 +31,7 @@ CLEANFILES = *~ $(DEPS) $(RES_FILES) $(TEST_FILES) $(MAN_FILES) ## Target information TARGET = gentz -CPPFLAGS += -I$(top_builddir)/common -I$(top_srcdir)/common -I$(top_srcdir)/i18n -I$(srcdir)/../toolutil +DEFS += -I$(top_builddir)/common -I$(top_srcdir)/common -I$(top_srcdir)/i18n -I$(srcdir)/../toolutil LIBS = $(LIBICUTOOLUTIL) $(LIBICUUC) $(DEFAULT_LIBS) $(LIB_M) OBJECTS = gentz.o diff --git a/icu4c/source/tools/genuca/Makefile.in b/icu4c/source/tools/genuca/Makefile.in index 70fe6386c8..fd9e5549c7 100644 --- a/icu4c/source/tools/genuca/Makefile.in +++ b/icu4c/source/tools/genuca/Makefile.in @@ -25,7 +25,7 @@ CLEANFILES = *~ $(TARGET).$(SECTION) $(DEPS) ## Target information TARGET = genuca -CPPFLAGS += -I$(top_builddir)/common -I$(top_srcdir)/common -I$(top_srcdir)/i18n -I$(top_srcdir)/extra/ustdio -I$(srcdir)/../toolutil +DEFS += -I$(top_builddir)/common -I$(top_srcdir)/common -I$(top_srcdir)/i18n -I$(srcdir)/../toolutil LIBS = $(LIBICUI18N) $(LIBICUTOOLUTIL) $(LIBICUUC) $(DEFAULT_LIBS) $(LIB_M) OBJECTS = genuca.o diff --git a/icu4c/source/tools/makeconv/Makefile.in b/icu4c/source/tools/makeconv/Makefile.in index 47f9644cd0..0129d83c03 100644 --- a/icu4c/source/tools/makeconv/Makefile.in +++ b/icu4c/source/tools/makeconv/Makefile.in @@ -31,7 +31,7 @@ CLEANFILES = *~ $(GENERATED_MAN_FILES) $(DEPS) $(CNV_FILES) $(TEST_CNV_FILES) ## Target information TARGET = makeconv -CPPFLAGS += -I$(top_builddir)/common -I$(top_srcdir)/common -I$(srcdir)/../toolutil +DEFS += -I$(top_builddir)/common -I$(top_srcdir)/common -I$(srcdir)/../toolutil LIBS = $(LIBICUTOOLUTIL) $(LIBICUUC) $(DEFAULT_LIBS) $(LIB_M) OBJECTS = makeconv.o ucnvstat.o genmbcs.o diff --git a/icu4c/source/tools/pkgdata/Makefile.in b/icu4c/source/tools/pkgdata/Makefile.in index 985a651c8a..7910c41834 100644 --- a/icu4c/source/tools/pkgdata/Makefile.in +++ b/icu4c/source/tools/pkgdata/Makefile.in @@ -28,7 +28,7 @@ CLEANFILES = *~ $(DEPS) $(RES_FILES) $(TEST_FILES) mkmap.tmp $(ALL_MAN_FILES) ## Target information TARGET = pkgdata -CPPFLAGS += -I$(top_builddir)/common -I$(top_srcdir)/common -I$(srcdir)/../toolutil -DUDATA_SO_SUFFIX=\".$(SO)\" -DSTATIC_O=\"$(STATIC_O)\" +DEFS += -I$(top_builddir)/common -I$(top_srcdir)/common -I$(srcdir)/../toolutil -DUDATA_SO_SUFFIX=\".$(SO)\" -DSTATIC_O=\"$(STATIC_O)\" LIBS = $(LIBICUTOOLUTIL) $(LIBICUUC) $(DEFAULT_LIBS) $(LIB_M) OBJECTS = pkgdata.o pkgtypes.o gmake.o dllmode.o cmnmode.o filemode.o sttcmode.o diff --git a/icu4c/source/tools/toolutil/Makefile.in b/icu4c/source/tools/toolutil/Makefile.in index 85b1071305..3fca94c25a 100644 --- a/icu4c/source/tools/toolutil/Makefile.in +++ b/icu4c/source/tools/toolutil/Makefile.in @@ -35,7 +35,8 @@ DYNAMICCPPFLAGS = $(SHAREDLIBCPPFLAGS) DYNAMICCFLAGS = $(SHAREDLIBCFLAGS) DYNAMICCXXFLAGS = $(SHAREDLIBCXXFLAGS) -CPPFLAGS += $(LIBCPPFLAGS) -I$(top_builddir)/common -I$(top_srcdir)/common -I$(top_srcdir)/i18n -I$(top_srcdir)/tools/ctestfw +CPPFLAGS += $(LIBCPPFLAGS) +DEFS += -I$(top_builddir)/common -I$(top_srcdir)/common -I$(top_srcdir)/i18n -I$(top_srcdir)/tools/ctestfw LIBS = $(LIBICUUC) $(DEFAULT_LIBS) OBJECTS = toolutil.o unewdata.o ucmpwrit.o uoptions.o uparse.o ucbuf.o