X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;f=pppd%2Foptions.c;h=dda3933169a7373e1d598637c6d909d51259feb7;hb=a83dce41e0260ef18e643c480d2e0af5cc6766ad;hp=d4906c9506239101c4556a3239817aab0d7a2006;hpb=72cf4afe3c7ef808bde3f5cea02cb631e2eb6fec;p=ppp.git diff --git a/pppd/options.c b/pppd/options.c index d4906c9..dda3933 100644 --- a/pppd/options.c +++ b/pppd/options.c @@ -131,7 +131,7 @@ int child_wait = 5; /* # seconds to wait for children at exit */ struct userenv *userenv_list; /* user environment variables */ int dfl_route_metric = -1; /* metric of the default route to set over the PPP link */ -#ifdef INET6 +#ifdef PPP_WITH_IPV6CP char path_ipv6up[MAXPATHLEN]; /* pathname of ipv6-up script */ char path_ipv6down[MAXPATHLEN]; /* pathname of ipv6-down script */ #endif @@ -335,7 +335,7 @@ option_t general_options[] = { "Set pathname of ip-down script", OPT_PRIV|OPT_STATIC, NULL, MAXPATHLEN }, -#ifdef INET6 +#ifdef PPP_WITH_IPV6CP { "ipv6-up-script", o_string, path_ipv6up, "Set pathname of ipv6-up script", OPT_PRIV|OPT_STATIC, NULL, MAXPATHLEN }, @@ -344,7 +344,7 @@ option_t general_options[] = { OPT_PRIV|OPT_STATIC, NULL, MAXPATHLEN }, #endif -#ifdef HAVE_MULTILINK +#ifdef PPP_WITH_MULTILINK { "multilink", o_bool, &multilink, "Enable multilink operation", OPT_PRIO | 1 }, { "mp", o_bool, &multilink, @@ -356,7 +356,7 @@ option_t general_options[] = { { "bundle", o_string, &bundle_name, "Bundle name for multilink", OPT_PRIO }, -#endif /* HAVE_MULTILINK */ +#endif /* PPP_WITH_MULTILINK */ #ifdef PLUGIN { "plugin", o_special, (void *)loadplugin,