diff options
| author | root <root@buildsamba01.idm.lab.bos.redhat.com> | 2010-03-19 19:25:48 -0500 |
|---|---|---|
| committer | Rich Megginson <rmeggins@redhat.com> | 2010-03-23 10:19:32 -0600 |
| commit | 682529e7f8391744615b40a14852efd317936109 (patch) | |
| tree | 906ac28baf86f97655acf29d988101b56c15758b /m4/sasl.m4 | |
| parent | 04a0bd9ada0b3dd8efae67b63421dfa31e15b051 (diff) | |
| download | ds-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/sasl.m4')
| -rw-r--r-- | m4/sasl.m4 | 25 |
1 files changed, 10 insertions, 15 deletions
@@ -27,24 +27,19 @@ dnl ======================================================== dnl ======================================================== dnl = Use the sasl libraries on the system (assuming it exists) dnl ======================================================== -AC_CHECKING(for sasl) +AC_CHECKING(for SASL) AC_MSG_CHECKING(for --with-sasl) AC_ARG_WITH(sasl, - [[ --with-sasl=PATH Use sasl from supplied path]], + AS_HELP_STRING([--with-sasl@<:@=PATH@:>@],[Use SASL from supplied path]), dnl = Look in the standard system locations [ if test "$withval" = "yes"; then AC_MSG_RESULT(yes) - dnl = Check for sasl.h in the normal locations - if test -f /usr/include/sasl/sasl.h; then - sasl_inc="-I/usr/include/sasl" - elif test -f /usr/include/sasl.h; then - sasl_inc="-I/usr/include" - else - AC_MSG_ERROR(sasl.h not found) - fi + elif test "$withval" = "no"; then + AC_MSG_RESULT(no) + AC_MSG_ERROR([SASL is required.]) dnl = Check the user provided location elif test -d "$withval" -a -d "$withval/lib" -a -d "$withval/include" ; then @@ -62,14 +57,14 @@ AC_ARG_WITH(sasl, sasl_libdir="$withval/lib" else AC_MSG_RESULT(yes) - AC_MSG_ERROR([sasl not found in $withval]) + AC_MSG_ERROR([SASL not found in $withval]) fi ], - AC_MSG_RESULT(no)) + AC_MSG_RESULT(yes)) AC_MSG_CHECKING(for --with-sasl-inc) AC_ARG_WITH(sasl-inc, - [[ --with-sasl-inc=PATH SASL include file directory]], + AS_HELP_STRING([--with-sasl-inc=PATH],[SASL include file directory]), [ if test -f "$withval"/sasl.h; then AC_MSG_RESULT([using $withval]) @@ -83,7 +78,7 @@ AC_ARG_WITH(sasl-inc, AC_MSG_CHECKING(for --with-sasl-lib) AC_ARG_WITH(sasl-lib, - [[ --with-sasl-lib=PATH SASL library directory]], + AS_HELP_STRING([--with-sasl-lib=PATH],[SASL library directory]), [ if test -d "$withval"; then AC_MSG_RESULT([using $withval]) @@ -107,6 +102,6 @@ if test -z "$sasl_inc"; then sasl_inc="-I/usr/include" else AC_MSG_RESULT(no) - AC_MSG_ERROR([sasl not found, specify with --with-sasl.]) + AC_MSG_ERROR([SASL not found, specify with --with-sasl.]) fi fi |