[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Bug-zile] small patches
From: |
Giuseppe Scrivano |
Subject: |
[Bug-zile] small patches |
Date: |
Tue, 02 Mar 2010 10:54:18 +0100 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/23.1.92 (gnu/linux) |
Hello,
First of all, thanks for this great software! I tried to build zile
from code and I had to change few things to get it built. I would
suggest you to consider the following small patches I have attached:
1) autogen.sh honors GNULIB_SRCDIR if it is defined, in this way you
don't need to have gnulib-tool in your PATH.
2) Update the code to accomodate new versions of gnulib, the only change
required is to use "gl_xlist.h" instead of "gl_list.h".
To get it working, gnulib must be re-imported using (note the
addition of the xlist module):
$ gnulib-tool --import --dir=. --lib=libgnu --source-base=lib \
--m4-base=m4 --doc-base=src --tests-base=tests \
--aux-dir=. --no-libtool --macro-prefix=gl alloca-opt array-list \
chown dirname euidaccess fcntl gendocs getcwd getopt-gnu hash \
linked-list minmax regex size_max stdarg stdbool sys_stat vasprintf \
version-etc-fsf xalloc xlist
3) If LUA is not found, signal an error, configure will not succeed.
What do you think?
Cheers,
Giuseppe
>From b92776422e3ea3d70707d9498cdd7502f5a0188c Mon Sep 17 00:00:00 2001
From: Giuseppe Scrivano <address@hidden>
Date: Tue, 2 Mar 2010 09:46:34 +0100
Subject: [PATCH 1/3] autogen.sh honors $GNULIB_SRCDIR when it is defined
---
autogen.sh | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/autogen.sh b/autogen.sh
index 24a9d1e..7a88fb2 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,5 +1,10 @@
#! /bin/sh
-
touch ChangeLog
-gnulib-tool --update
+
+if [ -z "$GNULIB_SRCDIR" ]; then
+ gnulib-tool --update
+else
+ $GNULIB_SRCDIR/gnulib-tool --update
+fi
+
autoreconf -i
--
1.7.0
>From 49bc6bd3969673ed27a05aeaeae7ee6d270f071b Mon Sep 17 00:00:00 2001
From: Giuseppe Scrivano <address@hidden>
Date: Tue, 2 Mar 2010 10:38:11 +0100
Subject: [PATCH 2/3] Use "gl_xlist.h" not "gl_list.h" to accomodate new gnulib
versions
---
src/main.h | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main.h b/src/main.h
index 97bf7c7..a7d6df0 100644
--- a/src/main.h
+++ b/src/main.h
@@ -1,6 +1,6 @@
/* Main types and definitions
- Copyright (c) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
2007, 2008, 2009 Free Software Foundation, Inc.
+ Copyright (c) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
2007, 2008, 2009, 2010 Free Software Foundation, Inc.
This file is part of GNU Zile.
@@ -30,7 +30,7 @@
#include "size_max.h"
#include "minmax.h"
#include "hash.h"
-#include "gl_list.h"
+#include "gl_xlist.h"
#include "astr.h"
#include "lists.h"
--
1.7.0
>From 1ffe1c08d1e99ac231bcd366c78f68b8f20ef5e2 Mon Sep 17 00:00:00 2001
From: Giuseppe Scrivano <address@hidden>
Date: Tue, 2 Mar 2010 10:40:28 +0100
Subject: [PATCH 3/3] configure raises an error if a suitable lua is not found
---
configure.ac | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/configure.ac b/configure.ac
index 5319f35..ae05495 100644
--- a/configure.ac
+++ b/configure.ac
@@ -69,6 +69,10 @@ fi
dnl Lua
AX_WITH_LUA
AX_LUA_VERSION(501, 502)
+if test "$lua_version" -lt "$lua_min_version" \
+ -o "$lua_version" -gt "$lua_max_version"; then
+ AC_MSG_ERROR([cannot find a suitable lua])
+fi
AC_SUBST(LUA)
dnl Extra definitions for config.h
--
1.7.0
- [Bug-zile] small patches,
Giuseppe Scrivano <=