From 0a9a0f5f49b2648ee6f1da431b2e0d1da4a53318 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Wed, 20 Nov 2002 02:57:38 +0000 Subject: 2002-11-19 Ralf Corsepius * aclocal/quoting.m4: Reworked (Part of fix to PR 312). --- ChangeLog | 4 ++++ aclocal/quoting.m4 | 19 ++++++++++++++----- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 30d32b93a5..e223137c4a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2002-11-19 Ralf Corsepius + + * aclocal/quoting.m4: Reworked (Part of fix to PR 312). + 2002-11-19 Ralf Corsepius * automake/compile.am: Remove LD_PATHS (Unused). diff --git a/aclocal/quoting.m4 b/aclocal/quoting.m4 index 53d98a4b87..0a95ae3e9b 100644 --- a/aclocal/quoting.m4 +++ b/aclocal/quoting.m4 @@ -1,17 +1,19 @@ dnl RTEMS_CONFIGURE_ARGS_QUOTE(dnl RETURN_VAR, [ADDITIONAL_CASES], [VAR_TO_PROCESS]]) dnl -AC_DEFUN([RTEMS_CONFIGURE_ARGS_QUOTE], +AC_DEFUN([_RTEMS_CONFIGURE_ARGS_QUOTE], [ +$1_prune() +{ # 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 + for ac_arg + do if test -n "$ac_prev"; then ac_prev= continue fi - # the eval casts away sh quotes - case `eval echo $ac_arg` in + case $ac_arg in -cache-file | --cache-file | --cache-fil | --cache-fi \ | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c) ac_prev=cache_file ;; @@ -26,7 +28,14 @@ AC_DEFUN([RTEMS_CONFIGURE_ARGS_QUOTE], -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*) ;; m4_if([$2],,,[$2]) - *) $1="$$1 $ac_arg" ;; + *) $1="$$1 '$ac_arg'" ;; esac done + export $1 +} +]) + +AC_DEFUN([RTEMS_CONFIGURE_ARGS_QUOTE],[ +m4_expand_once([_RTEMS_CONFIGURE_ARGS_QUOTE([$1],[$2])]) +eval $1_prune m4_if([$3],,[$ac_configure_args],[[$]$3]) ]) -- cgit v1.2.3