diff options
| author | Johnathan Corgan | 2010-07-29 16:16:28 -0700 |
|---|---|---|
| committer | Johnathan Corgan | 2010-07-29 16:16:28 -0700 |
| commit | 02ad84daaff3976d74dd8501b007775b196f7fcd (patch) | |
| tree | 41f3462c4cddc36236e732687e7a9f60a513066e | |
| parent | a7de1e8138de520377e3357ca24bc5de4b6bb5d9 (diff) | |
| parent | c76f5838e370ae71ec10d7eba0d30466a2caf73b (diff) | |
| download | gnuradio-02ad84daaff3976d74dd8501b007775b196f7fcd.tar.gz gnuradio-02ad84daaff3976d74dd8501b007775b196f7fcd.tar.bz2 gnuradio-02ad84daaff3976d74dd8501b007775b196f7fcd.zip | |
Merge branch 'master' into next
* master:
Fixes ./configure to allow grc to build without an X session
| -rw-r--r-- | config/gr_python.m4 | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/config/gr_python.m4 b/config/gr_python.m4 index 43ccfc015..7aef1662e 100644 --- a/config/gr_python.m4 +++ b/config/gr_python.m4 @@ -153,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]) |