X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=configure.ac;h=f5b105e4babdd41b945cc4d17c788e0069c804ab;hp=a99c0d3c5fafa5a66b9f08d5c4e67a08f573891c;hb=5b0e3ccb033e701a4c4005d6859757652ca8897c;hpb=715e6fb12b68e1749ee78607ad032acea6bbc2a5

diff --git a/configure.ac b/configure.ac
index a99c0d3c5..f5b105e4b 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
@@ -588,15 +593,6 @@ AC_CHECK_LIB([pfm], [pfm_initialize],
 	      ])
 AM_CONDITIONAL([LTTNG_TOOLS_BUILD_WITH_LIBPFM], [test "x$have_libpfm" = "xyes"])
 
-AC_ARG_ENABLE([git-version],
-              [AC_HELP_STRING([--disable-git-version],
-                              [Do not use the git version for the build])],
-              [have_git_version=$enableval], [have_git_version=yes]
-)
-
-AM_CONDITIONAL([LTTNG_TOOLS_BUILD_GIT_SOURCE],
-	[test "x${have_git_version}" = "xyes"])
-
 # For Python
 # SWIG version needed or newer:
 swig_version=2.0.0
@@ -686,11 +682,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,