Merge pull request #778 from esduran/fix/with-tpro-path-bug

Consistently use TPRO_HOME over TPROCTE_HOME
This commit is contained in:
dbankieris 2019-05-29 14:54:03 -05:00 committed by GitHub
commit a3c7b57a0a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 7 deletions

View File

@ -62,15 +62,15 @@ AC_DEFUN([AX_DMTCP_HOME],[
AC_DEFUN([AX_TPRO_HOME],[
AC_ARG_WITH([tpro],
AS_HELP_STRING([--with-tpro@<:@=DIR@:>@], [TPRO root directory]),
[TPROCTE_HOME="$withval"
[TPRO_HOME="$withval"
AC_CHECK_FILE([$TPRO_HOME/h/tpro.h],
[],
AC_MSG_ERROR([could not find $TPRO_HOME/h/tpro.h])
)
],
[TPROCTE_HOME=""]
[TPRO_HOME=""]
)
AC_SUBST([TPROCTE_HOME])
AC_SUBST([TPRO_HOME])
])
AC_DEFUN([AX_BC635_HOME],[

6
configure vendored
View File

@ -624,7 +624,7 @@ USE_ER7_UTILS
GTEST_HOME
GSL_HOME
BC635_HOME
TPROCTE_HOME
TPRO_HOME
DMTCP_HOME
HDF5_HOME
UDUNITS_EXCLUDE
@ -7076,7 +7076,7 @@ fi
# Check whether --with-tpro was given.
if test "${with_tpro+set}" = set; then :
withval=$with_tpro; TPROCTE_HOME="$withval"
withval=$with_tpro; TPRO_HOME="$withval"
as_ac_File=`$as_echo "ac_cv_file_$TPRO_HOME/h/tpro.h" | $as_tr_sh`
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $TPRO_HOME/h/tpro.h" >&5
$as_echo_n "checking for $TPRO_HOME/h/tpro.h... " >&6; }
@ -7103,7 +7103,7 @@ fi
else
TPROCTE_HOME=""
TPRO_HOME=""
fi

View File

@ -30,7 +30,7 @@ TRICK_EXCLUDE += :@UDUNITS_EXCLUDE@
HDF5 = @HDF5_HOME@
DMTCP = @DMTCP_HOME@
TPROCTE = @TPROCTE_HOME@
TPROCTE = @TPRO_HOME@
BC635 = @BC635_HOME@
GSL_HOME = @GSL_HOME@
GTEST_HOME = @GTEST_HOME@