From 898d3f4b437ca1348abc1bbd036b0106c66a7ba6 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Eivind=20N=C3=A6ss?= <eivnaes@yahoo.com>
Date: Fri, 6 Aug 2021 16:46:43 -0700
Subject: [PATCH] Changing PLUGIN to PPP_WITH_PLUGINS for consistency
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Eivind Næss <eivnaes@yahoo.com>
---
 Makefile.am        |  2 +-
 configure.ac       |  4 ++--
 pppd/Makefile.am   |  2 +-
 pppd/options.c     | 10 +++++-----
 pppd/pppdconf.h.in |  2 +-
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 15b2d09..d7b376c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,7 +2,7 @@ ACLOCAL_AMFLAGS="-Im4"
 
 SUBDIRS = chat contrib pppd pppstats pppdump
 
-if WITH_PLUGINS
+if PPP_WITH_PLUGINS
 SUBDIRS += pppd/plugins
 endif
 
diff --git a/configure.ac b/configure.ac
index 04e0940..3e01cf2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -170,8 +170,8 @@ AM_COND_IF([PPP_WITH_TDB],
 AC_ARG_ENABLE([plugins],
     AS_HELP_STRING([--disable-plugins], [Disable support for loadable plugins]))
 AS_IF([test "x$enable_plugins" != "xno"],
-    AC_DEFINE([PLUGIN], 1, ["Have support for loadable plugins"]))
-AM_CONDITIONAL(WITH_PLUGINS, test "${enable_plugins}" != "no")
+    AC_DEFINE([PPP_WITH_PLUGINS], 1, ["Have support for loadable plugins"]))
+AM_CONDITIONAL(PPP_WITH_PLUGINS, test "${enable_plugins}" != "no")
 
 #
 # Disable EAP-TLS support
diff --git a/pppd/Makefile.am b/pppd/Makefile.am
index 738613d..d70dd26 100644
--- a/pppd/Makefile.am
+++ b/pppd/Makefile.am
@@ -107,7 +107,7 @@ pppd_LDFLAGS += $(PCAP_LDFLAGS)
 pppd_LIBS += $(PCAP_LIBS)
 endif
 
-if WITH_PLUGINS
+if PPP_WITH_PLUGINS
 pppd_CPPFLAGS += -DPPPD_PLUGIN_DIR='"@PPPD_PLUGIN_DIR@"'
 pppd_LIBS += -ldl
 if LINUX
diff --git a/pppd/options.c b/pppd/options.c
index dda3933..b35c059 100644
--- a/pppd/options.c
+++ b/pppd/options.c
@@ -54,7 +54,7 @@
 #include <syslog.h>
 #include <string.h>
 #include <pwd.h>
-#ifdef PLUGIN
+#ifdef PPP_WITH_PLUGINS
 #include <dlfcn.h>
 #endif
 
@@ -173,7 +173,7 @@ static int showversion(char **);
 static int showhelp(char **);
 static void usage(void);
 static int setlogfile(char **);
-#ifdef PLUGIN
+#ifdef PPP_WITH_PLUGINS
 static int loadplugin(char **);
 #endif
 
@@ -358,7 +358,7 @@ option_t general_options[] = {
       "Bundle name for multilink", OPT_PRIO },
 #endif /* PPP_WITH_MULTILINK */
 
-#ifdef PLUGIN
+#ifdef PPP_WITH_PLUGINS
     { "plugin", o_special, (void *)loadplugin,
       "Load a plug-in module into pppd", OPT_PRIV | OPT_A2LIST },
 #endif
@@ -1591,7 +1591,7 @@ setmodir(char **argv)
 }
 #endif
 
-#ifdef PLUGIN
+#ifdef PPP_WITH_PLUGINS
 static int
 loadplugin(char **argv)
 {
@@ -1644,7 +1644,7 @@ loadplugin(char **argv)
 	free(path);
     return 0;
 }
-#endif /* PLUGIN */
+#endif /* PPP_WITH_PLUGINS */
 
 /*
  * Set an environment variable specified by the user.
diff --git a/pppd/pppdconf.h.in b/pppd/pppdconf.h.in
index eeabcf4..dfad5b3 100644
--- a/pppd/pppdconf.h.in
+++ b/pppd/pppdconf.h.in
@@ -19,7 +19,7 @@
 #undef PPP_FILTER
 
 /* "Have support for loadable plugins" */
-#undef PLUGIN
+#undef PPP_WITH_PLUGINS
 
 /* "Limit sessions by maximum number of octets" */
 #undef MAXOCTETS
-- 
2.39.2