diff options
author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2002-11-18 02:55:01 +0000 |
---|---|---|
committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2002-11-18 02:55:01 +0000 |
commit | bcf4d5bc29da62ed7d9f8f7a3f5ad552ea3d6a31 (patch) | |
tree | cd55af6e4fefc114a50c359a852b1934dbf0c5b8 | |
parent | 2002-11-18 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff) | |
download | rtems-bcf4d5bc29da62ed7d9f8f7a3f5ad552ea3d6a31.tar.bz2 |
2002-11-18 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* acinclude.m4: Use AS_IF instead of if/then/else/endif.
* configure.ac: Ditto.
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | acinclude.m4 | 56 | ||||
-rw-r--r-- | configure.ac | 4 |
3 files changed, 29 insertions, 36 deletions
@@ -1,3 +1,8 @@ +2002-11-18 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + + * acinclude.m4: Use AS_IF instead of if/then/else/endif. + * configure.ac: Ditto. + 2002-11-15 Ralf Corsepius <corsepiu@faw.uni-ulm.de> * automake/compile.am: Remove CFLAGS_DEBUG_OPTIMIZE_V, diff --git a/acinclude.m4 b/acinclude.m4 index 2dc9691262..5defa283f4 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -306,24 +306,18 @@ m4_append([_RTEMS_HOST_CONFIGDIRS_LIST],[ $1])dnl if test $build = $host; then - if test $host = $target; - then - _RTEMS_SUBST_IFNOT([build_configdirs],[$1]) - else - _RTEMS_SUBST_IFNOT([build_configdirs],[$1]) - fi + AS_IF([test $host = $target], + [_RTEMS_SUBST_IFNOT([build_configdirs],[$1])], + [_RTEMS_SUBST_IFNOT([build_configdirs],[$1])] + ) else - if test $host = $target; - then - _RTEMS_SUBST_IFNOT([host_configdirs],[$1]) - else - if test $build = $target; - then - _RTEMS_SUBST_IFNOT([host_configdirs],[$1]) - else - _RTEMS_SUBST_IFNOT([host_configdirs],[$1]) - fi - fi + AS_IF([test $host = $target], + [_RTEMS_SUBST_IFNOT([host_configdirs],[$1])], + [AS_IF([test $build = $target], + [_RTEMS_SUBST_IFNOT([host_configdirs],[$1])], + [_RTEMS_SUBST_IFNOT([host_configdirs],[$1])] + )] + ) fi m4_divert_text([DEFAULTS], @@ -350,24 +344,18 @@ m4_append([_RTEMS_TARGET_CONFIGDIRS_LIST],[ $1]) if test $build = $host; then - if test $host = $target; - then - _RTEMS_SUBST_IFNOT([build_configdirs],[$1]) - else - _RTEMS_SUBST_IFNOT([target_configdirs],[$1]) - fi + AS_IF([test $host = $target], + [_RTEMS_SUBST_IFNOT([build_configdirs],[$1])], + [_RTEMS_SUBST_IFNOT([target_configdirs],[$1])] + ) else - if test $host = $target; - then - _RTEMS_SUBST_IFNOT([host_configdirs],[$1]) - else - if test $build = $target; - then - _RTEMS_SUBST_IFNOT([build_configdirs],[$1]) - else - _RTEMS_SUBST_IFNOT([target_configdirs],[$1]) - fi - fi + AS_IF([test $host = $target], + [_RTEMS_SUBST_IFNOT([host_configdirs],[$1])], + [AS_IF([test $build = $target], + [_RTEMS_SUBST_IFNOT([build_configdirs],[$1])], + [_RTEMS_SUBST_IFNOT([target_configdirs],[$1])] + )] + ) fi m4_divert_text([DEFAULTS], diff --git a/configure.ac b/configure.ac index 42e1ce0ed7..54a267c73f 100644 --- a/configure.ac +++ b/configure.ac @@ -8,12 +8,12 @@ AC_CONFIG_SRCDIR([c]) RTEMS_TOP([.]) # Abort if trying to build inside of the source tree. -if test -f aclocal/version.m4; then +AS_IF([test -f aclocal/version.m4],[ rm -f config.cache config.log confdefs.h AC_MSG_ERROR([***] [Attempt to build inside of the source tree] [Please use a separate build directory, instead] ) -fi +]) AC_CANONICAL_TARGET([]) AM_INIT_AUTOMAKE([no-define foreign 1.6]) |