From: Frédéric Marchal <fmarchal@users.sourceforge.net>
Date: Fri, 29 Jan 2010 08:36:10 +0000 (+0000)
Subject: Invalid variable for the default value of --enable-sargphp in configure.in
X-Git-Tag: v2_2_7~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=af15cfa2d75bfbd8e71588547751700994dfa0e1;p=thirdparty%2Fsarg.git

Invalid variable for the default value of --enable-sargphp in configure.in
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 062869d..731c972 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 "7")
-SET(sarg_BUILDDATE "Jan-28-2010")
+SET(sarg_BUILDDATE "Jan-29-2010")
 
 INCLUDE(AddFileDependencies)
 INCLUDE(CheckIncludeFile)
diff --git a/ChangeLog b/ChangeLog
index 0026169..08453da 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,6 @@
 SARG ChangeLog
 
-Jan-28-2010 Version 2.2.7
+Jan-29-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.
@@ -24,6 +24,7 @@ Jan-28-2010 Version 2.2.7
 		- Fixed regressions in creation and reading of a sarg parsed log (thanks to Joao Alves).
 		- Does not report URLs consisting of only a host name ending with .com as a downloaded file.
 		- Mangle the $ and @ signs in user ID to make the resulting file name valid in shell commands.
+		- Fixed a regression in the default value of --enable-sargphp.
 
 Jan-06-2010 Version 2.2.6.1
 		- Remove unnecessary dependency on off_t.
diff --git a/configure b/configure
index 91c4fd9..9a12595 100755
--- a/configure
+++ b/configure
@@ -6543,7 +6543,7 @@ if test "${enable_sargphp+set}" = set; then
     fi
 
 else
-  SARGPHP="/var/www/html"
+  SARGPHPDIR="/var/www/html"
 fi
 
 if test "$SARGPHPDIR" ; then
diff --git a/configure.in b/configure.in
index fdb31c7..8cf35e4 100644
--- a/configure.in
+++ b/configure.in
@@ -133,7 +133,7 @@ AC_ARG_ENABLE(sargphp,
     if test "$enableval" -a "x$enableval" != "xno" ; then
         SARGPHPDIR=$enableval
     fi
-],[SARGPHP="/var/www/html"])
+],[SARGPHPDIR="/var/www/html"])
 if test "$SARGPHPDIR" ; then
    echo "using $SARGPHPDIR as the directory to install sarg-php"
    AC_SUBST(SARGPHPDIR)
diff --git a/include/info.h b/include/info.h
index 4bf8b6f..397a5d9 100755
--- a/include/info.h
+++ b/include/info.h
@@ -1,3 +1,3 @@
-#define VERSION PACKAGE_VERSION" Jan-28-2010"
+#define VERSION PACKAGE_VERSION" Jan-29-2010"
 #define PGM PACKAGE_NAME
 #define URL "http://sarg.sourceforge.net"