Factor version from find lua lib logic

1 files changed, 29 insertions, 63 deletions

diff --git a/findlua.mk b/findlua.mk
index b8149fb..dc94a39 100644
--- a/findlua.mk
+++ b/findlua.mk
@@ -19,7 +19,7 @@ endif
 
 NAKED_LUA_VER := $(shell (pkg-config --exists lua && \
                           pkg-config --modversion lua || \
-			  pkg-config --variable V lua) | cut -d. -f1-2)
+                          pkg-config --variable V lua) | cut -d. -f1-2)
 
 # fine appropriate Lua interpreter
 LUA_REPL := $(shell (which lua5.1 > /dev/null 2>&1 && echo lua5.1) || \
@@ -30,78 +30,44 @@ LUA_REPL := $(shell (which lua5.1 > /dev/null 2>&1 && echo lua5.1) || \
                     (which lua52 > /dev/null 2>&1 && echo lua52))
 
 # find appropriate Lua libraries
-LUA51_PKG := $(shell (pkg-config --exists lua5.1 && echo lua5.1) || \
-                     (pkg-config --exists lua-5.1 && echo lua-5.1) || \
-		     (pkg-config --exists lua51 && echo lua51) || \
+define find_lua_libs
+LUA$(1)_PKG := $$(shell (pkg-config --exists lua$(2) && echo lua$(2)) || \
+                     (pkg-config --exists lua-$(2) && echo lua-$(2)) || \
+                     (pkg-config --exists lua$(1) && echo lua$(1)) || \
                      (echo "NONE"))
 
+LUA$(1)_PKG := $$(strip $$(LUA$(1)_PKG))
 
-LUA51_PKG := $(strip $(LUA51_PKG))
-
-ifeq ($(LUA51_PKG),NONE)
-  ifeq ($(NAKED_LUA_VER),5.1)
-    LUA51_PKG := lua
-  endif
-endif
-
-ifneq ($(LUA51_PKG),NONE)
-  $(info Luxio: Lua 5.1 package name on this system is $(LUA51_PKG))
-  LUA51_HAS_MODINST := $(shell test x`pkg-config --variable INSTALL_LMOD $(LUA51_PKG)` != x && echo YES)
-  LUA51_INC := $(shell pkg-config --cflags $(LUA51_PKG))
-  LUA51_LIB := $(shell pkg-config --libs $(LUA51_PKG))
-  ifeq ($(LUA51_HAS_MODINST),)
-    LOCAL := YES
-  endif
-  ifeq ($(LOCAL),)
-    LUA51_LMOD_INST := $(shell pkg-config --variable=INSTALL_LMOD $(LUA51_PKG))
-    LUA51_CMOD_INST := $(shell pkg-config --variable=INSTALL_CMOD $(LUA51_PKG))
-  else
-    LUA51_LMOD_INST := /usr/local/share/lua/5.1
-    LUA51_CMOD_INST := /usr/local/lib/lua/5.1
-  endif
-  lua-5.1-try: lua-5.1
-  lua-5.1-try-install: lua-5.1-install
-else
-lua-5.1-try:
-	@echo Luxio: Lua 5.1 could not be found, so luxio was not built for it.
-lua-5.1-try-install:
-	@echo Luxio: Lua 5.1 could not be found, so luxio was not installed for it.
-endif
-
-LUA52_PKG := $(shell (pkg-config --exists lua5.2 && echo lua5.2) || \
-                     (pkg-config --exists lua-5.2 && echo lua-5.2) || \
-                     (pkg-config --exists lua52 && echo lua52) || \
-                     (echo "NONE")) 
-
-LUA52_PKG := $(strip $(LUA52_PKG))
-
-ifeq ($(LUA52_PKG),NONE)
-  ifeq ($(NAKED_LUA_VER),5.2)
-    LUA52_PKG := lua
+ifeq ($$(LUA$(1)_PKG),NONE)
+  ifeq ($$(NAKED_LUA_VER),$(2))
+    LUA$(1)_PKG := lua
   endif
 endif
 
-ifneq ($(LUA52_PKG),NONE)
-  $(info Luxio: Lua 5.2 package name on this system is $(LUA52_PKG))
-  LUA52_HAS_MODINST := $(shell test x`pkg-config --variable INSTALL_LMOD $(LUA52_PKG)` != x && echo YES)
-  LUA52_INC := $(shell pkg-config --cflags $(LUA52_PKG))
-  LUA52_LIB := $(shell pkg-config --libs $(LUA52_PKG))
-  ifeq ($(LUA52_HAS_MODINST),)
+ifneq ($$(LUA$(1)_PKG),NONE)
+  $$(info Luxio: Lua $(2) package name on this system is $$(LUA$(1)_PKG))
+  LUA$(1)_HAS_MODINST := $$(shell test x`pkg-config --variable INSTALL_LMOD $$(LUA$(1)_PKG)` != x && echo YES)
+  LUA$(1)_INC := $$(shell pkg-config --cflags $$(LUA$(1)_PKG))
+  LUA$(1)_LIB := $$(shell pkg-config --libs $$(LUA$(1)_PKG))
+  ifeq ($$(LUA$(1)_HAS_MODINST),)
     LOCAL := YES
   endif
-  ifeq ($(LOCAL),)
-    LUA52_LMOD_INST := $(shell pkg-config --variable=INSTALL_LMOD $(LUA52_PKG))
-    LUA52_CMOD_INST := $(shell pkg-config --variable=INSTALL_CMOD $(LUA52_PKG))
+  ifeq ($$(LOCAL),)
+    LUA$(1)_LMOD_INST := $$(shell pkg-config --variable=INSTALL_LMOD $$(LUA$(1)_PKG))
+    LUA$(1)_CMOD_INST := $$(shell pkg-config --variable=INSTALL_CMOD $$(LUA$(1)_PKG))
   else
-    LUA52_LMOD_INST := /usr/local/share/lua/5.2
-    LUA52_CMOD_INST := /usr/local/lib/lua/5.2
+    LUA$(1)_LMOD_INST := /usr/local/share/lua/$(2)
+    LUA$(1)_CMOD_INST := /usr/local/lib/lua/$(2)
   endif
-  lua-5.2-try: lua-5.2
-  lua-5.2-try-install: lua-5.2-install
+  lua-$(2)-try: lua-$(2)
+  lua-$(2)-try-install: lua-$(2)-install
 else
-lua-5.2-try:
-	@echo Luxio: Lua 5.2 could not be found, so luxio was not built for it.
-lua-5.2-try-install:
-	@echo Luxio: Lua 5.2 could not be found, so luxio was not installed for it.
+lua-$(2)-try:
+	@echo Luxio: Lua $(2) could not be found, so luxio was not built for it.
+lua-$(2)-try-install:
+	@echo Luxio: Lua $(2) could not be found, so luxio was not installed for it.
 endif
+endef
 
+$(eval $(call find_lua_libs,51,5.1))
+$(eval $(call find_lua_libs,52,5.2))