From 9bfd31472655573d14e7d1b15e06a2c89b288363 Mon Sep 17 00:00:00 2001 From: Esteban Duran Date: Tue, 21 May 2019 21:58:49 -0500 Subject: [PATCH 1/3] fix: TPROCTE_HOME Being Used In Place Of TPRO_HOME When compiling Trick with the --with-tpro option for use of a real-time clock, the TPROCTE_HOME variable was being assigned the contents of the withval variable instead of being assigned to the TPRO_HOME variable. The TPROCTE_HOME variable was never used and the TPRO_HOME variable will always be an empty string. Thus, the configuration file will always check for only /h/tpro.h instead of /h/tpro.h --- configure | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configure b/configure index e9c313e1..fad80c8b 100755 --- a/configure +++ b/configure @@ -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 From 93d10f3d327fc7ccec86ea004d2ecd47a8023dc0 Mon Sep 17 00:00:00 2001 From: Derek Bankieris Date: Wed, 29 May 2019 14:44:44 -0500 Subject: [PATCH 2/3] Change TPROCTE_HOME to TPRO_HOME in configure.ac --- autoconf/configure.ac | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/autoconf/configure.ac b/autoconf/configure.ac index 7664933d..b0cafc57 100755 --- a/autoconf/configure.ac +++ b/autoconf/configure.ac @@ -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],[ From 36c19e158916501157c0978f62ec11afa1cfbe16 Mon Sep 17 00:00:00 2001 From: Derek Bankieris Date: Wed, 29 May 2019 14:50:58 -0500 Subject: [PATCH 3/3] Change TPROCTE_HOME to TPRO_HOME in config_user.mk.in --- share/trick/makefiles/config_user.mk.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/trick/makefiles/config_user.mk.in b/share/trick/makefiles/config_user.mk.in index ca72ec51..c35fec92 100644 --- a/share/trick/makefiles/config_user.mk.in +++ b/share/trick/makefiles/config_user.mk.in @@ -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@