From c84c47842e218b888daf83382bc029440146d322 Mon Sep 17 00:00:00 2001
From: Alexandre Julliard <julliard@winehq.org>
Date: Fri, 22 Sep 2006 09:36:12 +0200
Subject: [PATCH] configure: Moved the libGL.a check to the final warnings.

---
 configure    | 38 +++++++++++++++-----------------------
 configure.ac | 32 ++++++++++++--------------------
 2 files changed, 27 insertions(+), 43 deletions(-)

diff --git a/configure b/configure
index 801ec4fd079..2df837e4930 100755
--- a/configure
+++ b/configure
@@ -9494,30 +9494,15 @@ fi
 echo "${ECHO_T}$ac_cv_lib_GL_glXCreateContext" >&6; }
 if test $ac_cv_lib_GL_glXCreateContext = yes; then
   OPENGL_LIBS="-lGL"
-
-fi
-
-
-		if test "$ac_cv_lib_GL_glXCreateContext" = "yes"
-		then
-			OPENGLFILES='$(OPENGLFILES)'
+                             OPENGLFILES='$(OPENGLFILES)'
 
 cat >>confdefs.h <<\_ACEOF
 #define HAVE_OPENGL 1
 _ACEOF
 
-		else
-                    if test -f /usr/X11R6/lib/libGL.a
-                    then
-                       { { echo "$as_me:$LINENO: error: /usr/X11R6/lib/libGL.a is present on your system.
-This prevents linking to OpenGL. Delete the file and restart configure." >&5
-echo "$as_me: error: /usr/X11R6/lib/libGL.a is present on your system.
-This prevents linking to OpenGL. Delete the file and restart configure." >&2;}
-   { (exit 1); exit 1; }; }
-                    else
-                                                wine_cv_opengl_libs_found="no"
-                    fi
-		fi
+
+fi
+
 
 	        		{ echo "$as_me:$LINENO: checking for gluLookAt in -lGLU" >&5
 echo $ECHO_N "checking for gluLookAt in -lGLU... $ECHO_C" >&6; }
@@ -25579,7 +25564,7 @@ echo "$as_me: WARNING: isn't what you want anyway. You will need to install deve
 echo "$as_me: WARNING:  packages of Xlib/Xfree86 at the very least." >&2;}
 fi
 
-if test "$wine_cv_opengl_headers_found" = "no" -o "$wine_cv_opengl_header_version_OK" = "no" -o "$wine_cv_opengl_libs_found" = "no"
+if test -z "$OPENGLFILES"
 then
   echo >&2
   { echo "$as_me:$LINENO: WARNING: Wine will be build without OpenGL or Direct3D support" >&5
@@ -25595,11 +25580,18 @@ echo "$as_me: WARNING: No OpenGL development headers were found" >&2;}
   then
     { echo "$as_me:$LINENO: WARNING: Old Mesa headers detected. Consider upgrading your Mesa libraries (http://www.mesa3d.org/)." >&5
 echo "$as_me: WARNING: Old Mesa headers detected. Consider upgrading your Mesa libraries (http://www.mesa3d.org/)." >&2;}
-  fi
-  if test "$wine_cv_opengl_libs_found" = "no"
+  elif test "$ac_cv_lib_GL_glXCreateContext" = "no"
   then
-    { echo "$as_me:$LINENO: WARNING: No OpenGL library found on this system." >&5
+     if test -f /usr/X11R6/lib/libGL.a
+     then
+        { echo "$as_me:$LINENO: WARNING: /usr/X11R6/lib/libGL.a is present on your system.
+This probably prevents linking to OpenGL. Try deleting the file and restarting configure." >&5
+echo "$as_me: WARNING: /usr/X11R6/lib/libGL.a is present on your system.
+This probably prevents linking to OpenGL. Try deleting the file and restarting configure." >&2;}
+     else
+        { echo "$as_me:$LINENO: WARNING: No OpenGL library found on this system." >&5
 echo "$as_me: WARNING: No OpenGL library found on this system." >&2;}
+     fi
   fi
 fi
 
diff --git a/configure.ac b/configure.ac
index 9a4be027853..f7246c00a5d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -413,25 +413,12 @@ then
             then
 		dnl Check for the presence of the library
 		AC_CHECK_LIB(GL,glXCreateContext,
-			     OPENGL_LIBS="-lGL"
+			     [OPENGL_LIBS="-lGL"
+                             OPENGLFILES='$(OPENGLFILES)'
+                             AC_DEFINE(HAVE_OPENGL, 1, [Define if OpenGL is present on the system])]
 			     ,,
 			     $X_LIBS -lXext -lX11 -lm $X_EXTRA_LIBS)
 
-		if test "$ac_cv_lib_GL_glXCreateContext" = "yes"
-		then
-			OPENGLFILES='$(OPENGLFILES)'
-			AC_DEFINE(HAVE_OPENGL, 1, [Define if OpenGL is present on the system])
-		else
-                    if test -f /usr/X11R6/lib/libGL.a
-                    then 
-                       AC_MSG_ERROR([/usr/X11R6/lib/libGL.a is present on your system.
-This prevents linking to OpenGL. Delete the file and restart configure.])
-                    else
-                        dnl The compile test most likely failed because no libGL.so was found
-                        wine_cv_opengl_libs_found="no"
-                    fi
-		fi
-
 	        dnl Check for GLU32 library.
 		AC_CHECK_LIB(GLU,gluLookAt,
 			     [OPENGL_LIBS="$OPENGL_LIBS -lGLU"
@@ -1975,7 +1962,7 @@ then
   AC_MSG_WARN([ packages of Xlib/Xfree86 at the very least.])
 fi
 
-if test "$wine_cv_opengl_headers_found" = "no" -o "$wine_cv_opengl_header_version_OK" = "no" -o "$wine_cv_opengl_libs_found" = "no"
+if test -z "$OPENGLFILES"
 then
   echo >&2
   AC_MSG_WARN([Wine will be build without OpenGL or Direct3D support])
@@ -1987,10 +1974,15 @@ then
   if test "$wine_cv_opengl_header_version_OK" = "no"
   then
     AC_MSG_WARN([Old Mesa headers detected. Consider upgrading your Mesa libraries (http://www.mesa3d.org/).])
-  fi
-  if test "$wine_cv_opengl_libs_found" = "no"
+  elif test "$ac_cv_lib_GL_glXCreateContext" = "no"
   then
-    AC_MSG_WARN([No OpenGL library found on this system.])
+     if test -f /usr/X11R6/lib/libGL.a
+     then 
+        AC_MSG_WARN([/usr/X11R6/lib/libGL.a is present on your system.
+This probably prevents linking to OpenGL. Try deleting the file and restarting configure.])
+     else
+        AC_MSG_WARN([No OpenGL library found on this system.])
+     fi
   fi
 fi