2010-05-24 Michael Snyder <msnyder@vmware.com>

[binutils-gdb.git] / gdb / acinclude.m4

diff --git a/gdb/acinclude.m4 b/gdb/acinclude.m4
index 3684c1861c7b8c396f2349d69449e173517d6c2b..e3f604ecff6ee7fe40ec6687c1b374055c5e161c 100644 (file)
--- a/gdb/acinclude.m4
+++ b/gdb/acinclude.m4
@@ -169,7 +169,8 @@ case "x$am_cv_prog_cc_stdc" in
 esac
 ])
 
-dnl From Bruno Haible.
+dnl Originally from Bruno Haible, but with some modifications
+dnl for the GDB project.
 
 AC_DEFUN([AM_ICONV],
 [
@@ -191,6 +192,7 @@ AC_DEFUN([AM_ICONV],
     am_cv_func_iconv="no, consider installing GNU libiconv"
     am_cv_lib_iconv=no
     am_cv_use_build_libiconv=no
+    am_cv_build_libiconv_path=
 
     # If libiconv is part of the build tree, then try using it over
     # any system iconv.
@@ -206,12 +208,12 @@ AC_DEFUN([AM_ICONV],
            iconv(cd,NULL,NULL,NULL,NULL);
            iconv_close(cd);],
           am_cv_use_build_libiconv=yes
+          am_cv_build_libiconv_path=$lib_dir/libiconv.a
           am_cv_lib_iconv=yes
           am_cv_func_iconv=yes)
         LIBS="$am_save_LIBS"
         CPPFLAGS="$am_save_CPPFLAGS"
         if test "$am_cv_use_build_libiconv" = "yes"; then
-          BUILD_LIBICONV_LIBDIR=$lib_dir
           break
         fi
       done
@@ -259,7 +261,7 @@ AC_DEFUN([AM_ICONV],
     LIBICONV_INCLUDE=
   fi
   if test "$am_cv_use_build_libiconv" = yes; then
-    LIBICONV="$BUILD_LIBICONV_LIBDIR/libiconv.a"
+    LIBICONV="$am_cv_build_libiconv_path"
     LIBICONV_LIBDIR=""
     LIBICONV_INCLUDE="$BUILD_LIBICONV_INCLUDE"
   fi