aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2012-09-28 12:04:07 +0200
committerKim Alvefur <zash@zash.se>2012-09-28 12:04:07 +0200
commit2b1cd1a3ae436f44ce109e7bf8f020bbc51f4d42 (patch)
tree77e1ae89e7757363e23d4487e00aa48fe99e5b62
parent5db9a6c120a984390287664b3581c4f3796cb3be (diff)
downloadprosody-2b1cd1a3ae436f44ce109e7bf8f020bbc51f4d42.tar.gz
prosody-2b1cd1a3ae436f44ce109e7bf8f020bbc51f4d42.zip
configure, Makefile: Allow runtime to be overridden.
-rw-r--r--Makefile3
-rwxr-xr-xconfigure5
2 files changed, 7 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 1acdd051..0e69192a 100644
--- 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 209fdccb..df62cc05 100755
--- 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