Fixup in merge/rebase, had to remove duplicate use of pppdconf.h

[ppp.git] / pppd / Makefile.am

diff --git a/pppd/Makefile.am b/pppd/Makefile.am
index 3607f574aa4f56f9377752d1b55449eaa9907a12..c316ea44d4b03c62c4891b986a6923a2b37e0f53 100644 (file)
--- a/pppd/Makefile.am
+++ b/pppd/Makefile.am
@@ -37,7 +37,6 @@ pppd_include_HEADERS = \
     md4.h \
     md5.h \
     mppe.h \
-    patchlevel.h \
     pathnames.h \
     peap.h \
     pppcrypt.h \
@@ -127,19 +126,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 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 +170,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