[Seq-cvs-commit] SF.net SVN: seq:[1221] showeq/trunk/acinclude.m4

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

Revision: 1221
          http://sourceforge.net/p/seq/svn/1221
Author:   cn187
Date:     2021-11-30 22:38:49 +0000 (Tue, 30 Nov 2021)
Log Message:
-----------
[Qt5] Improve qt5 autodetection on certain platforms

Modified Paths:
--------------
    showeq/trunk/acinclude.m4

Modified: showeq/trunk/acinclude.m4
===================================================================
--- showeq/trunk/acinclude.m4	2021-11-30 22:37:01 UTC (rev 1220)
+++ showeq/trunk/acinclude.m4	2021-11-30 22:38:49 UTC (rev 1221)
@@ -1,6 +1,6 @@
 ##   -*- autoconf -*-
 
-# serial 3 add qt5 support
+# serial 4 improve qt5 autodetection on certain plaforms
 
 dnl    This file is part of ShowEQ and is based on the file from KDE.
 dnl    Copyright (C) 1997 Janos Farkas (ch...@sh...)
@@ -862,10 +862,11 @@
 
 
 dnl qt5 (and later?) has QT_VERSION_STR in qconfig.h, while qt4 has it in qglobal.h
-AC_FIND_FILE("QtCore/qconfig.h", $qt_incdirs, qt5_incdir)
 AC_FIND_FILE("Qt/qglobal.h", $qt_incdirs, qt4_incdir)
+AC_FIND_FILE("QtCore/qconfig.h", $qt_incdirs, qt5_incdir_base)
+AC_FIND_FILE("QtCore/qconfig-32.h", $qt_incdirs, qt5_incdir_32)
+AC_FIND_FILE("QtCore/qconfig-64.h", $qt_incdirs, qt5_incdir_64)
 
-
 dnl  *************************************************
 dnl  * At this point, we extract the Qt version from *
 dnl  * the includes that we located...               *
@@ -887,10 +888,20 @@
 if [[ -n "$qt_version_string" ]]; then
     qt_incdir="$qt4_incdir"
 
-else 
+else
+    if [[ "$qt5_incdir_64" != "NO" ]]; then
+        qt_version_source="$qt5_incdir_64/QtCore/qconfig-64.h"
+        qt_incdir="$qt5_incdir_64"
+    else
+        if [[ "$qt5_incdir_32" != "NO" ]]; then
+            qt_version_source="$qt5_incdir_32/QtCore/qconfig-32.h"
+            qt_incdir="$qt5_incdir_32"
+        else
+            qt_version_source="$qt5_incdir_base/QtCore/qconfig.h"
+            qt_incdir="$qt5_incdir_base"
+        fi
+    fi
 
-        qt_version_source="$qt5_incdir/QtCore/qconfig.h"
-
         qt_version_string=`cat $qt_version_source 2> configure.dbg |\
                   grep "#define QT_VERSION_STR"                      |\
                   sed 's/QT_VERSION_STR//'                           |\
@@ -899,10 +910,8 @@
                   sed 's/	//g'                                     |\
                   sed 's/"//g'`;
 
-        qt_incdir="$qt5_incdir"
 fi
 
-
 qt_version_number=`cat $qt_version_source 2> configure.dbg |\
                    grep "#define QT_VERSION[^_]"                      |\
                    sed 's/QT_VERSION//'                               |\

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