From 6cc2272493033dbd4b430fbeebfbe2ffe7a6598b Mon Sep 17 00:00:00 2001 From: George Rhoten Date: Thu, 5 Apr 2007 07:29:13 +0000 Subject: [PATCH] ICU-5677 Remove out of date AIX and HP-UX configurations, and remove some unused configure variables to increase script readability. X-SVN-Rev: 21355 --- icu4c/source/acconfig.h | 29 ------ icu4c/source/aclocal.m4 | 9 +- icu4c/source/common/unicode/platform.h.in | 3 +- icu4c/source/config/Makefile.inc.in | 4 +- icu4c/source/config/mh-aix | 115 ---------------------- icu4c/source/config/mh-hpux-cc | 76 -------------- icu4c/source/configure | 66 +------------ icu4c/source/configure.in | 65 ++---------- icu4c/source/data/icupkg.inc.in | 4 +- icu4c/source/extra/uconv/pkgdata.inc.in | 5 +- 10 files changed, 15 insertions(+), 361 deletions(-) delete mode 100644 icu4c/source/acconfig.h delete mode 100644 icu4c/source/config/mh-aix delete mode 100644 icu4c/source/config/mh-hpux-cc diff --git a/icu4c/source/acconfig.h b/icu4c/source/acconfig.h deleted file mode 100644 index 76fed55c54..0000000000 --- a/icu4c/source/acconfig.h +++ /dev/null @@ -1,29 +0,0 @@ -/* Copyright (c) 1999-2000, International Business Machines Corporation and - others. All Rights Reserved. */ -/* Define to signed char if not in */ -#undef int8_t - -/* Define to unsigned char if not in */ -#undef uint8_t - -/* Define to signed short if not in */ -#undef int16_t - -/* Define to unsigned short if not in */ -#undef uint16_t - -/* Define to signed long if not in */ -#undef int32_t - -/* Define to unsigned long if not in */ -#undef uint32_t - -/* Define to signed char if not in */ -#undef bool_t - -/* Define if your system has */ -#undef HAVE_WCHAR_H - -/* Define to the size of wchar_t */ -#undef SIZEOF_WCHAR_T - diff --git a/icu4c/source/aclocal.m4 b/icu4c/source/aclocal.m4 index fa0ab6433a..3a77f706ac 100644 --- a/icu4c/source/aclocal.m4 +++ b/icu4c/source/aclocal.m4 @@ -1,5 +1,5 @@ dnl aclocal.m4 for ICU -dnl Copyright (c) 1999-2006, International Business Machines Corporation and +dnl Copyright (c) 1999-2007, International Business Machines Corporation and dnl others. All Rights Reserved. dnl Stephen F. Booth @@ -48,11 +48,7 @@ powerpc*-*-linux*) if test "$GCC" = yes; then icu_cv_host_frag=mh-aix-gcc else - if test -n "`$CXX --help 2>&1 | grep 'IBM C and C++ Compilers$'`"; then - icu_cv_host_frag=mh-aix - else - icu_cv_host_frag=mh-aix-va - fi + icu_cv_host_frag=mh-aix-va fi ;; *-*-hpux*) if test "$GCC" = yes; then @@ -60,7 +56,6 @@ powerpc*-*-linux*) else case "$CXX" in *aCC) icu_cv_host_frag=mh-hpux-acc ;; - *CC) icu_cv_host_frag=mh-hpux-cc ;; esac fi ;; *-*ibm-openedition*|*-*-os390*) icu_cv_host_frag=mh-os390 ;; diff --git a/icu4c/source/common/unicode/platform.h.in b/icu4c/source/common/unicode/platform.h.in index ee1d919b85..1913f7a93e 100644 --- a/icu4c/source/common/unicode/platform.h.in +++ b/icu4c/source/common/unicode/platform.h.in @@ -1,7 +1,7 @@ /* ****************************************************************************** * -* Copyright (C) 1997-2006, International Business Machines +* Copyright (C) 1997-2007, International Business Machines * Corporation and others. All Rights Reserved. * ****************************************************************************** @@ -233,7 +233,6 @@ typedef unsigned int uint32_t; /* Information about POSIX support */ /*===========================================================================*/ -#define U_HAVE_NL_LANGINFO @U_HAVE_NL_LANGINFO@ #define U_HAVE_NL_LANGINFO_CODESET @U_HAVE_NL_LANGINFO_CODESET@ #define U_NL_LANGINFO_CODESET @U_NL_LANGINFO_CODESET@ diff --git a/icu4c/source/config/Makefile.inc.in b/icu4c/source/config/Makefile.inc.in index 1e93d27992..c0b1d3293e 100644 --- a/icu4c/source/config/Makefile.inc.in +++ b/icu4c/source/config/Makefile.inc.in @@ -1,6 +1,6 @@ ## -*-makefile-*- #****************************************************************************** -# Copyright (C) 1999-2006, International Business Machines +# Copyright (C) 1999-2007, International Business Machines # Corporation and others. All Rights Reserved. #****************************************************************************** # This Makefile.inc is designed to be included into projects which make use @@ -163,7 +163,6 @@ platform = @platform@ # *4* compiler flags and misc. options # ################################################################## -AIX_SHLIB = @AIX_SHLIB@ AR = @AR@ # initial tab keeps it out of the shell version. ARFLAGS := @ARFLAGS@ $(ARFLAGS) @@ -197,7 +196,6 @@ SHLIB.cc= $(CXX) $(DEFS) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -shared U_IS_BIG_ENDIAN = @U_IS_BIG_ENDIAN@ includedir = @includedir@ infodir = @infodir@ -ld_rpath_suf = @ld_rpath_suf@ localstatedir = @localstatedir@ mandir = @mandir@ oldincludedir = @oldincludedir@ diff --git a/icu4c/source/config/mh-aix b/icu4c/source/config/mh-aix deleted file mode 100644 index 755a8a530c..0000000000 --- a/icu4c/source/config/mh-aix +++ /dev/null @@ -1,115 +0,0 @@ -## -*-makefile-*- -## Aix-specific setup (for xlC) -## Copyright (c) 1999-2006, International Business Machines Corporation and -## others. All Rights Reserved. -## -## 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 - -## Commands to generate dependency files -GEN_DEPS.c= $(CC) -E -M $(DEFS) $(CPPFLAGS) -GEN_DEPS.cc= $(CXX) -E -M $(DEFS) $(CPPFLAGS) - -# Make the strings readonly. This helps in the common data library -CFLAGS += -qroconst -CXXFLAGS += -qroconst - -LDFLAGS += -brtl - -## We need to delete things prior to linking, or else we'll get -## SEVERE ERROR: output file in use .. on AIX. -## But, shell script version should NOT delete target as we don't -## have $@ in that context. (SH = only shell script, icu-config) -AIX_PREDELETE=rm -f $@ ; -#SH# AIX_PREDELETE= - - -## 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= $(AIX_PREDELETE) $(CXX) $(CXXFLAGS) $(LDFLAGS) -LINK.cc= $(AIX_PREDELETE) $(CXX) $(CXXFLAGS) $(LDFLAGS) - -## Commands to make a shared library -SHLIB.c= $(AIX_PREDELETE) $(AIX_SHLIB) -p 5000 $(LDFLAGS) -SHLIB.cc= $(AIX_PREDELETE) $(AIX_SHLIB) -p 5000 $(LDFLAGS) - -## Compiler switch to embed a runtime search path -LD_RPATH= -I -LD_RPATH_PRE= - -## Environment variable to set a runtime search path -LDLIBRARYPATH_ENVVAR = LIBPATH - -## Override Versioned target for a shared library. -FINAL_SO_TARGET= $(basename $(SO_TARGET))$(SO_TARGET_VERSION).$(SO) -MIDDLE_SO_TARGET= $(basename $(SO_TARGET))$(SO_TARGET_VERSION_MAJOR).$(SO) - -# The following is for Makefile.inc's use. -ICULIBSUFFIX_VERSION = $(LIB_VERSION_MAJOR) - -# this one is for icudefs.mk's use -ifeq ($(ENABLE_SHARED),YES) -SO_TARGET_VERSION_SUFFIX = $(SO_TARGET_VERSION_MAJOR) -endif - -## Compiler switch to embed a library name. Not present on AIX. -LD_SONAME = - -## Shared object suffix -SO= so - -## Non-shared intermediate object suffix -STATIC_O = o - -## Special AIX rules - -## Build archive from shared object -%.a : %.so - $(AR) $(ARFLAGS) $@ $< - -## Build import list from export list -%.e : %.exp - @echo "Building an import list for $<" - @$(SHELL) -ec "echo '#! $*.a($*.so)' | cat - $< > $@" - -## Compilation rules -%.$(STATIC_O): $(srcdir)/%.c - $(COMPILE.c) $(STATICCPPFLAGS) $(STATICCFLAGS) -o $@ $< -%.o: $(srcdir)/%.c - $(COMPILE.c) $(DYNAMICCPPFLAGS) $(DYNAMICCFLAGS) -o $@ $< - -%.$(STATIC_O): $(srcdir)/%.cpp - $(COMPILE.cc) $(STATICCPPFLAGS) $(STATICCXXFLAGS) -o $@ $< -%.o: $(srcdir)/%.cpp - $(COMPILE.cc) $(DYNAMICCPPFLAGS) $(DYNAMICCXXFLAGS) -o $@ $< - - -## Dependency rules -%.d : %.u - @$(SHELL) -ec 'cat $< \ - | sed '\''s/\($*\)\.o[ :]*/\1.o $@ : /g'\'' > $@; \ - [ -s $@ ] || rm -f $@ ; rm -f $<' - -%.u : $(srcdir)/%.c - @echo "generating dependency information for $<" - @$(SHELL) -ec '$(GEN_DEPS.c) $< > /dev/null' - -%.u : $(srcdir)/%.cpp - @echo "generating dependency information for $<" - @$(SHELL) -ec '$(GEN_DEPS.cc) $< > /dev/null' - - -## Versioned libraries rules -%$(SO_TARGET_VERSION_MAJOR).$(SO): %$(SO_TARGET_VERSION).$(SO) - $(RM) $@ && ln -s ${*F}$(SO_TARGET_VERSION).$(SO) $@ -%.$(SO): %$(SO_TARGET_VERSION).$(SO) - $(RM) $@ && ln -s ${*F}$(SO_TARGET_VERSION).$(SO) $@ - - -## BIR - bind with internal references [so app data and icu data doesn't collide] -BIR_LDFLAGS= -E$(NAME).map -bnoexpall -BIR_DEPS= $(NAME).map - - -## End Aix-specific setup diff --git a/icu4c/source/config/mh-hpux-cc b/icu4c/source/config/mh-hpux-cc deleted file mode 100644 index 9bfbf567c8..0000000000 --- a/icu4c/source/config/mh-hpux-cc +++ /dev/null @@ -1,76 +0,0 @@ -## -*-makefile-*- -## HP/UX-specific setup using CC -## Copyright (c) 1999-2004, International Business Machines Corporation and -## others. All Rights Reserved. - - -## This causes source/tools/pkgdata generated makefiles to create and link -## in a bogus C++ file, so that exception handling with +eh will be -## enabled properly. Fun. -HPUX_JUNK_OBJ= $(TEMP_DIR)/hpux_junk_obj.o - -## Commands to generate dependency files -GEN_DEPS.c= : -GEN_DEPS.cc= : - -## Commands to compile -COMPILE.c= $(CC) -D__STDC__ +z -Ae $(DEFS) $(CPPFLAGS) $(CFLAGS) -c -COMPILE.cc= $(CXX) -D__STDC__ +z -ext +dup_static_removal +d $(DEFS) $(CPPFLAGS) $(CXXFLAGS) -c - -## Commands to link -## We need to use the C++ linker, even when linking C programs, since -## our libraries contain C++ code (bug in linker?) -#LINK.c= $(CC) +z -Ae $(DEFS) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -LINK.c= $(CXX) +z +a1 $(DEFS) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -Wl,+s -LINK.cc= $(CXX) +z +a1 $(DEFS) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -Wl,+s - -## Commands to make a shared library -#SHLIB.c= $(LD) $(LDFLAGS) -b -SHLIB.c= $(CXX) $(DEFS) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -b -Wl,+s -SHLIB.cc= $(CXX) $(DEFS) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -b -Wl,+s - -## Compiler switch to embed a runtime search path -LD_RPATH= -Wl,+b, -LD_RPATH_PRE= - -## Environment variable to set a runtime search path -LDLIBRARYPATH_ENVVAR = SHLIB_PATH - -## Compiler switch to embed a library name -LD_SONAME = -Wl,+h,$(notdir $(MIDDLE_SO_TARGET)) - -## Shared object suffix -SO= sl -## Non-shared intermediate object suffix -STATIC_O = o - -## Compilation rules -%.$(STATIC_O): $(srcdir)/%.c - $(COMPILE.c) $(STATICCPPFLAGS) $(STATICCFLAGS) -o $@ $< -%.o: $(srcdir)/%.c - $(COMPILE.c) $(DYNAMICCPPFLAGS) $(DYNAMICCFLAGS) -o $@ $< - -%.$(STATIC_O): $(srcdir)/%.cpp - $(COMPILE.cc) $(STATICCPPFLAGS) $(STATICCXXFLAGS) -o $@ $< -%.o: $(srcdir)/%.cpp - $(COMPILE.cc) $(DYNAMICCPPFLAGS) $(DYNAMICCXXFLAGS) -o $@ $< - - -## Dependency rules -%.d : $(srcdir)/%.c - @echo "generating dependency information for $<" - @$(GEN_DEPS.c) $< > $@ - -%.d : $(srcdir)/%.cpp - @echo "generating dependency information for $<" - @$(GEN_DEPS.cc) $< > $@ - -## Versioned libraries rules - -%.$(SO).$(SO_TARGET_VERSION_MAJOR): %.$(SO).$(SO_TARGET_VERSION) - $(RM) $@ && ln -s ${&1 | grep 'IBM C and C++ Compilers$'`"; then - icu_cv_host_frag=mh-aix - else - icu_cv_host_frag=mh-aix-va - fi + icu_cv_host_frag=mh-aix-va fi ;; *-*-hpux*) if test "$GCC" = yes; then @@ -3399,7 +3395,6 @@ powerpc*-*-linux*) else case "$CXX" in *aCC) icu_cv_host_frag=mh-hpux-acc ;; - *CC) icu_cv_host_frag=mh-hpux-cc ;; esac fi ;; *-*ibm-openedition*|*-*-os390*) icu_cv_host_frag=mh-os390 ;; @@ -5587,7 +5582,6 @@ else U_HAVE_NL_LANGINFO=0 fi - if test $U_HAVE_NL_LANGINFO -eq 1; then echo "$as_me:$LINENO: checking for nl_langinfo's argument to obtain the codeset" >&5 echo $ECHO_N "checking for nl_langinfo's argument to obtain the codeset... $ECHO_C" >&6 @@ -7642,12 +7636,7 @@ else datapackaging= fi; -#thesysconfdir=`eval echo $sysconfdir` -#AC_SUBST(thesysconfdir) -#thelibdir=`test "x$exec_prefix" = xNONE && exec_prefix="$prefix"; eval echo $libdir` -#AC_SUBST(thelibdir) thedatadir=`eval echo $datadir` - pkgicudatadir=$datadir thepkgicudatadir=$thedatadir @@ -7770,59 +7759,12 @@ platform_make_fragment='$(top_srcdir)/config/'"$platform_make_fragment_name" -case "${host}" in - *-*-solaris*) ld_rpath_suf=":" ;; - *-*-linux*) ld_rpath_suf=" " ;; - *-*-*bsd*|*-*-dragonfly*) ld_rpath_suf=" " ;; - *-*-aix*) ld_rpath_suf="" ;; - *-*-hpux*) ld_rpath_suf=":" ;; - *-*ibm-openedition*|*-*-os390*) ld_rpath_suf="" ;; - *-*-os400*) ld_rpath_suf=" " ;; - *-*-irix*) ld_rpath_suf=" " ;; - *) ld_rpath_suf="" ;; -esac - - -case "${host}" in - *-*-hpux*) - if test "${icu_cv_host_frag}" = "mh-hpux-cc"; then - for file in samples/date/date \ - samples/cal/cal test/cintltst/cintltst \ - tools/makeconv/makeconv tools/genrb/genrb \ - tools/genrb/derb tools/genccode/genccode \ - tools/gencmn/gencmn tools/gencmn/decmn \ - tools/gencnval/gencnval tools/gennorm/gennorm \ - tools/gennames/gennames tools/gentest/gentest \ - tools/pkgdata/pkgdata tools/genprops/genprops \ - tools/gencase/gencase \ - tools/genbidi/genbidi \ - tools/gensprep/gensprep - 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 - fi - ;; -esac - if test "${FORCE_LIBS}" != ""; then echo " *** Overriding automatically chosen LIBS=$LIBS, using instead FORCE_LIBS=${FORCE_LIBS}" 1>&6 LIBS=${FORCE_LIBS} fi -if test "${AIX_SHLIB}" != ""; then - echo " *** setting AIX_SHLIB (AIX only) to ${AIX_SHLIB}]" 1>&6 -else - AIX_SHLIB=makeC++SharedLib_r -fi - - - - if test $ICU_USE_THREADS -ne 0 then @@ -8545,7 +8487,6 @@ s,@EGREP@,$EGREP,;t t s,@U_HAVE_INTTYPES_H@,$U_HAVE_INTTYPES_H,;t t s,@U_IOSTREAM_SOURCE@,$U_IOSTREAM_SOURCE,;t t s,@U_IS_BIG_ENDIAN@,$U_IS_BIG_ENDIAN,;t t -s,@U_HAVE_NL_LANGINFO@,$U_HAVE_NL_LANGINFO,;t t s,@U_HAVE_NL_LANGINFO_CODESET@,$U_HAVE_NL_LANGINFO_CODESET,;t t s,@U_NL_LANGINFO_CODESET@,$U_NL_LANGINFO_CODESET,;t t s,@U_HAVE_NAMESPACE@,$U_HAVE_NAMESPACE,;t t @@ -8574,7 +8515,6 @@ s,@U_SIZEOF_WCHAR_T@,$U_SIZEOF_WCHAR_T,;t t s,@EXTRAS_TRUE@,$EXTRAS_TRUE,;t t s,@ICUIO_TRUE@,$ICUIO_TRUE,;t t s,@LAYOUT_TRUE@,$LAYOUT_TRUE,;t t -s,@thedatadir@,$thedatadir,;t t s,@pkgicudatadir@,$pkgicudatadir,;t t s,@thepkgicudatadir@,$thepkgicudatadir,;t t s,@DATA_PACKAGING_MODE@,$DATA_PACKAGING_MODE,;t t @@ -8587,8 +8527,6 @@ s,@ICUDATA_CHAR@,$ICUDATA_CHAR,;t t s,@platform@,$platform,;t t s,@platform_make_fragment_name@,$platform_make_fragment_name,;t t s,@platform_make_fragment@,$platform_make_fragment,;t t -s,@ld_rpath_suf@,$ld_rpath_suf,;t t -s,@AIX_SHLIB@,$AIX_SHLIB,;t t s,@LIBOBJS@,$LIBOBJS,;t t s,@LTLIBOBJS@,$LTLIBOBJS,;t t CEOF diff --git a/icu4c/source/configure.in b/icu4c/source/configure.in index 4715a858d4..c893824897 100644 --- a/icu4c/source/configure.in +++ b/icu4c/source/configure.in @@ -1,6 +1,6 @@ dnl -*-m4-*- dnl configure.in for ICU -dnl Copyright (c) 1999-2006, International Business Machines Corporation and +dnl Copyright (c) 1999-2007, International Business Machines Corporation and dnl others. All Rights Reserved. dnl Stephen F. Booth, heavily modified by Yves and others @@ -471,7 +471,7 @@ dnl Do various POSIX related checks U_HAVE_NL_LANGINFO_CODESET=0 U_NL_LANGINFO_CODESET=-1 AC_CHECK_FUNC(nl_langinfo,[U_HAVE_NL_LANGINFO=1],[U_HAVE_NL_LANGINFO=0]) -AC_SUBST(U_HAVE_NL_LANGINFO) +dnl AC_SUBST(U_HAVE_NL_LANGINFO) if test $U_HAVE_NL_LANGINFO -eq 1; then AC_CACHE_CHECK([for nl_langinfo's argument to obtain the codeset], ac_cv_nl_langinfo_codeset, @@ -853,12 +853,12 @@ AC_ARG_WITH(data-packaging, [datapackaging=]) dnl Note: 'thesysconfdir' is an evaluated version, for Man pages, so also for thedatadir, thelibdir, etc.. -#thesysconfdir=`eval echo $sysconfdir` -#AC_SUBST(thesysconfdir) -#thelibdir=`test "x$exec_prefix" = xNONE && exec_prefix="$prefix"; eval echo $libdir` -#AC_SUBST(thelibdir) +dnl thesysconfdir=`eval echo $sysconfdir` +dnl AC_SUBST(thesysconfdir) +dnl thelibdir=`test "x$exec_prefix" = xNONE && exec_prefix="$prefix"; eval echo $libdir` +dnl AC_SUBST(thelibdir) thedatadir=`eval echo $datadir` -AC_SUBST(thedatadir) +dnl AC_SUBST(thedatadir) dnl Always put raw data files in share/icu/{version}, etc. Never use lib/icu/{version} for data files.. Actual shared libraries will go in {libdir}. pkgicudatadir=$datadir thepkgicudatadir=$thedatadir @@ -965,63 +965,12 @@ platform_make_fragment='$(top_srcdir)/config/'"$platform_make_fragment_name" AC_SUBST(platform_make_fragment_name) AC_SUBST(platform_make_fragment) -dnl Handle -rpath options for shared library paths -case "${host}" in - *-*-solaris*) ld_rpath_suf=":" ;; - *-*-linux*) ld_rpath_suf=" " ;; - *-*-*bsd*|*-*-dragonfly*) ld_rpath_suf=" " ;; - *-*-aix*) ld_rpath_suf="" ;; - *-*-hpux*) ld_rpath_suf=":" ;; - *-*ibm-openedition*|*-*-os390*) ld_rpath_suf="" ;; - *-*-os400*) ld_rpath_suf=" " ;; - *-*-irix*) ld_rpath_suf=" " ;; - *) ld_rpath_suf="" ;; -esac -AC_SUBST(ld_rpath_suf) - -dnl On HP/UX, main() functions compiled in C don't invoke -dnl static constructors in C++ libs. Hack around that here -dnl by renaming some .c files to .cpp -case "${host}" in - *-*-hpux*) - if test "${icu_cv_host_frag}" = "mh-hpux-cc"; then - for file in samples/date/date \ - samples/cal/cal test/cintltst/cintltst \ - tools/makeconv/makeconv tools/genrb/genrb \ - tools/genrb/derb tools/genccode/genccode \ - tools/gencmn/gencmn tools/gencmn/decmn \ - tools/gencnval/gencnval tools/gennorm/gennorm \ - tools/gennames/gennames tools/gentest/gentest \ - tools/pkgdata/pkgdata tools/genprops/genprops \ - tools/gencase/gencase \ - tools/genbidi/genbidi \ - tools/gensprep/gensprep - 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 - fi - ;; -esac - if test "${FORCE_LIBS}" != ""; then echo " *** Overriding automatically chosen [LIBS=$LIBS], using instead [FORCE_LIBS=${FORCE_LIBS}]" 1>&6 LIBS=${FORCE_LIBS} fi -if test "${AIX_SHLIB}" != ""; then - echo " *** setting AIX_SHLIB (AIX only) to ${AIX_SHLIB}]" 1>&6 -else - AIX_SHLIB=makeC++SharedLib_r -fi - -AC_SUBST(AIX_SHLIB) - - dnl Now that we're done using CPPFLAGS etc. for tests, we can change it dnl for build. diff --git a/icu4c/source/data/icupkg.inc.in b/icu4c/source/data/icupkg.inc.in index 7caa28bb24..c76790afa9 100644 --- a/icu4c/source/data/icupkg.inc.in +++ b/icu4c/source/data/icupkg.inc.in @@ -1,6 +1,6 @@ #****************************************************************************** # -# Copyright (C) 2000-2006, International Business Machines +# Copyright (C) 2000-2007, International Business Machines # Corporation and others. All Rights Reserved. # #****************************************************************************** @@ -47,8 +47,6 @@ CPP=@CPP@ U_HAVE_INTTYPES_H=@U_HAVE_INTTYPES_H@ U_IS_BIG_ENDIAN=@U_IS_BIG_ENDIAN@ -ld_rpath_suf=@ld_rpath_suf@ - ##### Add the following to source/config/Makefile.in GENCCODE=$(BINDIR)/genccode diff --git a/icu4c/source/extra/uconv/pkgdata.inc.in b/icu4c/source/extra/uconv/pkgdata.inc.in index 1004562acb..8ce5c21a30 100644 --- a/icu4c/source/extra/uconv/pkgdata.inc.in +++ b/icu4c/source/extra/uconv/pkgdata.inc.in @@ -1,6 +1,6 @@ #****************************************************************************** # -# Copyright (C) 2000-2006, International Business Machines +# Copyright (C) 2000-2007, International Business Machines # Corporation and others. All Rights Reserved. # #****************************************************************************** @@ -53,9 +53,6 @@ U_HAVE_INTTYPES_H=@U_HAVE_INTTYPES_H@ U_IS_BIG_ENDIAN=@U_IS_BIG_ENDIAN@ platform=@platform@ - -ld_rpath_suf=@ld_rpath_suf@ - ##### Add the following to source/config/Makefile.in GENCCODE=$(BINDIR)/genccode