From: Ruben Kerkhof <ruben@rubenkerkhof.com>
Date: Fri, 26 Dec 2014 17:33:32 +0000 (+0100)
Subject: Stop linking pgsqlbackend with hardcoded libs
X-Git-Tag: rec-3.7.0-rc2~38^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F2007%2Fhead;p=thirdparty%2Fpdns.git

Stop linking pgsqlbackend with hardcoded libs

This is only for the dynamic case, static case uses
OBJECTLIBS to do the right thing.

Remove the check for libcrypt since that's now not needed anymore.
---

diff --git a/configure.ac b/configure.ac
index 232c823eac..1b0ff4d4d8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -117,15 +117,6 @@ if test "$has_RTLD_NOW" = "no"; then
 fi
 LIBS=$ac_save_LIBS
 
-# Check for libcrypt
-
-my_save_LIBS="$LIBS"
-LIBS=""
-AC_CHECK_LIB(crypt, crypt)
-LIBCRYPT=$LIBS
-LIBS="$my_save_LIBS"
-AC_SUBST(LIBCRYPT)
-
 THREADFLAGS=""
 
 case "$host_os" in
@@ -278,10 +269,6 @@ for a in $modules; do
     moduleobjects="$moduleobjects ../modules/${a}backend/$b"
   done
   modulelibs="$modulelibs `cat $srcdir/modules/${a}backend/OBJECTLIBS`"
-
-  if test ${a} = "gpgsql"; then
-    LIBS="$LIBS $LIBCRYPT"
-  fi
 done
 
 for a in $dynmodules; do
diff --git a/modules/gpgsqlbackend/Makefile.am b/modules/gpgsqlbackend/Makefile.am
index 7a29a06ea1..5ad305701f 100644
--- a/modules/gpgsqlbackend/Makefile.am
+++ b/modules/gpgsqlbackend/Makefile.am
@@ -18,4 +18,4 @@ libgpgsqlbackend_la_SOURCES = \
 	spgsql.cc spgsql.hh
 
 libgpgsqlbackend_la_LDFLAGS = -module -avoid-version
-libgpgsqlbackend_la_LIBADD = $(PGSQL_lib) -lssl $(LIBCRYPT) -lcrypto
+libgpgsqlbackend_la_LIBADD = $(PGSQL_lib)