[Mesa-dev] [PATCH] Make it possible to install gl.pc and osmesa.pc together.

[Johannes Obermayr]

---
 configure.ac         |    1 +
 src/mesa/Makefile.am |    9 ++++++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index 46265a2..00279f4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2126,6 +2126,7 @@ AC_SUBST([GALLIUM_MAKE_DIRS])
 
 AM_CONDITIONAL(HAVE_X11_DRIVER, echo "$DRIVER_DIRS" | grep 'x11' >/dev/null 2>&1)
 AM_CONDITIONAL(HAVE_DRI_DRIVER, echo "$DRIVER_DIRS" | grep 'dri' >/dev/null 2>&1)
+AM_CONDITIONAL(HAVE_OPENGL, test x$enable_opengl = xyes)
 AM_CONDITIONAL(HAVE_OSMESA_DRIVER, echo "$DRIVER_DIRS" | grep 'osmesa' >/dev/null 2>&1)
 
 AM_CONDITIONAL(HAVE_X86_ASM, echo "$DEFINES" | grep 'X86_ASM' >/dev/null 2>&1)
diff --git a/src/mesa/Makefile.am b/src/mesa/Makefile.am
index bada760..3568728 100644
--- a/src/mesa/Makefile.am
+++ b/src/mesa/Makefile.am
@@ -103,9 +103,12 @@ clean-local:
 	$(MAKE) -f $(srcdir)/Makefile.old clean
 
 pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = 
+
+if HAVE_OPENGL
+pkgconfig_DATA += gl.pc
+endif
 
 if HAVE_OSMESA_DRIVER
-pkgconfig_DATA = osmesa.pc
-else
-pkgconfig_DATA = gl.pc
+pkgconfig_DATA += osmesa.pc
 endif
-- 
1.7.7