diff options
| author | Matt Turner <[email protected]> | 2012-08-21 22:06:17 -0700 |
|---|---|---|
| committer | Matt Turner <[email protected]> | 2012-08-24 11:08:19 -0700 |
| commit | 00f3d9b11acd366329c347e4797b8af3437fcfe6 (patch) | |
| tree | 798ea0a7d4d7f0b66aa761ce49c5066b527d7ae2 | |
| parent | d23b1b79777828848656e350a19ec3031205e9fc (diff) | |
build: Remove duplicate DRI automake conditionals
| -rw-r--r-- | configure.ac | 5 | ||||
| -rw-r--r-- | src/mesa/libdricore/Makefile.am | 2 |
2 files changed, 2 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index 12ce8614541..4a59e195ef5 100644 --- a/configure.ac +++ b/configure.ac @@ -698,7 +698,7 @@ if test "x$enable_glx" = xyes -a \ enable_glx=no fi -AM_CONDITIONAL(HAVE_DRI, test x"$enable_dri" = xyes) +AM_CONDITIONAL(HAVE_DRI, test "x$enable_dri" = xyes) AC_ARG_ENABLE([shared-glapi], [AS_HELP_STRING([--enable-shared-glapi], @@ -917,8 +917,6 @@ AC_SUBST([GLAPI_LIB_DEPS]) DRI_LIB_DEPS="\$(top_builddir)/src/mesa/libdricore/libdricore${VERSION}.la" GALLIUM_DRI_LIB_DEPS="\$(TOP)/\$(LIB_DIR)/libdricore${VERSION}.so" -AM_CONDITIONAL(HAVE_DRICORE, test "x$enable_dri" = xyes) - AC_SUBST([HAVE_XF86VIDMODE]) dnl @@ -1977,7 +1975,6 @@ AM_CONDITIONAL(HAVE_GALLIUM_COMPUTE, test x$enable_opencl = xyes) AC_SUBST([GALLIUM_MAKE_DIRS]) AM_CONDITIONAL(HAVE_X11_DRIVER, echo "$DRIVER_DIRS" | grep 'x11' >/dev/null 2>&1) -AM_CONDITIONAL(HAVE_DRI_DRIVER, echo "$DRIVER_DIRS" | grep 'dri' >/dev/null 2>&1) AM_CONDITIONAL(HAVE_X86_ASM, echo "$DEFINES" | grep 'X86_ASM' >/dev/null 2>&1) AM_CONDITIONAL(HAVE_X86_64_ASM, echo "$DEFINES" | grep 'X86_64_ASM' >/dev/null 2>&1) diff --git a/src/mesa/libdricore/Makefile.am b/src/mesa/libdricore/Makefile.am index 881703405b1..897aeda6c6f 100644 --- a/src/mesa/libdricore/Makefile.am +++ b/src/mesa/libdricore/Makefile.am @@ -77,7 +77,7 @@ libdricore_asm_la_CPPFLAGS = $(AM_CPPFLAGS) \ -I$(top_srcdir)/src/mesa/sparc endif -if HAVE_DRICORE +if HAVE_DRI noinst_LTLIBRARIES = libdricore-asm.la lib_LTLIBRARIES = libdricore@[email protected] |