From d310872077eb67423ebb5ed7dff93a1e4b4e107c Mon Sep 17 00:00:00 2001 From: Ruben Laguna Date: Sat, 7 Feb 2015 23:29:52 +0100 Subject: [PATCH] Use AM_PATH_GLIB_2_0 instead of PKG_CHECK_MODULES --- Makefile.am | 4 ++-- configure.ac | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Makefile.am b/Makefile.am index 97f2afd..798942c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -19,7 +19,7 @@ testsuite_SOURCES = tests/test.c # CFLAGS and -l options that are retrieved from pkg-config (configure.ac) # DEPS_CFLAGS and DEPS_LIBS are filled by PKG_CHECK_MODULES (configure.ac) -testsuite_CFLAGS = $(DEPS_CFLAGS) # DEPS_* are filled by PKG_CHECK_MODULES -testsuite_LDADD = $(DEPS_LIBS) # in configure.ac +testsuite_CFLAGS = $(GLIB_CFLAGS) # DEPS_* are filled by PKG_CHECK_MODULES +testsuite_LDADD = $(GLIB_LIBS) # in configure.ac diff --git a/configure.ac b/configure.ac index b7b4660..ef5d695 100644 --- a/configure.ac +++ b/configure.ac @@ -4,6 +4,7 @@ AC_PREREQ([2.69]) AC_INIT([FULL-PACKAGE-NAME], [VERSION], [BUG-REPORT-ADDRESS]) AC_CONFIG_AUX_DIR([build-aux]) +AM_PATH_GLIB_2_0 AM_INIT_AUTOMAKE([foreign subdir-objects]) # Does not require NEWS, COPYING, AUTHORS, ChangeLog or README # silent make https://autotools.io/automake/silent.html @@ -58,7 +59,7 @@ AC_CHECK_HEADER([stdlib.h]) # it's going to link against glib2.0. # The required CFLAGS and -l options are available as DEPS_CFLAGS # and DEPS_LIBS in Makefile.am -PKG_CHECK_MODULES([DEPS], [glib-2.0 >= 2.24.1]) +# PKG_CHECK_MODULES([DEPS], [glib-2.0 >= 2.24.1]) AC_CONFIG_FILES([Makefile]) GLIB_TESTS