COREL: TWAIN32 support

[Marcus Meissner]

Hi,

This will be the last and final Corel merging patch from me ;)

Corel actually started TWAIN support just before the end of the project, 
not really finished.

This patch imports the code they did.

I have added:
* autoconf checks so we can use it if SANE is not present.

I plan to:
* Add gphoto2 backend.
* Split up SANE more.

This patch is under the Corel license (X11), since it contains mostly Corels
work, not mine.

Please rerun make_debug, make_dlls.

Ciao, Marcus

Changelog:
	Shi Quan He <shiquan at cyberdude.com> (for Corel)
	Started TWAIN implementation.

	Marcus Meissner <marcus at jet.franken.de>
	Merged into WineHQ, made sure it works without SANE.
-------------- next part --------------
Index: configure.ac
===================================================================
RCS file: /home/wine/wine/configure.ac,v
retrieving revision 1.5
diff -u -r1.5 configure.ac
--- configure.ac	11 Mar 2002 05:08:15 -0000	1.5
+++ configure.ac	19 Mar 2002 20:21:49 -0000
@@ -360,6 +360,30 @@
 )
 AC_SUBST(CUPSLIBS)
 
+dnl **** Check for SANE ****
+AC_CHECK_PROG(sane_devel,sane-config,sane-config,no)
+if test "$sane_devel" = "no"
+then
+    SANELIB=""
+    SANEDEF=""
+else
+    SANELIB="`$sane_devel --libs`"
+    SANEDEF="`$sane_devel --cflags`"
+    ac_save_CPPFLAGS="$CPPFLAGS"
+    ac_save_LIBS="$LIBS"
+    CPPFLAGS="$CPPFLAGS $SANEDEF"
+    LIBS="$LIBS $SANELIB"
+    AC_CHECK_HEADER(sane/sane.h,[
+	    AC_CHECK_LIB(sane,sane_open,[AC_DEFINE(HAVE_SANE, 1, [Define if we have SANE development environment])],
+	    SANELIB=""
+	    ])
+    )
+    LIBS="$ac_save_LIBS"
+    CPPFLAGS="$ac_save_CPPFLAGS"
+fi
+AC_SUBST(SANELIB)
+AC_SUBST(SANEDEF)
+
 dnl **** Check for FreeType 2 ****
 AC_CHECK_LIB(freetype,FT_Init_FreeType,ft_lib=yes,ft_lib=no,$X_LIBS)
 if test "$ft_lib" = "no"
@@ -1296,6 +1320,7 @@
 dlls/sti/Makefile
 dlls/tapi32/Makefile
 dlls/ttydrv/Makefile
+dlls/twain/Makefile
 dlls/url/Makefile
 dlls/urlmon/Makefile
 dlls/user/Makefile
Index: dlls/Makefile.in
===================================================================
RCS file: /home/wine/wine/dlls/Makefile.in,v
retrieving revision 1.113
diff -u -r1.113 Makefile.in
--- dlls/Makefile.in	28 Feb 2002 21:43:46 -0000	1.113
+++ dlls/Makefile.in	19 Mar 2002 20:21:49 -0000
@@ -70,6 +70,7 @@
 	sti \
 	tapi32 \
 	ttydrv \
+	twain \
 	url \
 	urlmon \
 	user \
@@ -193,6 +194,7 @@
 	libtapi32.$(LIBEXT) \
 	libtoolhelp.$(LIBEXT) \
 	libttydrv.$(LIBEXT) \
+	libtwain_32.$(LIBEXT) \
 	libtypelib.$(LIBEXT) \
 	liburl.$(LIBEXT) \
 	liburlmon.$(LIBEXT) \
@@ -425,6 +427,9 @@
 libttydrv.$(LIBEXT): ttydrv/libttydrv.$(LIBEXT)
 	$(RM) $@ && $(LN_S) ttydrv/libttydrv.$(LIBEXT) $@
 
+libtwain_32.$(LIBEXT): twain/libtwain_32.$(LIBEXT)
+	$(RM) $@ && $(LN_S) twain/libtwain_32.$(LIBEXT) $@
+
 liburl.$(LIBEXT): url/liburl.$(LIBEXT)
 	$(RM) $@ && $(LN_S) url/liburl.$(LIBEXT) $@
 
@@ -680,6 +685,10 @@
 ttydrv/libttydrv.$(LIBEXT): dummy libuser32.$(LIBEXT) libgdi32.$(LIBEXT) \
   libkernel32.$(LIBEXT) libntdll.$(LIBEXT)
 	@cd ttydrv && $(MAKE) libttydrv.$(LIBEXT)
+
+twain/libtwain_32.$(LIBEXT): dummy libntdll.$(LIBEXT) libkernel32.$(LIBEXT) \
+  libuser32.$(LIBEXT) libgdi32.$(LIBEXT)
+	@cd twain && $(MAKE) libtwain_32.$(LIBEXT)
 
 url/liburl.$(LIBEXT): dummy libntdll.$(LIBEXT)
 	@cd url && $(MAKE) liburl.$(LIBEXT)
-------------- next part --------------
A non-text attachment was scrubbed...
Name: twain.tgz
Type: application/octet-stream
Size: 32346 bytes
Desc: not available
Url : http://www.winehq.org/pipermail/wine-patches/attachments/20020319/3b483771/twain.obj