X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;f=pppd%2Fpathnames.h;h=57a130e1c2e3b4278226366aa2c9c58e2edcd87e;hb=607d8eadccfd62c1fa84a36bd1440bd48b4e55ca;hp=e68d91a15f067385d215764feb233f34adab0b6f;hpb=ab4d4992050ec171e1c72d661a3457efc8e7c141;p=ppp.git

diff --git a/pppd/pathnames.h b/pppd/pathnames.h
index e68d91a..57a130e 100644
--- a/pppd/pathnames.h
+++ b/pppd/pathnames.h
@@ -1,6 +1,9 @@
 /*
  * define path names
  */
+#ifndef PPP_PATHNAMES_H
+#define PPP_PATHNAMES_H
+
 #include "pppdconf.h"
 
 #ifdef HAVE_PATHS_H
@@ -39,11 +42,11 @@
 #define _PATH_CHAPFILE 	 _ROOT_PATH "/etc/ppp/chap-secrets"
 #define _PATH_SRPFILE 	 _ROOT_PATH "/etc/ppp/srp-secrets"
 
-#ifdef USE_EAPTLS
+#ifdef PPP_WITH_EAPTLS
 #define _PATH_EAPTLSCLIFILE	_ROOT_PATH "/etc/ppp/eaptls-client"
 #define _PATH_EAPTLSSERVFILE	_ROOT_PATH "/etc/ppp/eaptls-server"
 #define _PATH_OPENSSLCONFFILE	_ROOT_PATH "/etc/ppp/openssl.cnf"
-#endif /* USE_EAPTLS */
+#endif /* PPP_WITH_EAPTLS */
 
 #define _PATH_SYSOPTIONS _ROOT_PATH "/etc/ppp/options"
 #define _PATH_IPUP	 _ROOT_PATH "/etc/ppp/ip-up"
@@ -59,19 +62,15 @@
 #define _PATH_USEROPT	 ".ppprc"
 #define	_PATH_PSEUDONYM	 ".ppp_pseudonym"
 
-#ifdef INET6
+#ifdef PPP_WITH_IPV6CP
 #define _PATH_IPV6UP     _ROOT_PATH "/etc/ppp/ipv6-up"
 #define _PATH_IPV6DOWN   _ROOT_PATH "/etc/ppp/ipv6-down"
 #endif
 
-#ifdef IPX_CHANGE
-#define _PATH_IPXUP	 _ROOT_PATH "/etc/ppp/ipx-up"
-#define _PATH_IPXDOWN	 _ROOT_PATH "/etc/ppp/ipx-down"
-#endif /* IPX_CHANGE */
-
 #ifdef __STDC__
 #define _PATH_PPPDB	_ROOT_PATH _PATH_VARRUN "pppd2.tdb"
 #else /* __STDC__ */
 #define _PATH_PPPDB	_PPP_VARRUN "pppd2.tdb"
 #endif /* __STDC__ */
 
+#endif /* PPP_PATHNAMES_H */