]> The Tcpdump Group git mirrors - tcpdump/commitdiff
From Michael Riepe:
authorGuy Harris <[email protected]>
Tue, 24 Mar 2009 15:42:47 +0000 (08:42 -0700)
committerGuy Harris <[email protected]>
Tue, 24 Mar 2009 15:42:47 +0000 (08:42 -0700)
On e.g. an x86_64 Linux system, configure won't find libcrypto because
it's located in .../lib64.  As a temporal workaround, use the last part
of $libdir instead of "lib".  On the long run, AC_LBL_SSLEAY should
probably be rewritten.

CREDITS
aclocal.m4

diff --git a/CREDITS b/CREDITS
index 76ed39bede149863ef3dccd85bed862ce503df33..ed82f792917e32f2c69af1b829c6ce5ea60f1660 100644 (file)
--- a/CREDITS
+++ b/CREDITS
@@ -108,6 +108,7 @@ Additional people who have contributed patches:
        Max Laier                       <max at love2party dot net>
        Michael A. Meffie III           <meffie at sourceforge dot net>
        Michael Madore                  <mmadore at turbolinux dot com>
+       Michael Riepe                   <too-tired at sourceforge dot net>
        Michael Shalayeff               <mickey at openbsd dot org>
        Michael Shields                 <shields at msrl dot com>
        Michael T. Stolarchuk           <mts at off dot to>
index 346bda8fe15cc1b814a777aa5580dd3f69c77b2b..5126c70041ad72720fd6d8a3844d41f4886c3446 100644 (file)
@@ -1261,6 +1261,16 @@ AC_MSG_RESULT($ac_cv___attribute__)
 
 AC_DEFUN(AC_LBL_SSLEAY,
     [
+       #
+       # Find the last component of $libdir; it's not necessarily
+       # "lib" - it might be "lib64" on, for example, x86-64
+       # Linux systems.
+       #
+       # We assume the directory in which we're looking for
+       # libcrypto has a subdirectory with that as its name.
+       #
+       tmplib=`echo "$libdir" | sed 's,.*/,,'`
+
        #
        # XXX - is there a better way to check if a given library is
        # in a given directory than checking each of the possible
@@ -1271,10 +1281,10 @@ AC_DEFUN(AC_LBL_SSLEAY,
        #
        # Or should we just look for "libcrypto.*"?
        #
-       if test -d "$1/lib" -a \( -f "$1/lib/libcrypto.a" -o \
-                                   -f "$1/lib/libcrypto.so" -o \
-                                   -f "$1/lib/libcrypto.sl" -o \
-                                   -f "$1/lib/libcrypto.dylib" \); then
+       if test -d "$1/$tmplib" -a \( -f "$1/$tmplib/libcrypto.a" -o \
+                                   -f "$1/$tmplib/libcrypto.so" -o \
+                                   -f "$1/$tmplib/libcrypto.sl" -o \
+                                   -f "$1/$tmplib/libcrypto.dylib" \); then
                ac_cv_ssleay_path="$1"
        fi