diff options
| author | Steve Huston <shuston@riverace.com> | 2003-12-04 22:20:14 +0000 |
|---|---|---|
| committer | Steve Huston <shuston@riverace.com> | 2003-12-04 22:20:14 +0000 |
| commit | e6c2cf27ec2a2a3f15c6f2e110d3ed95652940f8 (patch) | |
| tree | e299f43b61262987fd0ba08f33f366872f06c424 /m4 | |
| parent | 4ca89d655bee6e8a35547bddc21ad33152463d36 (diff) | |
| download | ATCD-e6c2cf27ec2a2a3f15c6f2e110d3ed95652940f8.tar.gz | |
ChangeLogTag:Thu Dec 4 17:13:29 2003 Steve Huston <shuston@riverace.com>
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/compiler.m4 | 4 | ||||
| -rw-r--r-- | m4/tls.m4 | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/m4/compiler.m4 b/m4/compiler.m4 index b7ac6fdcb3f..868ed1ce752 100644 --- a/m4/compiler.m4 +++ b/m4/compiler.m4 @@ -202,7 +202,7 @@ changequote([, ])dnl OCXXFLAGS="" ;; aCC) - CFLAGS = "$CFLAGS -Ae" + 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 @@ -227,7 +227,7 @@ changequote([, ])dnl OCXXFLAGS="-O" # Warning 67: Invalid pragma name -- needed for # ACE_LACKS_PRAGMA_ONCE - WERROR="+We67" + WERROR="+We67 +p" # If exception support is explicitly disabled, tell the # compiler. This is not recommended since the run-time diff --git a/m4/tls.m4 b/m4/tls.m4 index 212fb7f0f14..05d01b23f29 100644 --- a/m4/tls.m4 +++ b/m4/tls.m4 @@ -136,9 +136,10 @@ SSL_shutdown (ssl); if test $ac_cv_openssl_libs != no; then AC_SUBST([ACE_TLS_LIBS],[$ace_TLS_LIBS]) - AM_CONDITIONAL([BUILD_SSL], [test X$ace_user_with_ssl = Xyes]) fi + AM_CONDITIONAL([BUILD_SSL], [test X$ace_user_with_ssl = Xyes]) + dnl Restore the original library list and preprocessor flags. LIBS="$ace_save_LIBS" CPPFLAGS="$ace_save_CPPFLAGS" |