gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-04-22 16:33:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

Include giconv.h

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@10020 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Adam Fedor 2001-05-24 04:00:15 +00:00
parent 6c69d5ac69
commit 61e4c24bb6
4 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
ChangeLog
View file

@ -1,6 +1,7 @@
2001-05-23 Adam Fedor <fedor@gnu.org>
* configure.in: Check for libgiconv
* Unicode.m: Include giconv.h if available.
2001-05-22 Adam Fedor <fedor@gnu.org>

4
Source/Unicode.m
View file

@ -42,7 +42,11 @@ struct _ucc_ {unichar from; char to;};
#include "unicode/decomp.h"
#ifdef HAVE_ICONV
#ifdef HAVE_GICONV_H
#include <giconv.h>
#else
#include <iconv.h>
#endif
#include <errno.h>
// The rest of the GNUstep code stores UNICODE in internal byte order,

2
configure vendored
View file

@ -5311,7 +5311,7 @@ fi
if test x"$av_cv_lib_giconv_main" = xyes; then
LIBS="$LIBS -lgiconv"
SYSTEM_DEFS="-DHAVE_ICONV $SYSTEM_DEFS"
SYSTEM_DEFS="-DHAVE_ICONV -DHAVE_GICONV_H $SYSTEM_DEFS"
else
echo $ac_n "checking for main in -liconv""... $ac_c" 1>&6
echo "configure:5318: checking for main in -liconv" >&5

2
configure.in
View file

@ -858,7 +858,7 @@ if test $ac_cv_func_iconv = no; then
if test x"$av_cv_lib_giconv_main" = xyes; then
LIBS="$LIBS -lgiconv"
AC_SUBST(LIBS)
SYSTEM_DEFS="-DHAVE_ICONV $SYSTEM_DEFS"
SYSTEM_DEFS="-DHAVE_ICONV -DHAVE_GICONV_H $SYSTEM_DEFS"
else
AC_CHECK_LIB(iconv, main)
if test x"$av_cv_lib_iconv_main" = xyes; then