[geany/geany-plugins] 24e0ba: Don't rely on a pkg-config output formatting detail

[Colomban Wendling]

Branch:      refs/heads/master
Author:      Colomban Wendling <ban at herbesfolles.org>
Committer:   Colomban Wendling <ban at herbesfolles.org>
Date:        Wed, 23 Jan 2019 21:56:28 UTC
Commit:      24e0ba445d6dafae04fe7f8a9167a955d11fa4b3
             https://github.com/geany/geany-plugins/commit/24e0ba445d6dafae04fe7f8a9167a955d11fa4b3

Log Message:
-----------
Don't rely on a pkg-config output formatting detail

Do not require pkg-config to emit spaces around elements in its
`--print-requires` output.

This should fix Geany GTK version check on OpenBSD 6.4.


Modified Paths:
--------------
    build/gtk.m4

Modified: build/gtk.m4
5 lines changed, 3 insertions(+), 2 deletions(-)
===================================================================
@@ -4,13 +4,14 @@ dnl GP_GTK_VERSION_MAJOR (e.g. "2");  and defines the GP_GTK3 AM conditional
 AC_DEFUN([GP_CHECK_GTK_VERSION],
 [
     AC_REQUIRE([AC_PROG_AWK])
+    AC_REQUIRE([AC_PROG_SED])
     AC_REQUIRE([PKG_PROG_PKG_CONFIG])
 
     GP_GEANY_PKG_CONFIG_PATH_PUSH
 
     _gtk_req=$(${PKG_CONFIG} --print-requires geany | ${AWK} '/^gtk\+-/{print}')
-    GP_GTK_PACKAGE=$(echo ${_gtk_req} | ${AWK} '{print $[]1}')
-    GP_GTK_VERSION=$(echo ${_gtk_req} | ${AWK} '{print $[]3}')
+    GP_GTK_PACKAGE=$(echo ${_gtk_req} | ${SED} 's/ *[[><=]].*$//')
+    GP_GTK_VERSION=$(echo ${_gtk_req} | ${SED} 's/^.*[[><=]] *//')
     GP_GTK_VERSION_MAJOR=$(echo ${GP_GTK_VERSION} | cut -d. -f1)
     AC_SUBST([GP_GTK_PACKAGE])
     AC_SUBST([GP_GTK_VERSION])



--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).