2006-04-19 Jeff Johnston <jjohnstn@redhat.com>
* configure.in: Modified to support autoconf 2.59. * */configure.in: Ditto. * configure: Regenerated. * */configure: Ditto. * wince/aclocal.m4: Ditto. * acinclude.m4: New file. * aclocal.m4: Ditto. * arm/aclocal.m4: Ditto. * cris/aclocal.m4: Ditto. * crx/aclocal.m4: Ditto. * d30v/aclocal.m4: Ditto. * fr30/aclocal.m4: Ditto. * frv/aclocal.m4: Ditto. * hp74x/aclocal.m4: Ditto. * i386/aclocal.m4: Ditto. * i960/aclocal.m4: Ditto. * iq2000/aclocal.m4: Ditto. * libnosys/aclocal.m4: Ditto. * m32c/aclocal.m4: Ditto. * m32r/aclocal.m4: Ditto. * m68hc11/aclocal.m4: Ditto. * m68k/aclocal.m4: Ditto. * mcore/aclocal.m4: Ditto. * mips/aclocal.m4: Ditto. * mn10200/aclocal.m4: Ditto. * mn10300/aclocal.m4: Ditto. * mt/aclocal.m4: Ditto. * pa/aclocal.m4: Ditto. * rs6000/aclocal.m4: Ditto. * sparc/aclocal.m4: Ditto. * sparc/libsys/aclocal.m4: Ditto. * xstormy16/aclocal.m4: Ditto.
This commit is contained in:
@@ -1,6 +1,7 @@
|
||||
dnl Process this file with autoconf to produce a configure script.
|
||||
AC_PREREQ(2.7)dnl
|
||||
AC_INIT(README)
|
||||
AC_PREREQ(2.59)
|
||||
AC_INIT([libgloss],[LIBGLOSS_VERSION])
|
||||
AC_CONFIG_SRCDIR([libnosys])
|
||||
|
||||
if test "${enable_shared}" = "yes" ; then
|
||||
echo "Shared libraries not supported for cross compiling, ignored"
|
||||
@@ -20,156 +21,111 @@ AC_CONFIG_AUX_DIR($libgloss_topdir)
|
||||
AC_PROG_INSTALL
|
||||
|
||||
AC_CANONICAL_SYSTEM
|
||||
AM_INIT_AUTOMAKE([cygnus no-define 1.9.5])
|
||||
|
||||
if test -z "${with_multisubdir}" ; then
|
||||
configdirs="doc libnosys"
|
||||
else
|
||||
configdirs="libnosys"
|
||||
AC_CONFIG_SUBDIRS(doc)
|
||||
fi
|
||||
|
||||
AC_CONFIG_SUBDIRS(libnosys)
|
||||
|
||||
case "${target}" in
|
||||
i[[3456]]86-*-elf*|i[[3456]]86-*-coff*)
|
||||
configdirs="${configdirs} i386 testsuite";
|
||||
i[[3456]]86-*-elf* | i[[3456]]86-*-coff*)
|
||||
AC_CONFIG_SUBDIRS(i386)
|
||||
config_testsuite = true;
|
||||
;;
|
||||
m32r-*-*)
|
||||
configdirs="${configdirs} m32r testsuite"
|
||||
AC_CONFIG_SUBDIRS(m32r)
|
||||
config_testsuite = true;
|
||||
;;
|
||||
m68hc11-*-*|m6811-*-*|m68hc12-*-*|m6812-*-*)
|
||||
configdirs="m68hc11 testsuite"
|
||||
m68hc11-*-* | m6811-*-* | m68hc12-*-* | m6812-*-*)
|
||||
AC_CONFIG_SUBDIRS(m68hc11)
|
||||
config_testsuite = true;
|
||||
;;
|
||||
m68*-*-*)
|
||||
configdirs="${configdirs} m68k testsuite"
|
||||
AC_CONFIG_SUBDIRS(m68k)
|
||||
config_testsuite = true;
|
||||
;;
|
||||
hppa*-*-pro*)
|
||||
configdirs="${configdirs} pa testsuite"
|
||||
AC_CONFIG_SUBDIRS(pa)
|
||||
config_testsuite = true;
|
||||
;;
|
||||
i960-*-coff)
|
||||
configdirs="${configdirs} i960 testsuite"
|
||||
AC_CONFIG_SUBDIRS(i960)
|
||||
config_testsuite = true;
|
||||
;;
|
||||
sparc-*-elf*)
|
||||
configdirs="${configdirs} sparc testsuite"
|
||||
sparclet-*-aout* | sparc-*-elf* | sparc64-*-elf* | sparc86x-*-* | sparclite-*-*)
|
||||
AC_CONFIG_SUBDIRS(sparc)
|
||||
config_testsuite = true;
|
||||
;;
|
||||
sparc64-*-elf*)
|
||||
configdirs="${configdirs} sparc testsuite"
|
||||
;;
|
||||
sparc86x-*-*)
|
||||
configdirs="${configdirs} sparc testsuite"
|
||||
;;
|
||||
sparclite-*-*)
|
||||
configdirs="${configdirs} sparc testsuite"
|
||||
;;
|
||||
sparclet-*-aout*)
|
||||
configdirs="${configdirs} sparc sparc/libsys testsuite"
|
||||
;;
|
||||
*arm-wince-pe)
|
||||
configdirs="wince"
|
||||
;;
|
||||
*arm-*-*)
|
||||
configdirs="${configdirs} arm"
|
||||
;;
|
||||
sh*-*-pe)
|
||||
configdirs="wince"
|
||||
;;
|
||||
mips*-*-pe)
|
||||
configdirs="wince"
|
||||
sh*-*-pe | mips*-*-pe | *arm-wince-pe)
|
||||
AC_CONFIG_SUBDIRS(wince)
|
||||
;;
|
||||
mips*-*-*)
|
||||
configdirs="${configdirs} mips testsuite"
|
||||
AC_CONFIG_SUBDIRS(mips)
|
||||
config_testsuite = true;
|
||||
;;
|
||||
powerpc-*-*|powerpcle-*-*)
|
||||
configdirs="${configdirs} rs6000 testsuite"
|
||||
AC_CONFIG_SUBDIRS(rs6000)
|
||||
config_testsuite = true;
|
||||
;;
|
||||
mn10200-*-*)
|
||||
configdirs="${configdirs} mn10200 testsuite"
|
||||
AC_CONFIG_SUBDIRS(mn10200)
|
||||
config_testsuite = true;
|
||||
;;
|
||||
mn10300-*-*)
|
||||
configdirs="${configdirs} mn10300 testsuite"
|
||||
AC_CONFIG_SUBDIRS(mn10300)
|
||||
config_testsuite = true;
|
||||
;;
|
||||
cris-*-* | crisv32-*-*)
|
||||
configdirs="${configdirs} cris testsuite"
|
||||
AC_CONFIG_SUBDIRS(cris)
|
||||
config_testsuite = true;
|
||||
;;
|
||||
crx-*-*)
|
||||
configdirs="${configdirs} crx"
|
||||
AC_CONFIG_SUBDIRS(crx)
|
||||
;;
|
||||
d30v-*-*)
|
||||
configdirs="${configdirs} d30v testsuite"
|
||||
AC_CONFIG_SUBDIRS(d30v)
|
||||
config_testsuite = true;
|
||||
;;
|
||||
fr30-*-*)
|
||||
configdirs="${configdirs} fr30 testsuite"
|
||||
AC_CONFIG_SUBDIRS(fr30)
|
||||
config_testsuite = true;
|
||||
;;
|
||||
frv*-*-*)
|
||||
configdirs="${configdirs} frv testsuite"
|
||||
AC_CONFIG_SUBDIRS(frv)
|
||||
config_testsuite = true;
|
||||
;;
|
||||
mcore-*-*)
|
||||
configdirs="${configdirs} mcore testsuite"
|
||||
AC_CONFIG_SUBDIRS(mcore)
|
||||
config_testsuite = true;
|
||||
;;
|
||||
mt-*-*)
|
||||
configdirs="${configdirs} mt testsuite";;
|
||||
AC_CONFIG_SUBDIRS(mt)
|
||||
config_testsuite = true;
|
||||
;;
|
||||
xstormy16-*-*)
|
||||
configdirs="${configdirs} xstormy16 testsuite"
|
||||
AC_CONFIG_SUBDIRS(xstormy16)
|
||||
config_testsuite = true;
|
||||
;;
|
||||
m32c-*-*)
|
||||
configdirs="${configdirs} m32c testsuite"
|
||||
AC_CONFIG_SUBDIRS(m32c)
|
||||
config_testsuite = true;
|
||||
;;
|
||||
strongarm-*-elf | strongarm-*-coff)
|
||||
configdirs="${configdirs} arm testsuite";
|
||||
;;
|
||||
arm*-*-elf | arm*-*-coff)
|
||||
configdirs="${configdirs} arm testsuite";
|
||||
;;
|
||||
ep9312-*-elf | ep9312-*-coff)
|
||||
configdirs="${configdirs} arm testsuite";
|
||||
;;
|
||||
xscale-*-elf | xscale-*-coff)
|
||||
configdirs="${configdirs} arm testsuite";
|
||||
strongarm-*-elf | strongarm-*-coff | arm*-*-elf | arm*-*-coff | ep9312-*-elf | ep9312-*-coff | xscale-*-elf | xscale-*-coff | *arm-*-*)
|
||||
AC_CONFIG_SUBDIRS(arm)
|
||||
config_testsuite = true;
|
||||
;;
|
||||
iq2000-*-*)
|
||||
configdirs="${configdirs} iq2000 testsuite";;
|
||||
|
||||
AC_CONFIG_SUBDIRS(iq2000)
|
||||
config_testsuite = true;
|
||||
;;
|
||||
esac
|
||||
|
||||
# temporarily strip out testsuite
|
||||
configdirs=`echo $configdirs | sed 's/testsuite//'`
|
||||
|
||||
AC_CONFIG_SUBDIRS($configdirs)
|
||||
|
||||
# FIXME: We temporarily define our own version of AC_PROG_CC. This is
|
||||
# copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS. We
|
||||
# are probably using a cross compiler, which will not be able to fully
|
||||
# link an executable. This should really be fixed in autoconf
|
||||
# itself.
|
||||
|
||||
AC_DEFUN(LIB_AC_PROG_CC,
|
||||
[AC_BEFORE([$0], [AC_PROG_CPP])dnl
|
||||
AC_CHECK_PROG(CC, gcc, gcc)
|
||||
if test -z "$CC"; then
|
||||
AC_CHECK_PROG(CC, cc, cc, , , /usr/ucb/cc)
|
||||
test -z "$CC" && AC_MSG_ERROR([no acceptable cc found in \$PATH])
|
||||
fi
|
||||
|
||||
AC_PROG_CC_GNU
|
||||
|
||||
if test $ac_cv_prog_gcc = yes; then
|
||||
GCC=yes
|
||||
dnl Check whether -g works, even if CFLAGS is set, in case the package
|
||||
dnl plays around with CFLAGS (such as to build both debugging and
|
||||
dnl normal versions of a library), tasteless as that idea is.
|
||||
ac_test_CFLAGS="${CFLAGS+set}"
|
||||
ac_save_CFLAGS="$CFLAGS"
|
||||
CFLAGS=
|
||||
AC_PROG_CC_G
|
||||
if test "$ac_test_CFLAGS" = set; then
|
||||
CFLAGS="$ac_save_CFLAGS"
|
||||
elif test $ac_cv_prog_cc_g = yes; then
|
||||
CFLAGS="-g -O2"
|
||||
else
|
||||
CFLAGS="-O2"
|
||||
fi
|
||||
else
|
||||
GCC=
|
||||
test "${CFLAGS+set}" = set || CFLAGS="-g"
|
||||
fi
|
||||
])
|
||||
# For now, don't bother configuring testsuite
|
||||
#
|
||||
# if test ${config_testsuite); then AC_CONFIG_SUBDIRS(testsuite); fi
|
||||
#
|
||||
|
||||
LIB_AC_PROG_CC
|
||||
AS=${AS-as}
|
||||
@@ -180,6 +136,7 @@ AC_SUBST(AR)
|
||||
LD=${LD-ld}
|
||||
AC_SUBST(LD)
|
||||
AC_PROG_RANLIB
|
||||
LIB_AM_PROG_AS
|
||||
|
||||
host_makefile_frag=${srcdir}/config/default.mh
|
||||
|
||||
@@ -192,7 +149,7 @@ AC_SUBST(host_makefile_frag_path)
|
||||
AC_SUBST_FILE(host_makefile_frag)
|
||||
|
||||
# for now, only add multilibs for specific targets
|
||||
AC_OUTPUT(Makefile,
|
||||
AC_CONFIG_FILES(Makefile,
|
||||
. ${libgloss_topdir}/config-ml.in,
|
||||
srcdir=${srcdir}
|
||||
target=${target}
|
||||
@@ -201,6 +158,6 @@ ac_configure_args="--enable-multilib ${ac_configure_args}"
|
||||
CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
|
||||
libgloss_topdir=${libgloss_topdir}
|
||||
)
|
||||
|
||||
AC_OUTPUT
|
||||
|
||||
|
||||
|
Reference in New Issue
Block a user