From b1549263e128d4729c28f148f39d28e731e02ccb Mon Sep 17 00:00:00 2001
From: Quanah Gibson-Mount <quanah@openldap.org>
Date: Fri, 17 May 2019 17:54:16 +0000
Subject: [PATCH] Regenerate configure after ITS#9008 revert

---
 configure | 53 ++++++++++-------------------------------------------
 1 file changed, 10 insertions(+), 43 deletions(-)

diff --git a/configure b/configure
index 48c31b9072..ca70437ead 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Id: ece3056fb7e492e05f8960847fddeb714caffcc1 .
+# From configure.in Id: 8d2ee0e155fee599e34b47353303d7c2c0c65097 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.65.
 #
@@ -867,7 +867,6 @@ LDFLAGS
 CFLAGS
 AR
 CC
-moduledir
 ldap_subdir
 top_builddir
 OPENLDAP_RELEASE_DATE
@@ -948,7 +947,6 @@ ac_subst_files=''
 ac_user_opts='
 enable_option_checking
 with_subdir
-with_moduledir
 enable_debug
 enable_dynamic
 enable_syslog
@@ -1731,7 +1729,6 @@ Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
   --with-subdir=DIR       change default subdirectory used for installs
-  --with-moduledir=DIR    change default module subdirectory used for installs
   --with-cyrus-sasl	  with Cyrus SASL support [auto]
   --with-fetch		  with fetch(3) URL support [auto]
   --with-threads	  with threads [auto]
@@ -3496,24 +3493,6 @@ esac
 fi
 
 
-
-moduledir="openldap"
-
-
-# Check whether --with-moduledir was given.
-if test "${with_moduledir+set}" = set; then :
-  withval=$with_moduledir; case "$withval" in
-	no) moduledir=""
-		;;
-	yes)
-		;;
-	*)
-		moduledir="$withval"
-		;;
-esac
-
-fi
-
 # OpenLDAP --enable-debug
 
 	# Check whether --enable-debug was given.
@@ -5110,18 +5089,6 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5
 $as_echo "done" >&6; }
 
-
-case $moduledir in
-	/*|\\*)
-		;;
-	*)
-		moduledir=$libexecdir/$moduledir
-		;;
-esac
-
-
-
-
 LDAP_LIBS=
 SLAPD_NDB_LIBS=
 SLAPD_NDB_INCS=
@@ -6975,7 +6942,7 @@ ia64-*-hpux*)
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 6978 "configure"' > conftest.$ac_ext
+  echo '#line 6945 "configure"' > conftest.$ac_ext
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -8656,11 +8623,11 @@ else
    -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:8659: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8626: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:8663: \$? = $ac_status" >&5
+   echo "$as_me:8630: \$? = $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.
@@ -8918,11 +8885,11 @@ else
    -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:8921: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8888: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:8925: \$? = $ac_status" >&5
+   echo "$as_me:8892: \$? = $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.
@@ -8980,11 +8947,11 @@ else
    -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:8983: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8950: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:8987: \$? = $ac_status" >&5
+   echo "$as_me:8954: \$? = $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
@@ -10852,7 +10819,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 10855 "configure"
+#line 10822 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -10950,7 +10917,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 10953 "configure"
+#line 10920 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H