#

# Copyright (c) 2006, 2009, Oracle and/or its affiliates. All rights reserved.

#

# Permission is hereby granted, free of charge, to any person obtaining a

# copy of this software and associated documentation files (the "Software"),

# to deal in the Software without restriction, including without limitation

# the rights to use, copy, modify, merge, publish, distribute, sublicense,

# and/or sell copies of the Software, and to permit persons to whom the

# Software is furnished to do so, subject to the following conditions:

#

# The above copyright notice and this permission notice (including the next

# paragraph) shall be included in all copies or substantial portions of the

# Software.

#

# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL

# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING

# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER

# DEALINGS IN THE SOFTWARE.

#

#

On Solaris we shipped the Xsun libxkbfile as libxkbfile.so.4, so the Xorg

libxkbfile (which is ABI incompatible) was made to be libxkbfile.so.5.

diff -urp -x '*~' -x '*.orig' src/Makefile.am src/Makefile.am

--- src/Makefile.am 2009-10-16 14:27:13.000000000 -0700

+++ src/Makefile.am 2011-02-11 16:52:54.247433835 -0800

@@ -22,7 +22,7 @@ INCLUDES = -I$(top_srcdir)/include/ -I$(

libxkbfile_la_LIBADD = @XKBFILE_LIBS@

AM_CFLAGS = $(CWARNFLAGS) @XKBFILE_CFLAGS@

-libxkbfile_la_LDFLAGS = -version-number 1:0:2 -no-undefined

+libxkbfile_la_LDFLAGS = -version-number 5 -no-undefined

libxkbfileincludedir = $(includedir)/X11/extensions

libxkbfileinclude_HEADERS = \

diff -urp -x '*~' -x '*.orig' src/Makefile.in src/Makefile.in

--- src/Makefile.in 2010-10-29 18:16:24.000000000 -0700

+++ src/Makefile.in 2011-02-11 16:52:54.247908598 -0800

@@ -265,7 +265,7 @@ libxkbfile_la_SOURCES = \

INCLUDES = -I$(top_srcdir)/include/ -I$(top_srcdir)/include/X11/extensions/

libxkbfile_la_LIBADD = @XKBFILE_LIBS@

AM_CFLAGS = $(CWARNFLAGS) @XKBFILE_CFLAGS@

-libxkbfile_la_LDFLAGS = -version-number 1:0:2 -no-undefined

+libxkbfile_la_LDFLAGS = -version-number 5 -no-undefined

libxkbfileincludedir = $(includedir)/X11/extensions

libxkbfileinclude_HEADERS = \

$(top_srcdir)/include/X11/extensions/XKM.h\