diff options
author | Rich Megginson <rmeggins@redhat.com> | 2006-11-22 03:00:30 +0000 |
---|---|---|
committer | Rich Megginson <rmeggins@redhat.com> | 2006-11-22 03:00:30 +0000 |
commit | d8b1c393b1baca17b2e0ed9097d5e1272e421ffd (patch) | |
tree | 86d4d36ad70ba8dd8a6923e7a4e9dc4ac11048eb /configure | |
parent | 4efc4a2ac13943b65f550e007c70265b835e8dd7 (diff) | |
download | ds-d8b1c393b1baca17b2e0ed9097d5e1272e421ffd.tar.gz ds-d8b1c393b1baca17b2e0ed9097d5e1272e421ffd.tar.xz ds-d8b1c393b1baca17b2e0ed9097d5e1272e421ffd.zip |
Bug: 210947
Description: parameterizing the hardcoded paths (phase 3. installed binaries, change log, setup)
Fix Description: RHEL4 64 is not able to find ldapsearch because the ldapsdk_bindir is hardcoded
to /usr/lib/mozldap6. We should get ldapsdk_bindir from pkg-config or just simply use
$libdir/mozldap6.
Added -o -z "$ldapsdk_bindir" check suggested by nhosoi
Reviewed by: nhosoi (Thanks!)
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 7 |
1 files changed, 5 insertions, 2 deletions
@@ -23312,7 +23312,7 @@ fi; # if LDAPSDK is not found yet, try pkg-config # last resort -if test -z "$ldapsdk_inc" -o -z "$ldapsdk_lib" -o -z "$ldapsdk_libdir"; then +if test -z "$ldapsdk_inc" -o -z "$ldapsdk_lib" -o -z "$ldapsdk_libdir" -o -z "$ldapsdk_bindir"; then echo "$as_me:$LINENO: checking for mozldap with pkg-config" >&5 echo $ECHO_N "checking for mozldap with pkg-config... $ECHO_C" >&6 # Extract the first word of "pkg-config", so it can be a program name with args. @@ -23359,6 +23359,7 @@ fi ldapsdk_inc=`$PKG_CONFIG --cflags-only-I mozldap6` ldapsdk_lib=`$PKG_CONFIG --libs-only-L mozldap6` ldapsdk_libdir=`$PKG_CONFIG --libs-only-L mozldap6 | sed -e s/-L// | sed -e s/\ *$//` + ldapsdk_bindir=`$PKG_CONFIG --variable=bindir mozldap6` echo "$as_me:$LINENO: result: using system mozldap6" >&5 echo "${ECHO_T}using system mozldap6" >&6 else @@ -23373,7 +23374,9 @@ if test -z "$ldapsdk_inc" -o -z "$ldapsdk_lib"; then echo "$as_me: error: LDAPSDK not found, specify with --with-ldapsdk-inc|-lib." >&2;} { (exit 1); exit 1; }; } fi -ldapsdk_bindir=/usr/lib/mozldap6 +if test -z "$ldapsdk_bindir" ; then + ldapsdk_bindir=$libdir/mozldap6 +fi save_cppflags="$CPPFLAGS" CPPFLAGS="$ldapsdk_inc $nss_inc $nspr_inc" |