Changeset 993

Timestamp:

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

Author:

garnier

Message:

en test pour moc

File:

• trunk/Configure (modified) (7 diffs)

trunk/Configure

@@ -19 +19 @@
 #
 
-# $Id: Configure,v 1.110 2008/12/03 15:34:57 bmorgan Exp $
-#
-# Generated on Wed Dec  3 15:33:49 GMT 2008 [metaconfig 3.0 PL70]
+# $Id: Configure,v 1.112 2009/01/22 14:26:31 bmorgan Exp $
+#
+# Generated on Thu Jan 22 14:06:57 GMT 2009 [metaconfig 3.0 PL70]
 
 cat >/tmp/c1$$ <<EOF
@@ -2377 +2377 @@
         if test -x "/usr/bin/moc" ; then
             g4_qt_moc="/usr/bin/moc"
-            echo "checking for moc... \$g4_qt_moc"
-
-            g4_qt_dir=\`dirname \$g4_qt_include_dir\`
-            g4_qt_dir=\`dirname \$g4_qt_dir\`
-
             g4_qt_version="4"
-            g4_qt_cxxflags="-I\$g4_qt_dir/QtCore.framework/Headers -I\$g4_qt_dir/QtGui.framework/Headers"
-            g4_qt_gl_cxxflags="-I\$g4_qt_dir/QtOpenGl.framework/Headers"
-            g4_qt_libs="-F\$g4_qt_dir -framework QtCore -framework QtGui"
-            g4_qt_gl_libs="-framework QtOpenGL"
+            # checking moc version
+            g4_qt_moc_major_version=\`\$g4_qt_moc -v 2>&1|sed 's/^.*(Qt \(.*\)\..*\..*)/\1/'\`
+            if test "$g4_qt_version" = "$g4_qt_moc_major_version" ; then
+                echo "checking for moc... found \$g4_qt_moc version \$g4_qt_moc_major_version"
+
+                g4_qt_dir=\`dirname \$g4_qt_include_dir\`
+                g4_qt_dir=\`dirname \$g4_qt_dir\`
+                
+                g4_qt_version="4"
+                g4_qt_cxxflags="-I\$g4_qt_dir/QtCore.framework/Headers -I\$g4_qt_dir/QtGui.framework/Headers"
+                g4_qt_gl_cxxflags="-I\$g4_qt_dir/QtOpenGl.framework/Headers"
+                g4_qt_libs="-F\$g4_qt_dir -framework QtCore -framework QtGui"
+                g4_qt_gl_libs="-framework QtOpenGL"
+            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_havegoodqt=no
+            fi
         else
             echo "checking for moc... no"
@@ -2544 +2552 @@
             g4_havegoodqt=no
         fi
-        echo "checking for moc... \$g4_qtmoc"
+        # checking moc version
+        g4_qt_moc_major_version=\`\$g4_qtmoc -v 2>&1|sed 's/^.*(Qt \(.*\)\..*\..*)/\1/'\`
+        echo "checking for moc... found \$g4_qtmoc version \$g4_qt_moc_major_version"
 
         ## THIS IS POINT AT WHICH TO DO FALLBACK TESTS I.E DOES
@@ -2589 +2599 @@
 
             g4_qt_moc=\$g4_qtmoc
-
-            g4_qt_is_configured=yes
+            if test '$g4_qt_version' = '$g4_qt_moc_major_version' ; then
+                g4_qt_is_configured=''
+            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=yes
+            fi
         else
             g4_qt_is_configured=''
@@ -3218 +3232 @@
         if test -d "$g4data/$g4data_g4emlow_version" ; then
                 $echo "yes"
-                g4ledata=$g4data/$g4data_emlow_version
+                g4ledata=$g4data/$g4data_g4emlow_version
         else
                 $echo "no"
@@ -3238 +3252 @@
         if test -d "$g4data/$g4data_g4abla_version" ; then
                 $echo "yes"
-                g4levelgammadata=$g4data/$g4data_g4abla_version
+                g4abladata=$g4data/$g4data_g4abla_version
         else
                 $echo "no"
@@ -3297 +3311 @@
                 else
                         #try again
+                        g4data_foundall=yes
                         g4data=$gans
                 fi