###############################################################################
# Copyright (c) 2008, 2011, 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.
#
diff -Nurp -x '*~' -x '*.orig' configure.ac configure.ac
--- configure.ac	2011-04-05 13:28:42.000000000 -0700
+++ configure.ac	2011-04-06 13:52:15.327642630 -0700
@@ -204,7 +204,7 @@ if test x$XLIB_LOADABLE_I18N = xyes; the
 	fi
 	AC_DEFINE(USE_DYNAMIC_LC,1,
 		  [Split some i18n functions into loadable modules])
-	AC_SUBST(I18N_MODULE_LIBS,'${top_builddir}/src/libX11.la')
+	AC_SUBST(I18N_MODULE_LIBS,'${top_builddir}/src/libX11.so.4 -lc')
 fi
 AC_MSG_RESULT($XLIB_LOADABLE_I18N)
 
diff -Nurp -x '*~' -x '*.orig' src/Makefile.am src/Makefile.am
--- src/Makefile.am	2011-02-17 20:54:46.000000000 -0800
+++ src/Makefile.am	2011-04-06 13:52:15.327994531 -0700
@@ -368,9 +368,14 @@ if XKB
 USE_XKB_LIBS = $(XKB_LIBS)
 endif
 
-libX11_la_LDFLAGS = -version-number 6:3: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 = \
+	-lc \
 	$(USE_I18N_LIBS) \
 	$(USE_XCMS_LIBS) \
 	$(USE_XKB_LIBS) \