[Commit-gnuradio] r9796 - gnuradio/branches/developers/trondeau/qtgui/config

[trondeau]

Author: trondeau
Date: 2008-10-15 09:33:09 -0600 (Wed, 15 Oct 2008)
New Revision: 9796

Modified:
   gnuradio/branches/developers/trondeau/qtgui/config/grc_gr_qtgui.m4
Log:
Using the package config file to find the locations of the moc and uic binaries.

Modified: gnuradio/branches/developers/trondeau/qtgui/config/grc_gr_qtgui.m4
===================================================================
--- gnuradio/branches/developers/trondeau/qtgui/config/grc_gr_qtgui.m4  
2008-10-15 00:42:58 UTC (rev 9795)
+++ gnuradio/branches/developers/trondeau/qtgui/config/grc_gr_qtgui.m4  
2008-10-15 15:33:09 UTC (rev 9796)
@@ -68,16 +68,20 @@
             QMAKE_INCLUDES="$QMAKE_INCLUDES ${i##-I}"
         done
 
+       QT_MOC_EXEC=`pkg-config --variable=moc_location QtCore`
+       QT_UIC_EXEC=`pkg-config --variable=uic_location QtCore`
+
         AC_SUBST(QMAKE_INCLUDES)
         AC_SUBST(QT_INCLUDES)
        AC_SUBST(QT_LIBS)
+       AC_SUBST(QT_MOC_EXEC)
+       AC_SUBST(QT_UIC_EXEC)
     fi
 
     AC_CONFIG_FILES([ \
         gr-qtgui/Makefile \
         gr-qtgui/src/Makefile \
         gr-qtgui/src/lib/Makefile \
-       gr-qtgui/src/lib/qtspectrum/specDisplay.pro \
         gr-qtgui/src/python/Makefile \
     ])