build: Make MULTIPATH_NUM a config.h value

MULTIPATH_NUM is setup inside of the Makefile.am DEFS to pass
in on the command line.  This fix moves the MULTIPATH_NUM
from there into config.h.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>

diff --git a/bgpd/Makefile.am b/bgpd/Makefile.am
index f6162696d46d83afed3c209763cddf0071354378..227aa8c6c2a4446a381375f25a0ffb04d68fe551 100644 (file)
--- a/bgpd/Makefile.am
+++ b/bgpd/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 -I$(top_builddir)/lib
-DEFS = @DEFS@ -DSYSCONFDIR=\"$(sysconfdir)/\" -DMULTIPATH_NUM=@MULTIPATH_NUM@
+DEFS = @DEFS@ -DSYSCONFDIR=\"$(sysconfdir)/\"
 INSTALL_SDATA=@INSTALL@ -m 600
 
 AM_CFLAGS = $(PICFLAGS) $(WERROR)

diff --git a/configure.ac b/configure.ac
index 40c11e7fb7cc7c32dec318e73788c56f337275c4..4d9007d06b5f4ee1ab99237f60c8387f072cc091 100755 (executable)
--- a/configure.ac
+++ b/configure.ac
@@ -412,14 +412,14 @@ AC_DEFINE_UNQUOTED(CONFIGFILE_MASK, ${enable_configfile_mask}, Mask for config f
 enable_logfile_mask=${enable_logfile_mask:-0600}
 AC_DEFINE_UNQUOTED(LOGFILE_MASK, ${enable_logfile_mask}, Mask for log files)
 
-MULTIPATH_NUM=1
+MPATH_NUM=1
 
 case "${enable_multipath}" in
   0)
-    MULTIPATH_NUM=64
+    MPATH_NUM=64
     ;;
   [[1-9]|[1-9][0-9]])
-    MULTIPATH_NUM="${enable_multipath}"
+    MPATH_NUM="${enable_multipath}"
     ;;
   "")
     ;;
@@ -428,7 +428,7 @@ case "${enable_multipath}" in
     ;;
 esac
 
-AC_SUBST(MULTIPATH_NUM)
+AC_DEFINE_UNQUOTED(MULTIPATH_NUM, $MPATH_NUM, Maximum number of paths for a route)
 
 dnl -----------------------------------
 dnl Add extra version string to package

diff --git a/zebra/Makefile.am b/zebra/Makefile.am
index 1526a9772a66c92d267703c43fee78ade2aaab55..8253664e7adef68ab11b315015629289b6b13c2b 100644 (file)
--- a/zebra/Makefile.am
+++ b/zebra/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 -I$(top_builddir)/lib
-DEFS = @DEFS@ -DSYSCONFDIR=\"$(sysconfdir)/\" -DMULTIPATH_NUM=@MULTIPATH_NUM@
+DEFS = @DEFS@ -DSYSCONFDIR=\"$(sysconfdir)/\"
 INSTALL_SDATA=@INSTALL@ -m 600
 
 LIB_IPV6 = @LIB_IPV6@