cobble a temporary changelog entry to keep this test build straight

[debian/gnuradio] / config / gr_python.m4

diff --git a/config/gr_python.m4 b/config/gr_python.m4
index 7479f0533dc921853d8e5bf6057344d007bdc855..7aef1662e0a6fb787eb5ed5f7b1f317498e22413 100644 (file)
--- a/config/gr_python.m4
+++ b/config/gr_python.m4
@@ -123,6 +123,12 @@ print path
              ;;
            esac
 
+           case $host_os in
+                *mingw* )
+             # Python 2.5 requires ".pyd" instead of ".dll" for extensions
+             PYTHON_LDFLAGS="-shrext .pyd ${PYTHON_LDFLAGS}"
+           esac
+
            AC_SUBST(PYTHON_LDFLAGS)
        fi
 ])
@@ -147,14 +153,16 @@ AC_DEFUN([PYTHON_CHECK_MODULE],[
 try:
     import $1
     assert $5
-except: exit(1)'
+except ImportError, AssertionError: exit(1)
+except: pass'
     dnl ########################################
     dnl # import checking only
     dnl ########################################
     else
         python_cmd='
 try: import $1
-except: exit(1)'
+except ImportError: exit(1)
+except: pass'
     fi
     if ! $PYTHON -c "$python_cmd" 2> /dev/null; then
         AC_MSG_RESULT([no])