[Libreoffice-commits] core.git: m4/libo_externals.m4
m4/libo_externals.m4 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 1c26cfdd8a7137cb6db29b1f88e5023e43f9d6e4 Author: Jan-Marek Glogowski AuthorDate: Thu Dec 30 02:11:19 2021 +0100 Commit: Jan-Marek Glogowski CommitDate: Thu Dec 30 11:04:50 2021 +0100 libo_CSM: better output for disabed tests Change-Id: Id912495169b6c83ce9798a13d24e1cf4b9e83a52 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127723 Tested-by: Jenkins Reviewed-by: Jan-Marek Glogowski diff --git a/m4/libo_externals.m4 b/m4/libo_externals.m4 index 19ad2bae532f..96a458658445 100644 --- a/m4/libo_externals.m4 +++ b/m4/libo_externals.m4 @@ -104,7 +104,7 @@ else if test "$test_$1" != no -a "$enable_$1" = no; then AC_MSG_RESULT([disabled]) else -AC_MSG_RESULT([ignored / not supported by OS]) +AC_MSG_RESULT([not tested]) fi fi fi
[Libreoffice-commits] core.git: m4/libo_externals.m4
m4/libo_externals.m4 | 30 ++
1 file changed, 18 insertions(+), 12 deletions(-)
New commits:
commit 301443e6bebd9c68a0229df832ddcb3188b575d3
Author: Jan-Marek Glogowski
AuthorDate: Tue May 25 14:57:29 2021 +0200
Commit: Jan-Marek Glogowski
CommitDate: Wed Dec 1 12:39:52 2021 +0100
m4: Add test flag to libo_CHECK_SYSTEM_MODULE
Automatically adds an ENABLE_* AC_SUBST and test for a disabled
test via test_*, like ENABLE_EPUBGEN and test_libepubgen.
Change-Id: Ifaf27d4d1193f41de6291ab70d973fe151f36b2e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126169
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski
diff --git a/m4/libo_externals.m4 b/m4/libo_externals.m4
index f755358bb395..d19178ab8250 100644
--- a/m4/libo_externals.m4
+++ b/m4/libo_externals.m4
@@ -12,20 +12,26 @@ AC_ARG_WITH(system-$1,
[Use $1 from operating system instead of building and bundling it.]),,
[with_system_$1="$with_system_libs"])
AC_MSG_CHECKING([which $1 to use])
-if test "$with_system_$1" = "yes"; then
-AC_MSG_RESULT([external])
-SYSTEM_$2=TRUE
-PKG_CHECK_MODULES([$2], [$3])
-$2_CFLAGS=$(printf '%s' "${$2_CFLAGS}" | sed -e "s/-I/${ISYSTEM?}/g")
-FilterLibs "${$2_LIBS}"
-$2_LIBS="$filteredlibs"
+if test "$test_$1" != "no"; then
+ENABLE_$2=TRUE
+if test "$with_system_$1" = "yes"; then
+AC_MSG_RESULT([external])
+SYSTEM_$2=TRUE
+PKG_CHECK_MODULES([$2], [$3])
+$2_CFLAGS=$(printf '%s' "${$2_CFLAGS}" | sed -e "s/-I/${ISYSTEM?}/g")
+FilterLibs "${$2_LIBS}"
+$2_LIBS="$filteredlibs"
+else
+AC_MSG_RESULT([internal])
+SYSTEM_$2=
+$2_CFLAGS=$4
+$2_LIBS=$5
+BUILD_TYPE="$BUILD_TYPE $2"
+fi
else
-AC_MSG_RESULT([internal])
-SYSTEM_$2=
-$2_CFLAGS=$4
-$2_LIBS=$5
-BUILD_TYPE="$BUILD_TYPE $2"
+AC_MSG_RESULT([ignored])
fi
+AC_SUBST([ENABLE_$2])
AC_SUBST([SYSTEM_$2])
AC_SUBST([$2_CFLAGS])
AC_SUBST([$2_LIBS])
[Libreoffice-commits] core.git: m4/libo_externals.m4
m4/libo_externals.m4 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 5e5b7e431edc837b2be32d03fcbb1e32377e935a Author: Michael Stahl mst...@redhat.com Date: Mon Feb 25 19:14:10 2013 +0100 m4: improve help message of libo_CHECK_SYSTEM_MODULE Change-Id: I784823b27108671e6bb549f60725f21abd47451e diff --git a/m4/libo_externals.m4 b/m4/libo_externals.m4 index c4584e0..329abc7 100644 --- a/m4/libo_externals.m4 +++ b/m4/libo_externals.m4 @@ -9,7 +9,7 @@ dnl -*- Mode: Autoconf; tab-width: 4; indent-tabs-mode: nil; fill-column: 102 -* AC_DEFUN([libo_CHECK_SYSTEM_MODULE], [ AC_ARG_WITH(system-$1, AS_HELP_STRING([--with-system-$1], -[Use $1 already on system.]),, +[Use $1 from operating system instead of building and bundling it.]),, [with_system_$1=$with_system_libs]) AC_MSG_CHECKING([which $1 to use]) if test $with_system_$1 = yes; then ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
