ExternalVendorCode/serval-dna
1
0
Fork 0
mirror of https://github.com/servalproject/serval-dna.git synced 2025-03-22 11:55:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Replace ./configure --enable-instance-path=<path> with INSTANCE_PATH=<path>

Browse Source
This commit is contained in:
Andrew Bettison 2014-02-25 14:46:10 +10:30
parent 2854821678
commit e10c4d92a1
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
configure.in
View File

@ -10,6 +10,10 @@ AC_CANONICAL_SYSTEM
dnl Init pkg-config
PKG_PROG_PKG_CONFIG()
dnl Specify default instance path
AC_ARG_VAR([INSTANCE_PATH], [default instance path for servald])
AS_IF([test "x$INSTANCE_PATH" != x], [AC_DEFINE_UNQUOTED([INSTANCE_PATH], ["$INSTANCE_PATH"], [default instance path])])
dnl VoIP test app
AC_ARG_ENABLE(voiptest,
AS_HELP_STRING([--enable-voiptest], [Require VoIP test program (default: only build if dependencies are present)])
@ -23,7 +27,7 @@ AS_IF([test "x$enable_voiptest" != "xno"], [
PKG_CHECK_MODULES([SRC], [samplerate],,[have_voip=0])
PKG_CHECK_MODULES([SPANDSP], [spandsp],,[have_voip=0])
AC_CHECK_HEADER([codec2.h],, [have_voip=0])
AC_CHECK_LIB([codec2], [codec2_create], [AC_SUBST(CODEC2_LIBS, -lcodec2)], [have_voip=0])
AC_CHECK_LIB([codec2], [codec2_create], [AC_SUBST([CODEC2_LIBS], -lcodec2)], [have_voip=0])
])
AS_IF([test "x$enable_voiptest" = "xyes" -a "x$have_voip" != "x1" ], [
AC_MSG_ERROR([Missing VoIP dependencies])
@ -60,9 +64,6 @@ if test -n "$JAVAC"; then
popdef([AC_MSG_ERROR])
fi
AC_ARG_ENABLE(instance-path,"Set default instance path for servald",
CPPFLAGS="$CPPFLAGS -DINSTANCE_PATH=\\\"$enableval\\\"")
dnl XXX Isn't this pointless? we are always linked against libc
AC_CHECK_LIB(c,srandomdev)

4
doc/Servald-Configuration.md
View File

@ -47,8 +47,8 @@ by the `SERVALINSTANCE_PATH` environment variable. If this is not set, then
**servald** uses a built-in default path which depends on its build-time option
and target platform:
* as specified by the `./configure --enable-instance-path=PATH` option when
**servald** was built from source
* as specified by the `./configure INSTANCE_PATH=<path>` option when **servald**
was built from source
* on Android `/data/data/org.servalproject/var/serval-node`
* on other platforms `/var/serval-node`

4
serval.h
View File

@ -196,7 +196,9 @@ int strn_to_sid_t(sid_t *sid, const char *hex, const char **endp);
#define alloca_tohex_sas(sas) alloca_tohex((sas), SAS_SIZE)
/*
* INSTANCE_PATH can be set via the ./configure option --enable-instance-path=<path>
* INSTANCE_PATH can be set on the ./configure command line, eg:
*
* ./configure INSTANCE_PATH=/var/local/serval/node
*/
#ifdef INSTANCE_PATH
#define DEFAULT_INSTANCE_PATH INSTANCE_PATH