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 135f18d031491bd808f897ca9aa6ca8beab10d2a..46b6bdf5b3cc7a0e59a0143dba9f13f942c61860 100644 (file)
--- 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 2ba78b995cc8a7b083fe81956ce16f40260afd94..db3a964c5d3610cab9a8bd0d015f51e002a0f99c 100644 (file)
--- 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@