OS X build fixes from Hans Fugal

diff --git a/configure.ac b/configure.ac
index 01dc3269931c4dad6b8ce9f2f9f92d9ba0cf5022..85a2cd532526007d38e24b30266ce57d9be16fc7 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -171,7 +171,7 @@ esac
 dnl Checks for libraries.
 
 dnl Thread related checks
-AC_SEARCH_LIBS(pthread_cancel, [pthread c_r])
+AC_SEARCH_LIBS(pthread_create, [pthread c_r])
 if test "x$ac_cv_header_pthread_h" = "xyes"; then
   if test "x$ac_cv_search_pthread_exit" = "x-lc_r"; then
     CXXFLAGS="-pthread $CXXFLAGS"
@@ -504,6 +504,76 @@ if test "x$ac_cv_header_osg_Version" != "xyes"; then
     exit
 fi
 
+# Find the OSG libraries.  Note special handling for OS X frameworks
+case "${host}" in
+*-apple-darwin*)
+
+    dnl Thank you Christian Bauer from SheepSaver
+    dnl AC_CHECK_FRAMEWORK($1=NAME, $2=INCLUDES)
+    AC_DEFUN([AC_CHECK_FRAMEWORK], [
+    AS_VAR_PUSHDEF([ac_Framework], [ac_cv_framework_$1])dnl
+    AC_CACHE_CHECK([whether compiler supports framework $1],
+        ac_Framework, [
+        saved_LIBS="$LIBS"
+        LIBS="$LIBS -framework $1"
+        AC_TRY_LINK(
+        [$2], [],
+        [AS_VAR_SET(ac_Framework, yes)], [AS_VAR_SET(ac_Framework, no); LIBS="$saved_LIBS"]
+        )
+    ])
+    AS_IF([test AS_VAR_GET(ac_Framework) = yes],
+        [AC_DEFINE(AS_TR_CPP(HAVE_FRAMEWORK_$1), 1, [Define if framework $1 is available.])]
+    )
+    AS_VAR_POPDEF([ac_Framework])dnl
+    ])
+
+    if USE_OSGDEBUG; then
+        AC_CHECK_LIB(osgViewerd,osgViewerGetVersion)
+        AC_CHECK_LIB(osgGAd,osgGAGetVersion)
+        AC_CHECK_LIB(osgTextd,osgTextGetVersion)
+        LIBS="$LIBS -losgFXd"
+        AC_CHECK_LIB(osgUtild,osgUtilGetVersion)
+        AC_CHECK_LIB(osgDBd,osgDBGetVersion)
+        AC_CHECK_LIB(osgSimd,osgSimGetVersion)
+        AC_CHECK_LIB(osgd,osgGetVersion)
+        AC_CHECK_LIB(OpenThreadsd,OpenThreadsGetVersion)
+    else
+        AC_CHECK_FRAMEWORK(osgViewer, [#include <osgViewer/Version>])
+        AC_CHECK_FRAMEWORK(osgGA, [#include <osgGA/Version>])
+        AC_CHECK_FRAMEWORK(osgText, [#include <osgText/Version>])
+        AC_CHECK_FRAMEWORK(osgFX, [#include <osgFX/AnisotropicLighting>])
+        AC_CHECK_FRAMEWORK(osgUtil, [#include <osgUtil/Version>])
+        AC_CHECK_FRAMEWORK(osgDB, [#include <osgDB/Version>])
+        AC_CHECK_FRAMEWORK(osgSim, [#include <osgSim/Version>])
+        AC_CHECK_FRAMEWORK(osg, [#include <osg/Version>])
+        AC_CHECK_FRAMEWORK(OpenThreads, [#include <OpenThreads/Version>])
+    fi
+    ;;
+*)
+    if USE_OSGDEBUG; then
+        AC_CHECK_LIB(osgViewerd,osgViewerGetVersion)
+        AC_CHECK_LIB(osgGAd,osgGAGetVersion)
+        AC_CHECK_LIB(osgTextd,osgTextGetVersion)
+        LIBS="$LIBS -losgFXd"
+        AC_CHECK_LIB(osgUtild,osgUtilGetVersion)
+        AC_CHECK_LIB(osgDBd,osgDBGetVersion)
+        AC_CHECK_LIB(osgSimd,osgSimGetVersion)
+        AC_CHECK_LIB(osgd,osgGetVersion)
+        AC_CHECK_LIB(OpenThreadsd,OpenThreadsGetVersion)
+    else
+        AC_CHECK_LIB(osgViewer,osgViewerGetVersion)
+        AC_CHECK_LIB(osgGA,osgGAGetVersion)
+        AC_CHECK_LIB(osgText,osgTextGetVersion)
+        LIBS="$LIBS -losgFX"
+        AC_CHECK_LIB(osgUtil,osgUtilGetVersion)
+        AC_CHECK_LIB(osgDB,osgDBGetVersion)
+        AC_CHECK_LIB(osgSim,osgSimGetVersion)
+        AC_CHECK_LIB(osg,osgGetVersion)
+        AC_CHECK_LIB(OpenThreads,OpenThreadsGetVersion)
+    fi
+    ;;
+esac
+
 AC_LANG_POP
 
 dnl Check for system installed zlib

diff --git a/src/Main/Makefile.am b/src/Main/Makefile.am
index 8e26d217acfcd3d47c3b46f8d1bf15826f26ec52..15c4f6d0a47e333d52174817e5f241cafe6c2cda 100644 (file)
--- a/src/Main/Makefile.am
+++ b/src/Main/Makefile.am
@@ -26,12 +26,6 @@ GFX_CODE = fg_os.cxx $(GFX_COMMON)
 endif
 endif
 
-if USE_OSGDEBUG
-OSG_LIBS = -losgViewerd -losgGAd -losgTextd -losgFXd -losgUtild -losgDBd -losgSimd -losgd -lOpenThreadsd
-else
-OSG_LIBS = -losgViewer -losgGA -losgText -losgFX -losgUtil -losgDB -losgSim -losg -lOpenThreads 
-endif
-
 JSBSIM_LIBS = \
        $(top_builddir)/src/FDM/JSBSim/libJSBSim.a \
         $(top_builddir)/src/FDM/JSBSim/initialization/libInit.a \