Changeset 996

Timestamp:

Apr 17, 2009, 3:17:42 PM (15 years ago)

Author:

garnier

Message:

en test pour moc

File:

• trunk/Configure (modified) (2 diffs)

trunk/Configure

@@ -2556 +2556 @@
         echo "checking for moc... found \$g4_qtmoc version \$g4_qt_moc_major_version"
 
+        if test '$g4_qt_major_ver' = '$g4_qt_moc_major_version' ; then
+            g4_havegoodqt=yes
+        else
+            echo "checking for moc... found \$g4_qt_moc for Qt version \$g4_qt_moc_major_version, but Qt \$g4_qt_major_ver path is used. Please update/move \$g4_qt_moc to Qt \$g4_qt_major_ver"
+            g4_havegoodqt=no
+        fi
         ## THIS IS POINT AT WHICH TO DO FALLBACK TESTS I.E DOES
         ## COMPILATION OF SMALL TEST PROGRAM WORK - THEN HEADERS AND
@@ -2599 +2605 @@
 
             g4_qt_moc=\$g4_qtmoc
-            if test '$g4_qt_version' = '$g4_qt_moc_major_version' ; then
-                g4_qt_is_configured=yes
-            else
-                echo "checking for moc... found \$g4_qt_moc for Qt version \$g4_qt_moc_major_version, but Qt \$g4_qt_version path is used. Please update/move \$g4_qt_moc to Qt \$g4_qt_version"
-                g4_qt_is_configured=''
-            fi
+            g4_qt_is_configured=yes
         else
             g4_qt_is_configured=''