Merge branch 'master' into meshfree_interp

libMesh · Dec 26, 2012 · a9bf681 · a9bf681
2 parents 5a25390 + b8cb652
commit a9bf681
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 25 deletions.
diff --git a/configure b/configure
@@ -28823,9 +28823,11 @@ else
 fi
 
 
+
 fi
 
 
+
 fi
 
 
@@ -28842,8 +28844,7 @@ $as_echo "<<< Configuring library with AztecOO support >>>" >&6; }
 ac_fn_cxx_check_header_mongrel "$LINENO" "$withtrilinosdir/include/NOX_Config.h" "$as_ac_Header" "$ac_includes_default"
 if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
   enablenox=yes
-else
-  as_ac_Header=`$as_echo "ac_cv_header_$withtrilinosdir/NOX_Config.h" | $as_tr_sh`
+                       as_ac_Header=`$as_echo "ac_cv_header_$withtrilinosdir/NOX_Config.h" | $as_tr_sh`
 ac_fn_cxx_check_header_mongrel "$LINENO" "$withtrilinosdir/NOX_Config.h" "$as_ac_Header" "$ac_includes_default"
 if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
   enablenox=yes
@@ -28857,9 +28858,11 @@ else
 fi
 
 
+
 fi
 
 
+
 fi
 
 
@@ -28891,9 +28894,11 @@ else
 fi
 
 
+
 fi
 
 
+
 fi
 
 

diff --git a/doc/html/publications.php b/doc/html/publications.php
@@ -91,13 +91,13 @@
 G.&nbsp;Bornia.
  <em>Analysis of optimal control problems for the incompressible MHD
   equations and implementation in a finite element multiphysics code</em>.
- PhD thesis, Universit&aacute; di Bologna, 2012.
+ PhD thesis, Universit&agrave; di Bologna, 2012.
 
   <a href="http://amsdottorato.cib.unibo.it/4868/1/giorgio_bornia_tesi.pdf">http://amsdottorato.cib.unibo.it/4868/1/giorgio_bornia_tesi.pdf</a>.
 <a name="Bornia_thesis"></a><pre>
 @phdthesis{Bornia_thesis,
   author = {G.~Bornia},
-  school = {Universit\'{a} di Bologna},
+  school = {Universit\`{a} di Bologna},
   title = {{Analysis of optimal control problems for the incompressible MHD equations and implementation in a finite element multiphysics code}},
   note = {\url{http://amsdottorato.cib.unibo.it/4868/1/giorgio_bornia_tesi.pdf}},
   year = {2012}

diff --git a/m4/trilinos.m4 b/m4/trilinos.m4
@@ -35,13 +35,15 @@ AC_DEFUN([CONFIGURE_TRILINOS_10],
        dnl ------------------------------------------------------
        dnl AztecOO
        dnl ------------------------------------------------------
-       AC_CHECK_HEADER($withtrilinosdir/include/AztecOO_config.h,
-                       enableaztecoo=yes,
-                       AC_CHECK_HEADER($withtrilinosdir/AztecOO_config.h,
-                                     enableaztecoo=yes,
-                                     AC_CHECK_HEADER($withtrilinosdir/packages/aztecoo/src/AztecOO_config.h,
-                                                 enableaztecoo=yes,
-                                                 enableaztecoo=no)))
+       AC_CHECK_HEADER([$withtrilinosdir/include/AztecOO_config.h],
+                       [enableaztecoo=yes],
+                       [AC_CHECK_HEADER([$withtrilinosdir/AztecOO_config.h],
+                                        [enableaztecoo=yes],
+                                        [AC_CHECK_HEADER([$withtrilinosdir/packages/aztecoo/src/AztecOO_config.h],
+                                                         [enableaztecoo=yes],
+                                                         [enableaztecoo=no])
+					])
+		       ])
                      
        if test "$enableaztecoo" != no ; then
           AC_DEFINE(HAVE_AZTECOO, 1,
@@ -52,13 +54,15 @@ AC_DEFUN([CONFIGURE_TRILINOS_10],
        dnl ------------------------------------------------------
        dnl NOX
        dnl ------------------------------------------------------
-       AC_CHECK_HEADER($withtrilinosdir/include/NOX_Config.h,
-                       enablenox=yes,
-                       AC_CHECK_HEADER($withtrilinosdir/NOX_Config.h,
-                                    enablenox=yes,
-                                    AC_CHECK_HEADER($withtrilinosdir/packages/nox/src/NOX_Config.h,
-                                                 enablenox=yes,
-                                                 enablenox=no)))
+       AC_CHECK_HEADER([$withtrilinosdir/include/NOX_Config.h],
+                       [enablenox=yes]
+                       [AC_CHECK_HEADER([$withtrilinosdir/NOX_Config.h],
+                                        [enablenox=yes],
+                                        [AC_CHECK_HEADER([$withtrilinosdir/packages/nox/src/NOX_Config.h],
+                                                         [enablenox=yes],
+                                                         [enablenox=no])
+					])
+		       ])
                      
        if test "$enablenox" != no ; then
           AC_DEFINE(HAVE_NOX, 1,
@@ -69,13 +73,15 @@ AC_DEFUN([CONFIGURE_TRILINOS_10],
        dnl ------------------------------------------------------
        dnl ML
        dnl ------------------------------------------------------
-       AC_CHECK_HEADER($withtrilinosdir/include/ml_include.h,
-                       enableml=yes,
-                       AC_CHECK_HEADER($withtrilinosdir/ml_include.h,
-                                       enableml=yes,
-                                       AC_CHECK_HEADER($withtrilinosdir/packages/ml/src/Include/ml_include.h,
-                                                enableml=yes,
-                                                enableml=no)))
+       AC_CHECK_HEADER([$withtrilinosdir/include/ml_include.h],
+                       [enableml=yes],
+                       [AC_CHECK_HEADER([$withtrilinosdir/ml_include.h],
+                                        [enableml=yes],
+                                        [AC_CHECK_HEADER([$withtrilinosdir/packages/ml/src/Include/ml_include.h],
+                                                         [enableml=yes],
+                                                         [enableml=no])
+					])
+		       ])
                      
        if test "$enableml" != no ; then
           AC_DEFINE(HAVE_ML, 1,