From eb63e50d95da4e1e08fc6fcec46ac63d5e3b7bf4 Mon Sep 17 00:00:00 2001 From: Matthieu Herrb Date: Sun, 12 Mar 2006 17:14:03 +0000 Subject: [PATCH] Fix build when AIGLX is false. --- ChangeLog | 5 +++++ hw/xfree86/dixmods/Makefile.am | 5 ++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 47cecf311..ac2c718e1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2006-03-12 Matthieu Herrb + + * hw/xfree86/dixmods/Makefile.am + Fix build when AIGLX is false. + 2006-03-11 Eric Anholt * exa/exa.h: diff --git a/hw/xfree86/dixmods/Makefile.am b/hw/xfree86/dixmods/Makefile.am index 0e06f5464..5162ee18b 100644 --- a/hw/xfree86/dixmods/Makefile.am +++ b/hw/xfree86/dixmods/Makefile.am @@ -73,9 +73,12 @@ libfb_la_LIBADD = $(top_builddir)/fb/libfb.la libfb_la_SOURCES = $(top_builddir)/fb/fbcmap.c fbmodule.c libglx_la_LDFLAGS = -avoid-version +if AIGLX +GLXDRI_LIBRARY = $(top_builddir)/GL/glx/libglxdri.la +endif libglx_la_LIBADD = \ $(top_builddir)/GL/glx/libglx.la \ - $(top_builddir)/GL/glx/libglxdri.la + $(GLXDRI_LIBRARY) libglx_la_SOURCES = glxmodule.c libmfb_la_LDFLAGS = -avoid-version