File:  [cvs.NetBSD.org] / pkgsrc / sysutils / bacula / patches / Attic / patch-ao
Revision 1.6: download - view: text, annotated - select for diffs
Sat Jun 18 10:40:33 2011 UTC (13 years, 8 months ago) by shattered
Branches: MAIN
CVS tags: pkgsrc-2012Q3-base, pkgsrc-2012Q3, pkgsrc-2012Q2-base, pkgsrc-2012Q2, pkgsrc-2012Q1-base, pkgsrc-2012Q1, pkgsrc-2011Q4-base, pkgsrc-2011Q4, pkgsrc-2011Q3-base, pkgsrc-2011Q3, pkgsrc-2011Q2-base, pkgsrc-2011Q2, HEAD
Fix build with python option.

$NetBSD: patch-ao,v 1.6 2011/06/18 10:40:33 shattered Exp $

--- configure.orig	2010-08-05 14:29:51.000000000 +0000
+++ configure
@@ -26254,8 +26254,8 @@ if test "${with_python+set}" = set; then
 		PYTHON_INCDIR=`/usr/bin/python-config --includes`
 		PYTHON_LIBS=`/usr/bin/python-config --libs`
 	     else
-		for python_root in /usr /usr/local /usr/sfw; do
-		   for ver in python2.2 python2.3 python2.4 python2.5 python2.6 python3; do
+		for python_root in ${PREFIX}; do
+		   for ver in python${PYVERSSUFFIX}; 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
@@ -47521,7 +47523,7 @@ echo "$as_me: error: Could not find qmak
    { (exit 1); exit 1; }; }
    fi
 
-   QMAKEBIN="qmake"
+   QMAKEBIN=${QMAKE}
    cd src/qt-console
    echo "Creating bat Makefile"
    touch bat

CVSweb <webmaster@jp.NetBSD.org>