From 51ac7ad745c086e22aa3af2e6deeb8a051105d4e Mon Sep 17 00:00:00 2001
From: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
Date: Mon, 20 Apr 2009 12:09:43 -0400
Subject: [PATCH] Remove warnings from the client test framework
---
sflphone-gtk/configure.ac | 9 +++++----
sflphone-gtk/tests/Makefile.am | 6 +++---
2 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/sflphone-gtk/configure.ac b/sflphone-gtk/configure.ac
index 5f920f1cff..69cbdc93f7 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 c56c1cfc17..ce42663bf6 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
###########################################################
--
GitLab