libx11 git update 29/8/2010

4 files changed, 2 insertions, 21 deletions

diff --git a/libX11/configure.ac b/libX11/configure.ac
index 9eb41d019..d5389470b 100644
--- a/libX11/configure.ac
+++ b/libX11/configure.ac
@@ -376,17 +376,6 @@ AC_ARG_ENABLE(xkb,
                 [Disable XKB support *EXPERIMENTAL*]),

               [XKB=$enableval],[XKB=yes])

 

-AC_ARG_ENABLE(man-pages,

-	      AC_HELP_STRING([--enable-man-pages=section],

-			     [Choose manual section for installing man pages]),

-		[LIBMAN=$enableval],[LIBMAN=yes])

-

-if test "x$LIBMAN" != "xyes"; then

-	LIB_MAN_SUFFIX=$LIBMAN

-fi

-

-AM_CONDITIONAL(MANPAGES, [ test x$LIBMAN '!=' xno ])

-

 AM_CONDITIONAL(XKB, [ test x$XKB = xyes ])

 if test x"$XKB" = "xyes"; then

    XKBPROTO_REQUIRES="kbproto"

@@ -544,11 +533,6 @@ AC_OUTPUT([Makefile
 	   x11.pc

 	   x11-xcb.pc])

 

-man_pages_suffix=$LIB_MAN_SUFFIX

-if test -z "$man_pages_suffix"; then

-    man_pages_suffix=none

-fi

-

 echo ""

 echo "X11 will be built with the following settings:"

 echo " Loadable i18n module support:            "$XLIB_LOADABLE_I18N

@@ -561,7 +545,7 @@ echo " Internationalization support:            "$XLOCALE
 echo " XF86BigFont support:                     "$XF86BIGFONT

 echo " XKB support:                             "$XKB

 echo " XLOCALEDIR environment variable support: "$ENABLE_XLOCALEDIR

-echo " Manual pages suffix:                     "$man_pages_suffix

+echo " Manual pages suffix:                     "$LIB_MAN_SUFFIX

 echo " Compose table cache enabled:             "$COMPOSECACHE

 echo " Functional specs building enabled:       "$build_specs

 echo ""

diff --git a/libX11/man/Makefile.am b/libX11/man/Makefile.am
index ac3f25ea2..2b4bedadb 100644
--- a/libX11/man/Makefile.am
+++ b/libX11/man/Makefile.am
@@ -194,13 +194,11 @@ libman_PRE = \
 filemandir = $(FILE_MAN_DIR)

 fileman_PRE = Compose.man

 

-if MANPAGES

 libman_DATA = $(libman_PRE:man=@LIB_MAN_SUFFIX@) \

 	      $(all_shadows:=.@LIB_MAN_SUFFIX@)

 

 fileman_DATA = $(fileman_PRE:man=@FILE_MAN_SUFFIX@) \

 	       $(file_shadows:=.@FILE_MAN_SUFFIX@)

-endif

 

 EXTRA_DIST = $(libman_PRE) $(fileman_PRE)

 

diff --git a/libX11/man/xkb/Makefile.am b/libX11/man/xkb/Makefile.am
index c5d970074..54f0fb4d8 100644
--- a/libX11/man/xkb/Makefile.am
+++ b/libX11/man/xkb/Makefile.am
@@ -202,9 +202,7 @@ libman_PRE = \
 	XkbUpdateMapFromCore.man                \

 	XkbVirtualModsToReal.man                

 

-if MANPAGES

 libman_DATA = $(libman_PRE:man=@LIB_MAN_SUFFIX@)

-endif

 

 EXTRA_DIST = $(libman_PRE)

 

diff --git a/libX11/nls/en_US.UTF-8/Compose.pre b/libX11/nls/en_US.UTF-8/Compose.pre
index e26ef2be6..b850db1f8 100644
--- a/libX11/nls/en_US.UTF-8/Compose.pre
+++ b/libX11/nls/en_US.UTF-8/Compose.pre
@@ -104,6 +104,7 @@ XCOMM Spaces
 <Multi_key> <minus> <d>          	: "đ"   dstroke # LATIN SMALL LETTER D WITH STROKE

 <Multi_key> <minus> <D>          	: "Đ"   Dstroke # LATIN CAPITAL LETTER D WITH STROKE

 <Multi_key> <s> <s>              	: "ß"   ssharp # LATIN SMALL LETTER SHARP S

+<Multi_key> <S> <S>              	: "ẞ"   Ssharp # LATIN CAPITAL LETTER SHARP S

 

 <Multi_key> <o> <e>              	: "œ"   oe # LATIN SMALL LIGATURE OE

 <Multi_key> <O> <E>              	: "Œ"   OE # LATIN CAPITAL LIGATURE OE