Use wordsplit for a submodule

5 files changed, 8 insertions, 5 deletions

diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..ec3950b
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "wordsplit"]
+	path = wordsplit
+	url = git://git.gnu.org.ua/wordsplit.git
diff --git a/Makefile.am b/Makefile.am
index 7d86aaf..2bd6172 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,2 +1,2 @@
-EXTRA_DIST=README
+EXTRA_DIST=README wordsplit/wordsplit.c wordsplit/wordsplit.h
 SUBDIRS = mimetypes src
diff --git a/src/Makefile.am b/src/Makefile.am
index dcefc04..7bc1f9e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,4 +2,5 @@ sbin_PROGRAMS=fileserv
 fileserv_SOURCES=fileserv.c runas.c fileserv.h logger.c pidfile.c\
- wordsplit.c wordsplit.h catfile.c config.c idx.c defidx.h\
+ catfile.c config.c idx.c defidx.h\
  mem.c remoteip.c icon.c dirls.c dirls.h lang.c httperr.c
+nodist_fileserv_SOURCES=wordsplit.c wordsplit.h
 BUILT_SOURCES=defidx.h
@@ -10,3 +11,4 @@ dist_man_MANS=fileserv.8
 LDADD = ../mimetypes/libmimetypes.a
-AM_CPPFLAGS = -I $(top_srcdir)/mimetypes -DSYSCONFDIR=\"$(sysconfdir)\"
+VPATH += $(top_srcdir)/wordsplit
+AM_CPPFLAGS = -I $(top_srcdir)/wordsplit -I $(top_srcdir)/mimetypes -DSYSCONFDIR=\"$(sysconfdir)\"
 EXTRA_DIST=ftoc.sed defidx.html fileserv.conf
diff --git a/src/idx.c b/src/idx.c
index 0ec7d29..17fdd58 100644
--- a/src/idx.c
+++ b/src/idx.c
@@ -784,3 +784,2 @@ directory_index(int fd, CONFIG const *conf,
 	env.ws.ws_env = varenv;
-	env.ws.ws_options = WRDSO_ARGV;
 	
@@ -792,3 +791,2 @@ directory_index(int fd, CONFIG const *conf,
 		| WRDSF_CLOSURE
-		| WRDSF_OPTIONS
 		| WRDSF_ENV
diff --git a/wordsplit b/wordsplit
new file mode 160000
+Subproject 6ccb9ad200f6fa0b59a3d17e7e069badb2d39e5