From 57b5d5cbbb9c546dfa3a7d80da5c819a226d45ba Mon Sep 17 00:00:00 2001
From: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
Date: Wed, 30 Apr 2008 14:11:49 -0400
Subject: [PATCH] Fix library name conflict between libiax0 and libiax2
Change the name of the libiax library
---
Makefile.am | 2 +-
configure.ac | 2 +-
libs/libiax2/src/Makefile.am | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 9e957b71eb..a53fc6a4de 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,7 +2,7 @@
ACLOCAL_AMFLAGS = -I m4
-SUBDIRS = libs src ringtones
+SUBDIRS = libs src ringtones po
EXTRA_DIST = m4/*.m4 tools/*.sh platform/* images/* README.gentoo
diff --git a/configure.ac b/configure.ac
index 45cdc5b0d3..5ef85d38c0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -252,7 +252,7 @@ AC_ARG_WITH([iax2],
LIBIAX2=
AS_IF([test "x$with_iax2" != xno],
[AC_CHECK_HEADER([iax/iax.h], , AC_MSG_FAILURE([Unable to find the libiax2 headers (you may need to install the dev package). You may use --without-iax2 to compile without iax2 protocol support.]))]
- [AC_CHECK_LIB([iax], [iax_init],
+ [AC_CHECK_LIB([iax2], [iax_init],
[],
[AC_MSG_FAILURE(
[libiax2 link test failed. You may use --without-iax2 to compile without iax2 protocol support.])]
diff --git a/libs/libiax2/src/Makefile.am b/libs/libiax2/src/Makefile.am
index e2bb07fd63..901b0421cd 100644
--- a/libs/libiax2/src/Makefile.am
+++ b/libs/libiax2/src/Makefile.am
@@ -8,8 +8,8 @@ AM_CFLAGS += $(UCFLAGS)
pkgdir = $(libdir)
-pkg_LTLIBRARIES=libiax.la
-libiax_la_SOURCES = iax2-parser.c iax.c md5.c jitterbuf.c
+pkg_LTLIBRARIES=libiax2.la
+libiax2_la_SOURCES = iax2-parser.c iax.c md5.c jitterbuf.c
EXTRA_DIST = md5.h frame.h iax-client.h iax2.h iax2-parser.h jitterbuf.h
install-data-local:
--
GitLab