Changing CBCP_SUPPORT define to PPP_WITH_CBCP to be consistent.

Signed-off-by: Eivind Næss <eivnaes@yahoo.com>

diff --git a/configure.ac b/configure.ac
index 65e205494c2633420ccf2a6ec7618ccb7b43098d..04e094094c16c266bdbd6ee6ba99abee04207d6e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -110,9 +110,9 @@ AM_COND_IF([WITH_SYSTEMD],
 # Enable Callback Protocol Support, disabled by default
 AC_ARG_ENABLE([cbcp],
     AS_HELP_STRING([--enable-cbcp], [Enable Callback Protocol]))
-AM_CONDITIONAL(WITH_CBCP, test "x${enable_cbcp}" = "xyes")
-AM_COND_IF([WITH_CBCP],
-    AC_DEFINE([CBCP_SUPPORT], 1, [Have Callback Protocol support]))
+AM_CONDITIONAL(PPP_WITH_CBCP, test "x${enable_cbcp}" = "xyes")
+AM_COND_IF([PPP_WITH_CBCP],
+    AC_DEFINE([PPP_WITH_CBCP], 1, [Have Callback Protocol support]))
 
 #
 # Disable support for limiting session duration by maximum octets
@@ -155,7 +155,7 @@ AC_ARG_ENABLE([multilink],
     AS_HELP_STRING([--enable-multilink], [Enable multilink support]))
 AM_CONDITIONAL(PPP_WITH_MULTILINK, test "x${enable_multilink}" = "xyes")
 AM_COND_IF([PPP_WITH_MULTILINK],
-    AC_DEFINE([PPP_WITH__MULTILINK], 1, ["Have multilink support"]))
+    AC_DEFINE([PPP_WITH_MULTILINK], 1, ["Have multilink support"]))
 AS_IF([test "x${build_sunos}" = "xyes" && test "x${enable_multilink}" = "xyes"],
     [AC_MSG_ERROR([Multilink is not supported on SunOS])])
 

diff --git a/pppd/Makefile.am b/pppd/Makefile.am
index f06c46dfdb095d11b035b0fc4fe789f38bbb0f6b..738613df8fca6c3ea374c021af7ac00e8c850e0d 100644 (file)
--- a/pppd/Makefile.am
+++ b/pppd/Makefile.am
@@ -93,7 +93,7 @@ pppd_SOURCES += pppcrypt.c
 endif
 endif
 
-if WITH_CBCP
+if PPP_WITH_CBCP
 pppd_SOURCES += cbcp.c
 endif
 

diff --git a/pppd/auth.c b/pppd/auth.c
index 7ce6baf288f2786c276c0e5a700e3c1983487e7d..c6e234417018ba5cb46eb3dd42ee867ee7048bfe 100644 (file)
--- a/pppd/auth.c
+++ b/pppd/auth.c
@@ -125,7 +125,7 @@
 #ifdef USE_EAPTLS
 #include "eap-tls.h"
 #endif
-#ifdef CBCP_SUPPORT
+#ifdef PPP_WITH_CBCP
 #include "cbcp.h"
 #endif
 #include "pathnames.h"
@@ -906,7 +906,7 @@ network_phase(int unit)
        }
     }
 
-#ifdef CBCP_SUPPORT
+#ifdef PPP_WITH_CBCP
     /*
      * If we negotiated callback, do it now.
      */

diff --git a/pppd/main.c b/pppd/main.c
index dbf22ece7f699ce3953a757ded2e1c3eba31fc4b..84a58c465a2b1da1f9a5aabfe11646db6aa0998a 100644 (file)
--- a/pppd/main.c
+++ b/pppd/main.c
@@ -113,7 +113,7 @@
 #include "tdb.h"
 #endif
 
-#ifdef CBCP_SUPPORT
+#ifdef PPP_WITH_CBCP
 #include "cbcp.h"
 #endif
 
@@ -268,7 +268,7 @@ struct protent *protocols[] = {
     &lcp_protent,
     &pap_protent,
     &chap_protent,
-#ifdef CBCP_SUPPORT
+#ifdef PPP_WITH_CBCP
     &cbcp_protent,
 #endif
     &ipcp_protent,

diff --git a/pppd/pppdconf.h.in b/pppd/pppdconf.h.in
index b607c6c4be91b903508459456e1fa23e4239af89..eeabcf4697f0e18706193fd0dd3c12c1d0872b51 100644 (file)
--- a/pppd/pppdconf.h.in
+++ b/pppd/pppdconf.h.in
@@ -25,7 +25,7 @@
 #undef MAXOCTETS
 
 /* Have Microsoft Callback Protocol support */
-#undef CBCP_SUPPORT
+#undef PPP_WITH_CBCP
 
 /* "Include Trivial Database support" */
 #undef PPP_WITH_TDB