A few remaining reorg changes.

diff --git a/Makefile.am b/Makefile.am
index 0f96d8469bc1dfeed1b6934066f759340a146bdb..9a5e299cd21f58f3bb6c498f4cece4ea597efea4 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -51,15 +51,15 @@ jsbsim-data:
 fgfs-docs: fgfs-docs-tar fgfs-manual-zip
 
 fgfs-docs-tar:
-       ( cd .. ; \
+       ( cd ../.. ; \
        tar czvf fgfs-docs-$(VERSION).tar.gz FlightGear/docs )
 
 # fgfs-docs-zip:
-#      ( cd .. ; \
+#      ( cd ../.. ; \
 #      zip -r fgfs-docs-$(VERSION).zip FlightGear/docs )
 
 fgfs-manual-zip:
-       ( cd .. ; \
+       ( cd ../.. ; \
        zip -r fgfs-manual-$(VERSION).zip FlightGear/docs/InstallGuide )
 
 # make the win32-bin distribution

diff --git a/NEWS b/NEWS
index 642f609417ccd2595523d9c1f31a2044531f5ea4..883060cc25a0d4d43d73a50ffdaa34879fba3cbc 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,35 @@
+New in 0.7.2
+* Lots of code reorganizations
+* Build requires plib-1.1.x
+* Build requires SimGear-0.0.x
+* LaRCsim/c172 is now the default aircraft model.
+* Added flaps support to control model.
+* Lots of updates and tweaks for the LaRCsim/c172 model.
+* Use a more standard texture/blend mode combination for sun/moon halos to
+  avoid render path that's not supported by all cards/drivers.
+* Change reported speed on hud from V_equiv_kts to V_calibrated_kts
+* Instrument panel rewrite by David Megginson.  This isn't quite as flashy
+  as the first pass, but is much more functional, plays much better with 
+  opengl, and it should be relatively easy for someone with graphical skills
+  to make it look more spiffy.
+* MacOS fixes contributed by Darrell Walisser.
+* Many JSBsim updates.
+* Added a screen snapshot facility (F3).
+* Added a load/save state function contributed by David Megginson.
+* Added support for various I/O protocols and channels so that flightgear
+  can communicate with itself and other programs through a variety of means.
+* Bug fix:  The aircraft model used for external views was being included in 
+  the height above terrain check so when the view position and the aircraft
+  model collided the current altitude kept getting pushed up to compensate,
+  but of course the aircraft model would get pushed up as well because it
+  tracks the current aircraft position and orientation.  Thus you had a never
+  ending cycle ...
+* Oliver's multiplayer network code now moved to his own subdirectory:
+  NetworkOLK
+* Added simulated cloud puffs as we pass through the cloud layer.
+* Cleaned up some memory leaks occuring between ssg and flightgear.
+* Update to Christian's weather data base code.
+
 New in 0.7.1
 * Durk Talsma added a nifty cloud layer.
 * Default to Christian Mayer's new weather system.

diff --git a/acconfig.h b/acconfig.h
index 4e22afc2d78e52f1dc4807421556d768272630aa..a5fe5539a070fe876e4e223a43c03a7d82bb6920 100644 (file)
--- a/acconfig.h
+++ b/acconfig.h
@@ -181,6 +181,9 @@
 /* Define if you have the wait3 system call.  */
 #undef HAVE_WAIT3
 
+/* 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/aclocal.m4 b/aclocal.m4
index df0bfb9e8f29b50a464c5d59d88df5ad05cb821c..78a4037e5c412f8cbb48479f9e8cf5998f0aad3e 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,7 +1,7 @@
-dnl aclocal.m4 generated automatically by aclocal 1.3
+dnl aclocal.m4 generated automatically by aclocal 1.4
 
-dnl Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
-dnl This Makefile.in is free software; the Free Software Foundation
+dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 
@@ -20,7 +20,7 @@ dnl Usage:
 dnl AM_INIT_AUTOMAKE(package,version, [no-define])
 
 AC_DEFUN(AM_INIT_AUTOMAKE,
-[AC_REQUIRE([AM_PROG_INSTALL])
+[AC_REQUIRE([AC_PROG_INSTALL])
 PACKAGE=[$1]
 AC_SUBST(PACKAGE)
 VERSION=[$2]
@@ -30,8 +30,8 @@ if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
   AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
 fi
 ifelse([$3],,
-AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE")
-AC_DEFINE_UNQUOTED(VERSION, "$VERSION"))
+AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
+AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package]))
 AC_REQUIRE([AM_SANITY_CHECK])
 AC_REQUIRE([AC_ARG_PROGRAM])
 dnl FIXME This is truly gross.
@@ -43,15 +43,6 @@ AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
 AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
 AC_REQUIRE([AC_PROG_MAKE_SET])])
 
-
-# serial 1
-
-AC_DEFUN(AM_PROG_INSTALL,
-[AC_REQUIRE([AC_PROG_INSTALL])
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
-AC_SUBST(INSTALL_SCRIPT)dnl
-])
-
 #
 # Check to make sure that the build environment is sane.
 #

diff --git a/src/WeatherCM/Makefile.am b/src/WeatherCM/Makefile.am
index 1f2162cb749e97048fe3f69b056ae367a15f3493..b5a0b5048a05dbb39561db5ef7964332b03259c9 100644 (file)
--- a/src/WeatherCM/Makefile.am
+++ b/src/WeatherCM/Makefile.am
@@ -1,5 +1,7 @@
 noinst_LIBRARIES = libWeatherCM.a
 
+EXTRA_DIST = linintp2.h linintp2.inl sphrintp.h sphrintp.inl
+
 libWeatherCM_a_SOURCES = \
        FGAirPressureItem.cpp FGAirPressureItem.h \
        FGCloud.h FGCloudItem.cpp FGCloudItem.h \