From df12bfb5b15823af5ff8624431240e524b2f3039 Mon Sep 17 00:00:00 2001 From: aet Date: Fri, 11 Feb 2005 20:02:46 +0000 Subject: [PATCH] - make use of AC_HELP_STRING in configure.in (Martin Paljak) git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@2180 c6295689-39f2-0310-b995-f0e70906c6a9 --- configure.in | 51 ++++++++++++++++++++++++--------------------------- 1 file changed, 24 insertions(+), 27 deletions(-) diff --git a/configure.in b/configure.in index adb1d9c1..8efd30c6 100644 --- a/configure.in +++ b/configure.in @@ -63,7 +63,7 @@ case "$host" in esac AC_ARG_WITH(common-dir, - [ --with-common-dir=PATH Specify path for common installation libraries], + AC_HELP_STRING([--with-common-dir=PATH], [Specify path for common installation libraries]), [ if test "x$withval" != "xno" ; then trycommondir=$withval @@ -190,7 +190,7 @@ AC_CHECK_FUNCS(readline) LIBS="$saved_LIBS" AC_ARG_WITH(flex-dir, - [ --with-flex-dir=PATH Specify path to flex installation], + AC_HELP_STRING([--with-flex-dir=PATH],[Specify path to flex installation]), [ if test "x$withval" != "xno" ; then tryflexdir=$withval @@ -237,7 +237,7 @@ SSL_MSG="no" ssldir="" AC_ARG_WITH(openssl, - [ --with-openssl=PATH use OpenSSL in PATH], + AC_HELP_STRING([--with-openssl=PATH], [use OpenSSL in PATH]), [ # Disable OpenSSL support if test "x$withval" = "xno" ; then @@ -457,7 +457,7 @@ LDFLAGS="$saved_LDFLAGS" AC_SUBST(OPENSSL_LDFLAGS) AC_ARG_WITH(pam-dir, - [ --with-pam-dir=PATH Specify path for PAM installation libraries], + AC_HELP_STRING([--with-pam-dir=PATH], [Specify path for PAM installation libraries]), [ if test "x$withval" != "xno" ; then trypamdir=$withval @@ -499,7 +499,7 @@ AC_SUBST(LIBPAM) saved_LIBS="$LIBS" AC_MSG_CHECKING([PAM support]) AC_ARG_WITH(pam, - [ --with-pam Enable PAM support], + AC_HELP_STRING([--with-pam], [Enable PAM support]), [ if test "x$withval" = "xno" ; then AC_MSG_RESULT(disabled) @@ -530,7 +530,7 @@ SIA_MSG="no" no_osfsia="" AC_MSG_CHECKING([SIA support]) AC_ARG_WITH(osfsia, - [ --with-osfsia Enable Digital Unix SIA], + AC_HELP_STRING([--with-osfsia], [Enable Digital Unix SIA]), [ if test "x$withval" = "xno" ; then AC_MSG_RESULT(disabled) @@ -569,7 +569,7 @@ saved_CFLAGS="$CFLAGS" saved_LDFLAGS="$LDFLAGS" saved_CPPFLAGS="$CPPFLAGS" AC_ARG_WITH(pcsclite, - [ --with-pcsclite=PATH use PC/SC Lite in PATH], + AC_HELP_STRING([--with-pcsclite=PATH], [use PC/SC Lite in PATH]), [pcsc_path=$withval]) if test "x$pcsc_path" = "xno"; then PCSC_MSG="no" @@ -667,7 +667,7 @@ saved_CFLAGS="$CFLAGS" saved_LDFLAGS="$LDFLAGS" saved_CPPFLAGS="$CPPFLAGS" AC_ARG_WITH(openct, - [ --with-openct=PATH use OpenCT in PATH], + AC_HELP_STRING([--with-openct=PATH], [use OpenCT in PATH]), [openct_path=$withval]) if test "x$openct_path" = "xno"; then OPENCT_MSG="no" @@ -714,7 +714,7 @@ fi # Check for user-specified random device, otherwise check /dev/urandom AC_ARG_WITH(random, - [ --with-random=FILE read entropy from FILE (default=/dev/urandom)], + AC_HELP_STRING([--with-random=FILE], [read entropy from FILE (default=/dev/urandom)]), [ if test "x$withval" != "xno" ; then RANDOM_POOL="$withval"; @@ -735,7 +735,7 @@ AC_ARG_WITH(random, # Check for PRNGD/EGD pool file AC_ARG_WITH(prngd-port, - [ --with-prngd-port=PORT read entropy from PRNGD/EGD localhost:PORT], + AC_HELP_STRING([--with-prngd-port=PORT], [read entropy from PRNGD/EGD localhost:PORT]), [ if test ! -z "$withval" -a "x$withval" != "xno" ; then PRNGD_PORT="$withval" @@ -746,7 +746,7 @@ AC_ARG_WITH(prngd-port, # Check for PRNGD/EGD pool file AC_ARG_WITH(prngd-socket, - [ --with-prngd-socket=FILE read entropy from PRNGD/EGD socket FILE (default=/var/run/egd-pool)], + AC_HELP_STRING([--with-prngd-socket=FILE], [read entropy from PRNGD/EGD socket FILE (default=/var/run/egd-pool)]), [ if test "x$withval" != "xno" ; then PRNGD_SOCKET="$withval" @@ -776,7 +776,7 @@ AC_ARG_WITH(prngd-socket, dnl enable/disable logging of sensitive apdu data AC_ARG_ENABLE(sensitive-logging, -[ --disable-sensitive-logging disable logging of sensitive APDU data [default=no]], + AC_HELP_STRING([--disable-sensitive-logging], [disable logging of sensitive APDU data [default=no]]), AC_DEFINE(OPENSC_DONT_LOG_SENSITIVE,1,[Disable logging of sensitive APDU data])) ### BEGIN LDAP SPECIFIC OPTIONS @@ -784,11 +784,11 @@ dnl ldap autoconf magic partly taken from pam_ldap dnl --enable-ldap option. AC_ARG_ENABLE(ldap, -[ --enable-ldap enable use of LDAP for authentication. [default=yes]], +AC_HELP_STRING([--enable-ldap], [enable use of LDAP for authentication. [default=yes]]), , enable_ldap=yes) -AC_ARG_ENABLE(ldap-ssl, [ --disable-ldap-ssl disable SSL/TSL support for ldap]) -AC_ARG_WITH(ldap-lib, [ --with-ldap-lib=type select ldap library [auto|netscape5|netscape4|netscape3|umich|openldap]]) -AC_ARG_WITH(ldap-dir, [ --with-ldap-dir=DIR base directory of ldap SDK]) +AC_ARG_ENABLE(ldap-ssl, AC_HELP_STRING([--disable-ldap-ssl], [disable SSL/TSL support for ldap])) +AC_ARG_WITH(ldap-lib, AC_HELP_STRING([--with-ldap-lib=type], [select ldap library [auto|netscape5|netscape4|netscape3|umich|openldap]])) +AC_ARG_WITH(ldap-dir, AC_HELP_STRING([--with-ldap-dir=DIR], [base directory of ldap SDK])) AC_SUBST(LIBLDAP) LDAP_MSG="no" @@ -853,7 +853,7 @@ AC_SUBST(CFLAGS_ASSUAN) AC_SUBST(LIBASSUAN) LIBASSUAN="-lassuan" AC_ARG_WITH(assuan, - [ --with-assuan=PATH use Assuan libraries in PATH], + AC_HELP_STRING([--with-assuan=PATH], [use Assuan libraries in PATH]), [ if test -n "${need_dash_r}"; then LDFLAGS="-L${withval}/lib -R${withval}/lib ${LDFLAGS}" @@ -876,7 +876,7 @@ AM_CONDITIONAL(HAVE_ASSUAN, test "x$ASSUAN_MSG" = "xyes") PLUGINDIR="/usr/lib/mozilla/plugins" AC_ARG_WITH(plugin-dir, - [ --with-plugin-dir=PATH install Mozilla plugin to PATH [[/usr/lib/mozilla/plugins]]], + AC_HELP_STRING([--with-plugin-dir=PATH], [install Mozilla plugin to PATH [[/usr/lib/mozilla/plugins]]]), [ PLUGINDIR="$withval" ] @@ -885,7 +885,7 @@ AC_SUBST(PLUGINDIR) BUNDLEDIR="${libdir}" AC_ARG_WITH(bundle-dir, - [ --with-bundle-dir=PATH install MacOS X bundles to PATH [[EPREFIX/lib]]], + AC_HELP_STRING([--with-bundle-dir=PATH], [install MacOS X bundles to PATH [[EPREFIX/lib]]]), [ BUNDLEDIR="$withval" ] @@ -895,7 +895,7 @@ AC_SUBST(BUNDLEDIR) # Check for PIN entry program used by OpenSC Signer PIN_ENTRY="/usr/local/bin/gpinentry" AC_ARG_WITH(pin-entry, - [ --with-pin-entry=PROG Run PROG as PIN-entry for OpenSC Signer], + AC_HELP_STRING([--with-pin-entry=PROG],[Run PROG as PIN-entry for OpenSC Signer]), [ if test ! -z "$withval" -a "x$withval" != "xno" ; then PIN_ENTRY="$withval" @@ -906,7 +906,7 @@ AC_DEFINE_UNQUOTED(PIN_ENTRY, "$PIN_ENTRY", [PIN-entry program for OpenSC Signer dnl Check for SGML processor AC_ARG_WITH(docbook, -[ --without-docbook do no generate html manual (needs docbook)], + AC_HELP_STRING([--without-docbook], [do no generate html manual (needs docbook)]), with_docbook=$withval) AC_CHECK_PROG(XSLTPROC, xsltproc, xsltproc) if test "x$XSLTPROC" = "x"; then @@ -925,12 +925,9 @@ if test "x$exec_prefix" = xNONE; then fi dnl Enable/disable debugging messages. -AC_ARG_ENABLE(debug, -[ --enable-debug enable debug messages. [default=no]], - , enable_debug=no) -if (test x$enable_debug = xyes); then - AC_DEFINE(DEBUG, 1, [Enable debug messages.]) -fi +AC_ARG_ENABLE(debug, + AC_HELP_STRING([--enable-debug], [enable debug messages. [[default=no]]]), + AC_DEFINE(DEBUG, 1, [Enable debug messages.])) CPPFLAGS="-I\${top_builddir}/src/include $CPPFLAGS" AM_CONDITIONAL(HAVE_BUNDLES, test "x$with_bundles" = "xyes")