From 71f90819042ebcefaab02ac495425e742fc5d3ab Mon Sep 17 00:00:00 2001 From: Mattias Ellert Date: Sat, 10 Nov 2007 11:35:34 +0000 Subject: [PATCH] MacOS X updates --- ChangeLog | 11 ++++++----- backend/dll.c | 6 ++++-- tools/sane-find-scanner.c | 2 ++ 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 58d34cf4f..44251437e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -10,11 +10,12 @@ add a check for IOKit/scsi/SCSICommandOperationCodes.h * doc/Makefile.in, tools/Makefile.in: disable things that need the built binaries to run when doing cross-compilations - * sanei/sanei_scsi.c: IOKit/scsi-commands has moved to IOKit/scsi - - support both locations of headers - * aclocal.m4, config.guess, config.sub, configure, sane/config.h.in: - update autogenerated files - * sane-backends/Makefile.in: remove sanei_config2 from cardscan deps + * sanei/sanei_scsi.c, tools/sane-find-scanner.c: IOKit/scsi-commands + has moved to IOKit/scsi - support both locations of headers + * aclocal.m4, config.guess, config.sub, configure, + include/sane/config.h.in: update autogenerated files + * backends/Makefile.in: remove sanei_config2 from cardscan deps + * backends/dll.c: add MacOS X naming convention for dlopen 2007-11-08 Gerhard Jaeger diff --git a/backend/dll.c b/backend/dll.c index 18f343f06..967833058 100644 --- a/backend/dll.c +++ b/backend/dll.c @@ -385,14 +385,16 @@ load (struct backend *be) # ifdef __hpux # define POSTFIX ".sl.%u" # define ALT_POSTFIX ".so.%u" -#elif defined (HAVE_WINDOWS_H) +# elif defined (HAVE_WINDOWS_H) # undef PREFIX # define PREFIX "cygsane-" # define POSTFIX "-%u.dll" -#elif defined (HAVE_OS2_H) +# elif defined (HAVE_OS2_H) # undef PREFIX # define PREFIX "" # define POSTFIX ".dll" +# elif defined (__APPLE__) && defined (__MACH__) +# define POSTFIX ".%u.so" # else # define POSTFIX ".so.%u" # endif diff --git a/tools/sane-find-scanner.c b/tools/sane-find-scanner.c index d7fa48bd4..4c8bce64c 100644 --- a/tools/sane-find-scanner.c +++ b/tools/sane-find-scanner.c @@ -819,6 +819,7 @@ static char **build_scsi_dev_list() #endif #if defined (HAVE_IOKIT_CDB_IOSCSILIB_H) || \ + defined (HAVE_IOKIT_SCSI_SCSICOMMANDOPERATIONCODES_H) || \ defined (HAVE_IOKIT_SCSI_COMMANDS_SCSICOMMANDOPERATIONCODES_H) char **scsi_dev_list; int scsi_dev_list_index; @@ -1410,6 +1411,7 @@ main (int argc, char **argv) #if defined (HAVE_WINDOWS_H) || \ defined (HAVE_IOKIT_CDB_IOSCSILIB_H) || \ + defined (HAVE_IOKIT_SCSI_SCSICOMMANDOPERATIONCODES_H) || \ defined (HAVE_IOKIT_SCSI_COMMANDS_SCSICOMMANDOPERATIONCODES_H) /* Build a list of valid of possible scanners found */ dev_list = build_scsi_dev_list();