From: Ruben Kerkhof <ruben@rubenkerkhof.com>
Date: Mon, 6 Jan 2014 13:07:25 +0000 (+0100)
Subject: Move ldap check to separate macro
X-Git-Tag: rec-3.6.0-rc1~264^2~9
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8fcc05606fd9e6007f7e9870ac547920f07930bc;p=pdns

Move ldap check to separate macro
---

diff --git a/configure.ac b/configure.ac
index 6c3cd10f1..73b2f3d06 100644
--- a/configure.ac
+++ b/configure.ac
@@ -261,26 +261,7 @@ do
 			needmysql=yes
 		;;
 		ldap)
-			AC_CHECK_HEADERS([ldap.h], , [AC_MSG_ERROR([ldap header (ldap.h) not found])])
-			AC_CHECK_HEADERS([lber.h], , [AC_MSG_ERROR([ldap header (lber.h) not found])])
-			AC_SUBST([LIBLDAP])
-			AC_CHECK_LIB(
-				[ldap_r], [ldap_set_option],
-				[AC_DEFINE([HAVE_LIBLDAP_R], 1, [Have -lldap_r]) LIBLDAP="ldap_r"],
-				[AC_CHECK_LIB(
-					[ldap], [ldap_set_option],
-					[AC_DEFINE([HAVE_LIBLDAP], 1, [Have -lldap]) LIBLDAP="ldap"],
-					[AC_MSG_ERROR([ldap library (libldap) not found])]
-				)]
-			)
-			AC_CHECK_LIB(
-				[$LIBLDAP], [ldap_initialize],
-				[AC_DEFINE([HAVE_LDAP_INITIALIZE], 1, [Define to 1 if you have ldap_initialize])]
-			)
-			AC_CHECK_LIB(
-				[$LIBLDAP], [ldap_sasl_bind],
-				[AC_DEFINE([HAVE_LDAP_SASL_BIND], 1, [Define to 1 if you have ldap_sasl_bind])]
-			)
+			PDNS_CHECK_LDAP
 		;;
 		opendbx)
 			AC_CHECK_HEADERS([odbx.h], , [AC_MSG_ERROR([opendbx header (odbx.h) not found])])
diff --git a/m4/pdns_check_ldap.m4 b/m4/pdns_check_ldap.m4
new file mode 100644
index 000000000..d10227795
--- /dev/null
+++ b/m4/pdns_check_ldap.m4
@@ -0,0 +1,36 @@
+AC_DEFUN([PDNS_CHECK_LDAP],[
+  AC_CHECK_HEADERS([ldap.h],
+    [],
+    [AC_MSG_ERROR([ldap header (ldap.h) not found])]
+  )
+
+  AC_CHECK_HEADERS([lber.h],
+    [],
+    [AC_MSG_ERROR([ldap header (lber.h) not found])]
+  )
+  AC_SUBST([LIBLDAP])
+
+  AC_CHECK_LIB([ldap_r], [ldap_set_option],
+    [
+      AC_DEFINE([HAVE_LIBLDAP_R], [1], [Have -lldap_r])
+      LIBLDAP="ldap_r"
+    ],
+    [
+      AC_CHECK_LIB([ldap], [ldap_set_option],
+        [
+          AC_DEFINE([HAVE_LIBLDAP], 1, [Have -lldap])
+          LIBLDAP="ldap"
+        ],
+        [AC_MSG_ERROR([ldap library (libldap) not found])]
+      )
+    ]
+  )
+
+  AC_CHECK_LIB([$LIBLDAP], [ldap_initialize],
+    [AC_DEFINE([HAVE_LDAP_INITIALIZE], 1, [Define to 1 if you have ldap_initialize])]
+  )
+
+  AC_CHECK_LIB([$LIBLDAP], [ldap_sasl_bind],
+    [AC_DEFINE([HAVE_LDAP_SASL_BIND], 1, [Define to 1 if you have ldap_sasl_bind])]
+  )
+])