From 9c9276af0f85da7d369afe87822d35304e950b6e Mon Sep 17 00:00:00 2001
From: James Turner <zakalawe@mac.com>
Date: Tue, 14 Jun 2016 15:12:20 +0100
Subject: [PATCH] Export untar header

Needed for scenery installation helper.
---
 simgear/io/CMakeLists.txt         | 2 ++
 simgear/{package => io}/untar.cxx | 0
 simgear/{package => io}/untar.hxx | 0
 simgear/package/CMakeLists.txt    | 1 -
 simgear/package/Install.cxx       | 2 +-
 5 files changed, 3 insertions(+), 2 deletions(-)
 rename simgear/{package => io}/untar.cxx (100%)
 rename simgear/{package => io}/untar.hxx (100%)

diff --git a/simgear/io/CMakeLists.txt b/simgear/io/CMakeLists.txt
index 682a4f6a..a4cf2c8f 100644
--- a/simgear/io/CMakeLists.txt
+++ b/simgear/io/CMakeLists.txt
@@ -19,6 +19,7 @@ set(HEADERS
     HTTPMemoryRequest.hxx
     HTTPRequest.hxx
     HTTPRepository.hxx
+    untar.hxx
     )
 
 set(SOURCES
@@ -38,6 +39,7 @@ set(SOURCES
     HTTPMemoryRequest.cxx
     HTTPRequest.cxx
     HTTPRepository.cxx
+    untar.cxx
     )
 
 if(ENABLE_DNS)
diff --git a/simgear/package/untar.cxx b/simgear/io/untar.cxx
similarity index 100%
rename from simgear/package/untar.cxx
rename to simgear/io/untar.cxx
diff --git a/simgear/package/untar.hxx b/simgear/io/untar.hxx
similarity index 100%
rename from simgear/package/untar.hxx
rename to simgear/io/untar.hxx
diff --git a/simgear/package/CMakeLists.txt b/simgear/package/CMakeLists.txt
index a031edaa..2c4067bd 100644
--- a/simgear/package/CMakeLists.txt
+++ b/simgear/package/CMakeLists.txt
@@ -18,7 +18,6 @@ set(SOURCES
     md5.h md5.c
     ioapi.c ioapi_mem.c ioapi.h
     unzip.h unzip.c
-    untar.hxx untar.cxx
     )
 
 simgear_component(package package "${SOURCES}" "${HEADERS}")
diff --git a/simgear/package/Install.cxx b/simgear/package/Install.cxx
index d43dff92..c2a92bac 100644
--- a/simgear/package/Install.cxx
+++ b/simgear/package/Install.cxx
@@ -22,8 +22,8 @@
 
 #include <simgear/package/unzip.h>
 #include <simgear/package/md5.h>
-#include <simgear/package/untar.hxx>
 
+#include <simgear/io/untar.hxx>
 #include <simgear/structure/exception.hxx>
 #include <simgear/props/props_io.hxx>
 #include <simgear/package/Catalog.hxx>
-- 
2.39.5