From 1d5790aeed5197bb244a6004e96594d91eb00e8b Mon Sep 17 00:00:00 2001 From: Kern Sibbald Date: Sun, 4 Jan 2009 07:06:03 +0000 Subject: [PATCH] Apply fix suggested by Bruno Friedmann to configure.in to find python2.5 git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@8307 91ce42f0-d328-0410-95d8-f526ca767f89 --- bacula/autoconf/config.h.in | 61 +++++++++++++++++++++--------------- bacula/autoconf/configure.in | 2 +- bacula/configure | 2 +- bacula/technotes-2.5 | 3 ++ 4 files changed, 41 insertions(+), 27 deletions(-) diff --git a/bacula/autoconf/config.h.in b/bacula/autoconf/config.h.in index c20174f918..76a910d1bd 100644 --- a/bacula/autoconf/config.h.in +++ b/bacula/autoconf/config.h.in @@ -2,9 +2,6 @@ /* ------------------------------------------------------------------------- */ /* -- CONFIGURE SPECIFIED FEATURES -- */ /* ------------------------------------------------------------------------- */ - -/* Define if you want to use the lock manager */ -#undef _USE_LOCKMGR /* Define if you want to use MySQL as Catalog database */ #undef USE_MYSQL_DB @@ -155,31 +152,9 @@ /* Define if you have zlib */ #undef HAVE_LIBZ -/* Defines if your system have the sys/acl.h header file */ -#undef HAVE_SYS_ACL_H - /* Define if you have libacl */ #undef HAVE_ACL -/* Define if you have extended acls */ -#undef HAVE_EXTENDED_ACL - -/* Defines if your system have the sys/xattr.h header file */ -#undef HAVE_SYS_XATTR_H - -/* Define if you have extended attributes */ -#undef HAVE_XATTR - -/* Define when you have extended attributes functions starting with l (like lstat) */ -#undef HAVE_LLISTXATTR -#undef HAVE_LGETXATTR -#undef HAVE_LSETXATTR - -/* Define when you have extended attributes functions not starting with l (like stat) */ -#undef HAVE_LISTXATTR -#undef HAVE_GETXATTR -#undef HAVE_SETXATTR - /* General libs */ #undef LIBS @@ -282,6 +257,9 @@ language is requested. */ #undef ENABLE_NLS +/* Normal attribute support */ +#undef HAVE_ACL + /* Define to 1 if you have `alloca', as a function or macro. */ #undef HAVE_ALLOCA @@ -368,6 +346,9 @@ /* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */ #undef HAVE_DOPRNT +/* Extended attribute support */ +#undef HAVE_EXTENDED_ACL + /* Define to 1 if you have the `fchdir' function. */ #undef HAVE_FCHDIR @@ -428,6 +409,9 @@ /* Define to 1 if you have the `getuid' function. */ #undef HAVE_GETUID +/* Define to 1 if you have the `getxattr' function. */ +#undef HAVE_GETXATTR + /* Define to 1 if you have the header file. */ #undef HAVE_GRP_H @@ -465,6 +449,9 @@ /* Define if your file defines LC_MESSAGES. */ #undef HAVE_LC_MESSAGES +/* LGETXATTR support */ +#undef HAVE_LGETXATTR + /* Define to 1 if you have the header file. */ #undef HAVE_LIBC_H @@ -495,6 +482,12 @@ /* Define to 1 if you have the header file. */ #undef HAVE_LIMITS_H +/* Define to 1 if you have the `listxattr' function. */ +#undef HAVE_LISTXATTR + +/* LLISTXATTR support */ +#undef HAVE_LLISTXATTR + /* Define to 1 if you have the header file. */ #undef HAVE_LOCALE_H @@ -507,6 +500,9 @@ /* Define if you have the 'long long' type. */ #undef HAVE_LONG_LONG +/* LSETXATTR support */ +#undef HAVE_LSETXATTR + /* Define to 1 if you have the `lstat' function. */ #undef HAVE_LSTAT @@ -594,6 +590,9 @@ /* Define to 1 if you have the `setsid' function. */ #undef HAVE_SETSID +/* Define to 1 if you have the `setxattr' function. */ +#undef HAVE_SETXATTR + /* Define if the SHA-2 family of digest algorithms is available */ #undef HAVE_SHA2 @@ -679,6 +678,9 @@ `HAVE_STRUCT_STAT_ST_RDEV' instead. */ #undef HAVE_ST_RDEV +/* Defines if your system have the sys/acl.h header file */ +#undef HAVE_SYS_ACL_H + /* Define to 1 if you have the header file. */ #undef HAVE_SYS_BITYPES_H @@ -729,6 +731,9 @@ /* Define to 1 if you have that is POSIX.1 compatible. */ #undef HAVE_SYS_WAIT_H +/* Defines if your system have the sys/xattr.h header file */ +#undef HAVE_SYS_XATTR_H + /* Define to 1 if you have the `tcgetattr' function. */ #undef HAVE_TCGETATTR @@ -794,6 +799,9 @@ /* Define if you have the 'wint_t' type. */ #undef HAVE_WINT_T +/* XATTR support */ +#undef HAVE_XATTR + /* Define to 1 if you have the header file. */ #undef HAVE_ZLIB_H @@ -911,6 +919,9 @@ /* Define for large files, on AIX-style hosts. */ #undef _LARGE_FILES +/* Set if you want Lock Manager enabled */ +#undef _USE_LOCKMGR + /* Define to empty if `const' does not conform to ANSI C. */ #undef const diff --git a/bacula/autoconf/configure.in b/bacula/autoconf/configure.in index f6c4befb50..827d20c87e 100644 --- a/bacula/autoconf/configure.in +++ b/bacula/autoconf/configure.in @@ -887,7 +887,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 46712d831c..b3ec94abe1 100755 --- a/bacula/configure +++ b/bacula/configure @@ -26151,7 +26151,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/technotes-2.5 b/bacula/technotes-2.5 index f4fca00795..2dd3e70ecf 100644 --- a/bacula/technotes-2.5 +++ b/bacula/technotes-2.5 @@ -10,6 +10,9 @@ filepattern (restore with regex in bsr) mixed priorities General: +28Dec08 +kes Apply fix suggested by Bruno Friedmann to configure.in to + find python2.5 26Dec08 kes Turn on Eric's match_bsr tape block checking code. kes Correct values used for tape block numbers in record.c. -- 2.39.5