From: Jérémie Galarneau Date: Fri, 27 Apr 2018 22:23:26 +0000 (-0400) Subject: Fix build: in_git_repo is used before being set X-Git-Tag: v2.10.4~1 X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=b9b5c709c07f3c71a79b199b741fad50cc8bf709;p=lttng-tools.git Fix build: in_git_repo is used before being set Signed-off-by: Jérémie Galarneau --- diff --git a/configure.ac b/configure.ac index 06cf38ec4..c5d315559 100644 --- a/configure.ac +++ b/configure.ac @@ -40,6 +40,11 @@ AM_CONDITIONAL([HAVE_OBJCOPY], [test "x$OBJCOPY" != xno]) AC_PATH_PROG([PGREP], [pgrep], [no]) AM_CONDITIONAL([HAVE_PGREP], [test "x$PGREP" != "xno"]) +# set $IN_GIT_REPO if we're in the Git repository; the `bootstrap` file +# is not distributed in tarballs +AS_IF([test -f "$srcdir/bootstrap"], [in_git_repo=yes], [in_git_repo=no]) +AM_CONDITIONAL([IN_GIT_REPO], [test "x$in_git_repo" = "xyes"]) + # check for bison AC_PROG_YACC BISON=$YACC @@ -676,11 +681,6 @@ if test "x$test_java_agent_jul" = "xyes" || test "x$test_java_agent_log4j" = "xy fi fi -# set $IN_GIT_REPO if we're in the Git repository; the `bootstrap` file -# is not distributed in tarballs -AS_IF([test -f "$srcdir/bootstrap"], [in_git_repo=yes], [in_git_repo=no]) -AM_CONDITIONAL([IN_GIT_REPO], [test "x$in_git_repo" = "xyes"]) - # enable building man pages (user's intention) AC_ARG_ENABLE( man-pages,