svn commit: r1500695 - in /subversion/trunk: build/ac-macros/berkeley-db.m4 configure.ac

[st...@apache.org]

Author: stsp
Date: Mon Jul  8 12:37:07 2013
New Revision: 1500695

URL: http://svn.apache.org/r1500695
Log:
Rename --enable-banging-head-against-wall to --enable-bdb6. I still like the
former name for this option, however using a clear name will help packagers
and people trying to read packaging scripts, and that's more important than
making a joke.

* build/ac-macros/berkeley-db.m4
  configure.ac: Rename --enable-banging-head-against-wall to --enable-bdb6.

Modified:
    subversion/trunk/build/ac-macros/berkeley-db.m4
    subversion/trunk/configure.ac

Modified: subversion/trunk/build/ac-macros/berkeley-db.m4
URL: http://svn.apache.org/viewvc/subversion/trunk/build/ac-macros/berkeley-db.m4?rev=1500695&r1=1500694&r2=1500695&view=diff
==============================================================================
--- subversion/trunk/build/ac-macros/berkeley-db.m4 (original)
+++ subversion/trunk/build/ac-macros/berkeley-db.m4 Mon Jul  8 12:37:07 2013
@@ -126,8 +126,8 @@ AC_DEFUN(SVN_LIB_BERKELEY_DB,
     svn_lib_berkeley_db=no
   else
     AC_MSG_CHECKING([for availability of Berkeley DB])
-    AC_ARG_ENABLE(banging-head-against-wall,
-      AS_HELP_STRING([---disable-banging-head-against-wall],
+    AC_ARG_ENABLE(bdb6,
+      AS_HELP_STRING([---disable-bdb6],
                      [Allow building against BDB 6+.
                       See --with-berkeley-db for specifying the location of
                       the Berkeley DB installation.  Using BDB 6 will fail if
@@ -140,7 +140,7 @@ AC_DEFUN(SVN_LIB_BERKELEY_DB,
       svn_lib_berkeley_db=yes
     else
       if test "$svn_have_berkeley_db" = "no6"; then
-        AC_MSG_RESULT([no (found version 6, but --enable-banging-head-against-wall not specified)])
+        AC_MSG_RESULT([no (found version 6, but --enable-bdb6 not specified)])
         # A warning will be printed at the end of configure.ac.
       else
         AC_MSG_RESULT([no])

Modified: subversion/trunk/configure.ac
URL: http://svn.apache.org/viewvc/subversion/trunk/configure.ac?rev=1500695&r1=1500694&r2=1500695&view=diff
==============================================================================
--- subversion/trunk/configure.ac (original)
+++ subversion/trunk/configure.ac Mon Jul  8 12:37:07 2013
@@ -1517,9 +1517,9 @@ if test "$svn_have_berkeley_db" = "no6" 
 
 
 Berkeley DB 6 was found, but not used.  Please re-run configure (see
-./config.nice) with the '--enable-banging-head-against-wall' flag to use it,
-or explicitly specify '--disable-banging-head-against-wall' or 
-'--without-berkeley-db' to silence this warning.
+./config.nice) with the '--enable-bdb6' flag to use it,
+or explicitly specify '--disable-bdb6' or '--without-berkeley-db'
+to silence this warning.
 
 Please note that some versions of Berkeley DB 6+ are under the GNU Affero
 General Public License, version 3: