[Libreoffice-commits] online.git: loolwsd/configure.ac
Ashod Nakashian
ashod.nakashian at collabora.co.uk
Wed Jan 6 06:24:36 PST 2016
loolwsd/configure.ac | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
New commits:
commit 6327f806dee60bf571c592f84703fc15212eaa5c
Author: Ashod Nakashian <ashod.nakashian at collabora.co.uk>
Date: Wed Jan 6 08:37:21 2016 -0500
loolwsd: support relative lokit path to configure
Change-Id: I19f76cbd39fd268145fa6cf6462f3fc940e06ff5
Reviewed-on: https://gerrit.libreoffice.org/21160
Reviewed-by: Ashod Nakashian <ashnakash at gmail.com>
Tested-by: Ashod Nakashian <ashnakash at gmail.com>
diff --git a/loolwsd/configure.ac b/loolwsd/configure.ac
index ed31af7..ef54b65 100644
--- a/loolwsd/configure.ac
+++ b/loolwsd/configure.ac
@@ -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}"])
More information about the Libreoffice-commits
mailing list