Update of /cvsroot/ufraw/ufraw
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv28218
Modified Files:
README autogen.sh configure.ac ufraw_conf.c
Log Message:
Make autogen.sh easier to maintain. Clean up configure.ac. Update README and
version output.
Index: configure.ac
===================================================================
RCS file: /cvsroot/ufraw/ufraw/configure.ac,v
retrieving revision 1.178
retrieving revision 1.179
diff -u -d -r1.178 -r1.179
--- configure.ac 5 Oct 2013 16:00:10 -0000 1.178
+++ configure.ac 6 Oct 2013 05:00:15 -0000 1.179
@@ -71,15 +71,15 @@
PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.12 gthread-2.0)
PKG_CHECK_MODULES(LCMS2, lcms2,
- [have_lcms="yes (lcms 2.x)"
+ [have_lcms="lcms 2.x"
AC_DEFINE(HAVE_LCMS2, 1, have the lcms 2.x library)
LCMS_CFLAGS="$LCMS2_CFLAGS"
LCMS_LIBS="$LCMS2_LIBS"],
- [have_lcms="no (lcms 2.x not found)"])
+ [have_lcms="lcms 2.x not found"])
-if test "x$have_lcms" != "xyes (lcms 2.x)"; then
+if test "x$have_lcms" != "xlcms 2.x"; then
PKG_CHECK_MODULES(LCMS1, lcms >= 1.14,
- [have_lcms="yes (lcms 1.x)"
+ [have_lcms="lcms 1.x"
AC_DEFINE(HAVE_LCMS1, 1, have the lcms 1.x library)
LCMS_CFLAGS="$LCMS1_CFLAGS"
LCMS_LIBS="$LCMS1_LIBS"],
@@ -380,7 +380,7 @@
AC_OUTPUT
AC_MSG_NOTICE(====================== summary =====================)
-AC_MSG_NOTICE(Color management support: $have_lcms)
+AC_MSG_NOTICE(color management support: $have_lcms)
AC_MSG_NOTICE(build GTK GUI: $have_gtk)
AC_MSG_NOTICE(build GIMP plug-in: $have_gimp)
AC_MSG_NOTICE(EXIF support using exiv2: $have_exiv2)
@@ -391,4 +391,4 @@
AC_MSG_NOTICE(FITS support: $have_cfitsio)
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)
+AC_MSG_NOTICE(lens defects correction support using lensfun: $have_lensfun)
Index: README
===================================================================
RCS file: /cvsroot/ufraw/ufraw/README,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -d -r1.68 -r1.69
--- README 26 Mar 2013 16:30:12 -0000 1.68
+++ README 6 Oct 2013 05:00:15 -0000 1.69
@@ -31,9 +31,9 @@
(If building from CVS rather than a release see also "Building UFRaw
from CVS", below.)
-Building UFRaw requires development packages for GLib >= 2.12 and lcms >= 1.14.
-There are many optional dependencies which enable building additional
-programs and adding features to existing programs.
+Building UFRaw requires development packages for GLib >= 2.12 and lcms >= 1.14
+(lcms 2.x is used if found). There are many optional dependencies which enable
+building additional programs and adding features to existing programs.
The UFRaw build process expects Perl to be present (for pod2man). It is
needed only if you are changing ufraw.pod or if you are building from CVS.
@@ -48,10 +48,11 @@
./configure
At the end of the configuration you will get a summary of the
-installation settings. If most optional dependencies are present it
+installation settings. If all optional dependencies are present it
will look like this:
configure: ====================== summary =====================
+configure: color management support: lcms 2.x
configure: build GTK GUI: yes
configure: build GIMP plug-in: yes
configure: EXIF support using exiv2: yes
@@ -62,7 +63,7 @@
configure: FITS support: yes
configure: gzip compressed raw support: yes
configure: bzip2 compressed raw support: yes
-configure: Lens defects correction via lensfun: yes
+configure: lens defects correction support using lensfun: yes
If some of the lines end with 'no' instead of 'yes', UFRaw can still
be built, but the named option will be disabled.
@@ -226,7 +227,8 @@
=======================
The development version has the following caveats:
-autoconf and automake must be installed.
+autoconf (version 2.57 or higher) and automake (version 1.5 or higher) must be
+installed.
./autogen.sh must be run before ./configure.
Index: ufraw_conf.c
===================================================================
RCS file: /cvsroot/ufraw/ufraw/ufraw_conf.c,v
retrieving revision 1.191
retrieving revision 1.192
diff -u -d -r1.191 -r1.192
--- ufraw_conf.c 23 Mar 2013 08:00:07 -0000 1.191
+++ ufraw_conf.c 6 Oct 2013 05:00:15 -0000 1.192
@@ -1691,6 +1691,13 @@
char versionText[] =
"%s " VERSION "\n"
+ "LCMS "
+#ifdef HAVE_LCMS2
+ "2.x\n"
+#else
+ "1.x\n"
+#endif
+
"EXIV2 "
#ifdef HAVE_EXIV2
"enabled.\n"
Index: autogen.sh
===================================================================
RCS file: /cvsroot/ufraw/ufraw/autogen.sh,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- autogen.sh 13 Aug 2013 13:00:08 -0000 1.7
+++ autogen.sh 6 Oct 2013 05:00:15 -0000 1.8
@@ -5,59 +5,9 @@
# Generate all autoconf/automake files, to prepare for running
# configure from only the contents of CVS.
-# Automake 1.5 or higher is required. Because conventions vary as to
-# whether plain "automake" is old (1.4) or modern automake, search for
-# versions by number from the most recent, taking the highest one
-# found.
-
-# XXX This search is a maintenance problem. Add a way to use plain
-# 'automake' and see if it is good enough. Consider declaring a
-# minimum version in Makefile.am and assuming that in 2006 the program
-# automake will be a modern version.
+# We silently assume that Automake 1.5 (released 2001-08-23) or higher is used.
-AUTOMAKE=automake-1.14
-ACLOCAL=aclocal-1.14
-($AUTOMAKE --version) < /dev/null > /dev/null 2>&1 || {
- AUTOMAKE=automake-1.13
- ACLOCAL=aclocal-1.13
-}
-($AUTOMAKE --version) < /dev/null > /dev/null 2>&1 || {
- AUTOMAKE=automake-1.12
- ACLOCAL=aclocal-1.12
-}
-($AUTOMAKE --version) < /dev/null > /dev/null 2>&1 || {
- AUTOMAKE=automake-1.11
- ACLOCAL=aclocal-1.11
-}
-($AUTOMAKE --version) < /dev/null > /dev/null 2>&1 || {
- AUTOMAKE=automake-1.10
- ACLOCAL=aclocal-1.10
-}
-($AUTOMAKE --version) < /dev/null > /dev/null 2>&1 || {
- AUTOMAKE=automake-1.9
- ACLOCAL=aclocal-1.9
-}
-($AUTOMAKE --version) < /dev/null > /dev/null 2>&1 || {
- AUTOMAKE=automake-1.8
- ACLOCAL=aclocal-1.8
-}
-($AUTOMAKE --version) < /dev/null > /dev/null 2>&1 || {
- AUTOMAKE=automake-1.7
- ACLOCAL=aclocal-1.7
-}
-($AUTOMAKE --version) < /dev/null > /dev/null 2>&1 || {
- AUTOMAKE=automake-1.6
- ACLOCAL=aclocal-1.6
-}
-($AUTOMAKE --version) < /dev/null > /dev/null 2>&1 || {
- AUTOMAKE=automake-1.5
- ACLOCAL=aclocal-1.5
-}
-($AUTOMAKE --version) < /dev/null > /dev/null 2>&1 || {
- echo "You must have automake-1.5 or higher."
- exit 1
-}
-$ACLOCAL
+aclocal
autoconf
autoheader
-$AUTOMAKE --foreign --add-missing --copy
+automake --foreign --add-missing --copy
------------------------------------------------------------------------------
October Webinars: Code for Performance
Free Intel webinars can help you accelerate application performance.
Explore tips for MPI, OpenMP, advanced profiling, and more. Get the most from
the latest Intel processors and coprocessors. See abstracts and register >
http://pubads.g.doubleclick.net/gampad/clk?id=60134791&iu=/4140/ostg.clktrk
_______________________________________________
ufraw-cvs mailing list
ufraw-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ufraw-cvs
