diff options
| author | Johnathan Corgan | 2009-10-11 08:42:37 -0700 |
|---|---|---|
| committer | Johnathan Corgan | 2009-10-11 08:42:37 -0700 |
| commit | c49fc2debfbcbf6e8ab2100f7d20319b457792ee (patch) | |
| tree | 8995da495bcd10e51842ada61fb62cf69c51b2e3 /config | |
| parent | a1faa30ce3313e81e180792bea445fe0a961fe3c (diff) | |
| parent | 58f84719a2084142bd2fe008a7ff4b1f05b5a598 (diff) | |
| download | gnuradio-c49fc2debfbcbf6e8ab2100f7d20319b457792ee.tar.gz gnuradio-c49fc2debfbcbf6e8ab2100f7d20319b457792ee.tar.bz2 gnuradio-c49fc2debfbcbf6e8ab2100f7d20319b457792ee.zip | |
Merge branch 'patches/dward' of git@gnuradio.org:jcorgan
* 'patches/dward' of git@gnuradio.org:jcorgan:
#include "config.h" in db_wbxng.cc (for timespec, nanosleep, etc.)
Add flags and dependencies for MinGW/MSYS.
Add dependence of gruel on guile; fixes ticket #410.
Use gruel::mutex instead of pthread_mutex in gr_histo_sink_f.
Add .gitattributes to fix CRLF problems on MinGW/MSYS
Diffstat (limited to 'config')
| -rw-r--r-- | config/gr_pwin32.m4 | 3 | ||||
| -rw-r--r-- | config/gr_python.m4 | 6 | ||||
| -rw-r--r-- | config/grc_gr_msdd6000.m4 | 2 | ||||
| -rw-r--r-- | config/grc_gruel.m4 | 4 |
4 files changed, 14 insertions, 1 deletions
diff --git a/config/gr_pwin32.m4 b/config/gr_pwin32.m4 index 7b99cba6b..495e9dd4d 100644 --- a/config/gr_pwin32.m4 +++ b/config/gr_pwin32.m4 @@ -99,6 +99,9 @@ struct timespec { long tv_nsec; }; #endif +#if HAVE_UNISTD_H +#include <unistd.h> +#endif static inline int nanosleep(const struct timespec *req, struct timespec *rem) { return usleep(req->tv_sec*1000000+req->tv_nsec/1000); } #endif diff --git a/config/gr_python.m4 b/config/gr_python.m4 index 7479f0533..43ccfc015 100644 --- 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 ]) diff --git a/config/grc_gr_msdd6000.m4 b/config/grc_gr_msdd6000.m4 index 6d40e8931..0c6fc320e 100644 --- a/config/grc_gr_msdd6000.m4 +++ b/config/grc_gr_msdd6000.m4 @@ -29,7 +29,7 @@ AC_DEFUN([GRC_GR_MSDD6000],[ dnl Don't do gr-msdd6000 if gnuradio-core skipped GRC_CHECK_DEPENDENCY(gr-msdd6000, gnuradio-core) - AC_CHECK_HEADERS(netinet/in.h arpa/inet.h sys/socket.h netdb.h) + AC_CHECK_HEADERS(netinet/in.h arpa/inet.h sys/socket.h netdb.h, [], [passed=no]) GRC_BUILD_CONDITIONAL([gr-msdd6000],[ dnl run_tests is created from run_tests.in. Make it executable. diff --git a/config/grc_gruel.m4 b/config/grc_gruel.m4 index 729571434..d8ac95fed 100644 --- a/config/grc_gruel.m4 +++ b/config/grc_gruel.m4 @@ -25,6 +25,10 @@ AC_DEFUN([GRC_GRUEL],[ dnl with : if the --with code didn't error out dnl yes : if the --enable code passed muster and all dependencies are met dnl no : otherwise + if test $passed = yes; then + dnl Don't do gruel if guile not available + GRC_CHECK_GUILE(gruel) + fi if test $passed != with; then dnl how and where to find INCLUDES and LA and such gruel_INCLUDES="\ |