X-Git-Url: https://git.ozlabs.org/?p=ppp.git;a=blobdiff_plain;f=pppd%2FMakefile.am;h=233685350463036cf664eae7977eb5f312de6b37;hp=9675208fd847213c40a093348ef67935c566e7df;hb=bdd34ab1f2f87acb23c6d92feee7354ac53005ff;hpb=a83dce41e0260ef18e643c480d2e0af5cc6766ad

diff --git a/pppd/Makefile.am b/pppd/Makefile.am
index 9675208..2336853 100644
--- a/pppd/Makefile.am
+++ b/pppd/Makefile.am
@@ -37,7 +37,7 @@ pppd_include_HEADERS = \
     md4.h \
     md5.h \
     mppe.h \
-    patchlevel.h \
+    pppdconf.h \
     pathnames.h \
     peap.h \
     pppcrypt.h \
@@ -93,7 +93,7 @@ pppd_SOURCES += pppcrypt.c
 endif
 endif
 
-if WITH_CBCP
+if PPP_WITH_CBCP
 pppd_SOURCES += cbcp.c
 endif
 
@@ -101,13 +101,13 @@ 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
@@ -119,7 +119,7 @@ if PPP_WITH_MULTILINK
 pppd_SOURCES += multilink.c
 endif
 
-if WITH_TDB
+if PPP_WITH_TDB
 pppd_SOURCES += tdb.c spinlock.c
 endif
 
@@ -127,19 +127,21 @@ if PPP_WITH_IPV6CP
 pppd_SOURCES += ipv6cp.c eui64.c
 endif
 
-if WITH_PAM
-pppd_LIBS += -lpam -ldl
+if PPP_WITH_PAM
+pppd_CPPFLAGS += $(PAM_CFLAGS)
+pppd_LIBS += $(PAM_LIBS) -ldl
+pppd_LDFLAGS += $(PAM_LDFLAGS)
 endif
 
-if WITH_EAPTLS
+if PPP_WITH_EAPTLS
 pppd_SOURCES += eap-tls.c tls.c
 else
-if WITH_PEAP
+if PPP_WITH_PEAP
 pppd_SOURCES += tls.c
 endif
 endif
 
-if WITH_PEAP
+if PPP_WITH_PEAP
 pppd_SOURCES += peap.c
 check_PROGRAMS += utest_peap
 endif
@@ -169,7 +171,8 @@ utest_chap_LDADD = libppp_crypt.la
 pppd_LIBS += libppp_crypt.la
 
 if WITH_SYSTEMD
-pppd_LIBS += -lsystemd
+pppd_CPPFLAGS += $(SYSTEMD_CFLAGS)
+pppd_LIBS += $(SYSTEMD_LIBS)
 endif
 
 if WITH_SRP