darkkirb/old-cross-binutils
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Cannot find in-tree libiconv.a after reconfigure.

Browse source 
* acinclude.m4 (AM_ICONV): If we find an in-tree libiconv.a
        that we can use, then cache the path to this archive.
        * configure: Regenerate.
This commit is contained in:
Joel Brobecker 2010-01-08 07:16:43 +00:00
parent fb34365b48
commit f0f209491f
3 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
gdb/ChangeLog
View file

@ -1,3 +1,10 @@
2009-01-08 Joel Brobecker <brobecker@adacore.com>
Cannot find in-tree libiconv.a after reconfigure.
* acinclude.m4 (AM_ICONV): If we find an in-tree libiconv.a
that we can use, then cache the path to this archive.
* configure: Regenerate.
2010-01-07 Stan Shebs <stan@codesourcery.com>
Make tracepoint operations go through target vector.

5
gdb/acinclude.m4
View file

@ -192,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.
@ -207,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
@ -260,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

5
gdb/configure vendored
View file

@ -8328,6 +8328,7 @@ else
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.
@ -8353,6 +8354,7 @@ iconv_t cd = iconv_open("","");
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
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
fi
@ -8361,7 +8363,6 @@ rm -f core conftest.err conftest.$ac_objext \
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
@ -8438,7 +8439,7 @@ $as_echo "$am_cv_func_iconv" >&6; }
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