summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Davenport <qball@gmpclient.org>2015-12-01 22:35:05 +0100
committerDave Davenport <qball@gmpclient.org>2015-12-01 22:35:23 +0100
commitc601130292dfdc5bb25b96e547edbfbf8ef744c0 (patch)
tree59a31d0f508de1629cd21fd74d0ee219d516f4c2
parent4b77a1728d8fffce96e597cceb16d6c598a7881a (diff)
Add glib minimum version check.
-rw-r--r--INSTALL.md2
-rw-r--r--Makefile.am2
-rw-r--r--configure.ac1
3 files changed, 4 insertions, 1 deletions
diff --git a/INSTALL.md b/INSTALL.md
index 7261abdf..efcdca87 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -18,7 +18,7 @@
* libpangocairo
* libcairo
* libcairo-xlib
-* libglib2.0
+* libglib2.0 >= 2.40
* libx11
* libstartup-notification-1.0
diff --git a/Makefile.am b/Makefile.am
index bf78ba8f..95881f2b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,6 +9,7 @@ bin_PROGRAMS=rofi
dist_bin_SCRIPTS=script/rofi-sensible-terminal
LIBS=\
+ @glib_LIBS@\
@x11_LIBS@\
@xinerama_LIBS@\
@libsn_LIBS@\
@@ -17,6 +18,7 @@ LIBS=\
AM_CFLAGS=\
@EXTRA_CFLAGS@\
+ @glib_CFLAGS@\
@x11_CFLAGS@\
@xinerama_CFLAGS@\
@pango_CFLAGS@\
diff --git a/configure.ac b/configure.ac
index e2bd2156..5c7d278d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -48,6 +48,7 @@ dnl Check dependencies
dnl ---------------------------------------------------------------------
PKG_PROG_PKG_CONFIG
+PKG_CHECK_MODULES([glib], [glib-2.0 >= 2.40])
PKG_CHECK_MODULES([x11], [x11])
PKG_CHECK_MODULES([xinerama], [xinerama])
PKG_CHECK_MODULES([pango], [pango pangocairo])