[Commit-gnuradio] r9608 - in gnuradio/branches/developers/trondeau/qtgui: config gr-qtgui/src/lib

[trondeau]

Author: trondeau
Date: 2008-09-19 17:28:05 -0600 (Fri, 19 Sep 2008)
New Revision: 9608

Modified:
   gnuradio/branches/developers/trondeau/qtgui/config/grc_gr_qtgui.m4
   gnuradio/branches/developers/trondeau/qtgui/gr-qtgui/src/lib/Makefile.am
Log:
cleaning up makefile.

Modified: gnuradio/branches/developers/trondeau/qtgui/config/grc_gr_qtgui.m4
===================================================================
--- gnuradio/branches/developers/trondeau/qtgui/config/grc_gr_qtgui.m4  
2008-09-19 21:47:55 UTC (rev 9607)
+++ gnuradio/branches/developers/trondeau/qtgui/config/grc_gr_qtgui.m4  
2008-09-19 23:28:05 UTC (rev 9608)
@@ -30,8 +30,6 @@
 
 
 # Check for: 
-#      GLU
-#      GL 
 #      QtOpenGL
 #      QtGui
 #      QtCore
@@ -50,10 +48,6 @@
         PKG_CHECK_MODULES(QTOPENGL, QtOpenGL >= 4.3.4, [],
            [passed=no; AC_MSG_RESULT([gr-qtgui requires libQtOpenGL.])])
        
-       #AC_CHECK_OPENGL
-       AC_CHECK_LIB(GL, main, [], 
-            [passed=no; AC_MSG_RESULT([gr-qtgui requires libGL.])])
-
         dnl Fetch QWT variables
         GR_QWT([], [passed=no])
 

Modified: 
gnuradio/branches/developers/trondeau/qtgui/gr-qtgui/src/lib/Makefile.am
===================================================================
--- gnuradio/branches/developers/trondeau/qtgui/gr-qtgui/src/lib/Makefile.am    
2008-09-19 21:47:55 UTC (rev 9607)
+++ gnuradio/branches/developers/trondeau/qtgui/gr-qtgui/src/lib/Makefile.am    
2008-09-19 23:28:05 UTC (rev 9608)
@@ -28,8 +28,8 @@
 ourpythondir = $(grpythondir)/qtgui
 ourlibdir    = $(grpyexecdir)/qtgui
 
-AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(WITH_INCLUDES) \
-               $(QT_INCLUDES) -Iqtspectrum -Iqtspectrum/.ui
+AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) \
+              $(QT_INCLUDES) -Iqtspectrum -Iqtspectrum/.ui $(WITH_INCLUDES)
 
 SWIGPYTHONARGS = $(SWIGPYTHONFLAGS) $(STD_DEFINES_AND_INCLUDES) \
        $(WITH_SWIG_INCLUDES) $(WITH_INCLUDES)