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 232c823eac8db8ad381c01d96ade27ebb6f91104..1b0ff4d4d8d6aa5570275bd5fa525ac6988122da 100644 (file)
--- 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 7a29a06ea135f1c444e4d21bb93450909bf51cd5..5ad305701f59ef13f1455150ead249caff2dede9 100644 (file)
--- 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)