From 59d28b7a1a2177538f88bdbef23ea8f5a6185258 Mon Sep 17 00:00:00 2001
From: Ralf Corsepius <ralf.corsepius@rtems.org>
Date: Fri, 11 Oct 2002 04:27:07 +0000
Subject: 2002-10-11	Ralf Corsepius <corsepiu@faw.uni-ulm.de>

	* aclocal/quoting.m4: New (Implements RTEMS_CONFIGURE_ARGS_QUOTE).
	* acinclude.m4: Apply RTEMS_CONFIGURE_ARGS_QUOTE.
---
 ChangeLog          |  5 +++++
 acinclude.m4       | 34 ++++++----------------------------
 aclocal/quoting.m4 | 31 +++++++++++++++++++++++++++++++
 3 files changed, 42 insertions(+), 28 deletions(-)
 create mode 100644 aclocal/quoting.m4

diff --git a/ChangeLog b/ChangeLog
index 426d2d7880..1ac2576ff0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-10-11	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* aclocal/quoting.m4: New (Implements RTEMS_CONFIGURE_ARGS_QUOTE).
+	* acinclude.m4: Apply RTEMS_CONFIGURE_ARGS_QUOTE.
+
 2002-10-08	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* bootstrap: Add autoconf/automake version checks by popular demand.
diff --git a/acinclude.m4 b/acinclude.m4
index 16218324aa..b82a62cf82 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -167,34 +167,12 @@ _RTEMS_ARG_VAR([CFLAGS_FOR_$2],
 if test "$no_recursion" != yes; then
 
  if test -n "${$2_SUBDIRS}"; then
-  ac_sub_configure_args=
-  ac_prev=
-  for ac_arg in $$1args; 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=*)
-      ;;
-    --config-cache | -C)
-      ;;
-    -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
-      ac_prev=srcdir ;;
-    -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
-      ;;
-    -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
-      ac_prev=prefix ;;
-    -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
-      ;;
-    *) ac_sub_configure_args="$ac_sub_configure_args $ac_arg" ;;
-    esac
-  done
+   RTEMS_CONFIGURE_ARGS_QUOTE([ac_sub_configure_args],[
+     -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
+       ac_prev=prefix ;;
+     -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
+       ;;
+   ],[$1args])
 
   # Always prepend --prefix to ensure using the same prefix
   # in subdir configurations.
diff --git a/aclocal/quoting.m4 b/aclocal/quoting.m4
new file mode 100644
index 0000000000..32995c9d38
--- /dev/null
+++ b/aclocal/quoting.m4
@@ -0,0 +1,31 @@
+dnl RTEMS_CONFIGURE_ARGS_QUOTE(dnl RETURN_VAR, [ADDITIONAL_CASES], [VAR_TO_PROCESS]])
+dnl 
+AC_DEFUN([RTEMS_CONFIGURE_ARGS_QUOTE],
+[
+  # Remove --cache-file and --srcdir arguments so they do not pile up.
+  $1=
+  ac_prev=
+  for ac_arg in m4_if([$3],,[$ac_configure_args],[[$]$3]); 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=*)
+      ;;
+    --config-cache | -C)
+      ;;
+    -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
+	  ac_prev=srcdir ;;
+    -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
+      ;;
+    m4_if([$2],,,[$2])
+    *) $1="$$1 $ac_arg" ;;
+    esac
+  done
+])
-- 
cgit v1.2.3