Merge from vendor branch TNF:
[pkgsrcv2.git] / sysutils / bacula / patches / patch-ao
1 $NetBSD$
2
3 --- configure.orig      2010-08-05 14:29:51.000000000 +0000
4 +++ configure
5 @@ -26254,8 +26254,8 @@ if test "${with_python+set}" = set; then
6                 PYTHON_INCDIR=`/usr/bin/python-config --includes`
7                 PYTHON_LIBS=`/usr/bin/python-config --libs`
8              else
9 -               for python_root in /usr /usr/local /usr/sfw; do
10 -                  for ver in python2.2 python2.3 python2.4 python2.5 python2.6 python3; do
11 +               for python_root in ${PREFIX}; do
12 +                  for ver in python${PYVERSSUFFIX}; do
13                       if test -f $python_root/include/${ver}/Python.h; then
14                          PYTHON_INCDIR=-I$python_root/include/${ver}
15                          if test -d $python_root/lib64/${ver}/config; then
16 @@ -47521,7 +47523,7 @@ echo "$as_me: error: Could not find qmak
17     { (exit 1); exit 1; }; }
18     fi
19  
20 -   QMAKEBIN="qmake"
21 +   QMAKEBIN=${QMAKE}
22     cd src/qt-console
23     echo "Creating bat Makefile"
24     touch bat