From 76326c64e91fbd6db6eb67b7bb8fdec7e35e900e Mon Sep 17 00:00:00 2001
From: Joe Orton <jorton@apache.org>
Date: Thu, 1 Mar 2018 09:29:47 +0000
Subject: [PATCH] Merge r1825147 from trunk:

* modules/lua/config.m4: Use liblua paths from pkg-config if
  available.

Reviewed by: wrowe, ylavic, jorton


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1825631 13f79535-47bb-0310-9956-ffa450edef68
---
 modules/lua/config.m4 | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/modules/lua/config.m4 b/modules/lua/config.m4
index a0c170b344..29fd563af4 100644
--- a/modules/lua/config.m4
+++ b/modules/lua/config.m4
@@ -55,9 +55,16 @@ else
     test_paths="${lua_path}"
 fi
 
-AC_CHECK_LIB(m, pow, lib_m="-lm")
-AC_CHECK_LIB(m, sqrt, lib_m="-lm")
-for x in $test_paths ; do
+if test -n "$PKGCONFIG" -a -z "$lua_path" \
+   && $PKGCONFIG --atleast-version=5.1 lua; then
+  LUA_LIBS="`$PKGCONFIG --libs lua`"
+  LUA_CFLAGS="`$PKGCONFIG --cflags lua`"
+  LUA_VERSION="`$PKGCONFIG --modversion lua`"
+  AC_MSG_NOTICE([using Lua $LUA_VERSION configuration from pkg-config])
+else
+  AC_CHECK_LIB(m, pow, lib_m="-lm")
+  AC_CHECK_LIB(m, sqrt, lib_m="-lm")
+  for x in $test_paths ; do
     CHECK_LUA_PATH([${x}], [include/lua-5.3], [lib/lua-5.3], [lua-5.3])
     CHECK_LUA_PATH([${x}], [include/lua5.3], [lib], [lua5.3])
     CHECK_LUA_PATH([${x}], [include/lua53], [lib/lua53], [lua])
@@ -71,7 +78,8 @@ for x in $test_paths ; do
     CHECK_LUA_PATH([${x}], [include/lua-5.1], [lib/lua-5.1], [lua-5.1])
     CHECK_LUA_PATH([${x}], [include/lua5.1], [lib], [lua5.1])
     CHECK_LUA_PATH([${x}], [include/lua51], [lib/lua51], [lua])
-done
+  done
+fi
 
 AC_SUBST(LUA_LIBS)
 AC_SUBST(LUA_CFLAGS)
-- 
2.40.0