* configure.ac, */Makefile.am: Fix previous commit. SNMP includes

	  must be after lib/ includes in some systems. Introduce SNMP_INCLUDES
	  for that.

diff --git a/ChangeLog b/ChangeLog
index f9c16ed988effebf3d800c04cb2abe38776fb2c5..d418bfc3ab378564a1b28af6c1f7e200d8249451 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-03-28 Hasso Tepper <hasso at quagga.net>
+
+       * configure.ac, */Makefile.am: Fix previous commit. SNMP includes
+         must be after lib/ includes in some systems. Introduce SNMP_INCLUDES
+         for that.
+
 2005-03-28 Hasso Tepper <hasso at quagga.net>
 
        * configure.ac: Fix most of "Presents But Cannot Compiled" warnings

diff --git a/bgpd/Makefile.am b/bgpd/Makefile.am
index 842b007a44d31af078e54a40a46e35d9af871c16..86408b46020455716fab825347ef963d576da3a5 100644 (file)
--- a/bgpd/Makefile.am
+++ b/bgpd/Makefile.am
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in.
 
-INCLUDES = @INCLUDES@ -I.. -I$(top_srcdir) -I$(top_srcdir)/lib
+INCLUDES = @INCLUDES@ -I.. -I$(top_srcdir) -I$(top_srcdir)/lib @SNMP_INCLUDES@
 DEFS = @DEFS@ -DSYSCONFDIR=\"$(sysconfdir)/\"
 INSTALL_SDATA=@INSTALL@ -m 600
 

diff --git a/configure.ac b/configure.ac
index def16cbe38dc66a4f8b374bf6cd697cb0d40ca4c..508ba7d37a7c961d492e4528e6d82b2b79819f4f 100755 (executable)
--- a/configure.ac
+++ b/configure.ac
@@ -5,7 +5,7 @@
 ##  Copyright (c) 1996, 97, 98, 99, 2000 Kunihiro Ishiguro <kunihiro@zebra.org>
 ##  Portions Copyright (c) 2003 Paul Jakma <paul@dishone.st>
 ##
-## $Id: configure.ac,v 1.93 2005/03/27 21:00:35 hasso Exp $
+## $Id: configure.ac,v 1.94 2005/03/28 15:29:07 hasso Exp $
 AC_PREREQ(2.53)
 
 AC_INIT(Quagga, 0.99.0, [http://bugzilla.quagga.net])
@@ -948,7 +948,7 @@ dnl  AC_CHECK_LIB(snmp, asn_parse_int, HAVE_SNMP=yes)
                   AC_DEFINE(HAVE_SNMP,,SNMP)
                  AC_DEFINE(HAVE_NETSNMP,,SNMP)
                   AC_DEFINE(UCD_COMPATIBLE,,SNMP)
-                  INCLUDES="${INCLUDES} -I/usr/include/net-snmp -I/usr/include/net-snmp/library"
+                  SNMP_INCLUDES="${SNMP_INCLUDES} -I/usr/include/net-snmp -I/usr/include/net-snmp/library"
                  if test "${HAVE_NETSNMP}" = "yes"; then
                        LIBS="${LIBS} -lnetsnmp"
                  else
@@ -957,19 +957,19 @@ dnl  AC_CHECK_LIB(snmp, asn_parse_int, HAVE_SNMP=yes)
                   ;;
       /usr/include/ucd-snmp/*) 
                   AC_DEFINE(HAVE_SNMP,,SNMP)
-                  INCLUDES="${INCLUDES} -I/usr/include/ucd-snmp"
+                  SNMP_INCLUDES="${SNMP_INCLUDES} -I/usr/include/ucd-snmp"
                  LIBS="${LIBS} -lsnmp"
                   ;;
       /usr/local/include/ucd-snmp/*) 
                   AC_DEFINE(HAVE_SNMP,,SNMP)
-                 INCLUDES="${INCLUDES} -I/usr/local/include/ucd-snmp"
+                 SNMP_INCLUDES="${SNMP_INCLUDES} -I/usr/local/include/ucd-snmp"
                  LIBS="${LIBS} -L/usr/local/lib -lsnmp"
                   ;;
       /usr/local/include/net-snmp/*)
                AC_DEFINE(HAVE_SNMP,,SNMP)
                AC_DEFINE(HAVE_NET_SNMP,,SNMP)
                AC_DEFINE(UCD_COMPATIBLE,,SNMP)
-               INCLUDES="${INCLUDES} -I/usr/local/include/net-snmp"
+               SNMP_INCLUDES="${SNMP_INCLUDES} -I/usr/local/include/net-snmp"
                LIBS="${LIBS} -L/usr/local/lib -lnetsnmp"
                ;;
     esac
@@ -983,6 +983,8 @@ if test "${enable_snmp}" = "yes" -a "${HAVE_SNMP}" != "yes"; then
   AC_MSG_ERROR([--enable-snmp given, but cannot find support for SNMP])
 fi
 
+AC_SUBST(SNMP_INCLUDES)
+
 dnl ----------------------------
 dnl check sa_len of sockaddr
 dnl ----------------------------
@@ -1280,7 +1282,7 @@ host operationg system  : ${host_os}
 source code location    : ${srcdir}
 compiler                : ${CC}
 compiler flags          : ${CFLAGS}
-includes                : ${INCLUDES}
+includes                : ${INCLUDES} ${SNMP_INCLUDES}
 linker flags            : ${LDFLAGS} ${LIBS}
 state file directory    : ${quagga_statedir}
 config file directory   : `eval echo \`echo ${sysconfdir}\``

diff --git a/isisd/Makefile.am b/isisd/Makefile.am
index a403321ebc260e6f2070a7f02c77558c5882f741..7993643dcc89bf4ebbf7f64ba9925dd080698106 100644 (file)
--- a/isisd/Makefile.am
+++ b/isisd/Makefile.am
@@ -1,7 +1,7 @@
 ## Process this file with automake to produce Makefile.in.
 
 # INCLUDES = @INCLUDES@ -I.. -I$(top_srcdir) -I$(top_srcdir)/lib -Itopology
-INCLUDES = @INCLUDES@ -I.. -I$(top_srcdir) -I$(top_srcdir)/lib 
+INCLUDES = @INCLUDES@ -I.. -I$(top_srcdir) -I$(top_srcdir)/lib
 DEFS = @DEFS@ -DSYSCONFDIR=\"$(sysconfdir)/\"
 INSTALL_SDATA=@INSTALL@ -m 600
 LIBS = @LIBS@ 

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 4709b34a2cbca0e1a8c5ee1d98e01e919f14af60..bc321b68fcfe0e0f4dcf49a95bc1f2d5dbc4dde3 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in.
 
-INCLUDES = @INCLUDES@ -I.. -I$(top_srcdir) -I$(top_srcdir)/lib
+INCLUDES = @INCLUDES@ -I.. -I$(top_srcdir) -I$(top_srcdir)/lib @SNMP_INCLUDES@
 DEFS = @DEFS@ -DSYSCONFDIR=\"$(sysconfdir)/\"
 
 lib_LTLIBRARIES = libzebra.la

diff --git a/ospf6d/Makefile.am b/ospf6d/Makefile.am
index cfdd93f26ff0a1cc8b65fa70d42e0bba9fbcfadc..ad8287136bc08d3fbe9c4dcd7376ea082e0a9776 100644 (file)
--- a/ospf6d/Makefile.am
+++ b/ospf6d/Makefile.am
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in.
 
-INCLUDES = @INCLUDES@ -I.. -I$(top_srcdir) -I$(top_srcdir)/lib
+INCLUDES = @INCLUDES@ -I.. -I$(top_srcdir) -I$(top_srcdir)/lib @SNMP_INCLUDES@
 DEFS = @DEFS@ -DSYSCONFDIR=\"$(sysconfdir)/\"
 INSTALL_SDATA=@INSTALL@ -m 600
 

diff --git a/ospfd/Makefile.am b/ospfd/Makefile.am
index fd03334ab4da4e138c0580dc76bea0c2046ae7fc..2e4d5c8e10cfa41ed178ba1fc6cd4ab1e7f124c3 100644 (file)
--- a/ospfd/Makefile.am
+++ b/ospfd/Makefile.am
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in.
 
-INCLUDES = @INCLUDES@ -I.. -I$(top_srcdir) -I$(top_srcdir)/lib
+INCLUDES = @INCLUDES@ -I.. -I$(top_srcdir) -I$(top_srcdir)/lib @SNMP_INCLUDES@
 DEFS = @DEFS@ $(LOCAL_OPTS) -DSYSCONFDIR=\"$(sysconfdir)/\"
 INSTALL_SDATA=@INSTALL@ -m 600
 

diff --git a/ripd/Makefile.am b/ripd/Makefile.am
index 49de7f5578724335b23694cd5657eed84642118a..dd51e341c2f6453ff14dd13b5924b1ba40b7b9ce 100644 (file)
--- a/ripd/Makefile.am
+++ b/ripd/Makefile.am
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in.
 
-INCLUDES = @INCLUDES@ -I.. -I$(top_srcdir) -I$(top_srcdir)/lib
+INCLUDES = @INCLUDES@ -I.. -I$(top_srcdir) -I$(top_srcdir)/lib @SNMP_INCLUDES@
 DEFS = @DEFS@ -DSYSCONFDIR=\"$(sysconfdir)/\"
 INSTALL_SDATA=@INSTALL@ -m 600
 

diff --git a/ripngd/Makefile.am b/ripngd/Makefile.am
index 6362e4e891d7aac501436baabafc998d4a81e359..ad1e27886afd52859639556b0294fd3660869d1a 100644 (file)
--- a/ripngd/Makefile.am
+++ b/ripngd/Makefile.am
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in.
 
-INCLUDES = @INCLUDES@ -I.. -I$(top_srcdir) -I$(top_srcdir)/lib
+INCLUDES = @INCLUDES@ -I.. -I$(top_srcdir) -I$(top_srcdir)/lib @SNMP_INCLUDES@
 DEFS = @DEFS@ -DSYSCONFDIR=\"$(sysconfdir)/\"
 INSTALL_SDATA=@INSTALL@ -m 600
 

diff --git a/zebra/Makefile.am b/zebra/Makefile.am
index f8a0f523d17065a371276fce24cb7a34b505ab80..7dc495e903e95843b69ff3c31ee192739b3bf0e1 100644 (file)
--- a/zebra/Makefile.am
+++ b/zebra/Makefile.am
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in.
 
-INCLUDES = @INCLUDES@ -I.. -I$(top_srcdir) -I$(top_srcdir)/lib
+INCLUDES = @INCLUDES@ -I.. -I$(top_srcdir) -I$(top_srcdir)/lib @SNMP_INCLUDES@
 DEFS = @DEFS@ -DSYSCONFDIR=\"$(sysconfdir)/\" -DMULTIPATH_NUM=@MULTIPATH_NUM@
 INSTALL_SDATA=@INSTALL@ -m 600