libburnia/libisoburn
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Trying to avoid iconv const warning and multiple -liconv options on FreeBSD

Browse Source
This commit is contained in:
Thomas Schmitt 2010-04-10 15:09:18 +00:00
parent 006fb7078e
commit 642a2bc48e
3 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
configure.ac
View File

@ -73,12 +73,23 @@ if test ! $ac_cv_func_fseeko; then
AC_ERROR([Libburn requires largefile support.]) AC_ERROR([Libburn requires largefile support.])
fi 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 iconv(3) is in an extra lib, then it gets added to variable LIBS.
dnl If not, then no -liconv will be added. dnl If not, then no -liconv will be added.
AC_CHECK_LIB(iconv, iconv, , ) AC_CHECK_LIB(iconv, iconv, , )
dnl GNU iconv has no function iconv() but libiconv() and a macro iconv() dnl GNU iconv has no function iconv() but libiconv() and a macro iconv()
AC_CHECK_LIB(iconv, libiconv, , ) AC_CHECK_LIB(iconv, libiconv, , )
fi
AC_PROG_LIBTOOL AC_PROG_LIBTOOL
AC_SUBST(LIBTOOL_DEPS) AC_SUBST(LIBTOOL_DEPS)
LIBTOOL="$LIBTOOL --silent" LIBTOOL="$LIBTOOL --silent"

12
xorriso/configure_ac.txt
View File

@ -50,12 +50,23 @@ if test ! $ac_cv_func_fseeko; then
AC_ERROR([Libburn requires largefile support.]) AC_ERROR([Libburn requires largefile support.])
fi 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 iconv(3) is in an extra libiconv, then it gets added to variable LIBS.
dnl If not, then no -liconv will be added. dnl If not, then no -liconv will be added.
AC_CHECK_LIB(iconv, iconv, , ) AC_CHECK_LIB(iconv, iconv, , )
dnl GNU iconv has no function iconv() but libiconv() and a macro iconv() dnl GNU iconv has no function iconv() but libiconv() and a macro iconv()
AC_CHECK_LIB(iconv, libiconv, , ) AC_CHECK_LIB(iconv, libiconv, , )
fi
AC_PROG_LIBTOOL AC_PROG_LIBTOOL
AC_SUBST(LIBTOOL_DEPS) AC_SUBST(LIBTOOL_DEPS)
LIBTOOL="$LIBTOOL --silent" LIBTOOL="$LIBTOOL --silent"
@ -90,7 +101,6 @@ AC_SUBST(ARCH)
AC_SUBST(LIBBURNIA_PKGCONFDIR) AC_SUBST(LIBBURNIA_PKGCONFDIR)
AC_SUBST(LIBBURN_ARCH_LIBS) AC_SUBST(LIBBURN_ARCH_LIBS)
dnl ts A90303 dnl ts A90303
dnl Check the preconditions for using statvfs() in sg-dummy dnl Check the preconditions for using statvfs() in sg-dummy
dnl (sg-linux and sg-freebsd use statvfs() unconditionally) dnl (sg-linux and sg-freebsd use statvfs() unconditionally)

2
xorriso/xorriso_timestamp.h
View File

@ -1 +1 @@
#define Xorriso_timestamP "2010.04.09.171108" #define Xorriso_timestamP "2010.04.10.150747"