Changing INET6 to PPP_WITH_IPV6CP and adding configure option

[ppp.git] / pppd / pathnames.h

diff --git a/pppd/pathnames.h b/pppd/pathnames.h
index e8f6af22da724663f714d4c97b4792f7cc21c955..c14402bfcc14961a17d1b65d54e97bf165ed8504 100644 (file)
--- a/pppd/pathnames.h
+++ b/pppd/pathnames.h
@@ -1,31 +1,72 @@
 /*
  * define path names
- *
- * $Id: pathnames.h,v 1.10 1999/03/02 05:37:12 paulus Exp $
  */
+#include "pppdconf.h"
 
 #ifdef HAVE_PATHS_H
 #include <paths.h>
+#endif /* HAVE_PATHS_H */
 
-#else
-#define _PATH_VARRUN   "/etc/ppp/"
+#ifndef _PATH_DEVNULL
 #define _PATH_DEVNULL  "/dev/null"
 #endif
 
-#define _PATH_UPAPFILE         "/etc/ppp/pap-secrets"
-#define _PATH_CHAPFILE         "/etc/ppp/chap-secrets"
-#define _PATH_SYSOPTIONS "/etc/ppp/options"
-#define _PATH_IPUP     "/etc/ppp/ip-up"
-#define _PATH_IPDOWN   "/etc/ppp/ip-down"
-#define _PATH_AUTHUP   "/etc/ppp/auth-up"
-#define _PATH_AUTHDOWN "/etc/ppp/auth-down"
-#define _PATH_TTYOPT   "/etc/ppp/options."
-#define _PATH_CONNERRS "/etc/ppp/connect-errors"
-#define _PATH_USEROPT  ".ppprc"
-#define _PATH_PEERFILES        "/etc/ppp/peers/"
-#define _PATH_RESOLV   "/etc/ppp/resolv.conf"
-
-#ifdef IPX_CHANGE
-#define _PATH_IPXUP    "/etc/ppp/ipx-up"
-#define _PATH_IPXDOWN  "/etc/ppp/ipx-down"
-#endif /* IPX_CHANGE */
+#ifdef PPPD_RUNTIME_DIR
+#undef  _PATH_VARRUN
+#define _PATH_VARRUN   PPPD_RUNTIME_DIR "/"
+#endif
+
+#ifdef PPPD_LOGFILE_DIR
+#undef  _PATH_VARLOG
+#define _PATH_VARLOG    PPPD_LOGFILE_DIR
+#endif
+
+#ifdef PPPD_PLUGIN_DIR
+#define _PATH_PLUGIN    PPPD_PLUGIN_DIR
+#else
+#ifdef __STDC__
+#define _PATH_PLUGIN   DESTDIR "/lib/pppd/" VERSION
+#else  /* __STDC__ */
+#define _PATH_PLUGIN   "/usr/lib/pppd"
+#endif /* __STDC__ */
+#endif /* PPPD_PLUGIN_DIR */
+
+#ifndef _ROOT_PATH
+#define _ROOT_PATH
+#endif
+
+#define _PATH_UPAPFILE          _ROOT_PATH "/etc/ppp/pap-secrets"
+#define _PATH_CHAPFILE          _ROOT_PATH "/etc/ppp/chap-secrets"
+#define _PATH_SRPFILE   _ROOT_PATH "/etc/ppp/srp-secrets"
+
+#ifdef USE_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 */
+
+#define _PATH_SYSOPTIONS _ROOT_PATH "/etc/ppp/options"
+#define _PATH_IPUP      _ROOT_PATH "/etc/ppp/ip-up"
+#define _PATH_IPDOWN    _ROOT_PATH "/etc/ppp/ip-down"
+#define _PATH_IPPREUP   _ROOT_PATH "/etc/ppp/ip-pre-up"
+#define _PATH_AUTHUP    _ROOT_PATH "/etc/ppp/auth-up"
+#define _PATH_AUTHDOWN  _ROOT_PATH "/etc/ppp/auth-down"
+#define _PATH_TTYOPT    _ROOT_PATH "/etc/ppp/options."
+#define _PATH_CONNERRS  _ROOT_PATH _PATH_VARLOG "/connect-errors"
+#define _PATH_PEERFILES         _ROOT_PATH "/etc/ppp/peers/"
+#define _PATH_RESOLV    _ROOT_PATH "/etc/ppp/resolv.conf"
+
+#define _PATH_USEROPT   ".ppprc"
+#define        _PATH_PSEUDONYM  ".ppp_pseudonym"
+
+#ifdef PPP_WITH_IPV6CP
+#define _PATH_IPV6UP     _ROOT_PATH "/etc/ppp/ipv6-up"
+#define _PATH_IPV6DOWN   _ROOT_PATH "/etc/ppp/ipv6-down"
+#endif
+
+#ifdef __STDC__
+#define _PATH_PPPDB    _ROOT_PATH _PATH_VARRUN "pppd2.tdb"
+#else /* __STDC__ */
+#define _PATH_PPPDB    _PPP_VARRUN "pppd2.tdb"
+#endif /* __STDC__ */
+