From ba5856e4360d0ba749c26189dae770481ea03234 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20M=C3=B6ller?= <nisse@lysator.liu.se>
Date: Wed, 22 Jun 2011 13:44:29 +0200
Subject: [PATCH] Use pwd -P when examining lib directories. Link in
serpent-encrypt.asm, if found.
Rev: nettle/configure.ac:1.34
---
configure.ac | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/configure.ac b/configure.ac
index ce3b7595..f06e8e9b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -174,9 +174,9 @@ if test "x$ABI" != xstandard ; then
AC_MSG_WARN([Cross compiling for linux. Can't guess if libraries go in lib${ABI} or lib.]); dnl '
else
# The dash builtin pwd tries to be "helpful" and remember
- # symlink names. Use /bin/pwd instead.
+ # symlink names. Use -P option, and hope it's portable enough.
test -d /usr/lib${ABI} \
- && (cd /usr/lib${ABI} && /bin/pwd | grep >/dev/null "/lib${ABI}"'$') \
+ && (cd /usr/lib${ABI} && pwd -P | grep >/dev/null "/lib${ABI}"'$') \
&& libdir='${exec_prefix}/'"lib${ABI}"
fi
;;
@@ -231,7 +231,8 @@ if test "x$enable_assembler" = xyes ; then
found=no
for tmp_f in aes-encrypt-internal.asm aes-decrypt-internal.asm \
arcfour-crypt.asm camellia-crypt-internal.asm \
- md5-compress.asm memxor.asm sha1-compress.asm machine.m4; do
+ md5-compress.asm memxor.asm serpent-encrypt.asm \
+ sha1-compress.asm machine.m4; do
# echo "Looking for $srcdir/$asm_path/$tmp_f"
if test -f "$srcdir/$asm_path/$tmp_f"; then
# echo found
--
GitLab