make sure g++ is the default

Cast/configure.in

@@ -138,7 +138,7 @@ AH_BOTTOM([#endif  // CAST_DEFS_H])
 # ----------------------------------------------------------------------
 
 # Locate a C++ compiler:
-AC_PROG_CXX(cl icc g++ g++4 c++ aCC CC cxx cc++ FCC KCC RCC xlC_r xlC gpp)
+AC_PROG_CXX(cl g++ g++4 c++ icc aCC CC cxx cc++ FCC KCC RCC xlC_r xlC gpp)
 
 # Use it hereinafter:
 AC_LANG(C++)

ChangeLog

+2006-11-15  Lynn Garren <garren@fnal.gov>
+
+	* configure.in: change ordering of possible C++ compilers so that
+	                g++ remains the default compiler if icc is in the path
+
 ==============================
 18.10.06 Release CLHEP-2.0.3.0
 ==============================

Evaluator/configure.in

@@ -140,7 +140,7 @@ AH_BOTTOM([#endif  // EVALUATOR_DEFS_H])
 # ----------------------------------------------------------------------
 
 # Locate a C++ compiler:
-AC_PROG_CXX(cl icc g++ g++4 c++ aCC CC cxx cc++ FCC KCC RCC xlC_r xlC gpp)
+AC_PROG_CXX(cl g++ g++4 c++ icc aCC CC cxx cc++ FCC KCC RCC xlC_r xlC gpp)
 
 # Use it hereinafter:
 AC_LANG(C++)

Exceptions/configure.in

@@ -148,7 +148,7 @@ AH_BOTTOM([#endif  // EXCEPTIONS_DEFS_H])
 # ----------------------------------------------------------------------
 
 # Locate a C++ compiler:
-AC_PROG_CXX(cl icc g++ g++4 c++ aCC CC cxx cc++ FCC KCC RCC xlC_r xlC gpp)
+AC_PROG_CXX(cl g++ g++4 c++ icc aCC CC cxx cc++ FCC KCC RCC xlC_r xlC gpp)
 
 # Use it hereinafter:
 AC_LANG(C++)

GenericFunctions/configure.in

@@ -140,7 +140,7 @@ AH_BOTTOM([#endif  // GENERICFUNCTIONS_DEFS_H])
 # ----------------------------------------------------------------------
 
 # Locate a C++ compiler:
-AC_PROG_CXX(cl icc g++ g++4 c++ aCC CC cxx cc++ FCC KCC RCC xlC_r xlC gpp)
+AC_PROG_CXX(cl g++ g++4 c++ icc aCC CC cxx cc++ FCC KCC RCC xlC_r xlC gpp)
 
 # Use it hereinafter:
 AC_LANG(C++)

Geometry/configure.in

@@ -141,7 +141,7 @@ AH_BOTTOM([#endif  // GEOMETRY_DEFS_H])
 # ----------------------------------------------------------------------
 
 # Locate a C++ compiler:
-AC_PROG_CXX(cl icc g++ g++4 c++ aCC CC cxx cc++ FCC KCC RCC xlC_r xlC gpp)
+AC_PROG_CXX(cl g++ g++4 c++ icc aCC CC cxx cc++ FCC KCC RCC xlC_r xlC gpp)
 
 # Use it hereinafter:
 AC_LANG(C++)

HepMC/configure.in

@@ -155,7 +155,7 @@ AH_BOTTOM([/*  use correct std::ios_base or std::ios (old) */
 # ----------------------------------------------------------------------
 
 # Locate a C++ compiler:
-AC_PROG_CXX(cl icc g++ g++4 c++ aCC CC cxx cc++ FCC KCC RCC xlC_r xlC gpp)
+AC_PROG_CXX(cl g++ g++4 c++ icc aCC CC cxx cc++ FCC KCC RCC xlC_r xlC gpp)
 
 # Use it hereinafter:
 AC_LANG(C++)

HepPDT/configure.in

@@ -166,7 +166,7 @@ AH_BOTTOM([/*  use correct std::ios_base or std::ios (old) */
 # ----------------------------------------------------------------------
 
 # Locate a C++ compiler:
-AC_PROG_CXX(cl icc g++ g++4 c++ aCC CC cxx cc++ FCC KCC RCC xlC_r xlC gpp)
+AC_PROG_CXX(cl g++ g++4 c++ icc aCC CC cxx cc++ FCC KCC RCC xlC_r xlC gpp)
 
 # Use it hereinafter:
 AC_LANG(C++)

Matrix/configure.in

@@ -148,7 +148,7 @@ AH_BOTTOM([#endif  // MATRIX_DEFS_H])
 # ----------------------------------------------------------------------
 
 # Locate a C++ compiler:
-AC_PROG_CXX(cl icc g++ g++4 c++ aCC CC cxx cc++ FCC KCC RCC xlC_r xlC gpp)
+AC_PROG_CXX(cl g++ g++4 c++ icc aCC CC cxx cc++ FCC KCC RCC xlC_r xlC gpp)
 
 # Use it hereinafter:
 AC_LANG(C++)

Random/configure.in

@@ -147,7 +147,7 @@ AH_BOTTOM([#endif  // RANDOM_DEFS_H])
 # ----------------------------------------------------------------------
 
 # Locate a C++ compiler:
-AC_PROG_CXX(cl icc g++ g++4 c++ aCC CC cxx cc++ FCC KCC RCC xlC_r xlC gpp)
+AC_PROG_CXX(cl g++ g++4 c++ icc aCC CC cxx cc++ FCC KCC RCC xlC_r xlC gpp)
 
 # Use it hereinafter:
 AC_LANG(C++)

RandomObjects/configure.in

@@ -140,7 +140,7 @@ AH_BOTTOM([#endif  // RANDOMOBJECTS_DEFS_H])
 # ----------------------------------------------------------------------
 
 # Locate a C++ compiler:
-AC_PROG_CXX(cl icc g++ g++4 c++ aCC CC cxx cc++ FCC KCC RCC xlC_r xlC gpp)
+AC_PROG_CXX(cl g++ g++4 c++ icc aCC CC cxx cc++ FCC KCC RCC xlC_r xlC gpp)
 
 # Use it hereinafter:
 AC_LANG(C++)

RefCount/configure.in

@@ -135,7 +135,7 @@ AH_BOTTOM([#endif  // REFCOUNT_DEFS_H])
 # ----------------------------------------------------------------------
 
 # Locate a C++ compiler:
-AC_PROG_CXX(cl icc g++ g++4 c++ aCC CC cxx cc++ FCC KCC RCC xlC_r xlC gpp)
+AC_PROG_CXX(cl g++ g++4 c++ icc aCC CC cxx cc++ FCC KCC RCC xlC_r xlC gpp)
 
 # Use it hereinafter:
 AC_LANG(C++)

StdHep/configure.in

@@ -151,7 +151,7 @@ AH_BOTTOM([/*  use correct std::ios_base or std::ios (old) */
 # ----------------------------------------------------------------------
 
 # Locate a C++ compiler:
-AC_PROG_CXX(cl icc g++ g++4 c++ aCC CC cxx cc++ FCC KCC RCC xlC_r xlC gpp)
+AC_PROG_CXX(cl g++ g++4 c++ icc aCC CC cxx cc++ FCC KCC RCC xlC_r xlC gpp)
 
 # Use it hereinafter:
 AC_LANG(C++)

Units/configure.in

@@ -139,7 +139,7 @@ AH_BOTTOM([#endif  // UNITS_DEFS_H])
 # ----------------------------------------------------------------------
 
 # Locate a C++ compiler:
-AC_PROG_CXX(cl icc g++ g++4 c++ aCC CC cxx cc++ FCC KCC RCC xlC_r xlC gpp)
+AC_PROG_CXX(cl g++ g++4 c++ icc aCC CC cxx cc++ FCC KCC RCC xlC_r xlC gpp)
 
 # Use it hereinafter:
 AC_LANG(C++)

Vector/configure.in

@@ -150,7 +150,7 @@ AH_BOTTOM([#endif  // VECTOR_DEFS_H])
 # ----------------------------------------------------------------------
 
 # Locate a C++ compiler:
-AC_PROG_CXX(cl icc g++ g++4 c++ aCC CC cxx cc++ FCC KCC RCC xlC_r xlC gpp)
+AC_PROG_CXX(cl g++ g++4 c++ icc aCC CC cxx cc++ FCC KCC RCC xlC_r xlC gpp)
 
 # Use it hereinafter:
 AC_LANG(C++)

configure.in

@@ -97,7 +97,7 @@ AC_CONFIG_FILES([clhep-config], [chmod +x clhep-config])
 # ----------------------------------------------------------------------
 
 # Locate a C++ compiler:
-AC_PROG_CXX(cl icc g++ g++4 c++ aCC CC cxx cc++ FCC KCC RCC xlC_r xlC gpp)
+AC_PROG_CXX(cl g++ g++4 c++ icc aCC CC cxx cc++ FCC KCC RCC xlC_r xlC gpp)
 
 # Use it hereinafter:
 AC_LANG(C++)