From ce8e04a7613377b9c420a4e5452065e5e3dae2d8 Mon Sep 17 00:00:00 2001 From: Luca Falavigna Date: Sun, 10 Aug 2014 15:04:55 +0200 Subject: Use Libs.private to avoid unnecessary linkage --- libvncclient.pc.in | 4 +++- libvncserver.pc.in | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/libvncclient.pc.in b/libvncclient.pc.in index 143dc46..37495e7 100644 --- a/libvncclient.pc.in +++ b/libvncclient.pc.in @@ -7,6 +7,8 @@ Name: LibVNCClient Description: A library for easy implementation of a VNC client. Version: @VERSION@ Requires: -Libs: -L${libdir} -lvncclient @LIBS@ @WSOCKLIB@ +Requires.private: zlib +Libs: -L${libdir} -lvncclient +Libs.private: @LIBS@ @WSOCKLIB@ Cflags: -I${includedir} diff --git a/libvncserver.pc.in b/libvncserver.pc.in index f9273ea..d246052 100644 --- a/libvncserver.pc.in +++ b/libvncserver.pc.in @@ -7,6 +7,8 @@ Name: LibVNCServer Description: A library for easy implementation of a VNC server. Version: @VERSION@ Requires: -Libs: -L${libdir} -lvncserver @LIBS@ @WSOCKLIB@ +Requires.private: zlib +Libs: -L${libdir} -lvncserver +Libs.private: @LIBS@ @WSOCKLIB@ Cflags: -I${includedir} -- cgit v1.2.3 From 0c08b5db653e3e2c3c50ce4023913cf1e69dcc75 Mon Sep 17 00:00:00 2001 From: Luca Falavigna Date: Sun, 10 Aug 2014 15:07:18 +0200 Subject: Enable support for ppc64el architecture --- acinclude.m4 | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/acinclude.m4 b/acinclude.m4 index fc947ac..6566414 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -1137,7 +1137,10 @@ x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*) x86_64-*linux*) LD="${LD-ld} -m elf_i386" ;; - ppc64-*linux*|powerpc64-*linux*) + powerpc64le-*) + LD="${LD-ld} -m elf32lppclinux" + ;; + powerpc64-*) LD="${LD-ld} -m elf32ppclinux" ;; s390x-*linux*) @@ -1153,7 +1156,10 @@ x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*) x86_64-*linux*) LD="${LD-ld} -m elf_x86_64" ;; - ppc*-*linux*|powerpc*-*linux*) + powerpcle-*) + LD="${LD-ld} -m elf64lppc" + ;; + powerpc-*) LD="${LD-ld} -m elf64ppc" ;; s390*-*linux*) -- cgit v1.2.3 From cdd8675fd975c3ecabe49781b03236c082bf0a14 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Sat, 16 Aug 2014 15:58:08 +0200 Subject: Fix whitespace Signed-off-by: Johannes Schindelin --- acinclude.m4 | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/acinclude.m4 b/acinclude.m4 index 6566414..0365753 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -1137,10 +1137,10 @@ x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*) x86_64-*linux*) LD="${LD-ld} -m elf_i386" ;; - powerpc64le-*) - LD="${LD-ld} -m elf32lppclinux" - ;; - powerpc64-*) + powerpc64le-*) + LD="${LD-ld} -m elf32lppclinux" + ;; + powerpc64-*) LD="${LD-ld} -m elf32ppclinux" ;; s390x-*linux*) @@ -1156,10 +1156,10 @@ x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*) x86_64-*linux*) LD="${LD-ld} -m elf_x86_64" ;; - powerpcle-*) - LD="${LD-ld} -m elf64lppc" - ;; - powerpc-*) + powerpcle-*) + LD="${LD-ld} -m elf64lppc" + ;; + powerpc-*) LD="${LD-ld} -m elf64ppc" ;; s390*-*linux*) -- cgit v1.2.3