mirror
/
sane-project-backends
kopia lustrzana https://gitlab.com/sane-project/backends
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Unset VERSION during the SCSI header check

merge-requests/1/head
Mattias Ellert 2012-10-24 17:30:05 +02:00
rodzic ef7023ae13
commit c6e8e2ab53
3 zmienionych plików z 24 dodań i 0 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

4
ChangeLog
Wyświetl plik

@ -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

10
configure vendored
Wyświetl plik

@ -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>

10
configure.in
Wyświetl plik

@ -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>])