diff options
| author | Luca Falavigna <dktrkranz@gmail.com> | 2014-08-16 10:04:31 +0000 |
|---|---|---|
| committer | Johannes Schindelin <johannes.schindelin@gmx.de> | 2014-08-16 16:17:55 +0200 |
| commit | 4276864096382f09f13021670dc67b695c92ddf8 (patch) | |
| tree | d01c0cb29c7ff7ca8a746dd2c0db11e4a5c16176 | |
| parent | 27b0c0deb79de78a693d335880b8908131c255df (diff) | |
| parent | cdd8675fd975c3ecabe49781b03236c082bf0a14 (diff) | |
| download | libvncserver-4276864096382f09f13021670dc67b695c92ddf8.zip libvncserver-4276864096382f09f13021670dc67b695c92ddf8.tar.gz | |
Merge pull request #17 from dktrkranz/master
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
| -rw-r--r-- | acinclude.m4 | 10 | ||||
| -rw-r--r-- | libvncclient.pc.in | 4 | ||||
| -rw-r--r-- | libvncserver.pc.in | 4 |
3 files changed, 14 insertions, 4 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index fc947ac..0365753 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*) 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} |
