32N/A###############################################################################

32N/A# Copyright 2008 Sun Microsystems, Inc. All rights reserved.

1339N/A# Use subject to license terms.

32N/A#

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

919N/A# copy of this software and associated documentation files (the

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

919N/A# without limitation the rights to use, copy, modify, merge, publish,

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

919N/A# to whom the Software is furnished to do so, provided that the above

919N/A# copyright notice(s) and this permission notice appear in all copies of

919N/A# the Software and that both the above copyright notice(s) and this

919N/A# permission notice appear in supporting documentation.

919N/A#

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

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

919N/A# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT

919N/A# OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR

919N/A# HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL

919N/A# INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING

919N/A# FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,

919N/A# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION

32N/A# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

32N/A#

32N/A# Except as contained in this notice, the name of a copyright holder

32N/A# shall not be used in advertising or otherwise to promote the sale, use

493N/A# or other dealings in this Software without prior written authorization

32N/A# of the copyright holder.

32N/A#

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

32N/A--- configure.ac 2008-02-27 21:08:23.251718000 -0800

911N/A+++ configure.ac 2008-02-27 21:08:28.279803000 -0800

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

1062N/A fi

911N/A AC_DEFINE(USE_DYNAMIC_LC,1,

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

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

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

1339N/A fi

1339N/A AC_MSG_RESULT($XLIB_LOADABLE_I18N)

1339N/A

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

32N/A--- src/Makefile.am 2008-02-27 21:08:23.252437000 -0800

+++ src/Makefile.am 2008-02-27 21:08:28.280422000 -0800

@@ -373,9 +373,12 @@ if XKB

USE_XKB_LIBS = $(XKB_LIBS)

endif

-libX11_la_LDFLAGS = -version-number 6:2:0 -no-undefined

+libX11_la_LDFLAGS = -version-number 4 -no-undefined $(ADD_libX11_LDFLAGS) \

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

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

+ -N libXext.so.0

-libX11_la_LIBADD = \

+libX11_la_LIBADD = -lc \

$(USE_I18N_LIBS) \

$(USE_XCMS_LIBS) \

$(USE_XKB_LIBS) \