diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | aclocal/quoting.m4 | 19 |
2 files changed, 18 insertions, 5 deletions
@@ -1,5 +1,9 @@ 2002-11-19 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + * aclocal/quoting.m4: Reworked (Part of fix to PR 312). + +2002-11-19 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + * automake/compile.am: Remove LD_PATHS (Unused). * aclocal/check-newlib.m4: Adaptation to autoconf-2.5x (AC_TRY_LINK is announced obsolete). 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]) ]) |