sbin_PROGRAMS = pppd
dist_man8_MANS = pppd.8
-check_PROGRAMS = \
- utest_chap
+check_PROGRAMS =
-utest_chap_SOURCES = chap_ms.c pppcrypt.c utils.c
+utest_chap_SOURCES = chap_ms.c utils.c crypto_ms.c
utest_chap_CPPFLAGS = -DUNIT_TEST
utest_chap_LDFLAGS =
-TESTS = $(check_PROGRAMS)
+utest_peap_SOURCES = peap.c utils.c mppe.c
+utest_peap_CPPFLAGS = -DUNIT_TEST
+utest_peap_LDFLAGS =
+
+utest_crypto_SOURCES = crypto.c
+utest_crypto_CPPFLAGS = -DUNIT_TEST
+utest_crypto_LDFLAGS =
+
+utest_pppcrypt_SOURCES = crypto_ms.c
+utest_pppcrypt_CPPFLAGS = -DUNIT_TEST_MSCRYPTO
+utest_pppcrypt_LDFLAGS =
+
+check_PROGRAMS += utest_crypto
if WITH_SRP
sbin_PROGRAMS += srp-entry
pppd_include_HEADERS = \
cbcp.h \
ccp.h \
- chap-md5.h \
+ chap.h \
chap_ms.h \
- chap-new.h \
+ crypto.h \
+ crypto_ms.h \
eap.h \
- eap-tls.h \
ecp.h \
eui64.h \
fsm.h \
ipcp.h \
ipv6cp.h \
- ipxcp.h \
lcp.h \
magic.h \
- md4.h \
- md5.h \
mppe.h \
- pppdconf.h \
- patchlevel.h \
- pathnames.h \
- pppcrypt.h \
+ multilink.h \
pppd.h \
+ options.h \
+ pppdconf.h \
session.h \
- sha1.h \
- spinlock.h \
- tdb.h \
upap.h
+# Headers to be distributed, but not installed in /usr/include/pppd
+noinst_HEADERS = \
+ chap-md5.h \
+ crypto-priv.h \
+ eap-tls.h \
+ pathnames.h \
+ peap.h \
+ pppd-private.h \
+ spinlock.h \
+ tls.h \
+ tdb.h
+
pppd_SOURCES = \
auth.c \
ccp.c \
chap-md5.c \
- chap-new.c \
+ chap.c \
demand.c \
eap.c \
ecp.c \
upap.c \
utils.c
-pppd_CPPFLAGS = -I${top_srcdir}/include -DPPPD_RUNTIME_DIR='"@PPPD_RUNTIME_DIR@"' -DPPPD_LOGFILE_DIR='"@PPPD_LOGFILE_DIR@"'
+pppd_CPPFLAGS = -DSYSCONFDIR=\"${sysconfdir}\" -DLOCALSTATEDIR=\"${localstatedir}\" -DPPPD_RUNTIME_DIR='"@PPPD_RUNTIME_DIR@"' -DPPPD_LOGFILE_DIR='"@PPPD_LOGFILE_DIR@"'
pppd_LDFLAGS =
pppd_LIBS =
if LINUX
-pppd_SOURCES += sys-linux.c termios_linux.h
+pppd_SOURCES += sys-linux.c
+noinst_HEADERS += termios_linux.h
pppd_LIBS += $(CRYPT_LIBS) $(UTIL_LIBS)
endif
if SUNOS
pppd_SOURCES += sys-solaris.c
+pppd_CPPFLAGS += -I${top_srcdir}/include
pppd_LIBS += -lsocket -lnsl
endif
-if WITH_CHAPMS
-pppd_SOURCES += chap_ms.c
-pppd_SOURCES += pppcrypt.c
+if PPP_WITH_CHAPMS
+pppd_SOURCES += chap_ms.c crypto_ms.c
+check_PROGRAMS += utest_chap
+check_PROGRAMS += utest_pppcrypt
else
if WITH_SRP
-pppd_SOURCES += pppcrypt.c
+pppd_SOURCES += crypto_ms.c
+check_PROGRAMS += utest_pppcrypt
endif
endif
-if WITH_CBCP
+if PPP_WITH_CBCP
pppd_SOURCES += cbcp.c
endif
-if WITH_IPXCP
-pppd_SOURCES += ipxcp.c
-endif
-
-if WITH_MPPE
+if PPP_WITH_MPPE
pppd_SOURCES += mppe.c
endif
-if WITH_FILTER
+if PPP_WITH_FILTER
pppd_CPPFLAGS += $(PCAP_CFLAGS)
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
endif
endif
-if WITH_MULTILINK
+if PPP_WITH_MULTILINK
pppd_SOURCES += multilink.c
endif
-if WITH_TDB
+if PPP_WITH_TDB
pppd_SOURCES += tdb.c spinlock.c
endif
-if WITH_INET6
+if PPP_WITH_IPV6CP
pppd_SOURCES += ipv6cp.c eui64.c
endif
-if WITH_PAM
-pppd_LIBS += -lpam -ldl
-endif
-
-if WITH_EAPTLS
-pppd_SOURCES += eap-tls.c
+if PPP_WITH_PAM
+pppd_CPPFLAGS += $(PAM_CFLAGS)
+pppd_LIBS += $(PAM_LIBS) -ldl
+pppd_LDFLAGS += $(PAM_LDFLAGS)
endif
-if !WITH_OPENSSL
-pppd_SOURCES += md5.c md4.c sha1.c
-utest_chap_SOURCES += md5.c md4.c sha1.c
+if PPP_WITH_EAPTLS
+pppd_SOURCES += eap-tls.c tls.c
else
-pppd_CPPFLAGS += $(OPENSSL_INCLUDES)
-pppd_LDFLAGS += $(OPENSSL_LDFLAGS)
-
-utest_chap_CPPFLAGS += $(OPENSSL_INCLUDES)
-utest_chap_LDFLAGS += $(OPENSSL_LDFLAGS)
-utest_chap_LDADD = $(OPENSSL_LIBS)
-
-pppd_LIBS += $(OPENSSL_LIBS)
-if !OPENSSL_HAVE_SHA
-pppd_SOURCES += sha1.c
-utest_chap_SOURCES += sha1.c
+if PPP_WITH_PEAP
+pppd_SOURCES += tls.c
endif
-if !OPENSSL_HAVE_MD4
-pppd_SOURCES += md4.c
-utest_chap_SOURCES += md4.c
endif
-if !OPENSSL_HAVE_MD5
-pppd_SOURCES += md5.c
-utest_chap_SOURCES += md5.c
+
+if PPP_WITH_PEAP
+pppd_SOURCES += peap.c
+check_PROGRAMS += utest_peap
endif
+
+noinst_LTLIBRARIES = libppp_crypto.la
+libppp_crypto_la_SOURCES=crypto.c ppp-md5.c ppp-md4.c ppp-sha1.c ppp-des.c
+
+if PPP_WITH_OPENSSL
+libppp_crypto_la_CPPFLAGS=$(OPENSSL_INCLUDES)
+libppp_crypto_la_LDFLAGS=$(OPENSSL_LDFLAGS)
+libppp_crypto_la_LIBADD=$(OPENSSL_LIBS)
endif
+utest_peap_LDADD = libppp_crypto.la
+utest_chap_LDADD = libppp_crypto.la
+utest_crypto_LDADD = libppp_crypto.la
+utest_pppcrypt_LDADD = libppp_crypto.la
+
+pppd_LIBS += libppp_crypto.la
+
if WITH_SYSTEMD
-pppd_LIBS += -lsystemd
+pppd_CPPFLAGS += $(SYSTEMD_CFLAGS)
+pppd_LIBS += $(SYSTEMD_LIBS)
endif
if WITH_SRP
EXTRA_DIST = \
ppp.pam
+
+TESTS = $(check_PROGRAMS)
+