From: Frédéric Marchal <fmarchal@users.sourceforge.net>
Date: Wed, 20 Jan 2010 11:43:02 +0000 (+0000)
Subject: Replace --enable-htmldir by --enable-sargphp to avoid confusion on the name.
X-Git-Tag: v2_2_7~19
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7bbc1de4e30a02b9438c9f2f245c4b12db702bba;p=thirdparty%2Fsarg.git

Replace --enable-htmldir by --enable-sargphp to avoid confusion on the name.
Installation of sarg-php can be disabled with --disable-sargphp.
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7c16fa7..01affbf 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,7 +3,7 @@ PROJECT(sarg C)
 SET(sarg_VERSION 2)
 SET(sarg_REVISION 2)
 SET(sarg_BUILD "7rc1")
-SET(sarg_BUILDDATE "Jan-18-2010")
+SET(sarg_BUILDDATE "Jan-20-2010")
 
 INCLUDE(AddFileDependencies)
 INCLUDE(CheckIncludeFile)
@@ -41,6 +41,7 @@ SET(MANDIR "share/man" CACHE PATH "The directory to copy the man page relative t
 SET(LANGDIR "share/sarg/languages" CACHE PATH "The directory to copy the languages files relative to the install directory")
 SET(FONTDIR "share/sarg/fonts" CACHE PATH "The directory to copy the fonts relative to the install directory")
 SET(IMAGEDIR "share/sarg/images" CACHE PATH "The directory to copy the images files relative to the install directory")
+SET(SARGPHPDIR "share/sarg/sarg-php" CACHE PATH "The directory to copy sarg-php relative to the install directory")
 
 # Sources to compile
 INCLUDE_DIRECTORIES("${CMAKE_BINARY_DIR}") #Make it find this config.h before the one in src/include
@@ -276,6 +277,7 @@ INSTALL(FILES sarg.1 DESTINATION "${MANDIR}")
 INSTALL(DIRECTORY languages/ DESTINATION "${LANGDIR}" PATTERN ".svn" EXCLUDE)
 INSTALL(DIRECTORY images/ DESTINATION "${IMAGEDIR}" PATTERN ".svn" EXCLUDE)
 INSTALL(DIRECTORY fonts/ DESTINATION "${FONTDIR}" FILES_MATCHING PATTERN "*.ttf" PATTERN ".svn" EXCLUDE)
+INSTALL(DIRECTORY sarg-php/ DESTINATION "${SARGPHPDIR}" PATTERN ".svn" EXCLUDE)
 
 # Package creation
 SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Squid Analysis Report Generator")
diff --git a/ChangeLog b/ChangeLog
index f63da96..745bc15 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,6 @@
 SARG ChangeLog
 
-Jan-18-2010 Version 2.2.7
+Jan-20-2010 Version 2.2.7
 		- Extra compile and run time protection (FORTIFY_SOURCE) fixed in configure.
 		- Use tabulations as columns separator in intermediary files to avoid problems when a field of the log contains a space.
 		- Input log file type detection partly rewritten to clearly distinguish which type is processed where.
@@ -18,6 +18,8 @@ Jan-18-2010 Version 2.2.7
 		- Directories deleted without using the rm system command.
 		- Index created using an internal sort algorithm instead of a system call.
 		- Fixed exclude_hosts to exclude subdomains and IPv4 subnets.
+		- Replace --enable-htmldir by --enable-sargphp to avoid confusion on the name.
+		- Installation of sarg-php can be disabled with --disable-sargphp.
 
 Jan-06-2010 Version 2.2.6.1
 		- Remove unnecessary dependency on off_t.
diff --git a/Makefile.in b/Makefile.in
index 63b1885..e4c08a1 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -11,12 +11,12 @@ BINDIR   	= @bindir@
 IBINDIR   	= -DBINDIR=\"@bindir@\"
 MANDIR		= @mandir@
 SYSCONFDIR	= @sysconfdir@
-HTMLDIR		= @HTMLDIR@
+SARGPHPDIR	= @SARGPHPDIR@
 LANGDIR		= @LANGDIR@
 FONTDIR		= @FONTDIR@
 IMAGEDIR	= @IMAGEDIR@
 ISYSCONFDIR	= -DSYSCONFDIR=\"@sysconfdir@\"
-IHTMLDIR	= -DHTMLDIR=\"@HTMLDIR@\"
+ISARGPHPDIR	= -DSARGPHPDIR=\"@SARGPHPDIR@\"
 ILANGDIR	= -DLANGDIR=\"@LANGDIR@\"
 IFONTDIR	= -DFONTDIR=\"@FONTDIR@\"
 IIMAGEDIR	= -DIMAGEDIR=\"@IMAGEDIR@\"
@@ -51,7 +51,7 @@ DISTFILES = $(SRCS)
 all: sarg
 
 .c.o:
-	$(CC) -c -I. $(CPPFLAGS) $(DEFS) $(CFLAGS) $(IBINDIR) $(ISYSCONFDIR) $(ILANGDIR) $(IFONTDIR) $(IIMAGEDIR) $(IHTMLDIR) $<
+	$(CC) -c -I. $(CPPFLAGS) $(DEFS) $(CFLAGS) $(IBINDIR) $(ISYSCONFDIR) $(ILANGDIR) $(IFONTDIR) $(IIMAGEDIR) $(ISARGPHPDIR) $<
 
 sarg: $(OBJS)
 	$(CC) $(LDFLAGS) $(OBJS) -o $@ $(LIBS) $(LIBCRYPT)
@@ -97,8 +97,8 @@ install: all
 	cp -r ./images/* $(DESTDIR)$(IMAGEDIR);
 	cp -r ./fonts/* $(DESTDIR)$(FONTDIR);
 	cp -r ./css.tpl $(DESTDIR)$(SYSCONFDIR);
-	-@if test -d $(DESTDIR)$(HTMLDIR); then \
-		cp -r ./sarg-php $(DESTDIR)$(HTMLDIR);	\
+	-@if test -n "$(SARGPHPDIR)" -a -d "$(DESTDIR)$(SARGPHPDIR)"; then \
+		cp -r ./sarg-php $(DESTDIR)$(SARGPHPDIR);	\
 	fi
 
 uninstall:
diff --git a/configure b/configure
index 2faca6b..86ac585 100755
--- a/configure
+++ b/configure
@@ -670,7 +670,7 @@ GREP
 EGREP
 LIBICONV
 LTLIBICONV
-HTMLDIR
+SARGPHPDIR
 LANGDIR
 FONTDIR
 IMAGEDIR
@@ -1262,8 +1262,8 @@ Optional Features:
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
   --disable-rpath         do not hardcode runtime library paths
   --disable-largefile     omit support for large files
-  --enable-htmldir=htmldir
-                        Select htmldir as the root of your WWW documents
+  --enable-sargphp=sargphpdir
+                        Select sargphpdir as the directory to install sarg-php into
   --enable-languagedir=languagedir
                         Select languagedir as the directory with the translations of sarg
   --enable-fontdir=fontdir
@@ -6535,19 +6535,21 @@ else
 echo "$as_me: WARNING: can not detect the size of your system\'s rlim_t type" >&2;}
 fi
 
-# Check whether --enable-htmldir was given.
-if test "${enable_htmldir+set}" = set; then
-  enableval=$enable_htmldir;
-    if test "$enableval"; then
-        HTMLDIR=$enableval
+# Check whether --enable-sargphp was given.
+if test "${enable_sargphp+set}" = set; then
+  enableval=$enable_sargphp;
+    if test "$enableval" -a "x$enableval" != "xno" ; then
+        SARGPHPDIR=$enableval
     fi
 
 else
-  HTMLDIR="/var/www/html"
+  SARGPHP="/var/www/html"
 fi
 
-echo "using $HTMLDIR as the WWW Document Root dir"
+if test "$SARGPHPDIR" ; then
+   echo "using $SARGPHPDIR as the directory to install sarg-php"
 
+fi
 
 # Check whether --enable-languagedir was given.
 if test "${enable_languagedir+set}" = set; then
@@ -7335,7 +7337,7 @@ GREP!$GREP$ac_delim
 EGREP!$EGREP$ac_delim
 LIBICONV!$LIBICONV$ac_delim
 LTLIBICONV!$LTLIBICONV$ac_delim
-HTMLDIR!$HTMLDIR$ac_delim
+SARGPHPDIR!$SARGPHPDIR$ac_delim
 LANGDIR!$LANGDIR$ac_delim
 FONTDIR!$FONTDIR$ac_delim
 IMAGEDIR!$IMAGEDIR$ac_delim
diff --git a/configure.in b/configure.in
index 3706f53..b72186c 100644
--- a/configure.in
+++ b/configure.in
@@ -125,17 +125,19 @@ else
     AC_MSG_WARN([can not detect the size of your system\'s rlim_t type])
 fi
 
-dnl Select htmldir
-AC_ARG_ENABLE(htmldir,
-[  --enable-htmldir=htmldir
-                        Select htmldir as the root of your WWW documents ],
+dnl Select sarg-php directory
+AC_ARG_ENABLE(sargphp,
+[  --enable-sargphp=sargphpdir
+                        Select sargphpdir as the directory to install sarg-php into ],
 [
-    if test "$enableval"; then
-        HTMLDIR=$enableval
+    if test "$enableval" -a "x$enableval" != "xno" ; then
+        SARGPHPDIR=$enableval
     fi
-],[HTMLDIR="/var/www/html"])
-echo "using $HTMLDIR as the WWW Document Root dir"
-AC_SUBST(HTMLDIR)
+],[SARGPHP="/var/www/html"])
+if test "$SARGPHPDIR" ; then
+   echo "using $SARGPHPDIR as the directory to install sarg-php"
+   AC_SUBST(SARGPHPDIR)
+fi
 
 dnl Select languages dir
 AC_ARG_ENABLE(languagedir,
diff --git a/include/info.h b/include/info.h
index 2903994..a9ee4ce 100755
--- a/include/info.h
+++ b/include/info.h
@@ -1,3 +1,3 @@
-#define VERSION PACKAGE_VERSION" Jan-18-2010"
+#define VERSION PACKAGE_VERSION" Jan-20-2010"
 #define PGM PACKAGE_NAME
 #define URL "http://sarg.sourceforge.net"