libglu: Changes to 'upstream-unstable'

[Timo Aaltonen <tjaalton-guest@alioth.debian.org>]

 configure.ac |   12 ++++++------
 glu.pc.in    |    2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit 030651b64854b84a01ebebad9af188e7644c541a
Author: Matt Turner <mattst88@gmail.com>
Date:   Mon Sep 17 11:32:14 2012 -0700

    build: Put correct thing in glu.pc's Requires:

diff --git a/configure.ac b/configure.ac
index 106bd6a..cbfd047 100644
--- a/configure.ac
+++ b/configure.ac
@@ -63,6 +63,7 @@ AC_ARG_ENABLE(osmesa,
 dnl Get the pkg-config definitions for libGL/OSMesa.  We include a fallback
 dnl path for implementations that don't provide a .pc file
 if test "x$OSMESA" = "xyes"; then
+    GLU_REQUIRES="osmesa"
     PKG_CHECK_MODULES(OSMESA, [osmesa], [], [
           AC_CHECK_LIB([OSMesa],
                    [glBegin],
@@ -70,6 +71,7 @@ if test "x$OSMESA" = "xyes"; then
                    AC_MSG_ERROR([OSMesa required]))
           ])
 else
+    GLU_REQUIRES="gl"
     PKG_CHECK_MODULES(GL, [gl], [], [
           AC_CHECK_HEADER([GL/gl.h],
                   [],
@@ -80,6 +82,7 @@ else
                    AC_MSG_ERROR([GL required]))
           ])
 fi
+AC_SUBST([GLU_REQUIRES])
 
 dnl Set up C warning and visibility flags.
 if test "x$GCC" = xyes; then
diff --git a/glu.pc.in b/glu.pc.in
index 1cff191..939740d 100644
--- a/glu.pc.in
+++ b/glu.pc.in
@@ -5,7 +5,7 @@ includedir=@includedir@
 
 Name: glu
 Description: Mesa OpenGL Utility library
-Requires: gl
+Requires: @GLU_REQUIRES@
 Version: @VERSION@
 Libs: -L${libdir} -lGLU
 Libs.private: -lm

commit 6713b96bc2134dda985f06d0b2c7f447296c4a70
Author: Matt Turner <mattst88@gmail.com>
Date:   Mon Sep 17 11:29:25 2012 -0700

    build: Don't check for osmesa.h since it's not used

diff --git a/configure.ac b/configure.ac
index 098960c..106bd6a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -64,9 +64,6 @@ dnl Get the pkg-config definitions for libGL/OSMesa.  We include a fallback
 dnl path for implementations that don't provide a .pc file
 if test "x$OSMESA" = "xyes"; then
     PKG_CHECK_MODULES(OSMESA, [osmesa], [], [
-          AC_CHECK_HEADER([GL/osmesa.h],
-                  [],
-                  AC_MSG_ERROR([OSMesa not found]))
           AC_CHECK_LIB([OSMesa],
                    [glBegin],
                    [OSMESA_LIBS=-lOSMesa],

commit 7545544bd6bfa765e81fd4a6abbc17b9af788fcb
Author: Matt Turner <mattst88@gmail.com>
Date:   Mon Sep 17 11:26:06 2012 -0700

    build: Fix white space

diff --git a/configure.ac b/configure.ac
index c5db09d..098960c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -94,7 +94,7 @@ if test "x$GCC" = xyes; then
     VISIBILITY_CFLAGS="-fvisibility=hidden"
     CFLAGS="$CFLAGS $VISIBILITY_CFLAGS"
     AC_LINK_IFELSE([AC_LANG_PROGRAM()], AC_MSG_RESULT([yes]),
-		   [VISIBILITY_CFLAGS=""; AC_MSG_RESULT([no])]);
+                   [VISIBILITY_CFLAGS=""; AC_MSG_RESULT([no])]);
 
     # Restore CFLAGS; VISIBILITY_CFLAGS are added to it where needed.
     CFLAGS=$save_CFLAGS
@@ -107,9 +107,9 @@ if test "x$GCC" = xyes; then
         AC_MSG_CHECKING([whether $CXX supports -fvisibility=hidden])
         VISIBILITY_CXXFLAGS="-fvisibility=hidden"
         CXXFLAGS="$CXXFLAGS $VISIBILITY_CXXFLAGS"
-	AC_LANG_PUSH([C++])
+        AC_LANG_PUSH([C++])
         AC_LINK_IFELSE([AC_LANG_PROGRAM()], AC_MSG_RESULT([yes]),
-		       [VISIBILITY_CXXFLAGS=""; AC_MSG_RESULT([no])]);
+                       [VISIBILITY_CXXFLAGS=""; AC_MSG_RESULT([no])]);
         AC_LANG_POP([C++])
 
         # Restore CXXFLAGS; VISIBILITY_CXXFLAGS are added to it where needed.