comparison configure.in @ 108145:947dd776616f

Move test for 64-bit kernel with 32-bit userland to configure. See discussion in bug#5655. * configure.in (machine, canonical): On amdx86-64, check for a 32-bit userland and maybe change values to i386 (move test from s/amdx86-64.h). * src/m/amdx86-64.h [i386]: Move this test to configure.in.
author Glenn Morris <rgm@gnu.org>
date Tue, 27 Apr 2010 23:43:38 -0700
parents 43dcbd8381dc
children 40b36ac1946f
comparison
equal deleted inserted replaced
108144:c46b2d0614cb 108145:947dd776616f
759 AC_PROG_CPP 759 AC_PROG_CPP
760 AC_PROG_INSTALL 760 AC_PROG_INSTALL
761 if test "x$RANLIB" = x; then 761 if test "x$RANLIB" = x; then
762 AC_PROG_RANLIB 762 AC_PROG_RANLIB
763 fi 763 fi
764
765 ## Although we're running on an amd64 kernel, we're actually compiling for
766 ## the x86 architecture. The user should probably have provided an
767 ## explicit --build to `configure', but if everything else than the kernel
768 ## is running in i386 mode, we can help them out.
769 if test "$machine" = "amdx86-64"; then
770 AC_CHECK_DECL([i386])
771 if test "$ac_cv_have_decl_i386" = "yes"; then
772 canonical=`echo "$canonical" | sed -e 's/^amd64/i386/' -e 's/^x86_64/i386/'`
773 machine=intel386
774 machfile="m/${machine}.h"
775 fi
776 fi
777
764 AC_PATH_PROG(INSTALL_INFO, install-info) 778 AC_PATH_PROG(INSTALL_INFO, install-info)
765 AC_PATH_PROG(INSTALL_INFO, install-info,, /usr/sbin) 779 AC_PATH_PROG(INSTALL_INFO, install-info,, /usr/sbin)
766 AC_PATH_PROG(INSTALL_INFO, install-info,:, /sbin) 780 AC_PATH_PROG(INSTALL_INFO, install-info,:, /sbin)
767 dnl Don't use GZIP, which is used by gzip for additional parameters. 781 dnl Don't use GZIP, which is used by gzip for additional parameters.
768 AC_PATH_PROG(GZIP_PROG, gzip) 782 AC_PATH_PROG(GZIP_PROG, gzip)