Various fixes and tweaks.

2003-01-07 19:48:32 +00:00 · 2003-01-07 19:48:32 +00:00 · 27a068f721
commit 27a068f721
parent bb4c4f6b13
5 changed files with 9 additions and 3 deletions
--- a/configure.ac
+++ b/configure.ac
@ -335,7 +335,6 @@ AC_CONFIG_FILES([ \
 	src/Utils/Makefile \
 	src/Utils/cdrom/Makefile \
 	src/Utils/download-map/Makefile \
-	src/Utils/TerraSync/Makefile \
 ])
 AC_OUTPUT

--- a/src/Airports/GenAirports/build.cxx
+++ b/src/Airports/GenAirports/build.cxx
@ -72,6 +72,7 @@
 #include "texparams.hxx"

 SG_USING_STD(map);
+SG_USING_STD(less);
 SG_USING_STD(string);


--- a/src/BuildTiles/Main/main.cxx
+++ b/src/BuildTiles/Main/main.cxx
@ -21,6 +21,10 @@
 // $Id$


+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
 #ifdef _MSC_VER
 #  include <io.h>
 #else
--- a/src/BuildTiles/Parallel/server.cxx
+++ b/src/BuildTiles/Parallel/server.cxx
@ -32,6 +32,9 @@ SG_USING_STD( endl );

 #define MAXBUF 1024

+#if defined (__APPLE__)
+typedef int socklen_t;
+#endif

 static double start_lon, start_lat;
 static double lat = 0.0;
--- a/src/Utils/Makefile.am
+++ b/src/Utils/Makefile.am
@ -2,5 +2,4 @@ EXTRA_DIST = mirror-dem

 SUBDIRS = \
        cdrom \
-        download-map \
-	TerraSync
+        download-map