Changeset 15180

Timestamp:

05/30/13 15:54:49 (12 years ago)

Author:

jschierm

Message:

BUG: Fixed wildcard handling for DAKOTA_VERSION.

File:

• issm/trunk-jpl/m4/issm_options.m4 (modified) (1 diff)

issm/trunk-jpl/m4/issm_options.m4

@@ -177 +177 @@
                 DAKOTAINCL=-I$DAKOTA_ROOT/include
                 AC_MSG_CHECKING(for dakota version)
-                DAKOTA_VERSION=`cat $DAKOTA_ROOT/../src/src/CommandLineHandler.* | grep 'DAKOTA version' | grep 'release' | grep -v // | sed 's/.*DAKOTA version //' | sed 's/ .*//' `
+                if test -f "$DAKOTA_ROOT/../src/src/CommandLineHandler.C"; then
+                        DAKOTA_VERSION=`cat $DAKOTA_ROOT/../src/src/CommandLineHandler.C | grep 'DAKOTA version' | grep 'release' | grep -v // | sed 's/.*DAKOTA version //' | sed 's/ .*//' `
+                else if test -f "$DAKOTA_ROOT/../src/src/CommandLineHandler.cpp"; then
+                        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!]);
+                fi
+                fi
                 AC_MSG_RESULT($DAKOTA_VERSION)
                 AC_DEFINE_UNQUOTED([_DAKOTA_VERSION_],"$DAKOTA_VERSION",[Dakota version number])