From 67c365a447600e29b9c89a0d261d2e365b416bdd Mon Sep 17 00:00:00 2001
From: curt <curt>
Date: Tue, 19 Jan 1999 17:49:14 +0000
Subject: [PATCH] Updated Thanks file.

Changes to configure.in for better solaris support.
---
 Thanks       |  4 ++++
 configure.in | 40 ++++++++++++++++++++++------------------
 2 files changed, 26 insertions(+), 18 deletions(-)

diff --git a/Thanks b/Thanks
index 171f8edb4..87f73e3b9 100644
--- a/Thanks
+++ b/Thanks
@@ -26,6 +26,10 @@ Steve Baker <sbaker@link.com>
     most of the more sophisticated features of Flight Gear.
 
 
+Michael Basler <pmb@knUUt.de>
+  Coauthor of the Getting Started guide.
+
+
 Paul Bleisch <pbleisch@acm.org>
   Paul redid the "debug" system so that it would be much more
   flexible, so it could be easily disabled for production system, and
diff --git a/configure.in b/configure.in
index 7ce5573c5..b9fc09906 100644
--- a/configure.in
+++ b/configure.in
@@ -95,7 +95,11 @@ dnl Enable serial support on Unix type systems
 AM_CONDITIONAL(ENABLE_UNIX_SERIAL, true)
 
 dnl extra library and include directories
-EXTRA_DIRS="/usr/local /usr/X11R6 /opt/X11R6"
+EXTRA_DIRS="/usr/local /usr/X11R6"
+
+if test -d /opt/X11R6 ; then
+     EXTRA_DIRS="$EXTRA_DIRS /opt/X11R6"
+fi
 
 if test "x$ac_cv_header_windows_h" = "xyes" ; then
     EXTRA_DIRS="${EXTRA_DIRS} `pwd`/Win32"
@@ -115,7 +119,7 @@ AC_CHECK_LIB(m, cos)
 
 base_LIBS="$LIBS"
 
-# AC_CHECK_LIB(socket, socket)
+AC_CHECK_LIB(socket, socket)
 AC_CHECK_LIB(X11, XCreateWindow)
 AC_CHECK_LIB(Xext, XShmCreateImage)
 AC_CHECK_LIB(Xi, XGetExtensionVersion)
@@ -218,6 +222,22 @@ else
     ac_cv_lib_glut_glutGameModeString="yes"
 fi
 
+if test "x$ac_cv_lib_glut_glutGetModifiers" = "xno"; then
+    echo 
+    echo "Unable to find the necessary OpenGL or GLUT libraries."
+    echo "See config.log for automated test details and results ..."
+    exit 1
+fi
+
+if test "x$ac_cv_lib_glut_glutGameModeString" = "xno"; then
+    echo
+    echo "Your version of glut doesn't support game mode."
+    echo "You need to fetch and install the latest version of glut from:"
+    echo
+    echo "    http://reality.sgi.com/opengl/glut3/glut3.html"
+    exit 1
+fi
+
 opengl_LIBS="$LIBS"
 LIBS="$base_LIBS"
 
@@ -243,22 +263,6 @@ AC_FUNC_VPRINTF
 AC_CHECK_FUNCS( ftime gettimeofday memcpy bcopy mktime strstr rand random \
 	setitimer getitimer signal GetLocalTime rint getrusage )
 
-if test "x$ac_cv_lib_glut_glutGetModifiers" = "xno"; then
-    echo 
-    echo "Unable to find the necessary OpenGL or GLUT libraries."
-    echo "See config.log for automated test details and results ..."
-    exit 1
-fi
-
-if test "x$ac_cv_lib_glut_glutGameModeString" = "xno"; then
-    echo
-    echo "Your version of glut doesn't support game mode."
-    echo "You need to fetch and install the latest version of glut from:"
-    echo
-    echo "    http://reality.sgi.com/opengl/glut3/glut3.html"
-    exit 1
-fi
-
 AM_CONFIG_HEADER(Include/config.h)
 
 AC_OUTPUT( \