From 5e1200b3da4f8497f302d3c8c20d784929a18c58 Mon Sep 17 00:00:00 2001
From: Fabrice Bellet <fabrice@bellet.info>
Date: Tue, 17 Feb 2015 20:14:04 +0100
Subject: [PATCH] use system iaxclient instead of bundled one

---
 3rdparty/CMakeLists.txt               | 4 ----
 CMakeLists.txt                        | 1 -
 CMakeModules/SetupFGFSLibraries.cmake | 2 +-
 src/Network/fgcom.cxx                 | 2 +-
 utils/fgcom/CMakeLists.txt            | 2 +-
 utils/fgcom/fgcom.cxx                 | 2 +-
 6 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/3rdparty/CMakeLists.txt b/3rdparty/CMakeLists.txt
index f8654d336..30169146c 100644
--- a/3rdparty/CMakeLists.txt
+++ b/3rdparty/CMakeLists.txt
@@ -3,10 +3,6 @@ if (NOT SYSTEM_SQLITE)
     add_subdirectory(sqlite3)
 endif()
 
-if (ENABLE_IAX)
-    add_subdirectory(iaxclient/lib)
-endif()
-
 add_subdirectory(mongoose)
 add_subdirectory(cjson)
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
index fae003bc1..e70640d0f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -242,7 +242,6 @@ endif()
 
 if(ENABLE_FGCOM)
   set(ENABLE_IAX 1)
-  include_directories(${PROJECT_SOURCE_DIR}/3rdparty/iaxclient/lib ) # for iaxclient.h
 endif()
 
 # Setup MSVC 3rd party directories
diff --git a/CMakeModules/SetupFGFSLibraries.cmake b/CMakeModules/SetupFGFSLibraries.cmake
index d47fa7d94..9c2c9d6b1 100644
--- a/CMakeModules/SetupFGFSLibraries.cmake
+++ b/CMakeModules/SetupFGFSLibraries.cmake
@@ -23,7 +23,7 @@ function(setup_fgfs_libraries target)
     endif()
 
     if(ENABLE_IAX)
-        target_link_libraries(${target} iaxclient_lib ${OPENAL_LIBRARY})
+        target_link_libraries(${target} iaxclient ${OPENAL_LIBRARY})
     endif()
 
     # manually created DBus target
diff --git a/src/Network/fgcom.cxx b/src/Network/fgcom.cxx
index cab79063d..f0abd31d9 100644
--- a/src/Network/fgcom.cxx
+++ b/src/Network/fgcom.cxx
@@ -40,7 +40,7 @@
 #include <Navaids/navlist.hxx>
 #include <Main/sentryIntegration.hxx>
 
-#include <3rdparty/iaxclient/lib/iaxclient.h>
+#include <iaxclient.h>
 
 
 #define NUM_CALLS 4
diff --git a/utils/fgcom/CMakeLists.txt b/utils/fgcom/CMakeLists.txt
index 273c2d256..7d36f2839 100644
--- a/utils/fgcom/CMakeLists.txt
+++ b/utils/fgcom/CMakeLists.txt
@@ -27,7 +27,7 @@ add_executable(${name}
 )
 
 target_link_Libraries(${name}
-                      iaxclient_lib
+                      iaxclient
                       ${OPENAL_LIBRARY}
                       SimGearCore
 )
diff --git a/utils/fgcom/fgcom.cxx b/utils/fgcom/fgcom.cxx
index 0a8f46d24..22fda4705 100644
--- a/utils/fgcom/fgcom.cxx
+++ b/utils/fgcom/fgcom.cxx
@@ -36,7 +36,7 @@
 #include <simgear/debug/logstream.hxx>
 #include <simgear/timing/timestamp.hxx>
 
-#include <3rdparty/iaxclient/lib/iaxclient.h>
+#include <iaxclient.h>
 
 #include "fgcom.hxx"
 #include "positions.hxx" // provides _positionsData[];
-- 
2.31.1