[Libreoffice-commits] .: configure.in

[Lubos Lunak]

 configure.in |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit ab151074df9e678fb76d79e78ffa52fa0b949944
Author: Luboš Luňák <l.lunak at suse.cz>
Date:   Thu Apr 14 15:41:29 2011 +0200

    fix qt4 moc detection
    
    cannot use the same variable for two AC_PATH_PROG calls, as the first call
    will cache the result and the second one will reuse it

diff --git a/configure.in b/configure.in
index 6f65e46..2b907b4 100755
--- a/configure.in
+++ b/configure.in
@@ -6911,7 +6911,8 @@ if test "$test_kde4" = "yes" -a "$ENABLE_KDE4" = "TRUE" ; then
 
    dnl Check for Meta Object Compiler
 
-   AC_PATH_PROG( MOC4, moc-qt4, no, [`dirname $qt_lib_dir`/bin:$QT4DIR/bin:$PATH] )
+   AC_PATH_PROG( MOCQT4, moc-qt4, no, [`dirname $qt_lib_dir`/bin:$QT4DIR/bin:$PATH] )
+   MOC4="$MOCQT4"
    if test "$MOC4" = "no" ; then
       AC_PATH_PROG( MOC4, moc, no, [`dirname $qt_lib_dir`/bin:$QT4DIR/bin:$PATH] )
       if test "$MOC4" = "no" ; then