[sane-devel] MacOS X SCSI support and other changes in SANE CVS
Peter O'Gorman
peter@pogma.com
Fri, 2 May 2003 09:35:56 +0900
--Apple-Mail-6-514112464
Content-Transfer-Encoding: 7bit
Content-Type: text/plain;
charset=US-ASCII;
format=flowed
Okay, that and changing the link order (darwin ld is *very* wierd)
allows scanimage to build. saned does not build however because darwin
does not have poll(2). Even though configure checks this, saned goes
ahead and uses it anyway :(
Attached is a patch which will get you as far as scanimage building.
Peter
On Friday, May 2, 2003, at 01:16 AM, Henning Meier-Geinitz wrote:
>
> #if defined(__GNUC__) && !defined(HAVE_NSLINKMODULE)
>
> back to
>
> #if defined(__GNUC__)
>
> What's the problem with the link order?
--Apple-Mail-6-514112464
Content-Disposition: attachment;
filename=sane.diff
Content-Transfer-Encoding: 7bit
Content-Type: application/octet-stream;
x-unix-mode=0644;
name="sane.diff"
diff -urN sane-backends/frontend/Makefile.in sane-backends.new/frontend/Makefile.in
--- sane-backends/frontend/Makefile.in Fri Dec 6 23:46:02 2002
+++ sane-backends.new/frontend/Makefile.in Fri May 2 08:03:06 2003
@@ -90,19 +90,19 @@
done
test: test.o $(LIBSANE) $(LIBLIB)
- @$(LIBTOOL) $(MLINK) $(LINK) test.o $(LIBSANE) $(LIBLIB) $(LIBS)
+ @$(LIBTOOL) $(MLINK) $(LINK) test.o $(LIBLIB) $(LIBSANE) $(LIBS)
saned: saned.o $(LIBSANEI) $(LIBSANE) $(LIBLIB)
- @$(LIBTOOL) $(MLINK) $(LINK) saned.o $(LIBSANEI) $(LIBSANE) $(LIBLIB) \
+ @$(LIBTOOL) $(MLINK) $(LINK) saned.o $(LIBLIB) $(LIBSANEI) $(LIBSANE) \
$(LIBS)
scanimage: $(SCAN_OBJS) $(LIBSANE) $(LIBLIB)
- @$(LIBTOOL) $(MLINK) $(LINK) $(SCAN_OBJS) $(LIBSANE) $(LIBLIB) $(LIBS)
+ @$(LIBTOOL) $(MLINK) $(LINK) $(SCAN_OBJS) $(LIBLIB) $(LIBSANE) $(LIBS)
# tstbackend is not compiled by default.
# To compile it, add tstbackend to BINPROGS.
tstbackend: tstbackend.o $(LIBSANE) $(LIBLIB)
- @$(LIBTOOL) $(MLINK) $(LINK) tstbackend.o $(LIBSANE) $(LIBLIB) $(LIBS)
+ @$(LIBTOOL) $(MLINK) $(LINK) tstbackend.o $(LIBLIB) $(LIBSANE) $(LIBS)
clean:
rm -f *.o tstbackend
diff -urN sane-backends/include/lalloca.h sane-backends.new/include/lalloca.h
--- sane-backends/include/lalloca.h Thu May 1 08:12:56 2003
+++ sane-backends.new/include/lalloca.h Fri May 2 08:01:00 2003
@@ -23,7 +23,7 @@
#define lalloca_h
/* AIX requires this to be the first thing in the file. */
-#if defined(__GNUC__) && !defined(HAVE_NSLINKMODULE)
+#if defined(__GNUC__)
# define alloca __builtin_alloca
#else
# if HAVE_ALLOCA_H
--Apple-Mail-6-514112464--