fixed check for libssl to make HAVE_LIBCRYPTO

diff --git a/Makefile.in b/Makefile.in
index 14358e152dfc42d6e546d0a23e76488324af35f9..c1e753cf7204ea5c5d61ad79fbf6df1a77f5ce84 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -17,7 +17,7 @@
 #  WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
 #  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 #
-# @(#) $Header: /tcpdump/master/tcpdump/Makefile.in,v 1.221 2000-01-15 00:43:17 fenner Exp $ (LBL)
+# @(#) $Header: /tcpdump/master/tcpdump/Makefile.in,v 1.222 2000-01-15 01:59:17 mcr Exp $ (LBL)
 
 #
 # Various configurable paths (remember to edit Makefile.in, not Makefile)
@@ -33,7 +33,7 @@ MANDEST = @mandir@
 
 # VPATH
 srcdir = @srcdir@
-VPATH = @srcdir@
+VPATH = @srcdir@:@srcdir@/missing
 
 #
 # You shouldn't need to edit anything below here.

diff --git a/acconfig.h b/acconfig.h
index fefaec1d5922a1f9fba442247c5b02263ce86948..11738bdc3442ef67e67338c52d5038d3a49fdea7 100644 (file)
--- a/acconfig.h
+++ b/acconfig.h
@@ -2,9 +2,6 @@
  * make them to acconfig.h and rerun autoheader */
 @TOP@
 
-/* Define if you have SSLeay XXX why isn't this HAVE_LIBCRYPTO? */
-#undef CRYPTO
-
 /* Define if you have SSLeay 0.9.0b with the buggy cast128. */
 #undef HAVE_BUGGY_CAST128
 

diff --git a/config.h.in b/config.h.in
index ef062d8f68e7c4595a1c689bd71c8793c9f167f9..16237ccdd76fb05b5ec803a3cb9ae7fde1cc24e3 100644 (file)
--- a/config.h.in
+++ b/config.h.in
@@ -18,9 +18,6 @@
    byte first (like Motorola and SPARC, unlike Intel and VAX).  */
 #undef WORDS_BIGENDIAN
 
-/* Define if you have SSLeay XXX why isn't this HAVE_LIBCRYPTO? */
-#undef CRYPTO
-
 /* Define if you have SSLeay 0.9.0b with the buggy cast128. */
 #undef HAVE_BUGGY_CAST128
 

diff --git a/configure b/configure
index 9c43caafa3ad386639efe215bf229fda51602668..2edaf1bf18ed45c3bbdff87d022f36275854d07a 100755 (executable)
--- a/configure
+++ b/configure
@@ -4305,10 +4305,6 @@ else
   echo "$ac_t""no" 1>&6
 fi
 
-       cat >> confdefs.h <<\EOF
-#define HAVE_LIBCRYPTO 1
-EOF
-
 
        bak_CPPFLAGS=$CPPFLAGS
        CPPFLAGS="$CPPFLAGS $V_INCLS"
@@ -4316,17 +4312,17 @@ EOF
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:4320: checking for $ac_hdr" >&5
+echo "configure:4316: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4325 "configure"
+#line 4321 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4330: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4326: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -4355,12 +4351,12 @@ done
 
        if test "$ac_cv_header_cast_h" = "yes"; then
                echo $ac_n "checking for buggy CAST128""... $ac_c" 1>&6
-echo "configure:4359: checking for buggy CAST128" >&5
+echo "configure:4355: checking for buggy CAST128" >&5
                if test "$cross_compiling" = yes; then
   buggy_cast128="cross-compiling, assume yes"
 else
   cat > conftest.$ac_ext <<EOF
-#line 4364 "configure"
+#line 4360 "configure"
 #include "confdefs.h"
 
 #include <cast.h>
@@ -4379,7 +4375,7 @@ main()
                return 1;
 }
 EOF
-if { (eval echo configure:4383: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:4379: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   buggy_cast128=yes
 else
@@ -4428,7 +4424,7 @@ fi
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:4432: checking for a BSD compatible install" >&5
+echo "configure:4428: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6

diff --git a/configure.in b/configure.in
index a1f7431eb1026784f923ef616092233cc5163cd6..13aab89c5dd18367ed833c25a0b8281145bc4cd9 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-dnl @(#) $Header: /tcpdump/master/tcpdump/configure.in,v 1.95 2000-01-15 00:43:17 fenner Exp $ (LBL)
+dnl @(#) $Header: /tcpdump/master/tcpdump/configure.in,v 1.96 2000-01-15 01:58:56 mcr 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.95 $)
+AC_REVISION($Revision: 1.96 $)
 AC_INIT(tcpdump.c)
 
 AC_CANONICAL_SYSTEM
@@ -584,7 +584,6 @@ if test "$ac_cv_ssleay_path" != no; then
                LIBS="$LIBS -lrsaref"
        fi
        AC_CHECK_LIB(crypto, des_cbc_encrypt)
-       AC_DEFINE(HAVE_LIBCRYPTO)
 
        bak_CPPFLAGS=$CPPFLAGS
        CPPFLAGS="$CPPFLAGS $V_INCLS"