Commit c4477d24 authored by Lynn Garren's avatar Lynn Garren

add flags for icc

parent 5e6608a9
......@@ -138,7 +138,7 @@ AH_BOTTOM([#endif // CAST_DEFS_H])
# ----------------------------------------------------------------------
# Locate a C++ compiler:
AC_PROG_CXX(cl g++ g++4 c++ aCC CC cxx cc++ FCC KCC RCC xlC_r xlC gpp)
AC_PROG_CXX(cl icc g++ g++4 c++ aCC CC cxx cc++ FCC KCC RCC xlC_r xlC gpp)
# Use it hereinafter:
AC_LANG(C++)
......@@ -232,6 +232,28 @@ c++)
MY_SHNAME="-Wl,-soname,"; MY_LD="-Wl,--rpath -Wl,"
AR="ar"; ARFLAGS="cru"
esac;;
icc)
case "$target" in
*-*-linux*)
AM_CXXFLAGS="-O -ansi -mp -no-gcc -w1"
AM_LDFLAGS="-lstdc++"
MY_SHFLAGS="-fPIC -DPIC"; MY_SHLINK="-shared"; SHEXT=so
MY_SHNAME="-Wl,-soname,"; MY_LD="-Wl,--rpath -Wl,"
AR="xiar"; ARFLAGS="cru"
;;
*-*-darwin*)
AM_CXXFLAGS="-O -ansi -mp -no-gcc -w1"
MY_SHFLAGS=""; MY_SHLINK="-dynamiclib"; SHEXT=dylib
MY_SHNAME="-Wl,-soname,"; MY_LD="-Wl,--rpath -Wl,"
AR="ar"; ARFLAGS="cru"
;;
*)
AM_CXXFLAGS="-O -ansi -mp -no-gcc -w1"
AM_LDFLAGS="-lstdc++"
MY_SHFLAGS="-fPIC -DPIC"; MY_SHLINK="-shared"; SHEXT=so
MY_SHNAME="-Wl,-soname,"; MY_LD="-Wl,--rpath -Wl,"
AR="xiar"; ARFLAGS="cru"
esac;;
cl)
AM_CXXFLAGS="-EHsc -nologo -GR -GX -MD"
AR="ar"; ARFLAGS="cru"
......
2006-09-29 Lynn Garren <garren@fnal.gov>
2006-10-05 Lynn Garren <garren@fnal.gov>
* configure.in: add flags for the Intel compiler (icc)
* configure.in. Makefile.am: stop building HepMC, HepPDT, and StdHep
==============================
......
......@@ -140,7 +140,7 @@ AH_BOTTOM([#endif // EVALUATOR_DEFS_H])
# ----------------------------------------------------------------------
# Locate a C++ compiler:
AC_PROG_CXX(cl g++ g++4 c++ aCC CC cxx cc++ FCC KCC RCC xlC_r xlC gpp)
AC_PROG_CXX(cl icc g++ g++4 c++ aCC CC cxx cc++ FCC KCC RCC xlC_r xlC gpp)
# Use it hereinafter:
AC_LANG(C++)
......@@ -234,6 +234,28 @@ c++)
MY_SHNAME="-Wl,-soname,"; MY_LD="-Wl,--rpath -Wl,"
AR="ar"; ARFLAGS="cru"
esac;;
icc)
case "$target" in
*-*-linux*)
AM_CXXFLAGS="-O -ansi -mp -no-gcc -w1"
AM_LDFLAGS="-lstdc++"
MY_SHFLAGS="-fPIC -DPIC"; MY_SHLINK="-shared"; SHEXT=so
MY_SHNAME="-Wl,-soname,"; MY_LD="-Wl,--rpath -Wl,"
AR="xiar"; ARFLAGS="cru"
;;
*-*-darwin*)
AM_CXXFLAGS="-O -ansi -mp -no-gcc -w1"
MY_SHFLAGS=""; MY_SHLINK="-dynamiclib"; SHEXT=dylib
MY_SHNAME="-Wl,-soname,"; MY_LD="-Wl,--rpath -Wl,"
AR="ar"; ARFLAGS="cru"
;;
*)
AM_CXXFLAGS="-O -ansi -mp -no-gcc -w1"
AM_LDFLAGS="-lstdc++"
MY_SHFLAGS="-fPIC -DPIC"; MY_SHLINK="-shared"; SHEXT=so
MY_SHNAME="-Wl,-soname,"; MY_LD="-Wl,--rpath -Wl,"
AR="xiar"; ARFLAGS="cru"
esac;;
cl)
AM_CXXFLAGS="-EHsc -nologo -GR -GX -MD"
AR="ar"; ARFLAGS="cru"
......
2006-10-05 Lynn Garren <garren@fnal.gov>
* configure.in: add flags for the Intel compiler (icc)
Exceptions is not supported for use with icc.
==============================
20.06.06 Release CLHEP-2.0.2.3
==============================
......
......@@ -148,7 +148,7 @@ AH_BOTTOM([#endif // EXCEPTIONS_DEFS_H])
# ----------------------------------------------------------------------
# Locate a C++ compiler:
AC_PROG_CXX(cl g++ g++4 c++ aCC CC cxx cc++ FCC KCC RCC xlC_r xlC gpp)
AC_PROG_CXX(cl icc g++ g++4 c++ aCC CC cxx cc++ FCC KCC RCC xlC_r xlC gpp)
# Use it hereinafter:
AC_LANG(C++)
......@@ -242,6 +242,29 @@ c++)
MY_SHNAME="-Wl,-soname,"; MY_LD="-Wl,--rpath -Wl,"
AR="ar"; ARFLAGS="cru"
esac;;
icc)
AM_CONDITIONAL(USING_ICC, test yes)
case "$target" in
*-*-linux*)
AM_CXXFLAGS="-O -ansi -mp -no-gcc -w1"
AM_LDFLAGS="-lstdc++ -lcxa -lunwind"
MY_SHFLAGS="-fPIC -DPIC"; MY_SHLINK="-shared"; SHEXT=so
MY_SHNAME="-Wl,-soname,"; MY_LD="-Wl,--rpath -Wl,"
AR="xiar"; ARFLAGS="cru"
;;
*-*-darwin*)
AM_CXXFLAGS="-O -ansi -mp -no-gcc -w1"
MY_SHFLAGS=""; MY_SHLINK="-dynamiclib"; SHEXT=dylib
MY_SHNAME="-Wl,-soname,"; MY_LD="-Wl,--rpath -Wl,"
AR="ar"; ARFLAGS="cru"
;;
*)
AM_CXXFLAGS="-O -ansi -mp -no-gcc -w1"
AM_LDFLAGS="-lstdc++"
MY_SHFLAGS="-fPIC -DPIC"; MY_SHLINK="-shared"; SHEXT=so
MY_SHNAME="-Wl,-soname,"; MY_LD="-Wl,--rpath -Wl,"
AR="xiar"; ARFLAGS="cru"
esac;;
cl)
AM_CXXFLAGS="-EHsc -nologo -GR -GX -MD"
AR="ar"; ARFLAGS="cru"
......
......@@ -51,6 +51,10 @@ check_SCRIPTS = \
excDblThrow.sh
# Identify test(s) to run when 'make check' is requested:
if USING_ICC
# Exceptions is not supported for icc
TESTS =
else
TESTS = \
testExceptions.sh \
testzmex.sh \
......@@ -60,6 +64,7 @@ TESTS = \
exctest3.sh \
exctest4.sh \
exctestNothrow.sh
endif
# excDblThrow.sh
......@@ -75,7 +80,7 @@ exctest2_SOURCES = exctest2.cc
exctest3_SOURCES = exctest3.cc
exctest4_SOURCES = exctest4.cc
exctestNothrow_SOURCES = exctestNothrow.cc
excDblThrow_SOURCES = excDblThrow.cc
#excDblThrow_SOURCES = excDblThrow.cc
# Identify input data file(s) and prototype output file(s):
#EXTRA_DIST = testExceptions.input testExceptions.output
......
......@@ -140,7 +140,7 @@ AH_BOTTOM([#endif // GENERICFUNCTIONS_DEFS_H])
# ----------------------------------------------------------------------
# Locate a C++ compiler:
AC_PROG_CXX(cl g++ g++4 c++ aCC CC cxx cc++ FCC KCC RCC xlC_r xlC gpp)
AC_PROG_CXX(cl icc g++ g++4 c++ aCC CC cxx cc++ FCC KCC RCC xlC_r xlC gpp)
# Use it hereinafter:
AC_LANG(C++)
......@@ -234,6 +234,28 @@ c++)
MY_SHNAME="-Wl,-soname,"; MY_LD="-Wl,--rpath -Wl,"
AR="ar"; ARFLAGS="cru"
esac;;
icc)
case "$target" in
*-*-linux*)
AM_CXXFLAGS="-O -ansi -mp -no-gcc -w1"
AM_LDFLAGS="-lstdc++"
MY_SHFLAGS="-fPIC -DPIC"; MY_SHLINK="-shared"; SHEXT=so
MY_SHNAME="-Wl,-soname,"; MY_LD="-Wl,--rpath -Wl,"
AR="xiar"; ARFLAGS="cru"
;;
*-*-darwin*)
AM_CXXFLAGS="-O -ansi -mp -no-gcc -w1"
MY_SHFLAGS=""; MY_SHLINK="-dynamiclib"; SHEXT=dylib
MY_SHNAME="-Wl,-soname,"; MY_LD="-Wl,--rpath -Wl,"
AR="ar"; ARFLAGS="cru"
;;
*)
AM_CXXFLAGS="-O -ansi -mp -no-gcc -w1"
AM_LDFLAGS="-lstdc++"
MY_SHFLAGS="-fPIC -DPIC"; MY_SHLINK="-shared"; SHEXT=so
MY_SHNAME="-Wl,-soname,"; MY_LD="-Wl,--rpath -Wl,"
AR="xiar"; ARFLAGS="cru"
esac;;
cl)
AM_CXXFLAGS="-EHsc -nologo -GR -GX -MD"
AR="ar"; ARFLAGS="cru"
......
......@@ -141,7 +141,7 @@ AH_BOTTOM([#endif // GEOMETRY_DEFS_H])
# ----------------------------------------------------------------------
# Locate a C++ compiler:
AC_PROG_CXX(cl g++ g++4 c++ aCC CC cxx cc++ FCC KCC RCC xlC_r xlC gpp)
AC_PROG_CXX(cl icc g++ g++4 c++ aCC CC cxx cc++ FCC KCC RCC xlC_r xlC gpp)
# Use it hereinafter:
AC_LANG(C++)
......@@ -235,6 +235,28 @@ c++)
MY_SHNAME="-Wl,-soname,"; MY_LD="-Wl,--rpath -Wl,"
AR="ar"; ARFLAGS="cru"
esac;;
icc)
case "$target" in
*-*-linux*)
AM_CXXFLAGS="-O -ansi -mp -no-gcc -w1"
AM_LDFLAGS="-lstdc++"
MY_SHFLAGS="-fPIC -DPIC"; MY_SHLINK="-shared"; SHEXT=so
MY_SHNAME="-Wl,-soname,"; MY_LD="-Wl,--rpath -Wl,"
AR="xiar"; ARFLAGS="cru"
;;
*-*-darwin*)
AM_CXXFLAGS="-O -ansi -mp -no-gcc -w1"
MY_SHFLAGS=""; MY_SHLINK="-dynamiclib"; SHEXT=dylib
MY_SHNAME="-Wl,-soname,"; MY_LD="-Wl,--rpath -Wl,"
AR="ar"; ARFLAGS="cru"
;;
*)
AM_CXXFLAGS="-O -ansi -mp -no-gcc -w1"
AM_LDFLAGS="-lstdc++"
MY_SHFLAGS="-fPIC -DPIC"; MY_SHLINK="-shared"; SHEXT=so
MY_SHNAME="-Wl,-soname,"; MY_LD="-Wl,--rpath -Wl,"
AR="xiar"; ARFLAGS="cru"
esac;;
cl)
AM_CXXFLAGS="-EHsc -nologo -GR -GX -MD"
AR="ar"; ARFLAGS="cru"
......
......@@ -155,7 +155,7 @@ AH_BOTTOM([/* use correct std::ios_base or std::ios (old) */
# ----------------------------------------------------------------------
# Locate a C++ compiler:
AC_PROG_CXX(cl g++ g++4 c++ aCC CC cxx cc++ FCC KCC RCC xlC_r xlC gpp)
AC_PROG_CXX(cl icc g++ g++4 c++ aCC CC cxx cc++ FCC KCC RCC xlC_r xlC gpp)
# Use it hereinafter:
AC_LANG(C++)
......@@ -249,6 +249,28 @@ c++)
MY_SHNAME="-Wl,-soname,"; MY_LD="-Wl,--rpath -Wl,"
AR="ar"; ARFLAGS="cru"
esac;;
icc)
case "$target" in
*-*-linux*)
AM_CXXFLAGS="-O -ansi -mp -no-gcc -w1"
AM_LDFLAGS="-lstdc++ -lcxa -lunwind"
MY_SHFLAGS="-fPIC -DPIC"; MY_SHLINK="-shared"; SHEXT=so
MY_SHNAME="-Wl,-soname,"; MY_LD="-Wl,--rpath -Wl,"
AR="xiar"; ARFLAGS="cru"
;;
*-*-darwin*)
AM_CXXFLAGS="-O -ansi -mp -no-gcc -w1"
MY_SHFLAGS=""; MY_SHLINK="-dynamiclib"; SHEXT=dylib
MY_SHNAME="-Wl,-soname,"; MY_LD="-Wl,--rpath -Wl,"
AR="ar"; ARFLAGS="cru"
;;
*)
AM_CXXFLAGS="-O -ansi -mp -no-gcc -w1"
AM_LDFLAGS="-lstdc++"
MY_SHFLAGS="-fPIC -DPIC"; MY_SHLINK="-shared"; SHEXT=so
MY_SHNAME="-Wl,-soname,"; MY_LD="-Wl,--rpath -Wl,"
AR="xiar"; ARFLAGS="cru"
esac;;
cl)
AM_CXXFLAGS="-EHsc -nologo -GR -GX -MD"
AR="ar"; ARFLAGS="cru"
......
......@@ -166,7 +166,7 @@ AH_BOTTOM([/* use correct std::ios_base or std::ios (old) */
# ----------------------------------------------------------------------
# Locate a C++ compiler:
AC_PROG_CXX(cl g++ g++4 c++ aCC CC cxx cc++ FCC KCC RCC xlC_r xlC gpp)
AC_PROG_CXX(cl icc g++ g++4 c++ aCC CC cxx cc++ FCC KCC RCC xlC_r xlC gpp)
# Use it hereinafter:
AC_LANG(C++)
......@@ -260,6 +260,28 @@ c++)
MY_SHNAME="-Wl,-soname,"; MY_LD="-Wl,--rpath -Wl,"
AR="ar"; ARFLAGS="cru"
esac;;
icc)
case "$target" in
*-*-linux*)
AM_CXXFLAGS="-O -ansi -mp -no-gcc -w1"
AM_LDFLAGS="-lstdc++ -lcxa -lunwind"
MY_SHFLAGS="-fPIC -DPIC"; MY_SHLINK="-shared"; SHEXT=so
MY_SHNAME="-Wl,-soname,"; MY_LD="-Wl,--rpath -Wl,"
AR="xiar"; ARFLAGS="cru"
;;
*-*-darwin*)
AM_CXXFLAGS="-O -ansi -mp -no-gcc -w1"
MY_SHFLAGS=""; MY_SHLINK="-dynamiclib"; SHEXT=dylib
MY_SHNAME="-Wl,-soname,"; MY_LD="-Wl,--rpath -Wl,"
AR="ar"; ARFLAGS="cru"
;;
*)
AM_CXXFLAGS="-O -ansi -mp -no-gcc -w1"
AM_LDFLAGS="-lstdc++"
MY_SHFLAGS="-fPIC -DPIC"; MY_SHLINK="-shared"; SHEXT=so
MY_SHNAME="-Wl,-soname,"; MY_LD="-Wl,--rpath -Wl,"
AR="xiar"; ARFLAGS="cru"
esac;;
cl)
AM_CXXFLAGS="-EHsc -nologo -GR -GX -MD"
AR="ar"; ARFLAGS="cru"
......
......@@ -20,10 +20,10 @@
CLHEP_BASE= @prefix@
CXX = @CXX@
LIBNAME = -L$(CLHEP_BASE)/lib -lCLHEP-@VERSION@
LIBNAME = -L$(CLHEP_BASE)/lib -lCLHEP-HepPDT-@VERSION@ -lCLHEP-@VERSION@
HerwigLIB = $(HERWIG_DIR)/lib/libherwig.a $(HERWIG_DIR)/lib/libherdum.a $(HERWIG_DIR)/lib/timel.o
IsajetLIB = $(ISAJET_DIR)/isajet.a
PythiaLIB = $(LULIB)/pydata.o $(LULIB)/pyr.o $(LULIB)/liblund.a $(LULIB)/libpydum.a
PythiaLIB = $(PYLIB)/pydata.o $(PYLIB)/libpythia.a $(PYLIB)/libpydum.a
INCDIR = -I$(CLHEP_BASE)/include
LIBS = @AM_LDFLAGS@
......
......@@ -148,7 +148,7 @@ AH_BOTTOM([#endif // MATRIX_DEFS_H])
# ----------------------------------------------------------------------
# Locate a C++ compiler:
AC_PROG_CXX(cl g++ g++4 c++ aCC CC cxx cc++ FCC KCC RCC xlC_r xlC gpp)
AC_PROG_CXX(cl icc g++ g++4 c++ aCC CC cxx cc++ FCC KCC RCC xlC_r xlC gpp)
# Use it hereinafter:
AC_LANG(C++)
......@@ -242,6 +242,28 @@ c++)
MY_SHNAME="-Wl,-soname,"; MY_LD="-Wl,--rpath -Wl,"
AR="ar"; ARFLAGS="cru"
esac;;
icc)
case "$target" in
*-*-linux*)
AM_CXXFLAGS="-O -ansi -mp -no-gcc -w1"
AM_LDFLAGS="-lstdc++ -lcxa -lunwind"
MY_SHFLAGS="-fPIC -DPIC"; MY_SHLINK="-shared"; SHEXT=so
MY_SHNAME="-Wl,-soname,"; MY_LD="-Wl,--rpath -Wl,"
AR="xiar"; ARFLAGS="cru"
;;
*-*-darwin*)
AM_CXXFLAGS="-O -ansi -mp -no-gcc -w1"
MY_SHFLAGS=""; MY_SHLINK="-dynamiclib"; SHEXT=dylib
MY_SHNAME="-Wl,-soname,"; MY_LD="-Wl,--rpath -Wl,"
AR="ar"; ARFLAGS="cru"
;;
*)
AM_CXXFLAGS="-O -ansi -mp -no-gcc -w1"
AM_LDFLAGS="-lstdc++"
MY_SHFLAGS="-fPIC -DPIC"; MY_SHLINK="-shared"; SHEXT=so
MY_SHNAME="-Wl,-soname,"; MY_LD="-Wl,--rpath -Wl,"
AR="xiar"; ARFLAGS="cru"
esac;;
cl)
AM_CXXFLAGS="-EHsc -nologo -GR -GX -MD"
AR="ar"; ARFLAGS="cru"
......
......@@ -147,7 +147,7 @@ AH_BOTTOM([#endif // RANDOM_DEFS_H])
# ----------------------------------------------------------------------
# Locate a C++ compiler:
AC_PROG_CXX(cl g++ g++4 c++ aCC CC cxx cc++ FCC KCC RCC xlC_r xlC gpp)
AC_PROG_CXX(cl icc g++ g++4 c++ aCC CC cxx cc++ FCC KCC RCC xlC_r xlC gpp)
# Use it hereinafter:
AC_LANG(C++)
......@@ -241,6 +241,28 @@ c++)
MY_SHNAME="-Wl,-soname,"; MY_LD="-Wl,--rpath -Wl,"
AR="ar"; ARFLAGS="cru"
esac;;
icc)
case "$target" in
*-*-linux*)
AM_CXXFLAGS="-O -ansi -mp -no-gcc -w1"
AM_LDFLAGS="-lstdc++ -lcxa -lunwind"
MY_SHFLAGS="-fPIC -DPIC"; MY_SHLINK="-shared"; SHEXT=so
MY_SHNAME="-Wl,-soname,"; MY_LD="-Wl,--rpath -Wl,"
AR="xiar"; ARFLAGS="cru"
;;
*-*-darwin*)
AM_CXXFLAGS="-O -ansi -mp -no-gcc -w1"
MY_SHFLAGS=""; MY_SHLINK="-dynamiclib"; SHEXT=dylib
MY_SHNAME="-Wl,-soname,"; MY_LD="-Wl,--rpath -Wl,"
AR="ar"; ARFLAGS="cru"
;;
*)
AM_CXXFLAGS="-O -ansi -mp -no-gcc -w1"
AM_LDFLAGS="-lstdc++"
MY_SHFLAGS="-fPIC -DPIC"; MY_SHLINK="-shared"; SHEXT=so
MY_SHNAME="-Wl,-soname,"; MY_LD="-Wl,--rpath -Wl,"
AR="xiar"; ARFLAGS="cru"
esac;;
cl)
AM_CXXFLAGS="-EHsc -nologo -GR -GX -MD"
AR="ar"; ARFLAGS="cru"
......
......@@ -140,7 +140,7 @@ AH_BOTTOM([#endif // RANDOMOBJECTS_DEFS_H])
# ----------------------------------------------------------------------
# Locate a C++ compiler:
AC_PROG_CXX(cl g++ g++4 c++ aCC CC cxx cc++ FCC KCC RCC xlC_r xlC gpp)
AC_PROG_CXX(cl icc g++ g++4 c++ aCC CC cxx cc++ FCC KCC RCC xlC_r xlC gpp)
# Use it hereinafter:
AC_LANG(C++)
......@@ -234,6 +234,28 @@ c++)
MY_SHNAME="-Wl,-soname,"; MY_LD="-Wl,--rpath -Wl,"
AR="ar"; ARFLAGS="cru"
esac;;
icc)
case "$target" in
*-*-linux*)
AM_CXXFLAGS="-O -ansi -mp -no-gcc -w1"
AM_LDFLAGS="-lstdc++ -lcxa -lunwind"
MY_SHFLAGS="-fPIC -DPIC"; MY_SHLINK="-shared"; SHEXT=so
MY_SHNAME="-Wl,-soname,"; MY_LD="-Wl,--rpath -Wl,"
AR="xiar"; ARFLAGS="cru"
;;
*-*-darwin*)
AM_CXXFLAGS="-O -ansi -mp -no-gcc -w1"
MY_SHFLAGS=""; MY_SHLINK="-dynamiclib"; SHEXT=dylib
MY_SHNAME="-Wl,-soname,"; MY_LD="-Wl,--rpath -Wl,"
AR="ar"; ARFLAGS="cru"
;;
*)
AM_CXXFLAGS="-O -ansi -mp -no-gcc -w1"
AM_LDFLAGS="-lstdc++"
MY_SHFLAGS="-fPIC -DPIC"; MY_SHLINK="-shared"; SHEXT=so
MY_SHNAME="-Wl,-soname,"; MY_LD="-Wl,--rpath -Wl,"
AR="xiar"; ARFLAGS="cru"
esac;;
cl)
AM_CXXFLAGS="-EHsc -nologo -GR -GX -MD"
AR="ar"; ARFLAGS="cru"
......
......@@ -135,7 +135,7 @@ AH_BOTTOM([#endif // REFCOUNT_DEFS_H])
# ----------------------------------------------------------------------
# Locate a C++ compiler:
AC_PROG_CXX(cl g++ g++4 c++ aCC CC cxx cc++ FCC KCC RCC xlC_r xlC gpp)
AC_PROG_CXX(cl icc g++ g++4 c++ aCC CC cxx cc++ FCC KCC RCC xlC_r xlC gpp)
# Use it hereinafter:
AC_LANG(C++)
......@@ -229,6 +229,28 @@ c++)
MY_SHNAME="-Wl,-soname,"; MY_LD="-Wl,--rpath -Wl,"
AR="ar"; ARFLAGS="cru"
esac;;
icc)
case "$target" in
*-*-linux*)
AM_CXXFLAGS="-O -ansi -mp -no-gcc -w1"
AM_LDFLAGS="-lstdc++"
MY_SHFLAGS="-fPIC -DPIC"; MY_SHLINK="-shared"; SHEXT=so
MY_SHNAME="-Wl,-soname,"; MY_LD="-Wl,--rpath -Wl,"
AR="xiar"; ARFLAGS="cru"
;;
*-*-darwin*)
AM_CXXFLAGS="-O -ansi -mp -no-gcc -w1"
MY_SHFLAGS=""; MY_SHLINK="-dynamiclib"; SHEXT=dylib
MY_SHNAME="-Wl,-soname,"; MY_LD="-Wl,--rpath -Wl,"
AR="ar"; ARFLAGS="cru"
;;
*)
AM_CXXFLAGS="-O -ansi -mp -no-gcc -w1"
AM_LDFLAGS="-lstdc++"
MY_SHFLAGS="-fPIC -DPIC"; MY_SHLINK="-shared"; SHEXT=so
MY_SHNAME="-Wl,-soname,"; MY_LD="-Wl,--rpath -Wl,"
AR="xiar"; ARFLAGS="cru"
esac;;
cl)
AM_CXXFLAGS="-EHsc -nologo -GR -GX -MD"
AR="ar"; ARFLAGS="cru"
......
......@@ -151,7 +151,7 @@ AH_BOTTOM([/* use correct std::ios_base or std::ios (old) */
# ----------------------------------------------------------------------
# Locate a C++ compiler:
AC_PROG_CXX(cl g++ g++4 c++ aCC CC cxx cc++ FCC KCC RCC xlC_r xlC gpp)
AC_PROG_CXX(cl icc g++ g++4 c++ aCC CC cxx cc++ FCC KCC RCC xlC_r xlC gpp)
# Use it hereinafter:
AC_LANG(C++)
......@@ -245,6 +245,28 @@ c++)
MY_SHNAME="-Wl,-soname,"; MY_LD="-Wl,--rpath -Wl,"
AR="ar"; ARFLAGS="cru"
esac;;
icc)
case "$target" in
*-*-linux*)
AM_CXXFLAGS="-O -ansi -mp -no-gcc -w1"
AM_LDFLAGS="-lstdc++ -lcxa -lunwind"
MY_SHFLAGS="-fPIC -DPIC"; MY_SHLINK="-shared"; SHEXT=so
MY_SHNAME="-Wl,-soname,"; MY_LD="-Wl,--rpath -Wl,"
AR="xiar"; ARFLAGS="cru"
;;
*-*-darwin*)
AM_CXXFLAGS="-O -ansi -mp -no-gcc -w1"
MY_SHFLAGS=""; MY_SHLINK="-dynamiclib"; SHEXT=dylib
MY_SHNAME="-Wl,-soname,"; MY_LD="-Wl,--rpath -Wl,"
AR="ar"; ARFLAGS="cru"
;;
*)
AM_CXXFLAGS="-O -ansi -mp -no-gcc -w1"
AM_LDFLAGS="-lstdc++"
MY_SHFLAGS="-fPIC -DPIC"; MY_SHLINK="-shared"; SHEXT=so
MY_SHNAME="-Wl,-soname,"; MY_LD="-Wl,--rpath -Wl,"
AR="xiar"; ARFLAGS="cru"
esac;;
cl)
AM_CXXFLAGS="-EHsc -nologo -GR -GX -MD"
AR="ar"; ARFLAGS="cru"
......
......@@ -14,7 +14,8 @@
CLHEP_BASE= @prefix@
CXX = @CXX@
INCDIR = -I$(CLHEP_BASE)/include
LIBNAME = -L$(CLHEP_BASE)/lib -lCLHEP-@VERSION@
LIBNAME = -L$(CLHEP_BASE)/lib -lCLHEP-StdHep-@VERSION@ \
-lCLHEP-HepMC-@VERSION@ -lCLHEP-HepPDT-@VERSION@ -lCLHEP-@VERSION@
################################################################################
......
......@@ -139,7 +139,7 @@ AH_BOTTOM([#endif // UNITS_DEFS_H])
# ----------------------------------------------------------------------
# Locate a C++ compiler:
AC_PROG_CXX(cl g++ g++4 c++ aCC CC cxx cc++ FCC KCC RCC xlC_r xlC gpp)
AC_PROG_CXX(cl icc g++ g++4 c++ aCC CC cxx cc++ FCC KCC RCC xlC_r xlC gpp)
# Use it hereinafter:
AC_LANG(C++)
......@@ -233,6 +233,27 @@ c++)
MY_SHNAME="-Wl,-soname,"; MY_LD="-Wl,--rpath -Wl,"
AR="ar"; ARFLAGS="cru"
esac;;
icc)
case "$target" in
*-*-linux*)
AM_CXXFLAGS="-O -ansi -mp -no-gcc -w1"
AM_LDFLAGS="-lstdc++"
MY_SHFLAGS="-fPIC -DPIC"; MY_SHLINK="-shared"; SHEXT=so
MY_SHNAME="-Wl,-soname,"; MY_LD="-Wl,--rpath -Wl,"
AR="xiar"; ARFLAGS="cru"
;;
*-*-darwin*)
AM_CXXFLAGS="-O -ansi -mp -no-gcc -w1"
MY_SHFLAGS=""; MY_SHLINK="-dynamiclib"; SHEXT=dylib
MY_SHNAME="-Wl,-soname,"; MY_LD="-Wl,--rpath -Wl,"
AR="ar"; ARFLAGS="cru"
;;
*)
AM_CXXFLAGS="-O -ansi -mp -no-gcc -w1"
MY_SHFLAGS="-fPIC"; MY_SHLINK="-shared"; SHEXT=so
MY_SHNAME="-Wl,-soname,"; MY_LD="-Wl,--rpath -Wl,"
AR="ar"; ARFLAGS="cru"
esac;;
cl)
AM_CXXFLAGS="-EHsc -nologo -GR -GX -MD"
AR="ar"; ARFLAGS="cru"
......
......@@ -150,7 +150,7 @@ AH_BOTTOM([#endif // VECTOR_DEFS_H])
# ----------------------------------------------------------------------
# Locate a C++ compiler:
AC_PROG_CXX(cl g++ g++4 c++ aCC CC cxx cc++ FCC KCC RCC xlC_r xlC gpp)
AC_PROG_CXX(cl icc g++ g++4 c++ aCC CC cxx cc++ FCC KCC RCC xlC_r xlC gpp)
# Use it hereinafter:
AC_LANG(C++)
......@@ -244,6 +244,27 @@ c++)
MY_SHNAME="-Wl,-soname,"; MY_LD="-Wl,--rpath -Wl,"
AR="ar"; ARFLAGS="cru"
esac;;
icc)
case "$target" in
*-*-linux*)
AM_CXXFLAGS="-O -ansi -mp -no-gcc -w1"
AM_LDFLAGS="-lstdc++ -lcxa -lunwind"
MY_SHFLAGS="-fPIC -DPIC"; MY_SHLINK="-shared"; SHEXT=so
MY_SHNAME="-Wl,-soname,"; MY_LD="-Wl,--rpath -Wl,"
AR="xiar"; ARFLAGS="cru"
;;
*-*-darwin*)
AM_CXXFLAGS="-O -ansi -mp -no-gcc -w1"
MY_SHFLAGS=""; MY_SHLINK="-dynamiclib"; SHEXT=dylib
MY_SHNAME="-Wl,-soname,"; MY_LD="-Wl,--rpath -Wl,"
AR="ar"; ARFLAGS="cru"
;;
*)
AM_CXXFLAGS="-O -ansi -mp -no-gcc -w1"
MY_SHFLAGS="-fPIC"; MY_SHLINK="-shared"; SHEXT=so
MY_SHNAME="-Wl,-soname,"; MY_LD="-Wl,--rpath -Wl,"
AR="ar"; ARFLAGS="cru"
esac;;
cl)
AM_CXXFLAGS="-EHsc -nologo -GR -GX -MD"
AR="ar"; ARFLAGS="cru"
......
......@@ -97,7 +97,7 @@ AC_CONFIG_FILES([clhep-config], [chmod +x clhep-config])
# ----------------------------------------------------------------------
# Locate a C++ compiler:
AC_PROG_CXX(cl g++ g++4 c++ aCC CC cxx cc++ FCC KCC RCC xlC_r xlC gpp)
AC_PROG_CXX(cl icc g++ g++4 c++ aCC CC cxx cc++ FCC KCC RCC xlC_r xlC gpp)
# Use it hereinafter:
AC_LANG(C++)
......@@ -191,6 +191,28 @@ c++)
MY_SHNAME="-Wl,-soname,"; MY_LD="-Wl,--rpath -Wl,"
AR="ar"; ARFLAGS="cru"
esac;;
icc)
case "$target" in
*-*-linux*)
AM_CXXFLAGS="-O -ansi -mp -no-gcc -w1"
AM_LDFLAGS="-lstdc++"
MY_SHFLAGS="-fPIC -DPIC"; MY_SHLINK="-shared"; SHEXT=so
MY_SHNAME="-Wl,-soname,"; MY_LD="-Wl,--rpath -Wl,"
AR="xiar"; ARFLAGS="cru"
;;
*-*-darwin*)
AM_CXXFLAGS="-O -ansi -mp -no-gcc -w1"
MY_SHFLAGS=""; MY_SHLINK="-dynamiclib"; SHEXT=dylib
MY_SHNAME="-Wl,-soname,"; MY_LD="-Wl,--rpath -Wl,"
AR="ar"; ARFLAGS="cru"
;;
*)
AM_CXXFLAGS="-O -ansi -mp -no-gcc -w1"
AM_LDFLAGS="-lstdc++"
MY_SHFLAGS="-fPIC -DPIC"; MY_SHLINK="-shared"; SHEXT=so
MY_SHNAME="-Wl,-soname,"; MY_LD="-Wl,--rpath -Wl,"
AR="xiar"; ARFLAGS="cru"
esac;;
cl)
AM_CXXFLAGS="-EHsc -nologo -GR -GX -MD"
AR="ar"; ARFLAGS="cru"
......
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