|
|
@@ -146,7 +146,7 @@ AC_ARG_ENABLE(link-with-maxeler, [AS_HELP_STRING([--disable-link-with-maxeler],
|
|
|
|
|
|
if test x$enable_fpga = xyes
|
|
|
then
|
|
|
- fpga_include_dir="${fpga_dir}/include"
|
|
|
+ fpga_include_dir="${fpga_dir}/include"
|
|
|
fpga_lib_dir="${fpga_dir}/lib"
|
|
|
|
|
|
SAVED_CPPFLAGS="${CPPFLAGS}"
|
|
|
@@ -154,12 +154,12 @@ then
|
|
|
|
|
|
STARPU_FPGA_CPPFLAGS="-I$fpga_include_dir"
|
|
|
if test x$link_with_riffa = xyes; then
|
|
|
- STARPU_FPGA_LDFLAGS="-L$fpga_lib_dir -lfpga -lriffa -lrt -lm"
|
|
|
+ STARPU_FPGA_LDFLAGS="-L$fpga_lib_dir -lfpga -lriffa -lrt -lm"
|
|
|
elif test x$link_with_maxeler = xyes; then
|
|
|
STARPU_FPGA_CPPFLAGS="`slic-config --cflags | sed s/\'//g | sed "s/-I /-I/"` $STARPU_FPGA_CPPFLAGS"
|
|
|
- STARPU_FPGA_LDFLAGS="`slic-config --libs | sed s/\'//g | sed "s/-L /-L/" | sed "s/-L /-L/"`"
|
|
|
+ STARPU_FPGA_LDFLAGS="`slic-config --libs | sed s/\'//g | sed "s/-L /-L/" | sed "s/-L /-L/"`"
|
|
|
else
|
|
|
- STARPU_FPGA_LDFLAGS="-L$fpga_lib_dir -lfpga -lrt -lm"
|
|
|
+ STARPU_FPGA_LDFLAGS="-L$fpga_lib_dir -lfpga -lrt -lm"
|
|
|
fi
|
|
|
|
|
|
CPPFLAGS="${CPPFLAGS} ${STARPU_FPGA_CPPFLAGS} "
|
|
|
@@ -169,7 +169,7 @@ then
|
|
|
AC_HAVE_LIBRARY([fpga],[have_valid_fpga=yes],[have_valid_fpga=no])
|
|
|
|
|
|
if test x$have_valid_fpga = xyes; then
|
|
|
- AC_COMPILE_IFELSE(
|
|
|
+ AC_COMPILE_IFELSE(
|
|
|
[AC_LANG_PROGRAM([[#include<fpga.h>]],[[hello()]])]
|
|
|
[have_valid_fpga="yes"],
|
|
|
[have_valid_fpga="no"]
|
|
|
@@ -192,7 +192,7 @@ then
|
|
|
# in case FPGA was explicitely required, but is not available, this is an error
|
|
|
if test x$enable_fpga = xyes -a x$have_valid_fpga = xno; then
|
|
|
AC_MSG_ERROR([cannot find FPGA])
|
|
|
- fi
|
|
|
+ fi
|
|
|
# now we enable FPGA if and only if a proper setup is available
|
|
|
enable_fpga=$have_valid_fpga
|
|
|
fi
|
|
|
@@ -202,7 +202,7 @@ AC_MSG_RESULT($enable_fpga)
|
|
|
AC_SUBST(STARPU_USE_FPGA,$enable_fpga)
|
|
|
AM_CONDITIONAL(STARPU_USE_FPGA,test x$enable_fpga = xyes)
|
|
|
if test x$enable_fpga = xyes; then
|
|
|
- AC_DEFINE(STARPU_USE_FPGA,[1],[FPGA support is activated])
|
|
|
+ AC_DEFINE(STARPU_USE_FPGA,[1],[FPGA support is activated])
|
|
|
fi
|
|
|
|
|
|
|
