Wireshark · Ethereal-dev: [Ethereal-dev] [PATCH] minor ethereal build system fixes

Ethereal-dev: [Ethereal-dev] [PATCH] minor ethereal build system fixes

Note: This archive is from the project's previous web site, ethereal.com. This list is no longer active.

Date: 06 Jul 2002 11:35:17 +0100

This fixes two classes of (admittedly minor) bug:

- passing -I/usr/include to the compiler, which is not a good idea
  when the compiler is GCC (GCC 3.1 warns about it --- GCC 3.2 may
  well simply *ignore* it, but it's still a mistake)

- prematurely expanding `PLUGIN_DIR' so that it doesn't move around
  if the user resets `prefix' at installation time --- obviously you
  need to expand it because it gets substituted into C code, so
  I've introduced a `plugindir' make variable which contains the
  unexpanded value.

ethereal/ changes:

2002-07-06  Nix  <nix@xxxxxxxxxxxxxxxxxx>

	* configure.in (plugindir): New variable, unexpanded PLUGIN_DIR.
	* plugins/Makefile.am (plugindir): Use it.
	* doc/README.plugins (plugindir): Document it.

	* acinclude.m4 (AC_ETHEREAL_PCAP_CHECK): Do not add the pcap_dir if it
        is /usr/include.

	* doc/README.plugins (INCLUDES): Do not -I the includedir.

giop/ changes:

2002-07-06  Nix  <nix@xxxxxxxxxxxxxxxxxx>

	* Makefile.am (INCLUDES): Do not -I the includedir.
	* Makefile.am (plugindir): Change from unexpanded PLUGIN_DIR.

wiretap/ changes:

2002-07-06  Nix  <nix@xxxxxxxxxxxxxxxxxx>

	* acinclude.m4 (AC_WIRETAP_PCAP_CHECK): Do not add the pcap_dir if it
        is /usr/include.

Index: ethereal/acinclude.m4
===================================================================
RCS file: /cvsroot/ethereal/acinclude.m4,v
retrieving revision 1.44
diff -u -r1.44 acinclude.m4
--- acinclude.m4	2002/04/08 01:34:38	1.44
+++ acinclude.m4	2002/07/06 10:05:01
@@ -273,8 +273,10 @@
 	  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
Index: ethereal/configure.in
===================================================================
RCS file: /cvsroot/ethereal/configure.in,v
retrieving revision 1.168
diff -u -r1.168 configure.in
--- configure.in	2002/06/28 20:15:30	1.168
+++ configure.in	2002/07/06 10:05:03
@@ -631,7 +631,8 @@
 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 @@
   AC_DEFINE(PLUGIN_DIR,NULL)
 fi
 AC_SUBST(PLUGIN_DIR)
+AC_SUBST(plugindir)
 
 dnl libtool defs
 AC_LIBTOOL_DLOPEN
Index: ethereal/doc/README.plugins
===================================================================
RCS file: /cvsroot/ethereal/doc/README.plugins,v
retrieving revision 1.5
diff -u -r1.5 README.plugins
--- README.plugins	2002/01/21 07:37:36	1.5
+++ README.plugins	2002/07/06 10:05:06
@@ -104,9 +104,9 @@
 
 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
Index: ethereal/plugins/Makefile.am
===================================================================
RCS file: /cvsroot/ethereal/plugins/Makefile.am,v
retrieving revision 1.9
diff -u -r1.9 Makefile.am
--- Makefile.am	2002/05/05 00:16:36	1.9
+++ Makefile.am	2002/07/06 10:05:08
@@ -24,7 +24,7 @@
 
 SUBDIRS = gryphon mgcp giop
 
-plugindir = @PLUGIN_DIR@
+plugindir = @plugindir@
 
 EXTRA_DIST = \
 	plugin_api.c	\
Index: ethereal/plugins/giop/Makefile.am
===================================================================
RCS file: /cvsroot/ethereal/plugins/giop/Makefile.am,v
retrieving revision 1.2
diff -u -r1.2 Makefile.am
--- Makefile.am	2001/07/20 20:56:18	1.2
+++ Makefile.am	2002/07/06 10:05:08
@@ -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
Index: ethereal/plugins/gryphon/Makefile.am
===================================================================
RCS file: /cvsroot/ethereal/plugins/gryphon/Makefile.am,v
retrieving revision 1.9
diff -u -r1.9 Makefile.am
--- Makefile.am	2001/07/10 13:18:42	1.9
+++ Makefile.am	2002/07/06 10:05:08
@@ -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
Index: ethereal/plugins/mgcp/Makefile.am
===================================================================
RCS file: /cvsroot/ethereal/plugins/mgcp/Makefile.am,v
retrieving revision 1.4
diff -u -r1.4 Makefile.am
--- Makefile.am	2001/07/10 13:18:43	1.4
+++ Makefile.am	2002/07/06 10:05:08
@@ -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
Index: ethereal/wiretap/acinclude.m4
===================================================================
RCS file: /cvsroot/ethereal/wiretap/acinclude.m4,v
retrieving revision 1.14
diff -u -r1.14 acinclude.m4
--- acinclude.m4	2002/04/08 01:34:39	1.14
+++ acinclude.m4	2002/07/06 10:05:09
@@ -47,8 +47,10 @@
 	  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


-- 
`What happened?'
                 `Nick shipped buggy code!'
                                             `Oh, no dinner for him...'

Follow-Ups:
- Re: [Ethereal-dev] [PATCH] minor ethereal build system fixes
  - From: Guy Harris
- Re: [Ethereal-dev] [PATCH] minor ethereal build system fixes
  - From: Guy Harris

Prev by Date: [Ethereal-dev] Ethereal reboots machine
Next by Date: Re: [Ethereal-dev] ntlmssp decoding
Previous by thread: [Ethereal-dev] Ethereal reboots machine
Next by thread: Re: [Ethereal-dev] [PATCH] minor ethereal build system fixes
Index(es):
- Date
- Thread

Riverbed Cascade Pilot: Take Wireshark to the Next Level - Advanced Triggers and Alerts; Web and VoIP Analytics; Long-Term Trending and Forensics; Deep Packet Analysis with Wireshark

Riverbed Cascade Pilot Personal Edition: Take Wireshark to the Next Level - Advanced Triggers and Alerts; Web and VoIP Analytics; Long-Term Trending and Forensics; Deep Packet Analysis with Wireshark

Riverbed AirPcap: Complete Visibility of Your Wireless Networks; Multi-Channel, Aggregated Analysis; Portable and Versatile; Easy to Setup and Easy to Use; Ready to Power Your Application

$Riverbed TurboCap: Full-Speed GbE Capture; Port Aggregation; Pass-thru Mode; Aggregating Tap; Full-Speed GbE Injection; Exported Interfaces; TurboCap API Developer\'s Pack$