mirror of
https://github.com/gnustep/libs-base.git
synced 2025-04-22 16:33:29 +00:00
Check for libgiconv
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@10019 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Adam Fedor
parent
10061bbcde
commit
6c69d5ac69
3 changed files with 77 additions and 15 deletions
|
|
@ -1,3 +1,7 @@
|
|||
2001-05-23 Adam Fedor <fedor@gnu.org>
|
||||
|
||||
* configure.in: Check for libgiconv
|
||||
|
||||
2001-05-22 Adam Fedor <fedor@gnu.org>
|
||||
|
||||
* configure.in: Check CPP handling of LONG_LONG_MAX
|
||||
|
|
|
|||
72
configure
vendored
72
configure
vendored
|
|
@ -3965,7 +3965,7 @@ else
|
|||
fi
|
||||
rm -f conftest*
|
||||
if test $llmax = yes; then
|
||||
echo "$ac_t""ok" 1>&6
|
||||
echo "$ac_t""yes" 1>&6
|
||||
cat >> confdefs.h <<\EOF
|
||||
#define HANDLE_LONG_LONG_MAX 1
|
||||
EOF
|
||||
|
|
@ -5264,8 +5264,57 @@ fi
|
|||
LIBS="$LIBS -L$libiconv_libdir"
|
||||
fi
|
||||
|
||||
echo $ac_n "checking for main in -liconv""... $ac_c" 1>&6
|
||||
echo "configure:5269: checking for main in -liconv" >&5
|
||||
# BSDs install this lib as libgiconv
|
||||
echo $ac_n "checking for main in -lgiconv""... $ac_c" 1>&6
|
||||
echo "configure:5270: checking for main in -lgiconv" >&5
|
||||
ac_lib_var=`echo giconv'_'main | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lgiconv $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 5278 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
int main() {
|
||||
main()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:5285: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_lib_$ac_lib_var=yes"
|
||||
else
|
||||
echo "configure: failed program was:" >&5
|
||||
cat conftest.$ac_ext >&5
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_lib_$ac_lib_var=no"
|
||||
fi
|
||||
rm -f conftest*
|
||||
LIBS="$ac_save_LIBS"
|
||||
|
||||
fi
|
||||
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
|
||||
echo "$ac_t""yes" 1>&6
|
||||
ac_tr_lib=HAVE_LIB`echo giconv | sed -e 's/[^a-zA-Z0-9_]/_/g' \
|
||||
-e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
|
||||
cat >> confdefs.h <<EOF
|
||||
#define $ac_tr_lib 1
|
||||
EOF
|
||||
|
||||
LIBS="-lgiconv $LIBS"
|
||||
|
||||
else
|
||||
echo "$ac_t""no" 1>&6
|
||||
fi
|
||||
|
||||
if test x"$av_cv_lib_giconv_main" = xyes; then
|
||||
LIBS="$LIBS -lgiconv"
|
||||
|
||||
SYSTEM_DEFS="-DHAVE_ICONV $SYSTEM_DEFS"
|
||||
else
|
||||
echo $ac_n "checking for main in -liconv""... $ac_c" 1>&6
|
||||
echo "configure:5318: checking for main in -liconv" >&5
|
||||
ac_lib_var=`echo iconv'_'main | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
|
|
@ -5273,14 +5322,14 @@ else
|
|||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-liconv $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 5277 "configure"
|
||||
#line 5326 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
int main() {
|
||||
main()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:5284: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:5333: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_lib_$ac_lib_var=yes"
|
||||
else
|
||||
|
|
@ -5307,12 +5356,13 @@ else
|
|||
echo "$ac_t""no" 1>&6
|
||||
fi
|
||||
|
||||
if test x"$av_cv_lib_iconv_main" = xyes; then
|
||||
LIBS="$LIBS -liconv"
|
||||
|
||||
SYSTEM_DEFS="-DHAVE_ICONV $SYSTEM_DEFS"
|
||||
else
|
||||
LIBS="$libs_temp";
|
||||
if test x"$av_cv_lib_iconv_main" = xyes; then
|
||||
LIBS="$LIBS -liconv"
|
||||
|
||||
SYSTEM_DEFS="-DHAVE_ICONV $SYSTEM_DEFS"
|
||||
else
|
||||
LIBS="$libs_temp"
|
||||
fi
|
||||
fi
|
||||
else
|
||||
SYSTEM_DEFS="-DHAVE_ICONV $SYSTEM_DEFS"
|
||||
|
|
|
|||
16
configure.in
16
configure.in
|
|
@ -853,13 +853,21 @@ if test $ac_cv_func_iconv = no; then
|
|||
LIBS="$LIBS -L$libiconv_libdir"
|
||||
fi
|
||||
|
||||
AC_CHECK_LIB(iconv, main)
|
||||
if test x"$av_cv_lib_iconv_main" = xyes; then
|
||||
LIBS="$LIBS -liconv"
|
||||
# BSDs install this lib as libgiconv
|
||||
AC_CHECK_LIB(giconv, main)
|
||||
if test x"$av_cv_lib_giconv_main" = xyes; then
|
||||
LIBS="$LIBS -lgiconv"
|
||||
AC_SUBST(LIBS)
|
||||
SYSTEM_DEFS="-DHAVE_ICONV $SYSTEM_DEFS"
|
||||
else
|
||||
LIBS="$libs_temp";
|
||||
AC_CHECK_LIB(iconv, main)
|
||||
if test x"$av_cv_lib_iconv_main" = xyes; then
|
||||
LIBS="$LIBS -liconv"
|
||||
AC_SUBST(LIBS)
|
||||
SYSTEM_DEFS="-DHAVE_ICONV $SYSTEM_DEFS"
|
||||
else
|
||||
LIBS="$libs_temp"
|
||||
fi
|
||||
fi
|
||||
else
|
||||
SYSTEM_DEFS="-DHAVE_ICONV $SYSTEM_DEFS"
|
||||
|
|
|
|||
Loading…
Reference in a new issue