svn commit: r1425086 - in /subversion/branches/tweak-build-take-two: autogen.sh build/ac-macros/compiler.m4 configure.ac

[br...@apache.org]

Author: brane
Date: Fri Dec 21 18:56:13 2012
New Revision: 1425086

URL: http://svn.apache.org/viewvc?rev=1425086&view=rev
Log:
[On the tweak-build-take-two branch]
Propagate configure-time C(XX)USERFLAGS to the compile command in such
a way that they are used when compiling Subversion sources, but not,
e.g., Swig-generated sources.

* build/ac-macros/compiler.m4 (SVN_CC_MODE_SETUP, SVN_CXX_MODE_SETUP):
   Substitute CMAINTAINTERFLAGS and CXXMAINTAINERFLAGS unconditionally.
* configure.ac:
  - Initialize C(XX)MAINTAINERFLAGS from initial C(XX)USERFLAGS, and
    preserve their value when adding maintainer-mode flags.
* autogen.sh: Mention the usage "./configure CUSERFLAGS=--something".

Modified:
    subversion/branches/tweak-build-take-two/autogen.sh
    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/autogen.sh
URL: http://svn.apache.org/viewvc/subversion/branches/tweak-build-take-two/autogen.sh?rev=1425086&r1=1425085&r2=1425086&view=diff
==============================================================================
--- subversion/branches/tweak-build-take-two/autogen.sh (original)
+++ subversion/branches/tweak-build-take-two/autogen.sh Fri Dec 21 18:56:13 2012
@@ -202,6 +202,7 @@ echo ""
 echo "./configure --enable-maintainer-mode"
 echo "./configure --disable-shared"
 echo "./configure --enable-maintainer-mode --disable-shared"
+echo "./configure CUSERFLAGS='--C-flags' CXXUSERFLAGS='--C++-flags'
 echo ""
 echo "Note:  If you wish to run a Subversion HTTP server, you will need"
 echo "Apache 2.x.  See the INSTALL file for details."

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=1425086&r1=1425085&r2=1425086&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 18:56:13 2012
@@ -69,6 +69,7 @@ AC_DEFUN([SVN_CC_MODE_SETUP],
   CMODEFLAGS="$CFLAGS"
   CFLAGS="$CFLAGS_KEEP"
   AC_SUBST(CMODEFLAGS)
+  AC_SUBST(CMAINTAINERFLAGS)
 ])
 
 
@@ -84,4 +85,5 @@ AC_DEFUN([SVN_CXX_MODE_SETUP],
   CXXMODEFLAGS="$CXXFLAGS"
   CXXFLAGS="$CXXFLAGS_KEEP"
   AC_SUBST(CXXMODEFLAGS)
+  AC_SUBST(CXXMAINTAINERFLAGS)
 ])

Modified: subversion/branches/tweak-build-take-two/configure.ac
URL: http://svn.apache.org/viewvc/subversion/branches/tweak-build-take-two/configure.ac?rev=1425086&r1=1425085&r2=1425086&view=diff
==============================================================================
--- subversion/branches/tweak-build-take-two/configure.ac (original)
+++ subversion/branches/tweak-build-take-two/configure.ac Fri Dec 21 18:56:13 2012
@@ -49,11 +49,13 @@ SVN_CONFIG_NICE(config.nice)
 # ==== Check for programs ====================================================
 
 # Look for a C compiler (before anything can set CFLAGS)
+CMAINTAINERFLAGS="$CUSERFLAGS"
 CUSERFLAGS="$CFLAGS"
 AC_PROG_CC
 SVN_CC_MODE_SETUP
 
 # Look for a C++ compiler (before anything can set CXXFLAGS)
+CXXMAINTAINERFLAGS="$CXXUSERFLAGS"
 CXXUSERFLAGS="$CXXFLAGS"
 AC_PROG_CXX
 SVN_CXX_MODE_SETUP
@@ -999,7 +1001,7 @@ AS_HELP_STRING([--enable-maintainer-mode
         dnl but throw too many warnings in svn code, of too little importance,
         dnl to keep these enabled. Remove the "dnl" to do a run with these
         dnl switches enabled.
-        dnl CMAINTAINERFLAGS="-Wswitch-enum -Wswitch-default $CMAINTAINERFLAGS"
+        dnl ./configure CUSERFLAGS="-Wswitch-enum -Wswitch-default"
 
         dnl Add each of the following flags only if the C compiler accepts it.
         CFLAGS_KEEP="$CFLAGS"
@@ -1014,8 +1016,7 @@ AS_HELP_STRING([--enable-maintainer-mode
         SVN_CFLAGS_ADD_IFELSE([-Wno-system-headers])
         SVN_CFLAGS_ADD_IFELSE([-Wno-format-nonliteral])
 
-        AC_SUBST(CMAINTAINERFLAGS)
-        CMAINTAINERFLAGS="$CFLAGS"
+        CMAINTAINERFLAGS="$CFLAGS $CMAINTAINERFLAGS"
         CFLAGS="$CFLAGS_KEEP"
 
         dnl Add flags that all versions of GCC (should) support
@@ -1033,8 +1034,7 @@ AS_HELP_STRING([--enable-maintainer-mode
         SVN_CXXFLAGS_ADD_IFELSE([-Wshorten-64-to-32])
         SVN_CXXFLAGS_ADD_IFELSE([-Wno-system-headers])
 
-        AC_SUBST(CXXMAINTAINERFLAGS)
-        CXXMAINTAINERFLAGS="$CXXFLAGS"
+        CXXMAINTAINERFLAGS="$CXXFLAGS $CXXMAINTAINERFLAGS"
         CXXFLAGS="$CXXFLAGS_KEEP"
 
         dnl Add flags that all versions of G++ (should) support