Changeset 9cf7774 in rtems

Timestamp:

Nov 5, 2002, 6:34:36 PM (17 years ago)

Author:

Ralf Corsepius <ralf.corsepius@…>

Branches:

4.10, 4.11, 4.8, 4.9, master

Children:

83433304

Parents:

2595580

Message:

2002-11-05 Ralf Corsepius <corsepiu@…>

• acinclude.m4: Adapations to autoconf > 2.52.

Files:

• ChangeLog (modified) (1 diff)
• acinclude.m4 (modified) (5 diffs)

ChangeLog

@@ +1 @@
+2002-11-05      Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+        * acinclude.m4: Adapations to autoconf > 2.52.
+
 2002-11-01      Joel Sherrill <joel@OARcorp.com>
 

acinclude.m4

@@ -177 +177 @@
   # Always prepend --prefix to ensure using the same prefix
   # in subdir configurations.
-  ac_sub_configure_args="--prefix=$prefix $ac_sub_configure_args"
+  ac_sub_configure_args="'--prefix=$prefix' $ac_sub_configure_args"
 
   case "$$1_subdir" in
   "." ) ;;
   * )
-    ac_sub_configure_args="$ac_sub_configure_args --with-target-subdir=$$1_subdir --exec-prefix=${prefix}/$$1_subdir"
+    ac_sub_configure_args="$ac_sub_configure_args '--with-target-subdir=$$1_subdir' '--exec-prefix=${prefix}/$$1_subdir'"
     ;;
   esac
@@ -228 +228 @@
       ac_sub_configure_vars=
       test -n "[$]CC_FOR_$2" && \
-        ac_sub_configure_vars="CC='[$]CC_FOR_$2'"
+        ac_sub_configure_vars="'CC=[$]CC_FOR_$2'"
       test -n "[$]CFLAGS_FOR_$2" && \
-        ac_sub_configure_vars="$ac_sub_configure_vars CFLAGS='[$]CFLAGS_FOR_$2'"
+        ac_sub_configure_vars="$ac_sub_configure_vars 'CFLAGS=[$]CFLAGS_FOR_$2'"
       eval $ac_sub_configure_vars \
         $ac_sub_configure $ac_sub_configure_args \
@@ -256 +256 @@
 ])
 
+AC_DEFUN([_RTEMS_CONFIGURE_ARGS_PRUNE],
+[
+  for ac_arg in m4_if([$3],,[$ac_configure_args],[[$]$3]); do
+    if test -n "$ac_prev"; then
+      ac_prev=
+      configure
+    fi
+    # the eval casts away sh quotes
+    case `eval echo $ac_arg` in
+    -host* | --host* );;
+    -host ) ac_prev=host_alias;;
+    -target* | --target* );;
+    -target | --target ) ac_prev=target_alias;;
+    -build* | --build* );;
+    -build | --build ) ac_prev=build_alias;;
+    --cache* );;
+    *_alias=* );;
+    m4_if([$2],,,[$2])
+    *) $1="$$1 '$ac_arg'" ;;
+   esac
+  done
+])
+
 AC_DEFUN(_RTEMS_BUILD_CONFIG_PREPARE,[
 # Record the configure arguments in Makefile.
 m4_ifdef([_RTEMS_BUILD_CONFIGDIRS_LIST],
 [
-buildargs=`echo "${ac_configure_args}" | \
-        sed -e 's/--no[[^       ]]*//' \
-            -e 's/--cache[[a-z-]]*=[[^  ]]*//' \
-            -e 's/--ho[[a-z-]]*=[[^     ]]*//' \
-            -e 's/--bu[[a-z-]]*=[[^     ]]*//' \
-            -e 's/--ta[[a-z-]]*=[[^     ]]*//' \
-            -e 's/[[^   ]]*alias=[[^    ]]*//g'` ;
-
-buildargs="--host=${build} --build=${build} --target=${target_alias} ${buildargs}"
+_RTEMS_CONFIGURE_ARGS_PRUNE([buildargs])
+buildargs="'--host=${build}' '--build=${build}' '--target=${target_alias}' ${buildargs}"
 AC_SUBST(buildargs)
 
@@ -311 +327 @@
 [
 # Record configure arguments in Makefile.
-hostargs=`echo "${ac_configure_args}" | \
-        sed -e 's/--no[[^       ]]*//' \
-            -e 's/--cache[[a-z-]]*=[[^  ]]*//' \
-            -e 's/--ho[[a-z-]]*=[[^     ]]*//' \
-            -e 's/--bu[[a-z-]]*=[[^     ]]*//' \
-            -e 's/--ta[[a-z-]]*=[[^     ]]*//' \
-            -e 's/[[^   ]]*alias=[[^    ]]*//g'` ;
-
-hostargs="--host=${host_alias} --build=${build} --target=${target_alias} ${hostargs}"
+_RTEMS_CONFIGURE_ARGS_PRUNE([hostargs])
+hostargs="'--host=${host_alias}' '--build=${build}' '--target=${target_alias}' ${hostargs}"
 AC_SUBST(hostargs)
 
@@ -362 +371 @@
 [
 # Record the configure arguments in Makefile.
-targetargs=`echo "${ac_configure_args}" | \
-        sed -e 's/--no[[^       ]]*//' \
-            -e 's/--cache[[a-z-]]*=[[^  ]]*//' \
-            -e 's/--ho[[a-z-]]*=[[^     ]]*//' \
-            -e 's/--bu[[a-z-]]*=[[^     ]]*//' \
-            -e 's/--ta[[a-z-]]*=[[^     ]]*//' \
-            -e 's/[[^   ]]*alias=[[^    ]]*//g'` ;
-
-targetargs="--host=${target_alias} --build=${build} --target=${target_alias} ${targetargs}"
+_RTEMS_CONFIGURE_ARGS_PRUNE([targetargs])
+targetargs="'--host=${target_alias}' '--build=${build}' '--target=${target_alias}' ${targetargs}"
 AC_SUBST(targetargs)