2 files changed, 30 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index a16e83478..f3d8d49ff 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+20060918
+ - (dtucker) [configure.ac] On AIX, check to see if the compiler will allow
+   macro redefinitions, and if not, remove "-qlanglvl=ansi" from the flags.
+   Allows build out of the box with older VAC and XLC compilers.  Found by
+   David Bronder and Bernhard Simon.
+
 20060916
  - OpenBSD CVS Sync
    - djm@cvs.openbsd.org 2006/09/16 19:53:37
@@ -5449,4 +5455,4 @@
    - (djm) Trim deprecated options from INSTALL. Mention UsePAM
    - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
 
-$Id: ChangeLog,v 1.4550 2006/09/17 12:55:52 dtucker Exp $
+$Id: ChangeLog,v 1.4551 2006/09/18 13:17:40 dtucker Exp $
diff --git a/configure.ac b/configure.ac
index cfc5d594a..f790f9a51 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-# $Id: configure.ac,v 1.364 2006/09/12 11:54:11 djm Exp $
+# $Id: configure.ac,v 1.365 2006/09/18 13:17:41 dtucker Exp $
 #
 # Copyright (c) 1999-2004 Damien Miller
 #
@@ -15,7 +15,7 @@
 # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 AC_INIT(OpenSSH, Portable, openssh-unix-dev@mindrot.org)
-AC_REVISION($Revision: 1.364 $)
+AC_REVISION($Revision: 1.365 $)
 AC_CONFIG_SRCDIR([ssh.c])
 
 AC_CONFIG_HEADER(config.h)
@@ -134,6 +134,27 @@ SPC_MSG="no"
 # Check for some target-specific stuff
 case "$host" in
 *-*-aix*)
+        # Some versions of VAC won't allow macro redefinitions at
+        # -qlanglevel=ansi, and autoconf 2.60 sometimes insists on using that
+        # particularly with older versions of vac or xlc.
+        # It also throws errors about null macro argments, but these are
+        # not fatal.
+        AC_MSG_CHECKING(if compiler allows macro redefinitions)
+        AC_COMPILE_IFELSE(
+            [AC_LANG_SOURCE([[
+#define testmacro foo
+#define testmacro bar
+int main(void) { exit(0); }
+            ]])],
+            [ AC_MSG_RESULT(yes) ],
+            [ AC_MSG_RESULT(no)
+              CC="`echo $CC | sed 's/-qlanglvl\=ansi//g'`"
+              LD="`echo $LD | sed 's/-qlanglvl\=ansi//g'`"
+              CFLAGS="`echo $CFLAGS | sed 's/-qlanglvl\=ansi//g'`"
+              CPPFLAGS="`echo $CPPFLAGS | sed 's/-qlanglvl\=ansi//g'`"
+            ]
+        )
+
         AC_MSG_CHECKING([how to specify blibpath for linker ($LD)])
         if (test -z "$blibpath"); then
                 blibpath="/usr/lib:/lib"