aboutsummaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2019-05-13 12:00:28 +0200
committerKim Alvefur <zash@zash.se>2019-05-13 12:00:28 +0200
commit61d02f359982574f857674bc314ac121f2735189 (patch)
tree3e7d16ca976c24d5ec646752d34b08344e0f63be /configure
parent371260638d19941a80979052d0fac875927659e0 (diff)
downloadprosody-61d02f359982574f857674bc314ac121f2735189.tar.gz
prosody-61d02f359982574f857674bc314ac121f2735189.zip
configure: Respect previously set paths in macosx preset
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure12
1 files changed, 8 insertions, 4 deletions
diff --git a/configure b/configure
index c9737ae6..2b58efe5 100755
--- a/configure
+++ b/configure
@@ -259,10 +259,14 @@ if [ "$OSPRESET_SET" = "yes" ]; then
CFLAGS="$CFLAGS -ggdb"
fi
if [ "$OSPRESET" = "macosx" ]; then
- LUA_INCDIR=/usr/local/include;
- LUA_INCDIR_SET=yes
- LUA_LIBDIR=/usr/local/lib
- LUA_LIBDIR_SET=yes
+ if [ "$LUA_INCDIR_SET" != "yes" ]; then
+ LUA_INCDIR=/usr/local/include;
+ LUA_INCDIR_SET=yes
+ fi
+ if [ "$LUA_LIBDIR_SET" != "yes" ]; then
+ LUA_LIBDIR=/usr/local/lib
+ LUA_LIBDIR_SET=yes
+ fi
CFLAGS="$CFLAGS -mmacosx-version-min=10.3"
LDFLAGS="-bundle -undefined dynamic_lookup"
fi