Howdy,
The following patch addresses issue 949. I didn't convert the help
string for '--with-berkeley-db' to AC_HELP_STRING because I don't know
how to preserve the paragraph break, and I didn't convert the help
string for '--with-apxs' because I don't know how preserve the braces
and not mess up the indentation.
Matt
* ac-helpers/swig.m4
Unquote AC_HELP_STRING.
* ac-helpers/find_apr.m4
Use AC_HELP_STRING.
* ac-helpers/berkeley-db.m4
Remove extra backslashes and reformat help string.
* ac-helpers/find_apu.m4
Use AC_HELP_STRING.
* ac-helpers/svn-apache.m4
Use AC_HELP_STRING.
* ac-helpers/neon.m4
Unquote AC_HELP_STRING.
* configure.in
Use AC_HELP_STRING.
* subversion/mod_dav_svn/static/config.m4
Use AC_HELP_STRING.
Index: ac-helpers/swig.m4
===================================================================
--- ac-helpers/swig.m4 (revision 3500)
+++ ac-helpers/swig.m4 (working copy)
@@ -8,10 +8,10 @@
AC_DEFUN(SVN_CHECK_SWIG,
[
AC_ARG_WITH(swig,
- [AC_HELP_STRING([--with-swig=PATH],
- [Try to use 'PATH/bin/swig' to build the
- swig bindings. If PATH is not specified,
- look for a 'swig' binary in your PATH.])],
+ AC_HELP_STRING([--with-swig=PATH],
+ [Try to use 'PATH/bin/swig' to build the
+ swig bindings. If PATH is not specified,
+ look for a 'swig' binary in your PATH.]),
[
case "$withval" in
"no")
Index: ac-helpers/find_apr.m4
===================================================================
--- ac-helpers/find_apr.m4 (revision 3500)
+++ ac-helpers/find_apr.m4 (working copy)
@@ -49,8 +49,9 @@
AC_MSG_CHECKING(for APR)
AC_ARG_WITH(apr,
- [ --with-apr=DIR|FILE prefix for installed APR, path to APR build tree,
- or the full path to apr-config],
+ AC_HELP_STRING([--with-apr=DIR|FILE],
+ [prefix for installed APR, path to APR build tree, or the
+ full path to apr-config]),
[
if test "$withval" = "no" || test "$withval" = "yes"; then
AC_MSG_ERROR([--with-apr requires a directory to be provided])
Index: ac-helpers/berkeley-db.m4
===================================================================
--- ac-helpers/berkeley-db.m4 (revision 3500)
+++ ac-helpers/berkeley-db.m4 (working copy)
@@ -49,18 +49,21 @@
dnl place spec.
AC_ARG_WITH(berkeley-db,
- [ --with-berkeley-db=PATH
- Find the Berkeley DB header and library in \`PATH/include' and
- \`PATH/lib'. If PATH is of the form \`HEADER:LIB', then search
- for header files in HEADER, and the library in LIB. If you omit
- the \`=PATH' part completely, the configure script will search
- for Berkeley DB in a number of standard places.
-
- The Subversion server requires Berkeley DB $db_version or newer. If
- you specify \`--without-berkeley-db', the server will not be
- built. Otherwise, the configure script builds the server if and
- only if it can find a new enough version installed, or if a copy
- of Berkeley DB exists in the subversion tree as subdir \`db'.],
+ [ --with-berkeley-db=PATH Find the Berkeley DB header and library in
+ `PATH/include' and `PATH/lib'. If PATH is of the
+ form `HEADER:LIB', then search for header files in
+ HEADER, and the library in LIB. If you omit the
+ `=PATH' part completely, the configure script will
+ search for Berkeley DB in a number of standard
+ places.
+
+ The Subversion server requires Berkeley DB
+ $db_version or newer. If you specify
+ `--without-berkeley-db', the server will not be
+ built. Otherwise, the configure script builds the
+ server if and only if it can find a new enough
+ version installed, or if a copy of Berkeley DB
+ exists in the subversion tree as subdir `db'.],
[
if test "$withval" = "yes"; then
status=required
Index: ac-helpers/find_apu.m4
===================================================================
--- ac-helpers/find_apu.m4 (revision 3500)
+++ ac-helpers/find_apu.m4 (working copy)
@@ -46,7 +46,8 @@
AC_MSG_CHECKING(for APR-util)
AC_ARG_WITH(apr-util,
- [ --with-apr-util=DIR prefix for installed APU, or path to APU build tree],
+ AC_HELP_STRING([--with-apr-util=DIR],
+ [prefix for installed APU, or path to APU build tree]),
[
if test "$withval" = "no" || test "$withval" = "yes"; then
AC_MSG_ERROR([--with-apr-util requires a directory to be provided])
Index: ac-helpers/svn-apache.m4
===================================================================
--- ac-helpers/svn-apache.m4 (revision 3500)
+++ ac-helpers/svn-apache.m4 (working copy)
@@ -12,8 +12,9 @@
AC_MSG_CHECKING(for static Apache module support)
AC_ARG_WITH(apache,
-[ --with-apache=DIR Build static Apache module. DIR is the path
- to the top-level Apache source directory.],
+AC_HELP_STRING([--with-apache=DIR],
+ [Build static Apache module. DIR is the path to the top-level
+ Apache source directory.]),
[
if test "$withval" = "yes"; then
AC_MSG_ERROR(You need to specify a directory with --with-apache)
Index: ac-helpers/neon.m4
===================================================================
--- ac-helpers/neon.m4 (revision 3500)
+++ ac-helpers/neon.m4 (working copy)
@@ -26,11 +26,11 @@
AC_MSG_NOTICE([checking neon library])
AC_ARG_WITH(neon,
- [AC_HELP_STRING([--with-neon=PREFIX],
+ AC_HELP_STRING([--with-neon=PREFIX],
[Determine neon library configuration based on
'PREFIX/bin/neon-config'. Default is to search for neon
in a subdirectory of the top source directory and then to
- look for neon-config in $PATH.])],
+ look for neon-config in $PATH.]),
[
if test "$withval" = "yes" ; then
AC_MSG_ERROR([--with-neon requires an argument.])
Index: configure.in
===================================================================
--- configure.in (revision 3500)
+++ configure.in (working copy)
@@ -55,7 +55,8 @@
dnl Possibly reconfigure packages in subdirectories
AC_ARG_ENABLE(subdir-config,
- [ --disable-subdir-config do not reconfigure packages in subdirectories ],
+ AC_HELP_STRING([--disable-subdir-config],
+ [do not reconfigure packages in subdirectories]),
[
if test "$enableval" = "yes" ; then
do_subdir_config="yes"
@@ -112,7 +113,8 @@
NEON_WANTED_REGEX="`sed -n '/NEON_WANTED_REGEX=/s/.*=//p' $srcdir/build/buildcheck.sh`"
dnl You can skip the neon version check only if you know what you are doing
AC_ARG_ENABLE(neon-version-check,
- [ --disable-neon-version-check do not check the Neon version ],
+ AC_HELP_STRING([--disable-neon-version-check],
+ [do not check the Neon version]),
[
if test "$enableval" = "no" ; then
NEON_WANTED_REGEX="*"
@@ -190,7 +192,8 @@
dnl Process some configuration options ----------
AC_ARG_ENABLE(debug,
-[ --enable-debug Turn on debugging and compile time warnings],
+AC_HELP_STRING([--enable-debug],
+ [Turn on debugging and compile time warnings]),
[
if test "$enableval" = "yes" ; then
enable_debugging="yes"
@@ -201,7 +204,8 @@
MOD_ACTIVATION="-a"
AC_ARG_ENABLE(mod-activation,
-[ --disable-mod-activation Do not enable mod_dav_svn in httpd.conf],
+AC_HELP_STRING([--disable-mod-activation],
+ [Do not enable mod_dav_svn in httpd.conf]),
[
if test "$enableval" = "no" ; then
MOD_ACTIVATION=""
@@ -214,8 +218,8 @@
AC_ARG_ENABLE(maintainer-mode,
-[ --enable-maintainer-mode Turn on debugging and very strict compile-time
- warnings],
+AC_HELP_STRING([--enable-maintainer-mode],
+ [Turn on debugging and very strict compile-time warnings]),
[
if test "$enableval" = "yes" ; then
if test "$enable_debugging" = "no" ; then
@@ -321,7 +325,7 @@
dnl decide whether we want to link against the RA libraries
AC_ARG_ENABLE(dso,
-[ --enable-dso Turn on DSO loading of RA libraries],
+AC_HELP_STRING([--enable-dso], [Turn on DSO loading of RA libraries]),
[
if test "$enableval" = "yes"; then
enable_dso=yes
Index: subversion/mod_dav_svn/static/config.m4
===================================================================
--- subversion/mod_dav_svn/static/config.m4 (revision 3500)
+++ subversion/mod_dav_svn/static/config.m4 (working copy)
@@ -10,7 +10,7 @@
AC_MSG_CHECKING(whether to enable mod_dav_svn)
AC_ARG_ENABLE(dav-svn,
- [ --enable-dav-svn DAV provider for Subversion],
+ AC_HELP_STRING([--enable-dav-svn], [DAV provider for Subversion]),
[ ],
[ enable_dav_svn=no ])
AC_MSG_RESULT($enable_dav_svn)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sat Oct 26 00:41:38 2002