From: jcorgan <jcorgan@221aa14e-8319-0410-a670-987f0aec2ac5>
Date: Sun, 25 Feb 2007 21:32:44 +0000 (+0000)
Subject: Merged -r4560:4627 from jcorgan/ticket-39 into trunk.  Fixes ticket:39.
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=a8feb55ea3bc852c02965fca826211617985f33e;p=debian%2Fgnuradio

Merged -r4560:4627 from jcorgan/ticket-39 into trunk.  Fixes ticket:39.

git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@4628 221aa14e-8319-0410-a670-987f0aec2ac5
---

diff --git a/config/gr_python.m4 b/config/gr_python.m4
index b2acbbb0..d2f3a4b6 100644
--- a/config/gr_python.m4
+++ b/config/gr_python.m4
@@ -28,6 +28,13 @@ AC_DEFUN([PYTHON_DEVEL],[
 	AC_REQUIRE([AM_PATH_PYTHON])
 	AC_REQUIRE([AC_CANONICAL_HOST])
 
+	# For Fedora Core 5 and 6, see ticket:39 in Trac
+	if test -f '/etc/redhat-release'; then
+		if  (echo $pyexecdir | grep -q lib64); then
+			pythondir="$pyexecdir"
+		fi
+	fi
+
 	# Check for Python include path
 	AC_MSG_CHECKING([for Python include path])
 	if test -z "$PYTHON" ; then
@@ -93,22 +100,10 @@ print path
           PYTHON_LDFLAGS="-L$python_stdlib_path -l$libpython_name"
           AC_MSG_RESULT($PYTHON_LDFLAGS) 
           # Replace all backslashes in PYTHON Paths with forward slashes
-          AC_MSG_CHECKING([for pythondir])
           pythondir=`echo $pythondir |sed 's,\\\\,/,g'`
-          AC_MSG_RESULT($pythondir)
-          AC_SUBST([pythondir])
-          AC_MSG_CHECKING([for pkgpythondir])
           pkgpythondir=`echo $pkgpythondir |sed 's,\\\\,/,g'`
-          AC_MSG_RESULT($pkgpythondir)
-          AC_SUBST([pkgpythondir])
-          AC_MSG_CHECKING([for pyexecdir])
           pyexecdir=`echo $pyexecdir |sed 's,\\\\,/,g'`
-          AC_MSG_RESULT($pyexecdir)
-          AC_SUBST([pyexecdir])
-          AC_MSG_CHECKING([for pkgpyexecdir])
           pkgpyexecdir=`echo $pkgpyexecdir |sed 's,\\\\,/,g'`
-          AC_MSG_RESULT($pkgpyexecdir)
-          AC_SUBST([pkgpyexecdir])
 	  ;;
         esac