Alexandre Julliard : gphoto2.ds: Don' t warn about libjpeg if gphoto support is not enabled.

Alexandre Julliard julliard at wine.codeweavers.com
Mon Nov 27 07:10:54 CST 2006


Module: wine
Branch: master
Commit: 86ba62a5637c2cfac38f223697fecdd09cc2bb73
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=86ba62a5637c2cfac38f223697fecdd09cc2bb73

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Mon Nov 27 13:47:17 2006 +0100

gphoto2.ds: Don't warn about libjpeg if gphoto support is not enabled.

---

 dlls/gphoto2.ds/gphoto2_i.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/dlls/gphoto2.ds/gphoto2_i.h b/dlls/gphoto2.ds/gphoto2_i.h
index 3e91d6c..bb2b6e3 100644
--- a/dlls/gphoto2.ds/gphoto2_i.h
+++ b/dlls/gphoto2.ds/gphoto2_i.h
@@ -24,7 +24,7 @@
 # error You must include config.h first
 #endif
 
-#if !defined(HAVE_JPEGLIB_H)
+#if defined(HAVE_GPHOTO2) && !defined(HAVE_JPEGLIB_H)
 # warning "gphoto2 support in twain needs jpeg development headers"
 # undef HAVE_GPHOTO2
 #endif




More information about the wine-cvs mailing list