Allow enchant2 for qmake build

psi-im · Sep 6, 2020 · 889432c · 889432c
1 parent 9fa29f9
commit 889432c
Show file tree

Hide file tree

Showing 3 changed files with 61 additions and 59 deletions.
diff --git a/configure b/configure
@@ -1824,50 +1824,51 @@ name: enchant
 */
 
 #define QC_ENCHANT
-bool qc_enchant_have = false;
+bool        qc_enchant_have = false;
 QStringList qc_enchant_defs;
 QStringList qc_enchant_incs;
 QStringList qc_enchant_libs;
 
 //----------------------------------------------------------------------------
 // qc_enchant
 //----------------------------------------------------------------------------
-class qc_enchant : public ConfObj
-{
+class qc_enchant : public ConfObj {
 public:
-	qc_enchant(Conf *c) : ConfObj(c) {}
-	QString name() const { return "enchant"; }
-	QString shortname() const { return "enchant"; }
+    qc_enchant(Conf *c) : ConfObj(c) { }
+    QString name() const { return "enchant"; }
+    QString shortname() const { return "enchant"; }
 
-	// no output
-	QString checkString() const { return QString(); }
+    // no output
+    QString checkString() const { return QString(); }
 
-	bool exec()
-	{
-                // on mac, always use built-in spell check
+    bool exec()
+    {
+        // on mac, always use built-in spell check
 #ifdef Q_OS_MAC
-		return false;
+        return false;
 #endif
 
-		qc_enchant_have = false;
-		qc_enchant_defs.clear();
-		qc_enchant_incs.clear();
-		qc_enchant_libs.clear();
+        qc_enchant_have = false;
+        qc_enchant_defs.clear();
+        qc_enchant_incs.clear();
+        qc_enchant_libs.clear();
 
-		QStringList incs;
-		QString version, libs, other;
-		if(!conf->findPkgConfig("enchant", VersionMin, "1.3.0", &version, &incs, &libs, &other))
-                        return false;
-		if(conf->findPkgConfig("enchant", VersionMin, "2.0.0", &version, &incs, &libs, &other))
-                        qc_enchant_defs += "HAVE_ENCHANT2";
+        QStringList incs;
+        QString     version, libs, other;
+        if (!conf->findPkgConfig("enchant", VersionMin, "1.3.0", &version, &incs, &libs, &other))
+            if (conf->findPkgConfig("enchant-2", VersionMin, "2.0.0", &version, &incs, &libs, &other)) {
+                qc_enchant_defs += "HAVE_ENCHANT2";
+            } else {
+                return false;
+            }
 
-		qc_enchant_defs += "HAVE_ENCHANT";
-		qc_enchant_incs += incs;
-		qc_enchant_libs += libs;
-		qc_enchant_have = true;
+        qc_enchant_defs += "HAVE_ENCHANT";
+        qc_enchant_incs += incs;
+        qc_enchant_libs += libs;
+        qc_enchant_have = true;
 
-		return true;
-	}
+        return true;
+    }
 };
 #line 1 "hunspell.qcm"
 /*

diff --git a/configure.exe b/configure.exe
diff --git a/qcm/enchant.qcm b/qcm/enchant.qcm
@@ -5,48 +5,49 @@ name: enchant
 */
 
 #define QC_ENCHANT
-bool qc_enchant_have = false;
+bool        qc_enchant_have = false;
 QStringList qc_enchant_defs;
 QStringList qc_enchant_incs;
 QStringList qc_enchant_libs;
 
 //----------------------------------------------------------------------------
 // qc_enchant
 //----------------------------------------------------------------------------
-class qc_enchant : public ConfObj
-{
+class qc_enchant : public ConfObj {
 public:
-	qc_enchant(Conf *c) : ConfObj(c) {}
-	QString name() const { return "enchant"; }
-	QString shortname() const { return "enchant"; }
+    qc_enchant(Conf *c) : ConfObj(c) { }
+    QString name() const { return "enchant"; }
+    QString shortname() const { return "enchant"; }
 
-	// no output
-	QString checkString() const { return QString(); }
+    // no output
+    QString checkString() const { return QString(); }
 
-	bool exec()
-	{
-                // on mac, always use built-in spell check
+    bool exec()
+    {
+        // on mac, always use built-in spell check
 #ifdef Q_OS_MAC
-		return false;
+        return false;
 #endif
 
-		qc_enchant_have = false;
-		qc_enchant_defs.clear();
-		qc_enchant_incs.clear();
-		qc_enchant_libs.clear();
-
-		QStringList incs;
-		QString version, libs, other;
-		if(!conf->findPkgConfig("enchant", VersionMin, "1.3.0", &version, &incs, &libs, &other))
-                        return false;
-		if(conf->findPkgConfig("enchant", VersionMin, "2.0.0", &version, &incs, &libs, &other))
-                        qc_enchant_defs += "HAVE_ENCHANT2";
-
-		qc_enchant_defs += "HAVE_ENCHANT";
-		qc_enchant_incs += incs;
-		qc_enchant_libs += libs;
-		qc_enchant_have = true;
-
-		return true;
-	}
+        qc_enchant_have = false;
+        qc_enchant_defs.clear();
+        qc_enchant_incs.clear();
+        qc_enchant_libs.clear();
+
+        QStringList incs;
+        QString     version, libs, other;
+        if (!conf->findPkgConfig("enchant", VersionMin, "1.3.0", &version, &incs, &libs, &other))
+            if (conf->findPkgConfig("enchant-2", VersionMin, "2.0.0", &version, &incs, &libs, &other)) {
+                qc_enchant_defs += "HAVE_ENCHANT2";
+            } else {
+                return false;
+            }
+
+        qc_enchant_defs += "HAVE_ENCHANT";
+        qc_enchant_incs += incs;
+        qc_enchant_libs += libs;
+        qc_enchant_have = true;
+
+        return true;
+    }
 };