valicek/test-autotools-static
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use AM_PATH_GLIB_2_0 instead of PKG_CHECK_MODULES

Browse Source
This commit is contained in:
Ruben Laguna 2015-02-07 23:29:52 +01:00
parent b7eea97f78
commit d310872077
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile.am
View File

@ -19,7 +19,7 @@ testsuite_SOURCES = tests/test.c
# CFLAGS and -l options that are retrieved from pkg-config (configure.ac) # 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) # 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_CFLAGS = $(GLIB_CFLAGS) # DEPS_* are filled by PKG_CHECK_MODULES
testsuite_LDADD = $(DEPS_LIBS) # in configure.ac testsuite_LDADD = $(GLIB_LIBS) # in configure.ac

3
configure.ac
View File

@ -4,6 +4,7 @@
AC_PREREQ([2.69]) AC_PREREQ([2.69])
AC_INIT([FULL-PACKAGE-NAME], [VERSION], [BUG-REPORT-ADDRESS]) AC_INIT([FULL-PACKAGE-NAME], [VERSION], [BUG-REPORT-ADDRESS])
AC_CONFIG_AUX_DIR([build-aux]) 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 AM_INIT_AUTOMAKE([foreign subdir-objects]) # Does not require NEWS, COPYING, AUTHORS, ChangeLog or README
# silent make https://autotools.io/automake/silent.html # 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. # it's going to link against glib2.0.
# The required CFLAGS and -l options are available as DEPS_CFLAGS # The required CFLAGS and -l options are available as DEPS_CFLAGS
# and DEPS_LIBS in Makefile.am # 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]) AC_CONFIG_FILES([Makefile])
GLIB_TESTS GLIB_TESTS