Commit afeaf287 authored by Guillaume Sadegh's avatar Guillaume Sadegh
Browse files

* m4/intel.m4: Fix to support the cache.

parent fd9ec017
2009-07-09 Guillaume Sadegh <sadegh@lrde.epita.fr>
* m4/intel.m4: Fix to support the cache.
2009-07-08 Guillaume Sadegh <sadegh@lrde.epita.fr>
* src/tgba/tgbacomplement.cc: Stay on 80 columns.
......
......@@ -25,7 +25,7 @@ AC_DEFUN([buddy_INTEL],
AC_CACHE_CHECK([to add extra CFLAGS for the INTEL C compiler],
[ac_cv_intel_cflags],
[ dnl
if test x"$ac_compiler_intel" = x"yes"; then
if test x"$ac_cv_[]_AC_LANG_ABBREV[]_compiler_intel" = x"yes"; then
# -W does not exist for icc in CFLAGS.
CFLAGS=`echo "$CFLAGS" | sed 's/-W[[[:space:]]]//g;s/-W$//'`
......@@ -39,12 +39,16 @@ AC_CACHE_CHECK([to add extra CFLAGS for the INTEL C compiler],
INTEL_CFLAGS="-w1 -Werror -wd${disabled_warnings}"
CFLAGS="$CFLAGS $INTEL_CFLAGS"
CXXFLAGS="$CFLAGS $INTEL_CFLAGS"
[ac_cv_intel_cflags="$INTEL_CFLAGS"]
else
[ac_cv_intel_cflags="no extra flags"]
[ac_cv_intel_cflags=""]
fi])
AC_SUBST([INTEL_CFLAGS])
if test x"$ac_cv_[]_AC_LANG_ABBREV[]_compiler_intel" = x"yes"; then
# -W does not exist for icc in CFLAGS.
CFLAGS=`echo "$CFLAGS" | sed 's/-W[[[:space:]]]//g;s/-W$//'`
CFLAGS="$CFLAGS $ac_cv_intel_cflags"
CXXFLAGS="$CFLAGS $ac_cv_intel_cflags"
fi
]) # buddy_INTEL
......@@ -24,10 +24,7 @@ AC_DEFUN([lbtt_INTEL],
AC_CACHE_CHECK([to add extra CXXFLAGS for the INTEL C++ compiler],
[ac_cv_intel_cxxflags],
[ dnl
if test x"$ac_compiler_intel" = x"yes"; then
# -W does not exist for icpc in CXXFLAGS.
CXXFLAGS=`echo "$CXXFLAGS" | sed 's/-W[[[:space:]]]//g;s/-W$//'`
if test x"$ac_cv_[]_AC_LANG_ABBREV[]_compiler_intel" = x"yes"; then
disabled_warnings=''
for warning in _INTEL_IGNORE_WARNINGS; do
disabled_warnings="$disabled_warnings,$warning"
......@@ -38,13 +35,18 @@ AC_CACHE_CHECK([to add extra CXXFLAGS for the INTEL C++ compiler],
INTEL_CXXFLAGS="-w1 -Werror -wd${disabled_warnings}"
# Even if the icpc preprocessor defines __GNUC__, it is not a GNU compiler.
GXX=
CXXFLAGS="$CXXFLAGS $INTEL_CXXFLAGS"
[ac_cv_intel_cxxflags="$INTEL_CXXFLAGS"]
else
[ac_cv_intel_cxxflags="no extra flags"]
[ac_cv_intel_cxxflags=""]
fi])
if test x"$ac_cv_[]_AC_LANG_ABBREV[]_compiler_intel" = x"yes"; then
# -W does not exist for icpc in CXXFLAGS.
CXXFLAGS=`echo "$CXXFLAGS" | sed 's/-W[[[:space:]]]//g;s/-W$//'`
# Even if the icpc preprocessor defines __GNUC__, it is not a GNU compiler.
GXX=
CXXFLAGS="$CXXFLAGS $ac_cv_intel_cxxflags"
fi
AC_SUBST([INTEL_CXXFLAGS])
]) # lbtt_INTEL
......@@ -32,10 +32,7 @@ AC_DEFUN([spot_INTEL],
AC_CACHE_CHECK([to add extra CXXFLAGS for the INTEL C++ compiler],
[ac_cv_intel_cxxflags],
[ dnl
if test x"$ac_compiler_intel" = x"yes"; then
# -W does not exist for icpc in CXXFLAGS.
CXXFLAGS=`echo "$CXXFLAGS" | sed 's/-W[[[:space:]]]//g;s/-W$//'`
if test x"$ac_cv_[]_AC_LANG_ABBREV[]_compiler_intel" = x"yes"; then
disabled_warnings=''
for warning in _INTEL_IGNORE_WARNINGS; do
disabled_warnings="$disabled_warnings,$warning"
......@@ -46,13 +43,18 @@ AC_CACHE_CHECK([to add extra CXXFLAGS for the INTEL C++ compiler],
INTEL_CXXFLAGS="-w1 -Werror -wd${disabled_warnings}"
# Even if the icpc preprocessor defines __GNUC__, it is not a GNU compiler.
GXX=
CXXFLAGS="$CXXFLAGS $INTEL_CXXFLAGS"
[ac_cv_intel_cxxflags="$INTEL_CXXFLAGS"]
else
[ac_cv_intel_cxxflags="no extra flags"]
[ac_cv_intel_cxxflags=""]
fi])
if test x"$ac_cv_[]_AC_LANG_ABBREV[]_compiler_intel" = x"yes"; then
# -W does not exist for icpc in CXXFLAGS.
CXXFLAGS=`echo "$CXXFLAGS" | sed 's/-W[[[:space:]]]//g;s/-W$//'`
# Even if the icpc preprocessor defines __GNUC__, it is not a GNU compiler.
GXX=
CXXFLAGS="$CXXFLAGS $ac_cv_intel_cxxflags"
fi
AC_SUBST([INTEL_CXXFLAGS])
]) # spot_INTEL
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment