projects / mesa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: f416b38)
mesa/program: Fix both Classic and Gallium build
authorQuentin Glidic <sardemff7+git@sardemff7.net>
Wed, 28 Nov 2012 15:33:47 +0000 (16:33 +0100)
committerKenneth Graunke <kenneth@whitecape.org>
Thu, 10 Jan 2013 18:34:56 +0000 (10:34 -0800)
Follow-up for 907844107252260c646aca361191ef7f121f3d23 and
3a5ad21cd3f026579eeacc25b39513711556c7ee

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=57044
Tested-by: Fabio Pedretti <fabio.ped@libero.it>
Tested-by: Brad King <brad.king@kitware.com>
configure.ac patch | blob | history
src/mesa/program/Makefile.am patch | blob | history

diff --git a/configure.ac b/configure.ac
index 855f01c98a5a57d90303bb923dd37a2cda06f9e6..685b29a7f44cdd030bd98a14919b84341b04ec1c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1967,6 +1967,9 @@ AM_CONDITIONAL(HAVE_DRM_LOADER_GALLIUM, test x$enable_gallium_drm_loader = xyes)
 AM_CONDITIONAL(HAVE_GALLIUM_COMPUTE, test x$enable_opencl = xyes)
 AC_SUBST([GALLIUM_MAKE_DIRS])
 
+AM_CONDITIONAL(NEED_LIBPROGRAM, test "x$with_gallium_drivers" != x -o \
+                                     "x$enable_xlib_glx" = xyes -o \
+                                     "x$enable_osmesa" = xyes)
 AM_CONDITIONAL(HAVE_X11_DRIVER, echo "$DRIVER_DIRS" | grep 'x11' >/dev/null 2>&1)
 
 AM_CONDITIONAL(HAVE_X86_ASM, echo "$DEFINES" | grep 'X86_ASM' >/dev/null 2>&1)
diff --git a/src/mesa/program/Makefile.am b/src/mesa/program/Makefile.am
index ea412f56f742f5119390e2c7bca8ffe37bad6992..1b820465892aac44981fe0252e7c02eb5d1427a2 100644 (file)
--- a/src/mesa/program/Makefile.am
+++ b/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