From 2d58228ecabb23b064e8a06e6241cf0d7e5ca785 Mon Sep 17 00:00:00 2001 From: hasso Date: Mon, 28 Mar 2005 15:29:07 +0000 Subject: * configure.ac, */Makefile.am: Fix previous commit. SNMP includes must be after lib/ includes in some systems. Introduce SNMP_INCLUDES for that. --- ChangeLog | 6 ++++++ bgpd/Makefile.am | 2 +- configure.ac | 14 ++++++++------ isisd/Makefile.am | 2 +- lib/Makefile.am | 2 +- ospf6d/Makefile.am | 2 +- ospfd/Makefile.am | 2 +- ripd/Makefile.am | 2 +- ripngd/Makefile.am | 2 +- zebra/Makefile.am | 2 +- 10 files changed, 22 insertions(+), 14 deletions(-) diff --git a/ChangeLog b/ChangeLog index f9c16ed98..d418bfc3a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2005-03-28 Hasso Tepper + + * 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 * configure.ac: Fix most of "Presents But Cannot Compiled" warnings diff --git a/bgpd/Makefile.am b/bgpd/Makefile.am index 842b007a4..86408b460 100644 --- 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 def16cbe3..508ba7d37 100755 --- a/configure.ac +++ b/configure.ac @@ -5,7 +5,7 @@ ## Copyright (c) 1996, 97, 98, 99, 2000 Kunihiro Ishiguro ## Portions Copyright (c) 2003 Paul Jakma ## -## $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 a403321eb..7993643dc 100644 --- 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 4709b34a2..bc321b68f 100644 --- 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 cfdd93f26..ad8287136 100644 --- 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 fd03334ab..2e4d5c8e1 100644 --- 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 49de7f557..dd51e341c 100644 --- 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 6362e4e89..ad1e27886 100644 --- 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 f8a0f523d..7dc495e90 100644 --- 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 -- cgit v1.2.3