Browse Source

libiconv: remove function, which is not available w/o libiconv a4 macros

Waldemar Brodkorb 2 years ago
parent
commit
d89de5cba6
2 changed files with 2 additions and 17 deletions
  1. 1 16
      libiconv/m4/iconv.m4
  2. 1 1
      utils/xgettext

+ 1 - 16
libiconv/m4/iconv.m4

@@ -6,33 +6,18 @@ dnl with or without modifications, as long as this notice is preserved.
 
 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).
   AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
 
-  dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV
-  dnl accordingly.
-  AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY])
-
   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])
+  dnl AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCICONV])
 
   AC_CACHE_CHECK([for iconv], [am_cv_func_iconv], [
     am_cv_func_iconv="no, consider installing GNU libiconv"

+ 1 - 1
utils/xgettext

@@ -103,6 +103,6 @@ while true ; do
 done
 
 [ "$outputfile" = "-" ] && exit 0
-#[ -z "$outputdir" ] && outputdir=.
+[ -z "$outputdir" ] && outputdir=.
 [ -z "$outputfile" ] && outputfile=${domain}.po
 touch $outputdir/$outputfile