Skip to content
Snippets Groups Projects
Commit 081f9fc0 authored by Alexandre Savard's avatar Alexandre Savard
Browse files

Merge branch 'master' of git+ssh://git.sflphone.org/var/repos/sflphone/git/sflphone

parents 1a3cdf1a 837951a5
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
sflphone-common/configure.ac
+ 3
− 0
View file @ 081f9fc0
...@@ -173,6 +173,9 @@ dnl AC_SUBST(UUID_LIBS) ...@@ -173,6 +173,9 @@ dnl AC_SUBST(UUID_LIBS)
UUID_MIN_VERSION=1.0 UUID_MIN_VERSION=1.0
PKG_CHECK_MODULES(UUID, uuid >= ${UUID_MIN_VERSION}, HAVE_UUID=true, HAVE_UUID=false); PKG_CHECK_MODULES(UUID, uuid >= ${UUID_MIN_VERSION}, HAVE_UUID=true, HAVE_UUID=false);
LIBCRYPTO_MIN_VERSION=1.0
PKG_CHECK_MODULES(LIBCRYPTO, libcrypto >= ${LIBCRYPTO_MIN_VERSION}, HAVE_LIBCRYPTO=true, HAVE_LIBCRYPTO=false);
dnl Check for alsa development package - name: libasound2-dev dnl Check for alsa development package - name: libasound2-dev
ALSA_MIN_VERSION=1.0 ALSA_MIN_VERSION=1.0
PKG_CHECK_MODULES(ALSA, alsa >= ${ALSA_MIN_VERSION},, AC_MSG_ERROR([Missing alsa development package: libasound2-dev or alsa-lib-devel])) PKG_CHECK_MODULES(ALSA, alsa >= ${ALSA_MIN_VERSION},, AC_MSG_ERROR([Missing alsa development package: libasound2-dev or alsa-lib-devel]))
......
sflphone-common/test/Makefile.am
+ 1
− 1
View file @ 081f9fc0
...@@ -3,7 +3,7 @@ include ../globals.mak ...@@ -3,7 +3,7 @@ include ../globals.mak
check_PROGRAMS = test check_PROGRAMS = test
test_CXXFLAGS = $(CPPUNIT_CFLAGS) test_CXXFLAGS = $(CPPUNIT_CFLAGS)
test_LDADD = $(LLIBS) test_LDADD = $(LLIBS) @LIBCRYPTO_LIBS@
test_SOURCES = \ test_SOURCES = \
main.cpp \ main.cpp \
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment