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/acconfig.h b/acconfig.h
index 5bdfd0d11a31d4b570bbd0d5f16d71978f61bb36..74d70ca8860b51d8ed7ff6fea5ce7f3893ac8ac3 100644 (file)
--- a/acconfig.h
+++ b/acconfig.h
@@ -187,12 +187,6 @@
 /* Define if you have the wait3 system call.  */
 #undef HAVE_WAIT3
 
-/* Define if you have MetaKit installed system wide.  */
-#undef HAVE_MK4
-
-/* Define if you have zlib installed system wide.  */
-#undef HAVE_ZLIB
-
 /* Define as __inline if that's what the C compiler calls it.  */
 #undef inline
 

diff --git a/src/ATC/Makefile.am b/src/ATC/Makefile.am
index d72f2bbc8f1b0a7a2c8bf23cad306513d591a5c0..2128a6f89c9ed09daf419a03f085403e8cb5fb5f 100644 (file)
--- a/src/ATC/Makefile.am
+++ b/src/ATC/Makefile.am
@@ -12,8 +12,4 @@ libATC_a_SOURCES = \
        AIEntity.hxx AIEntity.cxx \
        AILocalTraffic.hxx AILocalTraffic.cxx
 
-if OLD_AUTOMAKE
-INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src
-else
 INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src
-endif

diff --git a/src/Aircraft/Makefile.am b/src/Aircraft/Makefile.am
index bf84247b6f04a511765a8a600172e97c70cd59da..a26f5b7ee411c5fa898614931a979d501955806a 100644 (file)
--- a/src/Aircraft/Makefile.am
+++ b/src/Aircraft/Makefile.am
@@ -2,8 +2,4 @@ noinst_LIBRARIES = libAircraft.a
 
 libAircraft_a_SOURCES = aircraft.cxx aircraft.hxx
 
-if OLD_AUTOMAKE
-INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src
-else
 INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src
-endif

diff --git a/src/Airports/Makefile.am b/src/Airports/Makefile.am
index 33effd4cfaa4cb5a41113603c4a2538c0aa713b8..2ac70f3b8a1d709944b68bffe4ff9a09fc18f53f 100644 (file)
--- a/src/Airports/Makefile.am
+++ b/src/Airports/Makefile.am
@@ -12,8 +12,4 @@ gensimple_LDADD = libAirports.a -lsgdebug -lsgmisc -lsgxml -lmk4 -lz
 genrunways_SOURCES = genrunways.cxx
 genrunways_LDADD = libAirports.a -lsgdebug -lsgmisc -lsgxml -lmk4 -lz
 
-if OLD_AUTOMAKE
-INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src
-else
 INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src
-endif

diff --git a/src/Autopilot/Makefile.am b/src/Autopilot/Makefile.am
index 6ed225010a362cee884607b8e6e1e53610ff5a76..01ee5cedb7daa521e5e430c3b8b80a20b3c028fd 100644 (file)
--- a/src/Autopilot/Makefile.am
+++ b/src/Autopilot/Makefile.am
@@ -4,8 +4,4 @@ libAutopilot_a_SOURCES = \
        auto_gui.cxx auto_gui.hxx \
        newauto.cxx newauto.hxx
 
-if OLD_AUTOMAKE
-INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src
-else
 INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src
-endif

diff --git a/src/Cockpit/Makefile.am b/src/Cockpit/Makefile.am
index 707ab999bc8d771ca3d55deaf72bfb1ece244b86..5796d2b980c491dfa52032eca981099ea8ad60ed 100644 (file)
--- a/src/Cockpit/Makefile.am
+++ b/src/Cockpit/Makefile.am
@@ -14,10 +14,6 @@ libCockpit_a_SOURCES = \
        radiostack.cxx radiostack.hxx \
        steam.cxx steam.hxx
 
-if OLD_AUTOMAKE
-INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src
-else
 INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src
-endif
 
 SUBDIRS = built_in

diff --git a/src/Cockpit/built_in/Makefile.am b/src/Cockpit/built_in/Makefile.am
index ffade8c183238b887f9c93ff262863d0ba9b4d4c..1a596bcdef955701019fc0e9640f60fcdcbf5564 100644 (file)
--- a/src/Cockpit/built_in/Makefile.am
+++ b/src/Cockpit/built_in/Makefile.am
@@ -3,9 +3,5 @@ noinst_LIBRARIES = libBuilt_in.a
 libBuilt_in_a_SOURCES = \
        FGMagRibbon.cxx FGMagRibbon.hxx 
 
-if OLD_AUTOMAKE
-INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src
-else
 INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src
-endif
 

diff --git a/src/Controls/Makefile.am b/src/Controls/Makefile.am
index 4d19a13cba72bc5b06ad3fb85489fccd35d6d18c..02729a4faf24f87dcceec357e029489c74aa94c5 100644 (file)
--- a/src/Controls/Makefile.am
+++ b/src/Controls/Makefile.am
@@ -2,8 +2,4 @@ noinst_LIBRARIES = libControls.a
 
 libControls_a_SOURCES = controls.cxx controls.hxx
 
-if OLD_AUTOMAKE
-INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src
-else
 INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src
-endif

diff --git a/src/Environment/Makefile.am b/src/Environment/Makefile.am
index decc9a3d61a6f7963bf9174c8e3b0ac540d6c4cf..9efb9d7bdc9f60716cfce643c82c37f9749400e2 100644 (file)
--- a/src/Environment/Makefile.am
+++ b/src/Environment/Makefile.am
@@ -8,8 +8,4 @@ libEnvironment_a_SOURCES = environment.cxx environment.hxx \
                           environment_mgr.cxx environment_mgr.hxx \
                            environment_ctrl.cxx environment_ctrl.hxx
 
-if OLD_AUTOMAKE
-INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src
-else
 INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src
-endif

diff --git a/src/FDM/Balloon/Makefile.am b/src/FDM/Balloon/Makefile.am
index 7fb7d6ae82145115e9b121253cc05d6c9c5c6730..760ff18848d215af307f20dcb79830a3d3c7bece 100644 (file)
--- a/src/FDM/Balloon/Makefile.am
+++ b/src/FDM/Balloon/Makefile.am
@@ -2,8 +2,4 @@ noinst_LIBRARIES = libBalloon.a
 
 libBalloon_a_SOURCES = BalloonSim.cpp BalloonSim.h
 
-if OLD_AUTOMAKE
-INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src
-else
 INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src
-endif

diff --git a/src/FDM/JSBSim/Makefile.am b/src/FDM/JSBSim/Makefile.am
index 2dbc7dc09fdf8c8bea61ea6083a58a0b6bbb8d15..8fdddc1dccdc697ed4224a8e1952a89736e1fad4 100644 (file)
--- a/src/FDM/JSBSim/Makefile.am
+++ b/src/FDM/JSBSim/Makefile.am
@@ -55,10 +55,9 @@ libJSBSim_a_SOURCES = \
 # noinst_PROGRAMS = testJSBsim
 
 if OLD_AUTOMAKE
-INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src
 DEFS += -DFGFS
 else
-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src
 AM_CXXFLAGS = -DFGFS
 endif
 
+INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src

diff --git a/src/FDM/JSBSim/filtersjb/Makefile.am b/src/FDM/JSBSim/filtersjb/Makefile.am
index e8ca7090569bbcd81616e7b7f17e81cf105ef165..984c1df60f6be5d6dba55ea33e578341a4e743bc 100644 (file)
--- a/src/FDM/JSBSim/filtersjb/Makefile.am
+++ b/src/FDM/JSBSim/filtersjb/Makefile.am
@@ -13,10 +13,9 @@ libfiltersjb_a_SOURCES = \
        FGSwitch.cpp FGSwitch.h
 
 if OLD_AUTOMAKE
-INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src
 DEFS += -DFGFS
 else
-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src
 AM_CXXFLAGS = -DFGFS
 endif
 
+INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src

diff --git a/src/FDM/LaRCsim/Makefile.am b/src/FDM/LaRCsim/Makefile.am
index 44a1a4a103e122a9fca4c6e2c2c40b2078cf054d..a26c6445e6207ed4faf9473a5bcb8a4d7feb9279 100644 (file)
--- a/src/FDM/LaRCsim/Makefile.am
+++ b/src/FDM/LaRCsim/Makefile.am
@@ -32,8 +32,4 @@ libLaRCsim_a_SOURCES = \
        $(AIRCRAFT_MODEL) \
        ls_interface.c ls_interface.h
 
-if OLD_AUTOMAKE
-INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src
-else
 INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src
-endif

diff --git a/src/FDM/Makefile.am b/src/FDM/Makefile.am
index 53b862ad71dd48d148b0eb3d3fdf7c9a743e85e1..55f4b38ba166913a7136be9d0b751df8776ff2ef 100644 (file)
--- a/src/FDM/Makefile.am
+++ b/src/FDM/Makefile.am
@@ -15,8 +15,4 @@ libFlight_a_SOURCES = \
        UFO.cxx UFO.hxx \
        NullFDM.cxx NullFDM.hxx
 
-if OLD_AUTOMAKE
-INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src
-else
 INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src
-endif

diff --git a/src/FDM/UIUCModel/Makefile.am b/src/FDM/UIUCModel/Makefile.am
index a3b32b892833e0f8b04d4b7411b23a334cb90fe7..6f9b2a5ee6387853ab8200d61f2f12de10f7ac1d 100644 (file)
--- a/src/FDM/UIUCModel/Makefile.am
+++ b/src/FDM/UIUCModel/Makefile.am
@@ -52,8 +52,4 @@ libUIUCModel_a_SOURCES = \
                         uiuc_warnings_errors.cpp uiuc_warnings_errors.h \
                         uiuc_wrapper.cpp uiuc_wrapper.h
 
-if OLD_AUTOMAKE
-INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src
-else
 INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src
-endif

diff --git a/src/FDM/YASim/Makefile.am b/src/FDM/YASim/Makefile.am
index 3b3bd77fb4716a517d7a612a9897598ee667a22c..196acd359b454fcb9819994472e62230c2b705e8 100644 (file)
--- a/src/FDM/YASim/Makefile.am
+++ b/src/FDM/YASim/Makefile.am
@@ -23,8 +23,4 @@ libYASim_a_SOURCES = \
         Vector.hpp \
         Wing.cpp Wing.hpp
 
-if OLD_AUTOMAKE
-INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src
-else
 INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src
-endif

diff --git a/src/GUI/Makefile.am b/src/GUI/Makefile.am
index 7140523c8bdeadcc14390b13a0ec536cef37f5d4..ad177f0b296718165879342b157e6d6488450945 100644 (file)
--- a/src/GUI/Makefile.am
+++ b/src/GUI/Makefile.am
@@ -16,8 +16,4 @@ libGUI_a_SOURCES = \
        sgVec3Slider.cxx sgVec3Slider.hxx \
        trackball.c trackball.h
 
-if OLD_AUTOMAKE
-INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src
-else
 INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src
-endif

diff --git a/src/Input/Makefile.am b/src/Input/Makefile.am
index b9b50334ea23b1cf073fdebb8487d82c38cd0f20..579cfa5aa8bf8850d1b7c49d22008f1bc61abc5d 100644 (file)
--- a/src/Input/Makefile.am
+++ b/src/Input/Makefile.am
@@ -12,8 +12,4 @@ fgjs_SOURCES = fgjs.cxx jsinput.cxx jsinput.h jssuper.cxx jssuper.h
 
 fgjs_LDADD = $(audio_LIBS)
 
-if OLD_AUTOMAKE
-INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src
-else
 INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src
-endif

diff --git a/src/Main/Makefile.am b/src/Main/Makefile.am
index f21c5cc669b8dfb06822050c24bd9015feac0fc4..4473794da0e7467186d2cb3bfe6a7add2dc64a3e 100644 (file)
--- a/src/Main/Makefile.am
+++ b/src/Main/Makefile.am
@@ -1,9 +1,3 @@
-if ENABLE_UNIX_SERIAL
-SERIAL_LIBS = -lsgserial
-else
-SERIAL_LIBS =
-endif
-
 if ENABLE_WEATHERCM
 WEATHER_LIBS = $(top_builddir)/src/WeatherCM/libWeatherCM.a
 else
@@ -81,7 +75,7 @@ fgfs_LDADD = \
        $(top_builddir)/src/Input/libInput.a \
        -lsgroute -lsgsky -lsgephem -lsgtiming -lsgio -lsgscreen \
        -lsgmath -lsgbucket -lsgdebug -lsgmagvar -lsgmisc -lsgxml \
-       $(SERIAL_LIBS) \
+       -lsgserial \
        $(THREAD_LIBS) \
        -lplibpu -lplibfnt -lplibnet -lplibssg -lplibsg \
        -lmk4 -lz \
@@ -90,10 +84,4 @@ fgfs_LDADD = \
 
 fgfs_CFLAGS = -DTHIS_IS_A_TEST
 
-if OLD_AUTOMAKE
-INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src
-else
 INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src
-endif
-
-

diff --git a/src/Model/Makefile.am b/src/Model/Makefile.am
index 7ed105849690e9a244fd92c45d7ce435e0bc9386..38d08455346941e320d93b769129f88ae594b562 100644 (file)
--- a/src/Model/Makefile.am
+++ b/src/Model/Makefile.am
@@ -6,8 +6,4 @@ libModel_a_SOURCES = loader.cxx loader.hxx \
                      acmodel.cxx acmodel.hxx \
                      panelnode.cxx panelnode.hxx
 
-if OLD_AUTOMAKE
-INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src
-else
 INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src
-endif

diff --git a/src/Navaids/Makefile.am b/src/Navaids/Makefile.am
index 262a2be5a1e63ee0c152c31e61f1ed197e2b11a6..36efadf08c186994e06be93eb24469e849ed5f3f 100644 (file)
--- a/src/Navaids/Makefile.am
+++ b/src/Navaids/Makefile.am
@@ -14,8 +14,4 @@ testnavs_LDADD = \
        -lsgtiming -lsgmath -lsgmisc -lsgdebug -lsgmagvar -lsgxml \
        -lz
 
-if OLD_AUTOMAKE
-INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src
-else
 INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src
-endif

diff --git a/src/Network/Makefile.am b/src/Network/Makefile.am
index 7766c0977e1b7f4799f1d64d07ec7f34749504f2..87fda61fb0058f491dcb30314e94cddc841fec5f 100644 (file)
--- a/src/Network/Makefile.am
+++ b/src/Network/Makefile.am
@@ -26,8 +26,4 @@ libNetwork_a_SOURCES = \
        ray.cxx ray.hxx \
        rul.cxx rul.hxx
 
-if OLD_AUTOMAKE
-INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src
-else
 INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src
-endif

diff --git a/src/NetworkOLK/Makefile.am b/src/NetworkOLK/Makefile.am
index ad1f31be3ecbd4db7a4911afe4b92d5888dc1859..384d601da90f31ea47c7c2fa80e699ba2ded6575 100644 (file)
--- a/src/NetworkOLK/Makefile.am
+++ b/src/NetworkOLK/Makefile.am
@@ -3,8 +3,4 @@ noinst_LIBRARIES = libNetworkOLK.a
 libNetworkOLK_a_SOURCES = \
        net_send.cxx net_hud.cxx network.cxx network.h fgd.h
 
-if OLD_AUTOMAKE
-INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src
-else
 INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src
-endif

diff --git a/src/Objects/Makefile.am b/src/Objects/Makefile.am
index 692c345f23345ed3fbd73df963822e10a9b460d6..6561f7f0575a08af7ae3384ec7cdd218f9317e03 100644 (file)
--- a/src/Objects/Makefile.am
+++ b/src/Objects/Makefile.am
@@ -8,8 +8,4 @@ libObjects_a_SOURCES = \
        obj.cxx obj.hxx \
        texload.c texload.h colours.h
 
-if OLD_AUTOMAKE
-INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src
-else
 INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src
-endif

diff --git a/src/Scenery/Makefile.am b/src/Scenery/Makefile.am
index 4146df3a150aabe8d1282381a2631e9acd96e6cb..4caa7141f29d271748f64fca5043c1b383f24677 100644 (file)
--- a/src/Scenery/Makefile.am
+++ b/src/Scenery/Makefile.am
@@ -8,8 +8,4 @@ libScenery_a_SOURCES = \
        tileentry.cxx tileentry.hxx \
        tilemgr.cxx tilemgr.hxx
 
-if OLD_AUTOMAKE
-INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src
-else
 INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src
-endif

diff --git a/src/Sound/Makefile.am b/src/Sound/Makefile.am
index ef3619b84c446ff0017cd60aa08d9c23024d0660..3889f4215a8d6d6bfa9c8d76af7b6e885389f90d 100644 (file)
--- a/src/Sound/Makefile.am
+++ b/src/Sound/Makefile.am
@@ -7,8 +7,4 @@ libSound_a_SOURCES = \
        morse.cxx morse.hxx \
        soundmgr.cxx soundmgr.hxx
 
-if OLD_AUTOMAKE
-INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src
-else
 INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src
-endif

diff --git a/src/Time/Makefile.am b/src/Time/Makefile.am
index 55ae1362ad3c5ae8bd74f229534eb0a7d7e7484d..9a0be35ec8f5152dbe18d606558ca54e44645146 100644 (file)
--- a/src/Time/Makefile.am
+++ b/src/Time/Makefile.am
@@ -8,8 +8,4 @@ libTime_a_SOURCES = \
        sunpos.cxx sunpos.hxx \
        tmp.cxx tmp.hxx
 
-if OLD_AUTOMAKE
-INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src
-else
 INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src
-endif

diff --git a/src/WeatherCM/Makefile.am b/src/WeatherCM/Makefile.am
index 7833f6a68276abe952b112e1f96fbc7e2b153fcc..a88b0c273ea7af2ff24497e0fa82e2a25fbc8fe9 100644 (file)
--- a/src/WeatherCM/Makefile.am
+++ b/src/WeatherCM/Makefile.am
@@ -19,8 +19,4 @@ libWeatherCM_a_SOURCES = \
         linintp2.cpp linintp2.h \
         sphrintp.cpp sphrintp.h
 
-if OLD_AUTOMAKE
-INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src
-else
 INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src
-endif