From f66a467469dfb48c522679af0cc0f0448a1a4ef4 Mon Sep 17 00:00:00 2001
From: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
Date: Tue, 19 May 2009 12:45:46 -0400
Subject: [PATCH] [#1454] Make cppunit optional; remove from build deps in
control files
---
sflphone-common/Makefile.am | 9 ++++++++-
sflphone-common/configure.ac | 4 +---
sflphone-common/debian/control.hardy | 2 +-
sflphone-common/debian/control.intrepid | 2 +-
sflphone-common/debian/control.jaunty | 2 +-
5 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/sflphone-common/Makefile.am b/sflphone-common/Makefile.am
index f774bdf57c..ffd473d7d1 100644
--- a/sflphone-common/Makefile.am
+++ b/sflphone-common/Makefile.am
@@ -1,14 +1,21 @@
# Makefile.am
+if BUILD_TEST
+TESTS_DIR=test
unittest:
@(cd test; make)
@echo ""
@echo "NOTICE: Unitary tests successfully build"
@echo "Go in the test directory to run them"
@echo ""
+else
+unittest:
+ @echo "SFLphone WARNING:"
+ @echo " -- You need the cppunit devel package to compile the unitary tests."
+endif
ACLOCAL_AMFLAGS = -I m4
-SUBDIRS = libs src ringtones po man test
+SUBDIRS = libs src ringtones po man $(TESTS_DIR)
EXTRA_DIST = m4/*.m4 tools/*.sh platform/* images/* README.gentoo
diff --git a/sflphone-common/configure.ac b/sflphone-common/configure.ac
index f46555b486..69f2bcf1ff 100644
--- a/sflphone-common/configure.ac
+++ b/sflphone-common/configure.ac
@@ -267,11 +267,9 @@ AC_ARG_WITH(build-libdbus-cxx,
)
AC_SUBST(BUILD_LIBDBUS_CXX_DIR)
-
-
dnl Check for libcppunit-dev
CPPUNIT_MIN_VERSION=1.12
-PKG_CHECK_MODULES(CPPUNIT, cppunit >= ${CPPUNIT_MIN_VERSION})
+PKG_CHECK_MODULES(CPPUNIT, cppunit >= ${CPPUNIT_MIN_VERSION}, AM_CONDITIONAL(BUILD_TEST, test 1 = 1 ), AM_CONDITIONAL(BUILD_TEST, test 0 = 1 ))
AC_SUBST(CPPUNIT_LIBS)
# check for libgsm1 (doesn't use pkg-config)
diff --git a/sflphone-common/debian/control.hardy b/sflphone-common/debian/control.hardy
index e82bee0f7e..e14674d170 100644
--- a/sflphone-common/debian/control.hardy
+++ b/sflphone-common/debian/control.hardy
@@ -2,7 +2,7 @@ Source: sflphone-common
Maintainer: SavoirFaireLinux Inc <emmanuel.milou@savoirfairelinux.com>
Section: gnome
Priority: optional
-Build-Depends: debhelper (>= 5), libgcc1, autoconf, automake, libpulse-dev, libsamplerate0-dev, libcommoncpp2-dev, libccrtp-dev, libcppunit-dev, libgsm1-dev, libspeex-dev, libtool, libdbus-1-dev, libasound2-dev, uuid-dev, libexpat1-dev
+Build-Depends: debhelper (>= 5), libgcc1, autoconf, automake, libpulse-dev, libsamplerate0-dev, libcommoncpp2-dev, libccrtp-dev, libgsm1-dev, libspeex-dev, libtool, libdbus-1-dev, libasound2-dev, uuid-dev, libexpat1-dev
Standards-Version: 3.7.3
Package: sflphone-common
diff --git a/sflphone-common/debian/control.intrepid b/sflphone-common/debian/control.intrepid
index 00ce49356b..270e678112 100644
--- a/sflphone-common/debian/control.intrepid
+++ b/sflphone-common/debian/control.intrepid
@@ -2,7 +2,7 @@ Source: sflphone-common
Maintainer: SavoirFaireLinux Inc <emmanuel.milou@savoirfairelinux.com>
Section: gnome
Priority: optional
-Build-Depends: debhelper (>= 5), libgcc1 , autoconf, libpulse-dev, libsamplerate0-dev, libcommoncpp2-dev, libccrtp-dev, libcppunit-dev, libgsm1-dev, libspeex-dev, libtool, libdbus-1-dev, libasound2-dev, libspeexdsp-dev, uuid-dev, libexpat1-dev
+Build-Depends: debhelper (>= 5), libgcc1 , autoconf, libpulse-dev, libsamplerate0-dev, libcommoncpp2-dev, libccrtp-dev, libgsm1-dev, libspeex-dev, libtool, libdbus-1-dev, libasound2-dev, libspeexdsp-dev, uuid-dev, libexpat1-dev
Standards-Version: 3.8.0
Package: sflphone-common
diff --git a/sflphone-common/debian/control.jaunty b/sflphone-common/debian/control.jaunty
index 281a9da2a9..f871e07e75 100644
--- a/sflphone-common/debian/control.jaunty
+++ b/sflphone-common/debian/control.jaunty
@@ -2,7 +2,7 @@ Source: sflphone-common
Maintainer: SavoirFaireLinux Inc <emmanuel.milou@savoirfairelinux.com>
Section: gnome
Priority: optional
-Build-Depends: debhelper (>= 5), libgcc1 , autoconf, automake, libpulse-dev, libsamplerate0-dev, libcommoncpp2-dev, libccrtp-dev, libcppunit-dev, libgsm1-dev, libspeex-dev, libtool, libdbus-1-dev, libasound2-dev, libspeexdsp-dev, uuid-dev, libexpat1-dev
+Build-Depends: debhelper (>= 5), libgcc1 , autoconf, automake, libpulse-dev, libsamplerate0-dev, libcommoncpp2-dev, libccrtp-dev, libgsm1-dev, libspeex-dev, libtool, libdbus-1-dev, libasound2-dev, libspeexdsp-dev, uuid-dev, libexpat1-dev
Standards-Version: 3.7.3
Package: sflphone-common
--
GitLab