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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 062869d52c498e2816f368c272acfae4974980f9..731c972e4cb4cce3d887c2f82146f9cd1fff6dc0 100755 (executable)
--- 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 0026169ff68e6964050e7dc798dc6e63836d545e..08453da1911e5c04c8c87db1fcd1ac09da34807e 100644 (file)
--- 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 91c4fd9a51d2533f0062d090f5ac61bf620d70da..9a1259525474ff279c563e9aabe22dffe4f2e741 100755 (executable)
--- 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 fdb31c76b185e6aeea615fe3ffb16be93e63b743..8cf35e4ec73cd3d66a8d86149de3ad2173c31442 100644 (file)
--- 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 4bf8b6f1ded8969f80b46525aab6281b38263a0c..397a5d92561d5bd976b60bb78bb8746eace9b19f 100755 (executable)
--- 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"