[procps] Re: watch 8bit and make distcheck

On Wed, May 30, 2012 at 2:39 PM, Craig Small <csmall-procps@xxxxxxxxxx> wrote:
>  I can't quite pin it down, but there is something wrong with the build
> system with respect to the --enable-watch8bit option.
>
> The problem can be seen with
> ./configure
> make distcheck
>
> make will work, but distcheck doesn't.

I noticed distcheck failing finding '$(top_srcdir)/.version' which
came from commit 6940014c42372033c2f765ce6d2b71300b4b9288 See
attachment for a fix which I believe works.

> The problem is the linker links to libncurses and not libncursesw
> The library used seems to be decided at a different point to the compile
> time switches.  This means the compiler (or config.h) has WITH_WATCH8BIT
> but the linker does not.
>
> I suspect the code that switches which ncurses to link to is wrong, but
> what's the fix?

I'm  not sure about that.

-- 
   Sami Kerola
   http://www.iki.fi/kerolasa/

From ced91e192274f1648e405644842e6ed001359c9b Mon Sep 17 00:00:00 2001
From: Sami Kerola <kerolasa@xxxxxx>
Date: Mon, 4 Jun 2012 09:42:50 +0200
Subject: [PATCH] build-sys: do not assume $(top_srcdir)/.version file always
 exists

The issue was visible when trying to perform 'make distcheck'
without the .version file.

Reported-by: Craig Small <csmall@xxxxxxxxxx>
Reference: http://www.freelists.org/post/procps/watch-8bit-and-make-distcheck
Signed-off-by: Sami Kerola <kerolasa@xxxxxx>
---
 Makefile.am |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Makefile.am b/Makefile.am
index 45aad49..5d373e2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -108,7 +108,9 @@ dist_procpsng_DATA = \
        Documentation/BUGS \
        Documentation/FAQ
 
-BUILT_SOURCES = $(top_srcdir)/.version
+@ if [ -f $(top_srcdir)/.version ]; then \
+  BUILT_SOURCES = $(top_srcdir)/.version \
+fi
 $(top_srcdir)/.version:
        echo $(VERSION) > $@-t && mv $@-t $@
 dist-hook:
-- 
1.7.9.5

Other related posts: