diff options
| author | Jiayu Liu <jiayu.liu@airbnb.com> | 2022-04-19 04:18:58 +0200 |
|---|---|---|
| committer | Jens Geyer <jensg@apache.org> | 2022-04-19 18:40:52 +0200 |
| commit | 5d220eb3321aa571b316da942feb72c29c7386c1 (patch) | |
| tree | f4abfee6e0c27518187c9e65de095d524429c07b /configure.ac | |
| parent | a8fded497635f2a319ece3882b234f510d84cacd (diff) | |
| download | thrift-5d220eb3321aa571b316da942feb72c29c7386c1.tar.gz | |
THRIFT-5562: remove gradle wrapper and use installed gradle 6.9
Client: java
Patch: Jiayu Liu
This closes #2576
Diffstat (limited to 'configure.ac')
| -rwxr-xr-x | configure.ac | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index 5181f60ad..4656fbb10 100755 --- a/configure.ac +++ b/configure.ac @@ -195,11 +195,12 @@ AX_THRIFT_LIB(java, [Java], yes) if test "$with_java" = "yes"; then AX_JAVAC_AND_JAVA AC_PATH_PROG([ANT], [ant]) + AC_PATH_PROG([GRADLE], [gradle]) AX_CHECK_ANT_VERSION($ANT, 1.7) AC_SUBST(CLASSPATH) AC_SUBST(ANT_FLAGS) AC_SUBST(GRADLE_OPTS) - if test "x$JAVA" != "x" && test "x$JAVAC" != "x" && test "x$ANT" != "x" ; then + if test "x$JAVA" != "x" && test "x$JAVAC" != "x" && test "x$ANT" != "x" && test "x$GRADLE" != "x" ; then have_java="yes" fi fi @@ -921,10 +922,10 @@ fi if test "$have_java" = "yes" ; then echo echo "Java Library:" - echo " Using gradlew ............. : lib/java/gradlew" + echo " Using gradle .............. : $GRADLE" echo " Using java ................ : $JAVA" echo " Using javac ............... : $JAVAC" - echo " Using Gradle version ...... : $(lib/java/gradlew --version --quiet | grep Gradle 2>&1)" + echo " Using Gradle version ...... : $($GRADLE --version --quiet | grep Gradle 2>&1)" echo " Using java version ........ : $($JAVA -version 2>&1 | grep 'version ')" fi if test "$have_lua" = "yes" ; then |