patches from Assar Westerlund <[email protected]>

diff --git a/Makefile.in b/Makefile.in
index bed27b356872103959a675d6e3ca182e612ef8b3..d8121a102f18e9422b7929162b3acdbf45a3361b 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/libpcap/Makefile.in,v 1.72 1999-10-07 23:46:40 mcr Exp $ (LBL)
+# @(#) $Header: /tcpdump/master/libpcap/Makefile.in,v 1.73 1999-10-10 01:47:05 mcr Exp $ (LBL)
 
 #
 # Various configurable paths (remember to edit Makefile.in, not Makefile)
@@ -65,7 +65,7 @@ YACC = @V_YACC@
 # problem if you don't own the file but can write to the directory.
 .c.o:
        @rm -f $@
-       $(CC) $(CFLAGS) -c $(srcdir)/$*.c
+       $(CC) $(CFLAGS) -c $<
 
 PSRC = pcap-@[email protected]
 CSRC = pcap.c inet.c gencode.c optimize.c nametoaddr.c \
@@ -127,7 +127,7 @@ install-incl: force
            $(DESTDIR)$(INCLDEST)/pcap.h
        $(INSTALL) -m 444 -o bin -g bin $(srcdir)/pcap-namedb.h \
            $(DESTDIR)$(INCLDEST)/pcap-namedb.h
-       $(INSTALL) -m 444 -o bin -g bin $(srcdir)/net/bpf.h \
+       $(INSTALL) -m 444 -o bin -g bin $(srcdir)/bpf/net/bpf.h \
            $(DESTDIR)$(INCLDEST)/net/bpf.h
 
 install-man: force

diff --git a/aclocal.m4 b/aclocal.m4
index a0e489eae1d2e43b6fd77d7f1c7e279aa7594520..be15f25ea1d082b1db5e247dc970add9a84c85c5 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,4 +1,4 @@
-dnl @(#) $Header: /tcpdump/master/libpcap/aclocal.m4,v 1.63 1999-10-07 23:46:40 mcr Exp $ (LBL)
+dnl @(#) $Header: /tcpdump/master/libpcap/aclocal.m4,v 1.64 1999-10-10 01:47:05 mcr Exp $ (LBL)
 dnl
 dnl Copyright (c) 1995, 1996, 1997, 1998
 dnl    The Regents of the University of California.  All rights reserved.
@@ -51,7 +51,7 @@ AC_DEFUN(AC_LBL_C_INIT,
     $1="-O"
     $2=""
     if test "${srcdir}" != "." ; then
-           $2="-I\$\(srcdir\)"
+           $2="-I\$(srcdir)"
     fi
     if test "${CFLAGS+set}" = set; then
            LBL_CFLAGS="$CFLAGS"

diff --git a/configure b/configure
index 6bd9d5f1624e8b370e5cf2fa5ff71400c1066e1f..59e6917e2dd5c49ee7164311166e0652a67ffa67 100755 (executable)
--- a/configure
+++ b/configure
@@ -655,7 +655,7 @@ fi
     V_CCOPT="-O"
     V_INCLS=""
     if test "${srcdir}" != "." ; then
-           V_INCLS="-I\$\(srcdir\)"
+           V_INCLS="-I\$(srcdir)"
     fi
     if test "${CFLAGS+set}" = set; then
            LBL_CFLAGS="$CFLAGS"
@@ -1765,21 +1765,15 @@ EOF
 
     fi
 
-if test "${srcdir}" = "." ; then
-       srcdirprefix=""
-else
-       srcdirprefix="./"
-fi
-
-if test -r ${srcdirprefix}lbl/gnuc.h ; then
+if test -r ${srcdir}/lbl/gnuc.h ; then
        rm -f gnuc.h
-       ln -s ${srcdirprefix}lbl/gnuc.h gnuc.h
+       ln -s ${srcdir}/lbl/gnuc.h gnuc.h
 fi
 
 rm -f bpf_filter.c
-ln -s ${srcdirprefix}bpf/net/bpf_filter.c bpf_filter.c
+ln -s ${srcdir}/bpf/net/bpf_filter.c bpf_filter.c
 rm -f net
-ln -s ${srcdirprefix}bpf/net net
+ln -s ${srcdir}/bpf/net net
 
 
 
@@ -1799,7 +1793,7 @@ ln -s ${srcdirprefix}bpf/net net
 # 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:1803: checking for a BSD compatible install" >&5
+echo "configure:1797: 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 979ff6674c03995fb8b0b2998b026b00ff281dc0..add647effc34e58b8adac62e18f9dfafe80938c7 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-dnl @(#) $Header: /tcpdump/master/libpcap/configure.in,v 1.67 1999-10-07 23:46:40 mcr Exp $ (LBL)
+dnl @(#) $Header: /tcpdump/master/libpcap/configure.in,v 1.68 1999-10-10 01:47:06 mcr Exp $ (LBL)
 dnl
 dnl Copyright (c) 1994, 1995, 1996, 1997
 dnl    The Regents of the University of California.  All rights reserved.
@@ -156,21 +156,15 @@ AC_LBL_SOCKADDR_SA_LEN
 
 AC_LBL_UNALIGNED_ACCESS
 
-if test "${srcdir}" = "." ; then
-       srcdirprefix=""
-else
-       srcdirprefix="./"
-fi
-
-if test -r ${srcdirprefix}lbl/gnuc.h ; then
+if test -r ${srcdir}/lbl/gnuc.h ; then
        rm -f gnuc.h
-       ln -s ${srcdirprefix}lbl/gnuc.h gnuc.h
+       ln -s ${srcdir}/lbl/gnuc.h gnuc.h
 fi
 
 rm -f bpf_filter.c
-ln -s ${srcdirprefix}bpf/net/bpf_filter.c bpf_filter.c
+ln -s ${srcdir}/bpf/net/bpf_filter.c bpf_filter.c
 rm -f net
-ln -s ${srcdirprefix}bpf/net net
+ln -s ${srcdir}/bpf/net net
 
 AC_SUBST(V_CCOPT)
 AC_SUBST(V_INCLS)