Alexandre Julliard : configure: Make sure opengl is not built with --without-opengl is specified.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 8e9504da5c6c996f6f69367e84d898493ec1351c
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=8e9504da5c6c996f6f69367e84...

Author: Alexandre Julliard <julliard(a)winehq.org>
Date:   Wed Sep 24 13:11:11 2008 +0200

configure: Make sure opengl is not built with --without-opengl is specified.

---

 configure    |    8 +++++---
 configure.ac |    8 +++++---
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/configure b/configure
index 059a310..2875786 100755
--- a/configure
+++ b/configure
@@ -11387,6 +11387,11 @@ fi
          else
              opengl_msg="OpenGL development headers not found."
 	 fi
+         test -n "$opengl_msg" && enable_opengl32=${enable_opengl32:-no}
+         test "x$ac_cv_lib_soname_GLU" = "x" && enable_glu32=${enable_glu32:-no}
+    else
+         enable_opengl32=${enable_opengl32:-no}
+         enable_glu32=${enable_glu32:-no}
     fi
     if test -n "$opengl_msg"; then
   case "x$with_opengl" in
@@ -11404,9 +11409,6 @@ esac
 fi
 
 
-    test -n "$opengl_msg" && enable_opengl32=${enable_opengl32:-no}
-    test "x$ac_cv_lib_soname_GLU" = "x" && enable_glu32=${enable_glu32:-no}
-
         NASLIBS=""
 
 
diff --git a/configure.ac b/configure.ac
index bce9247..52f5752 100644
--- a/configure.ac
+++ b/configure.ac
@@ -790,13 +790,15 @@ This probably prevents linking to OpenGL. Try deleting the file and restarting c
          else
              opengl_msg="OpenGL development headers not found."
 	 fi
+         test -n "$opengl_msg" && enable_opengl32=${enable_opengl32:-no}
+         test "x$ac_cv_lib_soname_GLU" = "x" && enable_glu32=${enable_glu32:-no}
+    else
+         enable_opengl32=${enable_opengl32:-no}
+         enable_glu32=${enable_glu32:-no}
     fi
     WINE_WARNING_WITH(opengl,[test -n "$opengl_msg"],[$opengl_msg
 OpenGL and Direct3D won't be supported.])
 
-    test -n "$opengl_msg" && enable_opengl32=${enable_opengl32:-no}
-    test "x$ac_cv_lib_soname_GLU" = "x" && enable_glu32=${enable_glu32:-no}
-
     dnl **** Check for NAS ****
     AC_SUBST(NASLIBS,"")
     AC_CHECK_HEADERS(audio/audiolib.h,