Update of /cvsroot/ufraw/ufraw
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv1228

Modified Files:
        configure.ac ufraw_conf.c README 
Log Message:
Bump version number. Clean up configuration and update README. Add PNG 
enabled/disabled to --version output.

Index: README
===================================================================
RCS file: /cvsroot/ufraw/ufraw/README,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -d -r1.59 -r1.60
--- README      15 Oct 2009 07:50:14 -0000      1.59
+++ README      13 Nov 2009 16:25:22 -0000      1.60
@@ -56,9 +56,9 @@
 configure: build CinePaint plug-in: no
 configure: EXIF support using exiv2: yes
 configure: JPEG support: yes
+configure: TIFF support: yes
 configure: PNG support: yes
 configure: FITS support: no
-configure: TIFF support: yes
 configure: gzip compressed raw support: yes
 configure: bzip2 compressed raw support: yes
 configure: Scrolling in preview using GtkImageView: yes
@@ -112,13 +112,8 @@
 
 --enable-dst-correction: enable DST correction for file timestamps.
 
---enable-contrast: enable the contrast setting option.
-
 --enable-interp-none: enable 'None' interpolation (mostly for debugging).
 
---with-lensfun: use the lensfun library - experimental feature,
-               read http://ufraw.sourceforge.net/lensfun.html before using it.
-
 --with-prefix=PREFIX: use also PREFIX as input prefix for the build.
 
 --with-dosprefix=PREFIX: PREFIX is the prefix in dos format

Index: configure.ac
===================================================================
RCS file: /cvsroot/ufraw/ufraw/configure.ac,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -d -r1.145 -r1.146
--- configure.ac        5 Nov 2009 15:30:07 -0000       1.145
+++ configure.ac        13 Nov 2009 16:25:22 -0000      1.146
@@ -1,5 +1,5 @@
 dnl $Id$
-AC_INIT(UFRaw, 0.16)
+AC_INIT(UFRaw, 0.17)
 AC_PREREQ(2.57)
 
 # Create host_os, host_cpu variables
@@ -235,27 +235,22 @@
   AC_CHECK_LIB(jpeg, jpeg_CreateCompress))
 have_jpeg=${ac_cv_lib_jpeg_jpeg_CreateCompress:-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(LIBPNG, libpng,
   [ have_png=yes
     AC_DEFINE(HAVE_LIBPNG, 1, have the png library) ],
   [ have_png=no
     AC_MSG_RESULT($LIBPNG_PKG_ERRORS) ] )
 
-# 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(CFITSIO, cfitsio,
   [ have_cfitsio=yes
     AC_DEFINE(HAVE_LIBCFITSIO, 1, have the cfitsio library) ],
   [ have_cfitsio=no
     AC_MSG_RESULT($CFITSIO_PKG_ERRORS) ] )
-if test "$have_cfitsio" = "no"; then
-  AC_CHECK_HEADER(fitsio.h,
-    AC_CHECK_LIB(cfitsio, ffcmsg))
-  have_cfitsio=${ac_cv_lib_cfitsio_ffcmsg:-no}
-fi
 
 PKG_CHECK_MODULES(EXIV2, exiv2 >= 0.11,
   [ have_exiv2=yes
@@ -356,9 +351,9 @@
 AC_MSG_NOTICE(build CinePaint plug-in: $have_cinepaint)
 AC_MSG_NOTICE(EXIF support using exiv2: $have_exiv2)
 AC_MSG_NOTICE(JPEG support: $have_jpeg)
+AC_MSG_NOTICE(TIFF support: $have_tiff)
 AC_MSG_NOTICE(PNG support: $have_png)
 AC_MSG_NOTICE(FITS support: $have_cfitsio)
-AC_MSG_NOTICE(TIFF support: $have_tiff)
 AC_MSG_NOTICE(gzip compressed raw support: $have_zlib)
 AC_MSG_NOTICE(bzip2 compressed raw support: $have_libbz2)
 AC_MSG_NOTICE(Lens defects correction via lensfun: $have_lensfun)

Index: ufraw_conf.c
===================================================================
RCS file: /cvsroot/ufraw/ufraw/ufraw_conf.c,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -d -r1.153 -r1.154
--- ufraw_conf.c        10 Nov 2009 03:33:55 -0000      1.153
+++ ufraw_conf.c        13 Nov 2009 16:25:22 -0000      1.154
@@ -1621,6 +1621,13 @@
 "disabled.\n"
 #endif
 
+"PNG "
+#ifdef HAVE_LIBPNG
+"enabled.\n"
+#else
+"disabled.\n"
+#endif
+
 "FITS "
 #ifdef HAVE_LIBCFITSIO
 "enabled.\n"


------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day 
trial. Simplify your report design, integration and deployment - and focus on 
what you do best, core application coding. Discover what's new with
Crystal Reports now.  http://p.sf.net/sfu/bobj-july
_______________________________________________
ufraw-cvs mailing list
ufraw-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ufraw-cvs

Reply via email to