From 5abb66abb729363215148bc7e4b1ccb5f3265f1e Mon Sep 17 00:00:00 2001 From: david parsons Date: Tue, 27 Feb 2018 09:26:57 -0800 Subject: [PATCH] check for git & have branch be a no-op if it doesn't exist on this system --- configure.sh | 1 + tools/branch.c | 2 ++ 2 files changed, 3 insertions(+) diff --git a/configure.sh b/configure.sh index d8cf2c1b..792a40ad 100755 --- a/configure.sh +++ b/configure.sh @@ -70,6 +70,7 @@ AC_DEFINE THEME_CF "$THEME_CF" test "$DEBIAN_GLITCH" && AC_DEFINE 'DEBIAN_GLITCH' 1 AC_PROG_CC +AC_QUIET AC_PROG git && AC_DEFINE 'HAS_GIT' '1' AC_CHECK_NORETURN test "$TRY_SHARED" && AC_COMPILER_PIC && AC_CC_SHLIBS diff --git a/tools/branch.c b/tools/branch.c index 24af9233..91f34074 100644 --- a/tools/branch.c +++ b/tools/branch.c @@ -8,6 +8,7 @@ main(argc, argv) int argc; char **argv; { +#if HAS_GIT FILE * pipe; char line[1024]; @@ -23,5 +24,6 @@ char **argv; printf("\"(%s)\"", line); } pclose(pipe); +#endif return 0; }