Replace hardcoded lib with variable

diff --git a/m4/pdns_check_ldap.m4 b/m4/pdns_check_ldap.m4
index d102277958119a8d098528c8cbf9aeb262f8b8a1..e3a8a27cade1e060c6bd89e7f38cf173d48b4b7f 100644 (file)
--- a/m4/pdns_check_ldap.m4
+++ b/m4/pdns_check_ldap.m4
@@ -8,18 +8,19 @@ AC_DEFUN([PDNS_CHECK_LDAP],[
     [],
     [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"
+      LDAP_LIBS="-lldap_r -llber"
     ],
     [
       AC_CHECK_LIB([ldap], [ldap_set_option],
         [
           AC_DEFINE([HAVE_LIBLDAP], 1, [Have -lldap])
           LIBLDAP="ldap"
+          LDAP_LIBS="-lldap -llber"
         ],
         [AC_MSG_ERROR([ldap library (libldap) not found])]
       )
@@ -33,4 +34,6 @@ AC_DEFUN([PDNS_CHECK_LDAP],[
   AC_CHECK_LIB([$LIBLDAP], [ldap_sasl_bind],
     [AC_DEFINE([HAVE_LDAP_SASL_BIND], 1, [Define to 1 if you have ldap_sasl_bind])]
   )
+
+  AC_SUBST([LDAP_LIBS])
 ])

diff --git a/modules/ldapbackend/Makefile.am b/modules/ldapbackend/Makefile.am
index 67a1275714e2abeeace8182bc278a2e17eb15159..016fcf9d1fd171b15ef045e32af40ad255a0dd1d 100644 (file)
--- a/modules/ldapbackend/Makefile.am
+++ b/modules/ldapbackend/Makefile.am
@@ -4,5 +4,5 @@ EXTRA_DIST = OBJECTFILES OBJECTLIBS
 
 pkglib_LTLIBRARIES = libldapbackend.la
 libldapbackend_la_SOURCES = ldapbackend.cc ldapbackend.hh powerldap.hh powerldap.cc utils.hh
-libldapbackend_la_LDFLAGS =-module -avoid-version
-libldapbackend_la_LIBADD =-l$(LIBLDAP)
+libldapbackend_la_LDFLAGS = -module -avoid-version
+libldapbackend_la_LIBADD = $(LDAP_LIBS)

diff --git a/modules/ldapbackend/OBJECTLIBS b/modules/ldapbackend/OBJECTLIBS
index 4adc2f060fc5a72c7e3cd086d642952ecdf5744b..ab9c9d9c82163b9997ee0cfea496eab00cdcd5a9 100644 (file)
--- a/modules/ldapbackend/OBJECTLIBS
+++ b/modules/ldapbackend/OBJECTLIBS
@@ -1 +1 @@
--lldap_r -llber
+$(LDAP_LIBS)