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

Provisory remedy for missing compile option -liconv

Browse Source 
with GNU libiconv on FreeBSD.
This commit is contained in:
Thomas Schmitt 2009-06-30 13:41:34 +02:00
parent 0e14549521
commit e52b5e7f2a
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
configure.ac
View File

@ -87,7 +87,13 @@ fi
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.
dnl test ticket 151
### LIBICONV=
### ifdef(AM_ICONV, AM_ICONV, AC_CHECK_LIB(iconv, iconv, , ))
### LIBS="$LIBS $LIBICONV"
AC_CHECK_LIB(iconv, iconv, , ) 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_PROG_LIBTOOL
AC_SUBST(LIBTOOL_DEPS) AC_SUBST(LIBTOOL_DEPS)

2
libisofs/libisofs.h
View File

@ -4412,7 +4412,7 @@ int iso_node_get_attrs(IsoNode *node, size_t *num_attrs,
* @param flag * @param flag
* Bitfield for control purposes, unused yet, submit 0 * Bitfield for control purposes, unused yet, submit 0
* @return * @return
* 1= name found , 0= name not found , <0 indicates error error * 1= name found , 0= name not found , <0 indicates error
* *
* @since 0.6.18 * @since 0.6.18
*/ */

5
libisofs/make_isohybrid_mbr.c
View File

@ -25,12 +25,13 @@ and is now under the licenses to which H.Peter Anvin agreed:
or both, at your option. or both, at your option.
Sincerely, H. Peter Anvin Sincerely, H. Peter Anvin
In the context of libisofs this code derives its matching open source In the context of xorriso-standalone, this code is under GPLv2 derived from
LGPL. In the context of libisofs this code derives its matching open source
license from above stem licenses, typically from LGPL. license from above stem licenses, typically from LGPL.
In case its generosity is needed, here is the 2-clause BSD license: In case its generosity is needed, here is the 2-clause BSD license:
make_isohybrid_mbr.c is copyright 2002-2008 H. Peter Anvin make_isohybrid_mbr.c is copyright 2002-2008 H. Peter Anvin
and 2008 libburnia project. and 2008-2009 libburnia project.
1. Redistributions of source code must retain the above copyright notice, 1. Redistributions of source code must retain the above copyright notice,
this list of conditions and the following disclaimer. this list of conditions and the following disclaimer.