Apply fix suggested by Bruno Friedmann to configure.in to

     find python2.5

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/branches/Branch-2.4@8258 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/bacula/autoconf/configure.in b/bacula/autoconf/configure.in
index a89f070075329fd204227fc0c36d5ab7f8631856..a164bcd8f0282b05b11d610b897ff712a8f27929 100644 (file)
--- a/bacula/autoconf/configure.in
+++ b/bacula/autoconf/configure.in
@@ -723,7 +723,7 @@ AC_ARG_WITH(python,
   if test "$withval" != "no"; then
      if test "$withval" = "yes"; then
        for python_root in /usr /usr/local /usr/sfw; do
-         for ver in python2.2 python2.3 python2.4 python2.5; do
+         for ver in python2.2 python2.3 python2.4 python2.5 python2.6 python3; do
             if test -f $python_root/include/${ver}/Python.h; then
                PYTHON_INCDIR=-I$python_root/include/${ver}
                if test -d $python_root/lib64/${ver}/config; then

diff --git a/bacula/configure b/bacula/configure
index feeb67a129204fd9673e22a0952f72f8d54ac89f..9cd0c0f861c2b8116270c937c3102c293feeb3ac 100755 (executable)
--- a/bacula/configure
+++ b/bacula/configure
@@ -15621,7 +15621,7 @@ if test "${with_python+set}" = set; then
   if test "$withval" != "no"; then
      if test "$withval" = "yes"; then
        for python_root in /usr /usr/local /usr/sfw; do
-         for ver in python2.2 python2.3 python2.4 python2.5; do
+         for ver in python2.2 python2.3 python2.4 python2.5 python2.6 python3; do
             if test -f $python_root/include/${ver}/Python.h; then
                PYTHON_INCDIR=-I$python_root/include/${ver}
                if test -d $python_root/lib64/${ver}/config; then

diff --git a/bacula/src/version.h b/bacula/src/version.h
index 4f481b11c313d30f7f5c4e6df7fa021925db12e6..4cdb22a01d9c467eff842d9f0dd554b045cecd7e 100644 (file)
--- a/bacula/src/version.h
+++ b/bacula/src/version.h
@@ -4,8 +4,8 @@
 
 #undef  VERSION
 #define VERSION "2.4.4-b2"
-#define BDATE   "24 December 2008"
-#define LSMDATE "24Dec08"
+#define BDATE   "28 December 2008"
+#define LSMDATE "28Dec08"
 
 #define PROG_COPYRIGHT "Copyright (C) %d-2008 Free Software Foundation Europe e.V.\n"
 #define BYEAR "2008"       /* year for copyright messages in progs */

diff --git a/bacula/technotes-2.4 b/bacula/technotes-2.4
index dd370e75aadba00945035b85da6b740463ca7dd8..9764080da1a2f749a2771d750389bcc561fb6c29 100644 (file)
--- a/bacula/technotes-2.4
+++ b/bacula/technotes-2.4
@@ -1,6 +1,10 @@
               Technical notes on version 2.4
 
 General:
+28Dec08
+kes  Apply fix suggested by Bruno Friedmann to configure.in to
+     find python2.5
+
 Release Version 2.4.4-b2
 23Dec08
 kes  Fix bug #1208. Inappropriate Volume purging.