From 2d599da9fbd18a608b7ae92c37e469661ce3a86e Mon Sep 17 00:00:00 2001 From: Vittorio Giovara <vittorio.giovara@gmail.com> Date: Wed, 2 Jul 2014 19:16:12 -0400 Subject: [PATCH] configure: drop uuid check Pjproject dependency, automatically handled in contrib. Refs: #46617 --- daemon/configure.ac | 4 ---- daemon/src/Makefile.am | 4 +--- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/daemon/configure.ac b/daemon/configure.ac index 7c3efee038..d21d20e2bc 100644 --- a/daemon/configure.ac +++ b/daemon/configure.ac @@ -150,10 +150,6 @@ AC_SUBST(CONTRIB_DIR) dnl Check for pjproject PKG_CHECK_MODULES(PJPROJECT, libpjproject,, AC_MSG_ERROR([Missing pjproject files])) -dnl Check for uuid development package - name: uuid-dev -UUID_MIN_VERSION=1.0 -PKG_CHECK_MODULES(UUID, uuid >= ${UUID_MIN_VERSION}, HAVE_UUID=true, HAVE_UUID=false); - AC_SEARCH_LIBS([yaml_parser_initialize], [yaml], [AC_SUBST(YAML_LIBS, -lyaml)], [ AC_MSG_ERROR([Unable to find yaml development files])]) diff --git a/daemon/src/Makefile.am b/daemon/src/Makefile.am index 4a4db89f65..abd01f6740 100644 --- a/daemon/src/Makefile.am +++ b/daemon/src/Makefile.am @@ -52,7 +52,6 @@ libsflphone_la_LDFLAGS = \ @SAMPLERATE_LIBS@ \ @SNDFILE_LIBS@ \ $(TLS_LIB) \ - @UUID_LIBS@ \ @YAML_LIBS@ libsflphone_la_CFLAGS = \ @@ -62,8 +61,7 @@ libsflphone_la_CFLAGS = \ @ALSA_CFLAGS@ \ @PULSEAUDIO_CFLAGS@ \ @SAMPLERATE_CFLAGS@ \ - $(TLS_CFLAGS) \ - @UUID_CFLAGS@ + $(TLS_CFLAGS) libsflphone_la_SOURCES = conference.cpp \ account_factory.cpp \ -- GitLab