loolwsd/configure.ac | 14 ++++++++++++++
1 file changed, 14 insertions(+)
New commits:
commit f44b2b4471ea0027b9c1c9b881499c50ac621de2
Author: Tor Lillqvist <t...@collabora.com>
Date: Fri May 22 10:53:43 2015 +0100
Add configure options for where to look for libpng, too
diff --git a/loolwsd/configure.ac b/loolwsd/configure.ac
index 413be75..125954f 100644
--- a/loolwsd/configure.ac
+++ b/loolwsd/configure.ac
@@ -38,6 +38,14 @@ AC_ARG_WITH([poco-libs],
AS_HELP_STRING([--with-poco-libs=<path>],
[Path 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]))
+
+AC_ARG_WITH([libpng-libs],
+ AS_HELP_STRING([--with-libpng-libs=<path>],
+ [Path the "lib" directory with the libpng
libraries]))
+
# Handle options
AS_IF([test "$enable_debug" = yes -a -n "$with_poco_libs"],
[POCO_DEBUG_SUFFIX=d],
@@ -60,6 +68,12 @@ AS_IF([test -n "$with_poco_includes"],
AS_IF([test -n "$with_poco_libs"],
[LDFLAGS="$LDFLAGS -L${with_poco_libs}"])
+AS_IF([test -n "$with_libpng_includes"],
+ [CPPFLAGS="$CPPFLAGS -I${with_libpng_includes}"])
+
+AS_IF([test -n "$with_libpng_libs"],
+ [LDFLAGS="$LDFLAGS -L${with_libpng_libs}"])
+
AS_IF([test `uname -s` = Linux],
[AS_IF([test -n "$with_poco_libs"],
[LDFLAGS="$LDFLAGS -Wl,-rpath,${with_poco_libs}"])])
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
