Quote "$d" when testing it in "AC_LBL_LIBPCAP", so that if it's empty -

i.e., if no extraneous pcap header directory is found when using an
installed libpcap - we don't die.

diff --git a/aclocal.m4 b/aclocal.m4
index 64a3aac90064e591e90efe94bad93176651d5357..20d2effda60817d3f37c64e73a798ce263442494 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,4 +1,4 @@
-dnl @(#) $Header: /tcpdump/master/tcpdump/aclocal.m4,v 1.96 2003-05-01 21:20:52 guy Exp $ (LBL)
+dnl @(#) $Header: /tcpdump/master/tcpdump/aclocal.m4,v 1.97 2003-05-02 08:41:01 guy Exp $ (LBL)

 dnl
 dnl Copyright (c) 1995, 1996, 1997, 1998
 dnl    The Regents of the University of California.  All rights reserved.
 dnl
 dnl Copyright (c) 1995, 1996, 1997, 1998
 dnl    The Regents of the University of California.  All rights reserved.


@@ -281,7 +281,7 @@ AC_DEFUN(AC_LBL_LIBPCAP,
                    d="/usr/include/pcap"
                fi
            fi
                    d="/usr/include/pcap"
                fi
            fi

-           if test -z $d ; then
+           if test -z "$d" ; then

                AC_MSG_RESULT(not found)
            else
                $2="-I$d $$2"
                AC_MSG_RESULT(not found)
            else
                $2="-I$d $$2"

diff --git a/configure b/configure
index 728cccb9116b2f78e9625e73b4eb1c62d37b3292..544767927fe645805cd0d1b3633b90e1b5b05f13 100755 (executable)
--- a/configure
+++ b/configure
@@ -3930,7 +3930,7 @@ echo "configure:3925: checking for extraneous pcap header directories" >&5
                    d="/usr/include/pcap"
                fi
            fi
                    d="/usr/include/pcap"
                fi
            fi

-           if test -z $d ; then
+           if test -z "$d" ; then

                echo "$ac_t""not found" 1>&6
            else
                V_INCLS="-I$d $V_INCLS"
                echo "$ac_t""not found" 1>&6
            else
                V_INCLS="-I$d $V_INCLS"