From b62590493a8e95d3bcbbd0e80ffef5d69d5d5446 Mon Sep 17 00:00:00 2001 From: Thomas Schmitt Date: Wed, 4 Feb 2009 20:06:56 +0000 Subject: [PATCH] Checking for iconv(3) in separate libiconv (e.g. on FreeBSD) --- libisoburn/trunk/configure.ac | 4 ++++ libisoburn/trunk/xorriso/configure_ac.txt | 4 ++++ libisoburn/trunk/xorriso/xorriso_timestamp.h | 2 +- 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/libisoburn/trunk/configure.ac b/libisoburn/trunk/configure.ac index e81951fd..316f8d5d 100644 --- a/libisoburn/trunk/configure.ac +++ b/libisoburn/trunk/configure.ac @@ -70,6 +70,10 @@ if test ! $ac_cv_func_fseeko; then AC_ERROR([Libburn requires largefile support.]) 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, , ) + 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 22ef3790..85d113e7 100644 --- a/libisoburn/trunk/xorriso/configure_ac.txt +++ b/libisoburn/trunk/xorriso/configure_ac.txt @@ -43,6 +43,10 @@ if test ! $ac_cv_func_fseeko; then AC_ERROR([Libburn requires largefile support.]) 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, , ) + 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 0e2af16e..fa501519 100644 --- a/libisoburn/trunk/xorriso/xorriso_timestamp.h +++ b/libisoburn/trunk/xorriso/xorriso_timestamp.h @@ -1 +1 @@ -#define Xorriso_timestamP "2009.02.04.200055" +#define Xorriso_timestamP "2009.02.04.200653"