From fe5aa56240a08ad6deca1cb3add56f39b7d3cee6 Mon Sep 17 00:00:00 2001
From: Antony Mee <eemynotna@gmail.com>
Date: Thu, 10 Aug 2006 10:10:17 +0000
Subject: [PATCH]   * Added some ifdef magic to handle VERSION or PPPD_VERSION
 being defined   * Changed -DVERSION to -DNM_VERSION in the CPPFLAGS   * Moved
 2.4.4 headers to the correct location

git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@1946 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
---
 vpn-daemons/pptp/src/Makefile.am                            | 2 +-
 vpn-daemons/pptp/src/external/2.4.3/pppd/patchlevel.h       | 2 +-
 vpn-daemons/pptp/src/external/2.4.4/{ => pppd}/fsm.h        | 0
 vpn-daemons/pptp/src/external/2.4.4/{ => pppd}/ipcp.h       | 0
 vpn-daemons/pptp/src/external/2.4.4/{ => pppd}/patchlevel.h | 0
 vpn-daemons/pptp/src/external/2.4.4/{ => pppd}/pppd.h       | 0
 vpn-daemons/pptp/src/nm-pppd-plugin.c                       | 6 ++++++
 7 files changed, 8 insertions(+), 2 deletions(-)
 rename vpn-daemons/pptp/src/external/2.4.4/{ => pppd}/fsm.h (100%)
 rename vpn-daemons/pptp/src/external/2.4.4/{ => pppd}/ipcp.h (100%)
 rename vpn-daemons/pptp/src/external/2.4.4/{ => pppd}/patchlevel.h (100%)
 rename vpn-daemons/pptp/src/external/2.4.4/{ => pppd}/pppd.h (100%)

diff --git a/vpn-daemons/pptp/src/Makefile.am b/vpn-daemons/pptp/src/Makefile.am
index 77e85b9fb1..d5c82e0c48 100644
--- a/vpn-daemons/pptp/src/Makefile.am
+++ b/vpn-daemons/pptp/src/Makefile.am
@@ -12,7 +12,7 @@ AM_CPPFLAGS =							\
 	-DBINDIR=\"$(bindir)\"					\
 	-DPREFIX=\""$(prefix)"\"				\
 	-DSYSCONFDIR=\""$(sysconfdir)"\"			\
-	-DVERSION="\"$(VERSION)\""				\
+	-DNM_VERSION="\"$(VERSION)\""				\
 	-DLIBDIR=\""$(libdir)"\"				\
 	-DLIBEXECDIR=\""$(libexecdir)"\"			\
 	-DLOCALSTATEDIR=\""$(localstatedir)"\"		 	\
diff --git a/vpn-daemons/pptp/src/external/2.4.3/pppd/patchlevel.h b/vpn-daemons/pptp/src/external/2.4.3/pppd/patchlevel.h
index d9aaa4a702..f36d37f9cf 100644
--- a/vpn-daemons/pptp/src/external/2.4.3/pppd/patchlevel.h
+++ b/vpn-daemons/pptp/src/external/2.4.3/pppd/patchlevel.h
@@ -1,4 +1,4 @@
 /* $Id$ */
 
-#define PPPD_VERSION		"2.4.3"
+#define VERSION		"2.4.3"
 #define DATE		"13 November 2004"
diff --git a/vpn-daemons/pptp/src/external/2.4.4/fsm.h b/vpn-daemons/pptp/src/external/2.4.4/pppd/fsm.h
similarity index 100%
rename from vpn-daemons/pptp/src/external/2.4.4/fsm.h
rename to vpn-daemons/pptp/src/external/2.4.4/pppd/fsm.h
diff --git a/vpn-daemons/pptp/src/external/2.4.4/ipcp.h b/vpn-daemons/pptp/src/external/2.4.4/pppd/ipcp.h
similarity index 100%
rename from vpn-daemons/pptp/src/external/2.4.4/ipcp.h
rename to vpn-daemons/pptp/src/external/2.4.4/pppd/ipcp.h
diff --git a/vpn-daemons/pptp/src/external/2.4.4/patchlevel.h b/vpn-daemons/pptp/src/external/2.4.4/pppd/patchlevel.h
similarity index 100%
rename from vpn-daemons/pptp/src/external/2.4.4/patchlevel.h
rename to vpn-daemons/pptp/src/external/2.4.4/pppd/patchlevel.h
diff --git a/vpn-daemons/pptp/src/external/2.4.4/pppd.h b/vpn-daemons/pptp/src/external/2.4.4/pppd/pppd.h
similarity index 100%
rename from vpn-daemons/pptp/src/external/2.4.4/pppd.h
rename to vpn-daemons/pptp/src/external/2.4.4/pppd/pppd.h
diff --git a/vpn-daemons/pptp/src/nm-pppd-plugin.c b/vpn-daemons/pptp/src/nm-pppd-plugin.c
index bc12a910fc..34fb4bae69 100644
--- a/vpn-daemons/pptp/src/nm-pppd-plugin.c
+++ b/vpn-daemons/pptp/src/nm-pppd-plugin.c
@@ -17,10 +17,16 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  *
  */
+
 #include "pppd/pppd.h"
 
 #include "pppd/fsm.h"
 #include "pppd/ipcp.h"
+#ifndef PPPD_VERSION
+  #ifdef VERSION
+    #define PPPD_VERSION VERSION
+  #endif
+#endif
 
 #include <sys/types.h>
 #include <unistd.h>