Changeset 1153

Timestamp:

03/09/08 16:23:52 (2 years ago)

Author:

ahu

Message:

rest of previous commit - including opendbx autodetection improvements

Location:

trunk/pdns

Files:

• configure.in (modified) (2 diffs)
• modules/opendbxbackend/Makefile.am (modified) (1 diff)

trunk/pdns/configure.in

@@ -181 +181 @@
 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 +226 @@
                 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

trunk/pdns/modules/opendbxbackend/Makefile.am

@@ -1 +1 @@
 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@