[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=4dacedf

The following commit has been merged in the master branch:
commit 4dacedf4f22a2a6d7dce63a1c0b6fc20c3d6a3d0
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Sat Mar 17 09:49:14 2007 +0000

    Previous 2 revisions undone, removed obsolescent macros
---
 config/config.h.in  | 32 --------------------------------
 config/configure.ac | 15 +--------------
 2 files changed, 1 insertion(+), 46 deletions(-)

diff --git a/config/config.h.in b/config/config.h.in
index 710d27e..16a12c6 100644
--- a/config/config.h.in
+++ b/config/config.h.in
@@ -1,29 +1,12 @@
 /* config.h.in.  Generated from configure.ac by autoheader.  */
 
-/* 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
-
-/* Define to 1 if using `alloca.c'. */
-#undef C_ALLOCA
-
 /* Define to 1 if you have the `alarm' function. */
 #undef HAVE_ALARM
 
-/* Define to 1 if you have `alloca', as a function or macro. */
-#undef HAVE_ALLOCA
-
-/* Define to 1 if you have <alloca.h> and it should be used (not on Ultrix).
-   */
-#undef HAVE_ALLOCA_H
-
 /* Define to 1 if you have the declaration of `strerror_r', and to 0 if you
    don't. */
 #undef HAVE_DECL_STRERROR_R
 
-/* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */
-#undef HAVE_DOPRNT
-
 /* Define to 1 if you have the `gmtime_r' function. */
 #undef HAVE_GMTIME_R
 
@@ -70,10 +53,6 @@
    and to 0 otherwise. */
 #undef HAVE_REALLOC
 
-/* Define to 1 if `stat' has the bug that it succeeds when given the
-   zero-length file name argument. */
-#undef HAVE_STAT_EMPTY_STRING_BUG
-
 /* Define to 1 if stdbool.h conforms to C99. */
 #undef HAVE_STDBOOL_H
 
@@ -92,9 +71,6 @@
 /* Define to 1 if you have the `strerror_r' function. */
 #undef HAVE_STRERROR_R
 
-/* Define to 1 if you have the `strftime' function. */
-#undef HAVE_STRFTIME
-
 /* Define to 1 if you have the <strings.h> header file. */
 #undef HAVE_STRINGS_H
 
@@ -162,14 +138,6 @@
 /* Define to the version of this package. */
 #undef PACKAGE_VERSION
 
-/* If using the C implementation of alloca, define if you know the
-   direction of stack growth for your system; otherwise it will be
-   automatically deduced at run-time.
-	STACK_DIRECTION > 0 => grows toward higher addresses
-	STACK_DIRECTION < 0 => grows toward lower addresses
-	STACK_DIRECTION = 0 => direction of growth unknown */
-#undef STACK_DIRECTION
-
 /* Define to 1 if you have the ANSI C header files. */
 #undef STDC_HEADERS
 
diff --git a/config/configure.ac b/config/configure.ac
index 84b68b2..d6b2623 100644
--- a/config/configure.ac
+++ b/config/configure.ac
@@ -48,15 +48,7 @@ AC_CHECK_LIBM()
 LIBS="$LIBS $LIBM"
 CHECK_ZLIB()
 AC_SUBST(HAVE_LIBZ,$HAVE_LIBZ)
-
-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
+AM_ICONV
 
 # ---------------------------------------------------------------------------
 # Checks for header files.
@@ -84,14 +76,9 @@ AC_SUBST(GCC,$GCC)
 # ---------------------------------------------------------------------------
 # Checks for library functions.
 # ---------------------------------------------------------------------------
-AC_FUNC_ALLOCA
-AC_FUNC_MEMCMP
 AC_FUNC_MKTIME
 AC_FUNC_MMAP
-AC_FUNC_STAT
 AC_FUNC_STRERROR_R
-AC_FUNC_STRFTIME
-AC_FUNC_VPRINTF
 AC_CHECK_FUNCS([gmtime_r memset strchr strerror strtol mmap munmap])
 AC_CHECK_FUNCS([timegm], HAVE_TIMEGM=1)
 AC_SUBST(HAVE_TIMEGM,$HAVE_TIMEGM)

-- 
exiv2 packaging