Author: brane
Date: Fri Dec 21 08:35:00 2012
New Revision: 1424821
URL: http://svn.apache.org/viewvc?rev=1424821&view=rev
Log:
[On the tweak-build-take-two branch]
Avoid warnings about early expansion of AC_PROG_CC and AC_PROG_CXX; and
instead of propagating inital CFLAGS and CXXFLAGS, just remember them for later.
* configure.ac:
- Save initial CFLAGS and CXXFLAGS
- Call AC_PROG_CC and AC_PROG_CXX directly, then their mode-setup
functions.
* build/ac-macros/compiler.m4 (SVN_CC_MODE_SETUP): Renamed from
SVN_PROG_CC, do not call AC_PROG_CC and only set CMODEFLAGS.
(SVN_CXX_MODE_SETUP): Renamed from SVN_PROG_CXX, do not call
AC_PROG_CXX and only set CXXMODEFLAGS.
Modified:
subversion/branches/tweak-build-take-two/build/ac-macros/compiler.m4
subversion/branches/tweak-build-take-two/configure.ac
Modified: subversion/branches/tweak-build-take-two/build/ac-macros/compiler.m4
URL:
http://svn.apache.org/viewvc/subversion/branches/tweak-build-take-two/build/ac-macros/compiler.m4?rev=1424821&r1=1424820&r2=1424821&view=diff
==============================================================================
--- subversion/branches/tweak-build-take-two/build/ac-macros/compiler.m4
(original)
+++ subversion/branches/tweak-build-take-two/build/ac-macros/compiler.m4 Fri
Dec 21 08:35:00 2012
@@ -53,15 +53,11 @@ AC_DEFUN([SVN_CXXFLAGS_ADD_IFELSE],
[_SVN_XXFLAGS_ADD_IFELSE([C++],[CXX],[CXXFLAGS],[$1],[$2],[$3])])
-AC_DEFUN([SVN_PROG_CC],
+AC_DEFUN([SVN_CC_MODE_SETUP],
[
- dnl Keep user-supplied compiler flags separate
- AC_SUBST(CUSERFLAGS)
- CUSERFLAGS="$CFLAGS"
+ CFLAGS_KEEP="$CFLAGS"
CFLAGS=""
- AC_PROG_CC
-
dnl Find flags to force C90 mode
dnl gcc and clang
SVN_CFLAGS_ADD_IFELSE([-std=c90],[],[
@@ -70,26 +66,22 @@ AC_DEFUN([SVN_PROG_CC],
])
])
- AC_SUBST(CMODEFLAGS)
CMODEFLAGS="$CFLAGS"
- CFLAGS=""
+ CFLAGS="$CFLAGS_KEEP"
+ AC_SUBST(CMODEFLAGS)
])
-AC_DEFUN([SVN_PROG_CXX],
+AC_DEFUN([SVN_CXX_MODE_SETUP],
[
- dnl Keep user-supplied compiler flags separate
- AC_SUBST(CXXUSERFLAGS)
- CXXUSERFLAGS="$CXXFLAGS"
+ CXXFLAGS_KEEP="$CXXFLAGS"
CXXFLAGS=""
- AC_PROG_CXX
-
dnl Find flags to force C++98 mode
dnl g++ and clang++
SVN_CXXFLAGS_ADD_IFELSE([-std=c++98])
- AC_SUBST(CXXMODEFLAGS)
CXXMODEFLAGS="$CXXFLAGS"
- CXXFLAGS=""
+ CXXFLAGS="CXXFLAGS_KEEP"
+ AC_SUBST(CXXMODEFLAGS)
])
Modified: subversion/branches/tweak-build-take-two/configure.ac
URL:
http://svn.apache.org/viewvc/subversion/branches/tweak-build-take-two/configure.ac?rev=1424821&r1=1424820&r2=1424821&view=diff
==============================================================================
--- subversion/branches/tweak-build-take-two/configure.ac (original)
+++ subversion/branches/tweak-build-take-two/configure.ac Fri Dec 21 08:35:00
2012
@@ -49,10 +49,14 @@ SVN_CONFIG_NICE(config.nice)
# ==== Check for programs ====================================================
# Look for a C compiler (before anything can set CFLAGS)
-SVN_PROG_CC
-
-# Look for a C++ compiler
-SVN_PROG_CXX
+CUSERFLAGS="$CFLAGS"
+AC_PROG_CC
+SVN_CC_MODE_SETUP
+
+# Look for a C++ compiler (before anything can set CXXFLAGS)
+CXXUSERFLAGS="$CXXFLAGS"
+AC_PROG_CXX
+SVN_CXX_MODE_SETUP
# Look for a C pre-processor
AC_PROG_CPP
