From David Smith: let the path for the crypto headers and libraries be

set explicitly by setting Xprefix as an environment variable, for use
when cross-compiling.

diff --git a/CREDITS b/CREDITS
index e8bf8ca141a1e9e24389f9129e2cb8e2dedd47da..4923d496d235d4922f4fafd2d20bfaa77f53627b 100644 (file)
--- a/CREDITS
+++ b/CREDITS
@@ -37,6 +37,7 @@ Additional people who have contributed patches:
        Daniel Hagerty                  <[email protected]>
        Darren Reed                     <[email protected]>
        David Binderman                 <[email protected]>
+       David Smith                     <[email protected]>
        David Young                     <[email protected]>
        Eddie Kohler                    <[email protected]>
        Francis Dupont                  <[email protected]>

diff --git a/configure b/configure
index 60efb94c5fbc27973bb1a45ab8733868fa69edd3..4998c6b02a87ed88185a01ccc54d4e4d55bdfde5 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 1.188.2.6 .
+# From configure.in Revision: 1.188.2.7 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.57.
 #
@@ -11494,7 +11494,15 @@ echo $ECHO_N "checking for SSLeay... $ECHO_C" >&6
 ac_cv_ssleay_path=no
 incdir=no
 
-Xprefix=`eval echo $prefix`
+#
+# If Xprefix is set in the environment, use that value.
+# XXX - this should arguably be done by having --with-crypto take an
+# optional argument, and have that argument be used to set Xprefix
+# if present.
+#
+if test -z "$Xprefix"; then
+       Xprefix=`eval echo $prefix`
+fi
 
 for dir in $Xprefix /usr/${host_alias} /usr /usr/local /usr/local/ssl /usr/pkg; do
        #

diff --git a/configure.in b/configure.in
index 5fec2817d065c8d507da990e6f7c016537e79c81..3f551799d82294aad5a81316a35c0a73ddd254a5 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-dnl @(#) $Header: /tcpdump/master/tcpdump/configure.in,v 1.188.2.6 2005-04-24 01:36:19 guy Exp $ (LBL)
+dnl @(#) $Header: /tcpdump/master/tcpdump/configure.in,v 1.188.2.7 2005-09-21 16:50:01 guy Exp $ (LBL)
 dnl
 dnl Copyright (c) 1994, 1995, 1996, 1997
 dnl    The Regents of the University of California.  All rights reserved.
@@ -6,7 +6,7 @@ dnl
 dnl Process this file with autoconf to produce a configure script.
 dnl
 
-AC_REVISION($Revision: 1.188.2.6 $)
+AC_REVISION($Revision: 1.188.2.7 $)
 AC_PREREQ(2.50)
 AC_INIT(tcpdump.c)
 
@@ -908,7 +908,15 @@ AC_MSG_CHECKING(for SSLeay)
 ac_cv_ssleay_path=no
 incdir=no
 
-Xprefix=`eval echo $prefix`
+#
+# If Xprefix is set in the environment, use that value.
+# XXX - this should arguably be done by having --with-crypto take an
+# optional argument, and have that argument be used to set Xprefix
+# if present.
+#
+if test -z "$Xprefix"; then
+       Xprefix=`eval echo $prefix`
+fi
 
 for dir in $Xprefix /usr/${host_alias} /usr /usr/local /usr/local/ssl /usr/pkg; do
        #