Browse Source

build: Fix Automake hack in `gcc-plugin'; clarify comments.

Ludovic Courtès 12 years ago
parent
commit
32afe5bad0
2 changed files with 5 additions and 6 deletions
  1. 3 4
      configure.ac
  2. 2 2
      gcc-plugin/tests/Makefile.am

+ 3 - 4
configure.ac

@@ -1689,12 +1689,11 @@ AC_CHECK_MEMBER([struct cudaDeviceProp.pciBusID],
   AC_DEFINE([STARPU_HAVE_BUSID],[1],[Define to 1 if CUDA device properties include BusID]),
   , [[#include <cuda_runtime_api.h>]])
 
-dnl Check automake version is greater or equal to 1.11
-dnl Automake 1.11 introduced `silent-rules'. Test its availability to check the version of automake
+dnl Set this condition when Automake 1.11 or later is being used.
+dnl Automake 1.11 introduced `silent-rules', hence the check.
 m4_ifdef([AM_SILENT_RULES],
   AM_CONDITIONAL([STARPU_HAVE_AM111], [true]),
-  AM_CONDITIONAL([STARPU_HAVE_AM111], [false])
-)
+  AM_CONDITIONAL([STARPU_HAVE_AM111], [false]))
 
 ###############################################################################
 #                                                                             #

+ 2 - 2
gcc-plugin/tests/Makefile.am

@@ -91,9 +91,9 @@ if RUN_GCC_PLUGIN_TESTS
 
 TESTS = $(gcc_tests)
 if STARPU_HAVE_AM111
-TESTS_ENVIRONMENT = ./run-test
-else
 LOG_COMPILER = ./run-test
+else
+TESTS_ENVIRONMENT = ./run-test
 endif
 
 else !RUN_GCC_PLUGIN_TESTS