From ac3a2045741058e605070b0dab557c9d0dfe7b38 Mon Sep 17 00:00:00 2001
From: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
Date: Fri, 25 Sep 2009 14:40:53 -0400
Subject: [PATCH] [#2181] Do not install dbus-c++ headers + add return value
---
sflphone-common/libs/dbus-c++/src/Makefile.am | 4 ++--
sflphone-common/src/sip/sipvoiplink.cpp | 2 ++
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/sflphone-common/libs/dbus-c++/src/Makefile.am b/sflphone-common/libs/dbus-c++/src/Makefile.am
index 064d3fc059..09d7bd659f 100644
--- a/sflphone-common/libs/dbus-c++/src/Makefile.am
+++ b/sflphone-common/libs/dbus-c++/src/Makefile.am
@@ -34,8 +34,8 @@ HEADER_FILES = \
$(HEADER_DIR)/eventloop-integration.h \
$(GLIB_H)
-lib_includedir=$(includedir)/dbus-c++-1/dbus-c++/
-lib_include_HEADERS = $(HEADER_FILES)
+# noinst_lib_includedir=$(includedir)/dbus-c++-1/dbus-c++/
+noinst_HEADERS = $(HEADER_FILES)
lib_LTLIBRARIES = libdbus-c++-1.la
libdbus_c___1_la_SOURCES = $(HEADER_FILES) interface.cpp object.cpp introspection.cpp debug.cpp types.cpp connection.cpp connection_p.h property.cpp dispatcher.cpp dispatcher_p.h pendingcall.cpp pendingcall_p.h error.cpp internalerror.h message.cpp message_p.h server.cpp server_p.h eventloop.cpp eventloop-integration.cpp $(GLIB_CPP) $(ECORE_CPP)
diff --git a/sflphone-common/src/sip/sipvoiplink.cpp b/sflphone-common/src/sip/sipvoiplink.cpp
index e24083ab55..dc1e94a4d8 100644
--- a/sflphone-common/src/sip/sipvoiplink.cpp
+++ b/sflphone-common/src/sip/sipvoiplink.cpp
@@ -3663,6 +3663,8 @@ std::vector<std::string> SIPVoIPLink::getAllIpInterface (void)
ifaceList.push_back (std::string (tmpAddr));
_debug ("Local interface %s\n", tmpAddr);
}
+
+ return ifaceList;
}
--
GitLab