From 987c1bdfda75029208fc84413c6e27d03835dd87 Mon Sep 17 00:00:00 2001
From: James Turner <zakalawe@mac.com>
Date: Sun, 24 Oct 2010 11:04:14 +0100
Subject: [PATCH] Automake build fixes for PLIB net/ul removal.

---
 src/FDM/ExternalNet/ExternalNet.cxx | 2 ++
 src/FDM/fdm_shell.cxx               | 1 +
 src/Network/httpd.cxx               | 4 ++--
 src/Network/multiplay.cxx           | 3 +--
 utils/TerraSync/Makefile.am         | 2 +-
 5 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/FDM/ExternalNet/ExternalNet.cxx b/src/FDM/ExternalNet/ExternalNet.cxx
index 7a3a14156..9d2f3e7b2 100644
--- a/src/FDM/ExternalNet/ExternalNet.cxx
+++ b/src/FDM/ExternalNet/ExternalNet.cxx
@@ -24,6 +24,8 @@
 #  include <config.h>
 #endif
 
+#include <cstring>
+
 #include <simgear/debug/logstream.hxx>
 #include <simgear/io/lowlevel.hxx> // endian tests
 #include <simgear/io/sg_netBuffer.hxx>
diff --git a/src/FDM/fdm_shell.cxx b/src/FDM/fdm_shell.cxx
index a4cfad309..aaf94a6e7 100644
--- a/src/FDM/fdm_shell.cxx
+++ b/src/FDM/fdm_shell.cxx
@@ -24,6 +24,7 @@
 #  include <config.h>
 #endif
 
+#include <cassert>
 #include <simgear/structure/exception.hxx>
 
 #include <FDM/fdm_shell.hxx>
diff --git a/src/Network/httpd.cxx b/src/Network/httpd.cxx
index e2e6a918f..31d4b9337 100644
--- a/src/Network/httpd.cxx
+++ b/src/Network/httpd.cxx
@@ -32,8 +32,8 @@
 #include <simgear/compiler.h>
 
 #include <algorithm>		// sort()
-#include <stdlib.h>		// atoi() atof()
-
+#include <cstdlib>		// atoi() atof()
+#include <cstring>
 #include <string>
 
 #include <simgear/debug/logstream.hxx>
diff --git a/src/Network/multiplay.cxx b/src/Network/multiplay.cxx
index e7991e6b8..a9cd32bf3 100644
--- a/src/Network/multiplay.cxx
+++ b/src/Network/multiplay.cxx
@@ -28,8 +28,7 @@
 
 #include <simgear/compiler.h>
 
-#include <string>
-
+#include <cstring>
 #include <iostream>
 #include <map>
 #include <string>
diff --git a/utils/TerraSync/Makefile.am b/utils/TerraSync/Makefile.am
index 7106cc72f..3932be524 100644
--- a/utils/TerraSync/Makefile.am
+++ b/utils/TerraSync/Makefile.am
@@ -6,4 +6,4 @@ terrasync_SOURCES = terrasync.cxx
 
 AM_CPPFLAGS = $(svn_CPPFLAGS)
 
-terrasync_LDADD = -lsgio -lsgmisc -lsgdebug $(network_LIBS) $(svn_LIBS)
+terrasync_LDADD = -lsgio -lsgstructure -lsgmisc -lsgdebug $(network_LIBS) $(svn_LIBS)