40 lines
1.3 KiB
Diff
40 lines
1.3 KiB
Diff
|
diff -Naur freetds-0.82.orig/m4/iconv.m4 freetds-0.82/m4/iconv.m4
|
||
|
|
--- freetds-0.82.orig/m4/iconv.m4 2006-03-27 19:05:42.000000000 -0500
|
||
|
|
+++ freetds-0.82/m4/iconv.m4 2009-02-20 17:07:53.000000000 -0500
|
||
|
|
@@ -9,32 +9,20 @@
|
||
|
|
|
||
|
|
dnl From Bruno Haible.
|
||
|
|
|
||
|
|
-AC_DEFUN([AM_ICONV_LINKFLAGS_BODY],
|
||
|
|
-[
|
||
|
|
- dnl Prerequisites of AC_LIB_LINKFLAGS_BODY.
|
||
|
|
- AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
|
||
|
|
- AC_REQUIRE([AC_LIB_RPATH])
|
||
|
|
-
|
||
|
|
- dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV
|
||
|
|
- dnl accordingly.
|
||
|
|
- AC_LIB_LINKFLAGS_BODY([iconv])
|
||
|
|
-])
|
||
|
|
-
|
||
|
|
AC_DEFUN([AM_ICONV_LINK],
|
||
|
|
[
|
||
|
|
dnl Some systems have iconv in libc, some have it in libiconv (OSF/1 and
|
||
|
|
dnl those with the standalone portable GNU libiconv installed).
|
||
|
|
|
||
|
|
- dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV
|
||
|
|
- dnl accordingly.
|
||
|
|
- AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY])
|
||
|
|
+ LIBICONV=
|
||
|
|
+ LTLIBICONV=
|
||
|
|
+ INCICONV=
|
||
|
|
|
||
|
|
dnl Add $INCICONV to CPPFLAGS before performing the following checks,
|
||
|
|
dnl because if the user has installed libiconv and not disabled its use
|
||
|
|
dnl via --without-libiconv-prefix, he wants to use it. The first
|
||
|
|
dnl AC_TRY_LINK will then fail, the second AC_TRY_LINK will succeed.
|
||
|
|
am_save_CPPFLAGS="$CPPFLAGS"
|
||
|
|
- AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCICONV])
|
||
|
|
|
||
|
|
AC_CACHE_CHECK(for iconv, am_cv_func_iconv, [
|
||
|
|
am_cv_func_iconv="no, consider installing GNU libiconv"
|