configure, Makefile: Allow runtime to be overridden.

diff --git a/Makefile b/Makefile
index 1acdd05195cc3d4223fa25d62a9956728ff8a32e..0e69192aecf6a4abbc608a2814164a0ea500bf4d 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -52,7 +52,8 @@ util/%.so:
        $(MAKE) install -C util-src
 
 %.install: %
-       sed "s|^CFG_SOURCEDIR=.*;$$|CFG_SOURCEDIR='$(INSTALLEDSOURCE)';|; \
+       sed "1s/\blua\b/$(RUNWITH)/; \
+               s|^CFG_SOURCEDIR=.*;$$|CFG_SOURCEDIR='$(INSTALLEDSOURCE)';|; \
                s|^CFG_CONFIGDIR=.*;$$|CFG_CONFIGDIR='$(INSTALLEDCONFIG)';|; \
                s|^CFG_DATADIR=.*;$$|CFG_DATADIR='$(INSTALLEDDATA)';|; \
                s|^CFG_PLUGINDIR=.*;$$|CFG_PLUGINDIR='$(INSTALLEDMODULES)/';|;" < $^ > $@

diff --git a/configure b/configure
index 209fdccb310465da4eb353b8804af2ed339c6aa7..df62cc05b80a094c9281bac2fc40a0111bdf17f9 100755 (executable)
--- a/configure
+++ b/configure
@@ -16,6 +16,7 @@ OPENSSL_LIB=crypto
 CC=gcc
 CXX=g++
 LD=gcc
+RUNWITH=lua
 
 CFLAGS="-fPIC -Wall"
 LDFLAGS="-shared"
@@ -171,6 +172,9 @@ do
    --linker=*)
       LD="$value"
       ;;
+   --runwith=*)
+      RUNWITH="$value"
+      ;;
    *)
       echo "Error: Unknown flag: $1"
       exit 1
@@ -341,6 +345,7 @@ LDFLAGS=$LDFLAGS
 CC=$CC
 CXX=$CXX
 LD=$LD
+RUNWITH=$RUNWITH
 
 EOF