Integrated Steve's new "plib" conglomeration.

diff --git a/Makefile.am b/Makefile.am
index 5057f0371b9af2c9e7edd23bd94de6b2d46c7f53..c78d544c58ca1325ce34542e40002edb243697cd 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -25,7 +25,7 @@ fgfs-base-tar:
        (cd $(HOME); \
        tar czvf fgfs-base-$(VERSION).tar.gz \
        FlightGear/[A-R]* \
-       FlightGear/Scenery/w120n030/w111n033 \
+       FlightGear/Scenery/w120n30/w111n33 \
        FlightGear/Sounds \
        FlightGear/Textures FlightGear/Thanks \
        FlightGear/[m-r]* )
@@ -34,7 +34,7 @@ fgfs-base-zip:
        (cd $(HOME); \
        zip -r fgfs-base-$(VERSION).zip \
        FlightGear/[A-R]* \
-       FlightGear/Scenery/w120n030/w111n033 \
+       FlightGear/Scenery/w120n30/w111n33 \
        FlightGear/Sounds \
        FlightGear/Textures FlightGear/Thanks \
        FlightGear/[m-r]* )

diff --git a/configure.in b/configure.in
index a3782b43dd8928125937be5c7c0c230da8eef287..4baade276b474bdd2ef546dd167445b0ff022741 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -8,6 +8,10 @@ AC_INIT(Simulator/Aircraft/aircraft.cxx)
 dnl Initialize the automake stuff
 AM_INIT_AUTOMAKE(FlightGear, 0.6.0)
 
+dnl configure other independant packages included with flight gear for
+dnl convenience
+AC_CONFIG_SUBDIRS( Lib/plib )
+
 dnl Checks for programs.
 AC_PROG_MAKE_SET
 AC_PROG_CC
@@ -298,14 +302,10 @@ AC_OUTPUT( \
        Makefile \
        Include/Makefile \
        Lib/Makefile \
-       Lib/Audio/Makefile \
-       Lib/Audio/src/Makefile \
-       Lib/Audio/example/Makefile \
        Lib/Bucket/Makefile \
        Lib/Debug/Makefile \
        Lib/Math/Makefile \
        Lib/Misc/Makefile \
-       Lib/PUI/Makefile \
        Lib/Serial/Makefile \
        Lib/XGL/Makefile \
        Lib/zlib/Makefile \