summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarco Barisione <marco@barisione.org>2011-05-19 12:57:19 +0100
committerMarco Barisione <marco@barisione.org>2011-05-23 14:23:02 +0100
commit0f484ff84530777a6c18720b1389aa13e64d8e2e (patch)
tree74cb8439628259973dba4dd9be119a53d45a9c97
parent01d10bf1deca680b64592314a009ecccacdb1d9d (diff)
Use pkg-config to check for iphb and use the right include path
-rw-r--r--configure.ac7
-rw-r--r--src/sip-connection-private.h2
2 files changed, 3 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac
index b086e6e..42ad49e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -96,13 +96,10 @@ AC_ARG_WITH(iphb,
[with_iphb=no]
)
if test "x$with_iphb" != xno; then
- AC_CHECK_LIB(iphb, [iphb_open],
+ PKG_CHECK_MODULES(IPHB, [libiphb],
[
AC_DEFINE([HAVE_LIBIPHB], [], [IP heartbeat library is available])
- IPHB_CFLAGS='-I$(includedir)/iphbd'
- IPHB_LIBS=-liphb
- ],
- [AC_MSG_ERROR([IP heartbeat library not found])]
+ ]
)
else
IPHB_CFLAGS=
diff --git a/src/sip-connection-private.h b/src/sip-connection-private.h
index f79fa93..e70d2a6 100644
--- a/src/sip-connection-private.h
+++ b/src/sip-connection-private.h
@@ -28,7 +28,7 @@
#include <sofia-sip/sresolv.h>
#ifdef HAVE_LIBIPHB
-#include <libiphb.h>
+#include <iphbd/libiphb.h>
#endif
struct _TpsipConnectionPrivate