diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2001-12-20 17:33:23 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2001-12-20 17:33:23 +0000 |
| commit | ba748523d172d32b4c7d6207f6c2c5444c8f93a3 (patch) | |
| tree | 7fe6e24d8b195b0dec0138a29712948e81aa8b25 /aclocal/multi.m4 | |
| parent | 2001-12-20 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff) | |
| download | rtems-ba748523d172d32b4c7d6207f6c2c5444c8f93a3.tar.bz2 | |
2001-12-20 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* configure.ac: Reworked for multilibs, reflect changes to aclocal/*.m4.
* aclocal/subdirs.m4: New file.
* aclocal/multi.m4: New file, adopted from autoconf-2.52 w/
modifications.
* aclocal/check-posix.m4: Apply AS_IF.
* aclocal/config-subdirs.m4: Reflect changes to other m4-macros.
* aclocal/env-rtemsbsp.m4: Add PROJECT_INCLUDE, PROJECT_RELEASE.
Add AM_CONDITIONAL(MULTILIB). Adapt GCC_SPECS to multilibs.
* aclocal/env-rtemscpu.m4: Remove RTEMS_BSP. Add support for
MULTIBUILDTOP, MULTISUBDIR. Adapt GCC_SPECS to multilibs.
Add PROJECT_INCLUDE, PROJECT_RELEASE, includedir, libdir.
* aclocal/multilib.m4: Fix m4-quoting, adopt automake-1.5's
OUTPUT_COMMANDS.
* aclocal/project-root.m4: Remove PROJECT_INCLUDE, PROJECT_RELEASE.
* aclocal/rtems-debug.m4: Minor cleanups.
* aclocal/rtems-top.m4: Minor cleanups.
* automake/compile.am: Further steps towards automake's rules.
Diffstat (limited to 'aclocal/multi.m4')
| -rw-r--r-- | aclocal/multi.m4 | 53 |
1 files changed, 53 insertions, 0 deletions
diff --git a/aclocal/multi.m4 b/aclocal/multi.m4 new file mode 100644 index 0000000000..08d1783dd5 --- /dev/null +++ b/aclocal/multi.m4 @@ -0,0 +1,53 @@ +#serial 99 + +AC_DEFUN(AC_ENABLE_MULTILIB, +[ +AC_ARG_ENABLE(multilib, +AC_HELP_STRING([--enable-multilib], +[build many library versions (default=no)]), +[case "${enableval}" in + yes) multilib=yes ;; + no) multilib=no ;; + *) AC_MSG_ERROR(bad value ${enableval} for multilib option) ;; + esac], [multilib=no])dnl + +AM_CONDITIONAL(MULTILIB,test x"${multilib}" = x"yes") + +dnl We may get other options which we don't document: +dnl --with-target-subdir, --with-multisrctop, --with-multisubdir + +if test "[$]{srcdir}" = "."; then + if test "[$]{with_target_subdir}" != "."; then + multilib_basedir="[$]{srcdir}/[$]{with_multisrctop}../ifelse([$2],,,[$2])" + else + multilib_basedir="[$]{srcdir}/[$]{with_multisrctop}ifelse([$2],,,[$2])" + fi +else + multilib_basedir="[$]{srcdir}/ifelse([$2],,,[$2])" +fi +AC_SUBST(multilib_basedir) + +if test "${multilib}" = "yes"; then + multilib_arg="--enable-multilib" +else + multilib_arg= +fi + +AC_OUTPUT_COMMANDS( +[case " $CONFIG_FILES " in + *" ]m4_if([$1],,Makefile,[$1])[ "*) + ac_file=]m4_if([$1],,Makefile,[$1])[ . ${multilib_basedir}/config-ml.in +esac], +[ + srcdir=${srcdir} + host=${host} + target=${target} + with_multisrctop="${with_multisrctop}" + with_target_subdir="${with_target_subdir}" + with_multisubdir="${with_multisubdir}" + ac_configure_args="${multilib_arg} ${ac_configure_args}" + CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} + multilib_basedir=${multilib_basedir} + CC="${CC}"] +) +]) |