diff -Naur libgcrypt-1.4.4-orig/ltmain.sh libgcrypt-1.4.4-new/ltmain.sh
--- libgcrypt-1.4.4-orig/ltmain.sh	2008-08-19 08:20:08.000000000 -0700
+++ libgcrypt-1.4.4-new/ltmain.sh	2009-11-17 14:48:34.359034000 -0800
@@ -2126,7 +2126,7 @@
 	      fi
 	    done
 	  done
-	  if test "$found" != yes; then
+	  if test "$found" != yes || true; then
 	    # deplib doesn't seem to be a libtool library
 	    if test "$linkmode,$pass" = "prog,link"; then
 	      compile_deplibs="$deplib $compile_deplibs"
diff -Naur libgcrypt-1.4.4-orig/tests/Makefile.am libgcrypt-1.4.4-new/tests/Makefile.am
--- libgcrypt-1.4.4-orig/tests/Makefile.am	2008-12-02 02:51:35.000000000 -0800
+++ libgcrypt-1.4.4-new/tests/Makefile.am	2009-11-17 14:49:32.463254000 -0800
@@ -36,7 +36,7 @@
 AM_CPPFLAGS = -I../src -I$(top_srcdir)/src
 AM_CFLAGS = $(GPG_ERROR_CFLAGS)
 
-LDADD = ../src/libgcrypt.la $(DL_LIBS)
+LDADD = ../src/libgcrypt.la $(DL_LIBS) @LTLIBOBJS@ @GPG_ERROR_LIBS@
 
 EXTRA_PROGRAMS = testapi pkbench
 noinst_PROGRAMS = $(TESTS) fipsdrv
diff -Naur libgcrypt-1.4.4-orig/tests/Makefile.in libgcrypt-1.4.4-new/tests/Makefile.in
--- libgcrypt-1.4.4-orig/tests/Makefile.in	2009-01-22 10:16:51.000000000 -0800
+++ libgcrypt-1.4.4-new/tests/Makefile.in	2009-11-17 14:49:57.818797000 -0800
@@ -332,7 +332,7 @@
 # a built header.
 AM_CPPFLAGS = -I../src -I$(top_srcdir)/src
 AM_CFLAGS = $(GPG_ERROR_CFLAGS)
-LDADD = ../src/libgcrypt.la $(DL_LIBS)
+LDADD = ../src/libgcrypt.la $(DL_LIBS) @LTLIBOBJS@ @GPG_ERROR_LIBS@
 EXTRA_DIST = README rsa-16k.key cavs_tests.sh cavs_driver.pl
 all: all-am
 
