From 4ed58dd89ab7ef8b1390a2814d87e0a0b329f793 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C5=99emysl=20Eric=20Janouch?= <p@janouch.name>
Date: Sun, 25 Sep 2022 21:24:00 +0200
Subject: [PATCH] Bump liberty, make use of its new asciiman.awk

---
 CMakeLists.txt | 10 +++++++++-
 README.adoc    |  8 ++++----
 liberty        |  2 +-
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 98a5291..135ef0a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -99,7 +99,8 @@ install (FILES LICENSE DESTINATION ${CMAKE_INSTALL_DOCDIR})
 find_program (ASCIIDOCTOR_EXECUTABLE asciidoctor)
 find_program (A2X_EXECUTABLE a2x)
 if (NOT ASCIIDOCTOR_EXECUTABLE AND NOT A2X_EXECUTABLE)
-	message (FATAL_ERROR "Neither asciidoctor nor a2x were found")
+	message (WARNING "Neither asciidoctor nor a2x were found, "
+		"falling back to a substandard manual page generator")
 endif ()
 
 foreach (page ${PROJECT_NAME})
@@ -121,6 +122,13 @@ foreach (page ${PROJECT_NAME})
 				"${PROJECT_SOURCE_DIR}/${page}.adoc"
 			DEPENDS ${page}.adoc
 			COMMENT "Generating man page for ${page}" VERBATIM)
+	else ()
+		set (ASCIIMAN ${PROJECT_SOURCE_DIR}/liberty/tools/asciiman.awk)
+		add_custom_command (OUTPUT ${page_output}
+			COMMAND env LC_ALL=C awk -f ${ASCIIMAN}
+				"${PROJECT_SOURCE_DIR}/${page}.adoc" > ${page_output}
+			DEPENDS ${page}.adoc ${ASCIIMAN}
+			COMMENT "Generating man page for ${page}" VERBATIM)
 	endif ()
 endforeach ()
 
diff --git a/README.adoc b/README.adoc
index 2138514..1936789 100644
--- a/README.adoc
+++ b/README.adoc
@@ -34,10 +34,10 @@ a package with the latest development version from Archlinux's AUR.
 
 Building
 --------
-Build dependencies: CMake, pkg-config, asciidoctor or asciidoc,
-                    liberty (included), http-parser (included) +
-Runtime dependencies: libev, Jansson, cURL, openssl,
-                      readline or libedit >= 2013-07-12,
+Build dependencies: CMake, pkg-config, liberty (included),
+ http-parser (included), asciidoctor or asciidoc (recommended but optional) +
+Runtime dependencies:
+ libev, Jansson, cURL, openssl, readline or libedit >= 2013-07-12
 
  $ git clone --recursive https://git.janouch.name/p/json-rpc-shell.git
  $ mkdir json-rpc-shell/build
diff --git a/liberty b/liberty
index d71c47f..688c458 160000
--- a/liberty
+++ b/liberty
@@ -1 +1 @@
-Subproject commit d71c47f8ce7aecdc4856630e9d73a48912be68c1
+Subproject commit 688c458095974fcd85b2f92c6b5380edfb564398