###############################################################################

# Copyright (c) 2008, 2014, 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 --git a/configure.ac b/configure.ac

index 8ad1f00..a8ed884 100644

--- a/configure.ac

+++ b/configure.ac

@@ -195,7 +195,7 @@ if test x$XLIB_LOADABLE_I18N = xyes; then

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 --git a/src/Makefile.am b/src/Makefile.am

index d46b493..ddad93c 100644

--- a/src/Makefile.am

+++ b/src/Makefile.am

@@ -364,9 +364,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) \