Forcibly insert "-I/usr/local/include" in CFLAGS and "-L/usr/local/lib"

in LIBS, because there's a bunch of stuff we might use that might have
been installed in "/usr/local" ("libpcap", "zlib", an SNMP library), and
we want to make sure all the stuff that looks for libraries and header
files checks there.

Also, add all the "-I" stuff to CPPFLAGS as well, as that's what's used
in many header-file searches.

And, while we're at it, add "-R/usr/local/lib" on SunOS 5.x, as its
linker doesn't automatically set the run-time library search path to
include all directories specified in "-L".

Hopefully, this will make sure we find in "/usr/local/include" and
"/usr/local/lib" everything we might want to find (e.g., SNMP headers -
on FreeBSD, we weren't adding "/usr/local/include" because we found the
"libpcap" header in "/usr/include", and thus weren't searching
"/usr/local/include" for "ucd-snmp/snmp.h" or "snmp/snmp.h", and thus
weren't finding them even if we'd installed the UCD SNMP package!).

Also, hopefully it won't cause problems on some other platform with some
other configuration of installed packages....

svn path=/trunk/; revision=940

1 files changed, 23 insertions, 2 deletions

diff --git a/configure.in b/configure.in
index aa5cfa99d9..12963202be 100644
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-# $Id: configure.in,v 1.56 1999/10/27 05:34:39 guy Exp $
+# $Id: configure.in,v 1.57 1999/10/28 03:33:19 guy Exp $
 dnl Process this file with autoconf to produce a configure script.
 AC_INIT(etypes.h)
 
@@ -29,7 +29,28 @@ else
   AC_MSG_RESULT(no)
 fi
 
-CFLAGS="$CFLAGS -I\$(top_srcdir) -I\$(top_srcdir)/wiretap"
+#
+# Arrange that we search for header files in the source directory
+# and in its "wiretap" subdirectory, as well as in "/usr/local/include",
+# as various packages we use ("libpcap", "zlib", an SNMP library)
+# may have been installed under "/usr/local/include".
+#
+CFLAGS="$CFLAGS -I\$(top_srcdir) -I\$(top_srcdir)/wiretap -I/usr/local/include"
+CPPFLAGS="$CPPFLAGS -I\$(top_srcdir) -I\$(top_srcdir)/wiretap -I/usr/local/include"
+
+#
+# Arrange that we search for libraries in "/usr/local/lib", and set
+# a "-R" flag as appropriate.
+#
+# XXX - IRIX, and other OSes, may require some flag equivalent to
+# "-R" here.
+#
+LIBS="$LIBS -L/usr/local/lib"
+case "$host_os" in
+  solaris*)
+    LIBS="$LIBS -R/usr/local/lib"
+  ;;
+esac
 
 # Create DATAFILE_DIR #define for config.h
 DATAFILE_DIR=$sysconfdir