[patches] OPTION_EGLIBC_WORDEXP option group

[Jim Blandy <jimb@xxxxxxxxxxxxxxxx>]

I've committed the following.

ChangeLog.eglibc:
2007-08-21  Jim Blandy  <jimb@xxxxxxxxxxxxxxxx>

	Implement the OPTION_EGLIBC_WORDEXP option group.
	* option-groups.def (OPTION_EGLIBC_WORDEXP): New entry.
	* option-groups.defaults (OPTION_EGLIBC_WORDEXP): Initialize.
	* posixf/Makefile (routines): Put wordexp in the group.
	(tests): Put wordexp-test and wordexp-tst.out in the option group.

Index: option-groups.def
===================================================================
--- option-groups.def	(revision 3228)
+++ option-groups.def	(working copy)
@@ -555,6 +555,13 @@
          updwtmpx
          utmpxname
 
+config OPTION_EGLIBC_WORDEXP
+    bool "Shell-style word expansion"
+    help
+        This option group includes the 'wordexp' function for
+        performing word expansion in the manner of the shell, and the
+        accompanying 'wordfree' function.
+
 config OPTION_POSIX_REGEXP
     bool "Regular expressions"
     help
Index: option-groups.defaults
===================================================================
--- option-groups.defaults	(revision 3228)
+++ option-groups.defaults	(working copy)
@@ -25,4 +25,5 @@
 OPTION_EGLIBC_SUNRPC = y
 OPTION_EGLIBC_UTMP = y
 OPTION_EGLIBC_UTMPX = y
+OPTION_EGLIBC_WORDEXP = y
 OPTION_POSIX_REGEXP = y
Index: posix/Makefile
===================================================================
--- posix/Makefile	(revision 3228)
+++ posix/Makefile	(working copy)
@@ -57,7 +57,6 @@
 	getopt getopt1 getopt_init					      \
 	sched_setp sched_getp sched_sets sched_gets sched_yield sched_primax  \
 	sched_primin sched_rr_gi sched_getaffinity sched_setaffinity	      \
-	wordexp								      \
 	pread pwrite pread64 pwrite64					      \
 	posix_madvise							      \
 	get_child_max sched_cpucount
@@ -74,6 +73,7 @@
 	spawnattr_getsigmask spawnattr_getschedpolicy spawnattr_getschedparam \
 	spawnattr_setsigmask spawnattr_setschedpolicy spawnattr_setschedparam
 routines-$(OPTION_EGLIBC_GETLOGIN) += getlogin getlogin_r
+routines-$(OPTION_EGLIBC_WORDEXP) += wordexp
 
 include ../Makeconfig
 
@@ -107,8 +107,9 @@
 xtests-$(OPTION_EGLIBC_INET) += bug-ga2
 ifeq (yes,$(build-shared))
 test-srcs	:= globtest
-tests           += wordexp-test tst-exec
+tests           += tst-exec
 tests-$(OPTION_EGLIBC_SPAWN) += tst-spawn
+tests-$(OPTION_EGLIBC_WORDEXP) += wordexp-test
 endif
 others		:= getconf
 install-bin	:= getconf
@@ -139,14 +140,17 @@
 # eglibc: ifeq (no,$(cross-compiling))
 # globtest and wordexp-test currently only works with shared libraries
 ifeq (yes,$(build-shared))
-tests: $(objpfx)globtest.out $(objpfx)wordexp-tst.out
+tests: $(objpfx)globtest.out
 $(objpfx)globtest.out: globtest.sh $(objpfx)globtest
 	$(SHELL) -e globtest.sh $(common-objpfx) $(elf-objpfx) \
 		 $(rtld-installed-name) '$(cross-test-wrapper)'
+ifeq (y,$(OPTION_EGLIBC_WORDEXP))
+tests: $(objpfx)wordexp-tst.out
 $(objpfx)wordexp-tst.out: wordexp-tst.sh $(objpfx)wordexp-test
 	$(SHELL) -e wordexp-tst.sh $(common-objpfx) $(elf-objpfx) \
 		 $(rtld-installed-name) '$(cross-test-wrapper)'
 endif
+endif
 # eglibc: endif
 
 OPTION_EGLIBC_INET-CFLAGS-$(OPTION_EGLIBC_INET) = -DUSE_NSCD=1