jami/jami-daemon
1
0
Fork 0
mirror of https://git.jami.net/savoirfairelinux/jami-daemon.git synced 2025-08-07 22:02:12 +08:00
Code Issues Projects Releases Wiki Activity

build system detects cppunit with pkg-config

Browse Source
This commit is contained in:
Emmanuel Milou
2008-10-08 14:13:20 -04:00
parent 25e7c26ac8
commit 46dcaf3030
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
configure.ac
View File

@ -40,7 +40,7 @@ AC_CONFIG_FILES([src/Makefile \
src/zeroconf/Makefile]) src/zeroconf/Makefile])
dnl Unitary test section dnl Unitary test section
dnl AC_CONFIG_FILES([src/test/Makefile]) AC_CONFIG_FILES([test/Makefile])
AC_CONFIG_FILES([po/Makefile \ AC_CONFIG_FILES([po/Makefile \
@ -173,6 +173,10 @@ PKG_CHECK_MODULES(libdbuscpp, dbus-c++-1 >= ${LIBDBUSCPP_MIN_VERSION})
SFLPHONE_CFLAGS="$SFLPHONE_CFLAGS $libdbuscpp_CFLAGS" SFLPHONE_CFLAGS="$SFLPHONE_CFLAGS $libdbuscpp_CFLAGS"
SFLPHONE_LIBS="$SFLPHONE_LIBS $libdbuscpp_LIBS" SFLPHONE_LIBS="$SFLPHONE_LIBS $libdbuscpp_LIBS"
CPPUNIT_MIN_VERSION=1.12
PKG_CHECK_MODULES(CPPUNIT, cppunit >= ${CPPUNIT_MIN_VERSION})
AC_SUBST(CPPUNIT_LIBS)
# check for libgsm1 (doesn't use pkg-config) # check for libgsm1 (doesn't use pkg-config)
dnl Check for libgsm dnl Check for libgsm
AC_ARG_WITH([gsm], AC_ARG_WITH([gsm],

2
globals.mak
View File

@ -1,2 +1,2 @@
src = $(top_srcdir) src = $(top_srcdir)
AM_CPPFLAGS = -I$(src)/libs -I$(src)/src -I.. AM_CPPFLAGS = -I$(src)/libs -I$(src)/src -DPREFIX=\"$(prefix)\" -DPROGSHAREDIR=\"${datadir}/sflphone\" $(ZEROCONFFLAGS) $(IAX_FLAGS) $(SFLPHONE_CFLAGS) $(SIP_CFLAGS)