make Lua module for all available versions

configure.ac

@@ -111,28 +111,39 @@ gl_INIT
 PKG_PROG_PKG_CONFIG
 PKG_CHECK_MODULES([LIBXML], [libxml-2.0])
 
+LUA_SUBDIRS=
+LUA_MAKEFILES=
 m4_foreach_w([LUAPKG], [lua5.1 lua5.2 lua5.3 lua], [
   AC_MSG_CHECKING([for LUAPKG])
   PKG_CHECK_EXISTS(LUAPKG, [
     AC_MSG_RESULT([yes])
     LIBLUA_CFLAGS=$($PKG_CONFIG --cflags LUAPKG)
     LIBLUA_LIBS=$($PKG_CONFIG --libs LUAPKG)
-    LUA_VERSION=$($PKG_CONFIG --variable=V LUAPKG)
+    LUA_SUBDIRS="$LUA_SUBDIRS LUAPKG"
+
+    LUA_SUBDIR=src/LUAPKG
+    AS_MKDIR_P([$LUA_SUBDIR])
+
+    LUA_MAKEFILE=$LUA_SUBDIR/Makefile
+    ln -fs ../Makefile.luamod $LUA_MAKEFILE.am
+    eval $AUTOMAKE $LUA_MAKEFILE
+    LUA_MAKEFILES="$LUA_MAKEFILES $LUA_MAKEFILE"
   ], [AC_MSG_RESULT([no])])
 ])
 if test -z "$LIBLUA_LIBS"; then
   AC_MSG_ERROR([no Lua libraries found])
 fi
 AC_SUBST([LIBLUA_CFLAGS])
 AC_SUBST([LIBLUA_LIBS])
-AC_SUBST([LUA_VERSION])
+AC_SUBST([LUA_SUBDIRS])
 
 AC_CHECK_FUNCS([strerror_r fsync])
 
 AC_OUTPUT(Makefile \
           gnulib/lib/Makefile \
           gnulib/tests/Makefile \
           src/Makefile \
+	  $LUA_MAKEFILES \
           man/Makefile \
           tests/Makefile \
           examples/Makefile \

src/Makefile.am

@@ -1,3 +1,5 @@
+SUBDIRS = . $(LUA_SUBDIRS)
+
 GNULIB= ../gnulib/lib/libgnu.la
 GNULIB_CFLAGS= -I $(top_builddir)/gnulib/lib -I $(top_srcdir)/gnulib/lib
 
@@ -14,9 +16,6 @@ DISTCLEANFILES = datadir.h
 lib_LTLIBRARIES = libfa.la libaugeas.la libauglua.la
 noinst_LTLIBRARIES = liblexer.la
 
-luadir = $(libdir)/lua/$(LUA_VERSION)
-lua_LTLIBRARIES = augeas.la
-
 bin_PROGRAMS = augtool augparse
 
 include_HEADERS = augeas.h fa.h
@@ -60,10 +59,6 @@ libfa_la_LDFLAGS = $(FA_VERSION_SCRIPT) -version-info $(LIBFA_VERSION_INFO)
 liblexer_la_SOURCES = lexer.l
 liblexer_la_CFLAGS = $(AM_CFLAGS) -Wno-error
 
-augeas_la_SOURCES = augeas.h luamod.c luamod.h
-augeas_la_LIBADD = libaugeas.la
-augeas_la_LDFLAGS = $(AM_LDFLAGS) -avoid-version -module -shared
-
 FAILMALLOC_START ?= 1
 FAILMALLOC_REP   ?= 20
 FAILMALLOC_PROG ?= ./augtool

src/Makefile.luamod

@@ -0,0 +1,13 @@
+# Copyright (C) 2016 Kaarle Ritvanen
+
+AUTOMAKE_OPTIONS = subdir-objects
+
+LUA_PACKAGE = $(notdir $(CURDIR))
+
+luadir = $(libdir)/lua/$(shell $(PKG_CONFIG) --variable=V $(LUA_PACKAGE))
+lua_LTLIBRARIES = augeas.la
+
+augeas_la_SOURCES = ../augeas.h ../luamod.c ../luamod.h
+augeas_la_CFLAGS = $(AM_CFLAGS) $(LIBXML_CFLAGS) $(shell $(PKG_CONFIG) --cflags $(LUA_PACKAGE))
+augeas_la_LIBADD = ../libaugeas.la
+augeas_la_LDFLAGS = $(AM_LDFLAGS) -avoid-version -module -shared