diff options
| author | Alfred E. Heggestad <aeh@db.org> | 2016-05-09 22:05:56 +0200 |
|---|---|---|
| committer | Alfred E. Heggestad <aeh@db.org> | 2016-05-09 22:05:56 +0200 |
| commit | f30d2c34213ebadad0a918ac2c86e5f0b6417ba7 (patch) | |
| tree | 910c972e8a7d0cd163daab26dee87d573b69a424 | |
| parent | da67191adc6c396dfc5683de7b21f2ebf931dbf7 (diff) | |
| parent | ce25d76161ce78c5bc0436e7e02e20935b7412cc (diff) | |
Merge pull request #128 from clehner/master
Build gtk module only with new enough glib
| -rw-r--r-- | mk/modules.mk | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/mk/modules.mk b/mk/modules.mk index e0faccd..4dfbf04 100644 --- a/mk/modules.mk +++ b/mk/modules.mk @@ -200,9 +200,7 @@ USE_VPX := $(shell [ -f $(SYSROOT)/include/vpx/vp8.h ] \ || [ -f $(SYSROOT)/local/include/vpx/vp8.h ] \ || [ -f $(SYSROOT_ALT)/include/vpx/vp8.h ] \ && echo "yes") -USE_GTK := $(shell [ -f $(SYSROOT)/include/gtk-2.0/gtk/gtk.h ] || \ - [ -f $(SYSROOT)/local/include/gtk-2.0/gtk/gtk.h ] || \ - [ -f $(SYSROOT_ALT)/include/gtk-2.0/gtk/gtk.h ] && echo "yes") +USE_GTK := $(shell pkg-config 'glib-2.0 >= 2.32' && echo "yes") else # Windows. # Accounts for mingw with Windows SDK (formerly known as Platform SDK) |