Exclude docs from base package.

Added Curt Olson to Thanks file.
Force use of plib joystick code.

diff --git a/Makefile.am b/Makefile.am
index 81164feb9b5e6a47c2ef54af6077773289cc013c..6747942934eb1130eeb0aa46f176a552e32e7cb7 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -24,7 +24,7 @@ fgfs-base: fgfs-base-tar fgfs-base-zip
 fgfs-base-tar:
        (cd $(HOME); \
        tar czvf fgfs-base-$(VERSION).tar.gz \
-       FlightGear/[A-R]* \
+       FlightGear/[A-CE-R]* \
        FlightGear/Scenery/w120n30/w111n33 \
        FlightGear/Sounds \
        FlightGear/Textures FlightGear/Thanks \
@@ -33,7 +33,7 @@ fgfs-base-tar:
 fgfs-base-zip:
        (cd $(HOME); \
        zip -r fgfs-base-$(VERSION).zip \
-       FlightGear/[A-R]* \
+       FlightGear/[A-CE-R]* \
        FlightGear/Scenery/w120n30/w111n33 \
        FlightGear/Sounds \
        FlightGear/Textures FlightGear/Thanks \
@@ -62,7 +62,7 @@ fgfs-win32-bin:
        (cd $(HOME); \
        zip -r fgfs-win32-bin-$(VERSION).zip FlightGear/bin )
 
-# make the win32-libs distribution
+# make the win32-libs distribution (depricated)
 win32-libs:
        ( zip -r ../win32-libs-$(VERSION).zip Win32/Makefile \
        Win32/README.glut Win32/cygwinb1.dll Win32/def \

diff --git a/Thanks b/Thanks
index 9f4e181b47fbba0ec4f4651211552e3b172ea30d..5fa877dac1a798ebc982bcf458b8faa27d87eaed 100644 (file)
--- a/Thanks
+++ b/Thanks
@@ -160,6 +160,11 @@ Alan Murta <amurta@cs.man.ac.uk>
   Created the Generic Polygon Clipping library
 
 
+Curt Olson <curt@flightgear.org>
+  Curt is the one that "herds that cats".  Lately Curt has been concetrating
+  on building better scenery.
+
+
 Robin Peel <robinp@mindspring.com>
   Maintains the ever growing worldwide airport and runway database for
   the Flight Gear project as well as for X-Plane.

diff --git a/configure.in b/configure.in
index 9e8f8cadae376c49d0a34b934ef6cf663d6dba5d..458a7f46ff6ffa3e7996ee2400e56b337c6cfdcb 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -92,6 +92,10 @@ if test "x$ac_cv_header_plib_pu_h" != "xyes"; then
     echo
     echo "configure aborted."
     exit
+    AM_CONDITIONAL(ENABLE_PLIB_JOYSTICK, false )
+else
+    dnl Use plib joystick lib
+    AM_CONDITIONAL(ENABLE_PLIB_JOYSTICK, true )
 fi
 
 dnl Using AM_CONDITIONAL is a step out of the protected little 
@@ -120,9 +124,6 @@ AM_CONDITIONAL(ENABLE_IRIX_AUDIO, test -r /usr/include/audio.h)
 
 AM_CONDITIONAL(ENABLE_WIN32_AUDIO, test "x$ac_cv_header_windows_h" = "xyes")
 
-dnl Check for (currently Linux only style) joystick support
-AM_CONDITIONAL(ENABLE_LINUX_JOYSTICK, test -r /usr/include/linux/joystick.h )
-
 dnl Enable serial support on Unix type systems
 AM_CONDITIONAL(ENABLE_UNIX_SERIAL, true)