From 7a6da5bad3be23d6d6d7f98e6e81450d16a0c7a1 Mon Sep 17 00:00:00 2001
From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Tue, 8 Dec 2015 15:34:04 +0000
Subject: [PATCH] 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>
---
 bgpd/Makefile.am  | 2 +-
 configure.ac      | 8 ++++----
 zebra/Makefile.am | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/bgpd/Makefile.am b/bgpd/Makefile.am
index f6162696d4..227aa8c6c2 100644
--- 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 40c11e7fb7..4d9007d06b 100755
--- 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 1526a9772a..8253664e7a 100644
--- 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@
-- 
2.39.5