From 2d6fe96e8c3fe6ae9677eb212d03f11f2535606d Mon Sep 17 00:00:00 2001 From: Ruben Kerkhof Date: Fri, 26 Dec 2014 18:33:32 +0100 Subject: [PATCH] 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. --- configure.ac | 13 ------------- modules/gpgsqlbackend/Makefile.am | 2 +- 2 files changed, 1 insertion(+), 14 deletions(-) diff --git a/configure.ac b/configure.ac index 232c823ea..1b0ff4d4d 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 7a29a06ea..5ad305701 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) -- 2.40.0