From: Ruben Kerkhof <ruben@rubenkerkhof.com>
Date: Sat, 4 Oct 2014 22:08:23 +0000 (+0200)
Subject: Replace hardcoded lib with variable
X-Git-Tag: rec-3.7.0-rc1~223^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F1773%2Fhead;p=thirdparty%2Fpdns.git

Replace hardcoded lib with variable
---

diff --git a/m4/pdns_check_ldap.m4 b/m4/pdns_check_ldap.m4
index d102277958..e3a8a27cad 100644
--- 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 67a1275714..016fcf9d1f 100644
--- 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 4adc2f060f..ab9c9d9c82 100644
--- a/modules/ldapbackend/OBJECTLIBS
+++ b/modules/ldapbackend/OBJECTLIBS
@@ -1 +1 @@
--lldap_r -llber
+$(LDAP_LIBS)