Correction for MULTIPR building

diff --git a/config_files/build.csh b/config_files/build.csh
index 4808cf0ffe6661f65998fb2c5ac20597a51bee39..3e16d5c3d0d034316611b23799fc355993e504ca 100755 (executable)
--- a/config_files/build.csh
+++ b/config_files/build.csh
@@ -302,12 +302,12 @@ foreach module (${modules})
     set cfg_file=configure.ac
     if ( ! -e ${module_src}/${cfg_file} ) then
        set cfg_file=configure.in.base
+    endif
+    if ( -e ${module_src}/${cfg_file} ) then
        set vx=`grep -e "^VERSION=" ${module_src}/${cfg_file} | awk -F= '{ if (NF>1) print $NF; }' | tr -d '[:space:]'`
        if ( "$vx" == "" ) then
            set vx=`grep -e "^AC_INIT" ${module_src}/${cfg_file} | sed -e "s%.*\[\([[:digit:].]*\)\].*%\1%g"`
        endif
-       else
-       set vx=`grep -e "^AC_INIT" ${module_src}/${cfg_file} | sed -e "s%.*\[\([[:digit:].]*\)\].*%\1%g"`       
     endif
     set px=${BUILD_DIR}/${module}
     if ( "$prefix" != "" ) then

diff --git a/config_files/build.sh b/config_files/build.sh
index 6aae39979f23fdd2ca45362022dba2030e525cda..d07567875c8da3314b990c53d7433d6d5683707d 100755 (executable)
--- a/config_files/build.sh
+++ b/config_files/build.sh
@@ -309,12 +309,12 @@ for module in ${modules}; do
        cfg_file=configure.ac
        if [ ! -e ${module_src}/${cfg_file} ] ; then
            cfg_file=configure.in.base
+       fi
+       if [ -e ${module_src}/${cfg_file} ] ; then
            vx=`grep -e "^VERSION=" ${module_src}/${cfg_file} | awk -F= '{ if (NF>1) print $NF; }' | tr -d '[:space:]'`
            if [ "$vx" == "" ] ; then
                vx=`grep -e "^AC_INIT" ${module_src}/${cfg_file} | sed -e "s%.*\[\([[:digit:].]*\)\].*%\1%g"`
            fi
-       else
-           vx=`grep -e "^AC_INIT" ${module_src}/${cfg_file} | sed -e "s%.*\[\([[:digit:].]*\)\].*%\1%g"`
        fi
        px=${BUILD_DIR}/${module}
        if [ "$prefix" != "" ] ; then