diff options
| author | Rich Megginson <rmeggins@redhat.com> | 2007-06-11 14:13:55 +0000 |
|---|---|---|
| committer | Rich Megginson <rmeggins@redhat.com> | 2007-06-11 14:13:55 +0000 |
| commit | 941ed15d730bb365a5b056b37c81eccd10ca3c61 (patch) | |
| tree | 94830c92e45688df89fffc1e64387f66985923dc /m4 | |
| parent | 85eefc580b0dc619292325319a7bb261dd698e15 (diff) | |
| download | ds-941ed15d730bb365a5b056b37c81eccd10ca3c61.tar.gz ds-941ed15d730bb365a5b056b37c81eccd10ca3c61.tar.xz ds-941ed15d730bb365a5b056b37c81eccd10ca3c61.zip | |
Resolves: bug 243639
Description: --with-ldapsdk-bin required for configure argument
Fix Description:
In m4/mozldap.m4, there is a code to check whether ldapsdk_bindir is specified,
but you can't specify it except for --with-ldapsdk argument or using pkg-config.
So using --with-ldapsdk-lib and --with-ldapsdk-inc requires the additional
argument '--with-ldapsdk-bin'.
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/mozldap.m4 | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/m4/mozldap.m4 b/m4/mozldap.m4 index 7249c9ea..9bfd4fa2 100644 --- a/m4/mozldap.m4 +++ b/m4/mozldap.m4 @@ -70,6 +70,21 @@ AC_ARG_WITH(ldapsdk-lib, [ --with-ldapsdk-lib=PATH Mozilla LDAP SDK library ], 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], +[ + if test -d "$withval" + then + AC_MSG_RESULT([using $withval]) + ldapsdk_bindir="$withval" + else + echo + AC_MSG_ERROR([$withval not found]) + fi +], +AC_MSG_RESULT(no)) + # if LDAPSDK is not found yet, try pkg-config # last resort @@ -82,7 +97,7 @@ if test -z "$ldapsdk_inc" -o -z "$ldapsdk_lib" -o -z "$ldapsdk_libdir" -o -z "$l elif $PKG_CONFIG --exists mozldap; then mozldappkg=mozldap else - AC_MSG_ERROR([LDAPSDK not found, specify with --with-ldapsdk[-inc|-lib].]) + AC_MSG_ERROR([LDAPSDK not found, specify with --with-ldapsdk[-inc|-lib|-bin].]) fi ldapsdk_inc=`$PKG_CONFIG --cflags-only-I $mozldappkg` ldapsdk_lib=`$PKG_CONFIG --libs-only-L $mozldappkg` @@ -92,7 +107,7 @@ if test -z "$ldapsdk_inc" -o -z "$ldapsdk_lib" -o -z "$ldapsdk_libdir" -o -z "$l fi fi if test -z "$ldapsdk_inc" -o -z "$ldapsdk_lib"; then - AC_MSG_ERROR([LDAPSDK not found, specify with --with-ldapsdk[-inc|-lib].]) + AC_MSG_ERROR([LDAPSDK not found, specify with --with-ldapsdk[-inc|-lib|-bin].]) fi dnl default path for the ldap c sdk tools (see [210947] for more details) if test -z "$ldapsdk_bindir" ; then |