]> git.ipfire.org Git - thirdparty/nettle.git/commitdiff
Use pwd -P when examining lib directories.
authorNiels Möller <nisse@lysator.liu.se>
Wed, 22 Jun 2011 11:44:29 +0000 (13:44 +0200)
committerNiels Möller <nisse@lysator.liu.se>
Wed, 22 Jun 2011 11:44:29 +0000 (13:44 +0200)
Link in serpent-encrypt.asm, if found.

Rev: nettle/configure.ac:1.34

configure.ac

index ce3b7595c6e81f67928e52c3b060cd088d995fa9..f06e8e9b76905f5eec42cfeb18ac950714ed20db 100644 (file)
@@ -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