From b4729a60045c261e652b5569b2f7f114e9bb363b Mon Sep 17 00:00:00 2001 From: Thomas Schmitt Date: Tue, 30 Jun 2009 12:03:09 +0000 Subject: [PATCH] Provisory patch on ticket 152: GNU libiconv needs -liconv but offers no iconv() --- libisoburn/trunk/configure.ac | 2 ++ libisoburn/trunk/xorriso/configure_ac.txt | 4 +++- libisoburn/trunk/xorriso/xorriso_timestamp.h | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/libisoburn/trunk/configure.ac b/libisoburn/trunk/configure.ac index d9de7961..f415439c 100644 --- a/libisoburn/trunk/configure.ac +++ b/libisoburn/trunk/configure.ac @@ -74,6 +74,8 @@ fi 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, , ) AC_PROG_LIBTOOL AC_SUBST(LIBTOOL_DEPS) diff --git a/libisoburn/trunk/xorriso/configure_ac.txt b/libisoburn/trunk/xorriso/configure_ac.txt index 5f05fedc..1291dfc0 100644 --- a/libisoburn/trunk/xorriso/configure_ac.txt +++ b/libisoburn/trunk/xorriso/configure_ac.txt @@ -46,7 +46,9 @@ fi 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, , ) + AC_PROG_LIBTOOL AC_SUBST(LIBTOOL_DEPS) LIBTOOL="$LIBTOOL --silent" diff --git a/libisoburn/trunk/xorriso/xorriso_timestamp.h b/libisoburn/trunk/xorriso/xorriso_timestamp.h index b3a5a5a4..34e45d2f 100644 --- a/libisoburn/trunk/xorriso/xorriso_timestamp.h +++ b/libisoburn/trunk/xorriso/xorriso_timestamp.h @@ -1 +1 @@ -#define Xorriso_timestamP "2009.06.28.100124" +#define Xorriso_timestamP "2009.06.30.120311"