[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=278f65e

The following commit has been merged in the master branch:
commit 278f65ed39554ee7585d293495c8c0a4268d52ea
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Fri Mar 2 16:54:17 2007 +0000

    Added check for preprocessor define EXV_COMMERCIAL_VERSION.
---
 config/config.h.in  | 15 +++++++++++----
 config/configure.ac | 31 +++++++++++++++++++++++++------
 src/exv_msvc.h      | 14 ++++++++++++++
 src/nikonmn.cpp     |  2 --
 4 files changed, 50 insertions(+), 12 deletions(-)

diff --git a/config/config.h.in b/config/config.h.in
index 1a918e9..710d27e 100644
--- a/config/config.h.in
+++ b/config/config.h.in
@@ -1,9 +1,5 @@
 /* config.h.in.  Generated from configure.ac by autoheader.  */
 
-/* Define to 1 if translation of program messages to the user's
-   native language is requested. */
-#undef ENABLE_NLS
-
 /* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP
    systems. This function is required for `alloca.c' support on those systems. */
 #undef CRAY_STACKSEG_END
@@ -37,9 +33,20 @@
 /* Define to 1 if you have the <libintl.h> header file. */
 #undef HAVE_LIBINTL_H
 
+#ifndef EXV_COMMERCIAL_VERSION
+
+/* Define to 1 to enable translation of Exif.Nikon3.LensData. */
+#undef HAVE_LENSDATA
+
+/* Define to 1 if translation of program messages to the user's
+   native language is requested. */
+#undef ENABLE_NLS
+
 /* Define to 1 if you have the `iconv' function. */
 #undef HAVE_ICONV
 
+#endif /* !EXV_COMMERCIAL_VERSION */
+
 /* Define to `const' or to empty, depending on the second argument of `iconv'. */
 #undef ICONV_CONST
 
diff --git a/config/configure.ac b/config/configure.ac
index 63b2f40..1cc6714 100644
--- a/config/configure.ac
+++ b/config/configure.ac
@@ -64,6 +64,8 @@ AC_STRUCT_TM
 #AC_TYPE_UINT32_T
 #AC_TYPE_INT16_T
 #AC_TYPE_INT32_T
+AC_SUBST(GXX,$GXX)
+AC_SUBST(GCC,$GCC)
 
 # ---------------------------------------------------------------------------
 # Checks for library functions.
@@ -82,16 +84,33 @@ AC_CHECK_FUNCS([gmtime_r memset strchr strerror strtol mmap munmap])
 AC_CHECK_FUNCS([timegm], HAVE_TIMEGM=1)
 AC_SUBST(HAVE_TIMEGM,$HAVE_TIMEGM)
 
-AC_SUBST(GXX,$GXX)
-AC_SUBST(GCC,$GCC)
-
+# ---------------------------------------------------------------------------
+# Miscellaneous
+# ---------------------------------------------------------------------------
+AC_MSG_CHECKING([whether to enable dependency tracking])
 AC_ARG_ENABLE(dependency-tracking,
-[  --disable-dependency-tracking  speeds up one-time build
+    [  --disable-dependency-tracking  speeds up one-time build
   --enable-dependency-tracking   do not reject slow dependency extractors],
-[if test $enableval = yes; then DEP_TRACKING=1; fi],DEP_TRACKING=1)
-
+    USE_TRACKING=$enableval, USE_TRACKING=yes)
+AC_MSG_RESULT($USE_TRACKING)
+DEP_TRACKING=
+if test "$USE_TRACKING" = "yes"; then
+    DEP_TRACKING=1
+fi
 AC_SUBST(DEP_TRACKING,$DEP_TRACKING)
 
+AC_MSG_CHECKING([whether to use the lens database for Exif.Nikon3.LensData])
+AC_ARG_ENABLE(lensdata,
+    [  --disable-lensdata      do not use the lens database for Exif.Nikon3.LensData ],
+    USE_LENSDATA=$enableval, USE_LENSDATA=yes)
+AC_MSG_RESULT($USE_LENSDATA)
+if test "$USE_LENSDATA" = "yes"; then
+    AC_DEFINE(HAVE_LENSDATA,1)
+fi
+
+# ---------------------------------------------------------------------------
+# Create output files.
+# ---------------------------------------------------------------------------
 AC_CONFIG_FILES([./config/config.mk])
 AC_CONFIG_FILES([./config/exiv2-config], [chmod +x ./config/exiv2-config])
 AC_CONFIG_FILES([./config/exiv2.pc])
diff --git a/src/exv_msvc.h b/src/exv_msvc.h
index 3665336..7e2c316 100644
--- a/src/exv_msvc.h
+++ b/src/exv_msvc.h
@@ -34,6 +34,20 @@
 /* Define to `int' if <sys/types.h> does not define pid_t. */
 #define pid_t int
 
+#ifndef EXV_COMMERCIAL_VERSION
+
+/* Define to 1 to enable translation of Exif.Nikon3.LensData. */
+# define EXV_HAVE_LENSDATA 1
+
+/* Define to 1 if translation of program messages to the user's
+   native language is requested. */
+# undef EXV_ENABLE_NLS
+
+/* Define to 1 if you have the `iconv' function. */
+# undef EXV_HAVE_ICONV
+
+#endif /* !EXV_COMMERCIAL_VERSION */
+
 /* File path seperator */
 #define EXV_SEPERATOR_STR "\"
 #define EXV_SEPERATOR_CHR '\'
diff --git a/src/nikonmn.cpp b/src/nikonmn.cpp
index ed5eb88..5fe647d 100644
--- a/src/nikonmn.cpp
+++ b/src/nikonmn.cpp
@@ -51,8 +51,6 @@ EXIV2_RCSID("@(#) $Id$")
 #include <cassert>
 #include <cstring>
 
-#define EXV_HAVE_LENSDATA
-
 // *****************************************************************************
 // class member definitions
 namespace Exiv2 {

-- 
exiv2 packaging