It's called libatomic_ops not libatomic-ops
cf. <https://github.com/ivmai/libatomic_ops/> (as mentioned in external/libatomic_ops/README) Change-Id: Ibd50ca81695cbcd73e005b0bbbd46ceb62b1e9dc Reviewed-on: https://gerrit.libreoffice.org/66912 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
This commit is contained in:
@@ -8879,16 +8879,16 @@ int fb_api_is_30(void) { return 0; }
|
||||
else
|
||||
dnl Embedded Firebird has version 3.0
|
||||
AC_DEFINE(HAVE_FIREBIRD_30, 1)
|
||||
dnl We need libatomic-ops for any non X86/X64 system
|
||||
dnl We need libatomic_ops for any non X86/X64 system
|
||||
if test "${CPUNAME}" != INTEL -a "${CPUNAME}" != X86_64; then
|
||||
dnl ===================================================================
|
||||
dnl Check for system libatomic-ops
|
||||
dnl Check for system libatomic_ops
|
||||
dnl ===================================================================
|
||||
libo_CHECK_SYSTEM_MODULE([libatomic_ops],[ATOMIC_OPS],[atomic_ops >= 0.7.2])
|
||||
if test "$with_system_libatomic_ops" = "yes"; then
|
||||
SYSTEM_LIBATOMIC_OPS=TRUE
|
||||
AC_CHECK_HEADERS(atomic_ops.h, [],
|
||||
[AC_MSG_ERROR(atomic_ops.h not found. install libatomic-ops)], [])
|
||||
[AC_MSG_ERROR(atomic_ops.h not found. install libatomic_ops)], [])
|
||||
else
|
||||
SYSTEM_LIBATOMIC_OPS=
|
||||
LIBATOMIC_OPS_CFLAGS="-I${WORKDIR}/UnpackedTarball/libatomic_ops/include"
|
||||
|
@@ -930,9 +930,9 @@ libassuan
|
||||
See GNU Lesser General Public License Version 2.1 below
|
||||
See GNU General Public License Version 3 below
|
||||
|
||||
libatomic-ops
|
||||
libatomic_ops
|
||||
|
||||
The following software may be included in this product: libatomic-ops.
|
||||
The following software may be included in this product: libatomic_ops.
|
||||
Use of any of this software is governed by the terms of the license
|
||||
below:
|
||||
|
||||
|
@@ -3546,8 +3546,8 @@
|
||||
<text:p text:style-name="Standard">Alternatively, the acknowledgment may be graphical using the logos available at <text:a xlink:type="simple" xlink:href="http://www.jdom.org/images/logos" text:style-name="Internet_20_link" text:visited-style-name="Visited_20_Internet_20_Link">http://www.jdom.org/images/logos</text:a>.</text:p>
|
||||
<text:p text:style-name="Standard">THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE JDOM AUTHORS OR THE PROJECT CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</text:p>
|
||||
<text:p text:style-name="Standard">This software consists of voluntary contributions made by many individuals on behalf of the JDOM Project and was originally created by Jason Hunter <jhunter_AT_jdom_DOT_org> and Brett McLaughlin <brett_AT_jdom_DOT_org>. For more information on the JDOM Project, please see <text:a xlink:type="simple" xlink:href="http://www.jdom.org/" text:style-name="Internet_20_link" text:visited-style-name="Visited_20_Internet_20_Link">http://www.jdom.org/</text:a>.</text:p>
|
||||
<text:h text:style-name="P95" text:outline-level="2">libatomic-ops</text:h>
|
||||
<text:p text:style-name="P43">The following software may be included in this product: <text:span text:style-name="T24">libatomic-ops</text:span>. Use of any of this software is governed by the terms of the license below:</text:p>
|
||||
<text:h text:style-name="P95" text:outline-level="2">libatomic_ops</text:h>
|
||||
<text:p text:style-name="P43">The following software may be included in this product: <text:span text:style-name="T24">libatomic_ops</text:span>. Use of any of this software is governed by the terms of the license below:</text:p>
|
||||
<text:p text:style-name="P43"><text:a xlink:type="simple" xlink:href="#7.GNU General Public License Version 2|outline" text:style-name="Internet_20_link" text:visited-style-name="Visited_20_Internet_20_Link">Jump to GPL Version 2</text:a></text:p>
|
||||
<text:h text:style-name="P96" text:outline-level="2">libcdr</text:h>
|
||||
<text:p text:style-name="Standard">The following software may be included in this product: libcdr. Use of any of this software is governed by the terms of the license below:</text:p>
|
||||
|
File diff suppressed because one or more lines are too long
Reference in New Issue
Block a user