Permalink
Browse files

rigorous m4 quoting seems required for some older autoconfs

  • Loading branch information...
1 parent ee96345 commit b8cb65243b804435ca9da1dfefd1c878229fbcd6 @benkirk benkirk committed Dec 26, 2012
Showing with 34 additions and 23 deletions.
  1. +7 −2 configure
  2. +27 −21 m4/trilinos.m4
View
@@ -28818,9 +28818,11 @@ else
fi
+
fi
+
fi
@@ -28837,8 +28839,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
@@ -28852,9 +28853,11 @@ else
fi
+
fi
+
fi
@@ -28886,9 +28889,11 @@ else
fi
+
fi
+
fi
View
@@ -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,

0 comments on commit b8cb652

Please sign in to comment.