summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRalf Corsepius <ralf.corsepius@rtems.org>2002-11-06 11:16:52 +0000
committerRalf Corsepius <ralf.corsepius@rtems.org>2002-11-06 11:16:52 +0000
commite05468fb389fb745cabc4d1d5e2a4f0957a56f03 (patch)
tree6cbe0a8ff1493b1bd6d5f8963cb3d85bad8bd9ce
parent8ecc042a2a8abaf14c22198d1007823940d9f534 (diff)
downloadrtems-e05468fb389fb745cabc4d1d5e2a4f0957a56f03.tar.bz2
2002-11-06 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
Further preparations for autoconf > 2.52: * aclocal/enable-inlines.m4: Use AS_IF instead of if/then/else. * aclocal/quoting.m4: Use `eval echo $ac_args` to unquote $ac_arg. * aclocal/target.m4: Use `eval echo $rtems_args` to unquote $ac_arg.
-rw-r--r--ChangeLog7
-rw-r--r--aclocal/enable-inlines.m411
-rw-r--r--aclocal/quoting.m43
-rw-r--r--aclocal/target.m42
4 files changed, 13 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog
index 67ba02474e..68779a4a7e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2002-11-06 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+ Further preparations for autoconf > 2.52:
+ * aclocal/enable-inlines.m4: Use AS_IF instead of if/then/else.
+ * aclocal/quoting.m4: Use `eval echo $ac_args` to unquote $ac_arg.
+ * aclocal/target.m4: Use `eval echo $rtems_args` to unquote $ac_arg.
+
2002-11-05 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* acinclude.m4: Adapations to autoconf > 2.52.
diff --git a/aclocal/enable-inlines.m4 b/aclocal/enable-inlines.m4
index bf30ceedad..4e0eb80d24 100644
--- a/aclocal/enable-inlines.m4
+++ b/aclocal/enable-inlines.m4
@@ -11,12 +11,7 @@ AC_DEFUN(RTEMS_ENABLE_INLINES,
esac],[RTEMS_USE_MACROS=no])
AC_SUBST(RTEMS_USE_MACROS)dnl
-if test x"${RTEMS_USE_MACROS}" = x"yes";
-then
- AC_DEFINE_UNQUOTED(USE_MACROS,1,[if using macros])
-else
- AC_DEFINE_UNQUOTED(USE_INLINES,1,[if using inlines])
-fi
-
-
+AS_IF([test x"${RTEMS_USE_MACROS}" = x"yes"],
+ [AC_DEFINE_UNQUOTED(USE_MACROS,1,[if using macros])],
+ [AC_DEFINE_UNQUOTED(USE_INLINES,1,[if using inlines])])
])
diff --git a/aclocal/quoting.m4 b/aclocal/quoting.m4
index 32995c9d38..53d98a4b87 100644
--- a/aclocal/quoting.m4
+++ b/aclocal/quoting.m4
@@ -10,7 +10,8 @@ AC_DEFUN([RTEMS_CONFIGURE_ARGS_QUOTE],
ac_prev=
continue
fi
- case $ac_arg in
+ # the eval casts away sh quotes
+ case `eval echo $ac_arg` in
-cache-file | --cache-file | --cache-fil | --cache-fi \
| --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
ac_prev=cache_file ;;
diff --git a/aclocal/target.m4 b/aclocal/target.m4
index 6a23ea82c1..a81eb551ae 100644
--- a/aclocal/target.m4
+++ b/aclocal/target.m4
@@ -28,7 +28,7 @@ if test "$no_recursion" != yes; then
rtems_prev=
continue
fi
- case "$rtems_arg" in
+ case `eval echo $rtems_arg` in
-cache-file | --cache-file | --cache-fil | --cache-fi \
| --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
rtems_prev=cache_file ;;