build: Replace NEED_RADEON_LLVM with HAVE_GALLIUM_LLVM.

Reviewed-by: Emil Velikov <emil.velikov@collabora.com>

diff --git a/configure.ac b/configure.ac
index 21a73b031f4aed116ef12dc2c708cad6e5673e11..7d712b41a71199406c4de23edae80d07584769ee 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1012,7 +1012,6 @@ radeon_llvm_check() {
     llvm_add_component "bitreader" $2
     llvm_add_component "ipo" $2
 
-    NEED_RADEON_LLVM=yes
     if test "x$have_libelf" != xyes; then
        AC_MSG_ERROR([$1 requires libelf when using llvm])
     fi
@@ -2523,7 +2522,6 @@ AM_CONDITIONAL(NEED_RADEON_DRM_WINSYS, test "x$HAVE_GALLIUM_R300" = xyes -o \
                                             "x$HAVE_GALLIUM_R600" = xyes -o \
                                             "x$HAVE_GALLIUM_RADEONSI" = xyes)
 AM_CONDITIONAL(NEED_WINSYS_XLIB, test "x$enable_glx" = xgallium-xlib)
-AM_CONDITIONAL(NEED_RADEON_LLVM, test x$NEED_RADEON_LLVM = xyes)
 AM_CONDITIONAL(HAVE_GALLIUM_COMPUTE, test x$enable_opencl = xyes)
 AM_CONDITIONAL(HAVE_GALLIUM_LLVM, test "x$enable_llvm" = xyes)
 AM_CONDITIONAL(USE_VC4_SIMULATOR, test x$USE_VC4_SIMULATOR = xyes)

diff --git a/src/amd/Makefile.common.am b/src/amd/Makefile.common.am
index 832a9434dce9e825d91f10f183d391c90169bbf2..e492fbcb393d7673d1bb5fce6bfffd1e402d69a0 100644 (file)
--- a/src/amd/Makefile.common.am
+++ b/src/amd/Makefile.common.am
@@ -19,7 +19,7 @@
 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 # IN THE SOFTWARE.
 
-if NEED_RADEON_LLVM
+if HAVE_GALLIUM_LLVM
 
 COMMON_LIBS = common/libamd_common.la
 

diff --git a/src/gallium/drivers/r600/Automake.inc b/src/gallium/drivers/r600/Automake.inc
index 3ff5501d6c4a25a8579886c7e40cc4b055af8c4d..fa457359de60d1a7c4407fec6d8daa1fb4544740 100644 (file)
--- a/src/gallium/drivers/r600/Automake.inc
+++ b/src/gallium/drivers/r600/Automake.inc
@@ -13,7 +13,7 @@ TARGET_RADEON_WINSYS = \
 TARGET_RADEON_COMMON = \
        $(top_builddir)/src/gallium/drivers/radeon/libradeon.la
 
-if NEED_RADEON_LLVM
+if HAVE_GALLIUM_LLVM
 TARGET_RADEON_COMMON += \
        $(top_builddir)/src/amd/common/libamd_common.la
 endif

diff --git a/src/gallium/drivers/r600/Makefile.am b/src/gallium/drivers/r600/Makefile.am
index 3638e00f195caf32ed83c4405964e3a319a4021d..21762d838d0e30ea6ef8e42db08d7740d4694b83 100644 (file)
--- a/src/gallium/drivers/r600/Makefile.am
+++ b/src/gallium/drivers/r600/Makefile.am
@@ -17,7 +17,7 @@ libr600_la_SOURCES = \
        $(C_SOURCES) \
        $(CXX_SOURCES)
 
-if NEED_RADEON_LLVM
+if HAVE_GALLIUM_LLVM
 
 AM_CFLAGS += \
        $(LLVM_CFLAGS) \

diff --git a/src/gallium/drivers/radeon/Makefile.am b/src/gallium/drivers/radeon/Makefile.am
index 64c2799ee97b41e5c93446bca53dd28216604108..57e31f751b385affd6b6dd5ef90107643f23cec8 100644 (file)
--- a/src/gallium/drivers/radeon/Makefile.am
+++ b/src/gallium/drivers/radeon/Makefile.am
@@ -13,7 +13,7 @@ noinst_LTLIBRARIES = libradeon.la
 libradeon_la_SOURCES = \
        $(C_SOURCES)
 
-if NEED_RADEON_LLVM
+if HAVE_GALLIUM_LLVM
 
 AM_CFLAGS += \
        $(LLVM_CFLAGS) \

diff --git a/src/gallium/targets/pipe-loader/Makefile.am b/src/gallium/targets/pipe-loader/Makefile.am
index 26f79536fc12e87fea30f16a0aa1e330ceb51797..5f629a29827382861f25416f05ee711ab0999081 100644 (file)
--- a/src/gallium/targets/pipe-loader/Makefile.am
+++ b/src/gallium/targets/pipe-loader/Makefile.am
@@ -131,7 +131,7 @@ pipe_r600_la_LIBADD = \
        $(LIBDRM_LIBS) \
        $(RADEON_LIBS)
 
-if NEED_RADEON_LLVM
+if HAVE_GALLIUM_LLVM
 pipe_r600_la_LIBADD += \
        $(top_builddir)/src/amd/common/libamd_common.la
 endif