From a885314a39890b898ab078b365beaa7e24f4b501 Mon Sep 17 00:00:00 2001 From: curt Date: Sun, 25 Aug 2002 17:31:47 +0000 Subject: [PATCH] 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. --- configure.in | 7 +++---- simgear/Makefile.am | 8 +------- simgear/bucket/Makefile.am | 4 ---- simgear/debug/Makefile.am | 4 ---- simgear/ephemeris/Makefile.am | 4 ---- simgear/interpreter/Makefile.am | 4 ---- simgear/io/Makefile.am | 4 ---- simgear/magvar/Makefile.am | 4 ---- simgear/math/Makefile.am | 4 ---- simgear/metar/Makefile.am | 4 ---- simgear/misc/Makefile.am | 4 ---- simgear/route/Makefile.am | 4 ---- simgear/screen/Makefile.am | 4 ---- simgear/serial/Makefile.am | 4 ---- simgear/sky/Makefile.am | 4 ---- simgear/threads/Makefile.am | 4 ---- simgear/timing/Makefile.am | 4 ---- simgear/xgl/Makefile.am | 4 ---- simgear/xml/Makefile.am | 4 ---- 19 files changed, 4 insertions(+), 79 deletions(-) diff --git a/configure.in b/configure.in index 9cc86b96..cf7769c8 100644 --- 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 b8c05870..61bb70b0 100644 --- 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 b021a225..6ae60ce3 100644 --- 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 4f7ef2ae..cdfba793 100644 --- 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 7e544487..ce26c870 100644 --- 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 153f6fc6..88bebf39 100644 --- 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 92e1f1b6..c78df956 100644 --- 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 a74711dd..e0c9c664 100644 --- 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 cb939c9f..c319213c 100644 --- 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 be44d958..6033658c 100644 --- 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 865678b3..b3808f21 100644 --- 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 c1492f4b..8035f101 100644 --- 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 d0a030bd..4140b0f1 100644 --- 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 7536cce8..f39951ce 100644 --- 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 3d5adc7a..36695897 100644 --- 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 a8e76a1d..1672b287 100644 --- 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 73bd1dc2..234bea5a 100644 --- 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 3ade8f2d..9729a1c3 100644 --- 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 33c96bc2..cf449e5f 100644 --- 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