From d8e1a090f662ca41fe3b249bdfbfd99b3a9c79d2 Mon Sep 17 00:00:00 2001
From: Thomas Schmitt <scdbackup@gmx.net>
Date: Sat, 10 Apr 2010 15:09:18 +0000
Subject: [PATCH] Trying to avoid iconv const warning and multiple -liconv
 options on FreeBSD

---
 libisoburn/trunk/configure.ac                | 11 +++++++++++
 libisoburn/trunk/xorriso/configure_ac.txt    | 14 ++++++++++++--
 libisoburn/trunk/xorriso/xorriso_timestamp.h |  2 +-
 3 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/libisoburn/trunk/configure.ac b/libisoburn/trunk/configure.ac
index f56979e0..d2cb37ff 100644
--- a/libisoburn/trunk/configure.ac
+++ b/libisoburn/trunk/configure.ac
@@ -73,12 +73,23 @@ if test ! $ac_cv_func_fseeko; then
    AC_ERROR([Libburn requires largefile support.])
 fi
 
+if test x$LIBISOBURN_OLD_ICONV_CONFIGURE = x
+then
+
+dnl ts B00410 : To detect the need for -liconv and const argument of iconv()
+LIBBURNIA_CHECK_ICONV
+
+else
+
+dnl Outdated: produces double -liconv and warnings about parameter mismatch
 dnl If iconv(3) is in an extra lib, then it gets added to variable LIBS.
 dnl If not, then no -liconv will be added.
 AC_CHECK_LIB(iconv, iconv, , )
 dnl GNU iconv has no function iconv() but libiconv() and a macro iconv()
 AC_CHECK_LIB(iconv, libiconv, , )
 
+fi
+
 AC_PROG_LIBTOOL
 AC_SUBST(LIBTOOL_DEPS)
 LIBTOOL="$LIBTOOL --silent"
diff --git a/libisoburn/trunk/xorriso/configure_ac.txt b/libisoburn/trunk/xorriso/configure_ac.txt
index fcce14f0..cf762269 100644
--- a/libisoburn/trunk/xorriso/configure_ac.txt
+++ b/libisoburn/trunk/xorriso/configure_ac.txt
@@ -50,12 +50,23 @@ if test ! $ac_cv_func_fseeko; then
    AC_ERROR([Libburn requires largefile support.])
 fi
 
+if test x$XORRISO_OLD_ICONV_CONFIGURE = x
+then
+
+dnl ts B00410 : To detect the need for -liconv and const argument of iconv()
+LIBBURNIA_CHECK_ICONV
+
+else
+
+dnl Outdated: produces double -liconv and warnings about parameter mismatch
 dnl If iconv(3) is in an extra libiconv, then it gets added to variable LIBS.
 dnl If not, then no -liconv will be added.
 AC_CHECK_LIB(iconv, iconv, , )
 dnl GNU iconv has no function iconv() but libiconv() and a macro iconv()
 AC_CHECK_LIB(iconv, libiconv, , )
- 
+
+fi
+
 AC_PROG_LIBTOOL
 AC_SUBST(LIBTOOL_DEPS)
 LIBTOOL="$LIBTOOL --silent"
@@ -90,7 +101,6 @@ AC_SUBST(ARCH)
 AC_SUBST(LIBBURNIA_PKGCONFDIR)
 AC_SUBST(LIBBURN_ARCH_LIBS)
 
-
 dnl ts A90303
 dnl Check the preconditions for using statvfs() in sg-dummy
 dnl (sg-linux and sg-freebsd use statvfs() unconditionally)
diff --git a/libisoburn/trunk/xorriso/xorriso_timestamp.h b/libisoburn/trunk/xorriso/xorriso_timestamp.h
index dcaab55b..38aa7963 100644
--- a/libisoburn/trunk/xorriso/xorriso_timestamp.h
+++ b/libisoburn/trunk/xorriso/xorriso_timestamp.h
@@ -1 +1 @@
-#define Xorriso_timestamP "2010.04.09.171108"
+#define Xorriso_timestamP "2010.04.10.150747"