Update of /cvsroot/ufraw/ufraw
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv1157
Modified Files:
configure.ac
Log Message:
Restore old WINDRES search behaviour. Find and use libtiff-4.x if present.
Index: configure.ac
===================================================================
RCS file: /cvsroot/ufraw/ufraw/configure.ac,v
retrieving revision 1.170
retrieving revision 1.171
diff -u -d -r1.170 -r1.171
--- configure.ac 18 Mar 2013 03:45:20 -0000 1.170
+++ configure.ac 18 Mar 2013 04:45:21 -0000 1.171
@@ -243,9 +243,16 @@
have_jasper=${ac_cv_lib_jasper_jas_image_decode:-no}
# Check for tiff headers and library.
-AC_CHECK_HEADER(tiffio.h,
- AC_CHECK_LIB(tiff, TIFFSetErrorHandler))
-have_tiff=${ac_cv_lib_tiff_TIFFSetErrorHandler:-no}
+PKG_CHECK_MODULES(LIBTIFF, libtiff-4,
+ [ have_tiff=yes
+ AC_DEFINE(HAVE_LIBTIFF, 1, have the tiff library) ],
+ [ have_tiff=no
+ AC_MSG_RESULT($LIBTIFF_PKG_ERRORS) ] )
+if test $have_tiff = no; then
+ AC_CHECK_HEADER(tiffio.h,
+ AC_CHECK_LIB(tiff, TIFFSetErrorHandler))
+ have_tiff=${ac_cv_lib_tiff_TIFFSetErrorHandler:-no}
+fi
PKG_CHECK_MODULES(LIBPNG, libpng >= 1.2,
[ have_png=yes
@@ -273,14 +280,14 @@
# UFRAW_CPPFLAGS is added to the preprocessor flags AM_CPPFLAGS,
# affecting also the C and C++ compilers.
-UFRAW_CPPFLAGS="$UFRAW_CPPFLAGS $EXIV2_CFLAGS $GTK_CFLAGS $GLIB_CFLAGS
$LCMS_CFLAGS $LENSFUN_CFLAGS $LIBPNG_CFLAGS $CFITSIO_CFLAGS"
+UFRAW_CPPFLAGS="$UFRAW_CPPFLAGS $EXIV2_CFLAGS $GTK_CFLAGS $GLIB_CFLAGS
$LCMS_CFLAGS $LENSFUN_CFLAGS $LIBTIFF_CFLAGS $LIBPNG_CFLAGS $CFITSIO_CFLAGS"
AC_SUBST(UFRAW_CPPFLAGS)
# UFRAW_LDADD is added to the linker flags LDADD.
-UFRAW_LDADD="$UFRAW_LDADD $EXIV2_LIBS $GLIB_LIBS $LCMS_LIBS $LENSFUN_LIBS
$LIBPNG_LIBS $CFITSIO_LIBS $CARBON_LIBS"
+UFRAW_LDADD="$UFRAW_LDADD $EXIV2_LIBS $GLIB_LIBS $LCMS_LIBS $LENSFUN_LIBS
$LIBTIFF_LIBS $LIBPNG_LIBS $CFITSIO_LIBS $CARBON_LIBS"
AC_SUBST(UFRAW_LDADD)
if test $ufraw_win32 = yes; then
- AC_CHECK_PROGS(WINDRES, $host_alias-windres windres, , $PATH)
+ AC_CHECK_PROGS(WINDRES, $host_alias-windres $target_alias-windres windres, ,
$PATH)
AC_SUBST(WINDRES)
# For the windows-installer make needs the location of the DLLs
PREFIX=$with_prefix
------------------------------------------------------------------------------
Everyone hates slow websites. So do we.
Make your web apps faster with AppDynamics
Download AppDynamics Lite for free today:
http://p.sf.net/sfu/appdyn_d2d_mar
_______________________________________________
ufraw-cvs mailing list
ufraw-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ufraw-cvs
