Merge pull request #3654 from chrhasse/next

Add explicit reference to glib2 in automake
This commit is contained in:
Ingo Bürk 2019-03-21 08:44:13 +01:00 committed by GitHub
commit 3aa42cf795
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 0 deletions

View File

@ -277,6 +277,7 @@ i3_LDADD = \
libi3_CFLAGS = \ libi3_CFLAGS = \
$(AM_CFLAGS) \ $(AM_CFLAGS) \
$(GLIBGOBJECT_CFLAGS) \
$(XCB_CFLAGS) \ $(XCB_CFLAGS) \
$(XCB_UTIL_CFLAGS) \ $(XCB_UTIL_CFLAGS) \
$(XCB_UTIL_XRM_CFLAGS) \ $(XCB_UTIL_XRM_CFLAGS) \
@ -285,6 +286,7 @@ libi3_CFLAGS = \
libi3_LIBS = \ libi3_LIBS = \
$(top_builddir)/libi3.a \ $(top_builddir)/libi3.a \
$(GLIBGOBJECT_LIBS) \
$(XCB_LIBS) \ $(XCB_LIBS) \
$(XCB_UTIL_LIBS) \ $(XCB_UTIL_LIBS) \
$(XCB_UTIL_XRM_LIBS) \ $(XCB_UTIL_XRM_LIBS) \

View File

@ -101,6 +101,7 @@ PKG_CHECK_MODULES([XKBCOMMON], [xkbcommon xkbcommon-x11])
PKG_CHECK_MODULES([YAJL], [yajl]) PKG_CHECK_MODULES([YAJL], [yajl])
PKG_CHECK_MODULES([LIBPCRE], [libpcre >= 8.10]) PKG_CHECK_MODULES([LIBPCRE], [libpcre >= 8.10])
PKG_CHECK_MODULES([PANGOCAIRO], [cairo >= 1.14.4 pangocairo]) PKG_CHECK_MODULES([PANGOCAIRO], [cairo >= 1.14.4 pangocairo])
PKG_CHECK_MODULES([GLIBGOBJECT], [glib-2.0 gobject-2.0])
# Checks for programs. # Checks for programs.
AC_PROG_AWK AC_PROG_AWK