From 6c1485d6aefdbf5d9526b058f5f495ff28970f96 Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Wed, 3 Sep 2008 17:04:10 +0000
Subject: [PATCH] check ENABLE_LOWLEVEL_PPDEV rather than HAVE_LINUX_PPDEV_H so
 that the driver gets disabled according to the configure flag rather than the
 header check

git-svn-id: https://urjtag.svn.sourceforge.net/svnroot/urjtag/trunk@1347 b68d4a1b-bc3d-0410-92ed-d4ac073336b7
---
 jtag/ChangeLog                       | 6 ++++++
 jtag/src/tap/cable/generic_parport.c | 6 +++---
 jtag/src/tap/cable/wiggler.c         | 6 +++---
 jtag/src/tap/parport/ppdev.c         | 4 ++--
 4 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/jtag/ChangeLog b/jtag/ChangeLog
index ecdd83e6..01a1ceaa 100644
--- a/jtag/ChangeLog
+++ b/jtag/ChangeLog
@@ -1,3 +1,9 @@
+2008-09-03  Mike Frysinger  <vapier@gentoo.org>
+
+   * src/tap/parport/ppdev.c, src/tap/cable/wiggler.c,
+     src/tap/cable/generic_parport.c: Change HAVE_LINUX_PPDEV_H to
+     ENABLE_LOWLEVEL_PPDEV.
+
 2008-08-27  Arnim Laeuger  <arniml@users.sourceforge.net>
 
    * include/Makefile.am, include/bsdl.h, include/bsdl_mode.h,
diff --git a/jtag/src/tap/cable/generic_parport.c b/jtag/src/tap/cable/generic_parport.c
index 45e3d6c9..e2dbe782 100644
--- a/jtag/src/tap/cable/generic_parport.c
+++ b/jtag/src/tap/cable/generic_parport.c
@@ -110,7 +110,7 @@ generic_parport_help( const char *cablename )
 {
 	printf( _(
 		"Usage: cable %s parallel PORTADDR\n"
-#if HAVE_LINUX_PPDEV_H
+#if ENABLE_LOWLEVEL_PPDEV
 		"   or: cable %s ppdev PPDEV\n"
 #endif
 #if HAVE_DEV_PPBUS_PPI_H
@@ -118,7 +118,7 @@ generic_parport_help( const char *cablename )
 #endif
 		"\n"
 		"PORTADDR   parallel port address (e.g. 0x378)\n"
-#if HAVE_LINUX_PPDEV_H
+#if ENABLE_LOWLEVEL_PPDEV
 		"PPDEF      ppdev device (e.g. /dev/parport0)\n"
 #endif
 #if HAVE_DEV_PPBUS_PPI_H
@@ -126,7 +126,7 @@ generic_parport_help( const char *cablename )
 #endif
 		"\n"
 	),
-#if HAVE_LINUX_PPDEV_H
+#if ENABLE_LOWLEVEL_PPDEV
     cablename,
 #endif
 #if HAVE_DEV_PPBUS_PPI_H
diff --git a/jtag/src/tap/cable/wiggler.c b/jtag/src/tap/cable/wiggler.c
index e49f76c0..94ac008a 100644
--- a/jtag/src/tap/cable/wiggler.c
+++ b/jtag/src/tap/cable/wiggler.c
@@ -304,7 +304,7 @@ wiggler_help( const char *cablename )
 {
 	printf( _(
 		"Usage: cable %s parallel PORTADDR [TDO,TRST,TDI,TCK,TMS,SRESET]\n"
-#if HAVE_LINUX_PPDEV_H
+#if ENABLE_LOWLEVEL_PPDEV
 		"   or: cable %s ppdev PPDEV [TDO,TRST,TDI,TCK,TMS,SRESET]\n"
 #endif
 #if HAVE_DEV_PPBUS_PPI_H
@@ -312,7 +312,7 @@ wiggler_help( const char *cablename )
 #endif
 		"\n"
 		"PORTADDR   parallel port address (e.g. 0x378)\n"
-#if HAVE_LINUX_PPDEV_H
+#if ENABLE_LOWLEVEL_PPDEV
 		"PPDEF      ppdev device (e.g. /dev/parport0)\n"
 #endif
 #if HAVE_DEV_PPBUS_PPI_H
@@ -322,7 +322,7 @@ wiggler_help( const char *cablename )
 		"           default is '%s'\n"
 		"\n"
 	),
-#if HAVE_LINUX_PPDEV_H
+#if ENABLE_LOWLEVEL_PPDEV
     cablename,
 #endif
 #if HAVE_DEV_PPBUS_PPI_H
diff --git a/jtag/src/tap/parport/ppdev.c b/jtag/src/tap/parport/ppdev.c
index 6df2dfef..29be0610 100644
--- a/jtag/src/tap/parport/ppdev.c
+++ b/jtag/src/tap/parport/ppdev.c
@@ -25,7 +25,7 @@
 
 #include "sysdep.h"
 
-#ifdef HAVE_LINUX_PPDEV_H
+#ifdef ENABLE_LOWLEVEL_PPDEV
 
 #include <fcntl.h>
 #ifdef HAVE_STROPTS_H
@@ -235,4 +235,4 @@ parport_driver_t ppdev_parport_driver = {
 	ppdev_set_control
 };
 
-#endif /* HAVE_LINUX_PPDEV_H */
+#endif /* ENABLE_LOWLEVEL_PPDEV */