[PATCH] xserver: include GL CFLAGS in dixmod build

Jesse Barnes jbarnes at virtuousgeek.org
Fri Apr 29 10:15:31 PDT 2011


Found this:

make[5]: Entering directory `/home/jbarnes/working/xserver/hw/xfree86/dixmods'
  CCLD   librecord.la
  CCLD   libdbe.la
  CC     glxmodule.lo
In file included from glxmodule.c:44:0:
../../../glx/glxserver.h:56:19: fatal error: GL/gl.h: No such file or directory
compilation terminated.

when trying to build the tree at an alternate prefix without the GL
headers installed in the normal location.  So add the GL CFLAGS to pick
up the pkgconfig include path correctly.

Signed-off-by: Jesse Barnes <jbarnes at virtuousgeek.org>

diff --git a/hw/xfree86/dixmods/Makefile.am
b/hw/xfree86/dixmods/Makefile.am index 365f006..093e74c 100644
--- a/hw/xfree86/dixmods/Makefile.am
+++ b/hw/xfree86/dixmods/Makefile.am
@@ -23,7 +23,7 @@ extsmodule_LTLIBRARIES = $(RECORDMOD) \
 			 $(DBEMOD) \
                          $(GLXMODS)
 
-AM_CFLAGS = @XORG_CFLAGS@ @DIX_CFLAGS@
+AM_CFLAGS = @XORG_CFLAGS@ @DIX_CFLAGS@ @GL_CFLAGS@
 INCLUDES = @XORG_INCS@ \
            -I$(top_srcdir)/dbe \
            -I$(top_srcdir)/hw/xfree86/loader \


More information about the xorg-devel mailing list