2002-11-18 Ralf Corsepius <corsepiu@faw.uni-ulm.de>

* acinclude.m4: Use AS_IF instead of if/then/else/endif.
	* configure.ac: Ditto.
This commit is contained in:
Ralf Corsepius
2002-11-18 02:55:01 +00:00
parent f934a9d630
commit bcf4d5bc29
3 changed files with 29 additions and 36 deletions

View File

@@ -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> 2002-11-15 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* automake/compile.am: Remove CFLAGS_DEBUG_OPTIMIZE_V, * automake/compile.am: Remove CFLAGS_DEBUG_OPTIMIZE_V,

View File

@@ -306,24 +306,18 @@ m4_append([_RTEMS_HOST_CONFIGDIRS_LIST],[ $1])dnl
if test $build = $host; if test $build = $host;
then then
if test $host = $target; AS_IF([test $host = $target],
then [_RTEMS_SUBST_IFNOT([build_configdirs],[$1])],
_RTEMS_SUBST_IFNOT([build_configdirs],[$1]) [_RTEMS_SUBST_IFNOT([build_configdirs],[$1])]
else )
_RTEMS_SUBST_IFNOT([build_configdirs],[$1])
fi
else else
if test $host = $target; AS_IF([test $host = $target],
then [_RTEMS_SUBST_IFNOT([host_configdirs],[$1])],
_RTEMS_SUBST_IFNOT([host_configdirs],[$1]) [AS_IF([test $build = $target],
else [_RTEMS_SUBST_IFNOT([host_configdirs],[$1])],
if test $build = $target; [_RTEMS_SUBST_IFNOT([host_configdirs],[$1])]
then )]
_RTEMS_SUBST_IFNOT([host_configdirs],[$1]) )
else
_RTEMS_SUBST_IFNOT([host_configdirs],[$1])
fi
fi
fi fi
m4_divert_text([DEFAULTS], m4_divert_text([DEFAULTS],
@@ -350,24 +344,18 @@ m4_append([_RTEMS_TARGET_CONFIGDIRS_LIST],[ $1])
if test $build = $host; if test $build = $host;
then then
if test $host = $target; AS_IF([test $host = $target],
then [_RTEMS_SUBST_IFNOT([build_configdirs],[$1])],
_RTEMS_SUBST_IFNOT([build_configdirs],[$1]) [_RTEMS_SUBST_IFNOT([target_configdirs],[$1])]
else )
_RTEMS_SUBST_IFNOT([target_configdirs],[$1])
fi
else else
if test $host = $target; AS_IF([test $host = $target],
then [_RTEMS_SUBST_IFNOT([host_configdirs],[$1])],
_RTEMS_SUBST_IFNOT([host_configdirs],[$1]) [AS_IF([test $build = $target],
else [_RTEMS_SUBST_IFNOT([build_configdirs],[$1])],
if test $build = $target; [_RTEMS_SUBST_IFNOT([target_configdirs],[$1])]
then )]
_RTEMS_SUBST_IFNOT([build_configdirs],[$1]) )
else
_RTEMS_SUBST_IFNOT([target_configdirs],[$1])
fi
fi
fi fi
m4_divert_text([DEFAULTS], m4_divert_text([DEFAULTS],

View File

@@ -8,12 +8,12 @@ AC_CONFIG_SRCDIR([c])
RTEMS_TOP([.]) RTEMS_TOP([.])
# Abort if trying to build inside of the source tree. # 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 rm -f config.cache config.log confdefs.h
AC_MSG_ERROR([***] AC_MSG_ERROR([***]
[Attempt to build inside of the source tree] [Attempt to build inside of the source tree]
[Please use a separate build directory, instead] ) [Please use a separate build directory, instead] )
fi ])
AC_CANONICAL_TARGET([]) AC_CANONICAL_TARGET([])
AM_INIT_AUTOMAKE([no-define foreign 1.6]) AM_INIT_AUTOMAKE([no-define foreign 1.6])