Mercurial > hg > svapp

comparison configure.ac @ 220:0b1886cee2cf templating

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from default branch
author Chris Cannam
date Wed, 27 Apr 2011 11:33:48 +0100
parents ee31e2f3a0f1
children 819fd4147acf
comparison
equal deleted inserted replaced
210:143e1b56e81b 220:0b1886cee2cf
8 # the user's preferences. We need to ensure CXXFLAGS is only set if 8 # the user's preferences. We need to ensure CXXFLAGS is only set if
9 # the user has expressly set it. So, save the user's (or empty) 9 # the user has expressly set it. So, save the user's (or empty)
10 # setting now and restore it after Autoconf has done its bit of 10 # setting now and restore it after Autoconf has done its bit of
11 # piddling about. 11 # piddling about.
12 USER_CXXFLAGS="$CXXFLAGS" 12 USER_CXXFLAGS="$CXXFLAGS"
13
14 # If the user supplied CFLAGS but not CXXFLAGS, use CFLAGS instead
15 if test x"$USER_CXXFLAGS" = x; then
16 if test x"$CFLAGS" != x; then
17 USER_CXXFLAGS="$CFLAGS"
18 fi
19 fi
13 20
14 AC_LANG_CPLUSPLUS 21 AC_LANG_CPLUSPLUS
15 22
16 AC_PROG_CC 23 AC_PROG_CC
17 AC_PROG_CXX 24 AC_PROG_CXX