mesa/program: Fix both Classic and Gallium build

Follow-up for 9078441072 and
3a5ad21cd3

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>
This commit is contained in:
Quentin Glidic 2012-11-28 16:33:47 +01:00 committed by Kenneth Graunke
parent f416b382d6
commit c5e9396424
2 changed files with 4 additions and 1 deletions

View File

@ -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)

View File

@ -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