Control: tags -1 + patch

On 2018-03-12 21:12 +0100, Sven Joachim wrote:

> Source: iselect
> Version: 1.4.0-3
>
> If libslang2-dev is installed on the build system, iselect's configure
> script selects slcurses (slang's curses emulation) rather than ncurses,
> which is not really desirable.  Here is the relevant output:
>
> ,----
> | CHECK: Curses Environment
> | checking for additional include dir... none particular
> | checking for additional library dir... none particular
> | checking for grep that handles long lines and -e... /bin/grep
> | checking for egrep... /bin/grep -E
> | checking for ANSI C header files... yes
> | checking for sys/types.h... yes
> | checking for sys/stat.h... yes
> | checking for stdlib.h... yes
> | checking for string.h... yes
> | checking for memory.h... yes
> | checking for strings.h... yes
> | checking for inttypes.h... yes
> | checking for stdint.h... yes
> | checking for unistd.h... yes
> | checking ncurses/ncurses.h usability... no
> | checking ncurses/ncurses.h presence... no
> | checking for ncurses/ncurses.h... no
> | checking for initscr in -lncurses... yes
> | checking slcurses.h usability... yes
> | checking slcurses.h presence... yes
> | checking for slcurses.h... yes
> | checking for SLcurses_initscr in -lslang... yes
> | checking which Curses to use... S-Lang Curses
> `----
>
> There is no ncurses/ncurses.h in Debian.

The fix-ncurses-include-path.diff already took care of that for the
header files in iselect, I have amended it to also correct the path in
configure.in, which was enough to persuade "configure" to select ncurses
rather than slcurses. :-)

,----
| CHECK: Curses Environment
| checking for additional include dir... none particular
| checking for additional library dir... none particular
| checking for grep that handles long lines and -e... /bin/grep
| checking for egrep... /bin/grep -E
| checking for ANSI C header files... yes
| checking for sys/types.h... yes
| checking for sys/stat.h... yes
| checking for stdlib.h... yes
| checking for string.h... yes
| checking for memory.h... yes
| checking for strings.h... yes
| checking for inttypes.h... yes
| checking for stdint.h... yes
| checking for unistd.h... yes
| checking ncurses.h usability... yes
| checking ncurses.h presence... yes
| checking for ncurses.h... yes
| checking for initscr in -lncurses... yes
| checking slcurses.h usability... yes
| checking slcurses.h presence... yes
| checking for slcurses.h... yes
| checking for SLcurses_initscr in -lslang... yes
| checking which Curses to use... GNU NCurses
`----

Cheers,
       Sven

>From ffff4f1bc112817ccd00e456ab49d5ae6cec69f4 Mon Sep 17 00:00:00 2001
From: Sven Joachim <svenj...@gmx.de>
Date: Mon, 12 Mar 2018 21:24:21 +0100
Subject: [PATCH] Also fix the path to ncurses.h in configure.in

There is no ncurses/ncurses.h in Debian, and if libslang2-dev is
installed on the build system, configure would prefer slcurses over
ncurses.
---
 debian/patches/fix-ncurses-include-path.diff | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/debian/patches/fix-ncurses-include-path.diff b/debian/patches/fix-ncurses-include-path.diff
index 4429533..7ef8e7a 100644
--- a/debian/patches/fix-ncurses-include-path.diff
+++ b/debian/patches/fix-ncurses-include-path.diff
@@ -22,3 +22,14 @@ Fixes the include path for the ncurses header files.
  #endif
  #ifdef USE_SLCURSES
  #include <slcurses.h>
+--- iselect-1.3.1.orig/configure.in
++++ iselect-1.3.1/configure.in
+@@ -61,7 +61,7 @@ x="none particular"
+ )dnl
+ AC_MSG_RESULT([$x])
+ 
+-AC_CHECK_HEADER(ncurses/ncurses.h, HAVE_NCURSES_HEADER=YES, HAVE_NCURSES_HEADER=NO)
++AC_CHECK_HEADER(ncurses.h, HAVE_NCURSES_HEADER=YES, HAVE_NCURSES_HEADER=NO)
+ AC_CHECK_LIB(ncurses, initscr, HAVE_NCURSES_LIB=YES, HAVE_NCURSES_LIB=NO)
+ AC_CHECK_HEADER(slcurses.h, HAVE_SLCURSES_HEADER=YES, HAVE_SLCURSES_HEADER=NO)
+ OLIBS=$LIBS
-- 
2.16.2

Reply via email to