[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] r4628 - gnuradio/trunk/config
From: |
jcorgan |
Subject: |
[Commit-gnuradio] r4628 - gnuradio/trunk/config |
Date: |
Sun, 25 Feb 2007 14:32:44 -0700 (MST) |
Author: jcorgan
Date: 2007-02-25 14:32:44 -0700 (Sun, 25 Feb 2007)
New Revision: 4628
Modified:
gnuradio/trunk/config/gr_python.m4
Log:
Merged -r4560:4627 from jcorgan/ticket-39 into trunk. Fixes ticket:39.
Modified: gnuradio/trunk/config/gr_python.m4
===================================================================
--- gnuradio/trunk/config/gr_python.m4 2007-02-25 21:30:25 UTC (rev 4627)
+++ gnuradio/trunk/config/gr_python.m4 2007-02-25 21:32:44 UTC (rev 4628)
@@ -28,6 +28,13 @@
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 @@
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
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Commit-gnuradio] r4628 - gnuradio/trunk/config,
jcorgan <=