From 212f623428ddfcd17021f4b431750305024626a1 Mon Sep 17 00:00:00 2001
From: Johnathan Corgan <jcorgan@corganenterprises.com>
Date: Sat, 10 Oct 2009 16:47:09 -0700
Subject: [PATCH] Add flags and dependencies for MinGW/MSYS.

Patch-by: Don Ward <don2387ward@sprynet.com>
---
 config/gr_pwin32.m4                       |  3 +++
 config/gr_python.m4                       |  6 ++++++
 config/grc_gr_msdd6000.m4                 |  2 +-
 gnuradio-core/src/lib/missing/Makefile.am | 14 +++++++++++---
 4 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/config/gr_pwin32.m4 b/config/gr_pwin32.m4
index 7b99cba6..495e9dd4 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 7479f053..43ccfc01 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 6d40e893..0c6fc320 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/gnuradio-core/src/lib/missing/Makefile.am b/gnuradio-core/src/lib/missing/Makefile.am
index 08e521cb..23837091 100644
--- a/gnuradio-core/src/lib/missing/Makefile.am
+++ b/gnuradio-core/src/lib/missing/Makefile.am
@@ -1,5 +1,5 @@
 #
-# Copyright 2003,2004,2008 Free Software Foundation, Inc.
+# Copyright 2003,2004,2008,2009 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -33,6 +33,14 @@ EXTRA_DIST = 			\
 
 noinst_LTLIBRARIES = libmissing.la
 
-libmissing_la_SOURCES = 	\
-	bug_work_around_8.cc	\
+libmissing_la_common_SOURCES =	\
+	bug_work_around_8.cc
+
+powerpc_CODE = \
 	posix_memalign.cc	
+
+if MD_CPU_powerpc
+libmissing_la_SOURCES = $(libmissing_la_common_SOURCES) $(powerpc_CODE)
+else
+libmissing_la_SOURCES = $(libmissing_la_common_SOURCES)
+endif
-- 
2.30.2