From c6e8e2ab532c8bb33ed0d8d35ec75cf1a38c5543 Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@fysast.uu.se>
Date: Wed, 24 Oct 2012 17:30:05 +0200
Subject: [PATCH] Unset VERSION during the SCSI header check

---
 ChangeLog    |  4 ++++
 configure    | 10 ++++++++++
 configure.in | 10 ++++++++++
 3 files changed, 24 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 1b8892c2f..5726c35b6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2012-10-24 Mattias Ellert <mattias.ellert@fysast.uu.se>
+	* configure.in, configure: Unset VERSION during the SCSI header check
+	  (Check fails on MacOS X if VERSION is defined)
+
 2012-10-22 Mattias Ellert <mattias.ellert@fysast.uu.se>
 	* po/sv.po: Updated Swedish translation
 	* backend/pixma_bjnp.c: Fix arguments to IPv6 macros
diff --git a/configure b/configure
index 9aecbcf46..13c2d3ad6 100755
--- a/configure
+++ b/configure
@@ -9855,6 +9855,11 @@ fi
 
 
 
+
+# Unset VERSION during the SCSI header check
+sed "s!^#define VERSION .*!/* & */!" confdefs.h >> confdefs.h.tmp
+mv confdefs.h.tmp confdefs.h
+
 for ac_header in IOKit/scsi/SCSITaskLib.h IOKit/cdb/IOSCSILib.h \
   IOKit/scsi/SCSICommandOperationCodes.h \
   IOKit/scsi-commands/SCSICommandOperationCodes.h scsi.h sys/scsi.h \
@@ -9874,6 +9879,11 @@ fi
 
 done
 
+
+# Restore VERSION
+sed "s!/\* \(#define VERSION .*\) \*/!\1!" confdefs.h >> confdefs.h.tmp
+mv confdefs.h.tmp confdefs.h
+
 for ac_header in io/cam/cam.h
 do :
   ac_fn_c_check_header_compile "$LINENO" "io/cam/cam.h" "ac_cv_header_io_cam_cam_h" "#include <io/common/iotypes.h>
diff --git a/configure.in b/configure.in
index 79c894c76..7ee4c60fc 100644
--- a/configure.in
+++ b/configure.in
@@ -425,6 +425,11 @@ dnl ************
 dnl FIXME: These are a lot of header files to scan.  We should
 dnl scan for just one that is unique per platform and then do
 dnl conditional scans for more specific only as needed.
+
+# Unset VERSION during the SCSI header check
+sed "s!^#define VERSION .*!/* & */!" confdefs.h >> confdefs.h.tmp
+mv confdefs.h.tmp confdefs.h
+ 
 AC_CHECK_HEADERS(IOKit/scsi/SCSITaskLib.h IOKit/cdb/IOSCSILib.h \
   IOKit/scsi/SCSICommandOperationCodes.h \
   IOKit/scsi-commands/SCSICommandOperationCodes.h scsi.h sys/scsi.h \
@@ -432,6 +437,11 @@ AC_CHECK_HEADERS(IOKit/scsi/SCSITaskLib.h IOKit/cdb/IOSCSILib.h \
   camlib.h scdds.h sys/scsi/scsi.h sys/scsi/sgdefs.h \
   sys/scsi/targets/scgio.h apollo/scsi.h sys/sdi_comm.h \
   sys/passthrudef.h)
+
+# Restore VERSION
+sed "s!/\* \(#define VERSION .*\) \*/!\1!" confdefs.h >> confdefs.h.tmp
+mv confdefs.h.tmp confdefs.h
+
 AC_CHECK_HEADERS([io/cam/cam.h],,,[#include <io/common/iotypes.h>])
 AC_CHECK_HEADERS([ntddscsi.h ddk/ntddscsi.h],,,[#include <windows.h>])