From ddc05759f098f06bd93253a7bffe38640963dfb3 Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Fri, 11 Jan 2013 08:00:45 +0100
Subject: fontconfig libX11 mesa mkfontscale xserver git update 11 jan 2013

fontconfig: 0831c1770e4bac7269a190936bbb0529d747e233
libX11: 0b148750027fd0557c5ed93afda861ddf4b92e0f
mkfontscale: 9cbe3256bc932b82f2435b23cda0931f4f5f5ba2
xserver: 6703a7c7cf1a349c137e247a0c8eb462ff7b07be
mesa: babab2876080af0fe65249dff559244aebd0b87e
---
 mesalib/src/mesa/program/.gitignore  | 1 -
 mesalib/src/mesa/program/Makefile.am | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

(limited to 'mesalib/src/mesa/program')

diff --git a/mesalib/src/mesa/program/.gitignore b/mesalib/src/mesa/program/.gitignore
index bc48ef673..4c20872e1 100644
--- a/mesalib/src/mesa/program/.gitignore
+++ b/mesalib/src/mesa/program/.gitignore
@@ -1,4 +1,3 @@
-/Makefile
 program_parse.output
 lex.yy.c
 program_parse.tab.c
diff --git a/mesalib/src/mesa/program/Makefile.am b/mesalib/src/mesa/program/Makefile.am
index ea412f56f..1b8204658 100644
--- a/mesalib/src/mesa/program/Makefile.am
+++ b/mesalib/src/mesa/program/Makefile.am
@@ -35,7 +35,7 @@ DRICORE_LIB = libdricore_program.la
 endif
 
 noinst_LTLIBRARIES = $(DRICORE_LIB)
-if HAVE_GALLIUM
+if NEED_LIBPROGRAM
 noinst_LTLIBRARIES += libprogram.la
 else
 check_LTLIBRARIES = libprogram.la
-- 
cgit v1.2.3