Author: nkinder

Update of /cvs/dirsec/ldapserver In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7987

Modified Files: Makefile.am Makefile.in configure configure.ac Log Message: Resolves: 314791 Summary: Set SASL_PATH in ldclt wrapper script.

Index: Makefile.am =================================================================== RCS file: /cvs/dirsec/ldapserver/Makefile.am,v retrieving revision 1.58 retrieving revision 1.59 diff -u -r1.58 -r1.59 --- Makefile.am 1 Oct 2007 05:24:56 -0000 1.58 +++ Makefile.am 1 Oct 2007 23:22:37 -0000 1.59 @@ -1005,6 +1005,7 @@ -e 's,@db_libdir@,$(libdir),g' \ -e 's,@db_bindir@,$(bindir),g' \ -e 's,@sasl_libdir@,$(libdir),g' \ + -e 's,@sasl_path@,$(libdir)/sasl2,g' \ -e 's,@netsnmp_libdir@,$(libdir),g' \ -e 's,@propertydir@,$(propertydir),g' \ -e 's,@datadir@,$(datadir),g' \ @@ -1051,6 +1052,7 @@ -e 's,@db_libdir@,$(db_libdir),g' \ -e 's,@db_bindir@,$(db_bindir),g' \ -e 's,@sasl_libdir@,$(sasl_libdir),g' \ + -e 's,@sasl_path@,@sasl_path@,g' \ -e 's,@netsnmp_libdir@,$(netsnmp_libdir),g' \ -e 's,@propertydir@,$(propertydir),g' \ -e 's,@datadir@,$(datadir),g' \

Index: Makefile.in =================================================================== RCS file: /cvs/dirsec/ldapserver/Makefile.in,v retrieving revision 1.72 retrieving revision 1.73 diff -u -r1.72 -r1.73 --- Makefile.in 1 Oct 2007 19:04:02 -0000 1.72 +++ Makefile.in 1 Oct 2007 23:22:37 -0000 1.73 @@ -949,6 +949,7 @@ sasl_inc = @sasl_inc@ sasl_lib = @sasl_lib@ sasl_libdir = @sasl_libdir@ +sasl_path = @sasl_path@ sbindir = @sbindir@ schemadir = $(sysconfdir)@schemadir@ scripttemplatedir = @scripttemplatedir@ @@ -1875,6 +1876,7 @@ @BUNDLE_FALSE@ -e 's,@db_libdir@,$(db_libdir),g' \ @BUNDLE_FALSE@ -e 's,@db_bindir@,$(db_bindir),g' \ @BUNDLE_FALSE@ -e 's,@sasl_libdir@,$(sasl_libdir),g' \ +@BUNDLE_FALSE@ -e 's,@sasl_path@,@sasl_path@,g' \ @BUNDLE_FALSE@ -e 's,@netsnmp_libdir@,$(netsnmp_libdir),g' \ @BUNDLE_FALSE@ -e 's,@propertydir@,$(propertydir),g' \ @BUNDLE_FALSE@ -e 's,@datadir@,$(datadir),g' \ @@ -1931,6 +1933,7 @@ @BUNDLE_TRUE@ -e 's,@db_libdir@,$(libdir),g' \ @BUNDLE_TRUE@ -e 's,@db_bindir@,$(bindir),g' \ @BUNDLE_TRUE@ -e 's,@sasl_libdir@,$(libdir),g' \ +@BUNDLE_TRUE@ -e 's,@sasl_path@,$(libdir)/sasl2,g' \ @BUNDLE_TRUE@ -e 's,@netsnmp_libdir@,$(libdir),g' \ @BUNDLE_TRUE@ -e 's,@propertydir@,$(propertydir),g' \ @BUNDLE_TRUE@ -e 's,@datadir@,$(datadir),g' \

Index: configure =================================================================== RCS file: /cvs/dirsec/ldapserver/configure,v retrieving revision 1.67 retrieving revision 1.68 diff -u -r1.67 -r1.68 --- configure 1 Oct 2007 19:04:02 -0000 1.67 +++ configure 1 Oct 2007 23:22:38 -0000 1.68 @@ -465,7 +465,7 @@ #endif"

ac_default_prefix=/opt/$PACKAGE_NAME -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT build build_cpu build_vendor build_os host host_cpu host_vendor host_os CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CC CFLAGS ac_ct_CC CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE SED EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CP! P CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBOBJS debug_defs BUNDLE_TRUE BUNDLE_FALSE enable_pam_passthru_TRUE enable_pam_passthru_FALSE enable_dna_TRUE enable_dna_FALSE enable_ldapi_TRUE enable_ldapi_FALSE enable_bitwise_TRUE enable_bitwise_FALSE with_fhs_opt configdir sampledatadir propertydir schemadir serverdir serverplugindir scripttemplatedir perldir infdir defaultuser defaultgroup instconfigdir WINNT_TRUE WINNT_FALSE LIBSOCKET LIBNSL LIBDL LIBCSTD LIBCRUN initdir perlexec HPUX_TRUE HPUX_FALSE SOLARIS_TRUE SOLARIS_FALSE PKG_CONFIG ICU_CONFIG NETSNMP_CONFIG PACKAGE_BASE_VERSION nspr_inc nspr_lib nspr_libdir nss_inc nss_lib nss_libdir ldapsdk_inc ldapsdk_lib ldapsdk_libdir ldapsdk_bindir db_inc db_incdir db_lib db_libdir db_bindir db_libver sasl_inc sasl_lib sasl_libdir svrcore_inc svrcore_lib icu_lib icu_inc icu_bin netsnmp_inc netsnmp_lib netsnmp_libdir netsnmp_link brand capbrand vendor LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT build build_cpu build_vendor build_os host host_cpu host_vendor host_os CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CC CFLAGS ac_ct_CC CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE SED EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CP! P CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBOBJS debug_defs BUNDLE_TRUE BUNDLE_FALSE enable_pam_passthru_TRUE enable_pam_passthru_FALSE enable_dna_TRUE enable_dna_FALSE enable_ldapi_TRUE enable_ldapi_FALSE enable_bitwise_TRUE enable_bitwise_FALSE with_fhs_opt configdir sampledatadir propertydir schemadir serverdir serverplugindir scripttemplatedir perldir infdir defaultuser defaultgroup instconfigdir WINNT_TRUE WINNT_FALSE LIBSOCKET LIBNSL LIBDL LIBCSTD LIBCRUN initdir perlexec HPUX_TRUE HPUX_FALSE SOLARIS_TRUE SOLARIS_FALSE PKG_CONFIG ICU_CONFIG NETSNMP_CONFIG PACKAGE_BASE_VERSION nspr_inc nspr_lib nspr_libdir nss_inc nss_lib nss_libdir ldapsdk_inc ldapsdk_lib ldapsdk_libdir ldapsdk_bindir db_inc db_incdir db_lib db_libdir db_bindir db_libver sasl_inc sasl_lib sasl_libdir sasl_path svrcore_inc svrcore_lib icu_lib icu_inc icu_bin netsnmp_inc netsnmp_lib netsnmp_libdir netsnmp_link brand capbrand vendor LTLIBOBJS' ac_subst_files=''

# Initialize some variables set by options. @@ -25188,6 +25188,13 @@ PACKAGE_BASE_VERSION=`echo $PACKAGE_VERSION | awk -F. '{print $1"."$2}'`

+# set sasl_path for wrapper scripts +if test -z "$sasl_libdir" ; then + sasl_path="$libdir/sasl2" +else + sasl_path="$sasl_libdir/sasl2" +fi + # write out paths for binary components

@@ -25223,6 +25230,7 @@

+ cat >>confdefs.h <<_ACEOF #define LDAP_DEBUG 1 _ACEOF @@ -26095,6 +26103,7 @@ s,@sasl_inc@,$sasl_inc,;t t s,@sasl_lib@,$sasl_lib,;t t s,@sasl_libdir@,$sasl_libdir,;t t +s,@sasl_path@,$sasl_path,;t t s,@svrcore_inc@,$svrcore_inc,;t t s,@svrcore_lib@,$svrcore_lib,;t t s,@icu_lib@,$icu_lib,;t t

Index: configure.ac =================================================================== RCS file: /cvs/dirsec/ldapserver/configure.ac,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- configure.ac 22 Aug 2007 05:11:34 -0000 1.37 +++ configure.ac 1 Oct 2007 23:22:38 -0000 1.38 @@ -343,6 +343,13 @@ PACKAGE_BASE_VERSION=`echo $PACKAGE_VERSION | awk -F. '{print $1"."$2}'` AC_SUBST(PACKAGE_BASE_VERSION)

+# set sasl_path for wrapper scripts +if test -z "$sasl_libdir" ; then + sasl_path="$libdir/sasl2" +else + sasl_path="$sasl_libdir/sasl2" +fi + # write out paths for binary components AC_SUBST(nspr_inc) AC_SUBST(nspr_lib) @@ -363,6 +370,7 @@ AC_SUBST(sasl_inc) AC_SUBST(sasl_lib) AC_SUBST(sasl_libdir) +AC_SUBST(sasl_path) AC_SUBST(svrcore_inc) AC_SUBST(svrcore_lib) AC_SUBST(icu_lib)