[cig-commits] r14784 - mc/3D/CitcomS/trunk

[leif at geodynamics.org]

Author: leif
Date: 2009-04-21 15:29:26 -0700 (Tue, 21 Apr 2009)
New Revision: 14784

Modified:
   mc/3D/CitcomS/trunk/configure.ac
Log:
The new Python.h header check reorders this script somewhat.
CIT_CHECK_PYTHON_HEADER must follow AC_PROG_CC, and precede
CIT_PYTHON_EGG_SETUP.


Modified: mc/3D/CitcomS/trunk/configure.ac
===================================================================
--- mc/3D/CitcomS/trunk/configure.ac	2009-04-21 19:38:27 UTC (rev 14783)
+++ mc/3D/CitcomS/trunk/configure.ac	2009-04-21 22:29:26 UTC (rev 14784)
@@ -54,6 +54,10 @@
     [want_exchanger="$withval"],
     [want_exchanger=auto])
 
+# Checks for programs.
+AC_PROG_CC([mpicc hcc mpcc mpcc_r mpxlc cmpicc gcc cc cl icc ecc pgcc xlc xlc_r])
+AC_PROG_CXX([mpicxx mpic++ mpiCC hcp mpCC mpxlC mpxlC_r cmpic++ g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlc++_r xlC_r xlC icpc ecpc pgCC])
+
 if test "$want_pyre" = yes; then
     # Check for Python.
     AM_PATH_PYTHON([2.3])
@@ -64,6 +68,12 @@
     # Check for Python modules and packages.
     export want_exchanger
     CIT_PYTHON_EGG_SETUP
+
+    CIT_PROG_PYCONFIG
+    AC_SUBST([pkgsysconfdir], [\${sysconfdir}/$PACKAGE])
+    # Compile C as C++.
+    dnl CC="$CXX"
+    dnl CFLAGS="$CXXFLAGS"
 else
     if test "$want_exchanger" = yes; then
         AC_MSG_ERROR([Exchanger requires Pyre])
@@ -71,16 +81,6 @@
     want_exchanger=no
 fi
 
-# Checks for programs.
-AC_PROG_CC([mpicc hcc mpcc mpcc_r mpxlc cmpicc gcc cc cl icc ecc pgcc xlc xlc_r])
-AC_PROG_CXX([mpicxx mpic++ mpiCC hcp mpCC mpxlC mpxlC_r cmpic++ g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlc++_r xlC_r xlC icpc ecpc pgCC])
-if test "$want_pyre" = yes; then
-    CIT_PROG_PYCONFIG
-    AC_SUBST([pkgsysconfdir], [\${sysconfdir}/$PACKAGE])
-    # Compile C as C++.
-    dnl CC="$CXX"
-    dnl CFLAGS="$CXXFLAGS"
-fi
 # We don't need Fortran.
 AC_PROVIDE([AC_PROG_F77])
 AC_PROG_LIBTOOL