* 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

@@ -12,7 +12,7 @@ AM_CPPFLAGS =							\
 	-DBINDIR=\"$(bindir)\"					\
 	-DPREFIX=\""$(prefix)"\"				\
 	-DSYSCONFDIR=\""$(sysconfdir)"\"			\
-	-DVERSION="\"$(VERSION)\""				\
+	-DNM_VERSION="\"$(VERSION)\""				\
 	-DLIBDIR=\""$(libdir)"\"				\
 	-DLIBEXECDIR=\""$(libexecdir)"\"			\
 	-DLOCALSTATEDIR=\""$(localstatedir)"\"		 	\

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"

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>