-# Base args. Strip norecursion, cache-file, srcdir, host, build, target.
-# These are the ones we might not want to pass down to subconfigures.
-baseargs=`echo "${ac_configure_args}" | \
- sed -e 's/--no[[^ ]]*//' \
- -e 's/--cache[[a-z-]]*=[[^ ]]*//' \
- -e 's/--sr[[a-z-]]*=[[^ ]]*//' \
- -e 's/--ho[[a-z-]]*=[[^ ]]*//' \
- -e 's/--bu[[a-z-]]*=[[^ ]]*//' \
- -e 's/--ta[[a-z-]]*=[[^ ]]*//'`
+# Base args. Strip norecursion, cache-file, srcdir, host, build,
+# target and nonopt. These are the ones we might not want to pass
+# down to subconfigures.
+baseargs=`echo " ${ac_configure_args} " | \
+ sed -e 's/ --no[[^ ]]* / /' \
+ -e 's/ --c[[a-z-]]*[[= ]][[^ ]]* / /' \
+ -e 's/ --sr[[a-z-]]*[[= ]][[^ ]]* / /' \
+ -e 's/ --ho[[a-z-]]*[[= ]][[^ ]]* / /' \
+ -e 's/ --bu[[a-z-]]*[[= ]][[^ ]]* / /' \
+ -e 's/ --t[[a-z-]]*[[= ]][[^ ]]* / /' \
+ -e 's/ -cache-file[[= ]][[^ ]]* / /' \
+ -e 's/ -srcdir[[= ]][[^ ]]* / /' \
+ -e 's/ -host[[= ]][[^ ]]* / /' \
+ -e 's/ -build[[= ]][[^ ]]* / /' \
+ -e 's/ -target[[= ]][[^ ]]* / /' \
+ -e 's/ [[^ -][^ ]*] / /' \
+ -e 's/^ *//;s/ *$//'`