diff --git a/sflphone-gtk/configure.ac b/sflphone-gtk/configure.ac index 5f920f1cffa8c2019d4ef6fdb6efd3950c742d43..69cbdc93f7add6739dadfb4dabffafbb249c0daf 100644 --- a/sflphone-gtk/configure.ac +++ b/sflphone-gtk/configure.ac @@ -54,15 +54,16 @@ PKG_CHECK_MODULES(DEPS, \ libebook-1.2 >= 2.22 ) +AC_SUBST(DEPS_CFLAGS) +AC_SUBST(DEPS_LIBS) + # This macro is defined in check.m4 and tests if check.h and # libcheck.a are installed in your system. It sets CHECK_CFLAGS and # CHECK_LIBS accordingly. # AM_PATH_CHECK([MINIMUM-VERSION, # [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) -AM_PATH_CHECK() - -AC_SUBST(DEPS_CFLAGS) -AC_SUBST(DEPS_LIBS) +dnl AM_PATH_CHECK() DEPRECATED +PKG_CHECK_MODULES([CHECK], [check >= 0.9.4]) AC_OUTPUT([ Makefile diff --git a/sflphone-gtk/tests/Makefile.am b/sflphone-gtk/tests/Makefile.am index c56c1cfc17f1f613f172b394c0b104dfab2707e0..ce42663bf6971f595866d77434733149554e1ae8 100644 --- a/sflphone-gtk/tests/Makefile.am +++ b/sflphone-gtk/tests/Makefile.am @@ -34,18 +34,18 @@ check_global_LDADD = @CHECK_LIBS@ check_contacts_SOURCES = check_contacts.c check_contacts_CFLAGS = @CHECK_CFLAGS@ @DEPS_CFLAGS@ -check_contacts_LDADD = $(SFLPHONE_LIBS) $(SFLPHONE_OBJ) @CHECK_LIBS@ @DEPS_LIBS@ -llog4c +check_contacts_LDADD = $(SFLPHONE_LIBS) $(SFLPHONE_OBJ) @CHECK_LIBS@ @DEPS_LIBS@ @LIBSEXY_LIBS@ -llog4c ########################################################### check_config_SOURCES = check_config.c check_config_CFLAGS = @CHECK_CFLAGS@ @DEPS_CFLAGS@ -check_contacts_LDADD = $(SFLPHONE_LIBS) $(SFLPHONE_OBJ) @CHECK_LIBS@ @DEPS_LIBS@ -llog4c +check_config_LDADD = $(SFLPHONE_LIBS) $(SFLPHONE_OBJ) @CHECK_LIBS@ @DEPS_LIBS@ @LIBSEXY_LIBS@ -llog4c ########################################################### check_dbus_SOURCES = check_dbus.c check_dbus_CFLAGS = @CHECK_CFLAGS@ @DEPS_CFLAGS@ -check_contacts_LDADD = $(SFLPHONE_LIBS) $(SFLPHONE_OBJ) @CHECK_LIBS@ @DEPS_LIBS@ -llog4c +check_dbus_LDADD = $(SFLPHONE_LIBS) $(SFLPHONE_OBJ) @CHECK_LIBS@ @DEPS_LIBS@ @LIBSEXY_LIBS@ -llog4c ###########################################################