[gpm] GPM patches: install unversioned solibrary and resolve linking against ncursesw

[Nico Schottelius]

... applied.

Kamil Rytarowski [Sat, May 04, 2013 at 01:42:21AM +0200]:
> Hello!
> 
> I'm attaching two patches [1] [2] against the development version of gpm.
> 
> Regards,
> 
> [1] [PATCH] Install unversioned solibrary
> 
> Unversioned solibraries are shipped with -devel packages in Linux
> distros. Generate and install it for the consistency.
> 
> [2] [PATCH] Resolve linking against ncursesw
> 
> The NCURSES library ships with wide-character (UTF-8) version of
> libncurses, the wide-character file is called ncursesw.so*. Check if
> it is present and link against it.

> From 8dae832c7f57b646891b17ec5e58569ccfc52918 Mon Sep 17 00:00:00 2001
> From: Kamil Rytarowski <n54@gmx.com>
> Date: Sat, 4 May 2013 01:30:17 +0200
> Subject: [PATCH] Install unversioned solibrary
> 
> Unversioned solibraries are shipped with -devel packages in Linux
> distros. Generate and install it for the consistency.
> ---
>  src/Makefile.in | 7 +++----
>  1 file changed, 3 insertions(+), 4 deletions(-)
> 
> diff --git a/src/Makefile.in b/src/Makefile.in
> index 6b60ad3..7e9e2ef 100644
> --- a/src/Makefile.in
> +++ b/src/Makefile.in
> @@ -79,7 +79,7 @@ prog/%:	prog/%.o
>  #		| $(SED) '\''s/\($*\)\.o\([ :]*\)/\1.o \1.lo\2/g'\'' > $(DEPDIR)/$@'
>  
>  # Do it all!
> -all:	gpm lib/libgpm.so.@abi_lev@ @LIBGPM_A@ $(PROG)
> +all:	gpm lib/libgpm.so.@abi_lev@ lib/libgpm.so @LIBGPM_A@ $(PROG)
>  
>  gpm:	$(GOBJ)
>  	$(CC) @LDFLAGS@ $(LDFLAGS) -o $@ $(GOBJ) @LIBS@ $(LIBS) -lm
> @@ -168,9 +168,8 @@ lib/libgpm.so.@abi_full@:	$(PICS)
>  	@LDFLAGS@ $(LDFLAGS) -o lib/libgpm.so.@abi_full@ $^ @LIBS@ @SHARED_LIBS@ $(LIBS)	
>  lib/libgpm.so.@abi_lev@:	lib/libgpm.so.@abi_full@
>  	$(LN_S) -f libgpm.so.@abi_full@ lib/libgpm.so.@abi_lev@
> -# unneeded, isn't it?
> -#lib/libgpm.so:	lib/libgpm.so.@abi_full@
> -#	$(LN_S) -f libgpm.so.@abi_full@ lib/libgpm.so
> +lib/libgpm.so:	lib/libgpm.so.@abi_full@
> +	$(LN_S) -f libgpm.so.@abi_full@ lib/libgpm.so
>  
>  include $(DEPFILE)
>  
> -- 
> 1.8.1.5
> 

> From 83a34673cd528342ab9cd88c75eb566ebceb672b Mon Sep 17 00:00:00 2001
> From: Kamil Rytarowski <n54@gmx.com>
> Date: Sat, 4 May 2013 01:22:26 +0200
> Subject: [PATCH] Resolve linking against ncursesw
> 
> The NCURSES library ships with wide-character (UTF-8) version of
> libncurses, the wide-character file is called ncursesw.so*. Check if
> it is present and link against it.
> ---
>  configure.ac.footer | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/configure.ac.footer b/configure.ac.footer
> index 89a4cd9..1e5e4da 100644
> --- a/configure.ac.footer
> +++ b/configure.ac.footer
> @@ -124,7 +124,7 @@ No|no|N|n) SHARED_LIBS=-lc ;;
>      done
>      TERMLIBS=$LIBS
>      LIBS=
> -    for i in ncurses curses; do
> +    for i in ncurses curses ncursesw; do
>          if test x$LIBS = x; then
>              AC_CHECK_LIB($i, wgetch,,,$TERMLIBS)
>          else :; fi
> -- 
> 1.8.1.5
> 


-- 
PGP key: 7ED9 F7D3 6B10 81D7 0EC5  5C09 D7DC C8E4 3187 7DF0