ICU-3676 Fixes for HP-UX +DD64 and -AA detection and usage.

X-SVN-Rev: 14838

icu4c/source/aclocal.m4

@@ -162,15 +162,26 @@ AC_DEFUN(AC_CHECK_64BIT_LIBS,
             fi
             ;;
         *-*-hpux*)
+            dnl First we try the newer +DD64, if that doesn't work,
+            dnl try other options.
+
             OLD_CFLAGS="${CFLAGS}"
             OLD_CXXFLAGS="${CXXFLAGS}"
-            CFLAGS="${CFLAGS} +DA2.0W"
-            CXXFLAGS="${CXXFLAGS} +DA2.0W"
+            CFLAGS="${CFLAGS} +DD64"
+            CXXFLAGS="${CXXFLAGS} +DD64"
             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
                 CFLAGS="${OLD_CFLAGS}"
                 CXXFLAGS="${OLD_CXXFLAGS}"
+                CFLAGS="${CFLAGS} +DA2.0W"
+                CXXFLAGS="${CXXFLAGS} +DA2.0W"
+                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
+                    CFLAGS="${OLD_CFLAGS}"
+                    CXXFLAGS="${OLD_CXXFLAGS}"
+                fi
             fi
             ;;
         *)

icu4c/source/configure.in

@@ -333,6 +333,12 @@ if test x$streams != xnone
 then
     AC_LANG_SAVE
     AC_LANG_CPLUSPLUS
+    OLD_CXXFLAGS="${CXXFLAGS}"
+    case "${host}" in
+        *-*-hpux*) 	
+            CXXFLAGS="${CXXFLAGS} -AA"
+        ;;
+    esac
     AC_MSG_CHECKING([iostream usability])
     AC_TRY_COMPILE([#include <iostream>],[],
         [ac_cv_header_iostream=yes],[ac_cv_header_iostream=no])
@@ -341,6 +347,7 @@ then
     then
         U_IOSTREAM_SOURCE=199711
     else
+        CXXFLAGS="${OLD_CXXFLAGS}"
         AC_CHECK_HEADER(iostream.h)
         if test $ac_cv_header_iostream_h = yes; then
             AC_MSG_CHECKING([whether ostream is really defined])
@@ -358,6 +365,13 @@ then
         if test $U_IOSTREAM_SOURCE -ge $streams
         then
             U_IOSTREAM_SOURCE=$streams
+            case "${host}" in
+                *-*-hpux*)
+                    if test $U_IOSTREAM_SOURCE -lt 199711; then
+                        CXXFLAGS=${OLD_CXXFLAGS}
+                    fi
+                ;;
+            esac
         else
             AC_MSG_ERROR(${withval} iostream is not available)
         fi