Mercurial > gub
comparison patches/guile-1.9.14-gnulib-libunistring.patch @ 6471:834c939b7f86
guile: always retool and junk putenv.
| author | Jan Nieuwenhuizen <janneke@gnu.org> |
|---|---|
| date | Wed, 02 Feb 2011 18:23:54 +0100 |
| parents | |
| children |
comparison
equal
deleted
inserted
replaced
| 6470:f1b28c608b3a | 6471:834c939b7f86 |
|---|---|
| 1 --- guile-1.9.14/m4/libunistring.m4~ 2010-12-14 19:15:17.000000000 +0100 | |
| 2 +++ guile-1.9.14/m4/libunistring.m4 2011-02-02 02:09:21.822354542 +0100 | |
| 3 @@ -72,9 +72,7 @@ AC_DEFUN([gl_LIBUNISTRING_CORE], | |
| 4 dnl First, try to link without -liconv. libunistring often depends on | |
| 5 dnl libiconv, but we don't know (and often don't need to know) where | |
| 6 dnl libiconv is installed. | |
| 7 - AC_LIB_HAVE_LINKFLAGS([unistring], [], | |
| 8 - [#include <uniconv.h>], [u8_strconv_from_locale((char*)0);], | |
| 9 - [no, trying again together with libiconv]) | |
| 10 + AC_CHECK_LIB(unistring, [u8_strconv_from_locale], [HAVE_LIBUNISTRING=yes ac_cv_libunistring=yes AC_SUBST(HAVE_LIBUNISTRING) LTLIBUNISTRING="-lunistring" AC_SUBST(LTLIBUNISTRING)]) | |
| 11 if test "$ac_cv_libunistring" != yes; then | |
| 12 dnl Second try, with -liconv. | |
| 13 dnl We have to erase the cached result of the first AC_LIB_HAVE_LINKFLAGS | |
| 14 @@ -80,9 +80,7 @@ AC_DEFUN([gl_LIBUNISTRING_CORE], | |
| 15 unset ac_cv_libunistring | |
| 16 glus_save_LIBS="$LIBS" | |
| 17 LIBS="$LIBS $LIBICONV" | |
| 18 - AC_LIB_HAVE_LINKFLAGS([unistring], [], | |
| 19 - [#include <uniconv.h>], [u8_strconv_from_locale((char*)0);], | |
| 20 - [no, consider installing GNU libunistring]) | |
| 21 + AC_CHECK_LIB(unistring, [u8_strconv_from_locale], [HAVE_LIBUNISTRING=yes ac_cv_libunistring=yes AC_SUBST(HAVE_LIBUNISTRING) LTLIBUNISTRING="-lunistring" AC_SUBST(LTLIBUNISTRING)]) | |
| 22 if test -n "$LIBUNISTRING"; then | |
| 23 LIBUNISTRING="$LIBUNISTRING $LIBICONV" | |
| 24 LTLIBUNISTRING="$LTLIBUNISTRING $LTLIBICONV" | |
| 25 @@ -90,9 +90,7 @@ AC_DEFUN([gl_LIBUNISTRING_CORE], | |
| 26 LIBS="$glus_save_LIBS" | |
| 27 fi | |
| 28 else | |
| 29 - AC_LIB_HAVE_LINKFLAGS([unistring], [], | |
| 30 - [#include <uniconv.h>], [u8_strconv_from_locale((char*)0);], | |
| 31 - [no, consider installing GNU libunistring]) | |
| 32 + AC_CHECK_LIB(unistring, [u8_strconv_from_locale], [HAVE_LIBUNISTRING=yes ac_cv_libunistring=yes AC_SUBST(HAVE_LIBUNISTRING) LTLIBUNISTRING="-lunistring" AC_SUBST(LTLIBUNISTRING)]) | |
| 33 fi | |
| 34 if test $HAVE_LIBUNISTRING = yes; then | |
| 35 dnl Determine the installed version. |