From e565ff7553e60b3d13dde410ef96f5256c5525eb Mon Sep 17 00:00:00 2001
From: Noah Misch <noah@leadboat.com>
Date: Fri, 25 Jul 2014 18:51:35 -0400
Subject: [PATCH] Move PGAC_LDAP_SAFE to config/programs.m4.

This restores the style of keeping configure.in free of AC_DEFUN.  Per
gripe from Tom Lane.
---
 config/programs.m4 | 28 ++++++++++++++++++++++++++++
 configure          | 11 -----------
 configure.in       | 28 ----------------------------
 3 files changed, 28 insertions(+), 39 deletions(-)

diff --git a/config/programs.m4 b/config/programs.m4
index 76c0158973..ed6711df16 100644
--- a/config/programs.m4
+++ b/config/programs.m4
@@ -116,6 +116,34 @@ AC_SUBST(FLEXFLAGS)
 
 
 
+# PGAC_LDAP_SAFE
+# --------------
+# PostgreSQL sometimes loads libldap_r and plain libldap into the same
+# process.  Check for OpenLDAP versions known not to tolerate doing so; assume
+# non-OpenLDAP implementations are safe.  The dblink test suite exercises the
+# hazardous interaction directly.
+
+AC_DEFUN([PGAC_LDAP_SAFE],
+[AC_CACHE_CHECK([for compatible LDAP implementation], [pgac_cv_ldap_safe],
+[AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
+[#include <ldap.h>
+#if !defined(LDAP_VENDOR_VERSION) || \
+     (defined(LDAP_API_FEATURE_X_OPENLDAP) && \
+      LDAP_VENDOR_VERSION >= 20424 && LDAP_VENDOR_VERSION <= 20431)
+choke me
+#endif], [])],
+[pgac_cv_ldap_safe=yes],
+[pgac_cv_ldap_safe=no])])
+
+if test "$pgac_cv_ldap_safe" != yes; then
+  AC_MSG_WARN([
+*** With OpenLDAP versions 2.4.24 through 2.4.31, inclusive, each backend
+*** process that loads libpq (via WAL receiver, dblink, or postgres_fdw) and
+*** also uses LDAP will crash on exit.])
+fi])
+
+
+
 # PGAC_CHECK_READLINE
 # -------------------
 # Check for the readline library and dependent libraries, either
diff --git a/configure b/configure
index beb65ebffa..0b0a6566f3 100755
--- a/configure
+++ b/configure
@@ -9475,17 +9475,6 @@ fi
 
 fi
 
-# PGAC_LDAP_SAFE
-# --------------
-# PostgreSQL sometimes loads libldap_r and plain libldap into the same
-# process.  Check for OpenLDAP versions known not to tolerate doing so; assume
-# non-OpenLDAP implementations are safe.  The dblink test suite exercises the
-# hazardous interaction directly.
-
-
-
-
-
 if test "$with_ldap" = yes ; then
   if test "$PORTNAME" != "win32"; then
      for ac_header in ldap.h
diff --git a/configure.in b/configure.in
index e22f8d8ad7..fd9eb7152c 100644
--- a/configure.in
+++ b/configure.in
@@ -1097,34 +1097,6 @@ if test "$with_libxslt" = yes ; then
   AC_CHECK_HEADER(libxslt/xslt.h, [], [AC_MSG_ERROR([header file <libxslt/xslt.h> is required for XSLT support])])
 fi
 
-# PGAC_LDAP_SAFE
-# --------------
-# PostgreSQL sometimes loads libldap_r and plain libldap into the same
-# process.  Check for OpenLDAP versions known not to tolerate doing so; assume
-# non-OpenLDAP implementations are safe.  The dblink test suite exercises the
-# hazardous interaction directly.
-
-AC_DEFUN([PGAC_LDAP_SAFE],
-[AC_CACHE_CHECK([for compatible LDAP implementation], [pgac_cv_ldap_safe],
-[AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
-[#include <ldap.h>
-#if !defined(LDAP_VENDOR_VERSION) || \
-     (defined(LDAP_API_FEATURE_X_OPENLDAP) && \
-      LDAP_VENDOR_VERSION >= 20424 && LDAP_VENDOR_VERSION <= 20431)
-choke me
-#endif], [])],
-[pgac_cv_ldap_safe=yes],
-[pgac_cv_ldap_safe=no])])
-
-if test "$pgac_cv_ldap_safe" != yes; then
-  AC_MSG_WARN([
-*** With OpenLDAP versions 2.4.24 through 2.4.31, inclusive, each backend
-*** process that loads libpq (via WAL receiver, dblink, or postgres_fdw) and
-*** also uses LDAP will crash on exit.])
-fi])
-
-
-
 if test "$with_ldap" = yes ; then
   if test "$PORTNAME" != "win32"; then
      AC_CHECK_HEADERS(ldap.h, [],