From: <mar...@us...> - 2010-06-27 07:11:11
|
Revision: 3416 http://navit.svn.sourceforge.net/navit/?rev=3416&view=rev Author: martin-s Date: 2010-06-27 07:11:04 +0000 (Sun, 27 Jun 2010) Log Message: ----------- Fix:Build:Moved moc out of options to make distcheck happy Modified Paths: -------------- trunk/navit/configure.in Modified: trunk/navit/configure.in =================================================================== --- trunk/navit/configure.in 2010-06-26 16:59:33 UTC (rev 3415) +++ trunk/navit/configure.in 2010-06-27 07:11:04 UTC (rev 3416) @@ -860,18 +860,19 @@ fi if test "x${graphics_qt_qpainter}" = "xyes" ; then AC_DEFINE(USE_GRAPICS_QT_QPAINTER, 1, [Build with graphics qt_qpainter]) - MOC=`$PKG_CONFIG QtGui --variable=moc_location` - if test "x${MOC}" = "x"; then - AC_CHECK_PROG(MOC, moc, moc) - fi - AC_SUBST(MOC) fi AC_SUBST(QT_GUI_CFLAGS) AC_SUBST(QT_GUI_LIBS) AC_SUBST([QT_SVG_CFLAGS]) AC_SUBST([QT_SVG_LIBS]) AM_CONDITIONAL(GRAPHICS_QT_QPAINTER, test "x${graphics_qt_qpainter}" = "xyes") +MOC=`$PKG_CONFIG QtGui --variable=moc_location` +if test "x${MOC}" = "x"; then + AC_CHECK_PROG(MOC, moc, moc) +fi +AC_SUBST(MOC) + ## map # binfile AC_ARG_ENABLE(map-binfile, [ --disable-map-binfile disable graphics type android], map_binfile=$enableval;map_binfile_reason="configure parameter") @@ -917,11 +918,6 @@ fi if test "x${gui_qml}" = "xyes" ; then AC_DEFINE(USE_GUI_QML, 1, [Build with gui qml]) - MOC=`$PKG_CONFIG QtGui --variable=moc_location` - if test "x${MOC}" = "x"; then - AC_CHECK_PROG(MOC, moc, moc) - fi - AC_SUBST(MOC) fi AC_SUBST(QT_GUI_CFLAGS) AC_SUBST(QT_GUI_LIBS) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |