[Commit-gnuradio] r7939 - in gnuradio/branches/developers/jcorgan/bc-merge: . gr-comedi/src

[jcorgan]

Author: jcorgan
Date: 2008-03-05 12:17:04 -0700 (Wed, 05 Mar 2008)
New Revision: 7939

Modified:
   gnuradio/branches/developers/jcorgan/bc-merge/configure.ac
   gnuradio/branches/developers/jcorgan/bc-merge/gr-comedi/src/Makefile.am
Log:
Merged changeset r7630:7632 from trunk into developer branch.

Modified: gnuradio/branches/developers/jcorgan/bc-merge/configure.ac
===================================================================
--- gnuradio/branches/developers/jcorgan/bc-merge/configure.ac  2008-03-05 
19:15:56 UTC (rev 7938)
+++ gnuradio/branches/developers/jcorgan/bc-merge/configure.ac  2008-03-05 
19:17:04 UTC (rev 7939)
@@ -233,6 +233,10 @@
 AC_SUBST([skipped_dirs], [$skipped_dirs])
 AC_SUBST([with_dirs], [$with_dirs])
 
+# fix for older autotools that don't define "abs_top_YYY" by default
+AC_SUBST(abs_top_srcdir)
+AC_SUBST(abs_top_builddir)
+
 # 'with' variables - the pre-installed libraries, includes, and paths
 # - must always come last in the lists, so they require special
 # treatment.

Modified: 
gnuradio/branches/developers/jcorgan/bc-merge/gr-comedi/src/Makefile.am
===================================================================
--- gnuradio/branches/developers/jcorgan/bc-merge/gr-comedi/src/Makefile.am     
2008-03-05 19:15:56 UTC (rev 7938)
+++ gnuradio/branches/developers/jcorgan/bc-merge/gr-comedi/src/Makefile.am     
2008-03-05 19:17:04 UTC (rev 7939)
@@ -52,7 +52,7 @@
 INCLUDES = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(WITH_INCLUDES)
 
 SWIGCPPPYTHONARGS = -c++ -python $(PYTHON_CPPFLAGS) \
-       $(STD_DEFINES_AND_INCLUDES) $(WITH_SWIG_INCLUDES)
+       $(STD_DEFINES_AND_INCLUDES) $(WITH_SWIG_INCLUDES) $(WITH_INCLUDES)
 #      -I$(swigincludedir) $(S-I$(grincludedir) -I$(comediincludedir)
 
 ourlib_LTLIBRARIES = _comedi.la