aboutsummaryrefslogtreecommitdiff
path: root/bfd/acinclude.m4
diff options
context:
space:
mode:
authorNathanael Nerode <neroden@gcc.gnu.org>2004-08-30 18:58:14 +0000
committerNathanael Nerode <neroden@gcc.gnu.org>2004-08-30 18:58:14 +0000
commit5464f5a16efb738156e82cff22d1101b21026608 (patch)
tree5be790eabb39fe471b1009f585f634db86992319 /bfd/acinclude.m4
parent68f5350246f10891ea2dfa170e2f67a1465b84b0 (diff)
downloadgdb-5464f5a16efb738156e82cff22d1101b21026608.zip
gdb-5464f5a16efb738156e82cff22d1101b21026608.tar.gz
gdb-5464f5a16efb738156e82cff22d1101b21026608.tar.bz2
2004-08-30 Nathanael Nerode <neroden@gcc.gnu.org>
* acinclude.m4: Require AC_CANONICAL_TARGET, not AC_CANONICAL_SYSTEM. Include ../config/acx.m4 and use ACX_NONCANONICAL_* where appropriate; replace uses of *_alias with *_noncanonical. * aclocal.m4: Rebuild with aclocal 1.4p6. * Makefile.in: Rebuild with automake 1.4p6. * doc/Makefile.in: Rebuild with automake 1.4p6. * configure.in: Autoupdate with autoupdate 2.59. * config.in: Regenerate with autoheader 2.59. * configure: Regnerate with autoconf 2.59.
Diffstat (limited to 'bfd/acinclude.m4')
-rw-r--r--bfd/acinclude.m410
1 files changed, 7 insertions, 3 deletions
diff --git a/bfd/acinclude.m4 b/bfd/acinclude.m4
index 63b4bf9..37028f9 100644
--- a/bfd/acinclude.m4
+++ b/bfd/acinclude.m4
@@ -1,8 +1,9 @@
sinclude(../config/accross.m4)
+sinclude(../config/acx.m4)
dnl See whether we need to use fopen-bin.h rather than fopen-same.h.
AC_DEFUN([BFD_BINARY_FOPEN],
-[AC_REQUIRE([AC_CANONICAL_SYSTEM])
+[AC_REQUIRE([AC_CANONICAL_TARGET])
case "${host}" in
changequote(,)dnl
*-*-msdos* | *-*-go32* | *-*-mingw32* | *-*-cygwin* | *-*-windows*)
@@ -138,12 +139,15 @@ AC_DEFUN([AM_INSTALL_LIBBFD],
fi)
AC_MSG_RESULT($install_libbfd_p)
AM_CONDITIONAL(INSTALL_LIBBFD, test $install_libbfd_p = yes)
+ # Need _noncanonical variables for this.
+ ACX_HOST_NONCANONICAL
+ ACX_TARGET_NONCANONICAL
# libbfd.a is a host library containing target dependent code
bfdlibdir='$(libdir)'
bfdincludedir='$(includedir)'
if test "${host}" != "${target}"; then
- bfdlibdir='$(exec_prefix)/$(host_alias)/$(target_alias)/lib'
- bfdincludedir='$(exec_prefix)/$(host_alias)/$(target_alias)/include'
+ bfdlibdir='$(exec_prefix)/$(host_noncanonical)/$(target_noncanonical)/lib'
+ bfdincludedir='$(exec_prefix)/$(host_noncanonical)/$(target_noncanonical)/include'
fi
AC_SUBST(bfdlibdir)
AC_SUBST(bfdincludedir)