Index: gr-pager/src/Makefile.am
===================================================================
--- gr-pager/src/Makefile.am	(revision 4439)
+++ gr-pager/src/Makefile.am	(working copy)
@@ -94,6 +94,7 @@
 _pager_swig_la_LIBADD = \
     $(PYTHON_LDFLAGS) \
     $(GNURADIO_CORE_LIBS) \
+    $(OMNITHREAD_LIBS) \
     -lstdc++			
 
 pager_swig.cc pager_swig.py: $(ALL_IFILES)
Index: gr-audio-portaudio/src/Makefile.am
===================================================================
--- gr-audio-portaudio/src/Makefile.am	(revision 4439)
+++ gr-audio-portaudio/src/Makefile.am	(working copy)
@@ -76,6 +76,7 @@
 _audio_portaudio_la_LIBADD = 		\
 	$(PYTHON_LDFLAGS)		\
 	$(GNURADIO_CORE_LIBS)		\
+	$(OMNITHREAD_LIBS)		\
 	$(PORTAUDIO_LIBS)		\
 	-lstdc++				
 
Index: omnithread/Makefile.am
===================================================================
--- omnithread/Makefile.am	(revision 4439)
+++ omnithread/Makefile.am	(working copy)
@@ -44,6 +44,9 @@
 	nt.cc
 endif
 
+# magic flags
+libgromnithread_la_LDFLAGS = $(NO_UNDEFINED) -avoid-version
+
 libgromnithread_la_LIBADD =		\
 	$(PTHREAD_LIBS)
 
Index: gnuradio-core/src/lib/swig/Makefile.am
===================================================================
--- gnuradio-core/src/lib/swig/Makefile.am	(revision 4439)
+++ gnuradio-core/src/lib/swig/Makefile.am	(working copy)
@@ -120,6 +120,7 @@
 _gnuradio_swig_py_runtime_la_LIBADD  = 		\
 	$(top_builddir)/gnuradio-core/src/lib/libgnuradio-core.la	\
 	$(PYTHON_LDFLAGS)			\
+	$(OMNITHREAD_LIBS)			\
 	-lstdc++
 
 _gnuradio_swig_py_runtime_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
@@ -151,6 +152,7 @@
 _gnuradio_swig_py_general_la_LIBADD  = 		\
 	$(top_builddir)/gnuradio-core/src/lib/libgnuradio-core.la	\
 	$(PYTHON_LDFLAGS)			\
+	$(OMNITHREAD_LIBS)			\
 	-lstdc++
 
 _gnuradio_swig_py_general_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
@@ -244,6 +246,7 @@
 _gnuradio_swig_py_io_la_LIBADD  = 		\
 	$(top_builddir)/gnuradio-core/src/lib/libgnuradio-core.la	\
 	$(PYTHON_LDFLAGS)			\
+	$(OMNITHREAD_LIBS)			\
 	-lstdc++
 
 _gnuradio_swig_py_io_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
Index: run_tests.sh.in
===================================================================
--- run_tests.sh.in	(revision 4439)
+++ run_tests.sh.in	(working copy)
@@ -27,17 +27,20 @@
 grlibdir=@abs_top_builddir@/gnuradio-core/src/lib
 grlibdir=$grlibdir:$grlibdir/.libs
 
+# Where to find omnithread library
+gromnidir=@abs_top_builddir@/omnithread/.libs
+
 # Construct search path for python modules
 PYTHONPATH="$mylibdir:$mysrcdir:$mypydir:$grswigdir:$grswigsrcdir:$grpydir:$PYTHONPATH"
 export PYTHONPATH
 
 # For OS/X
-DYLD_LIBRARY_PATH=$grlibdir
+DYLD_LIBRARY_PATH=$grlibdir:$gromnidir  # $gromnidir NOT TESTED
 export DYLD_LIBRARY_PATH
 
 # For Win32
-PATH=$grlibdir:$PATH
+PATH=$grlibdir:$gromnidir:$PATH
 
 # Don't load user or system prefs
 GR_DONT_LOAD_PREFS=1
 
