diff options
| author | Nathanael Nerode <neroden@gcc.gnu.org> | 2004-08-30 18:58:14 +0000 |
|---|---|---|
| committer | Nathanael Nerode <neroden@gcc.gnu.org> | 2004-08-30 18:58:14 +0000 |
| commit | 68594b415744a958e92cbf6cb1758fed7f21c8de (patch) | |
| tree | 29b5f001ef1ba0d297dce37e651a1902082d0f02 /bfd/acinclude.m4 | |
| parent | 2ba35682602fb989b8550358617fd1b05e274aa0 (diff) | |
| download | binutils-redhat-68594b415744a958e92cbf6cb1758fed7f21c8de.tar.gz | |
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.m4 | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/bfd/acinclude.m4 b/bfd/acinclude.m4 index 63b4bf92b1..37028f951a 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) |