From: Bert Hubert <bert.hubert@netherlabs.nl>
Date: Sun, 9 Mar 2008 15:23:52 +0000 (+0000)
Subject: rest of previous commit - including opendbx autodetection improvements
X-Git-Tag: rec-3.1.7.1~88
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4d7e6a135e3bb5946953d3b0e6ec49b4e6d52ea2;p=thirdparty%2Fpdns.git

rest of previous commit - including opendbx autodetection improvements


git-svn-id: svn://svn.powerdns.com/pdns/trunk/pdns@1153 d19b8d6e-7fed-0310-83ef-9ca221ded41b
---

diff --git a/configure.in b/configure.in
index 135f18d031..46b6bdf5b3 100644
--- a/configure.in
+++ b/configure.in
@@ -180,7 +180,7 @@ AC_ARG_ENABLE(gcc-skip-locking,
 
 AC_MSG_CHECKING(whether we will be building the recursor)
 AC_ARG_ENABLE(recursor, 
- [  --enable-recursor	If we should build the server],
+ [  --enable-recursor	If we should build the recursor],
 	enable_recursor=$enableval,
 	enable_recursor=no )
 
@@ -226,6 +226,36 @@ do
 		pdns )
 			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])]
+			)
+		;;
+		opendbx)
+			AC_CHECK_HEADERS([odbx.h], , [AC_MSG_ERROR([opendbx header (odbx.h) not found])])
+			AC_SUBST([LIBOPENDBX])
+			AC_CHECK_LIB(
+				[opendbx], [odbx_init],
+				[AC_DEFINE([HAVE_LIBOPENDBX], 1, [Have -lopendbx]) LIBOPENDBX="opendbx"]
+			)
+		;;
 	esac
 done
 
diff --git a/modules/opendbxbackend/Makefile.am b/modules/opendbxbackend/Makefile.am
index 2ba78b995c..db3a964c5d 100644
--- a/modules/opendbxbackend/Makefile.am
+++ b/modules/opendbxbackend/Makefile.am
@@ -1,7 +1,8 @@
 AM_CPPFLAGS=@THREADFLAGS@
+
+EXTRA_DIST = OBJECTFILES OBJECTLIBS
+
 lib_LTLIBRARIES = libopendbxbackend.la
 libopendbxbackend_la_SOURCES = odbxbackend.hh odbxbackend.cc odbxprivate.cc
-libopendbxbackend_la_LIBADD =-lopendbx
 libopendbxbackend_la_LDFLAGS =-module -avoid-version
-
-EXTRA_DIST = OBJECTFILES OBJECTLIBS
+libopendbxbackend_la_LIBADD =-l@LIBOPENDBX@