Update branch to get the latest autotools stuff

FossilOrigin-Name: a39b9d0fe118ac1f3202f7b730f504056fdba8f0ab5fe79961e0861367fc60bb

2 files changed, 28 insertions, 9 deletions

diff --git a/tools/check b/tools/check
index 717746d..eee6490 100755
--- a/tools/check
+++ b/tools/check
@@ -2,7 +2,7 @@
 
 set -e
 
-types="Debug Release Coverage"
+types="debug release coverage"
 
 mkdir -p build
 cd build
@@ -10,7 +10,27 @@ cd build
 for type in $types
 do
 	rm -rf $type
-	cmake .. -G Ninja -B $type -DCMAKE_BUILD_TYPE=$type
+	mkdir -p $type
+	cd $type
+	case $type in
+		debug)
+			CFLAGS="-O0 -g3 -fsanitize=address,undefined"
+			;;
+		coverage)
+			CFLAGS="-O0 -g3 --coverage -fcondition-coverage"
+			;;
+		release)
+			CFLAGS="-O3"
+			;;
+		*)
+			echo "Unsupported type"
+			exit 1
+			;;
+	esac
+	../../configure --enable-build-mode=$type CFLAGS="$CFLAGS -Wall -Wextra -Werror -std=c89 -pedantic"
+	make check
+	../../configure --enable-build-mode=$type CFLAGS="$CFLAGS"
+	cd ..
 done
 
 cd ..
diff --git a/tools/checkcov b/tools/checkcov
index ac3cf91..412a58e 100755
--- a/tools/checkcov
+++ b/tools/checkcov
@@ -5,26 +5,25 @@ set -e
 cd build/$1
 
 case "$1" in
-	Coverage)
-		rm -rf CMakeFiles/aplwc.dir/src/lib/*
-		rm -rf CMakeFiles/aplwc-repl.dir/src/bin/*
+	coverage)
+		rm -rf src/lib/*
+		rm -rf src/bin/*
 		;;
 	*)
 		;;
 esac
 
-cmake --build .
-ctest
+make check
 
 case "$1" in
-	Coverage)
+	coverage)
 		;;
 	*)
 		exit 0
 		;;
 esac
 
-gcov -tg CMakeFiles/aplwc.dir/src/lib/*.gcno CMakeFiles/aplwc-repl.dir/src/bin/*.gcno | awk '
+gcov -tg src/lib/*.gcno src/bin/*.gcno | awk '
 BEGIN {
 	FS=":"
 }