From 84880b58422251ac135e45660496db921e8ee511 Mon Sep 17 00:00:00 2001 From: Jean-Marc Lasgouttes Date: Tue, 6 Oct 2009 14:05:57 +0000 Subject: [PATCH] cleanup the help messages of the configure script; now --with-version-suffix shows what the default suffix is git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31542 a592a061-630c-0410-9148-cb99ea01b6c8 --- config/lyxinclude.m4 | 12 ++++++------ config/qt4.m4 | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/config/lyxinclude.m4 b/config/lyxinclude.m4 index 6e438e36da..6c6f5fef90 100644 --- a/config/lyxinclude.m4 +++ b/config/lyxinclude.m4 @@ -44,7 +44,7 @@ AC_MSG_CHECKING([for version suffix]) dnl We need the literal double quotes in the rpm spec file RPM_VERSION_SUFFIX='""' AC_ARG_WITH(version-suffix, - [ --with-version-suffix[=] install lyx files as lyx], + [AC_HELP_STRING([--with-version-suffix@<:@=VERSION@:>@], install lyx files as lyxVERSION (VERSION=-AC_PACKAGE_VERSION))], [if test "x$withval" = "xyes"; then withval="-"AC_PACKAGE_VERSION @@ -425,7 +425,7 @@ dnl be used. AC_DEFUN([LYX_USE_INCLUDED_BOOST],[ AC_MSG_CHECKING([whether to use boost included library]) AC_ARG_WITH(included-boost, - [ --without-included-boost do not use the boost lib supplied with LyX, try to find one in the system directories - compilation will abort if nothing suitable is found], + [AC_HELP_STRING([--without-included-boost], [do not use the boost lib supplied with LyX, try to find one in the system directories - compilation will abort if nothing suitable is found])], [lyx_cv_with_included_boost=$withval], [lyx_cv_with_included_boost=yes]) AM_CONDITIONAL(USE_INCLUDED_BOOST, test x$lyx_cv_with_included_boost = xyes) @@ -581,8 +581,8 @@ rm -f conftest*]) AC_DEFUN([LYX_USE_FRONTENDS], [AC_MSG_CHECKING([what frontend should be used for the GUI]) AC_ARG_WITH(frontend, - [ --with-frontend=THIS Use THIS frontend as main GUI: - Possible values: qt4], + [AC_HELP_STRING([--with-frontend=THIS], [use THIS frontend as main GUI: + Possible values: qt4])], [FRONTENDS="$withval"],[FRONTENDS="qt4"]) if test "x$FRONTENDS" = x ; then AC_MSG_RESULT(none) @@ -600,8 +600,8 @@ AC_SUBST(FRONTENDS_PROGS) AC_DEFUN([LYX_USE_PACKAGING], [AC_MSG_CHECKING([what packaging should be used]) AC_ARG_WITH(packaging, - [ --with-packaging=THIS Use THIS packaging for installation: - Possible values: posix, windows, macosx], + [AC_HELP_STRING([--with-packaging=THIS], [use THIS packaging for installation: + Possible values: posix, windows, macosx])], [lyx_use_packaging="$withval"], [ case $host in *-apple-darwin*) lyx_use_packaging=macosx ;; diff --git a/config/qt4.m4 b/config/qt4.m4 index 79fbbc17ca..7166e88f78 100644 --- a/config/qt4.m4 +++ b/config/qt4.m4 @@ -94,13 +94,13 @@ AC_DEFUN([QT4_DO_IT_ALL], dnl oprofile. FATAL=0 - AC_ARG_WITH(qt4-dir, [ --with-qt4-dir where the root of Qt 4 is installed ], + AC_ARG_WITH(qt4-dir, [AC_HELP_STRING([--with-qt4-dir], [where the root of Qt 4 is installed])], [ qt4_cv_dir=`eval echo "$withval"/` ]) - AC_ARG_WITH(qt4-includes, [ --with-qt4-includes where the Qt 4 includes are. ], + AC_ARG_WITH(qt4-includes, [AC_HELP_STRING([--with-qt4-includes], [where the Qt 4 includes are])], [ qt4_cv_includes=`eval echo "$withval"` ]) - AC_ARG_WITH(qt4-libraries, [ --with-qt4-libraries where the Qt 4 library is installed.], + AC_ARG_WITH(qt4-libraries, [AC_HELP_STRING([--with-qt4-libraries], [where the Qt 4 library is installed])], [ qt4_cv_libraries=`eval echo "$withval"` ]) dnl pay attention to $QT4DIR unless overridden -- 2.39.2