diff options
| author | Marius Halden <marius.h@lden.org> | 2016-07-26 08:45:29 +0200 |
|---|---|---|
| committer | Marius Halden <marius.h@lden.org> | 2016-07-26 08:45:29 +0200 |
| commit | 2b08324ee61be94fedd11c7885e297a0f85b9490 (patch) | |
| tree | e2d038633d71787f49fbc8c20abd9a559ed6b988 /configure | |
| parent | 2e2b21996d42f1956db372df6e2bd25a0b089ceb (diff) | |
| parent | dc45a85c1996169df4517dc9bb7f7368cb176de5 (diff) | |
Merge branch 'master' into patched-master
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 8 |
1 files changed, 7 insertions, 1 deletions
@@ -341,7 +341,13 @@ if [ -z "$PKG_CONFIG" ]; then PKG_CONFIG=pkg-config fi -if $PKG_CONFIG --version > /dev/null 2>/dev/null && $PKG_CONFIG glib-2.0; then +if ! $PKG_CONFIG --version > /dev/null 2>/dev/null; then + echo + echo 'Cannot find pkg-config, aborting.' + exit 1 +fi + +if $PKG_CONFIG glib-2.0; then if $PKG_CONFIG glib-2.0 --atleast-version=$GLIB_MIN_VERSION; then cat<<EOF >>Makefile.settings EFLAGS+=$($PKG_CONFIG --libs glib-2.0 gmodule-2.0) |