diff options
Diffstat (limited to 'config')
| -rw-r--r-- | config/gr_pwin32.m4 | 3 | ||||
| -rw-r--r-- | config/gr_python.m4 | 6 | ||||
| -rw-r--r-- | config/gr_version.m4 | 5 | ||||
| -rw-r--r-- | config/grc_gnuradio_examples.m4 | 5 | ||||
| -rw-r--r-- | config/grc_gr_msdd6000.m4 | 2 | ||||
| -rw-r--r-- | config/grc_grc.m4 | 1 | ||||
| -rw-r--r-- | config/grc_gruel.m4 | 4 |
7 files changed, 22 insertions, 4 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/gr_version.m4 b/config/gr_version.m4 index 4f45f0efa..3360b7d54 100644 --- a/config/gr_version.m4 +++ b/config/gr_version.m4 @@ -40,6 +40,7 @@ AC_DEFUN([GR_VERSION],[ if test "$MINOR_VERSION" == "git"; then dnl 3.3git-xxx-gxxxxxxxx RELEASE=$RELEASE$MINOR_VERSION + DOCVER=$RELEASE if test "$GIT_VERSION" != "" ; then RELEASE=$RELEASE-$GIT_VERSION fi @@ -47,6 +48,7 @@ AC_DEFUN([GR_VERSION],[ if test "$MAINT_VERSION" == "git" ; then dnl 3.3.1git-xxx-gxxxxxxxx RELEASE=$RELEASE.$MINOR_VERSION$MAINT_VERSION + DOCVER=$RELEASE if test "$GIT_VERSION" != "" ; then RELEASE=$RELEASE-$GIT_VERSION fi @@ -61,9 +63,12 @@ AC_DEFUN([GR_VERSION],[ dnl 3.3.0.1, 3.3.1.1 RELEASE=$RELEASE.$MAINT_VERSION fi + DOCVER=$RELEASE fi fi fi AC_MSG_NOTICE([GNU Radio Release $RELEASE]) + AC_SUBST(RELEASE) + AC_SUBST(DOCVER) ]) diff --git a/config/grc_gnuradio_examples.m4 b/config/grc_gnuradio_examples.m4 index 3225f3ab5..4d6116c70 100644 --- a/config/grc_gnuradio_examples.m4 +++ b/config/grc_gnuradio_examples.m4 @@ -1,4 +1,4 @@ -dnl Copyright 2001,2002,2003,2004,2005,2006,2008 Free Software Foundation, Inc. +dnl Copyright 2001,2002,2003,2004,2005,2006,2008,2009 Free Software Foundation, Inc. dnl dnl This file is part of GNU Radio dnl @@ -27,13 +27,14 @@ AC_DEFUN([GRC_GNURADIO_EXAMPLES],[ gnuradio-examples/Makefile \ gnuradio-examples/c++/Makefile \ gnuradio-examples/python/Makefile \ + gnuradio-examples/grc/Makefile \ gnuradio-examples/python/apps/hf_explorer/Makefile \ gnuradio-examples/python/apps/hf_radio/Makefile \ gnuradio-examples/python/apps/Makefile \ gnuradio-examples/python/audio/Makefile \ gnuradio-examples/python/digital/Makefile \ gnuradio-examples/python/digital_voice/Makefile \ - gnuradio-examples/python/digital-bert/Makefile \ + gnuradio-examples/python/digital-bert/Makefile \ gnuradio-examples/python/mp-sched/Makefile \ gnuradio-examples/python/multi-antenna/Makefile \ gnuradio-examples/python/multi_usrp/Makefile \ 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_grc.m4 b/config/grc_grc.m4 index 7ee009fae..16720b8fe 100644 --- a/config/grc_grc.m4 +++ b/config/grc_grc.m4 @@ -50,7 +50,6 @@ AC_DEFUN([GRC_GRC],[ grc/Makefile \ grc/base/Makefile \ grc/blocks/Makefile \ - grc/examples/Makefile \ grc/freedesktop/Makefile \ grc/grc_gnuradio/Makefile \ grc/gui/Makefile \ 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="\ |