diff options
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | src/mesa/program/Makefile.am | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 855f01c98a5..685b29a7f44 100644 --- 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 ea412f56f74..1b820465892 100644 --- 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 |