[Fedora-directory-commits] ldapserver Makefile.in, 1.70, 1.71 configure, 1.64, 1.65 aclocal.m4, 1.51, 1.52 Makefile.am, 1.57, 1.58 - 389-commits - Fedora mailing-lists

1 Oct 2007

Author: nhosoi
Update of /cvs/dirsec/ldapserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8798
Modified Files:
    Makefile.in configure aclocal.m4 Makefile.am 
Log Message:
Resolves: #312811
Summary: Installation failed. template files not found.
Description: Added template-sasl.ldif to Makefile.am
Index: Makefile.in
===================================================================
RCS file: /cvs/dirsec/ldapserver/Makefile.in,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71

--- Makefile.in	12 Sep 2007 15:20:59 -0000	1.70
+++ Makefile.in	1 Oct 2007 05:24:56 -0000	1.71
@@ -850,7 +850,6 @@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 RANLIB = @RANLIB@
-SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SOLARIS_FALSE = @SOLARIS_FALSE@
@@ -1057,7 +1056,6 @@
    ldap/ldif/template-pampta.ldif \
    ldap/ldif/template-dnaplugin.ldif \
    ldap/ldif/template-bitwise.ldif \
-	ldap/ldif/template-dse.ldif \
    ldap/ldif/template-org.ldif \
    ldap/ldif/template-domain.ldif \
    ldap/ldif/template-state.ldif \
@@ -1065,6 +1063,7 @@
    ldap/ldif/template-country.ldif \
    ldap/ldif/template-orgunit.ldif \
    ldap/ldif/template-baseacis.ldif \
+	ldap/ldif/template-sasl.ldif \
    $(srcdir)/ldap/servers/slapd/tools/rsearch/scripts/dbgen-FamilyNames \
    $(srcdir)/ldap/servers/slapd/tools/rsearch/scripts/dbgen-GivenNames \
    $(srcdir)/ldap/servers/slapd/tools/rsearch/scripts/dbgen-OrgUnits
Index: configure
===================================================================
RCS file: /cvs/dirsec/ldapserver/configure,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- configure	12 Sep 2007 15:20:59 -0000	1.64
+++ configure	1 Oct 2007 05:24:56 -0000	1.65
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for dirsrv 1.1.0b1.
+# Generated by GNU Autoconf 2.59 for dirsrv 8.0.0.
 #
 # Report bugs to http://bugzilla.redhat.com/.
 #
@@ -423,8 +423,8 @@
 # Identity of this package.
 PACKAGE_NAME='dirsrv'
 PACKAGE_TARNAME='dirsrv'
-PACKAGE_VERSION='1.1.0b1'
-PACKAGE_STRING='dirsrv 1.1.0b1'
+PACKAGE_VERSION='8.0.0'
+PACKAGE_STRING='dirsrv 8.0.0'
 PACKAGE_BUGREPORT='http://bugzilla.redhat.com/'
# Factoring default headers for most tests.
@@ -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 EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CX!
 XCPP 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_files=''
# Initialize some variables set by options.
@@ -954,7 +954,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-`configure' configures dirsrv 1.1.0b1 to adapt to many kinds of systems.
+`configure' configures dirsrv 8.0.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1020,7 +1020,7 @@
if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of dirsrv 1.1.0b1:";;
+     short | recursive ) echo "Configuration of dirsrv 8.0.0:";;
    esac
   cat <<_ACEOF
@@ -1201,7 +1201,7 @@
 test -n "$ac_init_help" && exit 0
 if $ac_init_version; then
   cat <<_ACEOF
-dirsrv configure 1.1.0b1
+dirsrv configure 8.0.0
 generated by GNU Autoconf 2.59
Copyright (C) 2003 Free Software Foundation, Inc.
@@ -1215,7 +1215,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
-It was created by dirsrv $as_me 1.1.0b1, which was
+It was created by dirsrv $as_me 8.0.0, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
$ $0 $@
@@ -1861,7 +1861,7 @@
# Define the identity of the package.
  PACKAGE='dirsrv'
- VERSION='1.1.0b1'
+ VERSION='8.0.0'
cat >>confdefs.h <<_ACEOF
@@ -3836,7 +3836,6 @@
     done
   done
 done
-IFS=$as_save_IFS
 lt_ac_max=0
 lt_ac_count=0
 # Add /usr/xpg4/bin/sed as it is typically found on Solaris
@@ -3871,7 +3870,6 @@
 fi
SED=$lt_cv_path_SED
-
 echo "$as_me:$LINENO: result: $SED" >&5
 echo "${ECHO_T}$SED" >&6
@@ -4312,7 +4310,7 @@
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 4315 "configure"' > conftest.$ac_ext
+  echo '#line 4313 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: "$ac_compile"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -5447,7 +5445,7 @@
# Provide some information about the compiler.
-echo "$as_me:5450:" \
+echo "$as_me:5448:" \
      "checking for Fortran 77 compiler version" >&5
 ac_compiler=`set X $ac_compile; echo $2`
 { (eval echo "$as_me:$LINENO: "$ac_compiler --version </dev/null >&5"") >&5
@@ -6510,11 +6508,11 @@
    -e 's:.*FLAGS}{0,1} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo ""$as_me:6513: $lt_compile"" >&5)
+   (eval echo ""$as_me:6511: $lt_compile"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:6517: $? = $ac_status" >&5
+   echo "$as_me:6515: $? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -6778,11 +6776,11 @@
    -e 's:.*FLAGS}{0,1} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo ""$as_me:6781: $lt_compile"" >&5)
+   (eval echo ""$as_me:6779: $lt_compile"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:6785: $? = $ac_status" >&5
+   echo "$as_me:6783: $? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -6882,11 +6880,11 @@
    -e 's:.*FLAGS}{0,1} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo ""$as_me:6885: $lt_compile"" >&5)
+   (eval echo ""$as_me:6883: $lt_compile"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:6889: $? = $ac_status" >&5
+   echo "$as_me:6887: $? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -8347,31 +8345,10 @@
   # before this can be enabled.
   hardcode_into_libs=yes
-  # find out which ABI we are using
-  libsuff=
-  case "$host_cpu" in
-  x86_64*|s390x*|powerpc64*)
-    echo '#line 8354 "configure"' > conftest.$ac_ext
-    if { (eval echo "$as_me:$LINENO: "$ac_compile"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: $? = $ac_status" >&5
-  (exit $ac_status); }; then
-      case `/usr/bin/file conftest.$ac_objext` in
-      *64-bit*)
-        libsuff=64
-        sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
-        ;;
-      esac
-    fi
-    rm -rf conftest*
-    ;;
-  esac
-
   # Append ld.so.conf contents to the search path
   if test -f /etc/ld.so.conf; then
-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", $2)); skip = 1; } { if (!skip) print $0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-    sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", $2)); skip = 1; } { if (!skip) print $0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
   fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
@@ -9248,7 +9225,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 9251 "configure"
+#line 9228 "configure"
 #include "confdefs.h"
#if HAVE_DLFCN_H
@@ -9348,7 +9325,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 9351 "configure"
+#line 9328 "configure"
 #include "confdefs.h"
#if HAVE_DLFCN_H
@@ -9679,9 +9656,6 @@
 # Is the compiler the GNU C compiler?
 with_gcc=$GCC
-gcc_dir=`gcc -print-file-name=. | $SED 's,/.$,,'`
-gcc_ver=`gcc -dumpversion`
-
 # An ERE matcher.
 EGREP=$lt_EGREP
@@ -9815,11 +9789,11 @@
# Dependencies to place before the objects being linked to create a
 # shared library.
-predep_objects=`echo $lt_predep_objects | $SED -e "s@${gcc_dir}@\${gcc_dir}@g;s@${gcc_ver}@\${gcc_ver}@g"`
+predep_objects=$lt_predep_objects
# Dependencies to place after the objects being linked to create a
 # shared library.
-postdep_objects=`echo $lt_postdep_objects | $SED -e "s@${gcc_dir}@\${gcc_dir}@g;s@${gcc_ver}@\${gcc_ver}@g"`
+postdep_objects=$lt_postdep_objects
# Dependencies to place before the objects being linked to create a
 # shared library.
@@ -9831,7 +9805,7 @@
# The library search path used internally by the compiler when linking
 # a shared library.
-compiler_lib_search_path=`echo $lt_compiler_lib_search_path | $SED -e "s@${gcc_dir}@\${gcc_dir}@g;s@${gcc_ver}@\${gcc_ver}@g"`
+compiler_lib_search_path=$lt_compiler_lib_search_path
# Method to check whether dependent libraries are shared objects.
 deplibs_check_method=$lt_deplibs_check_method
@@ -9911,7 +9885,7 @@
 link_all_deplibs=$link_all_deplibs
# Compile-time system search path for libraries
-sys_lib_search_path_spec=`echo $lt_sys_lib_search_path_spec | $SED -e "s@${gcc_dir}@\${gcc_dir}@g;s@${gcc_ver}@\${gcc_ver}@g"`
+sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
# Run-time system search path for libraries
 sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
@@ -11691,11 +11665,11 @@
    -e 's:.*FLAGS}{0,1} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo ""$as_me:11694: $lt_compile"" >&5)
+   (eval echo ""$as_me:11668: $lt_compile"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:11698: $? = $ac_status" >&5
+   echo "$as_me:11672: $? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -11795,11 +11769,11 @@
    -e 's:.*FLAGS}{0,1} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo ""$as_me:11798: $lt_compile"" >&5)
+   (eval echo ""$as_me:11772: $lt_compile"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:11802: $? = $ac_status" >&5
+   echo "$as_me:11776: $? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -12327,31 +12301,10 @@
   # before this can be enabled.
   hardcode_into_libs=yes
-  # find out which ABI we are using
-  libsuff=
-  case "$host_cpu" in
-  x86_64*|s390x*|powerpc64*)
-    echo '#line 12334 "configure"' > conftest.$ac_ext
-    if { (eval echo "$as_me:$LINENO: "$ac_compile"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: $? = $ac_status" >&5
-  (exit $ac_status); }; then
-      case `/usr/bin/file conftest.$ac_objext` in
-      *64-bit*)
-        libsuff=64
-        sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
-        ;;
-      esac
-    fi
-    rm -rf conftest*
-    ;;
-  esac
-
   # Append ld.so.conf contents to the search path
   if test -f /etc/ld.so.conf; then
-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", $2)); skip = 1; } { if (!skip) print $0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-    sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", $2)); skip = 1; } { if (!skip) print $0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
   fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
@@ -12735,9 +12688,6 @@
 # Is the compiler the GNU C compiler?
 with_gcc=$GCC_CXX
-gcc_dir=`gcc -print-file-name=. | $SED 's,/.$,,'`
-gcc_ver=`gcc -dumpversion`
-
 # An ERE matcher.
 EGREP=$lt_EGREP
@@ -12871,11 +12821,11 @@
# Dependencies to place before the objects being linked to create a
 # shared library.
-predep_objects=`echo $lt_predep_objects_CXX | $SED -e "s@${gcc_dir}@\${gcc_dir}@g;s@${gcc_ver}@\${gcc_ver}@g"`
+predep_objects=$lt_predep_objects_CXX
# Dependencies to place after the objects being linked to create a
 # shared library.
-postdep_objects=`echo $lt_postdep_objects_CXX | $SED -e "s@${gcc_dir}@\${gcc_dir}@g;s@${gcc_ver}@\${gcc_ver}@g"`
+postdep_objects=$lt_postdep_objects_CXX
# Dependencies to place before the objects being linked to create a
 # shared library.
@@ -12887,7 +12837,7 @@
# The library search path used internally by the compiler when linking
 # a shared library.
-compiler_lib_search_path=`echo $lt_compiler_lib_search_path_CXX | $SED -e "s@${gcc_dir}@\${gcc_dir}@g;s@${gcc_ver}@\${gcc_ver}@g"`
+compiler_lib_search_path=$lt_compiler_lib_search_path_CXX
# Method to check whether dependent libraries are shared objects.
 deplibs_check_method=$lt_deplibs_check_method
@@ -12967,7 +12917,7 @@
 link_all_deplibs=$link_all_deplibs_CXX
# Compile-time system search path for libraries
-sys_lib_search_path_spec=`echo $lt_sys_lib_search_path_spec | $SED -e "s@${gcc_dir}@\${gcc_dir}@g;s@${gcc_ver}@\${gcc_ver}@g"`
+sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
# Run-time system search path for libraries
 sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
@@ -13389,11 +13339,11 @@
    -e 's:.*FLAGS}{0,1} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo ""$as_me:13392: $lt_compile"" >&5)
+   (eval echo ""$as_me:13342: $lt_compile"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:13396: $? = $ac_status" >&5
+   echo "$as_me:13346: $? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -13493,11 +13443,11 @@
    -e 's:.*FLAGS}{0,1} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo ""$as_me:13496: $lt_compile"" >&5)
+   (eval echo ""$as_me:13446: $lt_compile"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:13500: $? = $ac_status" >&5
+   echo "$as_me:13450: $? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -14938,31 +14888,10 @@
   # before this can be enabled.
   hardcode_into_libs=yes
-  # find out which ABI we are using
-  libsuff=
-  case "$host_cpu" in
-  x86_64*|s390x*|powerpc64*)
-    echo '#line 14945 "configure"' > conftest.$ac_ext
-    if { (eval echo "$as_me:$LINENO: "$ac_compile"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: $? = $ac_status" >&5
-  (exit $ac_status); }; then
-      case `/usr/bin/file conftest.$ac_objext` in
-      *64-bit*)
-        libsuff=64
-        sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
-        ;;
-      esac
-    fi
-    rm -rf conftest*
-    ;;
-  esac
-
   # Append ld.so.conf contents to the search path
   if test -f /etc/ld.so.conf; then
-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", $2)); skip = 1; } { if (!skip) print $0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-    sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", $2)); skip = 1; } { if (!skip) print $0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
   fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
@@ -15346,9 +15275,6 @@
 # Is the compiler the GNU C compiler?
 with_gcc=$GCC_F77
-gcc_dir=`gcc -print-file-name=. | $SED 's,/.$,,'`
-gcc_ver=`gcc -dumpversion`
-
 # An ERE matcher.
 EGREP=$lt_EGREP
@@ -15482,11 +15408,11 @@
# Dependencies to place before the objects being linked to create a
 # shared library.
-predep_objects=`echo $lt_predep_objects_F77 | $SED -e "s@${gcc_dir}@\${gcc_dir}@g;s@${gcc_ver}@\${gcc_ver}@g"`
+predep_objects=$lt_predep_objects_F77
# Dependencies to place after the objects being linked to create a
 # shared library.
-postdep_objects=`echo $lt_postdep_objects_F77 | $SED -e "s@${gcc_dir}@\${gcc_dir}@g;s@${gcc_ver}@\${gcc_ver}@g"`
+postdep_objects=$lt_postdep_objects_F77
# Dependencies to place before the objects being linked to create a
 # shared library.
@@ -15498,7 +15424,7 @@
# The library search path used internally by the compiler when linking
 # a shared library.
-compiler_lib_search_path=`echo $lt_compiler_lib_search_path_F77 | $SED -e "s@${gcc_dir}@\${gcc_dir}@g;s@${gcc_ver}@\${gcc_ver}@g"`
+compiler_lib_search_path=$lt_compiler_lib_search_path_F77
# Method to check whether dependent libraries are shared objects.
 deplibs_check_method=$lt_deplibs_check_method
@@ -15578,7 +15504,7 @@
 link_all_deplibs=$link_all_deplibs_F77
# Compile-time system search path for libraries
-sys_lib_search_path_spec=`echo $lt_sys_lib_search_path_spec | $SED -e "s@${gcc_dir}@\${gcc_dir}@g;s@${gcc_ver}@\${gcc_ver}@g"`
+sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
# Run-time system search path for libraries
 sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
@@ -15720,11 +15646,11 @@
    -e 's:.*FLAGS}{0,1} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo ""$as_me:15723: $lt_compile"" >&5)
+   (eval echo ""$as_me:15649: $lt_compile"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:15727: $? = $ac_status" >&5
+   echo "$as_me:15653: $? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -15988,11 +15914,11 @@
    -e 's:.*FLAGS}{0,1} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo ""$as_me:15991: $lt_compile"" >&5)
+   (eval echo ""$as_me:15917: $lt_compile"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:15995: $? = $ac_status" >&5
+   echo "$as_me:15921: $? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -16092,11 +16018,11 @@
    -e 's:.*FLAGS}{0,1} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo ""$as_me:16095: $lt_compile"" >&5)
+   (eval echo ""$as_me:16021: $lt_compile"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:16099: $? = $ac_status" >&5
+   echo "$as_me:16025: $? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -17557,31 +17483,10 @@
   # before this can be enabled.
   hardcode_into_libs=yes
-  # find out which ABI we are using
-  libsuff=
-  case "$host_cpu" in
-  x86_64*|s390x*|powerpc64*)
-    echo '#line 17564 "configure"' > conftest.$ac_ext
-    if { (eval echo "$as_me:$LINENO: "$ac_compile"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: $? = $ac_status" >&5
-  (exit $ac_status); }; then
-      case `/usr/bin/file conftest.$ac_objext` in
-      *64-bit*)
-        libsuff=64
-        sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
-        ;;
-      esac
-    fi
-    rm -rf conftest*
-    ;;
-  esac
-
   # Append ld.so.conf contents to the search path
   if test -f /etc/ld.so.conf; then
-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", $2)); skip = 1; } { if (!skip) print $0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-    sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", $2)); skip = 1; } { if (!skip) print $0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
   fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
@@ -17965,9 +17870,6 @@
 # Is the compiler the GNU C compiler?
 with_gcc=$GCC_GCJ
-gcc_dir=`gcc -print-file-name=. | $SED 's,/.$,,'`
-gcc_ver=`gcc -dumpversion`
-
 # An ERE matcher.
 EGREP=$lt_EGREP
@@ -18101,11 +18003,11 @@
# Dependencies to place before the objects being linked to create a
 # shared library.
-predep_objects=`echo $lt_predep_objects_GCJ | $SED -e "s@${gcc_dir}@\${gcc_dir}@g;s@${gcc_ver}@\${gcc_ver}@g"`
+predep_objects=$lt_predep_objects_GCJ
# Dependencies to place after the objects being linked to create a
 # shared library.
-postdep_objects=`echo $lt_postdep_objects_GCJ | $SED -e "s@${gcc_dir}@\${gcc_dir}@g;s@${gcc_ver}@\${gcc_ver}@g"`
+postdep_objects=$lt_postdep_objects_GCJ
# Dependencies to place before the objects being linked to create a
 # shared library.
@@ -18117,7 +18019,7 @@
# The library search path used internally by the compiler when linking
 # a shared library.
-compiler_lib_search_path=`echo $lt_compiler_lib_search_path_GCJ | $SED -e "s@${gcc_dir}@\${gcc_dir}@g;s@${gcc_ver}@\${gcc_ver}@g"`
+compiler_lib_search_path=$lt_compiler_lib_search_path_GCJ
# Method to check whether dependent libraries are shared objects.
 deplibs_check_method=$lt_deplibs_check_method
@@ -18197,7 +18099,7 @@
 link_all_deplibs=$link_all_deplibs_GCJ
# Compile-time system search path for libraries
-sys_lib_search_path_spec=`echo $lt_sys_lib_search_path_spec | $SED -e "s@${gcc_dir}@\${gcc_dir}@g;s@${gcc_ver}@\${gcc_ver}@g"`
+sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
# Run-time system search path for libraries
 sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
@@ -18449,9 +18351,6 @@
 # Is the compiler the GNU C compiler?
 with_gcc=$GCC_RC
-gcc_dir=`gcc -print-file-name=. | $SED 's,/.$,,'`
-gcc_ver=`gcc -dumpversion`
-
 # An ERE matcher.
 EGREP=$lt_EGREP
@@ -18585,11 +18484,11 @@
# Dependencies to place before the objects being linked to create a
 # shared library.
-predep_objects=`echo $lt_predep_objects_RC | $SED -e "s@${gcc_dir}@\${gcc_dir}@g;s@${gcc_ver}@\${gcc_ver}@g"`
+predep_objects=$lt_predep_objects_RC
# Dependencies to place after the objects being linked to create a
 # shared library.
-postdep_objects=`echo $lt_postdep_objects_RC | $SED -e "s@${gcc_dir}@\${gcc_dir}@g;s@${gcc_ver}@\${gcc_ver}@g"`
+postdep_objects=$lt_postdep_objects_RC
# Dependencies to place before the objects being linked to create a
 # shared library.
@@ -18601,7 +18500,7 @@
# The library search path used internally by the compiler when linking
 # a shared library.
-compiler_lib_search_path=`echo $lt_compiler_lib_search_path_RC | $SED -e "s@${gcc_dir}@\${gcc_dir}@g;s@${gcc_ver}@\${gcc_ver}@g"`
+compiler_lib_search_path=$lt_compiler_lib_search_path_RC
# Method to check whether dependent libraries are shared objects.
 deplibs_check_method=$lt_deplibs_check_method
@@ -18681,7 +18580,7 @@
 link_all_deplibs=$link_all_deplibs_RC
# Compile-time system search path for libraries
-sys_lib_search_path_spec=`echo $lt_sys_lib_search_path_spec | $SED -e "s@${gcc_dir}@\${gcc_dir}@g;s@${gcc_ver}@\${gcc_ver}@g"`
+sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
# Run-time system search path for libraries
 sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
@@ -23055,9 +22954,9 @@
 # the default prefix - override with --prefix or --with-fhs
-brand=fedora
-capbrand=Fedora
-vendor="Fedora Project"
+brand=redhat
+capbrand='Red Hat'
+vendor="Red Hat"
# BEGIN COPYRIGHT BLOCK
 # Copyright (C) 2006 Red Hat, Inc.
@@ -25704,7 +25603,7 @@
 } >&5
 cat >&5 <<_CSEOF
-This file was extended by dirsrv $as_me 1.1.0b1, which was
+This file was extended by dirsrv $as_me 8.0.0, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
CONFIG_FILES    = $CONFIG_FILES
@@ -25767,7 +25666,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\
-dirsrv config.status 1.1.0b1
+dirsrv config.status 8.0.0
 configured by $0, generated by GNU Autoconf 2.59,
   with options \"`echo "$ac_configure_args" | sed 's/[\""`$]/\\&/g'`\"
@@ -26020,7 +25919,6 @@
 s,@CCDEPMODE@,$CCDEPMODE,;t t
 s,@am__fastdepCC_TRUE@,$am__fastdepCC_TRUE,;t t
 s,@am__fastdepCC_FALSE@,$am__fastdepCC_FALSE,;t t
-s,@SED@,$SED,;t t
 s,@EGREP@,$EGREP,;t t
 s,@LN_S@,$LN_S,;t t
 s,@ECHO@,$ECHO,;t t
Index: aclocal.m4
===================================================================
RCS file: /cvs/dirsec/ldapserver/aclocal.m4,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- aclocal.m4	12 Sep 2007 15:20:59 -0000	1.51
+++ aclocal.m4	1 Oct 2007 05:24:56 -0000	1.52
@@ -1578,27 +1578,10 @@
   # before this can be enabled.
   hardcode_into_libs=yes
-  # find out which ABI we are using
-  libsuff=
-  case "$host_cpu" in
-  x86_64*|s390x*|powerpc64*)
-    echo '[#]line __oline__ "configure"' > conftest.$ac_ext
-    if AC_TRY_EVAL(ac_compile); then
-      case `/usr/bin/file conftest.$ac_objext` in
-      *64-bit*)
-        libsuff=64
-        sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
-        ;;
-      esac
-    fi
-    rm -rf conftest*
-    ;;
-  esac
-
   # Append ld.so.conf contents to the search path
   if test -f /etc/ld.so.conf; then
-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", [$]2)); skip = 1; } { if (!skip) print [$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-    sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", [$]2)); skip = 1; } { if (!skip) print [$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
   fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
@@ -4305,9 +4288,6 @@
 # Is the compiler the GNU C compiler?
 with_gcc=$_LT_AC_TAGVAR(GCC, $1)
-gcc_dir=`gcc -print-file-name=. | $SED 's,/.$,,'`
-gcc_ver=`gcc -dumpversion`
-
 # An ERE matcher.
 EGREP=$lt_EGREP
@@ -4441,11 +4421,11 @@
# Dependencies to place before the objects being linked to create a
 # shared library.
-predep_objects=`echo $lt_[]_LT_AC_TAGVAR(predep_objects, $1) | $SED -e "s@${gcc_dir}@\${gcc_dir}@g;s@${gcc_ver}@\${gcc_ver}@g"`
+predep_objects=$lt_[]_LT_AC_TAGVAR(predep_objects, $1)
# Dependencies to place after the objects being linked to create a
 # shared library.
-postdep_objects=`echo $lt_[]_LT_AC_TAGVAR(postdep_objects, $1) | $SED -e "s@${gcc_dir}@\${gcc_dir}@g;s@${gcc_ver}@\${gcc_ver}@g"`
+postdep_objects=$lt_[]_LT_AC_TAGVAR(postdep_objects, $1)
# Dependencies to place before the objects being linked to create a
 # shared library.
@@ -4457,7 +4437,7 @@
# The library search path used internally by the compiler when linking
 # a shared library.
-compiler_lib_search_path=`echo $lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1) | $SED -e "s@${gcc_dir}@\${gcc_dir}@g;s@${gcc_ver}@\${gcc_ver}@g"`
+compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1)
# Method to check whether dependent libraries are shared objects.
 deplibs_check_method=$lt_deplibs_check_method
@@ -4537,7 +4517,7 @@
 link_all_deplibs=$_LT_AC_TAGVAR(link_all_deplibs, $1)
# Compile-time system search path for libraries
-sys_lib_search_path_spec=`echo $lt_sys_lib_search_path_spec | $SED -e "s@${gcc_dir}@\${gcc_dir}@g;s@${gcc_ver}@\${gcc_ver}@g"`
+sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
# Run-time system search path for libraries
 sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
@@ -6373,7 +6353,6 @@
     done
   done
 done
-IFS=$as_save_IFS
 lt_ac_max=0
 lt_ac_count=0
 # Add /usr/xpg4/bin/sed as it is typically found on Solaris
@@ -6406,7 +6385,6 @@
 done
 ])
 SED=$lt_cv_path_SED
-AC_SUBST([SED])
 AC_MSG_RESULT([$SED])
 ])
Index: Makefile.am
===================================================================
RCS file: /cvs/dirsec/ldapserver/Makefile.am,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- Makefile.am	7 Sep 2007 19:08:44 -0000	1.57
+++ Makefile.am	1 Oct 2007 05:24:56 -0000	1.58
@@ -145,7 +145,6 @@
    ldap/ldif/template-pampta.ldif \
    ldap/ldif/template-dnaplugin.ldif \
    ldap/ldif/template-bitwise.ldif \
-	ldap/ldif/template-dse.ldif \
    ldap/ldif/template-org.ldif \
    ldap/ldif/template-domain.ldif \
    ldap/ldif/template-state.ldif \
@@ -153,6 +152,7 @@
    ldap/ldif/template-country.ldif \
    ldap/ldif/template-orgunit.ldif \
    ldap/ldif/template-baseacis.ldif \
+	ldap/ldif/template-sasl.ldif \
    $(srcdir)/ldap/servers/slapd/tools/rsearch/scripts/dbgen-FamilyNames \
    $(srcdir)/ldap/servers/slapd/tools/rsearch/scripts/dbgen-GivenNames \
    $(srcdir)/ldap/servers/slapd/tools/rsearch/scripts/dbgen-OrgUnits

    