--- tiff-3.7.4/m4/acinclude.m4.orig	2005-09-12 17:29:10 +0400
+++ tiff-3.7.4/m4/acinclude.m4	2005-10-25 19:03:12 +0400
@@ -239,7 +239,7 @@ else
     else
       ax_try_lib="${ax_lib}"
     fi
-    LIBS="${ax_try_lib} ${GL_LIBS} ${ax_save_LIBS}"
+    LIBS="${GL_LIBS} ${ax_save_LIBS} ${ax_try_lib}"
     AC_LINK_IFELSE(
     [AC_LANG_PROGRAM([[
 # if HAVE_WINDOWS_H && defined(_WIN32)
@@ -312,7 +312,6 @@ if test "X${with_apple_opengl_framework}
     # "conftest.cc"; and Microsoft cl doesn't know what to do with such a
     # file.
     #
-    AC_LANG_PUSH([C++])
     if test X$ax_compiler_ms = Xyes; then
       AC_LANG_PUSH([C])
     fi
@@ -327,7 +326,6 @@ if test "X${with_apple_opengl_framework}
     if test X$ax_compiler_ms = Xyes; then
       AC_LANG_POP([C])
     fi
-    AC_LANG_POP([C++])
   done
   LIBS=${ax_save_LIBS}
   CPPFLAGS=${ax_save_CPPFLAGS}])
@@ -398,7 +396,7 @@ else
     else
       ax_try_lib="${ax_lib}"
     fi
-    LIBS="${ax_try_lib} ${GLUT_LIBS} ${ax_save_LIBS}"
+    LIBS="${GLUT_LIBS} ${ax_save_LIBS} ${ax_try_lib}"
     AC_LINK_IFELSE(
     [AC_LANG_PROGRAM([[
 # if HAVE_WINDOWS_H && defined(_WIN32)