From 846027b9b8e2d1a645681f9c0a5f3e75a02422df Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Tue, 31 Oct 2000 21:19:08 +0000 Subject: 2000-10-30 Ralf Corsepius * configure.in: Switch to GNU-canonicalization. * Makefile.am: Reflect changes to configure.in. * acinclude.m4: Remove. --- c/src/ChangeLog | 6 +++ c/src/Makefile.am | 2 +- c/src/acinclude.m4 | 121 ----------------------------------------------------- c/src/configure.in | 11 ++--- 4 files changed, 10 insertions(+), 130 deletions(-) delete mode 100644 c/src/acinclude.m4 (limited to 'c') diff --git a/c/src/ChangeLog b/c/src/ChangeLog index b8e6f79469..04adef0b70 100644 --- a/c/src/ChangeLog +++ b/c/src/ChangeLog @@ -1,3 +1,9 @@ +2000-10-30 Ralf Corsepius + + * configure.in: Switch to GNU-canonicalization. + * Makefile.am: Reflect changes to configure.in. + * acinclude.m4: Remove. + 2000-10-27 Ralf Corsepius * configure.in: add lib/libbsp to the GNU canonicalized diff --git a/c/src/Makefile.am b/c/src/Makefile.am index cddba02b70..1e1ee9420a 100644 --- a/c/src/Makefile.am +++ b/c/src/Makefile.am @@ -3,7 +3,7 @@ ## AUTOMAKE_OPTIONS = foreign 1.4 -ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal +ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/macros SUBDIRS = make @hst_subdirs@ wrapup tests diff --git a/c/src/acinclude.m4 b/c/src/acinclude.m4 deleted file mode 100644 index 93cd0358f6..0000000000 --- a/c/src/acinclude.m4 +++ /dev/null @@ -1,121 +0,0 @@ -dnl $Id$ - -AC_DEFUN(RTEMS_CONFIG_HOST_SUBDIRS, -[ -define([RTEMS_HOST_SUBDIRS], -ifdef([RTEMS_HOST_SUBDIRS], [RTEMS_HOST_SUBDIRS ],)[$1])dnl -host_subdirs="RTEMS_HOST_SUBDIRS" -AC_SUBST(host_subdirs) -]) - -dnl Derived from automake-1.4's AC_OUTPUT_SUBDIRS -AC_DEFUN(RTEMS_OUTPUT_HOST_SUBDIRS, -[ -if test "$no_recursion" != yes; then - if test $target_alias != $host_alias; then - target_subdir="$target_alias" - else - target_subdir="." - fi - # Remove --cache-file and --srcdir arguments so they do not pile up. - ac_sub_configure_args= - ac_prev= - for ac_arg in $ac_configure_args; do - if test -n "$ac_prev"; then - ac_prev= - continue - fi - case "$ac_arg" in - -cache-file | --cache-file | --cache-fil | --cache-fi \ - | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c) - ac_prev=cache_file ;; - -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \ - | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*) - ;; - -srcdir | --srcdir | --srcdi | --srcd | --src | --sr) - ac_prev=srcdir ;; - -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*) - ;; - --target*) ;; - --build*) ;; - --host*) ;; - *) ac_sub_configure_args="$ac_sub_configure_args $ac_arg" ;; - esac - done - -# test -d $target_subdir || mkdir $target_subdir - for ac_config_dir in $1; do - - # Do not complain, so a configure script can configure whichever - # parts of a large source tree are present. - if test ! -d $srcdir/$ac_config_dir; then - continue - fi - - echo configuring in $ac_config_dir - - case "$srcdir" in -## .) ;; - *) - if test -d $ac_config_dir || mkdir $ac_config_dir; then :; - else - AC_MSG_ERROR(can not create `pwd`/$ac_config_dir) - fi - ;; - esac - - ac_popdir=`pwd` - cd $ac_config_dir - -changequote(, )dnl - # A "../" for each directory in /$ac_config_dir. - ac_dots=`echo $ac_config_dir|sed -e 's%^\./%%' -e 's%[^/]$%&/%' -e 's%[^/]*/%../%g'` -changequote([, ])dnl - - case "$srcdir" in -## .) # No --srcdir option. We are building in place. -## ac_sub_srcdir=$srcdir ;; - /*) # Absolute path. - ac_sub_srcdir=$srcdir/$ac_config_dir ;; - *) # Relative path. - ac_sub_srcdir=$ac_dots$srcdir/$ac_config_dir ;; - esac - - # Check for guested configure; otherwise get Cygnus style configure. - if test -f $ac_sub_srcdir/configure; then - ac_sub_configure=$ac_sub_srcdir/configure - elif test -f $ac_sub_srcdir/configure.in; then - ac_sub_configure=$ac_configure - else - AC_MSG_WARN(no configuration information is in $ac_config_dir) - ac_sub_configure= - fi - - # The recursion is here. - if test -n "$ac_sub_configure"; then - ac_sub_cache_file=./config.cache -ifdef([AC_PROVIDE_AC_PROG_INSTALL], - [ case "$ac_given_INSTALL" in -changequote(, )dnl - [/$]*) INSTALL="$ac_given_INSTALL" ;; -changequote([, ])dnl - *) INSTALL="$ac_dots$ac_given_INSTALL" ;; - esac -])dnl - - echo "[running ${CONFIG_SHELL-/bin/sh} $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file] --srcdir=$ac_sub_srcdir" - # The eval makes quoting arguments work. - if eval ${CONFIG_SHELL-/bin/sh} $ac_sub_configure \ - $ac_sub_configure_args --host=$target_alias --build=$build_alias \ - --srcdir=$ac_sub_srcdir \ - --with-target-subdir=$target_subdir --cache-file=$ac_sub_cache_file - then : - else - AC_MSG_ERROR($ac_sub_configure failed for $ac_config_dir) - fi - fi - - cd $ac_popdir - done -fi -]) diff --git a/c/src/configure.in b/c/src/configure.in index 784e2a1e5a..39b680bbd9 100644 --- a/c/src/configure.in +++ b/c/src/configure.in @@ -59,21 +59,16 @@ if test "$RTEMS_HAS_CPLUSPLUS" = "yes"; then hst_subdirs="$hst_subdirs librtems++"; fi -RTEMS_CONFIG_HOST_SUBDIRS($hst_subdirs) +AC_CONFIG_SUBDIRS($hst_subdirs) AC_SUBST(hst_subdirs) -RTEMS_CONFIG_HOST_SUBDIRS(tests) +AC_CONFIG_SUBDIRS(wrapup tests) RTEMS_PROJECT_ROOT -RTEMS_PROG_CC_FOR_TARGET -RTEMS_CANONICALIZE_TOOLS - # Explicitly list all Makefiles here AC_OUTPUT( Makefile -wrapup/Makefile,, +,, test -d lib || mkdir lib ) - -RTEMS_OUTPUT_HOST_SUBDIRS(RTEMS_HOST_SUBDIRS) -- cgit v1.2.3