341N/A###############################################################################

1064N/A# Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.

341N/A#

341N/A# Permission is hereby granted, free of charge, to any person obtaining a

919N/A# copy of this software and associated documentation files (the "Software"),

919N/A# to deal in the Software without restriction, including without limitation

919N/A# the rights to use, copy, modify, merge, publish, distribute, sublicense,

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

919N/A# Software is furnished to do so, subject to the following conditions:

919N/A#

919N/A# The above copyright notice and this permission notice (including the next

919N/A# paragraph) shall be included in all copies or substantial portions of the

919N/A# Software.

919N/A#

919N/A# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

919N/A# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

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

919N/A# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

919N/A# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING

919N/A# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER

919N/A# DEALINGS IN THE SOFTWARE.

341N/A#

341N/Adiff -urp -x '*~' -x '*.orig' configure.ac configure.ac

1064N/A--- configure.ac 2010-11-21 14:02:48.000000000 -0800

1064N/A+++ configure.ac 2010-11-21 18:47:54.799563366 -0800

1064N/A@@ -206,7 +206,7 @@ if test x$XLIB_LOADABLE_I18N = xyes; the

341N/A fi

341N/A AC_DEFINE(USE_DYNAMIC_LC,1,

341N/A [Split some i18n functions into loadable modules])

341N/A- AC_SUBST(I18N_MODULE_LIBS,'${top_builddir}/src/libX11.la')

341N/A+ AC_SUBST(I18N_MODULE_LIBS,'${top_builddir}/src/libX11.so.4 -lc')

341N/A fi

341N/A AC_MSG_RESULT($XLIB_LOADABLE_I18N)

688N/A

341N/Adiff -urp -x '*~' -x '*.orig' src/Makefile.am src/Makefile.am

1064N/A--- src/Makefile.am 2010-09-21 18:25:24.000000000 -0700

1064N/A+++ src/Makefile.am 2010-11-21 18:47:54.799940548 -0800

1064N/A@@ -369,9 +369,14 @@ if XKB

341N/A USE_XKB_LIBS = $(XKB_LIBS)

341N/A endif

341N/A

851N/A-libX11_la_LDFLAGS = -version-number 6:3:0 -no-undefined

851N/A+libX11_la_LDFLAGS = -version-number 4 -no-undefined \

851N/A+ $(ADD_libX11_LDFLAGS) \

341N/A+ -M $(top_srcdir)/../../mapfile-vers \

341N/A+ -M $(top_srcdir)/../../mapfile-order \

341N/A+ -N libXext.so.0

341N/A

688N/A libX11_la_LIBADD = \

688N/A+ -lc \

341N/A $(USE_I18N_LIBS) \

341N/A $(USE_XCMS_LIBS) \

341N/A $(USE_XKB_LIBS) \