Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 224383 Details for
Bug 104554
EBuild for 389 Directory Ldap Server (fka Fedora Directory Ldap Server)
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
389-ds-base/files/0001-Bug-480787-Autoconf-parameter-with-and-without.patch
0001-Bug-480787-Autoconf-parameter-with-and-without.patch (text/plain), 26.81 KB, created by
Mario Fetka (geos_one)
on 2010-03-20 14:03:13 UTC
(
hide
)
Description:
389-ds-base/files/0001-Bug-480787-Autoconf-parameter-with-and-without.patch
Filename:
MIME Type:
Creator:
Mario Fetka (geos_one)
Created:
2010-03-20 14:03:13 UTC
Size:
26.81 KB
patch
obsolete
>From 3e9703cde0edd023bceb609c23a038debb4263f1 Mon Sep 17 00:00:00 2001 >From: root <root@buildsamba01.idm.lab.bos.redhat.com> >Date: Fri, 19 Mar 2010 19:25:48 -0500 >Subject: [PATCH] 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. >--- > configure.ac | 2 - > m4/db.m4 | 21 +-- > m4/fhs.m4 | 4 +- > m4/icu.m4 | 25 +++-- > m4/kerberos.m4 | 4 +- > m4/mozldap.m4 | 32 ++++- > m4/netsnmp.m4 | 15 ++- > m4/nspr.m4 | 17 ++- > m4/nss.m4 | 17 ++- > m4/openldap.m4 | 16 ++- > m4/pcre.m4 | 33 ++--- > m4/sasl.m4 | 25 ++-- > m4/selinux.m4 | 16 ++- > m4/svrcore.m4 | 41 ++++--- > 15 files changed, 397 insertions(+), 267 deletions(-) > > >diff --git a/configure.ac b/configure.ac >index 68a6d80..cd4ab80 100644 >--- a/configure.ac >+++ b/configure.ac >@@ -466,8 +466,6 @@ AM_CONDITIONAL(SOLARIS,test "$platform" = "solaris") > # Check for library dependencies > m4_include(m4/nspr.m4) > m4_include(m4/nss.m4) >-# default to Mozilla LDAP C SDK - override with --with-openldap >-with_ldapsdk=yes > m4_include(m4/openldap.m4) > m4_include(m4/mozldap.m4) > m4_include(m4/db.m4) >diff --git a/m4/db.m4 b/m4/db.m4 >index 1cde57d..7b300f4 100644 >--- a/m4/db.m4 >+++ b/m4/db.m4 >@@ -22,19 +22,13 @@ AC_CHECKING(for db) > > dnl - check for --with-db > AC_MSG_CHECKING(for --with-db) >-AC_ARG_WITH(db, [ --with-db=PATH Berkeley DB directory], >+AC_ARG_WITH(db, AS_HELP_STRING([--with-db@<:@=PATH@:>@],[Berkeley DB directory]), > [ > if test "$withval" = "yes"; then > AC_MSG_RESULT(yes) >- dnl - check in system locations >- if test -f "/usr/include/db.h"; then >- db_incdir="/usr/include" >- db_inc="-I/usr/include" >- db_lib='-L$(libdir)' >- db_libdir='$(libdir)' >- else >- AC_MSG_ERROR([db.h not found]) >- fi >+ elif test "$withval" = "no"; then >+ AC_MSG_RESULT(no) >+ AC_MSG_ERROR([db is required.]) > elif test -d "$withval"/include -a -d "$withval"/lib; then > AC_MSG_RESULT([using $withval]) > dnl - check the user provided location >@@ -51,12 +45,12 @@ AC_ARG_WITH(db, [ --with-db=PATH Berkeley DB directory], > AC_MSG_ERROR([$withval not found]) > fi > ], >-AC_MSG_RESULT(no)) >+AC_MSG_RESULT(yes)) > dnl default path for the db tools (see [210947] for more details) > > # check for --with-db-inc > AC_MSG_CHECKING(for --with-db-inc) >-AC_ARG_WITH(db-inc, [ --with-db-inc=PATH Berkeley DB include file directory], >+AC_ARG_WITH(db-inc, AS_HELP_STRING([--with-db-inc=PATH],[Berkeley DB include file directory]), > [ > if test -e "$withval"/db.h > then >@@ -72,7 +66,7 @@ AC_MSG_RESULT(no)) > > # check for --with-db-lib > AC_MSG_CHECKING(for --with-db-lib) >-AC_ARG_WITH(db-lib, [ --with-db-lib=PATH Berkeley DB library directory], >+AC_ARG_WITH(db-lib, AS_HELP_STRING([--with-db-lib=PATH],[Berkeley DB library directory]), > [ > if test -d "$withval" > then >@@ -106,6 +100,7 @@ if test -z "$db_inc"; then > AC_MSG_ERROR([db not found, specify with --with-db.]) > fi > fi >+ > dnl figure out which version of db we're using from the header file > db_ver_maj=`grep DB_VERSION_MAJOR $db_incdir/db.h | awk '{print $3}'` > db_ver_min=`grep DB_VERSION_MINOR $db_incdir/db.h | awk '{print $3}'` >diff --git a/m4/fhs.m4 b/m4/fhs.m4 >index 479a76d..d42c304 100644 >--- a/m4/fhs.m4 >+++ b/m4/fhs.m4 >@@ -22,7 +22,7 @@ AC_CHECKING(for FHS) > > # check for --with-fhs > AC_MSG_CHECKING(for --with-fhs) >-AC_ARG_WITH(fhs, [ --with-fhs Use FHS layout], >+AC_ARG_WITH(fhs, AS_HELP_STRING([--with-fhs],[Use FHS layout]), > [ > with_fhs=yes > AC_MSG_RESULT(yes) >@@ -35,7 +35,7 @@ fi > > # check for --with-fhs-opt > AC_MSG_CHECKING(for --with-fhs-opt) >-AC_ARG_WITH(fhs-opt, [ --with-fhs-opt Use FHS optional layout], >+AC_ARG_WITH(fhs-opt, AS_HELP_STRING([--with-fhs-opt],[Use FHS optional layout]), > [ > with_fhs_opt=yes > AC_MSG_RESULT(yes) >diff --git a/m4/icu.m4 b/m4/icu.m4 >index f36ef93..a901293 100644 >--- a/m4/icu.m4 >+++ b/m4/icu.m4 >@@ -22,25 +22,32 @@ AC_CHECKING(for LIBICU) > > # check for --with-icu > AC_MSG_CHECKING(for --with-icu) >-AC_ARG_WITH(icu, [ --with-icu=PATH ICU directory], >+AC_ARG_WITH(icu, AS_HELP_STRING([--with-icu@<:@=PATH@:>@],[ICU directory]), > [ >- if test -d "$withval"/lib >+ if test "$withval" = "yes" >+ then >+ AC_MSG_RESULT(yes) >+ elif test "$withval" = "no" >+ then >+ AC_MSG_RESULT(no) >+ AC_MSG_ERROR([ICU is required.]) >+ elif test -d "$withval"/lib > then > AC_MSG_RESULT([using $withval]) > ICUDIR=$withval > icu_lib="-L$ICUDIR/lib" >+ icu_inc="-I$withval/include" >+ icu_bin="$withval/bin" > else > echo > AC_MSG_ERROR([$withval not found]) > fi >- icu_inc="-I$withval/include" >- icu_bin="$withval/bin" > ], >-AC_MSG_RESULT(no)) >+AC_MSG_RESULT(yes)) > > # check for --with-icu-inc > AC_MSG_CHECKING(for --with-icu-inc) >-AC_ARG_WITH(icu-inc, [ --with-icu-inc=PATH ICU include directory], >+AC_ARG_WITH(icu-inc, AS_HELP_STRING([--with-icu-inc=PATH],[ICU include directory]), > [ > if test -d "$withval" > then >@@ -55,7 +62,7 @@ AC_MSG_RESULT(no)) > > # check for --with-icu-lib > AC_MSG_CHECKING(for --with-icu-lib) >-AC_ARG_WITH(icu-lib, [ --with-icu-lib=PATH ICU library directory], >+AC_ARG_WITH(icu-lib, AS_HELP_STRING([--with-icu-lib=PATH],[ICU library directory]), > [ > if test -d "$withval" > then >@@ -70,7 +77,7 @@ AC_MSG_RESULT(no)) > > # check for --with-icu-bin > AC_MSG_CHECKING(for --with-icu-bin) >-AC_ARG_WITH(icu-bin, [ --with-icu-bin=PATH ICU binary directory], >+AC_ARG_WITH(icu-bin, AS_HELP_STRING([--with-icu-bin=PATH],[ICU binary directory]), > [ > if test -d "$withval" > then >@@ -86,8 +93,8 @@ AC_MSG_RESULT(no)) > > # last resort > if test -z "$icu_lib"; then >- AC_MSG_CHECKING(for icu with icu-config) > AC_PATH_PROG(ICU_CONFIG, icu-config) >+ AC_MSG_CHECKING(for icu with icu-config) > if test -n "$ICU_CONFIG"; then > icu_lib=`$ICU_CONFIG --ldflags-searchpath` > icu_inc=`$ICU_CONFIG --cppflags-searchpath` >diff --git a/m4/kerberos.m4 b/m4/kerberos.m4 >index 2623414..0a84e96 100644 >--- a/m4/kerberos.m4 >+++ b/m4/kerberos.m4 >@@ -26,7 +26,7 @@ dnl = authentication (replication, chaining, etc.) > dnl = This allows us to authenticate using a keytab without > dnl = having to call kinit outside the process > dnl ======================================================== >-AC_CHECKING(for kerberos) >+AC_CHECKING(for Kerberos) > > if test -z "$with_kerberos" ; then > with_kerberos=yes # if not set on cmdline, set default >@@ -34,7 +34,7 @@ fi > > AC_MSG_CHECKING(for --with-kerberos) > AC_ARG_WITH(kerberos, >- AS_HELP_STRING([--with-kerberos[=PATH]], [Use the kerberos API in the server directly - allows the server to authenticate directly with a keytab - otherwise, SASL/GSSAPI auth depends on underlying SASL libraries and external kinit with a keytab - if PATH is not specified, look for kerberos in the system locations. This will attempt to use krb5-config from the PATH to find the libs and include dirs - you can specify KRB5_CONFIG_BIN to specify a different filename or absolute path. If krb5-config does not work, this will attempt to look in various system directories]), >+ AS_HELP_STRING([--with-kerberos@<:@=PATH@:>@], [Use the kerberos API in the server directly - allows the server to authenticate directly with a keytab - otherwise, SASL/GSSAPI auth depends on underlying SASL libraries and external kinit with a keytab - if PATH is not specified, look for kerberos in the system locations. This will attempt to use krb5-config from the PATH to find the libs and include dirs - you can specify KRB5_CONFIG_BIN to specify a different filename or absolute path. If krb5-config does not work, this will attempt to look in various system directories]), > [ > if test "x$withval" = "xyes"; then > AC_MSG_RESULT(yes) >diff --git a/m4/mozldap.m4 b/m4/mozldap.m4 >index 475e868..51e151d 100644 >--- a/m4/mozldap.m4 >+++ b/m4/mozldap.m4 >@@ -22,11 +22,14 @@ AC_CHECKING(for Mozilla LDAPSDK) > > # check for --with-ldapsdk > AC_MSG_CHECKING(for --with-ldapsdk) >-AC_ARG_WITH(ldapsdk, [ --with-ldapsdk=PATH Mozilla LDAP SDK directory], >+AC_ARG_WITH(ldapsdk, AS_HELP_STRING([--with-ldapsdk@<:@=PATH@:>@],[Mozilla LDAP SDK directory]), > [ > if test "$withval" = yes > then >- AC_MSG_RESULT([using system MozLDAP]) >+ AC_MSG_RESULT(yes) >+ elif test "$withval" = no >+ then >+ AC_MSG_RESULT(no) > elif test -e "$withval"/include/ldap.h -a -d "$withval"/lib > then > AC_MSG_RESULT([using $withval]) >@@ -40,12 +43,29 @@ AC_ARG_WITH(ldapsdk, [ --with-ldapsdk=PATH Mozilla LDAP SDK directory], > echo > AC_MSG_ERROR([$withval not found]) > fi >+ >+ if test "$with_ldapsdk" = yes -a "$with_openldap" = yes >+ then >+ AC_MSG_ERROR([Cannot use both LDAPSDK and OpenLDAP.]) >+ fi >+ if test "$with_ldapsdk" != yes -a "$with_openldap" != yes >+ then >+ AC_MSG_ERROR([Either LDAPSDK or OpenLDAP must be used.]) >+ fi > ], >-AC_MSG_RESULT(no)) >+[ >+ if test "$with_openldap" = yes >+ then >+ AC_MSG_RESULT(no) >+ else >+ AC_MSG_RESULT(yes) >+ with_ldapsdk=yes >+ fi >+]) > > # check for --with-ldapsdk-inc > AC_MSG_CHECKING(for --with-ldapsdk-inc) >-AC_ARG_WITH(ldapsdk-inc, [ --with-ldapsdk-inc=PATH Mozilla LDAP SDK include directory], >+AC_ARG_WITH(ldapsdk-inc, AS_HELP_STRING([--with-ldapsdk-inc=PATH],[Mozilla LDAP SDK include directory]), > [ > if test -e "$withval"/ldap.h > then >@@ -61,7 +81,7 @@ AC_MSG_RESULT(no)) > > # check for --with-ldapsdk-lib > AC_MSG_CHECKING(for --with-ldapsdk-lib) >-AC_ARG_WITH(ldapsdk-lib, [ --with-ldapsdk-lib=PATH Mozilla LDAP SDK library directory], >+AC_ARG_WITH(ldapsdk-lib, AS_HELP_STRING([--with-ldapsdk-lib=PATH],[Mozilla LDAP SDK library directory]), > [ > if test -d "$withval" > then >@@ -78,7 +98,7 @@ AC_MSG_RESULT(no)) > > # check for --with-ldapsdk-bin > AC_MSG_CHECKING(for --with-ldapsdk-bin) >-AC_ARG_WITH(ldapsdk-bin, [ --with-ldapsdk-bin=PATH Mozilla LDAP SDK binary directory], >+AC_ARG_WITH(ldapsdk-bin, AS_HELP_STRING([--with-ldapsdk-bin=PATH],[Mozilla LDAP SDK binary directory]), > [ > if test -d "$withval" > then >diff --git a/m4/netsnmp.m4 b/m4/netsnmp.m4 >index 10fccf8..60ad9c9 100644 >--- a/m4/netsnmp.m4 >+++ b/m4/netsnmp.m4 >@@ -22,9 +22,14 @@ AC_CHECKING(for Net-SNMP) > > dnl - check for --with-netsnmp > AC_MSG_CHECKING(for --with-netsnmp) >-AC_ARG_WITH(netsnmp, [ --with-netsnmp=PATH Net-SNMP directory], >+AC_ARG_WITH(netsnmp, AS_HELP_STRING([--with-netsnmp@<:@=PATH@:>@],[Net-SNMP directory]), > [ >- if test -d "$withval" -a -d "$withval/lib" -a -d "$withval/include"; then >+ if test "$withval" = "yes"; then >+ AC_MSG_RESULT(yes) >+ elif test "$withval" = "no"; then >+ AC_MSG_RESULT(no) >+ AC_MSG_ERROR([Net-SNMP is required.]) >+ elif test -d "$withval" -a -d "$withval/lib" -a -d "$withval/include"; then > AC_MSG_RESULT([using $withval]) > NETSNMPDIR=$withval > >@@ -41,11 +46,11 @@ AC_ARG_WITH(netsnmp, [ --with-netsnmp=PATH Net-SNMP directory], > AC_MSG_ERROR([$withval not found]) > fi > ], >-AC_MSG_RESULT(no)) >+AC_MSG_RESULT(yes)) > > dnl - check for --with-netsnmp-inc > AC_MSG_CHECKING(for --with-netsnmp-inc) >-AC_ARG_WITH(netsnmp-inc, [ --with-netsnmp-inc=PATH Net-SNMP include directory], >+AC_ARG_WITH(netsnmp-inc, AS_HELP_STRING([--with-netsnmp-inc=PATH],[Net-SNMP include directory]), > [ > if test -f "$withval/net-snmp/net-snmp-includes.h"; then > AC_MSG_RESULT([using $withval]) >@@ -59,7 +64,7 @@ AC_MSG_RESULT(no)) > > dnl - check for --with-netsnmp-lib > AC_MSG_CHECKING(for --with-netsnmp-lib) >-AC_ARG_WITH(netsnmp-lib, [ --with-netsnmp-lib=PATH Net-SNMP library directory], >+AC_ARG_WITH(netsnmp-lib, AS_HELP_STRING([--with-netsnmp-lib=PATH],[Net-SNMP library directory]), > [ > if test -d "$withval" > then >diff --git a/m4/nspr.m4 b/m4/nspr.m4 >index e89b9a8..79d21b0 100644 >--- a/m4/nspr.m4 >+++ b/m4/nspr.m4 >@@ -22,9 +22,16 @@ AC_CHECKING(for NSPR) > > # check for --with-nspr > AC_MSG_CHECKING(for --with-nspr) >-AC_ARG_WITH(nspr, [ --with-nspr=PATH Netscape Portable Runtime (NSPR) directory], >+AC_ARG_WITH(nspr, AS_HELP_STRING([--with-nspr@<:@=PATH@:>@],[Netscape Portable Runtime (NSPR) directory]), > [ >- if test -e "$withval"/include/nspr.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([NSPR is required.]) >+ elif test -e "$withval"/include/nspr.h -a -d "$withval"/lib > then > AC_MSG_RESULT([using $withval]) > NSPRDIR=$withval >@@ -36,11 +43,11 @@ AC_ARG_WITH(nspr, [ --with-nspr=PATH Netscape Portable Runtime (NSPR) di > AC_MSG_ERROR([$withval not found]) > fi > ], >-AC_MSG_RESULT(no)) >+AC_MSG_RESULT(yes)) > > # check for --with-nspr-inc > AC_MSG_CHECKING(for --with-nspr-inc) >-AC_ARG_WITH(nspr-inc, [ --with-nspr-inc=PATH Netscape Portable Runtime (NSPR) include file directory], >+AC_ARG_WITH(nspr-inc, AS_HELP_STRING([--with-nspr-inc=PATH],[Netscape Portable Runtime (NSPR) include directory]), > [ > if test -e "$withval"/nspr.h > then >@@ -55,7 +62,7 @@ AC_MSG_RESULT(no)) > > # check for --with-nspr-lib > AC_MSG_CHECKING(for --with-nspr-lib) >-AC_ARG_WITH(nspr-lib, [ --with-nspr-lib=PATH Netscape Portable Runtime (NSPR) library directory], >+AC_ARG_WITH(nspr-lib, AS_HELP_STRING([--with-nspr-lib=PATH],[Netscape Portable Runtime (NSPR) library directory]), > [ > if test -d "$withval" > then >diff --git a/m4/nss.m4 b/m4/nss.m4 >index 9d89225..753b003 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 >diff --git a/m4/openldap.m4 b/m4/openldap.m4 >index 29dc115..cf91a89 100644 >--- a/m4/openldap.m4 >+++ b/m4/openldap.m4 >@@ -22,11 +22,14 @@ AC_CHECKING(for OpenLDAP) > > # check for --with-openldap > AC_MSG_CHECKING(for --with-openldap) >-AC_ARG_WITH(openldap, AS_HELP_STRING([--with-openldap[=PATH]],[Use OpenLDAP - optional PATH is path to OpenLDAP SDK]), >+AC_ARG_WITH(openldap, AS_HELP_STRING([--with-openldap@<:@=PATH@:>@],[Use OpenLDAP - optional PATH is path to OpenLDAP SDK]), > [ > if test "$withval" = yes > then > AC_MSG_RESULT([using system OpenLDAP]) >+ elif test "$withval" = no >+ then >+ AC_MSG_RESULT(no) > elif test -e "$withval"/include/ldap.h -a -d "$withval"/lib > then > AC_MSG_RESULT([using $withval]) >@@ -46,7 +49,7 @@ AC_MSG_RESULT(no)) > > # check for --with-openldap-inc > AC_MSG_CHECKING(for --with-openldap-inc) >-AC_ARG_WITH(openldap-inc, [ --with-openldap-inc=PATH OpenLDAP SDK include directory], >+AC_ARG_WITH(openldap-inc, AS_HELP_STRING([--with-openldap-inc=PATH],[OpenLDAP SDK include directory]), > [ > if test -e "$withval"/ldap.h > then >@@ -63,7 +66,7 @@ AC_MSG_RESULT(no)) > > # check for --with-openldap-lib > AC_MSG_CHECKING(for --with-openldap-lib) >-AC_ARG_WITH(openldap-lib, [ --with-openldap-lib=PATH OpenLDAP SDK library directory], >+AC_ARG_WITH(openldap-lib, AS_HELP_STRING([--with-openldap-lib=PATH],[OpenLDAP SDK library directory]), > [ > if test -d "$withval" > then >@@ -80,7 +83,7 @@ AC_MSG_RESULT(no)) > > # check for --with-openldap-bin > AC_MSG_CHECKING(for --with-openldap-bin) >-AC_ARG_WITH(openldap-bin, [ --with-openldap-bin=PATH OpenLDAP SDK binary directory], >+AC_ARG_WITH(openldap-bin, AS_HELP_STRING([--with-openldap-bin=PATH],[OpenLDAP SDK binary directory]), > [ > if test -d "$withval" > then >@@ -96,8 +99,8 @@ AC_MSG_RESULT(no)) > > # if OPENLDAP is not found yet, try pkg-config > >-if test -z "$openldap_inc" -o -z "$openldap_lib" -o -z "$openldap_libdir" -o -z "$openldap_bindir"; then >- if test "$with_openldap" = yes ; then # user wants to use openldap, but didn't specify paths >+if test "$with_openldap" = yes ; then # user wants to use openldap, but didn't specify paths >+ if test -z "$openldap_inc" -o -z "$openldap_lib" -o -z "$openldap_libdir" -o -z "$openldap_bindir"; then > AC_PATH_PROG(PKG_CONFIG, pkg-config) > AC_MSG_CHECKING(for OpenLDAP with pkg-config) > if test -n "$PKG_CONFIG" && $PKG_CONFIG --exists openldap; then >@@ -143,5 +146,4 @@ if test "$with_openldap" = yes ; then > CPPFLAGS="$save_cppflags" > > AC_DEFINE([USE_OPENLDAP], [1], [If defined, using OpenLDAP for LDAP SDK]) >- with_ldapsdk=no # using openldap not mozldap > fi >diff --git a/m4/pcre.m4 b/m4/pcre.m4 >index 0c7569d..1fec03d 100644 >--- a/m4/pcre.m4 >+++ b/m4/pcre.m4 >@@ -18,28 +18,17 @@ > # > # END COPYRIGHT BLOCK > >-AC_CHECKING(for pcre) >+AC_CHECKING(for PCRE) > > dnl - check for --with-pcre > AC_MSG_CHECKING(for --with-pcre) >-AC_ARG_WITH(pcre, [ --with-pcre=PATH Perl Compatible Regular Expression directory], >+AC_ARG_WITH(pcre, AS_HELP_STRING([--with-pcre@<:@=PATH@:>@],[Perl Compatible Regular Expression directory]), > [ > if test "$withval" = "yes"; then > AC_MSG_RESULT(yes) >- dnl - check in system locations >- if test -f "/usr/include/pcre/pcre.h"; then >- pcre_incdir="/usr/include/pcre" >- pcre_inc="-I/usr/include/pcre" >- pcre_lib='-L$(libdir)' >- pcre_libdir='$(libdir)' >- elif test -f "/usr/include/pcre.h"; then >- pcre_incdir="/usr/include" >- pcre_inc="-I/usr/include" >- pcre_lib='-L$(libdir)' >- pcre_libdir='$(libdir)' >- else >- AC_MSG_ERROR([pcre.h not found]) >- fi >+ elif test "$withval" = "no"; then >+ AC_MSG_RESULT(no) >+ AC_MSG_ERROR([PCRE is required.]) > elif test -d "$withval"/include -a -d "$withval"/lib; then > AC_MSG_RESULT([using $withval]) > dnl - check the user provided location >@@ -56,7 +45,7 @@ AC_ARG_WITH(pcre, [ --with-pcre=PATH Perl Compatible Regular Expression direc > AC_MSG_ERROR([$withval not found]) > fi > ], >-AC_MSG_RESULT(no)) >+AC_MSG_RESULT(yes)) > > # > # if PCRE is not found yet, try pkg-config >@@ -84,7 +73,13 @@ dnl last resort > dnl - check in system locations > if test -z "$pcre_inc"; then > AC_MSG_CHECKING(for pcre.h) >- if test -f "/usr/include/pcre.h"; then >+ if test -f "/usr/include/pcre/pcre.h"; then >+ AC_MSG_RESULT([using /usr/include/pcre/pcre.h]) >+ pcre_incdir="/usr/include/pcre" >+ pcre_inc="-I/usr/include/pcre" >+ pcre_lib='-L$(libdir)' >+ pcre_libdir='$(libdir)' >+ elif test -f "/usr/include/pcre.h"; then > AC_MSG_RESULT([using /usr/include/pcre.h]) > pcre_incdir="/usr/include" > pcre_inc="-I/usr/include" >@@ -92,6 +87,6 @@ if test -z "$pcre_inc"; then > pcre_libdir='$(libdir)' > else > AC_MSG_RESULT(no) >- AC_MSG_ERROR([pcre not found, specify with --with-pcre.]) >+ AC_MSG_ERROR([PCRE not found, specify with --with-pcre.]) > fi > fi >diff --git a/m4/sasl.m4 b/m4/sasl.m4 >index 00b2f2a..b875e70 100644 >--- a/m4/sasl.m4 >+++ b/m4/sasl.m4 >@@ -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 >diff --git a/m4/selinux.m4 b/m4/selinux.m4 >index de97c94..5a574d1 100644 >--- a/m4/selinux.m4 >+++ b/m4/selinux.m4 >@@ -22,13 +22,17 @@ AC_CHECKING(for SELinux) > > # check for --with-selinux > AC_MSG_CHECKING(for --with-selinux) >-AC_ARG_WITH(selinux, [ --with-selinux Build SELinux policy], >+AC_ARG_WITH(selinux, AS_HELP_STRING([--with-selinux],[Build SELinux policy]), > [ >- with_selinux=yes >- AC_MSG_RESULT(yes) >- AC_SUBST(with_selinux) >- if test ! -f "/usr/share/selinux/devel/Makefile"; then >- AC_MSG_ERROR([SELinux development tools (selinux-policy) not found]) >+ if test "$withval" = "no"; then >+ AC_MSG_RESULT(no) >+ else >+ with_selinux=yes >+ AC_MSG_RESULT(yes) >+ AC_SUBST(with_selinux) >+ if test ! -f "/usr/share/selinux/devel/Makefile"; then >+ AC_MSG_ERROR([SELinux development tools (selinux-policy) not found]) >+ fi > fi > ], > AC_MSG_RESULT(no)) >diff --git a/m4/svrcore.m4 b/m4/svrcore.m4 >index 5051f73..7164ab9 100644 >--- a/m4/svrcore.m4 >+++ b/m4/svrcore.m4 >@@ -20,22 +20,19 @@ > # > # Configure paths for SVRCORE > >-AC_CHECKING(for svrcore) >+AC_CHECKING(for SVRCORE) > > AC_MSG_CHECKING(for --with-svrcore) > AC_ARG_WITH(svrcore, >- [[ --with-svrcore[=PATH] Use system installed svrcore - optional path for svrcore]], >+ AS_HELP_STRING([--with-svrcore@<:@=PATH@:>@],[Use system installed SVRCORE - optional path for SVRCORE]), > dnl = Look in the standard system locations > [ > if test "$withval" = "yes"; then > AC_MSG_RESULT(yes) > >- dnl = Check for svrcore.h in the normal locations >- if test -f /usr/include/svrcore.h; then >- svrcore_inc="-I/usr/include" >- else >- AC_MSG_ERROR(svrcore.h not found) >- fi >+ elif test "$withval" = "no"; then >+ AC_MSG_RESULT(no) >+ AC_MSG_ERROR([SVRCORE is required.]) > > dnl = Check the user provided location > elif test -d "$withval" -a -d "$withval/lib" -a -d "$withval/include" ; then >@@ -50,14 +47,14 @@ AC_ARG_WITH(svrcore, > svrcore_lib="-L$withval/lib" > else > AC_MSG_RESULT(yes) >- AC_MSG_ERROR([svrcore not found in $withval]) >+ AC_MSG_ERROR([SVRCORE not found in $withval]) > fi > ], >- AC_MSG_RESULT(no)) >+ AC_MSG_RESULT(yes)) > > AC_MSG_CHECKING(for --with-svrcore-inc) > AC_ARG_WITH(svrcore-inc, >- [[ --with-svrcore-inc=PATH SVRCORE include file directory]], >+ AS_HELP_STRING([--with-svrcore-inc=PATH],[SVRCORE include file directory]), > [ > if test -f "$withval"/svrcore.h; then > AC_MSG_RESULT([using $withval]) >@@ -71,7 +68,7 @@ AC_ARG_WITH(svrcore-inc, > > AC_MSG_CHECKING(for --with-svrcore-lib) > AC_ARG_WITH(svrcore-lib, >- [[ --with-svrcore-lib=PATH SVRCORE library directory]], >+ AS_HELP_STRING([--with-svrcore-lib=PATH],[SVRCORE library directory]), > [ > if test -d "$withval"; then > AC_MSG_RESULT([using $withval]) >@@ -86,7 +83,7 @@ AC_ARG_WITH(svrcore-lib, > dnl svrcore not given - look for pkg-config > if test -z "$svrcore_inc" -o -z "$svrcore_lib"; then > AC_PATH_PROG(PKG_CONFIG, pkg-config) >- AC_MSG_CHECKING(for svrcore with pkg-config) >+ AC_MSG_CHECKING(for SVRCORE with pkg-config) > if test -n "$PKG_CONFIG"; then > if $PKG_CONFIG --exists svrcore; then > svrcore_inc=`$PKG_CONFIG --cflags-only-I svrcore` >@@ -97,18 +94,28 @@ if test -z "$svrcore_inc" -o -z "$svrcore_lib"; then > fi > > if test -z "$svrcore_inc" -o -z "$svrcore_lib"; then >-dnl just see if svrcore is already a system library >+dnl just see if SVRCORE is already a system library > AC_CHECK_LIB([svrcore], [SVRCORE_GetRegisteredPinObj], [havesvrcore=1], > [], [$nss_inc $nspr_inc $nss_lib -lnss3 -lsoftokn3 $nspr_lib -lplds4 -lplc4 -lnspr4]) > if test -n "$havesvrcore" ; then >-dnl just see if svrcore is already a system header file >+dnl just see if SVRCORE is already a system header file > save_cppflags="$CPPFLAGS" > CPPFLAGS="$nss_inc $nspr_inc" > AC_CHECK_HEADER([svrcore.h], [havesvrcore=1], [havesvrcore=]) > CPPFLAGS="$save_cppflags" > fi >-dnl for svrcore to be present, both the library and the header must exist >+dnl for SVRCORE to be present, both the library and the header must exist > if test -z "$havesvrcore" ; then >- AC_MSG_ERROR([svrcore not found, specify with --with-svrcore.]) >+ AC_MSG_ERROR([SVRCORE not found, specify with --with-svrcore.]) >+ fi >+fi >+ >+dnl = Check for svrcore.h in the normal locations >+if test -z "$svrcore_inc" -o -z "$svrcore_lib"; then >+ if test -f /usr/include/svrcore.h; then >+ svrcore_inc="-I/usr/include" >+ svrcore_lib="-L/usr/lib" >+ else >+ AC_MSG_ERROR([SVRCORE not found, specify with --with-svrcore.]) > fi > fi >-- >1.5.5.6 >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 104554
:
74427
|
110645
|
110657
|
110675
|
110714
|
110956
|
110957
|
110959
|
127259
|
127260
|
127262
|
127263
|
127265
|
127266
|
127269
|
163221
|
163230
|
209028
|
209030
|
209032
|
209033
|
209035
|
209037
|
209039
|
209041
|
209043
|
212617
|
213604
|
213605
|
217432
|
217433
|
224381
| 224383 |
224389