Automake build fixes for PLIB net/ul removal.

diff --git a/src/FDM/ExternalNet/ExternalNet.cxx b/src/FDM/ExternalNet/ExternalNet.cxx
index 7a3a141563e6eb69c86d79228ef0d137d9c5f626..9d2f3e7b2f2a4102dc2da4a944919faa1521f53d 100644 (file)
--- 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 a4cfad3098969198a5d60a3e765b8ae4ae27cbd8..aaf94a6e73476bc20f359cf448211189b212f4a4 100644 (file)
--- 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 e2e6a918f5326eb52b18536a0cd4d50ca158e303..31d4b93375af4724799b0b1184b99a102ed29df1 100644 (file)
--- 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 e7991e6b83fe72c4ffa9d8d9691338af92898e62..a9cd32bf3823009c0fb6002270d321b993f35c35 100644 (file)
--- 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 7106cc72f2d49a92b97e24d92c492915acb46238..3932be5243f6802df35f7d2fd6545b06fc89d539 100644 (file)
--- 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)