Skip to content

Commit

Permalink
case statement is clearer
Browse files Browse the repository at this point in the history
benkirk committed Feb 6, 2013
1 parent b848041 commit 60a60e7
Showing 2 changed files with 36 additions and 26 deletions.
29 changes: 17 additions & 12 deletions configure
Original file line number Diff line number Diff line change
@@ -31791,28 +31791,33 @@ fi
exodusversion=no
fi

if (test "x$exodusversion" = "xv5.09"); then
# The EXODUS API is distributed with libmesh, so we don't have to guess
# where it might be installed...
EXODUS_INCLUDE="-I\$(top_srcdir)/contrib/exodusii/$exodusversion/include"
case "${exodusversion}" in

"v5.09")
# The EXODUS API is distributed with libmesh, so we don't have to guess
# where it might be installed...
EXODUS_INCLUDE="-I\$(top_srcdir)/contrib/exodusii/$exodusversion/include"

$as_echo "#define HAVE_EXODUS_API 1" >>confdefs.h

{ $as_echo "$as_me:${as_lineno-$LINENO}: result: <<< Configuring library with Exodus version $exodusversion support >>>" >&5
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: <<< Configuring library with Exodus version $exodusversion support >>>" >&5
$as_echo "<<< Configuring library with Exodus version $exodusversion support >>>" >&6; }
;;

elif (test "x$exodusversion" = "xv5.22"); then
EXODUS_INCLUDE="-I\$(top_srcdir)/contrib/exodusii/$exodusversion/exodus/cbind/include"
"v5.22")
EXODUS_INCLUDE="-I\$(top_srcdir)/contrib/exodusii/$exodusversion/exodus/cbind/include"

$as_echo "#define HAVE_EXODUS_API 1" >>confdefs.h

{ $as_echo "$as_me:${as_lineno-$LINENO}: result: <<< Configuring library with Exodus version $exodusversion support >>>" >&5
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: <<< Configuring library with Exodus version $exodusversion support >>>" >&5
$as_echo "<<< Configuring library with Exodus version $exodusversion support >>>" >&6; }
;;

else
EXODUS_INCLUDE=""
enableexodus=no
fi
*)
EXODUS_INCLUDE=""
enableexodus=no
;;
esac

ac_config_files="$ac_config_files contrib/exodusii/v5.09/Makefile"

33 changes: 19 additions & 14 deletions m4/exodus.m4
Original file line number Diff line number Diff line change
@@ -20,22 +20,27 @@ AC_DEFUN([CONFIGURE_EXODUS],
exodusversion=no
fi
if (test "x$exodusversion" = "xv5.09"); then
# The EXODUS API is distributed with libmesh, so we don't have to guess
# where it might be installed...
EXODUS_INCLUDE="-I\$(top_srcdir)/contrib/exodusii/$exodusversion/include"
AC_DEFINE(HAVE_EXODUS_API, 1, [Flag indicating whether the library will be compiled with Exodus support])
AC_MSG_RESULT(<<< Configuring library with Exodus version $exodusversion support >>>)
case "${exodusversion}" in
"v5.09")
# The EXODUS API is distributed with libmesh, so we don't have to guess
# where it might be installed...
EXODUS_INCLUDE="-I\$(top_srcdir)/contrib/exodusii/$exodusversion/include"
AC_DEFINE(HAVE_EXODUS_API, 1, [Flag indicating whether the library will be compiled with Exodus support])
AC_MSG_RESULT(<<< Configuring library with Exodus version $exodusversion support >>>)
;;
elif (test "x$exodusversion" = "xv5.22"); then
EXODUS_INCLUDE="-I\$(top_srcdir)/contrib/exodusii/$exodusversion/exodus/cbind/include"
AC_DEFINE(HAVE_EXODUS_API, 1, [Flag indicating whether the library will be compiled with Exodus support])
AC_MSG_RESULT(<<< Configuring library with Exodus version $exodusversion support >>>)
"v5.22")
EXODUS_INCLUDE="-I\$(top_srcdir)/contrib/exodusii/$exodusversion/exodus/cbind/include"
AC_DEFINE(HAVE_EXODUS_API, 1, [Flag indicating whether the library will be compiled with Exodus support])
AC_MSG_RESULT(<<< Configuring library with Exodus version $exodusversion support >>>)
;;
else
EXODUS_INCLUDE=""
enableexodus=no
fi
*)
EXODUS_INCLUDE=""
enableexodus=no
;;
esac
AC_CONFIG_FILES([contrib/exodusii/v5.09/Makefile])
AC_CONFIG_FILES([contrib/exodusii/v5.22/exodus/cbind/Makefile])

0 comments on commit 60a60e7

Please sign in to comment.