haraldwolff
/
collabora-online
mirror of https://github.com/CollaboraOnline/online.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

loolwsd: support relative lokit path to configure 

Change-Id: I19f76cbd39fd268145fa6cf6462f3fc940e06ff5
Reviewed-on: https://gerrit.libreoffice.org/21160
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
private/hcvcastro/socket
Ashod Nakashian 2016-01-06 08:37:21 -05:00 committed by Ashod Nakashian
parent c3826587e1
commit 6327f806de
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
loolwsd/configure.ac
View File

@ -29,23 +29,23 @@ AC_ARG_ENABLE([debug],
AC_ARG_WITH([lokit-path],
AS_HELP_STRING([--with-lokit-path=<path>],
[Path the "include" directory with the LibreOfficeKit headers]))
[Path to the "include" directory with the LibreOfficeKit headers]))
AC_ARG_WITH([poco-includes],
AS_HELP_STRING([--with-poco-includes=<path>],
[Path the "include" directory with the Poco headers]))
[Path to the "include" directory with the Poco headers]))
AC_ARG_WITH([poco-libs],
AS_HELP_STRING([--with-poco-libs=<path>],
[Path the "lib" directory with the Poco libraries]))
[Path to the "lib" directory with the Poco libraries]))
AC_ARG_WITH([libpng-includes],
AS_HELP_STRING([--with-libpng-includes=<path>],
[Path the "include" directory with the libpng headers]))
[Path to the "include" directory with the libpng headers]))
AC_ARG_WITH([libpng-libs],
AS_HELP_STRING([--with-libpng-libs=<path>],
[Path the "lib" directory with the libpng libraries]))
[Path to the "lib" directory with the libpng libraries]))
AC_ARG_ENABLE([tests],
AS_HELP_STRING([--disable-tests],
@ -66,6 +66,7 @@ CXXFLAGS="$CXXFLAGS -Wall -Wextra -Werror"
AS_IF([test -z "$with_poco_libs"],
[CXXFLAGS="$CXXFLAGS -Wshadow"])
with_lokit_path=`readlink -f $with_lokit_path`
AS_IF([test -n "$with_lokit_path"],
[CPPFLAGS="$CPPFLAGS -I${with_lokit_path}"])