Author: rjung Date: Tue Dec 11 13:19:02 2007 New Revision: 603364 URL: http://svn.apache.org/viewvc?rev=603364&view=rev Log: Use AS_HELP_STRING to format help messages of configure in columns.
Modified: tomcat/connectors/trunk/jk/native/configure.in Modified: tomcat/connectors/trunk/jk/native/configure.in URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/configure.in?rev=603364&r1=603363&r2=603364&view=diff ============================================================================== --- tomcat/connectors/trunk/jk/native/configure.in (original) +++ tomcat/connectors/trunk/jk/native/configure.in Tue Dec 11 13:19:02 2007 @@ -322,8 +322,9 @@ apache_dir_is_src="false" AC_ARG_WITH(apache, -[ --with-apache=DIR Build static Apache module. DIR is the pathname - to the Apache source directory.], +[AS_HELP_STRING([--with-apache=DIR], +[Build static Apache module. DIR is the pathname +to the Apache source directory.])], [ if ${TEST} ! -z "$WEBSERVER" ; then AC_MSG_ERROR([Sorry cannot use --with-apxs=${APXS} and --with-apache=${withval} together, please choose one of both]) @@ -397,7 +398,7 @@ AC_SUBST(APACHE_DIR) AC_ARG_ENABLE(netscape, -[ --enable-netscape=DIR Build Netscape/iPlanet/SunONE nsapi redirector plugin.], +[AS_HELP_STRING([--enable-netscape=DIR],[Build Netscape/iPlanet/SunONE nsapi redirector plugin])], [ if ${TEST} ! -z "$WEBSERVER" ; then AC_MSG_ERROR([Sorry cannot use --with-apxs=${APXS} or --with-apache=${withval} with --with-netscape, please choose one or the other.]) @@ -414,7 +415,7 @@ dnl Check for enable-jni JK_JNI_WORKER="" AC_ARG_ENABLE(jni, -[ --enable-jni Build jni_connect.so and enable jni_worker.], +[AS_HELP_STRING([--enable-jni],[Build jni_connect.so and enable jni_worker])], [ AC_MSG_RESULT(jni enable (need JDK)) CFLAGS="${CFLAGS} -DHAVE_JNI" @@ -425,9 +426,8 @@ dnl CFLAGS for EAPI mod_ssl (Apache 1.3) dnl it also allows the CFLAGS environment variable. CFLAGS="${CFLAGS}" -AC_ARG_ENABLE( -EAPI, -[ --enable-EAPI Enable EAPI support (mod_ssl, Apache 1.3)], +AC_ARG_ENABLE(EAPI, +[AS_HELP_STRING([--enable-EAPI],[Enable EAPI support (mod_ssl, Apache 1.3)])], [ case "${enableval}" in y | Y | YES | yes | TRUE | true ) @@ -441,9 +441,8 @@ dnl CFLAGS for maintainer mode dnl it also allows the CFLAGS environment variable. CFLAGS="${CFLAGS}" -AC_ARG_ENABLE( -maintainer-mode, -[ --enable-maintainer-mode Turn on debugging and compile time warnings], +AC_ARG_ENABLE(maintainer-mode, +[AS_HELP_STRING([--enable-maintainer-mode],[Turn on debugging and compile time warnings])], [ case "${enableval}" in y | Y | YES | yes | TRUE | true ) @@ -454,12 +453,11 @@ ]) AC_SUBST(CFLAGS) -dnl CFLAGS for preforks mode +dnl CFLAGS for prefork mode dnl it also allows the CFLAGS environment variable. CFLAGS="${CFLAGS}" -AC_ARG_ENABLE( -prefork, -[ --enable-prefork Turn on prefork web server mode], +AC_ARG_ENABLE(prefork, +[AS_HELP_STRING([--enable-prefork],[Turn on prefork web server mode (single-threaded)])], [ case "${enableval}" in y | Y | YES | yes | TRUE | true ) @@ -474,7 +472,7 @@ dnl it also allows the CFLAGS environment variable. CFLAGS="${CFLAGS}" AC_ARG_ENABLE(trace, -[ --disable-trace Exclude trace log code from compilation], +[AS_HELP_STRING([--disable-trace],[Exclude trace log code from compilation])], [ case "${enableval}" in no ) @@ -488,9 +486,8 @@ dnl CFLAGS for shared memory lock mode dnl it also allows the CFLAGS environment variable. CFLAGS="${CFLAGS}" -AC_ARG_ENABLE( -flock, -[ --enable-flock Turn on flock for shared locking if present], +AC_ARG_ENABLE(flock, +[AS_HELP_STRING([--enable-flock],[Turn on flock for shared locking if present])], [ case "${enableval}" in y | Y | YES | yes | TRUE | true ) @@ -540,7 +537,7 @@ JAVA_PLATFORM="1" AC_ARG_WITH(java-home, -[ --with-java-home=DIR Where is your JDK root directory.], +[AS_HELP_STRING([--with-java-home=DIR],[Where is your JDK root directory])], [ # This stuff works if the command line parameter --with-java-home was @@ -642,8 +639,9 @@ AC_MSG_CHECKING(Java platform) AC_ARG_WITH(java-platform, - [ --with-java-platform=VAL Force the Java platorm - (value is 1 for 1.1.x or 2 for 1.2.x or greater)], + [AS_HELP_STRING([--with-java-platform=VAL], + [Force the Java platform + (value is 1 for 1.1.x or 2 for 1.2.x or greater)])], [ dnl This requires a bit of tweaking to be handled properly, but dnl the default is good enough @@ -664,7 +662,7 @@ dnl guess OS = OS_TYPE for jni_md.h OS="" AC_ARG_WITH(os-type, -[ --with-os-type[=SUBDIR] Where is your JDK os-type subdirectory.], +[AS_HELP_STRING([--with-os-type=SUBDIR],[Where is your JDK os-type subdirectory])], [ OS=${withval} --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]