Skip to content

Commit 9440c69

Browse files
committed
Only run "ant clean" if we have detected "ant".
1 parent 22434c3 commit 9440c69

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

Makefile.am

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,9 @@ all-local:
7979

8080
clean-local:
8181
$(MAKE) -C python clean
82-
ant clean
82+
if HAVE_ANT
83+
$(ANT) clean
84+
endif
8385

8486
%.pb.h %.pb.cc: %.proto
8587
$(AM_V_GEN)protoc $^ --cpp_out=.

configure.ac

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ AC_PROG_LN_S
1616
AC_PROG_RANLIB
1717
AM_PROG_AR
1818
AX_CXX_COMPILE_STDCXX_11
19+
AC_CHECK_PROGS([ANT], [ant])
1920

2021
PKG_CHECK_MODULES([json_c], [json-c])
2122

@@ -49,6 +50,7 @@ AC_ARG_VAR([GMOCK_DIR], [directory containing Google Mock])
4950
# fail later during the build (sometimes in ways that are unclear to
5051
# the user.
5152

53+
AM_CONDITIONAL([HAVE_ANT], [test -n "$ANT"])
5254
AC_DEFINE_UNQUOTED([TEST_SRCDIR], ["$srcdir"], [Top of the source directory, for tests.])
5355
AC_CONFIG_FILES([Makefile])
5456
AC_OUTPUT

0 commit comments

Comments
 (0)