summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Williams <dcbw@redhat.com>2007-07-26 13:28:11 +0000
committerDan Williams <dcbw@redhat.com>2007-07-26 13:28:11 +0000
commit7ee937c7ac0b01ccc46c94e308097a1a5fa16843 (patch)
treee14ae46a7bc6a80788ceab5bc45cc06264a8161c
parent3d7b0e5b4723ff9b6d5d452ccc821ddd7a3049ee (diff)
downloadNetworkManager-7ee937c7ac0b01ccc46c94e308097a1a5fa16843.tar.gz
2007-07-26 Dan Williams <dcbw@redhat.com>
Patch from Robert Buchholz <rbu@gentoo.org> * src/Makefile.am - Fix for new pppd files layout (#454741) git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@2640 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
-rw-r--r--vpn-daemons/pptp/ChangeLog7
-rw-r--r--vpn-daemons/pptp/src/Makefile.am17
2 files changed, 19 insertions, 5 deletions
diff --git a/vpn-daemons/pptp/ChangeLog b/vpn-daemons/pptp/ChangeLog
index 93e163aeac..6bcfb360bb 100644
--- a/vpn-daemons/pptp/ChangeLog
+++ b/vpn-daemons/pptp/ChangeLog
@@ -1,3 +1,10 @@
+2007-07-26 Dan Williams <dcbw@redhat.com>
+
+ Patch from Robert Buchholz <rbu@gentoo.org>
+
+ * src/Makefile.am
+ - Fix for new pppd files layout (#454741)
+
2007-06-21 Christopher Aillon <caillon@redhat.com>
* nm-ppp-starter.name.in:
diff --git a/vpn-daemons/pptp/src/Makefile.am b/vpn-daemons/pptp/src/Makefile.am
index 94cbde592f..54cb3384cf 100644
--- a/vpn-daemons/pptp/src/Makefile.am
+++ b/vpn-daemons/pptp/src/Makefile.am
@@ -31,11 +31,18 @@ nm_ppp_starter_SOURCES = \
nm-ppp-starter.h \
nm-utils.c \
nm-utils.h \
- pppd/fsm.h \
- pppd/ipcp.h \
- pppd/patchlevel.h \
- pppd/pppd.h
-
+ external/2.4.3/pppd/patchlevel.h \
+ external/2.4.3/pppd/ipcp.h \
+ external/2.4.3/pppd/pppd.h \
+ external/2.4.3/pppd/fsm.h \
+ external/2.4.4/pppd/patchlevel.h \
+ external/2.4.4/pppd/ipcp.h \
+ external/2.4.4/pppd/pppd.h \
+ external/2.4.4/pppd/fsm.h \
+ external/2.4.4b1/pppd/patchlevel.h \
+ external/2.4.4b1/pppd/ipcp.h \
+ external/2.4.4b1/pppd/pppd.h \
+ external/2.4.4b1/pppd/fsm.h
nm_ppp_starter_LDADD = \
$(DBUS_LIBS) \