gravatar
ladanyi@tmit.bme.hu
ladanyi@tmit.bme.hu
Properly detect the Intel C++ compiler (ticket #154).
0 1 0
default
1 file changed with 15 insertions and 1 deletions:
↑ Collapse diff ↑
Ignore white space 12 line context
... ...
@@ -18,24 +18,38 @@
18 18
AM_INIT_AUTOMAKE([-Wall -Werror foreign subdir-objects nostdinc])
19 19
AC_CONFIG_SRCDIR([lemon/list_graph.h])
20 20
AC_CONFIG_HEADERS([config.h lemon/config.h])
21 21

	
22 22
lx_cmdline_cxxflags_set=${CXXFLAGS+set}
23 23

	
24
dnl Do compilation tests using the C++ compiler.
25
AC_LANG([C++])
26

	
24 27
dnl Checks for programs.
25 28
AC_PROG_CXX
26 29
AC_PROG_CXXCPP
27 30
AC_PROG_INSTALL
28 31
AC_DISABLE_SHARED
29 32
AC_PROG_LIBTOOL
30 33

	
31 34
AC_CHECK_PROG([doxygen_found],[doxygen],[yes],[no])
32 35
AC_CHECK_PROG([gs_found],[gs],[yes],[no])
33 36

	
37
dnl Detect Intel compiler.
38
AC_MSG_CHECKING([whether we are using the Intel C++ compiler])
39
AC_COMPILE_IFELSE([#ifndef __INTEL_COMPILER
40
choke me
41
#endif], [ICC=[yes]], [ICC=[no]])
42
if test x"$ICC" = x"yes"; then
43
  AC_MSG_RESULT([yes])
44
else
45
  AC_MSG_RESULT([no])
46
fi
47

	
34 48
dnl Set custom compiler flags when using g++.
35
if test x"$lx_cmdline_cxxflags_set" != x"set" -a "$GXX" = yes; then
49
if test x"$lx_cmdline_cxxflags_set" != x"set" -a "$GXX" = yes -a "$ICC" = no; then
36 50
  CXXFLAGS="$CXXFLAGS -Wall -W -Wall -W -Wunused -Wformat=2 -Wctor-dtor-privacy -Wnon-virtual-dtor -Wno-char-subscripts -Wwrite-strings -Wno-char-subscripts -Wreturn-type -Wcast-qual -Wcast-align -Wsign-promo -Woverloaded-virtual -Woverloaded-virtual -ansi -fno-strict-aliasing -Wold-style-cast -Wno-unknown-pragmas"
37 51
fi
38 52

	
39 53
dnl Checks for libraries.
40 54
#LX_CHECK_GLPK
41 55
#LX_CHECK_CPLEX
0 comments (0 inline)