From 581bd67c5ad51cb59176472101f6a0b03703e494 Mon Sep 17 00:00:00 2001
From: Alex Chernyakhovsky <achernya@google.com>
Date: Tue, 5 Jul 2022 16:26:30 -0400
Subject: Fixes for distcheck

---
 configure.ac         | 6 ++++--
 src/Makefile.am      | 2 +-
 src/fuzz/Makefile.am | 4 +++-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/configure.ac b/configure.ac
index 011395b..2a628d7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -74,7 +74,8 @@ MISC_CXXFLAGS=""
 AC_ARG_ENABLE([fuzzing],
   [AS_HELP_STRING([--enable-fuzzing],
     [Enable compiler and linker options to enable fuzz testing @<:@no/yes/libfuzzer@:>@])],
-  [case "$enableval" in
+  [fuzzing="$enableval"
+   case "$enableval" in
     no)
       ;;
     '' | yes | libfuzzer)
@@ -86,9 +87,10 @@ AC_ARG_ENABLE([fuzzing],
      AC_MSG_ERROR(["Unknown argument '$enableval' to --enable-fuzzing])
      ;;
   esac],
-  [])
+  [fuzzing="no"])
 AC_SUBST([FUZZING_CFLAGS])
 AC_SUBST([MISC_CXXFLAGS])
+AM_CONDITIONAL([ENABLE_FUZZING], [test x"$fuzzing" != xno])
 
 AC_ARG_ENABLE([asan],
   [AS_HELP_STRING([--enable-asan],
diff --git a/src/Makefile.am b/src/Makefile.am
index a714997..0c2e9fe 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1 +1 @@
-SUBDIRS = include protobufs util crypto terminal network statesync frontend examples tests
+SUBDIRS = include protobufs util crypto terminal network statesync frontend examples tests fuzz
diff --git a/src/fuzz/Makefile.am b/src/fuzz/Makefile.am
index 8dccf7a..3b8339a 100644
--- a/src/fuzz/Makefile.am
+++ b/src/fuzz/Makefile.am
@@ -1,6 +1,8 @@
 AM_CXXFLAGS = $(WARNING_CXXFLAGS) $(PICKY_CXXFLAGS) $(HARDEN_CFLAGS) $(MISC_CXXFLAGS) $(CODE_COVERAGE_CXXFLAGS) $(FUZZING_CFLAGS)
 
-noinst_PROGRAMS = terminal_parser_fuzzer terminal_fuzzer
+if ENABLE_FUZZING
+  noinst_PROGRAMS = terminal_parser_fuzzer terminal_fuzzer
+endif
 
 terminal_parser_fuzzer_CPPFLAGS = -I$(srcdir)/../terminal -I$(srcdir)/../util
 terminal_parser_fuzzer_LDADD = ../terminal/libmoshterminal.a ../util/libmoshutil.a
-- 
cgit v1.2.3