summaryrefslogtreecommitdiffstats
path: root/m4/nss.m4
diff options
context:
space:
mode:
authorroot <root@buildsamba01.idm.lab.bos.redhat.com>2010-03-19 19:25:48 -0500
committerRich Megginson <rmeggins@redhat.com>2010-03-23 10:19:32 -0600
commit682529e7f8391744615b40a14852efd317936109 (patch)
tree906ac28baf86f97655acf29d988101b56c15758b /m4/nss.m4
parent04a0bd9ada0b3dd8efae67b63421dfa31e15b051 (diff)
downloadds-682529e7f8391744615b40a14852efd317936109.tar.gz
ds-682529e7f8391744615b40a14852efd317936109.tar.xz
ds-682529e7f8391744615b40a14852efd317936109.zip
Bug 480787 - Autoconf parameter --with and --without
https://bugzilla.redhat.com/show_bug.cgi?id=480787 Resolves: bug 480787 Bug Description: Autoconf parameter --with and --without Fix Description: The configure script has been modified such that the --with-XXX and --without-XXX switches will work as --with-XXX=yes and --with-XXX=no, respectively. If the package is required and none of the switches are specified, it will default to "yes". The code that detects LDAPSDK and OpenLDAP conflicts has been updated. The help messages have been cleaned up. Reviewed by: rmeggins (and pushed by)
Diffstat (limited to 'm4/nss.m4')
-rw-r--r--m4/nss.m417
1 files changed, 12 insertions, 5 deletions
diff --git a/m4/nss.m4 b/m4/nss.m4
index 9d892254..753b0033 100644
--- a/m4/nss.m4
+++ b/m4/nss.m4
@@ -22,9 +22,16 @@ AC_CHECKING(for NSS)
# check for --with-nss
AC_MSG_CHECKING(for --with-nss)
-AC_ARG_WITH(nss, [ --with-nss=PATH Network Security Services (NSS) directory],
+AC_ARG_WITH(nss, AS_HELP_STRING([--with-nss@<:@=PATH@:>@],[Network Security Services (NSS) directory]),
[
- if test -e "$withval"/include/nss.h -a -d "$withval"/lib
+ if test "$withval" = "yes"
+ then
+ AC_MSG_RESULT(yes)
+ elif test "$withval" = "no"
+ then
+ AC_MSG_RESULT(no)
+ AC_MSG_ERROR([NSS is required.])
+ elif test -e "$withval"/include/nss.h -a -d "$withval"/lib
then
AC_MSG_RESULT([using $withval])
NSSDIR=$withval
@@ -36,11 +43,11 @@ AC_ARG_WITH(nss, [ --with-nss=PATH Network Security Services (NSS) dire
AC_MSG_ERROR([$withval not found])
fi
],
-AC_MSG_RESULT(no))
+AC_MSG_RESULT(yes))
# check for --with-nss-inc
AC_MSG_CHECKING(for --with-nss-inc)
-AC_ARG_WITH(nss-inc, [ --with-nss-inc=PATH Network Security Services (NSS) include directory],
+AC_ARG_WITH(nss-inc, AS_HELP_STRING([--with-nss-inc=PATH],[Network Security Services (NSS) include directory]),
[
if test -e "$withval"/nss.h
then
@@ -55,7 +62,7 @@ AC_MSG_RESULT(no))
# check for --with-nss-lib
AC_MSG_CHECKING(for --with-nss-lib)
-AC_ARG_WITH(nss-lib, [ --with-nss-lib=PATH Network Security Services (NSS) library directory],
+AC_ARG_WITH(nss-lib, AS_HELP_STRING([--with-nss-lib=PATH],[Network Security Services (NSS) library directory]),
[
if test -d "$withval"
then