projects
/
prosody.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
configure: Add 'openbsd' preset (thanks xavier)
[prosody.git]
/
configure
diff --git
a/configure
b/configure
index 00ed2658b2f7cffd7db370d34f79da55ef610728..dd6af49c35f70777fab532bbe98ea3148a7bb63b 100755
(executable)
--- a/
configure
+++ b/
configure
@@
-59,6
+59,8
@@
Configure Prosody prior to building.
Default is $CC
--linker=CC The linker to use when building modules.
Default is $LD
Default is $CC
--linker=CC The linker to use when building modules.
Default is $LD
+--require-config Will cause Prosody to refuse to run when
+ it fails to find a configuration file
EOF
}
EOF
}
@@
-110,7
+112,7
@@
do
CFLAGS="-Wall -fPIC"
LDFLAGS="-shared"
fi
CFLAGS="-Wall -fPIC"
LDFLAGS="-shared"
fi
- if [ "$OSTYPE" = "freebsd" ]
+ if [ "$OSTYPE" = "freebsd"
-o "$OSTYPE" = "openbsd"
]
then LUA_INCDIR="/usr/local/include/lua51"
LUA_INCDIR_SET=yes
CFLAGS="-Wall -fPIC -I/usr/local/include"
then LUA_INCDIR="/usr/local/include/lua51"
LUA_INCDIR_SET=yes
CFLAGS="-Wall -fPIC -I/usr/local/include"
@@
-120,11
+122,17
@@
do
LUA_DIR=/usr/local
LUA_DIR_SET=yes
fi
LUA_DIR=/usr/local
LUA_DIR_SET=yes
fi
+ if [ "$OSTYPE" = "openbsd" ]
+ then LUA_INCDIR="/usr/local/include";
+ fi
;;
--datadir=*)
DATADIR="$value"
DATADIR_SET=yes
;;
;;
--datadir=*)
DATADIR="$value"
DATADIR_SET=yes
;;
+ --require-config)
+ REQUIRE_CONFIG=yes
+ ;;
--lua-suffix=*)
LUA_SUFFIX="$value"
LUA_SUFFIX_SET=yes
--lua-suffix=*)
LUA_SUFFIX="$value"
LUA_SUFFIX_SET=yes
@@
-322,6
+330,7
@@
LUA_DIR=$LUA_DIR
LUA_INCDIR=$LUA_INCDIR
LUA_LIBDIR=$LUA_LIBDIR
LUA_BINDIR=$LUA_BINDIR
LUA_INCDIR=$LUA_INCDIR
LUA_LIBDIR=$LUA_LIBDIR
LUA_BINDIR=$LUA_BINDIR
+REQUIRE_CONFIG=$REQUIRE_CONFIG
IDN_LIB=$IDN_LIB
IDNA_LIBS=$IDNA_LIBS
OPENSSL_LIB=$OPENSSL_LIB
IDN_LIB=$IDN_LIB
IDNA_LIBS=$IDNA_LIBS
OPENSSL_LIB=$OPENSSL_LIB