summaryrefslogtreecommitdiff
path: root/configure
diff options
context:
space:
mode:
authorHelmut Grohne <helmut@subdivi.de>2019-05-27 21:32:57 +0200
committerJens Axboe <axboe@kernel.dk>2019-05-27 14:50:57 -0600
commit31ce8438e868e133e2b15a6bc7f288dda2cc4b2f (patch)
tree1e468edf641cd624cd94cdb0f3dc2845558c9087 /configure
parent4d1bc43e9f495459f03b32a53002e1526d06dea6 (diff)
downloadfio-31ce8438e868e133e2b15a6bc7f288dda2cc4b2f.tar.gz
fio-31ce8438e868e133e2b15a6bc7f288dda2cc4b2f.tar.bz2
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 <helmut@subdivi.de> Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure13
1 files changed, 6 insertions, 7 deletions
diff --git a/configure b/configure
index 82bd432e..383175ae 100755
--- a/configure
+++ b/configure
@@ -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