From 74cc8b89306bccad8592a812f3b40964b1ea0742 Mon Sep 17 00:00:00 2001 From: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com> Date: Tue, 15 Sep 2009 14:31:06 -0400 Subject: [PATCH] [#929] Link against uuid if installed --- sflphone-common/configure.ac | 5 ++++- sflphone-common/src/Makefile.am | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sflphone-common/configure.ac b/sflphone-common/configure.ac index 26e30db19b..a11adcf4d2 100644 --- a/sflphone-common/configure.ac +++ b/sflphone-common/configure.ac @@ -157,10 +157,13 @@ AC_CHECK_TYPES([ptrdiff_t]) #AC_SUBST(SIP_CFLAGS) dnl Check for uuid development package - name: uuid-dev - dnl UUID_MIN_VERSION=1.0 dnl PKG_CHECK_MODULES(UUID, uuid >= ${UUID_MIN_VERSION}) dnl AC_SUBST(UUID_CFLAGS) dnl AC_SUBST(UUID_LIBS) +UUID_MIN_VERSION=1.0 +PKG_CHECK_MODULES(UUID, uuid >= ${UUID_MIN_VERSION}, HAVE_UUID=true, HAVE_UUID=false); +AC_SUBST(UUID_CFLAGS) +AC_SUBST(UUID_LIBS) dnl Check for alsa development package - name: libasound2-dev LIBASOUND2_MIN_VERSION=1.0 diff --git a/sflphone-common/src/Makefile.am b/sflphone-common/src/Makefile.am index 05ac52d8b8..ec1ebffe3f 100644 --- a/sflphone-common/src/Makefile.am +++ b/sflphone-common/src/Makefile.am @@ -46,7 +46,7 @@ sflphoned_LDADD = \ @libssl_LIBS@ # sflphoned_LDFLAGS= -pg -luuid -# sflphoned_LDFLAGS= -luuid +sflphoned_LDFLAGS= $(UUID_LIBS) noinst_LTLIBRARIES = libsflphone.la -- GitLab