| 1 |
diff -Naur freetds-0.82.orig/m4/iconv.m4 freetds-0.82/m4/iconv.m4 |
| 2 |
--- freetds-0.82.orig/m4/iconv.m4 2006-03-27 19:05:42.000000000 -0500 |
| 3 |
+++ freetds-0.82/m4/iconv.m4 2009-02-20 17:07:53.000000000 -0500 |
| 4 |
@@ -9,32 +9,20 @@ |
| 5 |
|
| 6 |
dnl From Bruno Haible. |
| 7 |
|
| 8 |
-AC_DEFUN([AM_ICONV_LINKFLAGS_BODY], |
| 9 |
-[ |
| 10 |
- dnl Prerequisites of AC_LIB_LINKFLAGS_BODY. |
| 11 |
- AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) |
| 12 |
- AC_REQUIRE([AC_LIB_RPATH]) |
| 13 |
- |
| 14 |
- dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV |
| 15 |
- dnl accordingly. |
| 16 |
- AC_LIB_LINKFLAGS_BODY([iconv]) |
| 17 |
-]) |
| 18 |
- |
| 19 |
AC_DEFUN([AM_ICONV_LINK], |
| 20 |
[ |
| 21 |
dnl Some systems have iconv in libc, some have it in libiconv (OSF/1 and |
| 22 |
dnl those with the standalone portable GNU libiconv installed). |
| 23 |
|
| 24 |
- dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV |
| 25 |
- dnl accordingly. |
| 26 |
- AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY]) |
| 27 |
+ LIBICONV= |
| 28 |
+ LTLIBICONV= |
| 29 |
+ INCICONV= |
| 30 |
|
| 31 |
dnl Add $INCICONV to CPPFLAGS before performing the following checks, |
| 32 |
dnl because if the user has installed libiconv and not disabled its use |
| 33 |
dnl via --without-libiconv-prefix, he wants to use it. The first |
| 34 |
dnl AC_TRY_LINK will then fail, the second AC_TRY_LINK will succeed. |
| 35 |
am_save_CPPFLAGS="$CPPFLAGS" |
| 36 |
- AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCICONV]) |
| 37 |
|
| 38 |
AC_CACHE_CHECK(for iconv, am_cv_func_iconv, [ |
| 39 |
am_cv_func_iconv="no, consider installing GNU libiconv" |
Parent Directory
| 
Revision Log