diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | aclocal/env-rtemscpu.m4 | 41 | ||||
| -rw-r--r-- | aclocal/multi.m4 | 53 | ||||
| -rw-r--r-- | aclocal/multilib.m4 | 42 |
4 files changed, 6 insertions, 136 deletions
@@ -1,3 +1,9 @@ +2002-06-17 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + + * aclocal/env-rtemscpu.m4: Remove. + * aclocal/multi.m4: Remove. + * aclocal/multilib: Remove RTEMS_ENABLE_MULTILIB_MASTER. + 2002-05-28 Joel Sherrill <joel@OARcorp.com> * aclocal/version.m4: Updated to rtems-ss-20020528. diff --git a/aclocal/env-rtemscpu.m4 b/aclocal/env-rtemscpu.m4 deleted file mode 100644 index e01efb12c0..0000000000 --- a/aclocal/env-rtemscpu.m4 +++ /dev/null @@ -1,41 +0,0 @@ -dnl $Id$ - -AC_DEFUN(RTEMS_ENV_RTEMSCPU, -[AC_REQUIRE([RTEMS_ENABLE_MULTILIB]) - -if test x"$multilib" = x"yes"; then -## FIXME: There is no multilib BSP - RTEMS_BSP_SPECS="" - AC_SUBST(RTEMS_BSP_SPECS) - - if test -n "$with_multisubdir"; then - MULTIBUILDTOP=`echo "/$with_multisubdir" | sed 's,/[[^\\/]]*,../,g'` - fi - AC_SUBST(MULTIBUILDTOP) - - if test -n "$with_multisubdir"; then - MULTISUBDIR="/$with_multisubdir" - fi - AC_SUBST(MULTISUBDIR) - - PROJECT_ROOT="${RTEMS_TOPdir}/\$(MULTIBUILDTOP)\$(top_builddir)" - GCC_SPECS="-isystem \$(PROJECT_ROOT)/lib/include" - AC_SUBST(GCC_SPECS) - - PROJECT_INCLUDE="\$(PROJECT_ROOT)/lib/include" - AC_SUBST(PROJECT_INCLUDE) - - PROJECT_RELEASE="\$(PROJECT_ROOT)" - AC_SUBST(PROJECT_RELEASE) - - RTEMS_ROOT=${PROJECT_ROOT} - AC_SUBST(RTEMS_ROOT) - - includedir="\${exec_prefix}/lib/include" - libdir="${libdir}\$(MULTISUBDIR)" - AM_CONDITIONAL([RTEMS_CONFIG_PER_BSP],[false]) -else - RTEMS_ENV_RTEMSBSP - RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP) -fi -]) diff --git a/aclocal/multi.m4 b/aclocal/multi.m4 deleted file mode 100644 index 08d1783dd5..0000000000 --- a/aclocal/multi.m4 +++ /dev/null @@ -1,53 +0,0 @@ -#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}"] -) -]) diff --git a/aclocal/multilib.m4 b/aclocal/multilib.m4 index b3f308ca2e..66896f9ce5 100644 --- a/aclocal/multilib.m4 +++ b/aclocal/multilib.m4 @@ -15,45 +15,3 @@ AC_HELP_STRING([--enable-multilib], AM_CONDITIONAL(MULTILIB,test x"${multilib}" = x"yes") ]) - -AC_DEFUN([RTEMS_ENABLE_MULTILIB_MASTER], -[ -AC_REQUIRE([RTEMS_ENABLE_MULTILIB]) - -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}"]) -]) |