From fdcf53c6886bbb73eb5094a6a1a16378059ecd4c Mon Sep 17 00:00:00 2001
From: ehofman <ehofman>
Date: Tue, 9 Feb 2010 09:26:04 +0000
Subject: [PATCH 1/3] Properly test for OpenThreads and bail out if it isn't
 found

---
 configure.ac              | 38 +++++++++++++++++++++++---------------
 simgear/props/Makefile.am |  2 +-
 2 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/configure.ac b/configure.ac
index 6ac0c87b..7bebd560 100644
--- a/configure.ac
+++ b/configure.ac
@@ -475,18 +475,18 @@ LIBS="$saved_LIBS"
 case "${host}" in
 *-apple-darwin*)
     if test "x$with_osg_framework" != "x"; then
-        AC_CHECK_FRAMEWORK(osgViewer, [#include <osgViewer/Version>], $with_osg_framework)
-        AC_CHECK_FRAMEWORK(osgGA, [#include <osgGA/Version>], $with_osg_framework)
-        AC_CHECK_FRAMEWORK(osgText, [#include <osgText/Version>], $with_osg_framework)
-        AC_CHECK_FRAMEWORK(osgFX, [#include <osgFX/AnisotropicLighting>], $with_osg_framework)
-        AC_CHECK_FRAMEWORK(osgUtil, [#include <osgUtil/Version>], $with_osg_framework)
-        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)
-        osg_FRAMEWORKS="$FRAMEWORKS"
-        FRAMEWORKS=""
-        AC_SUBST(osg_FRAMEWORKS)
+#       AC_CHECK_FRAMEWORK(osgViewer, [#include <osgViewer/Version>], $with_osg_framework)
+#       AC_CHECK_FRAMEWORK(osgGA, [#include <osgGA/Version>], $with_osg_framework)
+#       AC_CHECK_FRAMEWORK(osgText, [#include <osgText/Version>], $with_osg_framework)
+#       AC_CHECK_FRAMEWORK(osgFX, [#include <osgFX/AnisotropicLighting>], $with_osg_framework)
+#       AC_CHECK_FRAMEWORK(osgUtil, [#include <osgUtil/Version>], $with_osg_framework)
+#       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)
+#       osg_FRAMEWORKS="$FRAMEWORKS"
+#       FRAMEWORKS=""
+#       AC_SUBST(osg_FRAMEWORKS)
         AC_CHECK_FRAMEWORK(OpenThreads, [#include <OpenThreads/Version>], $with_osg_framework)
         openthreads_FRAMEWORK="$FRAMEWORKS"
         FRAMEWORKS=""
@@ -499,15 +499,23 @@ case "${host}" in
         LDFLAGS="$LDFLAGS -L$with_osg"
     fi
     ;;
+*)
+    if test "x$enable_osgdebug" = "xyes"; then
+        AC_CHECK_LIB(OpenThreadsd,OpenThreadsGetVersion)
+    else
+        AC_CHECK_LIB(OpenThreads,OpenThreadsGetVersion)
+    fi
+    ;;
 esac
 AM_CONDITIONAL(HAVE_FRAMEWORK_OSG, test "x$ac_cv_framework_osg" != "x")
 
 AC_CHECK_HEADER(osg/Version)
-if test "x$ac_cv_header_osg_Version" != "xyes"; then
+if test "x$ac_cv_header_osg_Version" != "xyes" -o "x$ac_cv_lib_OpenThreads_OpenThreadsGetVersion" != "xyes"; then
   if test "x$ac_cv_framework_osg" != "xyes"; then
     echo
-    echo "You *must* have the OpenSceneGraph support library installed on your system"
-    echo "to build this version of SimGear!"
+    echo "Warning: The OpenThreads library was not found on this system."
+    echo "         Mybe you forgot to sepcify --with-osg?"
+    echo "Without the OpenSceneGraph library FlightGear will not work."
     echo
     echo "Please see README.OSG for more details."
     echo
diff --git a/simgear/props/Makefile.am b/simgear/props/Makefile.am
index acf52017..658fe126 100644
--- a/simgear/props/Makefile.am
+++ b/simgear/props/Makefile.am
@@ -15,7 +15,7 @@ libsgprops_a_SOURCES = \
 	props_io.cxx \
 	AtomicChangeListener.cxx
 
-noinst_PROGRAMS = props_test
+check_PROGRAMS = props_test
 
 props_test_SOURCES = props_test.cxx
 props_test_LDADD = \

From bb370a304d9bc2cb9b48fb69f65e3eb484cd2542 Mon Sep 17 00:00:00 2001
From: ehofman <ehofman>
Date: Tue, 9 Feb 2010 09:28:40 +0000
Subject: [PATCH 2/3] smnall update for MacOS without framework support

---
 configure.ac | 1 +
 1 file changed, 1 insertion(+)

diff --git a/configure.ac b/configure.ac
index 7bebd560..75b95987 100644
--- a/configure.ac
+++ b/configure.ac
@@ -496,6 +496,7 @@ case "${host}" in
         dnl This is needed when osg dynamic libs are specified 
         dnl instead of OSG frameworks on Mac OS X
         dnl
+        AC_CHECK_LIB(OpenThreads,OpenThreadsGetVersion)
         LDFLAGS="$LDFLAGS -L$with_osg"
     fi
     ;;

From 6786a7be4ac56e8371777c90b3d13120f55752ad Mon Sep 17 00:00:00 2001
From: ehofman <ehofman>
Date: Wed, 10 Feb 2010 08:13:09 +0000
Subject: [PATCH 3/3] small MacOS fix

---
 configure.ac | 1 -
 1 file changed, 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 75b95987..710a42f3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -497,7 +497,6 @@ case "${host}" in
         dnl instead of OSG frameworks on Mac OS X
         dnl
         AC_CHECK_LIB(OpenThreads,OpenThreadsGetVersion)
-        LDFLAGS="$LDFLAGS -L$with_osg"
     fi
     ;;
 *)