Tidy up the autoconf/automake configuration a bit.

- Removed some old cruft.

- Removed some support for older versions of automake which technically was
  correct, but caused the newer automakes to squawk warnings during an
  initial sanity check (which isn't done very intelligently.)

  NOTE: this fix is technically not correct for older version of automake.
  These older version use the variable "INCLUDES" internally and could have
  them already set to an important value.  That is why we were appending
  our values to them.  However, newer versions of automake don't set this
  value themselves so it is an error to append to a non-existant variable.
  We seem to "get away" with overwriting the value on older versions of
  automake, but if you have problems, consider upgrading to at least
  automake-1.5.

diff --git a/configure.in b/configure.in
index 9cc86b96ca49e232293bbf290757c2cb5debf830..cf7769c8282cbf9e9df80a9994d5b41f064b3a64 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -128,9 +128,6 @@ dnl enough.  AM_CONDITIONALS are then referenced to conditionally
 dnl build a Makefile.in from a Makefile.am which lets us define custom
 dnl includes, compile alternative source files, etc.
 
-dnl Enable serial support on Unix type systems
-AM_CONDITIONAL(ENABLE_UNIX_SERIAL, true)
-
 dnl X11 might be installed on Mac OS X, don't want to use it if it is.
 if test "x$HOSTTYPE" != "xmacintosh" ; then
     dnl Check for X11 (fancy)
@@ -254,7 +251,9 @@ fi
 if test "x$ac_cv_lib_glut_glutGameModeString" = "xno"; then
     echo
     echo "Your version of glut doesn't support game mode."
-    echo "You need to fetch and install the latest version of glut from:"
+    echo "You need to install the latest version of glut.  If your"
+    echo "distribution doesn't provide a newer version, you can get the source"
+    echo "code from:"
     echo
     echo "    http://reality.sgi.com/opengl/glut3/glut3.html"
     exit 1

diff --git a/simgear/Makefile.am b/simgear/Makefile.am
index b8c05870601da0372a8f90adf7e3ff566de06236..61bb70b08efb76e974bbf023d75ecd8bbfc21f46 100644 (file)
--- a/simgear/Makefile.am
+++ b/simgear/Makefile.am
@@ -1,9 +1,3 @@
-if ENABLE_UNIX_SERIAL
-SERIAL_DIRS = serial
-else
-SERIAL_DIRS =
-endif
-
 if HAVE_THREADS
 SGTHREAD_DIR = threads
 else
@@ -30,7 +24,7 @@ SUBDIRS = \
        $(METAR_DIRS) \
        route \
        screen \
-       $(SERIAL_DIRS) \
+       serial \
        sky \
        $(SGTHREAD_DIR) \
        timing \

diff --git a/simgear/bucket/Makefile.am b/simgear/bucket/Makefile.am
index b021a225f0a3a23556ecf8cb9ddf1ecc205faa83..6ae60ce3d241b3926a57b4cb0b27ede275c515e1 100644 (file)
--- a/simgear/bucket/Makefile.am
+++ b/simgear/bucket/Makefile.am
@@ -14,8 +14,4 @@ libsgbucket_a_SOURCES = newbucket.cxx
 #      $(top_builddir)/bucket/libsgbucket.a \
 #      $(top_builddir)/misc/libsgmisc.a
 
-if OLD_AUTOMAKE
-INCLUDES += -I$(top_srcdir)
-else
 INCLUDES = -I$(top_srcdir)
-endif

diff --git a/simgear/debug/Makefile.am b/simgear/debug/Makefile.am
index 4f7ef2ae24b4f82d40d2bcf96a6451cd0ce7fad1..cdfba79368a6d0dff045fbc977b3a2c4bda2b2c0 100644 (file)
--- a/simgear/debug/Makefile.am
+++ b/simgear/debug/Makefile.am
@@ -8,8 +8,4 @@ include_HEADERS = debug_types.h logstream.hxx
 
 libsgdebug_a_SOURCES = logstream.cxx
 
-if OLD_AUTOMAKE
-INCLUDES += -I$(top_srcdir)
-else
 INCLUDES = -I$(top_srcdir)
-endif

diff --git a/simgear/ephemeris/Makefile.am b/simgear/ephemeris/Makefile.am
index 7e544487e8cd991602bb2d07f05666d4bdcabab8..ce26c870a7a1021df89a49fb91e84af8c9a43631 100644 (file)
--- a/simgear/ephemeris/Makefile.am
+++ b/simgear/ephemeris/Makefile.am
@@ -31,8 +31,4 @@ libsgephem_a_SOURCES = \
        uranus.cxx \
        venus.cxx
 
-if OLD_AUTOMAKE
-INCLUDES += -I$(top_srcdir)
-else
 INCLUDES = -I$(top_srcdir)
-endif

diff --git a/simgear/interpreter/Makefile.am b/simgear/interpreter/Makefile.am
index 153f6fc67da52e6c17ff202aace83bd9b7d353c8..88bebf39f1343fc8d417c62c781853f5590c92dc 100644 (file)
--- a/simgear/interpreter/Makefile.am
+++ b/simgear/interpreter/Makefile.am
@@ -30,8 +30,4 @@ libsginterp_a_SOURCES = \
        ixlib_js_internals.hh \
        ixlib_random.hh
 
-if OLD_AUTOMAKE
-INCLUDES += -I$(top_srcdir)
-else
 INCLUDES = -I$(top_srcdir)
-endif

diff --git a/simgear/io/Makefile.am b/simgear/io/Makefile.am
index 92e1f1b628eda92bf9c46ed860d1277be8f7cbc1..c78df9565d495ee28f38a24d214b7333096beed4 100644 (file)
--- a/simgear/io/Makefile.am
+++ b/simgear/io/Makefile.am
@@ -20,11 +20,7 @@ libsgio_a_SOURCES = \
        sg_socket.cxx \
        sg_socket_udp.cxx 
 
-if OLD_AUTOMAKE
-INCLUDES += -I$(top_srcdir)
-else
 INCLUDES = -I$(top_srcdir)
-endif
 
 if IS_MINGW
 NETWORK_LIB = -lwsock32

diff --git a/simgear/magvar/Makefile.am b/simgear/magvar/Makefile.am
index a74711dd7ebd6592aeb8ba084a269c9a8b92c800..e0c9c66491e8b5b86a5c421f72ec5ec064cce65f 100644 (file)
--- a/simgear/magvar/Makefile.am
+++ b/simgear/magvar/Makefile.am
@@ -14,8 +14,4 @@ testmagvar_SOURCES = testmagvar.cxx
 
 testmagvar_LDADD = $(top_builddir)/simgear/magvar/libsgmagvar.a
 
-if OLD_AUTOMAKE
-INCLUDES += -I$(top_srcdir)
-else
 INCLUDES = -I$(top_srcdir)
-endif

diff --git a/simgear/math/Makefile.am b/simgear/math/Makefile.am
index cb939c9f630c3f3d44b9b5560e3b185e3b3d6a1c..c319213c0da6fdbac49128f3251f74d24745a5b3 100644 (file)
--- a/simgear/math/Makefile.am
+++ b/simgear/math/Makefile.am
@@ -24,8 +24,4 @@ libsgmath_a_SOURCES = \
        sg_random.c \
        vector.cxx
 
-if OLD_AUTOMAKE
-INCLUDES += -I$(top_srcdir)
-else
 INCLUDES = -I$(top_srcdir)
-endif

diff --git a/simgear/metar/Makefile.am b/simgear/metar/Makefile.am
index be44d958a5be59a0a7f2389d60f189c8a2b48ded..6033658cbd995531132f9fcac791ee12a0631665 100644 (file)
--- a/simgear/metar/Makefile.am
+++ b/simgear/metar/Makefile.am
@@ -11,8 +11,4 @@ libsgmetar_a_SOURCES = \
        MetarStation.cpp \
        Prtdmetr.cpp Stspack2.cpp Stspack3.cpp
 
-if OLD_AUTOMAKE
-INCLUDES += -I$(top_srcdir)
-else
 INCLUDES = -I$(top_srcdir)
-endif

diff --git a/simgear/misc/Makefile.am b/simgear/misc/Makefile.am
index 865678b38eb05d9dbbb57bfbe976ed0670934dda..b3808f2152cc90081080ee5707c29a6e9d786d64 100644 (file)
--- a/simgear/misc/Makefile.am
+++ b/simgear/misc/Makefile.am
@@ -30,8 +30,4 @@ noinst_PROGRAMS = props_test
 props_test_SOURCES = props_test.cxx
 props_test_LDADD = libsgmisc.a ../xml/libsgxml.a ../debug/libsgdebug.a
 
-if OLD_AUTOMAKE
-INCLUDES += -I$(top_srcdir)
-else
 INCLUDES = -I$(top_srcdir)
-endif

diff --git a/simgear/route/Makefile.am b/simgear/route/Makefile.am
index c1492f4b71aa2bfac71833b615a8754e0d14d834..8035f101437c4d7bde0caceb38d1dbdafdc9f0e4 100644 (file)
--- a/simgear/route/Makefile.am
+++ b/simgear/route/Makefile.am
@@ -8,11 +8,7 @@ libsgroute_a_SOURCES = \
        route.cxx \
        waypoint.cxx
 
-if OLD_AUTOMAKE
-INCLUDES += -I$(top_srcdir)
-else
 INCLUDES = -I$(top_srcdir)
-endif
 
 noinst_PROGRAMS = waytest routetest
 

diff --git a/simgear/screen/Makefile.am b/simgear/screen/Makefile.am
index d0a030bd178eed307d7510f17760ab5a80524544..4140b0f1907a6e031f17f8a801b702121a4f144a 100644 (file)
--- a/simgear/screen/Makefile.am
+++ b/simgear/screen/Makefile.am
@@ -19,8 +19,4 @@ libsgscreen_a_SOURCES = \
         tr.cxx \
        win32-printer.h
 
-if OLD_AUTOMAKE
-INCLUDES += -I$(top_srcdir)
-else
 INCLUDES = -I$(top_srcdir)
-endif

diff --git a/simgear/serial/Makefile.am b/simgear/serial/Makefile.am
index 7536cce8b65834ad9412eee43cb5e2407f7553f8..f39951cea028853944f1df704e7e2c37fcbe8e75 100644 (file)
--- a/simgear/serial/Makefile.am
+++ b/simgear/serial/Makefile.am
@@ -14,8 +14,4 @@ testserial_LDADD = \
        $(top_builddir)/simgear/serial/libsgserial.a \
        $(top_builddir)/simgear/debug/libsgdebug.a
 
-if OLD_AUTOMAKE
-INCLUDES += -I$(top_srcdir)
-else
 INCLUDES = -I$(top_srcdir)
-endif

diff --git a/simgear/sky/Makefile.am b/simgear/sky/Makefile.am
index 3d5adc7a32ec9707a9b130b23344e51f5ec236ce..366958977c7b97677605cced12b1893898db4e53 100644 (file)
--- a/simgear/sky/Makefile.am
+++ b/simgear/sky/Makefile.am
@@ -20,8 +20,4 @@ libsgsky_a_SOURCES = \
        sphere.cxx \
        stars.cxx
 
-if OLD_AUTOMAKE
-INCLUDES += -I$(top_srcdir)
-else
 INCLUDES = -I$(top_srcdir)
-endif

diff --git a/simgear/threads/Makefile.am b/simgear/threads/Makefile.am
index a8e76a1de03a4745e7a3419dded98e05c592ce7f..1672b28797321c6ad7ee393b2677d2175bdfe1ea 100644 (file)
--- a/simgear/threads/Makefile.am
+++ b/simgear/threads/Makefile.am
@@ -10,8 +10,4 @@ include_HEADERS = \
 libsgthreads_a_SOURCES = \
        SGThread.cxx
 
-if OLD_AUTOMAKE
-INCLUDES += -I$(top_srcdir)
-else
 INCLUDES = -I$(top_srcdir)
-endif

diff --git a/simgear/timing/Makefile.am b/simgear/timing/Makefile.am
index 73bd1dc2f41e12b5aa4bb4a79114d21f715d185d..234bea5a798a2d6d3c476ad3d4523a03ce933d23 100644 (file)
--- a/simgear/timing/Makefile.am
+++ b/simgear/timing/Makefile.am
@@ -16,8 +16,4 @@ libsgtiming_a_SOURCES = \
        timestamp.cxx \
        timezone.cxx
 
-if OLD_AUTOMAKE
-INCLUDES += -I$(top_srcdir)
-else
 INCLUDES = -I$(top_srcdir)
-endif

diff --git a/simgear/xgl/Makefile.am b/simgear/xgl/Makefile.am
index 3ade8f2dab6ba02051b2cd34578c9f92edc87214..9729a1c33d50f222c2ed208db81159e5d93240e4 100644 (file)
--- a/simgear/xgl/Makefile.am
+++ b/simgear/xgl/Makefile.am
@@ -6,8 +6,4 @@ include_HEADERS = xgl.h
 
 libsgxgl_a_SOURCES = xgl.c xglUtils.c
 
-if OLD_AUTOMAKE
-INCLUDES += -I$(top_srcdir)
-else
 INCLUDES = -I$(top_srcdir)
-endif

diff --git a/simgear/xml/Makefile.am b/simgear/xml/Makefile.am
index 33c96bc210aa1056f2ef5b2ce81c13b50649de44..cf449e5f4bd9d1868a71ca948202d560fb4eda2d 100644 (file)
--- a/simgear/xml/Makefile.am
+++ b/simgear/xml/Makefile.am
@@ -18,8 +18,4 @@ libsgxml_a_SOURCES = \
        xmltok.h xmltok.c \
        xmltok_impl.h
 
-if OLD_AUTOMAKE
-INCLUDES += -I$(top_srcdir)
-else
 INCLUDES = -I$(top_srcdir)
-endif