From: Kern Sibbald Date: Tue, 5 Dec 2006 10:47:18 +0000 (+0000) Subject: Update configure.in to include python 2.5 search. X-Git-Tag: Release-2.0.0~162 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=f0cc257109c57980e43cf462e5e6838fd6e26d0b;p=bacula%2Fbacula Update configure.in to include python 2.5 search. git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@3755 91ce42f0-d328-0410-95d8-f526ca767f89 --- diff --git a/bacula/autoconf/config.h.in b/bacula/autoconf/config.h.in index 0600da0a77..082f6410a6 100644 --- a/bacula/autoconf/config.h.in +++ b/bacula/autoconf/config.h.in @@ -146,9 +146,6 @@ /* Directory for PID files */ #undef _PATH_BACULA_PIDDIR -/* LOCALEDIR */ -#undef LOCALEDIR - /* Define if you have zlib */ #undef HAVE_LIBZ @@ -223,6 +220,7 @@ /* Needed on HP-UX/g++ systems to support long long ints (int64) */ #undef _INCLUDE_LONGLONG + /* Define to 1 if the `closedir' function returns void instead of `int'. */ #undef CLOSEDIR_VOID @@ -234,10 +232,6 @@ /* Define to 1 if using `alloca.c'. */ #undef C_ALLOCA -/* Define to 1 if translation of program messages to the user's native - language is requested. */ -#undef ENABLE_NLS - /* Define to 1 if you have `alloca', as a function or macro. */ #undef HAVE_ALLOCA @@ -245,62 +239,21 @@ */ #undef HAVE_ALLOCA_H -/* Define to 1 if you have the header file. */ -#undef HAVE_ARGZ_H - /* Define to 1 if you have the header file. */ #undef HAVE_ARPA_NAMESER_H -/* Define to 1 if you have the `asprintf' function. */ -#undef HAVE_ASPRINTF - /* Define to 1 if you have the header file. */ #undef HAVE_ASSERT_H -/* Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the - CoreFoundation framework. */ -#undef HAVE_CFLOCALECOPYCURRENT - -/* Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue in - the CoreFoundation framework. */ -#undef HAVE_CFPREFERENCESCOPYAPPVALUE - /* Define to 1 if you have the `chflags' function. */ #undef HAVE_CHFLAGS /* Set if Bacula conio support enabled */ #undef HAVE_CONIO -/* Define if encryption support should be enabled */ -#undef HAVE_CRYPTO - /* Define to 1 if you have the header file. */ #undef HAVE_CURSES_H -/* Define if the GNU dcgettext() function is already present or preinstalled. - */ -#undef HAVE_DCGETTEXT - -/* Define to 1 if you have the declaration of `feof_unlocked', and to 0 if you - don't. */ -#undef HAVE_DECL_FEOF_UNLOCKED - -/* Define to 1 if you have the declaration of `fgets_unlocked', and to 0 if - you don't. */ -#undef HAVE_DECL_FGETS_UNLOCKED - -/* Define to 1 if you have the declaration of `getc_unlocked', and to 0 if you - don't. */ -#undef HAVE_DECL_GETC_UNLOCKED - -/* Define to 1 if you have the declaration of `_snprintf', and to 0 if you - don't. */ -#undef HAVE_DECL__SNPRINTF - -/* Define to 1 if you have the declaration of `_snwprintf', and to 0 if you - don't. */ -#undef HAVE_DECL__SNWPRINTF - /* Define to 1 if you have the header file, and it defines `DIR'. */ #undef HAVE_DIRENT_H @@ -317,24 +270,9 @@ /* Define to 1 if you have the `fork' function. */ #undef HAVE_FORK -/* Define to 1 if you have the `fseeko' function. */ -#undef HAVE_FSEEKO - -/* Define to 1 if you have the `fwprintf' function. */ -#undef HAVE_FWPRINTF - /* Define to 1 if you have the `getcwd' function. */ #undef HAVE_GETCWD -/* Define to 1 if you have the `getegid' function. */ -#undef HAVE_GETEGID - -/* Define to 1 if you have the `geteuid' function. */ -#undef HAVE_GETEUID - -/* Define to 1 if you have the `getgid' function. */ -#undef HAVE_GETGID - /* Define to 1 if you have the `gethostbyname2' function. */ #undef HAVE_GETHOSTBYNAME2 @@ -350,55 +288,30 @@ /* Define to 1 if you have the `getmntent' function. */ #undef HAVE_GETMNTENT -/* Define to 1 if you have the `getpagesize' function. */ -#undef HAVE_GETPAGESIZE - /* Define to 1 if you have the `getpid' function. */ #undef HAVE_GETPID -/* Define if the GNU gettext() function is already present or preinstalled. */ -#undef HAVE_GETTEXT - /* Define to 1 if you have the `gettimeofday' function. */ #undef HAVE_GETTIMEOFDAY -/* Define to 1 if you have the `getuid' function. */ -#undef HAVE_GETUID - /* Define to 1 if you have the header file. */ #undef HAVE_GRP_H -/* Define if you have the iconv() function. */ -#undef HAVE_ICONV - /* Define to 1 if you have the `inet_ntop' function. */ #undef HAVE_INET_NTOP /* Define to 1 if you have the `inet_pton' function. */ #undef HAVE_INET_PTON -/* Define if you have the 'intmax_t' type in or . */ -#undef HAVE_INTMAX_T - -/* Define if exists and doesn't clash with . */ +/* Define to 1 if you have the header file. */ #undef HAVE_INTTYPES_H -/* Define if exists, doesn't clash with , and - declares uintmax_t. */ -#undef HAVE_INTTYPES_H_WITH_UINTMAX - /* Whether to enable IPv6 support */ #undef HAVE_IPV6 -/* Define if you have and nl_langinfo(CODESET). */ -#undef HAVE_LANGINFO_CODESET - /* Define to 1 if you have the `lchown' function. */ #undef HAVE_LCHOWN -/* Define if your file defines LC_MESSAGES. */ -#undef HAVE_LC_MESSAGES - /* Define to 1 if you have the header file. */ #undef HAVE_LIBC_H @@ -417,48 +330,24 @@ /* Define to 1 if you have the `sun' library (-lsun). */ #undef HAVE_LIBSUN -/* Define to 1 if you have the `util' library (-lutil). */ -#undef HAVE_LIBUTIL - /* Define to 1 if you have the `xnet' library (-lxnet). */ #undef HAVE_LIBXNET /* Define to 1 if you have the header file. */ #undef HAVE_LIMITS_H -/* Define to 1 if you have the header file. */ -#undef HAVE_LOCALE_H - /* Define to 1 if you have the `localtime_r' function. */ #undef HAVE_LOCALTIME_R -/* Define if you have the 'long double' type. */ -#undef HAVE_LONG_DOUBLE - -/* Define if you have the 'long long' type. */ -#undef HAVE_LONG_LONG - /* Define to 1 if you have the `lstat' function. */ #undef HAVE_LSTAT -/* Define to 1 if you have the header file. */ -#undef HAVE_MALLOC_H - /* Define to 1 if you have the header file. */ #undef HAVE_MEMORY_H -/* Define to 1 if you have the `mempcpy' function. */ -#undef HAVE_MEMPCPY - -/* Define to 1 if you have a working `mmap' system call. */ -#undef HAVE_MMAP - /* Define to 1 if you have the header file. */ #undef HAVE_MTIO_H -/* Define to 1 if you have the `munmap' function. */ -#undef HAVE_MUNMAP - /* Define to 1 if you have the `nanosleep' function. */ #undef HAVE_NANOSLEEP @@ -468,15 +357,6 @@ /* Define to 1 if you have the `nl_langinfo' function. */ #undef HAVE_NL_LANGINFO -/* Define to 1 if you have the header file. */ -#undef HAVE_NL_TYPES_H - -/* Define if OpenSSL library is available */ -#undef HAVE_OPENSSL - -/* Define if your printf() function supports format strings with positions. */ -#undef HAVE_POSIX_PRINTF - /* Define to 1 if you have the `putenv' function. */ #undef HAVE_PUTENV @@ -513,9 +393,6 @@ /* Define to 1 if you have the `setsid' function. */ #undef HAVE_SETSID -/* Define if the SHA-2 family of digest algorithms is available */ -#undef HAVE_SHA2 - /* Define to 1 if you have the `signal' function. */ #undef HAVE_SIGNAL @@ -525,28 +402,15 @@ /* Define to 1 if you have the header file. */ #undef HAVE_STDARG_H -/* Define to 1 if you have the header file. */ -#undef HAVE_STDDEF_H - /* Define to 1 if you have the header file. */ #undef HAVE_STDINT_H -/* Define if exists, doesn't clash with , and declares - uintmax_t. */ -#undef HAVE_STDINT_H_WITH_UINTMAX - /* Define to 1 if you have the header file. */ #undef HAVE_STDLIB_H -/* Define to 1 if you have the `stpcpy' function. */ -#undef HAVE_STPCPY - /* Define to 1 if you have the `strcasecmp' function. */ #undef HAVE_STRCASECMP -/* Define to 1 if you have the `strdup' function. */ -#undef HAVE_STRDUP - /* Define to 1 if you have the `strerror' function. */ #undef HAVE_STRERROR @@ -571,9 +435,6 @@ /* Define to 1 if you have the `strtoll' function. */ #undef HAVE_STRTOLL -/* Define to 1 if you have the `strtoul' function. */ -#undef HAVE_STRTOUL - /* Define to 1 if `st_blksize' is member of `struct stat'. */ #undef HAVE_STRUCT_STAT_ST_BLKSIZE @@ -618,9 +479,6 @@ */ #undef HAVE_SYS_NDIR_H -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_PARAM_H - /* Define to 1 if you have the header file. */ #undef HAVE_SYS_SELECT_H @@ -630,9 +488,6 @@ /* Define to 1 if you have the header file. */ #undef HAVE_SYS_SOCKIO_H -/* Defines if your system have the sys/statvfs.h header file */ -#undef HAVE_SYS_STATVFS_H - /* Define to 1 if you have the header file. */ #undef HAVE_SYS_STAT_H @@ -660,32 +515,17 @@ /* Define to 1 if you have the header file. */ #undef HAVE_TERM_H -/* Define if TLS support should be enabled */ -#undef HAVE_TLS - /* Define to 1 if your `struct tm' has `tm_zone'. Deprecated, use `HAVE_STRUCT_TM_TM_ZONE' instead. */ #undef HAVE_TM_ZONE -/* Define to 1 if you have the `tsearch' function. */ -#undef HAVE_TSEARCH - -/* Defind to 1 if compiler has typeof */ -#undef HAVE_TYPEOF - /* Define to 1 if you don't have `tm_zone' but do have the external array `tzname'. */ #undef HAVE_TZNAME -/* Define if you have the 'uintmax_t' type in or . */ -#undef HAVE_UINTMAX_T - /* Define to 1 if you have the header file. */ #undef HAVE_UNISTD_H -/* Define if you have the 'unsigned long long' type. */ -#undef HAVE_UNSIGNED_LONG_LONG - /* Define to 1 if you have the header file. */ #undef HAVE_VARARGS_H @@ -698,36 +538,9 @@ /* Define to 1 if you have the `vsnprintf' function. */ #undef HAVE_VSNPRINTF -/* Define if you have the 'wchar_t' type. */ -#undef HAVE_WCHAR_T - -/* Define to 1 if you have the `wcslen' function. */ -#undef HAVE_WCSLEN - -/* Define if you have the 'wint_t' type. */ -#undef HAVE_WINT_T - /* Define to 1 if you have the header file. */ #undef HAVE_ZLIB_H -/* Define to 1 if you have the `__argz_count' function. */ -#undef HAVE___ARGZ_COUNT - -/* Define to 1 if you have the `__argz_next' function. */ -#undef HAVE___ARGZ_NEXT - -/* Define to 1 if you have the `__argz_stringify' function. */ -#undef HAVE___ARGZ_STRINGIFY - -/* Define to 1 if you have the `__fsetlocking' function. */ -#undef HAVE___FSETLOCKING - -/* Define as const if the declaration of iconv() needs const. */ -#undef ICONV_CONST - -/* Define if integer division by zero raises signal SIGFPE. */ -#undef INTDIV0_RAISES_SIGFPE - /* Define to 1 if `major', `minor', and `makedev' are declared in . */ #undef MAJOR_IN_MKDEV @@ -754,9 +567,6 @@ /* Define to the version of this package. */ #undef PACKAGE_VERSION -/* Define if exists and defines unusable PRI* macros. */ -#undef PRI_MACROS_BROKEN - /* Define as the return type of signal handlers (`int' or `void'). */ #undef RETSIGTYPE @@ -781,10 +591,6 @@ /* The size of a `short int', as computed by sizeof. */ #undef SIZEOF_SHORT_INT -/* Define as the maximum value of type 'size_t', if the system doesn't define - it. */ -#undef SIZE_MAX - /* If using the C implementation of alloca, define if you know the direction of stack growth for your system; otherwise it will be automatically deduced at run-time. @@ -799,9 +605,6 @@ /* Define to 1 if you have the ANSI C header files. */ #undef STDC_HEADERS -/* Directory for configuration files */ -#undef SYSCONFDIR - /* Define to 1 if you can safely include both and . */ #undef TIME_WITH_SYS_TIME @@ -832,12 +635,6 @@ /* Define to `int' if doesn't define. */ #undef gid_t -/* Define to `__inline__' or `__inline' if that's what the C compiler - calls it, or to nothing if 'inline' is not supported under any name. */ -#ifndef __cplusplus -#undef inline -#endif - /* Define to `unsigned long' if does not define. */ #undef ino_t @@ -856,13 +653,6 @@ /* Define to `int' if does not define. */ #undef pid_t -/* Define as the type of the result of subtracting two pointers, if the system - doesn't define it. */ -#undef ptrdiff_t - -/* Define to empty if the C compiler doesn't support this keyword. */ -#undef signed - /* Define to `unsigned' if does not define. */ #undef size_t @@ -872,6 +662,5 @@ /* Define to `int' if doesn't define. */ #undef uid_t -/* Define to unsigned long or unsigned long long if and - don't define. */ -#undef uintmax_t +/* Define to system config director */ +#undef SYSCONFDIR diff --git a/bacula/autoconf/config.h.in.save b/bacula/autoconf/config.h.in.save index ee8c0df5c1..082f6410a6 100644 --- a/bacula/autoconf/config.h.in.save +++ b/bacula/autoconf/config.h.in.save @@ -594,9 +594,9 @@ /* If using the C implementation of alloca, define if you know the direction of stack growth for your system; otherwise it will be automatically deduced at run-time. - STACK_DIRECTION > 0 => grows toward higher addresses - STACK_DIRECTION < 0 => grows toward lower addresses - STACK_DIRECTION = 0 => direction of growth unknown */ + STACK_DIRECTION > 0 => grows toward higher addresses + STACK_DIRECTION < 0 => grows toward lower addresses + STACK_DIRECTION = 0 => direction of growth unknown */ #undef STACK_DIRECTION /* Define to 1 if the `S_IS*' macros in do not work properly. */ @@ -661,3 +661,6 @@ /* Define to `int' if doesn't define. */ #undef uid_t + +/* Define to system config director */ +#undef SYSCONFDIR diff --git a/bacula/autoconf/configure.in b/bacula/autoconf/configure.in index a6ef0c821c..0dbdde72e5 100644 --- a/bacula/autoconf/configure.in +++ b/bacula/autoconf/configure.in @@ -611,31 +611,17 @@ AC_ARG_WITH(python, if test "$withval" != "no"; then if test "$withval" = "yes"; then for python_root in /usr /usr/local /usr/sfw; do - if test -f $python_root/include/python2.2/Python.h; then - PYTHON_INCDIR=-I$python_root/include/python2.2 - if test -d $python_root/lib64/python2.2/config; then - PYTHON_LIBS="-L$python_root/lib64/python2.2/config -lpython2.2" - else - PYTHON_LIBS="-L$python_root/lib/python2.2/config -lpython2.2" - fi - break - elif test -f $python_root/include/python2.3/Python.h; then - PYTHON_INCDIR=-I$python_root/include/python2.3 - if test -d $python_root/lib64/python2.3/config; then - PYTHON_LIBS="-L$python_root/lib64/python2.3/config -lpython2.3" - else - PYTHON_LIBS="-L$python_root/lib/python2.3/config -lpython2.3" + for ver in python2.2 python2.3 python2.4 python2.5; 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 + PYTHON_LIBS="-L$python_root/lib64/${ver}/config -l${ver}" + else + PYTHON_LIBS="-L$python_root/lib/${ver}/config -l${ver}" + fi + break fi - break - elif test -f $python_root/include/python2.4/Python.h; then - PYTHON_INCDIR=-I$python_root/include/python2.4 - if test -d $python_root/lib64/python2.4/config; then - PYTHON_LIBS="-L$python_root/lib64/python2.4/config -lpython2.4" - else - PYTHON_LIBS="-L$python_root/lib/python2.4/config -lpython2.4" - fi - break - fi + done done if test x$PYTHON_INCDIR = x; then if test -f $prefix/include/Python.h; then diff --git a/bacula/configure b/bacula/configure index a73913e712..5c6124bf0d 100755 --- a/bacula/configure +++ b/bacula/configure @@ -14958,31 +14958,17 @@ 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 - if test -f $python_root/include/python2.2/Python.h; then - PYTHON_INCDIR=-I$python_root/include/python2.2 - if test -d $python_root/lib64/python2.2/config; then - PYTHON_LIBS="-L$python_root/lib64/python2.2/config -lpython2.2" - else - PYTHON_LIBS="-L$python_root/lib/python2.2/config -lpython2.2" - fi - break - elif test -f $python_root/include/python2.3/Python.h; then - PYTHON_INCDIR=-I$python_root/include/python2.3 - if test -d $python_root/lib64/python2.3/config; then - PYTHON_LIBS="-L$python_root/lib64/python2.3/config -lpython2.3" - else - PYTHON_LIBS="-L$python_root/lib/python2.3/config -lpython2.3" + for ver in python2.2 python2.3 python2.4 python2.5; 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 + PYTHON_LIBS="-L$python_root/lib64/${ver}/config -l${ver}" + else + PYTHON_LIBS="-L$python_root/lib/${ver}/config -l${ver}" + fi + break fi - break - elif test -f $python_root/include/python2.4/Python.h; then - PYTHON_INCDIR=-I$python_root/include/python2.4 - if test -d $python_root/lib64/python2.4/config; then - PYTHON_LIBS="-L$python_root/lib64/python2.4/config -lpython2.4" - else - PYTHON_LIBS="-L$python_root/lib/python2.4/config -lpython2.4" - fi - break - fi + done done if test x$PYTHON_INCDIR = x; then if test -f $prefix/include/Python.h; then diff --git a/bacula/technotes-1.39 b/bacula/technotes-1.39 index 6d0511eb2e..84d17edb78 100644 --- a/bacula/technotes-1.39 +++ b/bacula/technotes-1.39 @@ -2,6 +2,7 @@ General: 05Dec06 +kes Update configure.in to include python 2.5 search. kes Back out unwanted migration change reported by Richard Mortimer. 04Dec06 kes Make migration with no files to migrate set normal termination.