diff options
| author | Christian Persch <chpe@src.gnome.org> | 2017-10-24 10:38:59 +0200 |
|---|---|---|
| committer | Christian Persch <chpe@src.gnome.org> | 2017-10-24 10:38:59 +0200 |
| commit | 368e89dcb00d84fb741101e932ab6243732a9aa1 (patch) | |
| tree | 00c6ed6fbd0f66dea48216239f27c27762ae695a | |
| parent | 34cb79e23f019d67107a2624a6b54340b678254d (diff) | |
| download | vte-368e89dcb00d84fb741101e932ab6243732a9aa1.tar.gz | |
build: Separate libvte and test app build requirements
| -rw-r--r-- | configure.ac | 6 | ||||
| -rw-r--r-- | src/app/Makefile.am | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index e7c386d6..fb153823 100644 --- a/configure.ac +++ b/configure.ac @@ -314,6 +314,12 @@ PKG_CHECK_MODULES([GLIB],[glib-2.0 >= $GLIB_REQUIRED]) PKG_CHECK_MODULES([GOBJECT],[gobject-2.0]) PKG_CHECK_MODULES([GTK],[gtk+-$GTK_API_VERSION >= $GTK_REQUIRED]) +PKG_CHECK_MODULES([APP],[ + glib-2.0 >= $GLIB_REQUIRED + gobject-2.0 + pango >= $PANGO_REQUIRED + gtk+-$GTK_API_VERSION >= $GTK_REQUIRED]) + wcs_funcs_includes=" #ifdef HAVE_STRING_H # if !STDC_HEADERS && HAVE_MEMORY_H diff --git a/src/app/Makefile.am b/src/app/Makefile.am index 93b67651..0b52ef4f 100644 --- a/src/app/Makefile.am +++ b/src/app/Makefile.am @@ -25,7 +25,7 @@ vte_@VTE_API_MAJOR_VERSION@_@VTE_API_MINOR_VERSION@_CPPFLAGS = \ $(NULL) vte_@VTE_API_MAJOR_VERSION@_@VTE_API_MINOR_VERSION@_CXXFLAGS = \ - $(VTE_CFLAGS) \ + $(APP_CFLAGS) \ $(WARN_CXXFLAGS) \ $(AM_CXXFLAGS) \ $(NULL) @@ -36,7 +36,7 @@ vte_@VTE_API_MAJOR_VERSION@_@VTE_API_MINOR_VERSION@_LDFLAGS = \ vte_@VTE_API_MAJOR_VERSION@_@VTE_API_MINOR_VERSION@_LDADD = \ $(top_builddir)/src/libvte-$(VTE_API_VERSION).la \ - $(VTE_LIBS) \ + $(APP_LIBS) \ $(NULL) CLEANFILES += \ |