From ae22321d9c532221164462d2bea2f73affceec8d Mon Sep 17 00:00:00 2001
From: James Turner <jmt@Dulux.local>
Date: Mon, 14 Jun 2010 12:38:41 +0100
Subject: [PATCH] Automake changes to Hudson 'make check' runs. Includes moving
 the OpenAL test programs to 'noinst' so they don't run as part of make check

---
 configure.ac                   | 2 +-
 simgear/Makefile.am            | 4 ++--
 simgear/scene/bvh/Makefile.am  | 6 +++++-
 simgear/sound/Makefile.am      | 2 +-
 simgear/sound/openal_test1.cxx | 2 +-
 5 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/configure.ac b/configure.ac
index f415fcaa..41a7ada0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -489,7 +489,7 @@ case "${host}" in
 #       AC_CHECK_FRAMEWORK(osgDB, [#include <osgDB/Version>], $with_osg_framework)
 #       AC_CHECK_FRAMEWORK(osgSim, [#include <osgSim/Version>], $with_osg_framework)
 #       AC_CHECK_FRAMEWORK(osgParticle, [#include <osgParticle/Version>], $with_osg_framework)
-#       AC_CHECK_FRAMEWORK(osg, [#include <osg/Version>], $with_osg_framework)
+        AC_CHECK_FRAMEWORK(osg, [#include <osg/Version>], $with_osg_framework)
 #       osg_FRAMEWORKS="$FRAMEWORKS"
 #       FRAMEWORKS=""
 #       AC_SUBST(osg_FRAMEWORKS)
diff --git a/simgear/Makefile.am b/simgear/Makefile.am
index de98c035..1f67b560 100644
--- a/simgear/Makefile.am
+++ b/simgear/Makefile.am
@@ -24,8 +24,8 @@ SUBDIRS = \
 	scene \
 	screen \
 	serial \
-	sound \
 	threads \
-	timing
+	timing \
+	sound 
 
 DIST_SUBDIRS = $(SUBDIRS) compatibility
diff --git a/simgear/scene/bvh/Makefile.am b/simgear/scene/bvh/Makefile.am
index c880a313..2e5389cb 100644
--- a/simgear/scene/bvh/Makefile.am
+++ b/simgear/scene/bvh/Makefile.am
@@ -4,7 +4,11 @@ check_PROGRAMS  = bvhtest
 TESTS           = $(check_PROGRAMS)
 
 bvhtest_SOURCES = bvhtest.cxx
-bvhtest_LDADD = libsgbvh.a -lsgstructure -lsgmath $(base_LIBS)
+bvhtest_LDADD = libsgbvh.a \
+	$(top_builddir)/simgear/structure/libsgstructure.a \
+	$(top_builddir)/simgear/debug/libsgdebug.a \
+	$(base_LIBS)
+
 
 lib_LIBRARIES = libsgbvh.a
 
diff --git a/simgear/sound/Makefile.am b/simgear/sound/Makefile.am
index d14c9fb7..e76fed45 100644
--- a/simgear/sound/Makefile.am
+++ b/simgear/sound/Makefile.am
@@ -18,7 +18,7 @@ libsgsound_a_SOURCES = \
 	soundmgr_openal.cxx \
 	xmlsound.cxx 
 
-check_PROGRAMS = openal_test1 openal_test2 openal_test3
+noinst_PROGRAMS = openal_test1 openal_test2 openal_test3
 
 openal_test1_SOURCES = openal_test1.cxx
 openal_test2_SOURCES = openal_test2.cxx
diff --git a/simgear/sound/openal_test1.cxx b/simgear/sound/openal_test1.cxx
index e563753a..3d055b00 100644
--- a/simgear/sound/openal_test1.cxx
+++ b/simgear/sound/openal_test1.cxx
@@ -12,7 +12,7 @@
 # define AL_ILLEGAL_COMMAND AL_INVALID_OPERATION
 # include <OpenAL/al.h>
 # include <OpenAL/alc.h>
-# include <OpenAL/alut.h>
+# include <ALUT/alut.h>
 #elif defined(OPENALSDK)
 # include <al.h>
 # include <alc.h>
-- 
2.39.5