Tweaks from Erik Hofman.

diff --git a/configure.ac b/configure.ac
index 58a41557d98f19ce0617f80842bcc2f29e44d5b9..a06ee82418a720095ed855ff8e028d055271fa67 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -24,16 +24,20 @@ AC_PROG_LN_S
 dnl set the $host variable based on local machine/os
 AC_CANONICAL_HOST
 
-dnl Used on the Irix platform
-AR="ar"
-ARFLAGS="cru"
 case "${host}" in
 *-*-irix*)
     if test "$CXX" = "CC"; then
         AR="CC -ar"
         ARFLAGS="-o"
+    else
+        AR="ar"
+        ARFLAGS="cru"
     fi
     ;;
+*)
+    AR="ar"
+    ARFLAGS="cru"
+    ;;
 esac
 AC_SUBST(AR)
 AC_SUBST(ARFLAGS)
@@ -276,7 +280,11 @@ case "${host}" in
        AC_CHECK_LIB(MesaGLU, gluLookAt)
     fi
 
-    LIBS="$LIBS -lglut"
+    AC_CHECK_LIB(glut, glutGetModifiers)
+    if test "x$ac_cv_lib_glut_glutGetModifiers" = "xno" ; then
+        dnl if no "real" glut, check for freeglut
+        AC_CHECK_LIB(freeglut, glutGetModifiers)
+    fi
     ;;
 
 esac