From ef174831b8d262ee8587db8c236a4d51e68c0176 Mon Sep 17 00:00:00 2001
From: Quanah Gibson-Mount <quanah@openldap.org>
Date: Tue, 6 Jul 2021 16:28:12 +0000
Subject: [PATCH] ITS#9485 - Update contrib ldapc++ for autoconf-2.71

---
 contrib/ldapc++/configure.ac  | 12 ++++++------
 contrib/ldapc++/src/ac/time.h |  8 ++------
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/contrib/ldapc++/configure.ac b/contrib/ldapc++/configure.ac
index 9e53b72431..ec6bc79bf3 100644
--- a/contrib/ldapc++/configure.ac
+++ b/contrib/ldapc++/configure.ac
@@ -8,10 +8,10 @@ dnl Process this file with autoconf to produce a configure script.
 AC_COPYRIGHT([[Copyright 2000-2021 The OpenLDAP Foundation. All rights reserved.
 Restrictions apply, see COPYRIGHT and LICENSE files.]])
 AC_REVISION([$Id$])
-AC_INIT(ldapcpplib, [] , [http://www.openldap.org/its/] )
+AC_INIT([ldapcpplib],[ ],[http://www.openldap.org/its/ ])
 AC_CONFIG_SRCDIR(src/LDAPConnection.h)
 AM_INIT_AUTOMAKE(foreign)
-AM_CONFIG_HEADER(src/config.h)
+AC_CONFIG_HEADERS([src/config.h])
 
 eval `$ac_aux_dir/version.sh`
 if test -z "$OL_CPP_API_RELEASE"; then
@@ -27,8 +27,8 @@ AC_PROG_INSTALL
 dnl AC_PROG_CC
 AC_PROG_CXX
 dnl AC_PROG_RANLIB
-dnl AM_DISABLE_SHARED
-AC_PROG_LIBTOOL
+dnl AC_DISABLE_SHARED([])
+LT_INIT
 dnl AC_PROG_MAKE_SET
 AC_ARG_ENABLE(debug,[  --enable-debug],[
 	CXXFLAGS="-g -O0 -Wall"
@@ -72,7 +72,6 @@ dnl NOOP
     -llber
     ])
 dnl Checks for header files.
-AC_HEADER_TIME
 AC_CHECK_HEADERS(termios.h ldap.h)
 AC_EGREP_HEADER(ldap_add_ext,ldap.h,[
 dnl NOOP
@@ -98,4 +97,5 @@ dnl Checks for typedefs, structures, and compiler characteristics.
 
 dnl Checks for library functions.
 
-AC_OUTPUT(Makefile src/Makefile examples/Makefile)
+AC_CONFIG_FILES([Makefile src/Makefile examples/Makefile])
+AC_OUTPUT
diff --git a/contrib/ldapc++/src/ac/time.h b/contrib/ldapc++/src/ac/time.h
index 7c7f6c680c..6ea30f0dd9 100644
--- a/contrib/ldapc++/src/ac/time.h
+++ b/contrib/ldapc++/src/ac/time.h
@@ -13,16 +13,12 @@
 #ifndef _AC_TIME_H
 #define _AC_TIME_H
 
-#ifdef TIME_WITH_SYS_TIME
-# include <sys/time.h>
-# include <time.h>
-#elif defined HAVE_SYS_TIME_H
+#if defined HAVE_SYS_TIME_H
 # include <sys/time.h>
 # ifdef HAVE_SYS_TIMEB_H
 #  include <sys/timeb.h>
 # endif
-#else
-# include <time.h>
 #endif
+# include <time.h>
 
 #endif /* _AC_TIME_H */