debianpkg: Always build FPM module

- FPM is a module since 3.0. Always build it and allow user choice to enable or disable it

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>

diff --git a/debianpkg/backports/ubuntu12.04/debian/rules b/debianpkg/backports/ubuntu12.04/debian/rules
index d44a0c518c8bb54774cf7066c774cfe33df713b4..7cafadcc49c05f1b7346f710f68f8c74921cbcd0 100755 (executable)
--- a/debianpkg/backports/ubuntu12.04/debian/rules
+++ b/debianpkg/backports/ubuntu12.04/debian/rules
@@ -11,7 +11,6 @@
 #   export WANT_PIM=1
 #   export WANT_OSPFAPI=1
 #   export WANT_TCP_ZEBRA=0
-#   export WANT_FPM=0
 #   export WANT_BGP_VNC=0
 #   export WANT_CUMULUS_MODE=0
 #   export WANT_MULTIPATH=1
@@ -56,16 +55,6 @@ else
   USE_OSPFAPI=--enable-ospfapi=no
 endif
 
-ifeq ($(WANT_FPM), 1)
-  USE_FPM=---enable-fpm
-  ifneq ($(WANT_TCP_ZEBRA),1)
-    $(warning "Zebra TCP interface enabled for FPM (requirement for FPM)")
-    export WANT_TCP_ZEBRA=1
-  endif
-else
-  USE_FPM=--disable-fpm
-endif
-
 ifeq ($(WANT_TCP_ZEBRA),1)
   USE_TCP_ZEBRA=--enable-tcp-zebra
 endif
@@ -137,7 +126,7 @@ override_dh_auto_configure:
                $(USE_MULTIPATH) \
                $(USE_LDP) \
                $(USE_TCP_ZEBRA) \
-               $(USE_FPM) \
+               --enable-fpm \
                $(USE_FRR_USER) $(USE_FRR_GROUP) \
                $(USE_FRR_VTY_GROUP) \
                --enable-configfile-mask=0640 \

diff --git a/debianpkg/backports/ubuntu14.04/debian/rules b/debianpkg/backports/ubuntu14.04/debian/rules
index b649335188b3a228b529d81cb77b769ccd9802a6..4d9a22046cac4f18a63eb7a9dedc0865581e7323 100755 (executable)
--- a/debianpkg/backports/ubuntu14.04/debian/rules
+++ b/debianpkg/backports/ubuntu14.04/debian/rules
@@ -11,7 +11,6 @@
 #   export WANT_PIM=1
 #   export WANT_OSPFAPI=1
 #   export WANT_TCP_ZEBRA=0
-#   export WANT_FPM=0
 #   export WANT_BGP_VNC=0
 #   export WANT_CUMULUS_MODE=0
 #   export WANT_MULTIPATH=1
@@ -56,16 +55,6 @@ else
   USE_OSPFAPI=--enable-ospfapi=no
 endif
 
-ifeq ($(WANT_FPM), 1)
-  USE_FPM=---enable-fpm
-  ifneq ($(WANT_TCP_ZEBRA),1)
-    $(warning "Zebra TCP interface enabled for FPM (requirement for FPM)")
-    export WANT_TCP_ZEBRA=1
-  endif
-else
-  USE_FPM=--disable-fpm
-endif
-
 ifeq ($(WANT_TCP_ZEBRA),1)
   USE_TCP_ZEBRA=--enable-tcp-zebra
 endif
@@ -137,7 +126,7 @@ override_dh_auto_configure:
                $(USE_MULTIPATH) \
                $(USE_LDP) \
                $(USE_TCP_ZEBRA) \
-               $(USE_FPM) \
+               --enable-fpm \
                $(USE_FRR_USER) $(USE_FRR_GROUP) \
                $(USE_FRR_VTY_GROUP) \
                --enable-configfile-mask=0640 \

diff --git a/debianpkg/rules b/debianpkg/rules
index 413a664014cf918040b4f41f591cbb72fe395fb5..fb5512bac90d564708b00d73ecd774bd595dad2c 100755 (executable)
--- a/debianpkg/rules
+++ b/debianpkg/rules
@@ -11,7 +11,6 @@
 #   export WANT_PIM=1
 #   export WANT_OSPFAPI=1
 #   export WANT_TCP_ZEBRA=0
-#   export WANT_FPM=0
 #   export WANT_BGP_VNC=0
 #   export WANT_CUMULUS_MODE=0
 #   export WANT_MULTIPATH=1
@@ -56,16 +55,6 @@ else
   USE_OSPFAPI=--enable-ospfapi=no
 endif
 
-ifeq ($(WANT_FPM), 1)
-  USE_FPM=---enable-fpm
-  ifneq ($(WANT_TCP_ZEBRA),1)
-    $(warning "Zebra TCP interface enabled for FPM (requirement for FPM)")
-    export WANT_TCP_ZEBRA=1
-  endif
-else
-  USE_FPM=--disable-fpm
-endif
-
 ifeq ($(WANT_TCP_ZEBRA),1)
   USE_TCP_ZEBRA=--enable-tcp-zebra
 endif
@@ -137,7 +126,7 @@ override_dh_auto_configure:
                $(USE_MULTIPATH) \
                $(USE_LDP) \
                $(USE_TCP_ZEBRA) \
-               $(USE_FPM) \
+               --enable-fpm \
                $(USE_FRR_USER) $(USE_FRR_GROUP) \
                $(USE_FRR_VTY_GROUP) \
                --enable-configfile-mask=0640 \