summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Huston <shuston@riverace.com>2003-10-28 21:52:20 +0000
committerSteve Huston <shuston@riverace.com>2003-10-28 21:52:20 +0000
commitd5ff8350c68bfbe2555261f9387af16c99a83c5b (patch)
tree81c1f5c75b45c75c6d873f46d490465e8b3adc5a
parentbe6dccfcf40b119b0920aafa198167916e33d3e6 (diff)
downloadATCD-d5ff8350c68bfbe2555261f9387af16c99a83c5b.tar.gz
ChangeLogTag:Tue Oct 28 16:33:41 2003 Steve Huston <shuston@riverace.com>
-rw-r--r--ChangeLog9
-rw-r--r--m4/ace.m419
-rw-r--r--m4/compiler.m47
3 files changed, 34 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index bf83699054b..dac0f34e5b8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Tue Oct 28 16:33:41 2003 Steve Huston <shuston@riverace.com>
+
+ * m4/ace.m4: Added new option, --enable-stdcpplib, defaults to yes.
+ This enables (disables) use of the standard C++ library on platforms
+ where it makes a difference, like HP-UX aC++.
+
+ * m4/compiler.m4: For HP aC++, add -Ae (c89 mode) to CFLAGS.
+ When using --enable-stdcpplib=yes with aC++, add -AA to CXXFLAGS.
+
Tue Oct 28 07:52:12 UTC 2003 Johnny Willemsen <jwillemsen@remedy.nl>
* include/makeinclude/wrapper_macros.GNU:
diff --git a/m4/ace.m4 b/m4/ace.m4
index 94b1a944eb4..a81d40370dc 100644
--- a/m4/ace.m4
+++ b/m4/ace.m4
@@ -654,4 +654,23 @@ dnl fi
esac
],)
+ AC_ARG_ENABLE([stdcpplib],
+ AC_HELP_STRING([--enable-stdcpplib],[enable standard C++ library [[yes]]]),
+ [
+ case "${enableval}" in
+ yes)
+ ace_user_enable_stdcpplib=yes
+ ;;
+ no)
+ ace_user_enable_stdcpplib=no
+ ;;
+ *)
+ AC_MSG_ERROR([bad value ${enableval} for --enable-stdcpplib])
+ ;;
+ esac
+ ],
+ [
+ ace_user_enable_stdcpplib=yes
+ ])
+
])
diff --git a/m4/compiler.m4 b/m4/compiler.m4
index b12479baed4..ffcdff48e68 100644
--- a/m4/compiler.m4
+++ b/m4/compiler.m4
@@ -202,7 +202,12 @@ changequote([, ])dnl
OCXXFLAGS=""
;;
aCC)
- CXXFLAGS="$CXXFLAGS"
+ CFLAGS = "$CFLAGS -Ae"
+ # -AA has been available since aC++ x.27 (2001?) - if using a
+ # compiler without this support, must --enable_stdcpplib=no.
+ if test "$ace_user_enable_stdcpplib" = yes; then
+ CXXFLAGS="$CXXFLAGS -AA"
+ fi
# Warning 930 is spurious when new(std::nothrow) is
# used. Reported to HP as support call 3201224717. (Steve
# Huston, 23-Nov-2002)