[devhelp/wip/swilmet/build-system-update: 3/3] build: have only one PKG_CHECK_MODULES

[Sébastien Wilmet <swilmet src gnome org>]

commit ab9b0db2ede85a13b72947fe9c3d2af1d0bbdf48
Author: Sébastien Wilmet <swilmet gnome org>
Date:   Thu Nov 3 15:17:05 2016 +0100

    build: have only one PKG_CHECK_MODULES
    
    To list dependencies only once. The devhelp program (not the library)
    has the same dependencies as the library.
    
    Also, remove gthread because it isn't used by devhelp.
    
    And update version numbers to stable versions.

 configure.ac               |   13 +++----------
 docs/reference/Makefile.am |    4 ++--
 src/Makefile.am            |    4 ++--
 3 files changed, 7 insertions(+), 14 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index f8fd1b3..2cc79b2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -49,16 +49,9 @@ AC_CHECK_LIBM
 AC_SUBST(LIBM)
 
 PKG_CHECK_MODULES(DEVHELP, [
-  gthread-2.0 >= 2.10.0
-  gtk+-3.0 >= 3.19.3
-  webkit2gtk-4.0 >= 2.6.0
-  gio-2.0 >= 2.37.3
-])
-
-PKG_CHECK_MODULES(LIBDEVHELP, [
-  gtk+-3.0 >= 3.12.0
-  gio-2.0 >= 2.37.3
-  webkit2gtk-4.0 >= 2.6.0
+  gio-2.0 >= 2.38
+  gtk+-3.0 >= 3.20
+  webkit2gtk-4.0 >= 2.6
 ])
 
 AC_ARG_WITH(zlib, [  --with-zlib=DIR         use zlib in DIR], zlibdir=$with_zlib)
diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am
index 6b1b550..a9e4657 100644
--- a/docs/reference/Makefile.am
+++ b/docs/reference/Makefile.am
@@ -73,12 +73,12 @@ GTKDOC_CFLAGS = \
        -I$(top_srcdir) \
        -I$(top_builddir) \
        -I$(top_builddir)/src \
-       $(LIBDEVHELP_CFLAGS) \
+       $(DEVHELP_CFLAGS) \
        $(NULL)
 
 GTKDOC_LIBS = \
        $(top_builddir)/src/libdevhelp-3.la \
-       $(LIBDEVHELP_LIBS) \
+       $(DEVHELP_LIBS) \
        $(NULL)
 
 # This includes the standard gtk-doc make rules, copied by gtkdocize.
diff --git a/src/Makefile.am b/src/Makefile.am
index 369ec8c..ca07bcb 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -104,10 +104,10 @@ libdevhelp_3_la_CPPFLAGS =                                \
        $(ZLIB_CPPFLAGS)
 
 libdevhelp_3_la_CFLAGS =                               \
-       $(LIBDEVHELP_CFLAGS)
+       $(DEVHELP_CFLAGS)
 
 libdevhelp_3_la_LIBADD =                               \
-       $(LIBDEVHELP_LIBS)                              \
+       $(DEVHELP_LIBS)                                 \
        $(ZLIB_LIBS)                                    \
        $(LIBM)