File 001-check-python26.diff of Package bacula

File 001-check-python26.diff of Package bacula (Revision 8b11669826e9b632a15af1baa8587c9f)

Currently displaying revision 8b11669826e9b632a15af1baa8587c9f, show latest

--- bacula-2.4.3/configure.ori	2008-12-21 22:03:04.000000000 +0100
+++ bacula-2.4.3/configure	2008-12-21 22:20:11.000000000 +0100
@@ -15620,37 +15620,45 @@
   PYTHON_LIBS=
   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
-	     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
+        if [ -a /usr/bin/python-config ] ; then
+	  PYTHON_INCDIR=`python-config --includes`
+	  PYTHON_LIBS=`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; 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
+	    done
 	  done
-	done
-	if test x$PYTHON_INCDIR = x; then
-	  if test -f $prefix/include/Python.h; then
-	     PYTHON_INCDIR=-I$prefix/include
-	     if test -d $prefix/lib64/config; then
-		PYTHON_LIBS="-L$prefix/lib64/config -lpython"
-	     else
-		PYTHON_LIBS="-L$prefix/lib/config -lpython"
-	     fi
-	  else
-	   { echo "$as_me:$LINENO: result: no" >&5
+	  if test x$PYTHON_INCDIR = x; then
+	    if test -f $prefix/include/Python.h; then
+	       PYTHON_INCDIR=-I$prefix/include
+	       if test -d $prefix/lib64/config; then
+		  PYTHON_LIBS="-L$prefix/lib64/config -lpython"
+	       else
+		  PYTHON_LIBS="-L$prefix/lib/config -lpython"
+	       fi
+	    else
+	     { echo "$as_me:$LINENO: result: no" >&5
 echo "${ECHO_T}no" >&6; }
-	   { { echo "$as_me:$LINENO: error: Unable to find Python.h in standard locations" >&5
+	     { { echo "$as_me:$LINENO: error: Unable to find Python.h in standard locations" >&5
 echo "$as_me: error: Unable to find Python.h in standard locations" >&2;}
-   { (exit 1); exit 1; }; }
+     { (exit 1); exit 1; }; }
+	    fi
 	  fi
 	fi
      else
-	if test -f $withval/Python.h; then
+        if test -x $withval/bin/python-config ; then
+	  PYTHON_INCDIR=`python-config --includes`
+	  PYTHON_LIBS=`python-config --libs`
+	elif test -f $withval/Python.h; then
 	   PYTHON_INCDIR=-I$withval
 	   PYTHON_LIBS="-L$withval/config -lpython"
 	elif test -f $withval/include/Python.h; then