From 8b84d8cea5c5a03c8d72ee54d0d5a7ed3d6d1a81 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 -
 src/Main/CMakeLists.txt    | 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 6eb756871..ba812676c 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 34db2989f..d3fb72dac 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -231,7 +231,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/src/Main/CMakeLists.txt b/src/Main/CMakeLists.txt
index 74c7fd7a7..ca62afe0a 100644
--- a/src/Main/CMakeLists.txt
+++ b/src/Main/CMakeLists.txt
@@ -144,7 +144,7 @@ if(ENABLE_JSBSIM)
     target_link_libraries(fgfs JSBSim)
 endif()
 if(ENABLE_IAX)
-    target_link_libraries(fgfs iaxclient_lib ${OPENAL_LIBRARY})
+    target_link_libraries(fgfs iaxclient ${OPENAL_LIBRARY})
 endif()
 if(USE_DBUS)
     target_link_libraries(fgfs ${DBUS_LIBRARIES})
diff --git a/src/Network/fgcom.cxx b/src/Network/fgcom.cxx
index 8d1bfc96c..b501bd779 100644
--- a/src/Network/fgcom.cxx
+++ b/src/Network/fgcom.cxx
@@ -39,7 +39,7 @@
 #include <Airports/airport.hxx>
 #include <Navaids/navlist.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.14.3