diff options
| author | Guy Harris <guy@alum.mit.edu> | 2002-07-06 20:40:50 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2002-07-06 20:40:50 +0000 |
| commit | 78b3b038e17097671f07427732a18a837c33a44c (patch) | |
| tree | 886ec7323a363ca81cb8efa03a353abc34abf27c /wiretap | |
| parent | 26543ab3d4271ca6927a020de79666b1f9d24c0e (diff) | |
From Nix:
Don't add "-I/usr/include" to CFLAGS or CPPFLAGS; GCC 3.1 warns
about it, and it's not necessary.
Expand the plugin directory path used for installation at
installation time, rather than configuration time, so the user
can reset "prefix" at installation time.
svn path=/trunk/; revision=5828
Diffstat (limited to 'wiretap')
| -rw-r--r-- | wiretap/acinclude.m4 | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/wiretap/acinclude.m4 b/wiretap/acinclude.m4 index df4cd6a020..d778a78289 100644 --- a/wiretap/acinclude.m4 +++ b/wiretap/acinclude.m4 @@ -2,7 +2,7 @@ dnl Macros that test for specific features. dnl This file is part of the Autoconf packaging for Ethereal. dnl Copyright (C) 1998-2000 by Gerald Combs. dnl -dnl $Id: acinclude.m4,v 1.14 2002/04/08 01:34:39 guy Exp $ +dnl $Id: acinclude.m4,v 1.15 2002/07/06 20:40:50 guy Exp $ dnl # @@ -47,8 +47,10 @@ AC_DEFUN(AC_WIRETAP_PCAP_CHECK, for pcap_dir in /usr/include/pcap /usr/local/include/pcap $prefix/include do if test -d $pcap_dir ; then - CFLAGS="$CFLAGS -I$pcap_dir" - CPPFLAGS="$CPPFLAGS -I$pcap_dir" + if test x$pcap_dir != x/usr/include; then + CFLAGS="$CFLAGS -I$pcap_dir" + CPPFLAGS="$CPPFLAGS -I$pcap_dir" + fi found_pcap_dir=" $found_pcap_dir -I$pcap_dir" fi done |