[patch] ufraw-exiv2-check.patch

ufraw-exiv2-check.patch (text/plain), 1.38 KB, created by Priit Laes (IRC: plaes) on 2007-07-25 19:48:57 UTC

--- ufraw-0.11.orig/configure.ac
+++ ufraw-0.11/configure.ac
@@ -185,12 +185,10 @@
 AC_MSG_RESULT($with_exiv2)
 have_exiv2=no
 if test $with_exiv2 = yes; then
-  AC_CHECK_PROGS(EXIV2_CONFIG, exiv2-config, , $PATH)
-  if test -n "$EXIV2_CONFIG"; then
-    have_exiv2=yes
-    AC_DEFINE(HAVE_EXIV2, 1, have exiv2)
-    EXIV2_LIBS=`$EXIV2_CONFIG --libs`
-  fi
+  PKG_CHECK_MODULES(EXIV2, exiv2,
+    [ have_exiv2=yes
+      AC_DEFINE(HAVE_EXIV2, 1, have exiv2)],
+    AC_MSG_RESULT($EXIV2_PKG_ERRORS))
 fi
 
 UFRAW_CFLAGS="$UFRAW_CFLAGS $EXIF_CFLAGS $GIMP_CFLAGS $GTK_CFLAGS $GLIB_CFLAGS $LCMS_CFLAGS"
--- ufraw-0.11.orig/nikon_curve.c
+++ ufraw-0.11/nikon_curve.c
@@ -110,7 +110,7 @@
 	    printf("NOTE: If a resolution is not specified, a default one will be used.\n");
 	    printf("      If the -o option is not specified, default files will be used.\n\n");
 	    printf("Example:\n");
-	    printf("NikonCurveGenerator -sr 65536 -or 256 curveFile -o exportFile\n");
+	    printf("%s -sr 65536 -or 256 curveFile -o exportFile\n", args[0]);
 	    
 	    //signal that processing cannot occur
 	    return NC_ERROR;
--- ufraw-0.11.orig/ufraw_exiv2.cc
+++ ufraw-0.11/ufraw_exiv2.cc
@@ -201,7 +201,7 @@
 }
 catch (Exiv2::AnyError& e) {
     std::cerr.rdbuf(savecerr);
-    ufraw_message(UFRAW_SET_WARNING, "%s\n", e.what().c_str());
+    ufraw_message(UFRAW_SET_WARNING, "%s\n", e.what());
     return UFRAW_ERROR;
 }