[sword-cvs] icu-sword/source Makefile.in,1.4,1.5 aclocal.m4,1.4,1.5 configure,1.5,1.6 configure.in,1.5,1.6 icudefs.mk.in,1.5,1.6 mkinstalldirs,1.4,1.5 runConfigureICU,1.6,1.7 README.in,1.3,NONE

Tue, 6 Apr 2004 03:11:14 -0700

Update of /cvs/core/icu-sword/source
In directory www:/tmp/cvs-serv8911/source

Modified Files:
	Makefile.in aclocal.m4 configure configure.in icudefs.mk.in 
	mkinstalldirs runConfigureICU 
Removed Files:
	README.in 
Log Message:
ICU 2.8 sync

Index: Makefile.in
===================================================================
RCS file: /cvs/core/icu-sword/source/Makefile.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5

--- Makefile.in	10 Sep 2003 02:42:01 -0000	1.4
+++ Makefile.in	6 Apr 2004 10:07:56 -0000	1.5
@@ -40,10 +40,10 @@
 DOXYGEN = @DOXYGEN@
 
 ## Files to remove for 'make clean'
-CLEANFILES = *~ README
+CLEANFILES = *~ 
 
 ## Files built (autoconfed) and installed
-INSTALLED_BUILT_FILES = $(top_builddir)/config/Makefile.inc $(top_builddir)/config/icu-config @platform_make_fragment@ README $(EXTRA_DATA:%=$(DESTDIR)$(pkglibdir)/%)
+INSTALLED_BUILT_FILES = $(top_builddir)/config/Makefile.inc $(top_builddir)/config/icu-config @platform_make_fragment@ $(EXTRA_DATA:%=$(DESTDIR)$(pkglibdir)/%)
 
 ## Files built (autoconfed) but not installed
 LOCAL_BUILT_FILES = icudefs.mk
@@ -131,7 +131,7 @@
 	    $(RM) Makefile.inc && ln -s current/Makefile.inc .
 	$(INSTALL_DATA) @platform_make_fragment@ $(DESTDIR)$(pkgdatadir)/config/@platform_make_fragment_name@
 	$(INSTALL_SCRIPT) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(pkgdatadir)/mkinstalldirs
-	$(INSTALL_DATA) README $(DESTDIR)$(pkgdatadir)/README
+	$(INSTALL_DATA) $(top_srcdir)/../license.html $(DESTDIR)$(pkgdatadir)/license.html
 	$(INSTALL_SCRIPT) $(top_builddir)/config/icu-config $(DESTDIR)$(bindir)/icu-config
 
 ifeq ($(DOXYGEN),)
@@ -163,10 +163,6 @@
 #	cd $(srcdir) && $(AUTOCONF)
 
 icudefs.mk: $(srcdir)/icudefs.mk.in  $(top_builddir)/config.status
-	cd $(top_builddir) \
-		&& CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-README: $(srcdir)/README.in  $(top_builddir)/config.status
 	cd $(top_builddir) \
 		&& CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 

Index: aclocal.m4
===================================================================
RCS file: /cvs/core/icu-sword/source/aclocal.m4,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- aclocal.m4	10 Sep 2003 02:42:01 -0000	1.4
+++ aclocal.m4	6 Apr 2004 10:07:56 -0000	1.5
@@ -33,10 +33,14 @@
 	fi ;;
 *-*-*bsd*) 	icu_cv_host_frag=mh-bsd-gcc ;;
 *-*-aix*)
+       if test "$ac_cv_prog_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
 	fi ;;
 *-*-hpux*)
 	if test "$ac_cv_prog_gcc" = yes; then
@@ -51,9 +55,11 @@
 *-*-os400*)	icu_cv_host_frag=mh-os400 ;;
 *-apple-rhapsody*)	icu_cv_host_frag=mh-darwin ;;
 *-apple-darwin*)	icu_cv_host_frag=mh-darwin ;;
+*-*-beos)	icu_cv_host_frag=mh-beos ;;
 *-*-irix*)	icu_cv_host_frag=mh-irix ;;
 *-dec-osf*) icu_cv_host_frag=mh-alpha-osf ;;
 *-*-nto*)	icu_cv_host_frag=mh-qnx ;;
+*-ncr-*)	icu_cv_host_frag=mh-mpras ;;
 *-sequent-*) 	icu_cv_host_frag=mh-ptx ;;
 *) 		icu_cv_host_frag=mh-unknown ;;
 esac
@@ -112,12 +118,12 @@
     if test "$ENABLE_64BIT_LIBS" = no; then
         case "${host}" in
         *-*-hpux*)
-            case "${CXX}" in
-            *CC)
-                CFLAGS="${CFLAGS} +DAportable"
-                CXXFLAGS="${CXXFLAGS} +DAportable"
-                ;;
-            esac;;
+#            case "${CXX}" in
+#            *CC)
+#                CFLAGS="${CFLAGS} +DAportable"
+#                CXXFLAGS="${CXXFLAGS} +DAportable"
+#                ;;
+#            esac;;
         esac
     else
         case "${host}" in
@@ -138,20 +144,24 @@
             fi
             ;;
         *-*-aix*)
-            OLD_CFLAGS="${CFLAGS}"
-            OLD_CXXFLAGS="${CXXFLAGS}"
-            OLD_LDFLAGS="${LDFLAGS}"
-            CFLAGS="${CFLAGS} -q64"
-            CXXFLAGS="${CXXFLAGS} -q64"
-            LDFLAGS="${LDFLAGS} -q64"
-            AC_TRY_RUN(int main(void) {return 0;},
+            if test "$ac_cv_prog_gcc" = no; then
+             # Note: Have not tested 64-bitness with gcc.
+             # Maybe the flag "-maix64" could be used with gcc?
+             OLD_CFLAGS="${CFLAGS}"
+             OLD_CXXFLAGS="${CXXFLAGS}"
+             OLD_LDFLAGS="${LDFLAGS}"
+             CFLAGS="${CFLAGS} -q64"
+             CXXFLAGS="${CXXFLAGS} -q64"
+             LDFLAGS="${LDFLAGS} -q64"
+             AC_TRY_RUN(int main(void) {return 0;},
                 ENABLE_64BIT_LIBS=yes, ENABLE_64BIT_LIBS=no, ENABLE_64BIT_LIBS=no)
-            if test "$ENABLE_64BIT_LIBS" = no; then
+             if test "$ENABLE_64BIT_LIBS" = no; then
                 CFLAGS="${OLD_CFLAGS}"
                 CXXFLAGS="${OLD_CXXFLAGS}"
                 LDFLAGS="${OLD_LDFLAGS}"
-            else
+             else
                 ARFLAGS="${ARFLAGS} -X64"
+             fi
             fi
             ;;
         *-*-hpux*)
@@ -193,7 +203,7 @@
     then
         if test "$GCC" = yes
         then
-            CFLAGS="$CFLAGS -Wall -ansi -pedantic -Wshadow -Wpointer-arith -Wmissing-prototypes -Wwrite-strings -Winline"
+            CFLAGS="$CFLAGS -Wall -ansi -pedantic -Wshadow -Wpointer-arith -Wmissing-prototypes -Wwrite-strings -Winline -Wno-long-long"
             case "${host}" in
             *-*-solaris*)
                 CFLAGS="$CFLAGS -D__STDC__=0";;
@@ -201,7 +211,7 @@
         fi
         if test "$GXX" = yes
         then
-            CXXFLAGS="$CXXFLAGS -W -Wall -ansi -pedantic -Wpointer-arith -Wmissing-prototypes -Wwrite-strings -Winline"
+            CXXFLAGS="$CXXFLAGS -W -Wall -ansi -pedantic -Wpointer-arith -Wmissing-prototypes -Wwrite-strings -Winline -Wno-long-long"
             case "${host}" in
             *-*-solaris*)
                 CXXFLAGS="$CXXFLAGS -D__STDC__=0";;

Index: configure
===================================================================
RCS file: /cvs/core/icu-sword/source/configure,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- configure	10 Sep 2003 02:42:01 -0000	1.5
+++ configure	6 Apr 2004 10:07:56 -0000	1.6
@@ -16,17 +16,21 @@
 ac_help="$ac_help
   --enable-64bit-libs     build 64-bit libraries [default=yes]"
 ac_help="$ac_help
-  --enable-hpuxcma        build ICU with HPUX CMA threads (only ver>=11) [default=no]"
+  --enable-shared         build shared libraries [default=yes]"
 ac_help="$ac_help
-  --enable-shared[=PKGS]  build shared libraries [default=yes]"
+  --enable-static         build static libraries [default=no]"
 ac_help="$ac_help
-  --enable-static[=PKGS]  build static libraries [default=no]"
+  --enable-debug          build debug libraries [default=no]"
[...1934 lines suppressed...]
-		tools/gennames/Makefile tools/toolutil/Makefile \
+		tools/genrb/Makefile \
+		tools/genuca/Makefile \
+		tools/genccode/Makefile \
+		tools/gencmn/Makefile \
+		tools/gencnval/Makefile \
+		tools/gennames/Makefile \
 		tools/gentest/Makefile \
 		tools/gennorm/Makefile \
 		tools/genprops/Makefile \
 		tools/genpname/Makefile \
 		tools/genbrk/Makefile \
-		tools/genidna/Makefile \
+		tools/gensprep/Makefile \
+		tools/icuswap/Makefile \
+		tools/pkgdata/Makefile \
+		tools/toolutil/Makefile \
 		tools/dumpce/Makefile \
 		test/Makefile test/testdata/Makefile \
 		test/intltest/Makefile \

Index: configure.in
===================================================================
RCS file: /cvs/core/icu-sword/source/configure.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- configure.in	10 Sep 2003 02:42:01 -0000	1.5
+++ configure.in	6 Apr 2004 10:07:56 -0000	1.6
@@ -78,14 +78,10 @@
 
 ICU_CHECK_MH_FRAG
 
-hpuxcma=false
-
 dnl Checks for libraries and other host specific stuff
 dnl On HP/UX, don't link to -lm from a shared lib because it isn't
 dnl  PIC (at least on 10.2)
 case "${host}" in
-	*-*-hpux10*)    hpuxcma=true
-			AC_CHECK_LIB(m, floor, LIB_M="-lm") ;;
 	*-*-hpux*) 	AC_CHECK_LIB(m, floor, LIB_M="-lm") ;;
 	
 	*) 		AC_CHECK_LIB(m, floor) 
@@ -93,35 +89,11 @@
 esac
 AC_SUBST(LIB_M)
 
-dnl Enable/disable hpuxcma
-
-if test $hpuxcma = false; then
- AC_ARG_ENABLE(hpuxcma,
-	[  --enable-hpuxcma        build ICU with HPUX CMA threads (only ver>=11) [default=no]],
-	[case "${enableval}" in
-	     yes) hpuxcma=true;;
-	     no) hpuxcma=false;;
-		*) AC_MSG_ERROR(bad value ${enableval} for --enable-hpuxcma) ;;
-		esac], 
-	)
-fi
-
-dnl Note, we set the conditional outside of IF for non hpux plats
-ICU_CONDITIONAL(HPUX_CMA, test "$hpuxcma" = true)
-
-dnl Should this be a nested CASE?
-if test $hpuxcma = true; then
-  case "${host}" in
-	*-*-hpux*)	hpuxcma=true ;;
-	*)		AC_MSG_ERROR(--enable-hpuxcma is not valid on this platform ${host}) ;;
-  esac
-fi
-
 dnl Check whether to build shared libraries
 AC_MSG_CHECKING([whether to build shared libraries])
 enabled=no
 AC_ARG_ENABLE(shared,
-    [  --enable-shared[=PKGS]  build shared libraries [default=yes]],
+    [  --enable-shared         build shared libraries [default=yes]],
     [ case "${enableval}" in
 	     yes|"") enabled=yes; ENABLE_SHARED=YES ;;
 	     no);;
@@ -136,7 +108,7 @@
 AC_MSG_CHECKING([whether to build static libraries])
 enabled=no
 AC_ARG_ENABLE(static,
-    [  --enable-static[=PKGS]  build static libraries [default=no]],
+    [  --enable-static         build static libraries [default=no]],
     [ case "${enableval}" in
 	     yes|"") enabled=yes; ENABLE_STATIC=YES ;;
 	     no) ;;
@@ -146,6 +118,34 @@
 AC_MSG_RESULT($enabled)
 AC_SUBST(ENABLE_STATIC)
 
+dnl Check whether to build debug libraries
+AC_MSG_CHECKING([whether to build debug libraries])
+enabled=no
+ENABLE_DEBUG=0
+AC_ARG_ENABLE(debug,
+    [  --enable-debug          build debug libraries [default=no]],
+    [ case "${enableval}" in
+         yes|"") enabled=yes; ENABLE_DEBUG=1 ;;
+         *) ;;
+    esac],
+)
+AC_MSG_RESULT($enabled)
+AC_SUBST(ENABLE_DEBUG)
+
+dnl Check whether to build release libraries
+AC_MSG_CHECKING([whether to build release libraries])
+enabled=yes
+ENABLE_RELEASE=1
+AC_ARG_ENABLE(release,
+    [  --enable-release        build release libraries [default=yes]],
+    [ case "${enableval}" in
+         no) enabled=no; ENABLE_RELEASE=0 ;;
+         *) ;;
+    esac],
+)
+AC_MSG_RESULT($enabled)
+AC_SUBST(ENABLE_RELEASE)
+
 AC_PROG_RANLIB
 AC_PATH_PROG(AR,ar,[echo archiver ar not found re-run configure ; false],$PATH:/bin:/usr/bin:/usr/ccs/bin)
 
@@ -163,6 +163,20 @@
 AC_MSG_RESULT($enabled)
 AC_SUBST(U_DISABLE_RENAMING)
 
+AC_MSG_CHECKING([whether to enable function and data tracing])
+enabled=yes
+U_ENABLE_TRACING=1
+AC_ARG_ENABLE(tracing,
+    [  --enable-tracing        enable function and data tracing [default=yes]],
+    [ case "${enableval}" in
+	     yes|"") enabled=yes ;;
+	     no) enabled=no; U_ENABLE_TRACING=0 ;;
+	     *) ;;
+    esac],
+)
+AC_MSG_RESULT($enabled)
+AC_SUBST(U_ENABLE_TRACING)
+
 dnl Check whether to use the evil rpath or not
 AC_ARG_ENABLE(rpath,
     [  --enable-rpath          use rpath when linking [default is only if necessary]],
@@ -196,7 +210,7 @@
 
 dnl Enable/disable threads
 AC_ARG_ENABLE(threads,
-	[  --enable-threads        build ICU with threads [default=yes]],
+	[  --enable-threads        build ICU with thread safety [default=yes]],
 	[case "${enableval}" in
 		yes) threads=true ;;
 		no)  threads=false ;;
@@ -208,14 +222,6 @@
 ICU_USE_THREADS=0
 
 if test $threads = true; then
- dnl Test for HPUX cma threads first.. 
- if test $hpuxcma = true; then
-  dnl HPUX cma case
-  AC_CHECK_LIB(cma, pthread_create)
-  if test $ac_cv_lib_cma_pthread_create = yes; then
-   ICU_USE_THREADS=1
-  fi
- else 
   dnl For Compaq Tru64 (OSF1), we must look for pthread_attr_init
   dnl and must do this before seaching for pthread_mutex_destroy, or
   dnl we will pick up libpthreads.so not libpthread.so
@@ -229,11 +235,10 @@
    dnl Locate the right library for POSIX threads. We look for the
    dnl symbols in the libraries first, because on Solaris libc provides
    dnl pthread_create but libpthread has the real code :(
-   dnl AIX uses libpthreads instead of libpthread, and HP/UX uses libcma
-   dnl (but that was checked above).
+   dnl AIX uses libpthreads instead of libpthread, and HP/UX uses libpthread
    dnl FreeBSD users may need libpthread if they do not have libc_r.
 
-   AC_SEARCH_LIBS_FIRST(pthread_mutex_destroy, pthread pthreads c_r cma)
+   AC_SEARCH_LIBS_FIRST(pthread_mutex_destroy, pthread pthreads c_r )
 
    if test "$ac_cv_search_pthread_mutex_destroy" != no; then
     ICU_USE_THREADS=1
@@ -250,8 +255,15 @@
    if test $ac_cv_func_pthread_mutex_lock = yes; then
      ICU_USE_THREADS=1
    fi
+   dnl Check to see if we are using CygWin with MSVC
+   case "${host}" in
+   *-pc-cygwin*|*-pc-mingw*)
+     if test "$ac_cv_prog_gcc" = no; then
+       dnl We're using normal windows compilers. Threading is available.
+       ICU_USE_THREADS=1
+     fi ;;
+   esac
   fi
- fi
 fi
 
 AC_SUBST(ICU_USE_THREADS)
@@ -815,8 +827,8 @@
 	*-*-solaris*) 	platform=U_SOLARIS ;;
 	*-*-linux*) 	platform=U_LINUX ;;
 	*-*-*bsd*) 	platform=U_BSD ;;
-	*-*-aix*) 	platform=AIX ;;
-	*-*-hpux*) 	platform=HPUX ;;
+	*-*-aix*) 	platform=U_AIX ;;
+	*-*-hpux*) 	platform=U_HPUX ;;
 	*-apple-darwin*|*-apple-rhapsody*)	platform=U_DARWIN ;;
 	*-*-cygwin*|*-*-mingw*)	platform=U_CYGWIN ;;
 	*-*ibm-openedition*|*-*-os390*)	platform=OS390
@@ -825,7 +837,9 @@
 			ICUDATA_CHAR="e" ;;
 	*-*-nto*)	platform=U_QNX ;;
 	*-dec-osf*) 	platform=U_OSF ;;
-	*-*-irix*)      platform=IRIX ;;
+	*-*-beos)		platform=U_BEOS ;;
+	*-*-irix*)		platform=U_IRIX ;;
+	*-ncr-*)		platform=U_MPRAS ;;
 	*-sequent-*)	platform=PTX ;;
 	*) 		platform=U_UNKNOWN_PLATFORM ;;
 esac
@@ -856,7 +870,7 @@
 dnl by renaming some .c files to .cpp
 case "${host}" in
 	*-*-hpux*) 	
-		if test "$ac_cv_prog_gcc" != yes; then
+		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 \
@@ -865,7 +879,7 @@
 			  tools/gencnval/gencnval tools/gennorm/gennorm \
 			  tools/gennames/gennames tools/gentest/gentest \
 			  tools/pkgdata/pkgdata tools/genprops/genprops \
-			  tools/genidna/genidna
+			  tools/gensprep/gensprep
 			do
 			  if test -f $file.c; then
 			    mv $file.c $file.cpp
@@ -892,12 +906,6 @@
 AC_SUBST(AIX_SHLIB)
 
 
-dnl SPECIAL handling for HPUX 10 and also '11 & --enable-hpuxcma=true'
-if test $hpuxcma = true; then
-	CPPFLAGS="${CPPFLAGS} -D_PTHREADS_DRAFT4 -DHPUX_CMA"
-fi
-dnl END special 
-
 dnl Now that we're done using CPPFLAGS etc. for tests, we can change it
 dnl for build.
 
@@ -919,7 +927,7 @@
 fi
 
 dnl output the Makefiles
-AC_OUTPUT([README icudefs.mk \
+AC_OUTPUT([icudefs.mk \
 		Makefile \
 		data/Makefile data/icupkg.inc \
 		common/Makefile config/Makefile.inc i18n/Makefile \
@@ -929,18 +937,21 @@
 		extra/uconv/Makefile extra/scrptrun/Makefile
 		stubdata/Makefile \
 		tools/Makefile tools/ctestfw/Makefile tools/makeconv/Makefile \
-		tools/genrb/Makefile  \
-		tools/genuca/Makefile  \
-		tools/pkgdata/Makefile \
-		tools/genccode/Makefile tools/gencmn/Makefile \
-		tools/gencnval/Makefile tools/gentz/Makefile \
-		tools/gennames/Makefile tools/toolutil/Makefile \
+		tools/genrb/Makefile \
+		tools/genuca/Makefile \
+		tools/genccode/Makefile \
+		tools/gencmn/Makefile \
+		tools/gencnval/Makefile \
+		tools/gennames/Makefile \
 		tools/gentest/Makefile \
 		tools/gennorm/Makefile \
 		tools/genprops/Makefile \
 		tools/genpname/Makefile \
 		tools/genbrk/Makefile \
-		tools/genidna/Makefile \
+		tools/gensprep/Makefile \
+		tools/icuswap/Makefile \
+		tools/pkgdata/Makefile \
+		tools/toolutil/Makefile \
 		tools/dumpce/Makefile \
 		test/Makefile test/testdata/Makefile \
 		test/intltest/Makefile \

Index: icudefs.mk.in
===================================================================
RCS file: /cvs/core/icu-sword/source/icudefs.mk.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- icudefs.mk.in	10 Sep 2003 02:42:01 -0000	1.5
+++ icudefs.mk.in	6 Apr 2004 10:07:57 -0000	1.6
@@ -82,6 +82,8 @@
 
 # Compiler and tools
 
+ENABLE_DEBUG = @ENABLE_DEBUG@
+ENABLE_RELEASE = @ENABLE_RELEASE@
 EXEEXT = @EXEEXT@
 CC = @CC@
 CXX = @CXX@
@@ -147,9 +149,17 @@
 ICUPREFIX = icu
 LIBICU = lib$(ICUPREFIX)
 
+# Static library prefix and file extension
+STATIC_PREFIX = s
+LIBSICU = lib$(STATIC_PREFIX)$(ICUPREFIX)
+A = a
+
 # Force removal [for make clean]
 RMV = rm -rf
+
 # Platform commands to remove or move executable and library targets
+# INSTALL-L installs libraries. Override in mh-* file to INSTALL_PROGRAM
+#           when the library needs to have executable permissions
 INSTALL-S = $(INSTALL_PROGRAM)
 INSTALL-L = $(INSTALL_DATA)
 

Index: mkinstalldirs
===================================================================
RCS file: /cvs/core/icu-sword/source/mkinstalldirs,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5

Index: runConfigureICU
===================================================================
RCS file: /cvs/core/icu-sword/source/runConfigureICU,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- runConfigureICU	10 Sep 2003 02:42:01 -0000	1.6
+++ runConfigureICU	6 Apr 2004 10:07:57 -0000	1.7
@@ -32,13 +32,17 @@
     AIX4.3xlC               Use IBM's xlC on AIX 4.3
     AIX4.3xlC_nothreads     Use IBM's xlC on AIX 4.3 with no multithreading
     AIX4.3VA                Use IBM's Visual Age xlC_r compiler on AIX 4.3
+    AIXGCC                  Use GCC on AIX
     ALPHA/LINUXGCC          Use GCC on Alpha/Linux systems
     ALPHA/LINUXCCC          Use Compaq C compiler on Alpha/Linux systems
+    BeOS                    Use the GNU C++ compiler on BeOS
     CygWin                  Use the GNU C++ compiler on CygWin
     FreeBSD                 Use the GNU C++ compiler on Free BSD
-    HP-UX11CC               Use HP's C++ compiler on HP-UX 11
     HP-UX11ACC              Use the Advanced C++ compiler on HP-UX 11
+    HP-UX11CC               Use HP's C++ compiler on HP-UX 11
     LinuxRedHat             Use the GNU C++ compiler on Linux
+    LINUX/ECC               Use the Intel ECC compiler on Linux
+    LINUX/ICC               Use the Intel ICC compiler on Linux
     MacOSX                  Use the GNU C++ compiler on MacOS X (Darwin)
     QNX                     Use QNX's QCC compiler on QNX/Neutrino
     SOLARISCC               Use Sun's CC compiler on Solaris
@@ -69,11 +73,11 @@
         ;;
     --enable-debug)
         debug=1
-        release=0
+        OPTS="$OPTS --enable-debug"
         ;;
     --disable-release)
-        debug=0
         release=0
+        OPTS="$OPTS --disable-release"
         ;;
     *)
         platform="$1"
@@ -147,6 +151,12 @@
         RELEASE_CXXFLAGS="-O2 -qmaxmem=-1"
         #LDFLAGS=-L/usr/lpp/xlC/lib; export LDFLAGS
         ;;
+    AIXGCC)
+        THE_OS=AIX
+        THE_COMP="gcc"
+        CC=`which gcc`; export CC
+        CXX=`which g++`; export CXX
+        ;;
 # Just use --enable-threads=no. Visual Age makes no distinction between xlC and xlC_r or any other _r programs.
 #    AIX4.3VA_nothreads)
 #        THE_OS=AIX
@@ -191,6 +201,8 @@
         THE_COMP="the GNU C++"
         CXXFLAGS=-I/usr/local/include/g++; export CXXFLAGS
         LDFLAGS=-R/usr/local/lib; export LDFLAGS
+        RELEASE_CXXFLAGS=-O
+        RELEASE_CFLAGS=-O3
         ;;
     HP-UX11CC)
         THE_OS="HP-UX 11"
@@ -234,10 +246,40 @@
         CC=gcc; export CC
         CXX=g++; export CXX
         ;;
+    LINUX/ECC)
+        THE_OS="Linux"
+        THE_COMP="Intel ECC 7.1"
+        CC=ecc; export CC
+        CXX=ecpc; export CXX
+        RELEASE_CFLAGS='-O2'
+        RELEASE_CXXFLAGS='-O2'
+        ;;
+    LINUX/ICC)
+        THE_OS="Linux"
+        THE_COMP="Intel ICC 6.0"
+        CC=icc; export CC
+        CXX=icpc; export CXX
+        RELEASE_CFLAGS='-O0'
+        RELEASE_CXXFLAGS='-O0'
+        ;;
     CygWin)
         THE_OS="CygWin"
         THE_COMP="the GNU C++"
+        RELEASE_CFLAGS='-O3'
+        RELEASE_CXXFLAGS='-O3'
         ;;
+# This doesn't work yet.
+#    CygWin/MSVC)
+#        THE_OS="CygWin"
+#        THE_COMP="Microsoft Visual C++"
+#        CC=cl; export CC
+#        CXX=cl; export CXX
+#        RELEASE_CFLAGS='/O2 /Ob2'
+#        RELEASE_CXXFLAGS='/O2 /Ob2'
+#        DEBUG_CFLAGS='/Zi'
+#        DEBUG_CXXFLAGS='/Zi'
+#        DEBUG_LDFLAGS='/DEBUG'
+#        ;;
     MacOSX)
         THE_OS="MacOS X (Darwin)"
         THE_COMP="the GNU C++"
@@ -256,6 +298,21 @@
         CC=qcc; export CC
         CXX=QCC; export CXX
         ;;
+    BeOS)
+        THE_OS="BeOS"
+        THE_COMP="the GNU C++"
+        OPTIMIZATIONS="-fdefault-inline -fdefer-pop -fforce-mem -fforce-addr \
+            -finline -finline-functions \
+            -fkeep-inline-functions -fkeep-static-consts -fbranch-count-reg \
+            -ffunction-cse -fstrength-reduce -fthread-jumps -fcse-follow-jumps \
+            -fcse-skip-blocks -frerun-cse-after-loop -frerun-loop-opt \
+            -fexpensive-optimizations -foptimize-register-move -fregmove \
+            -fschedule-insns -fschedule-insns2 -ffloat-store -funroll-loops \
+            -fmove-all-movables -freduce-all-givs -fpeephole \
+            -funroll-all-loops -ffunction-sections -fdata-sections"
+        RELEASE_CFLAGS="$OPTIMIZATIONS"
+        RELEASE_CXXFLAGS="$OPTIMIZATIONS"
+        ;;
     zOS)
         THE_OS="z/OS (OS/390)"
         THE_COMP="z/OS 1.2 (through OS/390 v2r10) C/C++"
@@ -340,6 +397,11 @@
         CXXFLAGS="$CXXFLAGS $DEBUG_CXXFLAGS"
     fi
     export CXXFLAGS
+    if test "$DEBUG_LDFLAGS" != ""
+    then
+        LDFLAGS="$LDFLAGS $DEBUG_LDFLAGS"
+    fi
+    export LDFLAGS
 fi
 
 # Run configure
@@ -351,4 +413,3 @@
 echo If the result of the above commands looks okay to you, go to the directory
 echo source in the ICU distribution to build ICU. Please remember that ICU needs
 echo GNU make to build properly...
-

--- README.in DELETED ---



