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

10 files changed, 35 insertions, 22 deletions

diff --git a/AUTHORS b/AUTHORS
index b2869fdd13..d29a78df57 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1306,6 +1306,11 @@ Christopher K. St. John <cks[AT]distributopia.com> {
 	Apache JServ Protocol v1.3 support
 }
 
+Nix <nix[AT]esperi.demon.co.uk> {
+	Don't add "-I/usr/include" to CFLAGS or CPPFLAGS
+	Expand the plugin directory path at install time
+}
+
 Alain Magloire <alainm[AT]rcsm.ece.mcgill.ca> was kind enough to
 give his permission to use his version of snprintf.c.
 
diff --git a/acinclude.m4 b/acinclude.m4
index 38a05706fc..eddede08d0 100644
--- a/acinclude.m4
+++ b/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.44 2002/04/08 01:34:38 guy Exp $
+dnl $Id: acinclude.m4,v 1.45 2002/07/06 20:40:42 guy Exp $
 dnl
 dnl This program is free software; you can redistribute it and/or modify
 dnl it under the terms of the GNU General Public License as published by
@@ -273,8 +273,10 @@ AC_DEFUN(AC_ETHEREAL_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
diff --git a/configure.in b/configure.in
index cbc1963db9..408e1ef28c 100644
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-# $Id: configure.in,v 1.168 2002/06/28 20:15:30 gerald Exp $
+# $Id: configure.in,v 1.169 2002/07/06 20:40:42 guy Exp $
 dnl
 dnl Process this file with autoconf 2.13 or later to produce a
 dnl configure script; 2.12 doesn't generate a "configure" script that
@@ -631,7 +631,8 @@ dnl
 dnl check whether plugins should be enabled and, if they should be,
 dnl check for plugins directory - stolen from Amanda's configure.in
 dnl
-PLUGIN_DIR="$libdir/ethereal/plugins/$VERSION"
+plugindir="$libdir/ethereal/plugins/$VERSION"
+PLUGIN_DIR="$plugindir"
 AC_ARG_WITH(plugins,
   [  --with-plugins[=DIR]    support plugins (installed in DIR, if supplied).],
   [
@@ -670,6 +671,7 @@ else
   AC_DEFINE(PLUGIN_DIR,NULL)
 fi
 AC_SUBST(PLUGIN_DIR)
+AC_SUBST(plugindir)
 
 dnl libtool defs
 AC_LIBTOOL_DLOPEN
diff --git a/doc/README.plugins b/doc/README.plugins
index 5bbefcec81..c8341cffb0 100644
--- a/doc/README.plugins
+++ b/doc/README.plugins
@@ -1,4 +1,4 @@
-$Id: README.plugins,v 1.5 2002/01/21 07:37:36 guy Exp $
+$Id: README.plugins,v 1.6 2002/07/06 20:40:43 guy Exp $
 
 Plugins
 
@@ -104,9 +104,9 @@ files.
 
 An example of the Makefile.am follows:
 
-INCLUDES = -I$(top_srcdir) -I$(includedir)
+INCLUDES = -I$(top_srcdir)
 
-plugindir = @PLUGIN_DIR@
+plugindir = @plugindir@
 
 plugin_LTLIBRARIES = xxx.la
 xxx_la_SOURCES = packet-xxx.c moduleinfo.h
diff --git a/doc/ethereal.pod.template b/doc/ethereal.pod.template
index ed1aec3710..d62fcbcafe 100644
--- a/doc/ethereal.pod.template
+++ b/doc/ethereal.pod.template
@@ -1457,6 +1457,8 @@ B<http://www.ethereal.com>.
   Tsutomu Mieno            <iitom[AT]utouto.com>
   Yasuhiro Shirasaki       <yasuhiro@gnome[AT]gr.jp>
   Anand V. Narwani         <anarwani[AT]cisco.com>
+  Christopher K. St. John  <cks[AT]distributopia.com>
+  Nix                      <nix[AT]esperi.demon.co.uk>
 
 Alain Magloire <alainm[AT]rcsm.ece.mcgill.ca> was kind enough to give his
 permission to use his version of snprintf.c.
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index 83338ea000..e5c7638ced 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -1,7 +1,7 @@
 # Makefile.am
 # Automake file for Ethereal
 #
-# $Id: Makefile.am,v 1.9 2002/05/05 00:16:36 guy Exp $
+# $Id: Makefile.am,v 1.10 2002/07/06 20:40:45 guy Exp $
 #
 # Ethereal - Network traffic analyzer
 # By Gerald Combs <gerald@zing.org>
@@ -24,7 +24,7 @@
 
 SUBDIRS = gryphon mgcp giop
 
-plugindir = @PLUGIN_DIR@
+plugindir = @plugindir@
 
 EXTRA_DIST = \
 	plugin_api.c	\
diff --git a/plugins/giop/Makefile.am b/plugins/giop/Makefile.am
index ee5f2e1c50..d6475a9cda 100644
--- a/plugins/giop/Makefile.am
+++ b/plugins/giop/Makefile.am
@@ -1,7 +1,7 @@
 # Makefile.am
 # Automake file for Ethereal/GIOP subdissectors 
 #
-# $Id: Makefile.am,v 1.2 2001/07/20 20:56:18 guy Exp $
+# $Id: Makefile.am,v 1.3 2002/07/06 20:40:46 guy Exp $
 #
 # Copyright 2001, Ericsson Inc.
 # Frank Singleton <frank.singleton@ericsson.com>
@@ -26,9 +26,9 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 
-INCLUDES = -I$(top_srcdir) -I$(includedir)
+INCLUDES = -I$(top_srcdir)
 
-plugindir = @PLUGIN_DIR@
+plugindir = @plugindir@
 
 plugin_LTLIBRARIES = cosnaming.la coseventcomm.la
 cosnaming_la_SOURCES = packet-cosnaming.c moduleinfo.h
diff --git a/plugins/gryphon/Makefile.am b/plugins/gryphon/Makefile.am
index 0bc15c888b..889f2bd921 100644
--- a/plugins/gryphon/Makefile.am
+++ b/plugins/gryphon/Makefile.am
@@ -1,7 +1,7 @@
 # Makefile.am
 # Automake file for Ethereal/Gryphon
 #
-# $Id: Makefile.am,v 1.9 2001/07/10 13:18:42 hagbard Exp $
+# $Id: Makefile.am,v 1.10 2002/07/06 20:40:47 guy Exp $
 #
 # Ethereal - Network traffic analyzer
 # By Steve Limkemann <stevelim@dgtech.com>
@@ -23,9 +23,9 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 
-INCLUDES = -I$(top_srcdir) -I$(includedir)
+INCLUDES = -I$(top_srcdir)
 
-plugindir = @PLUGIN_DIR@
+plugindir = @plugindir@
 
 plugin_LTLIBRARIES = gryphon.la
 gryphon_la_SOURCES = packet-gryphon.c packet-gryphon.h moduleinfo.h
diff --git a/plugins/mgcp/Makefile.am b/plugins/mgcp/Makefile.am
index 63e2132a8b..25f3b99d35 100644
--- a/plugins/mgcp/Makefile.am
+++ b/plugins/mgcp/Makefile.am
@@ -1,7 +1,7 @@
 # Makefile.am
 # Automake file for Ethereal/Gryphon
 #
-# $Id: Makefile.am,v 1.4 2001/07/10 13:18:43 hagbard Exp $
+# $Id: Makefile.am,v 1.5 2002/07/06 20:40:48 guy Exp $
 #
 # Ethereal - Network traffic analyzer
 # By Steve Limkemann <stevelim@dgtech.com>
@@ -23,9 +23,9 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 
-INCLUDES = -I$(top_srcdir) -I$(includedir)
+INCLUDES = -I$(top_srcdir)
 
-plugindir = @PLUGIN_DIR@
+plugindir = @plugindir@
 
 plugin_LTLIBRARIES = mgcp.la
 mgcp_la_SOURCES = packet-mgcp.c moduleinfo.h
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