On Wed, Jan 24, 2024 at 11:41:57AM +0100, Petr Menšík wrote: > Date: Wed, 24 Jan 2024 11:28:38 +0100 > Subject: [PATCH] Make lua version more easy to customize > > If distribution making lua-enabled binary does not use default lua5.4, > make it possible to use make LUA=lua5.1 or make LUA=lua. > > Fedora provides just lua-devel with pkg-config lua, this change would > make it easier to build it. > --- > Makefile | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) > > diff --git a/Makefile b/Makefile > index 4c5401e..7a6aac6 100644 > --- a/Makefile > +++ b/Makefile > @@ -36,6 +36,7 @@ LIBS = > > PKG_CONFIG = pkg-config > INSTALL = install > +LUA = lua5.4 > MSGMERGE = msgmerge > MSGFMT = msgfmt > XGETTEXT = xgettext > @@ -60,8 +61,8 @@ idn2_cflags = `echo $(COPTS) | $(top)/bld/pkg-wrapper > HAVE_LIBIDN2 $(PKG_CONFI > idn2_libs = `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_LIBIDN2 > $(PKG_CONFIG) --libs libidn2` > ct_cflags = `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_CONNTRACK > $(PKG_CONFIG) --cflags libnetfilter_conntrack` > ct_libs = `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_CONNTRACK > $(PKG_CONFIG) --libs libnetfilter_conntrack` > -lua_cflags = `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_LUASCRIPT > $(PKG_CONFIG) --cflags lua5.4` > -lua_libs = `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_LUASCRIPT > $(PKG_CONFIG) --libs lua5.4` > +lua_cflags = `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_LUASCRIPT > $(PKG_CONFIG) --cflags $(LUA)` > +lua_libs = `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_LUASCRIPT > $(PKG_CONFIG) --libs $(LUA)` > nettle_cflags = `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_DNSSEC > $(PKG_CONFIG) --cflags 'nettle hogweed' \ > HAVE_CRYPTOHASH > $(PKG_CONFIG) --cflags nettle \ > HAVE_NETTLEHASH > $(PKG_CONFIG) --cflags nettle`
Looks good to me. Groeten Geert Stappers In an attempt to get more attention to proposed patches. -- Silence is hard to parse _______________________________________________ Dnsmasq-discuss mailing list Dnsmasq-discuss@lists.thekelleys.org.uk https://lists.thekelleys.org.uk/cgi-bin/mailman/listinfo/dnsmasq-discuss
