INN commit: trunk (6 files)

[INN Commit]

    Date: Monday, November 17, 2008 @ 11:12:27
  Author: iulius
Revision: 8169

Add support for --with-http-dir at configure time.
It allows the user to configure pathhttp in inn.conf (which was
previously set to pathlog).

Modified:
  trunk/Makefile.global.in
  trunk/doc/pod/inn.conf.pod
  trunk/lib/innconf.c
  trunk/m4/paths.m4
  trunk/samples/inn.conf.in
  trunk/support/fixconfig.in

----------------------+
 Makefile.global.in   |    1 +
 doc/pod/inn.conf.pod |    2 +-
 lib/innconf.c        |    2 +-
 m4/paths.m4          |    3 +++
 samples/inn.conf.in  |    2 +-
 support/fixconfig.in |    2 ++
 6 files changed, 9 insertions(+), 3 deletions(-)

Modified: Makefile.global.in
===================================================================
--- Makefile.global.in	2008-11-17 18:56:24 UTC (rev 8168)
+++ Makefile.global.in	2008-11-17 19:12:27 UTC (rev 8169)
@@ -238,6 +238,7 @@
 PATHCONTROL	= @CONTROLDIR@
 PATHFILTER	= @FILTERDIR@
 PATHRUN		= @RUNDIR@
+PATHHTTP	= @HTTPDIR@
 PATHLOG		= @LOGDIR@
 PATHLOGOLD	= $(PATHLOG)/OLD
 PATHDB		= @DBDIR@

Modified: doc/pod/inn.conf.pod
===================================================================
--- doc/pod/inn.conf.pod	2008-11-17 18:56:24 UTC (rev 8168)
+++ doc/pod/inn.conf.pod	2008-11-17 19:12:27 UTC (rev 8169)
@@ -1253,7 +1253,7 @@
 Where any HTML files (such as periodic status reports) are placed.  If the
 news reports should be available in real-time on the web, the files in
 this directory should be served by a web server.  The default value is
-the value of I<pathlog>.
+the value of I<pathnews>/http.
 
 =item I<pathincoming>
 

Modified: lib/innconf.c
===================================================================
--- lib/innconf.c	2008-11-17 18:56:24 UTC (rev 8168)
+++ lib/innconf.c	2008-11-17 19:12:27 UTC (rev 8169)
@@ -330,7 +330,7 @@
     if (innconf->pathlog == NULL)
         innconf->pathlog = concatpath(innconf->pathnews, "log");
     if (innconf->pathhttp == NULL)
-        innconf->pathhttp = xstrdup(innconf->pathlog);
+        innconf->pathhttp = concatpath(innconf->pathnews, "http");
     if (innconf->pathspool == NULL)
         innconf->pathspool = concatpath(innconf->pathnews, "spool");
     if (innconf->patharticles == NULL)

Modified: m4/paths.m4
===================================================================
--- m4/paths.m4	2008-11-17 18:56:24 UTC (rev 8168)
+++ m4/paths.m4	2008-11-17 19:12:27 UTC (rev 8169)
@@ -29,6 +29,9 @@
 _INN_ARG_DIR([filter], ['${bindir}/filter'], [FILTERDIR],
     [AC_HELP_STRING([--with-filter-dir=PATH],
         [Path for embedded filters [PREFIX/bin/filter]])])
+_INN_ARG_DIR([http], ['${prefix}/http'], [HTTPDIR],
+    [AC_HELP_STRING([--with-http-dir=PATH],
+        [Path for web pages [PREFIX/http]])])
 _INN_ARG_DIR([libperl], ['${libdir}/perl'], [LIBPERLDIR],
     [AC_HELP_STRING([--with-libperl-dir=PATH],
         [Path for Perl modules [PREFIX/lib/perl]])])

Modified: samples/inn.conf.in
===================================================================
--- samples/inn.conf.in	2008-11-17 18:56:24 UTC (rev 8168)
+++ samples/inn.conf.in	2008-11-17 19:12:27 UTC (rev 8169)
@@ -187,7 +187,7 @@
 pathdb:                 @DBDIR@
 pathetc:                @sysconfdir@
 pathfilter:             @FILTERDIR@
-pathhttp:               @LOGDIR@
+pathhttp:               @HTTPDIR@
 pathincoming:           @SPOOLDIR@/incoming
 pathlog:                @LOGDIR@
 pathoutgoing:           @SPOOLDIR@/outgoing

Modified: support/fixconfig.in
===================================================================
--- support/fixconfig.in	2008-11-17 18:56:24 UTC (rev 8168)
+++ support/fixconfig.in	2008-11-17 19:12:27 UTC (rev 8169)
@@ -24,6 +24,7 @@
 CONTROLDIR=@CONTROLDIR@
 DBDIR=@DBDIR@
 FILTERDIR=@FILTERDIR@
+HTTPDIR=@HTTPDIR@
 LIBPERLDIR=@LIBPERLDIR@
 LOGDIR=@LOGDIR@
 RUNDIR=@RUNDIR@
@@ -63,6 +64,7 @@
      -e "s, at CONTROLDIR\@,$CONTROLDIR," \
      -e "s, at DBDIR\@,$DBDIR," \
      -e "s, at FILTERDIR\@,$FILTERDIR," \
+     -e "s, at HTTPDIR\@,$HTTPDIR," \
      -e "s, at LIBPERLDIR\@,$LIBPERLDIR," \
      -e "s, at LOGDIR\@,$LOGDIR," \
      -e "s, at RUNDIR\@,$RUNDIR," \