summaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2006-09-18 23:17:40 +1000
committerDarren Tucker <dtucker@zip.com.au>2006-09-18 23:17:40 +1000
commit9216c37d60fdb8b9e247541991248e0ca86cac07 (patch)
tree3062f8c017765ab665656d6ccf363efba011236c /configure.ac
parent83bbb03e52743b8b0d6500fdf46bd9436b0a2543 (diff)
- (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.
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac25
1 files changed, 23 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac
index cfc5d594a..f790f9a51 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
1# $Id: configure.ac,v 1.364 2006/09/12 11:54:11 djm Exp $ 1# $Id: configure.ac,v 1.365 2006/09/18 13:17:41 dtucker Exp $
2# 2#
3# Copyright (c) 1999-2004 Damien Miller 3# Copyright (c) 1999-2004 Damien Miller
4# 4#
@@ -15,7 +15,7 @@
15# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. 15# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
16 16
17AC_INIT(OpenSSH, Portable, openssh-unix-dev@mindrot.org) 17AC_INIT(OpenSSH, Portable, openssh-unix-dev@mindrot.org)
18AC_REVISION($Revision: 1.364 $) 18AC_REVISION($Revision: 1.365 $)
19AC_CONFIG_SRCDIR([ssh.c]) 19AC_CONFIG_SRCDIR([ssh.c])
20 20
21AC_CONFIG_HEADER(config.h) 21AC_CONFIG_HEADER(config.h)
@@ -134,6 +134,27 @@ SPC_MSG="no"
134# Check for some target-specific stuff 134# Check for some target-specific stuff
135case "$host" in 135case "$host" in
136*-*-aix*) 136*-*-aix*)
137 # Some versions of VAC won't allow macro redefinitions at
138 # -qlanglevel=ansi, and autoconf 2.60 sometimes insists on using that
139 # particularly with older versions of vac or xlc.
140 # It also throws errors about null macro argments, but these are
141 # not fatal.
142 AC_MSG_CHECKING(if compiler allows macro redefinitions)
143 AC_COMPILE_IFELSE(
144 [AC_LANG_SOURCE([[
145#define testmacro foo
146#define testmacro bar
147int main(void) { exit(0); }
148 ]])],
149 [ AC_MSG_RESULT(yes) ],
150 [ AC_MSG_RESULT(no)
151 CC="`echo $CC | sed 's/-qlanglvl\=ansi//g'`"
152 LD="`echo $LD | sed 's/-qlanglvl\=ansi//g'`"
153 CFLAGS="`echo $CFLAGS | sed 's/-qlanglvl\=ansi//g'`"
154 CPPFLAGS="`echo $CPPFLAGS | sed 's/-qlanglvl\=ansi//g'`"
155 ]
156 )
157
137 AC_MSG_CHECKING([how to specify blibpath for linker ($LD)]) 158 AC_MSG_CHECKING([how to specify blibpath for linker ($LD)])
138 if (test -z "$blibpath"); then 159 if (test -z "$blibpath"); then
139 blibpath="/usr/lib:/lib" 160 blibpath="/usr/lib:/lib"