Imported Upstream version 3.0.3

[debian/gnuradio] / configure

diff --git a/configure b/configure
index d04da58b041bad475483182e52840cc08363ea90..d27bb1197a311aabc9ddc7e939002a26fedbf13f 100755 (executable)
--- a/configure
+++ b/configure
@@ -2487,7 +2487,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE=gnuradio
- VERSION=3.0.2
+ VERSION=3.0.3
 
 
 cat >>confdefs.h <<_ACEOF
@@ -5787,7 +5787,7 @@ _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <math.h>
+#include <cmath>
 int
 main ()
 {
@@ -22059,6 +22059,13 @@ echo "${ECHO_T}$am_cv_python_pyexecdir" >&6; }
 
 
 
+       # 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
        { echo "$as_me:$LINENO: checking for Python include path" >&5
 echo $ECHO_N "checking for Python include path... $ECHO_C" >&6; }
@@ -22299,30 +22306,10 @@ print path
           { echo "$as_me:$LINENO: result: $PYTHON_LDFLAGS" >&5
 echo "${ECHO_T}$PYTHON_LDFLAGS" >&6; }
           # Replace all backslashes in PYTHON Paths with forward slashes
-          { echo "$as_me:$LINENO: checking for pythondir" >&5
-echo $ECHO_N "checking for pythondir... $ECHO_C" >&6; }
           pythondir=`echo $pythondir |sed 's,\\\\,/,g'`
-          { echo "$as_me:$LINENO: result: $pythondir" >&5
-echo "${ECHO_T}$pythondir" >&6; }
-
-          { echo "$as_me:$LINENO: checking for pkgpythondir" >&5
-echo $ECHO_N "checking for pkgpythondir... $ECHO_C" >&6; }
           pkgpythondir=`echo $pkgpythondir |sed 's,\\\\,/,g'`
-          { echo "$as_me:$LINENO: result: $pkgpythondir" >&5
-echo "${ECHO_T}$pkgpythondir" >&6; }
-
-          { echo "$as_me:$LINENO: checking for pyexecdir" >&5
-echo $ECHO_N "checking for pyexecdir... $ECHO_C" >&6; }
           pyexecdir=`echo $pyexecdir |sed 's,\\\\,/,g'`
-          { echo "$as_me:$LINENO: result: $pyexecdir" >&5
-echo "${ECHO_T}$pyexecdir" >&6; }
-
-          { echo "$as_me:$LINENO: checking for pkgpyexecdir" >&5
-echo $ECHO_N "checking for pkgpyexecdir... $ECHO_C" >&6; }
           pkgpyexecdir=`echo $pkgpyexecdir |sed 's,\\\\,/,g'`
-          { echo "$as_me:$LINENO: result: $pkgpyexecdir" >&5
-echo "${ECHO_T}$pkgpyexecdir" >&6; }
-
          ;;
         esac
 
@@ -33945,9 +33932,7 @@ fi
     ac_config_files="$ac_config_files gr-wxgui/Makefile gr-wxgui/src/Makefile gr-wxgui/src/python/Makefile"
 
 
-    # FIXME: this breaks pkgsrc by calling python without a version number
-    # gdt--patch welcome :-)
-    if python -c 'import wx'; then
+    if ${PYTHON} -c 'import wx'; then
        passed=yes
     else
        passed=no