Changeset 15181

Timestamp:

05/30/13 16:01:48 (12 years ago)

Author:

jschierm

Message:

BUG: Mathieu won't let me leave until I properly fix wildcard handling for DAKOTA_VERSION.

File:

• issm/trunk-jpl/m4/issm_options.m4 (modified) (2 diffs)

issm/trunk-jpl/m4/issm_options.m4

@@ -182 +182 @@
                         DAKOTA_VERSION=`cat $DAKOTA_ROOT/../src/src/CommandLineHandler.cpp | grep 'DAKOTA version' | grep 'release' | grep -v // | sed 's/.*DAKOTA version //' | sed 's/ .*//' `
                 else
-                        AC_MSG_ERROR([Dakota CommandLineHandler.C or CommandLineHandler.cpp file not found!]);
+                        AC_MSG_ERROR([Dakota CommandLineHandler.C or CommandLineHandler.cpp file not found to determine DAKOTA_VERSION!]);
                 fi
                 fi
@@ -228 +228 @@
                 AC_DEFINE([_HAVE_DAKOTA_],[1],[with Dakota in ISSM src])
                 AC_MSG_CHECKING(for dakota major version)
-                DAKOTA_MAJOR=`cat $DAKOTA_ROOT/../src/src/CommandLineHandler.* | grep 'DAKOTA version' | grep 'release' | grep -v // | sed 's/.*DAKOTA version //' | sed 's/ .*//' | sed 's/\..*//' `
+                if test -f "$DAKOTA_ROOT/../src/src/CommandLineHandler.C"; then
+                        DAKOTA_MAJOR=`cat $DAKOTA_ROOT/../src/src/CommandLineHandler.C | grep 'DAKOTA version' | grep 'release' | grep -v // | sed 's/.*DAKOTA version //' | sed 's/ .*//' | sed 's/\..*//' `
+                else if test -f "$DAKOTA_ROOT/../src/src/CommandLineHandler.cpp"; then
+                        DAKOTA_MAJOR=`cat $DAKOTA_ROOT/../src/src/CommandLineHandler.cpp | grep 'DAKOTA version' | grep 'release' | grep -v // | sed 's/.*DAKOTA version //' | sed 's/ .*//' | sed 's/\..*//' `
+                else
+                        AC_MSG_ERROR([Dakota CommandLineHandler.C or CommandLineHandler.cpp file not found to determine DAKOTA_MAJOR!]);
+                fi
+                fi
                 AC_MSG_RESULT($DAKOTA_MAJOR)
                 AC_DEFINE_UNQUOTED([_DAKOTA_MAJOR_],$DAKOTA_MAJOR,[Dakota major version number])
                 AC_MSG_CHECKING(for dakota minor version)
-                DAKOTA_MINOR=`cat $DAKOTA_ROOT/../src/src/CommandLineHandler.* | grep 'DAKOTA version' | grep 'release' | grep -v // | sed 's/.*DAKOTA version //' | sed 's/ .*//' | sed 's/.*\.//' | sed 's/+//' `
+                if test -f "$DAKOTA_ROOT/../src/src/CommandLineHandler.C"; then
+                        DAKOTA_MINOR=`cat $DAKOTA_ROOT/../src/src/CommandLineHandler.C | grep 'DAKOTA version' | grep 'release' | grep -v // | sed 's/.*DAKOTA version //' | sed 's/ .*//' | sed 's/.*\.//' | sed 's/+//' `
+                else if test -f "$DAKOTA_ROOT/../src/src/CommandLineHandler.cpp"; then
+                        DAKOTA_MINOR=`cat $DAKOTA_ROOT/../src/src/CommandLineHandler.cpp | grep 'DAKOTA version' | grep 'release' | grep -v // | sed 's/.*DAKOTA version //' | sed 's/ .*//' | sed 's/.*\.//' | sed 's/+//' `
+                else
+                        AC_MSG_ERROR([Dakota CommandLineHandler.C or CommandLineHandler.cpp file not found to determine DAKOTA_MINOR!]);
+                fi
+                fi
                 AC_MSG_RESULT($DAKOTA_MINOR)
                 AC_DEFINE_UNQUOTED([_DAKOTA_MINOR_],$DAKOTA_MINOR,[Dakota minor version number])