* sconex/ModuleLoader: Fold ModuleLoaderDLL into here.

  Parse modconf files and store dependency info.
  Run conf file on module load.
* sconex/Module: Remove conf_path, autoload, and delay load options.
  Add load_module_dir - run_parts-style module loading using conf
  directory with dependency information.
* sconex/Kernel: Add conf_path and autoload option.
* http/getfile: Remove module, move to http/GetFileStream.
* http/dirindex: Remove module, move to http/DirIndexStream.
* http/errorpage: Remove module, move to http/ErrorPageStream.
* sconesite/image: Move module to toplevel.
* all: Add module .conf files, installed to conf_path/modules.d.

ChangeLog

@@ -1,4 +1,19 @@
 
+2013-02-21 Andrew Wedgbury <wedge@sconemad.com>
+
+	* sconex/ModuleLoader: Fold ModuleLoaderDLL into here.
+	Parse modconf files and store dependency info.
+	Run conf file on module load.
+	* sconex/Module: Remove conf_path, autoload, and delay load options.
+	Add load_module_dir - run_parts-style module loading using conf
+	directory with dependency information.
+	* sconex/Kernel: Add conf_path and autoload option.
+	* http/getfile: Remove module, move to http/GetFileStream.
+	* http/dirindex: Remove module, move to http/DirIndexStream.
+	* http/errorpage: Remove module, move to http/ErrorPageStream.
+	* sconesite/image: Move module to toplevel.
+	* all: Add module .conf files, installed to conf_path/modules.d.
+
 2013-02-13 Andrew Wedgbury <wedge@sconemad.com>
 
 	* sconesite/Template: Set parent element (fixes logging).

Makefile.am

@@ -12,37 +12,40 @@ sconed_SOURCES = main.cpp
 sconed_LDADD = $(top_builddir)/sconex/libsconex.la
 
 MODULES = \
-server \
+bluetooth \
+exec \
+forward \
+http \
+image \
 ip \
 ip6 \
 local \
 location \
-bluetooth \
-http \
-sconesite \
+maths \
 mime \
+mysql \
+rss \
+sconesite \
+server \
 simple \
+smtp \
+sqlite \
 ssl \
 stat \
-exec \
-forward \
 tftp \
 test \
-testbuilder \
+testbuilder
+
+EXPERIMENTAL = \
 lettuce \
-mysql \
-sqlite \
-smtp \
-rss \
-maths \
 ui
 
-SUBDIRS = sconex examples $(MODULES)
+SUBDIRS = sconex examples $(MODULES) $(EXPERIMENTAL)
 
 docdir=$(datadir)/doc/$(PACKAGE)
 doc_DATA = AUTHORS COPYING ChangeLog INSTALL NEWS README THANKS TODO
 
-sysconf_DATA = sconeserver.conf.example
+sysconf_DATA = sconeserver.conf
 
 dist_man_MANS = sconed.1
 

Makefile.in

@@ -182,6 +182,8 @@ EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
 GREP = @GREP@
+IMAGE_LDFLAGS = @IMAGE_LDFLAGS@
+IMAGE_LIBS = @IMAGE_LIBS@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -217,8 +219,6 @@ PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 RANLIB = @RANLIB@
-SCONESITE_IMAGE_LDFLAGS = @SCONESITE_IMAGE_LDFLAGS@
-SCONESITE_IMAGE_LIBS = @SCONESITE_IMAGE_LIBS@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
@@ -293,34 +293,37 @@ AM_CPPFLAGS = \
 sconed_SOURCES = main.cpp
 sconed_LDADD = $(top_builddir)/sconex/libsconex.la
 MODULES = \
-server \
+bluetooth \
+exec \
+forward \
+http \
+image \
 ip \
 ip6 \
 local \
 location \
-bluetooth \
-http \
-sconesite \
+maths \
 mime \
+mysql \
+rss \
+sconesite \
+server \
 simple \
+smtp \
+sqlite \
 ssl \
 stat \
-exec \
-forward \
 tftp \
 test \
-testbuilder \
+testbuilder
+
+EXPERIMENTAL = \
 lettuce \
-mysql \
-sqlite \
-smtp \
-rss \
-maths \
 ui
 
-SUBDIRS = sconex examples $(MODULES)
+SUBDIRS = sconex examples $(MODULES) $(EXPERIMENTAL)
 doc_DATA = AUTHORS COPYING ChangeLog INSTALL NEWS README THANKS TODO
-sysconf_DATA = sconeserver.conf.example
+sysconf_DATA = sconeserver.conf
 dist_man_MANS = sconed.1
 EXTRA_DIST = \
 $(sysconf_DATA) \

bluetooth/Makefile.am

@@ -16,3 +16,7 @@ BluetoothSocketAddress.h
 bluetooth_la_LDFLAGS = -module -avoid-version
 bluetooth_la_LIBADD = -lbluetooth
 
+modconfdir = $(sysconfdir)/modules.d
+modconf_DATA = bluetooth.conf
+
+EXTRA_DIST = $(modconf_DATA)

bluetooth/Makefile.in

@@ -18,6 +18,7 @@
 # SconeServer (http://www.sconemad.com)
 
 
+
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
@@ -70,7 +71,7 @@ am__nobase_list = $(am__nobase_strip_setup); \
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__installdirs = "$(DESTDIR)$(pkglibdir)"
+am__installdirs = "$(DESTDIR)$(pkglibdir)" "$(DESTDIR)$(modconfdir)"
 LTLIBRARIES = $(pkglib_LTLIBRARIES)
 bluetooth_la_DEPENDENCIES =
 am_bluetooth_la_OBJECTS = BluetoothModule.lo BluetoothSocketAddress.lo
@@ -94,6 +95,7 @@ CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 	$(LDFLAGS) -o $@
 SOURCES = $(bluetooth_la_SOURCES)
 DIST_SOURCES = $(bluetooth_la_SOURCES)
+DATA = $(modconf_DATA)
 HEADERS = $(noinst_HEADERS)
 ETAGS = etags
 CTAGS = ctags
@@ -127,6 +129,8 @@ EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
 GREP = @GREP@
+IMAGE_LDFLAGS = @IMAGE_LDFLAGS@
+IMAGE_LIBS = @IMAGE_LIBS@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -162,8 +166,6 @@ PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 RANLIB = @RANLIB@
-SCONESITE_IMAGE_LDFLAGS = @SCONESITE_IMAGE_LDFLAGS@
-SCONESITE_IMAGE_LIBS = @SCONESITE_IMAGE_LIBS@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
@@ -240,6 +242,9 @@ BluetoothSocketAddress.h
 
 bluetooth_la_LDFLAGS = -module -avoid-version
 bluetooth_la_LIBADD = -lbluetooth
+modconfdir = $(sysconfdir)/modules.d
+modconf_DATA = bluetooth.conf
+EXTRA_DIST = $(modconf_DATA)
 all: all-am
 
 .SUFFIXES:
@@ -343,6 +348,26 @@ mostlyclean-libtool:
 
 clean-libtool:
 	-rm -rf .libs _libs
+install-modconfDATA: $(modconf_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(modconfdir)" || $(MKDIR_P) "$(DESTDIR)$(modconfdir)"
+	@list='$(modconf_DATA)'; test -n "$(modconfdir)" || list=; \
+	for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(modconfdir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(modconfdir)" || exit $$?; \
+	done
+
+uninstall-modconfDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(modconf_DATA)'; test -n "$(modconfdir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(modconfdir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(modconfdir)" && rm -f $$files
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
@@ -428,9 +453,9 @@ distdir: $(DISTFILES)
 	done
 check-am: all-am
 check: check-am
-all-am: Makefile $(LTLIBRARIES) $(HEADERS)
+all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS)
 installdirs:
-	for dir in "$(DESTDIR)$(pkglibdir)"; do \
+	for dir in "$(DESTDIR)$(pkglibdir)" "$(DESTDIR)$(modconfdir)"; do \
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
@@ -481,7 +506,7 @@ info: info-am
 
 info-am:
 
-install-data-am:
+install-data-am: install-modconfDATA
 
 install-dvi: install-dvi-am
 
@@ -527,7 +552,7 @@ ps: ps-am
 
 ps-am:
 
-uninstall-am: uninstall-pkglibLTLIBRARIES
+uninstall-am: uninstall-modconfDATA uninstall-pkglibLTLIBRARIES
 
 .MAKE: install-am install-strip
 
@@ -538,12 +563,13 @@ uninstall-am: uninstall-pkglibLTLIBRARIES
 	install install-am install-data install-data-am install-dvi \
 	install-dvi-am install-exec install-exec-am install-html \
 	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-pkglibLTLIBRARIES \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-pkglibLTLIBRARIES
+	install-modconfDATA install-pdf install-pdf-am \
+	install-pkglibLTLIBRARIES install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+	pdf pdf-am ps ps-am tags uninstall uninstall-am \
+	uninstall-modconfDATA uninstall-pkglibLTLIBRARIES
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.

bluetooth/bluetooth.conf

@@ -0,0 +1,2 @@
+#MODULE: bluetooth
+#DEPENDS: server