Skip to content

Commit

Permalink
Merge pull request #778 from esduran/fix/with-tpro-path-bug
Browse files Browse the repository at this point in the history
Consistently use TPRO_HOME over TPROCTE_HOME
  • Loading branch information
dbankieris committed May 29, 2019
2 parents b694d54 + 36c19e1 commit a3c7b57
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
6 changes: 3 additions & 3 deletions autoconf/configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -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],[
Expand Down
6 changes: 3 additions & 3 deletions configure
Original file line number Diff line number Diff line change
Expand Up @@ -624,7 +624,7 @@ USE_ER7_UTILS
GTEST_HOME
GSL_HOME
BC635_HOME
TPROCTE_HOME
TPRO_HOME
DMTCP_HOME
HDF5_HOME
UDUNITS_EXCLUDE
Expand Down Expand Up @@ -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; }
Expand All @@ -7103,7 +7103,7 @@ fi
else
TPROCTE_HOME=""
TPRO_HOME=""
fi
Expand Down
2 changes: 1 addition & 1 deletion share/trick/makefiles/config_user.mk.in
Original file line number Diff line number Diff line change
Expand Up @@ -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@
Expand Down

0 comments on commit a3c7b57

Please sign in to comment.