From 2bcd991b46059a87a9e2d7eb62b0704af7c8700f Mon Sep 17 00:00:00 2001 From: Stefan Knoblich Date: Mon, 12 May 2008 19:12:37 +0000 Subject: [PATCH] Add AS_HELP_STRING to options missing it, fix --disable-core-libedit-support value handling after rename (oops) git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@8371 d0543943-73ff-0310-b7d9-9358b9ac24b2 --- build/config/ax_check_java.m4 | 6 +++--- configure.in | 7 ++++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/build/config/ax_check_java.m4 b/build/config/ax_check_java.m4 index efee0782ab..321fb8d48c 100644 --- a/build/config/ax_check_java.m4 +++ b/build/config/ax_check_java.m4 @@ -9,9 +9,9 @@ dnl prerequisites: AC_DEFUN([AX_CHECK_JAVA], [ AC_ARG_WITH([java], - AC_HELP_STRING([ --with-java=PFX], [prefix where 'java' is installed.]), - [with_java_prefix=$withval], - [with_java_prefix=${JAVA_INSTALL_PATH:-/usr/java/j2sdk1.4.1_01}]) + [AC_HELP_STRING([--with-java=PFX], [prefix where 'java' is installed.])], + [with_java_prefix="$withval"], + [with_java_prefix="${JAVA_INSTALL_PATH:-/usr/java/j2sdk1.4.1_01}"]) have_java='no' LIB_JAVA='' JAVA_FLAGS='' diff --git a/configure.in b/configure.in index f03bb07ce8..cf3a65df80 100644 --- a/configure.in +++ b/configure.in @@ -31,7 +31,8 @@ AC_SUBST(switch_srcdir) AC_SUBST(switch_builddir) # Where to install the modules -AC_ARG_WITH(modinstdir, [ --with-modinstdir (default=$prefix/mod)], modinstdir=$withval, modinstdir="${prefix}/mod") +AC_ARG_WITH([modinstdir], + [AS_HELP_STRING([--with-modinstdir=DIR], [Install modules into this location (default: $prefix/mod)])], [modinstdir="$withval"], [modinstdir="${prefix}/mod"]) AC_SUBST(modinstdir) AC_DEFINE_UNQUOTED([SWITCH_MOD_DIR],"${modinstdir}",[where to install the modules to]) @@ -408,10 +409,10 @@ LIBCURL_CHECK_CONFIG([yes], [7.13.0], [LIBCURL_DEPS=''], [LIBCURL_DEPS='${switch AC_SUBST(LIBCURL_DEPS) AC_ARG_ENABLE(core-odbc-support, - [ --enable-core-odbc-support Compile with ODBC Support],,[enable_core_odbc_support="no"]) + [AS_HELP_STRING([--enable-core-odbc-support], [Compile with ODBC Support])],,[enable_core_odbc_support="no"]) AC_ARG_ENABLE(core-libedit-support, - [ --disable-core-libedit-support Compile without libedit Support],,[enable_core_libedit_support="yes"]) + [AS_HELP_STRING([--disable-core-libedit-support], [Compile without libedit Support])], [enable_core_libedit_support="$enableval"], [enable_core_libedit_support="yes"]) if test "$enable_core_libedit_support" = "yes" ; then AC_CHECK_LIB(ncurses, tgetent,,