From 315587efa4875fae3a899a18d62d9ad3eb6e094c Mon Sep 17 00:00:00 2001
From: Vincent Bernat <vbernat@wanadooportails.com>
Date: Tue, 25 Nov 2008 16:16:39 +0100
Subject: [PATCH] Move at the bottom of configure.ac the instructions to
 conditionaly compile additional protocols

---
 configure.ac | 90 ++++++++++++++++++++++++++--------------------------
 1 file changed, 45 insertions(+), 45 deletions(-)

diff --git a/configure.ac b/configure.ac
index 222941dc..db13cb9c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,51 +11,6 @@ AC_CONFIG_FILES([Makefile src/Makefile man/Makefile])
 # Checks for programs.
 AC_PROG_CC
 
-# Options
-AC_ARG_ENABLE(cdp, AC_HELP_STRING([--enable-cdp],
-		   [Enable Cisco Discovery Protocol]),
-	      [enable_cdp=$enableval],[enable_cdp=yes])
-AC_MSG_CHECKING(whether to enable CDP)
-if test x$enable_cdp = xyes; then
-	AC_MSG_RESULT(yes)
-	AC_DEFINE([ENABLE_CDP],, [Enable Cisco Discovery Protocol])
-else
-	AC_MSG_RESULT(no)
-fi
-
-AC_ARG_ENABLE(fdp, AC_HELP_STRING([--enable-fdp],
-		   [Enable Foundry Discovery Protocol]),
-	      [enable_fdp=$enableval],[enable_fdp=yes])
-AC_MSG_CHECKING(whether to enable FDP)
-if test x$enable_fdp = xyes; then
-	AC_MSG_RESULT(yes)
-	AC_DEFINE([ENABLE_FDP],, [Enable Foundry Discovery Protocol])
-else
-	AC_MSG_RESULT(no)
-fi
-
-AC_ARG_ENABLE(edp, AC_HELP_STRING([--enable-edp],
-		   [Enable Extreme Discovery Protocol]),
- 	      [enable_edp=$enableval],[enable_edp=yes])
-AC_MSG_CHECKING(whether to enable EDP)
-if test x$enable_edp = xyes; then
-	AC_MSG_RESULT(yes)
-	AC_DEFINE([ENABLE_EDP],, [Enable Extreme Discovery Protocol])
-else
-	AC_MSG_RESULT(no)
-fi
-
-AC_ARG_ENABLE(sonmp, AC_HELP_STRING([--enable-sonmp],
-		   [Enable SynOptics Network Management Protocol]),
-	      [enable_sonmp=$enableval],[enable_sonmp=yes])
-AC_MSG_CHECKING(whether to enable SONMP)
-if test x$enable_sonmp = xyes; then
-	AC_MSG_RESULT(yes)
-	AC_DEFINE([ENABLE_SONMP],, [Enable SynOptics Network Management Protocol])
-else
-	AC_MSG_RESULT(no)
-fi
-
 # Checks for libraries.
 AC_ARG_WITH(snmp,
   AC_HELP_STRING(
@@ -132,4 +87,49 @@ if test "${with_snmp}" != "no"; then
    fi
 fi
 
+# Options
+AC_ARG_ENABLE(cdp, AC_HELP_STRING([--enable-cdp],
+		   [Enable Cisco Discovery Protocol]),
+	      [enable_cdp=$enableval],[enable_cdp=yes])
+AC_MSG_CHECKING(whether to enable CDP)
+if test x$enable_cdp = xyes; then
+	AC_MSG_RESULT(yes)
+	AC_DEFINE([ENABLE_CDP],, [Enable Cisco Discovery Protocol])
+else
+	AC_MSG_RESULT(no)
+fi
+
+AC_ARG_ENABLE(fdp, AC_HELP_STRING([--enable-fdp],
+		   [Enable Foundry Discovery Protocol]),
+	      [enable_fdp=$enableval],[enable_fdp=yes])
+AC_MSG_CHECKING(whether to enable FDP)
+if test x$enable_fdp = xyes; then
+	AC_MSG_RESULT(yes)
+	AC_DEFINE([ENABLE_FDP],, [Enable Foundry Discovery Protocol])
+else
+	AC_MSG_RESULT(no)
+fi
+
+AC_ARG_ENABLE(edp, AC_HELP_STRING([--enable-edp],
+		   [Enable Extreme Discovery Protocol]),
+ 	      [enable_edp=$enableval],[enable_edp=yes])
+AC_MSG_CHECKING(whether to enable EDP)
+if test x$enable_edp = xyes; then
+	AC_MSG_RESULT(yes)
+	AC_DEFINE([ENABLE_EDP],, [Enable Extreme Discovery Protocol])
+else
+	AC_MSG_RESULT(no)
+fi
+
+AC_ARG_ENABLE(sonmp, AC_HELP_STRING([--enable-sonmp],
+		   [Enable SynOptics Network Management Protocol]),
+	      [enable_sonmp=$enableval],[enable_sonmp=yes])
+AC_MSG_CHECKING(whether to enable SONMP)
+if test x$enable_sonmp = xyes; then
+	AC_MSG_RESULT(yes)
+	AC_DEFINE([ENABLE_SONMP],, [Enable SynOptics Network Management Protocol])
+else
+	AC_MSG_RESULT(no)
+fi
+
 AC_OUTPUT
-- 
2.39.5