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

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

Revision: 1116
          http://sourceforge.net/p/seq/svn/1116
Author:   cn187
Date:     2020-11-29 13:15:39 +0000 (Sun, 29 Nov 2020)
Log Message:
-----------
More Qt autodetection fixes for arm

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	2020-11-29 13:15:25 UTC (rev 1115)
+++ showeq/branches/pre_6_0_beta/acinclude.m4	2020-11-29 13:15:39 UTC (rev 1116)
@@ -103,6 +103,8 @@
                          $QTDIR/bin                 \
                          $QTDIR/src/moc             \
                          /usr/local/qt4/bin         \
+			 /usr/lib/${host_cpu}-${host_vendor}-${host_os}/qt4/bin    \
+			 /usr/lib/arm-linux-gnueabihf/qt4/bin \
                          /usr/lib/*/qt4/bin         \
                          /usr/lib/qt4/bin           \
                          /usr/X11R6/bin/qt4         \
@@ -130,6 +132,8 @@
                             $QTDIR/bin                 \
                             $QTDIR/src/moc             \
                             /usr/local/qt4/bin         \
+			    /usr/lib/${host_cpu}-${host_vendor}-${host_os}/qt4/bin    \
+			    /usr/lib/arm-linux-gnueabihf/qt4/bin \
                             /usr/lib/*/qt4/bin         \
                             /usr/lib/qt4/bin           \
                             /usr/X11R6/bin/qt4         \
@@ -237,6 +241,8 @@
                           $QTDIR/bin                 \
                           $QTDIR/src/uic             \
                           /usr/local/qt4/bin         \
+			  /usr/lib/${host_cpu}-${host_vendor}-${host_os}/qt4/bin    \
+			  /usr/lib/arm-linux-gnueabihf/qt4/bin \
                           /usr/lib/*/qt4/bin         \
                           /usr/lib64/*/qt4/bin         \
                           /usr/bin                   \
@@ -643,7 +649,8 @@
              /usr/local/qt4/include             \
              /usr/qt/4/include                  \
              /usr/include/qt4                   \
-             /usr/include/${host_cpu}-linux-gnu/qt4    \
+             /usr/include/${host_cpu}-${host_vendor}-${host_os}/qt4    \
+	     /usr/include/arm-linux-gnueabihf/qt4 \
              /usr/include/*/qt4  \
              /usr/lib/qt4/include               \
              /usr/X11R6/include/X11/qt4         \
@@ -750,7 +757,8 @@
              $LD_LIBRARY_PATH               \
              $QTLIB                         \
              /usr/lib                       \
-             /usr/lib/i386-linux-gnu        \
+             /usr/lib/${host_cpu}-${host_vendor}-${host_os}    \
+	     /usr/lib/arm-linux-gnueabihf \
              /usr/local/qt4/lib             \
              /usr/qt/4/lib                  \
              /usr/lib/qt4/lib               \
@@ -776,7 +784,8 @@
 qt_libdirs=" $QTDIR/lib64                   \
              $QTLIB                         \
              /usr/lib64                     \
-             /usr/lib/${host_cpu}-linux-gnu \
+             /usr/lib/${host_cpu}-${host_vendor}-${host_os}    \
+	     /usr/lib/arm-linux-gnueabihf \
              /usr/local/qt4/lib64           \
              /usr/qt/4/lib64                \
              /usr/lib/qt4/lib64             \

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