* Moved the pppd headers to a directory based on the pppd version

and included some automake stuff to give a -I option for
    the correct directory.


git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@1927 4912f4e0-d625-0410-9fb7-b9a5a253dbdc

vpn-daemons/pptp/src/Makefile.am

@@ -1,4 +1,6 @@
-INCLUDES = -I${top_srcdir}  -I${top_srcdir}/utils -I${top_srcdir}/vpn-daemons/pptp
+INCLUDES = -I${top_srcdir}                  \
+           -I${top_srcdir}/utils            \
+           -I${top_srcdir}/vpn-daemons/pptp
 
 AM_CPPFLAGS =							\
 	$(DBUS_CFLAGS)						\
@@ -18,35 +20,38 @@ AM_CPPFLAGS =							\
 
 bin_PROGRAMS = nm-ppp-starter
 
-pppdplugindir = $(libdir)/pppd/2.4.3
+pppdplugindir = $(libdir)/pppd/$(PPPD_VERSION)
 pppdplugin_PROGRAMS = nm-pppd-plugin.so
 
-nm_ppp_starter_SOURCES =				\
+nm_ppp_starter_SOURCES =			\
 				nm-ppp-starter.c	\
 				nm-ppp-starter.h	\
-				nm-utils.c		\
-				nm-utils.h		\
-				pppd/fsm.h		\
-				pppd/ipcp.h		\
+				nm-utils.c			\
+				nm-utils.h			\
+				pppd/fsm.h			\
+				pppd/ipcp.h			\
 				pppd/patchlevel.h 	\
 				pppd/pppd.h
 
 
-nm_ppp_starter_LDADD = 						\
-				$(DBUS_LIBS)				\
-				$(GTHREAD_LIBS)
+nm_ppp_starter_LDADD = 				\
+				$(DBUS_LIBS)		\
+				$(GTHREAD_LIBS)            
 
 
+nm_pppd_plugin_so_CPPFLAGS = 		\
+				-I pppd/$(PPPD_VERSION)
+
 nm_pppd_plugin_so_SOURCES = 		\
-				nm-pppd-plugin.c  \
-				nm-pppd-plugin.h  \
+				nm-pppd-plugin.c 	\
+				nm-pppd-plugin.h  	\
 				nm-ppp-starter.h
 
 nm_pppd_plugin_so_LDFLAGS = 		\
 				-shared 
 
 nm_pppd_plugin_so_LDADD = 		\
-				$(DBUS_LIBS)				\
+				$(DBUS_LIBS)	\
 				$(GTHREAD_LIBS)
 
 CLEANFILES = *~

vpn-daemons/pptp/src/nm-pppd-plugin.c

@@ -17,10 +17,10 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  *
  */
-#include "pppd/pppd.h"
+#include "pppd.h"
 
-#include "pppd/fsm.h"
-#include "pppd/ipcp.h"
+#include "fsm.h"
+#include "ipcp.h"
 
 #include <sys/types.h>
 #include <unistd.h>