merge

configure.ac

@@ -166,8 +166,8 @@ if test x$enable_fpga = xyes; then
 	if test x$link_with_riffa = xyes; then
    	   STARPU_FPGA_LDFLAGS="-L$fpga_lib_dir -lfpga -lriffa -lrt -lm"
 	elif test x$link_with_maxeler = xyes; then
-	   STARPU_FPGA_CPPFLAGS=`slicconfig --cflags`" $STARPU_FPGA_CPPFLAGS"
-   	   STARPU_FPGA_LDFLAGS=`slicconfig --libs`" -lrt -lm"
+	   STARPU_FPGA_CPPFLAGS=`slic-config --cflags`" $STARPU_FPGA_CPPFLAGS"
+   	   STARPU_FPGA_LDFLAGS=`slic-config --libs`" -lrt -lm"
 	else
    	   STARPU_FPGA_LDFLAGS="-L$fpga_lib_dir -lfpga -lrt -lm"	
 	fi

install/share/doc/starpu/STARPU-REVISION

@@ -1 +1 @@
-7f81a3dbe35c7f710a028821ed1ec504c61cf52f
+b97fb57955a3da3564712afdafcc777d552deebe

tests/perfmodels/max_fpga.c

@@ -6,7 +6,7 @@
 #include "../helper.h"
 
 //#include "StreamFMA.h"
-//#include "MaxSLiCInterface.h"
+#include "MaxSLiCInterface.h"
 
 
 void cpu_func(void *buffers[], void *cl_arg)