[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - m4/libo_pkg_version.m4

David Tardon dtardon at redhat.com
Tue Jan 5 06:21:29 PST 2016


 m4/libo_pkg_version.m4 |   48 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 48 insertions(+)

New commits:
commit 2b8fd3b5c1ec0400df70e065e794703c78eb63ea
Author: David Tardon <dtardon at redhat.com>
Date:   Wed Dec 16 17:55:11 2015 +0100

    add support for version detection of libs
    
    Change-Id: Id5f84306926b6c28bef0d213aba151d8834b7b2d
    (cherry picked from commit bc0f3f0df24b05d749481ca99e5251546611aaf4)
    Reviewed-on: https://gerrit.libreoffice.org/20936
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>

diff --git a/m4/libo_pkg_version.m4 b/m4/libo_pkg_version.m4
new file mode 100644
index 0000000..c004b92
--- /dev/null
+++ b/m4/libo_pkg_version.m4
@@ -0,0 +1,48 @@
+dnl -*- Mode: Autoconf; tab-width: 4; indent-tabs-mode: nil; fill-column: 102 -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+m4_define([_libo_define_pkg_version], [
+    save_IFS="$IFS"
+    IFS=.
+    echo "$ver" | while read major minor micro; do
+        AC_DEFINE_UNQUOTED([$1_VERSION_MAJOR], [$major])
+        AC_DEFINE_UNQUOTED([$1_VERSION_MINOR], [$minor])
+        AC_DEFINE_UNQUOTED([$1_VERSION_MICRO], [$micro])
+    done
+    IFS="$save_IFS"
+])
+
+m4_define([_libo_define_pkg_version_direct], [
+    AC_DEFINE([$1_VERSION_MAJOR], [$2])
+    AC_DEFINE([$1_VERSION_MINOR], [$3])
+    AC_DEFINE([$1_VERSION_MICRO], [$4])
+])
+
+# libo_PKG_VERSION(VARIABLE-STEM, MODULE, BUNDLED-VERSION)
+AC_DEFUN([libo_PKG_VERSION], [
+    AS_IF([test -n "$SYSTEM_$1"], [
+        AC_REQUIRE([PKG_PROG_PKG_CONFIG])
+        AC_MSG_CHECKING([for $1 version])
+        AS_IF([test -n "$PKG_CONFIG"], [
+            ver=`$PKG_CONFIG --modversion "$2"`
+            AS_IF([test -n "$ver"], [
+                AC_MSG_RESULT([$ver])
+                _libo_define_pkg_version([$1], [$ver])
+            ], [
+                AC_MSG_ERROR([not found])
+            ])
+        ], [
+            AC_MSG_ERROR([not found])
+        ])
+    ], [
+        _libo_define_pkg_version_direct([$1], m4_translit([$3], [.], [,]))
+    ])
+])
+
+dnl vim:set shiftwidth=4 softtabstop=4 expandtab:


More information about the Libreoffice-commits mailing list