[cig-commits] r18273 - short/3D/PyLith/pylith_installer/trunk

[brad at geodynamics.org]

Author: brad
Date: 2011-04-21 16:03:57 -0700 (Thu, 21 Apr 2011)
New Revision: 18273

Modified:
   short/3D/PyLith/pylith_installer/trunk/Makefile.am
   short/3D/PyLith/pylith_installer/trunk/configure.ac
Log:
More fixes.

Modified: short/3D/PyLith/pylith_installer/trunk/Makefile.am
===================================================================
--- short/3D/PyLith/pylith_installer/trunk/Makefile.am	2011-04-21 22:42:31 UTC (rev 18272)
+++ short/3D/PyLith/pylith_installer/trunk/Makefile.am	2011-04-21 23:03:57 UTC (rev 18273)
@@ -141,9 +141,9 @@
 # ----------------------------------------------------------------------
 compilers: finished_mkdest
 if INSTALL_GCC
-LANGUAGES = "c,c++"
+LANGUAGES = c,c++
 if WITH_FORTRAN
-LANGUAGES += ",fortran"
+LANGUAGES = c,c++,fortran
 endif
 	$(FETCH_SCRIPT) "$(downloader)" gcc-$(GCC_VER).tar.bz2 http://geodynamics.org/~buildbot/deps
 	$(FETCH_SCRIPT) "$(downloader)" mpc-$(MPC_VER).tar.gz http://geodynamics.org/~buildbot/deps
@@ -159,7 +159,8 @@
 		ln -sf mpfr-2.4.2/ mpfr
 	$(MKDIR_P) gcc-build
 	cd gcc-build && \
-		../gcc-4.5.2/configure --prefix=$(prefix) $(LANGUAGES)
+		../gcc-4.5.2/configure --prefix=$(prefix) \
+			--enable-languages=$(LANGUAGES) && \
 		make -j $(make_threads) && \
 		make install && \
 		touch ../installed_compilers

Modified: short/3D/PyLith/pylith_installer/trunk/configure.ac
===================================================================
--- short/3D/PyLith/pylith_installer/trunk/configure.ac	2011-04-21 22:42:31 UTC (rev 18272)
+++ short/3D/PyLith/pylith_installer/trunk/configure.ac	2011-04-21 23:03:57 UTC (rev 18273)
@@ -159,7 +159,7 @@
 # FORTRAN
 AC_ARG_WITH([fortran],
     [AC_HELP_STRING([--with-fortran],
-        [enable Fortran options for packages @<:@default=yes@:>@])],
+        [enable Fortran options for packages @<:@default=no@:>@])],
 	[with_fortran=yes],
 	[with_fortran=no])
 AM_CONDITIONAL([WITH_FORTRAN], [test "$with_fortran" = yes])
@@ -463,9 +463,15 @@
 fi
 
 echo ""
-echo "Additional info:"
+echo "Build info:"
 echo "  Using $downloader to download tarballs."
 echo "  Using $make_threads thread(s) when running make in parallel."
+echo -n "  Languages enabled: "
+if test "$with_fortran" = yes ; then
+  echo "C,C++,Fortran"
+else
+  echo "C,C++"
+fi
 echo ""
 echo "PyLith dependencies to be installed:"
 echo ""