From acdd75b6c1df3cab03f039f3b30b08cb6f851a43 Mon Sep 17 00:00:00 2001 From: "John M. Penn" Date: Wed, 14 Sep 2022 16:30:48 -0500 Subject: [PATCH] Revert "Modify configure.ac so Trick will not use er7utils by default. #1340" This reverts commit 07b21fa4ae5085d39692bf3bfcd9801ed69cb091. --- autoconf/configure.ac | 6 +++--- configure | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/autoconf/configure.ac b/autoconf/configure.ac index bce92142..83be0027 100644 --- a/autoconf/configure.ac +++ b/autoconf/configure.ac @@ -215,12 +215,12 @@ AC_DEFUN([AX_JAVA],[ ],[]) ]) -dnl test if we want to use er7_utils, default to no +dnl test if we want to use er7_utils, default to yes AC_DEFUN([AX_ER7_UTILS],[ AC_ARG_ENABLE([er7utils], - AS_HELP_STRING([--enable-er7utils], [use er7_utils (default is no)]), + AS_HELP_STRING([--enable-er7utils], [use er7_utils (default is yes)]), AS_IF([test "x$enable_er7utils" = xyes], [USE_ER7_UTILS="1"], [USE_ER7_UTILS="0"]), - [USE_ER7_UTILS="0"] + [USE_ER7_UTILS="1"] ) AC_SUBST([USE_ER7_UTILS]) ]) diff --git a/configure b/configure index 09ba7fcc..e0d8912e 100755 --- a/configure +++ b/configure @@ -1432,7 +1432,7 @@ Optional Features: trick-offline directory in TRICK_HOME to use this feature --enable-java use java (default is yes) - --enable-er7utils use er7_utils (default is no) + --enable-er7utils use er7_utils (default is yes) Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] @@ -10252,7 +10252,7 @@ else $as_nop USE_ER7_UTILS="0" fi else $as_nop - USE_ER7_UTILS="0" + USE_ER7_UTILS="1" fi