[Gnash-commit] [SCM] Gnash branch, master, updated. 906c136130f71279240c54de18ee31763be61e32

[Rob Savoye]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnash".

The branch, master has been updated
       via  906c136130f71279240c54de18ee31763be61e32 (commit)
      from  213cfc16a01475e087dbee8134f2c49b3dad9269 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit//commit/?id=906c136130f71279240c54de18ee31763be61e32


commit 906c136130f71279240c54de18ee31763be61e32
Author: Gabriele Giacone <>
Date:   Fri Dec 3 20:21:39 2010 -0700

    add uic4 and moc4 as alternatives

diff --git a/macros/qt4.m4 b/macros/qt4.m4
index 6203525..0a570e1 100644
--- a/macros/qt4.m4
+++ b/macros/qt4.m4
@@ -175,8 +175,8 @@ dnl   fi
       has_qt4="no"
     fi
 
-    AC_PATH_PROGS(MOC4, [moc-qt4 moc], ,[/usr/bin ${QTDIR}/bin 
/usr/lib/qt4/bin /usr/share/qt4/bin/ ${pathlist}])
-    AC_PATH_PROGS(UIC4, [uic-qt4 uic], ,[/usr/bin ${QTDIR}/bin 
/usr/lib/qt4/bin /usr/share/qt4/bin/ ${pathlist}])
+    AC_PATH_PROGS(MOC4, [moc-qt4 moc moc4], ,[/usr/bin ${QTDIR}/bin 
/usr/lib/qt4/bin /usr/share/qt4/bin/ ${pathlist}])
+    AC_PATH_PROGS(UIC4, [uic-qt4 uic uic4], ,[/usr/bin ${QTDIR}/bin 
/usr/lib/qt4/bin /usr/share/qt4/bin/ ${pathlist}])
 
 
     AC_SUBST([QT4_CFLAGS])

-----------------------------------------------------------------------

Summary of changes:
 macros/qt4.m4 |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
Gnash