From 8ae2430a2ac19e41cd61957ae446baef02e76118 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ra=C3=BAl=20Mar=C3=ADn?= <git@rmr.ninja>
Date: Mon, 22 Jun 2020 12:42:02 +0200
Subject: [PATCH 1/2] Configure: Default to -lproj in all cases

---
 configure.ac | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/configure.ac b/configure.ac
index db8ceb999e3..b5c73e14491 100644
--- a/configure.ac
+++ b/configure.ac
@@ -864,15 +864,18 @@ if test ! "x$PROJDIR" = "x"; then
 		fi
 	fi
 elif test ! -z "$PKG_CONFIG"; then
-        dnl To keep compatibility with PROJ pre 4.8, default to lproj if not found
+	dnl To keep compatibility with PROJ pre 4.8, default to lproj if not found
 	PKG_CHECK_MODULES([PROJ], [proj],
-            [
-                PROJ_CPPFLAGS="$PROJ_CFLAGS"
-                PROJ_LDFLAGS="$PROJ_LIBS"
-            ],
-            [
-                PROJ_LDFLAGS="-lproj"
-            ])
+		[
+			PROJ_CPPFLAGS="$PROJ_CFLAGS"
+			PROJ_LDFLAGS="$PROJ_LIBS"
+		],
+		[
+			PROJ_LDFLAGS="-lproj"
+		])
+else
+	dnl To keep compatibility with PROJ pre 4.8, default to lproj
+	PROJ_LDFLAGS="-lproj"
 fi
 
 

From ea52314867604fdf79906daf7001c1539e615d5b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ra=C3=BAl=20Mar=C3=ADn?= <git@rmr.ninja>
Date: Mon, 22 Jun 2020 12:42:27 +0200
Subject: [PATCH 2/2] Configure: Don't error if json-c is not found with
 pkg-config

---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index b5c73e14491..5398ae0b50d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -960,7 +960,7 @@ if test "$CHECK_JSON" != "no"; then
                 HAVE_JSON=yes
                 JSON_CPPFLAGS="$JSONC_CFLAGS"
                 JSON_LDFLAGS="$JSONC_LIBS"
-            ], [])
+            ], [AC_MSG_WARN("Could not find json-c")])
     fi
 
     if test "$HAVE_JSON" = "yes"; then