configure: check for gtk version using pkg-config

PATCH In review Helmut Grohne 1 participant 1 message May 27, 2019

Share & tools

Helmut Grohne

author

2019-05-27 19:32 UTC #0 lore raw

PATCH 2/2 configure: check for gtk version using pkg-config

The previous way of running a program was incompatible with cross compilation. The program is still being compiled as a sanity check, but no longer run.

Signed-off-by Helmut Grohne <[email protected]>

---
 configure | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

configure +6 -7

index 82bd432e..383175ae 100755
@@ -1356,19 +1356,18 @@ if test "$?" != "0" ; then
   echo "configure: gtk and gthread not found"
   exit 1
 fi
-if compile_prog "$GTK_CFLAGS" "$GTK_LIBS" "gfio" ; then
-  $TMPE
-  if test "$?" = "0" ; then
+if ! ${cross_prefix}pkg-config --atleast-version 2.18.0 gtk+-2.0; then
+  echo "GTK found, but need version 2.18 or higher"
+  gfio="no"
+else
+  if compile_prog "$GTK_CFLAGS" "$GTK_LIBS" "gfio" ; then
     gfio="yes"
     GFIO_LIBS="$LIBS $GTK_LIBS"
     CFLAGS="$CFLAGS $GTK_CFLAGS"
   else
-    echo "GTK found, but need version 2.18 or higher"
+    echo "Please install gtk and gdk libraries"
     gfio="no"
   fi
-else
-  echo "Please install gtk and gdk libraries"
-  gfio="no"
 fi
 LDFLAGS=$ORG_LDFLAGS
 fi

Signature · 1 line

2.20.1