[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=49e9f5d

The following commit has been merged in the master branch:
commit 49e9f5d0d24d06e0b87295548f10fc383f326b3c
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Sat Mar 17 08:02:19 2007 +0000

    Preliminary check-in: NLS and libiconv configuration tweaks
---
 config/configure.ac | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/config/configure.ac b/config/configure.ac
index 1cdb394..bd65516 100644
--- a/config/configure.ac
+++ b/config/configure.ac
@@ -34,7 +34,14 @@ AC_PROG_RANLIB
 # ---------------------------------------------------------------------------
 # i18n support
 # ---------------------------------------------------------------------------
-AM_GNU_GETTEXT([external])
+AC_MSG_CHECKING([whether to build with NLS ])
+AC_ARG_ENABLE(nls,
+    ,
+    USE_NLS=$enableval, USE_NLS=yes)
+AC_MSG_RESULT($USE_NLS)
+if test "$USE_NLS" = "yes"; then
+    AM_GNU_GETTEXT([external])
+fi
 
 # ---------------------------------------------------------------------------
 # Libtool support
@@ -48,7 +55,15 @@ AC_CHECK_LIBM()
 LIBS="$LIBS $LIBM"
 CHECK_ZLIB()
 AC_SUBST(HAVE_LIBZ,$HAVE_LIBZ)
-AM_ICONV
+
+AC_MSG_CHECKING([whether to use libiconv])
+AC_ARG_ENABLE(libiconv,
+    [  --disable-libiconv      do not use libiconv to translate Windows XP tags ],
+    USE_LIBICONV=$enableval, USE_LIBICONV=yes)
+AC_MSG_RESULT($USE_LIBICONV)
+if test "$USE_LIBICONV" = "yes"; then
+    AM_ICONV
+fi
 
 # ---------------------------------------------------------------------------
 # Checks for header files.

-- 
exiv2 packaging