[Seq-cvs-commit] SF.net SVN: seq:[985] showeq/branches/pre_6_0_beta/acinclude.m4

[<cn...@us...>]

Revision: 985
          http://sourceforge.net/p/seq/svn/985
Author:   cn187
Date:     2019-10-31 01:59:45 +0000 (Thu, 31 Oct 2019)
Log Message:
-----------
Fix qt header and moc detection for some systems

Modified Paths:
--------------
    showeq/branches/pre_6_0_beta/acinclude.m4

Modified: showeq/branches/pre_6_0_beta/acinclude.m4
===================================================================
--- showeq/branches/pre_6_0_beta/acinclude.m4	2019-10-31 01:59:41 UTC (rev 984)
+++ showeq/branches/pre_6_0_beta/acinclude.m4	2019-10-31 01:59:45 UTC (rev 985)
@@ -99,7 +99,7 @@
   if [[ -n "$ac_qt_includes" ]]; then
    
      AC_MSG_CHECKING([for Qt4 MOC]);
-     AC_FIND_FILE(moc, [ $ac_qt_bindir              \
+     AC_FIND_FILE(moc-qt4, [ $ac_qt_bindir          \
                          $QTDIR/bin                 \
                          $QTDIR/src/moc             \
                          /usr/local/qt4/bin         \
@@ -121,8 +121,43 @@
                          /usr/src/qt-*/bin            ],
 
              MOC)
+     ac_qt_moc_bin=moc-qt4
 
-     MOC="$MOC/moc"
+dnl if we don't find it named "moc-qt4" then we should check for "moc"
+     if [[ -z "$MOC" ]]; then
+
+        AC_FIND_FILE(moc, [ $ac_qt_bindir              \
+                            $QTDIR/bin                 \
+                            $QTDIR/src/moc             \
+                            /usr/local/qt4/bin         \
+                            /usr/lib/*/qt4/bin         \
+                            /usr/lib/qt4/bin           \
+                            /usr/X11R6/bin/qt4         \
+                            /usr/X11R6/bin/qt4/bin     \
+                            /usr/X11R6/bin/X11/qt4     \
+                            /usr/X11R6/bin/X11/qt4/bin \
+                            /usr/local/qt*/bin         \
+                            /usr/lib/*/qt*/bin         \
+                            /usr/X11R6/bin/qt*         \
+                            /usr/X11R6/bin/qt*/bin     \
+                            /usr/X11R6/bin/X11/qt*     \
+                            /usr/X11R6/bin/X11/qt*/bin \
+                            /usr/lib/qt*/bin           \
+                            /usr/bin                   \
+                            /usr/X11R6/bin             \
+                            /usr/src/qt-*/bin            ],
+
+                MOC)
+
+        ac_qt_moc_bin=moc
+
+     fi
+
+     if [[ -n "$ac_qt_moc_bin" ]]; then
+        MOC="$MOC/$ac_qt_moc_bin"
+     else
+        MOC="$MOC/moc"
+     fi
      ac_cv_path_moc="$MOC"
 
      if [[ -n "$ac_cv_path_moc" ]]; then
@@ -698,8 +733,8 @@
 qt_lib_major_bld="${qt_lib}.so.$qt_major_version.$qt_minor_version.$qt_major_build"
 
 if [[ -n $qt_incdir ]]; then
-    for dir in `ls -1 $qt_incdir`; do
-        ac_qt_includes="$ac_qt_includes -I$qt_incdir/$dir"
+    for dir in `ls -1 -d $qt_incdir/Qt*`; do
+        ac_qt_includes="$ac_qt_includes -I$dir"
     done;
 fi
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.