X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=pppd%2Fplugins%2Fradius%2FMakefile.am;h=3897e988bf49b851c6dc26d6777e380aeeb33589;hb=ba7f7e053daae846a54a1d08d3d133a5f1266ace;hp=5655ad58c27a4209ad695cb94a47841464fb1c0f;hpb=2883dd07101bf851e2ea368f0c04c91aea85cff2;p=ppp.git

diff --git a/pppd/plugins/radius/Makefile.am b/pppd/plugins/radius/Makefile.am
index 5655ad5..3897e98 100644
--- a/pppd/plugins/radius/Makefile.am
+++ b/pppd/plugins/radius/Makefile.am
@@ -2,7 +2,7 @@ pppd_plugin_LTLIBRARIES = radius.la radattr.la radrealms.la
 pppd_plugindir = $(PPPD_PLUGIN_DIR)
 
 noinst_LTLIBRARIES = libradiusclient.la
-man8_MANS = pppd-radius.8 pppd-radattr.8
+dist_man8_MANS = pppd-radius.8 pppd-radattr.8
 noinst_HEADERS = \
     includes.h \
     options.h \
@@ -25,41 +25,27 @@ EXTRA_ETC = \
     etc/realms \
     etc/servers
 
-RADIUS_CFLAGS = -I${top_srcdir}/include -I${top_srcdir}/pppd -DRC_LOG_FACILITY=LOG_DAEMON
-RADIUS_LDFLAGS = -module -avoid-version @LDFLAGS@
+RADIUS_CPPFLAGS = -I${top_srcdir} -DRC_LOG_FACILITY=LOG_DAEMON
+RADIUS_LDFLAGS = -module -avoid-version $(LDFLAGS)
 
-radius_la_CFLAGS = $(RADIUS_CFLAGS)
+radius_la_CPPFLAGS = $(RADIUS_CPPFLAGS)
 radius_la_LDFLAGS = $(RADIUS_LDFLAGS)
 radius_la_SOURCES = radius.c
 radius_la_LIBADD = libradiusclient.la
-if WITH_OPENSSL
-radius_la_LIBADD += @OPENSSL_LIBS@
-endif
 
-radattr_la_CFLAGS = $(RADIUS_CFLAGS)
+radattr_la_CPPFLAGS = $(RADIUS_CPPFLAGS)
 radattr_la_LDFLAGS = $(RADIUS_LDFLAGS)
 radattr_la_SOURCES = radattr.c
 
-radrealms_la_CFLAGS = $(RADIUS_CFLAGS)
+radrealms_la_CPPFLAGS = $(RADIUS_CPPFLAGS)
 radrealms_la_LDFLAGS = $(RADIUS_LDFLAGS)
 radrealms_la_SOURCES = radrealms.c
 
 libradiusclient_la_SOURCES = \
     avpair.c buildreq.c config.c dict.c ip_util.c \
-	clientid.c sendserver.c lock.c util.c
-libradiusclient_la_CFLAGS = $(RADIUS_CFLAGS)
-
-if !WITH_OPENSSL
-libradiusclient_la_SOURCES += md5.c
-else
-if OPENSSL_HAVE_MD5
-libradiusclient_la_SOURCES += md5.c
-else
-libradiusclient_la_CFLAGS += @OPENSSL_INCLUDES@
-endif
-endif
+	clientid.c sendserver.c lock.c util.c md5.c
+libradiusclient_la_CPPFLAGS = $(RADIUS_CPPFLAGS) -DSYSCONFDIR=\"${sysconfdir}\"
 
 EXTRA_DIST = \
-    $(man8_MANS) \
     $(EXTRA_FILES) \
     $(EXTRA_ETC)