Merge branch 'pppoe-discovery' of https://github.com/pali/ppp

Signed-off-by: Paul Mackerras <paulus@ozlabs.org>

diff --cc pppd/plugins/pppoe/Makefile.am
index e3c01cd054e9e03282ba2a9893b0bc9c9e4b3471,0000000000000000000000000000000000000000..0d70380a13893385dafcacc9aa8cd4b70505f62e
mode 100644,000000..100644
--- 1/pppd/plugins/pppoe/Makefile.am
--- /dev/null
+++ b/pppd/plugins/pppoe/Makefile.am
@@@ -1,14 -1,0 +1,14 @@@
- pppoe_discovery_SOURCES = pppoe-discovery.c debug.c
 +pppd_plugin_LTLIBRARIES = pppoe.la 
 +pppd_plugindir = $(PPPD_PLUGIN_DIR)
 +sbin_PROGRAMS = pppoe-discovery
 +dist_man8_MANS = pppoe-discovery.8
 +
 +noinst_HEADERS = \
 +    pppoe.h
 +
 +pppoe_la_CPPFLAGS = -I${top_srcdir} -I${top_srcdir}/include
 +pppoe_la_LDFLAGS = -module -avoid-version
 +pppoe_la_SOURCES = plugin.c discovery.c if.c common.c
 +
 +pppoe_discovery_CPPFLAGS = -I${top_srcdir} -I${top_srcdir}/include
++pppoe_discovery_SOURCES = pppoe-discovery.c discovery.c if.c common.c

diff --cc pppd/plugins/pppoe/common.c
Simple merge

diff --cc pppd/plugins/pppoe/discovery.c
Simple merge

diff --cc pppd/plugins/pppoe/plugin.c
Simple merge

diff --cc pppd/plugins/pppoe/pppoe-discovery.c
Simple merge

diff --cc pppd/plugins/pppoe/pppoe.h
Simple merge

diff --cc pppd/pppd.8
Simple merge