Change key directory to /etc/bacula/pubkeys

[bacula/bacula] / bacula / autoconf / configure.in

diff --git a/bacula/autoconf/configure.in b/bacula/autoconf/configure.in
index 19f3d1d70191bdffaaa25b4d9629583035bc3785..b61da9e8b90f6a9b51e9c9df59637f2690864739 100644 (file)
--- a/bacula/autoconf/configure.in
+++ b/bacula/autoconf/configure.in
@@ -612,22 +612,38 @@ AC_ARG_WITH(python,
        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
-            PYTHON_LIBS="-L$python_root/lib/python2.2/config -lpython2.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
-            PYTHON_LIBS="-L$python_root/lib/python2.3/config -lpython2.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"
+            fi
             break
          elif test -f $python_root/include/python2.4/Python.h; then
             PYTHON_INCDIR=-I$python_root/include/python2.4
-            PYTHON_LIBS="-L$python_root/lib/python2.4/config -lpython2.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
        if test x$PYTHON_INCDIR = x; then
          if test -f $prefix/include/Python.h; then
             PYTHON_INCDIR=-I$prefix/include
-            PYTHON_LIBS="-L$prefix/lib/config -lpython"
+            if test -d $prefix/lib64/config; then
+               PYTHON_LIBS="-L$prefix/lib64/config -lpython"
+            else
+               PYTHON_LIBS="-L$prefix/lib/config -lpython"
+            fi
          else
           AC_MSG_RESULT(no)
           AC_MSG_ERROR(Unable to find Python.h in standard locations)
@@ -639,10 +655,18 @@ AC_ARG_WITH(python,
           PYTHON_LIBS="-L$withval/config -lpython"
        elif test -f $withval/include/Python.h; then
           PYTHON_INCDIR=-I$withval/include
-          PYTHON_LIBS="-L$withval/lib/config -lpython"
+          if test -d $withval/lib64/config; then
+             PYTHON_LIBS="-L$withval/lib64/config -lpython"
+          else
+             PYTHON_LIBS="-L$withval/lib/config -lpython"
+          fi
        elif test -f $withval/include/python/Python.h; then
           PYTHON_INCDIR=-I$withval/include/python
-          PYTHON_LIBS="-L$withval/lib/python/config -lpython"
+          if test -d $withval/lib64/python/config; then
+             PYTHON_LIBS="-L$withval/lib64/python/config -lpython"
+          else
+             PYTHON_LIBS="-L$withval/lib/python/config -lpython"
+          fi
        else
           AC_MSG_RESULT(no)
           AC_MSG_ERROR(Invalid Python directory $withval - unable to find Python.h under $withval)
@@ -1738,8 +1762,8 @@ freebsd)
        DISTVER=`uname -a |awk '{print $3}'`
        VER=`echo $DISTVER | cut -c 1`
        if test x$VER = x4 ; then
-          PTHREAD_LIB="${PTHREAD_LIBS}"
-          CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}"
+          PTHREAD_LIB="${PTHREAD_LIBS:--pthread}"
+          CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS:--pthread}"
        fi
        lld="qd"
        llu="qu"
@@ -1980,7 +2004,6 @@ AC_OUTPUT([autoconf/Make.common \
           src/stored/bacula-sd.conf \
           src/filed/Makefile \
           src/filed/bacula-fd.conf \
-          src/filed/win32/Makefile \
           src/cats/Makefile \
           src/cats/make_catalog_backup \
           src/cats/delete_catalog_backup \
@@ -2025,13 +2048,6 @@ AC_OUTPUT([autoconf/Make.common \
           src/findlib/Makefile \
           src/pygtk-console/Makefile \
           src/tools/Makefile \
-          src/win32/winbacula.nsi \
-          src/win32/baculafd/bacula-fd.conf \
-          src/win32/Makefile \
-          src/win32/Makefile.vcpp \
-          src/win32/console/bconsole.conf \
-          src/win32/wx-console/wx-console.conf \
-          src/win32/pebuilder/Makefile \
           po/Makefile.in \
           $PFILES ],  
          [(echo "Doing make of dependencies"; ${MAKE:-make} depend;) ]