[Guile-commits] GNU Guile branch, master, updated. release_1-9-11-213-g3d9f7bd

[Thien-Thi Nguyen]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Guile".

http://git.savannah.gnu.org/cgit/guile.git/commit/?id=3d9f7bd57eb1cf9024314f8656a302bab114d107

The branch, master has been updated
       via  3d9f7bd57eb1cf9024314f8656a302bab114d107 (commit)
       via  39f7ae3135f4ad9dad3504cf8ffb0dfa4ba5bda4 (commit)
       via  6a6df18794657badfc5af0a14a8a2f1481fa39a0 (commit)
      from  648da032599d696c34c9ff2bf9cd1de27987b7a3 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 3d9f7bd57eb1cf9024314f8656a302bab114d107
Author: Thien-Thi Nguyen <address@hidden>
Date:   Thu Jul 22 14:25:27 2010 +0200

    Add copyright notice to acinclude.m4.
    
    * acinclude.m4: Add copyright notice, with years derived from "git log" 
output.

commit 39f7ae3135f4ad9dad3504cf8ffb0dfa4ba5bda4
Author: Thien-Thi Nguyen <address@hidden>
Date:   Thu Jul 22 14:22:42 2010 +0200

    [build] Move GUILE_CONFIG_SCRIPT to acinclude.m4.
    
    * configure.ac (GUILE_CONFIG_SCRIPT): Move from here...
    * acinclude.m4 (GUILE_CONFIG_SCRIPT): ...to here.

commit 6a6df18794657badfc5af0a14a8a2f1481fa39a0
Author: Thien-Thi Nguyen <address@hidden>
Date:   Thu Jul 22 14:17:26 2010 +0200

    [maint] Avoid no-op config-subst for libguile/guile-func-name-check.
    
    * configure.ac (libguile/guile-func-name-check): Remove 
‘GUILE_CONFIG_SCRIPT’.
    * libguile/Makefile.am (.c.doc): Look in $(srcdir) for awk script.
    * libguile/guile-func-name-check: Rename from guile-func-name-check.in.

-----------------------------------------------------------------------

Summary of changes:
 acinclude.m4                                       |   25 ++++++++++++++++++++
 configure.ac                                       |    6 ----
 libguile/Makefile.am                               |    8 +++---
 ...le-func-name-check.in => guile-func-name-check} |    0
 4 files changed, 29 insertions(+), 10 deletions(-)
 rename libguile/{guile-func-name-check.in => guile-func-name-check} (100%)

diff --git a/acinclude.m4 b/acinclude.m4
index e00bc97..82fa24e 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -1,5 +1,26 @@
 dnl -*- Autoconf -*-
 
+dnl Copyright (C) 1997, 1999, 2000, 2001, 2002, 2004, 2006,
+dnl   2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+dnl
+dnl This file is part of GUILE
+dnl
+dnl GUILE is free software; you can redistribute it and/or modify it under
+dnl the terms of the GNU Lesser General Public License as published by the
+dnl Free Software Foundation; either version 3, or (at your option) any
+dnl later version.
+dnl
+dnl GUILE is distributed in the hope that it will be useful, but WITHOUT
+dnl ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+dnl FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
+dnl License for more details.
+dnl
+dnl You should have received a copy of the GNU Lesser General Public
+dnl License along with GUILE; see the file COPYING.LESSER.  If not, write
+dnl to the Free Software Foundation, Inc., 51 Franklin Street, Fifth
+dnl Floor, Boston, MA 02110-1301, USA.
+
+
 dnl  On the NeXT, #including <utime.h> doesn't give you a definition for
 dnl  struct utime, unless you #define _POSIX_SOURCE.
 
@@ -442,3 +463,7 @@ AC_DEFUN([GUILE_READLINE], [
   AC_SUBST(LIBGUILEREADLINE_INTERFACE_AGE)
   AC_SUBST(LIBGUILEREADLINE_INTERFACE)
 ])
+
+dnl Declare file $1 to be a script that needs configuring,
+dnl and arrange to make it executable in the process.
+AC_DEFUN([GUILE_CONFIG_SCRIPT],[AC_CONFIG_FILES([$1],[chmod +x $1])])
diff --git a/configure.ac b/configure.ac
index f401172..265b382 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1643,11 +1643,6 @@ AC_CONFIG_FILES([meta/guile-2.0.pc])
 AC_CONFIG_FILES([meta/guile-2.0-uninstalled.pc])
 AC_CONFIG_FILES([doc/ref/effective-version.texi])
 
-dnl We can get fancy with m4sugar (m4_foreach et al) later.
-dnl NB: We don't jam everything into one GUILE_CONFIG_SCRIPT call
-dnl since that expands "chmod +x LONG-LIST-OF-FILES" multiply.  --ttn
-AC_DEFUN([GUILE_CONFIG_SCRIPT],[AC_CONFIG_FILES([$1],[chmod +x $1])])
-
 GUILE_CONFIG_SCRIPT([check-guile])
 GUILE_CONFIG_SCRIPT([benchmark-guile])
 GUILE_CONFIG_SCRIPT([meta/guile])
@@ -1656,7 +1651,6 @@ GUILE_CONFIG_SCRIPT([meta/gdb-uninstalled-guile])
 GUILE_CONFIG_SCRIPT([meta/guile-tools])
 GUILE_CONFIG_SCRIPT([libguile/guile-snarf])
 GUILE_CONFIG_SCRIPT([libguile/guile-doc-snarf])
-GUILE_CONFIG_SCRIPT([libguile/guile-func-name-check])
 GUILE_CONFIG_SCRIPT([libguile/guile-snarf-docs])
 GUILE_CONFIG_SCRIPT([test-suite/standalone/test-use-srfi])
 GUILE_CONFIG_SCRIPT([test-suite/standalone/test-fast-slot-ref])
diff --git a/libguile/Makefile.am b/libguile/Makefile.am
index 6a33473..5897d03 100644
--- a/libguile/Makefile.am
+++ b/libguile/Makefile.am
@@ -63,7 +63,7 @@ gen-scmconfig.$(OBJEXT): gen-scmconfig.c
        fi
 
 ## Override default rule; this should run on BUILD host.
-gen-scmconfig$(EXEEXT): $(gen_scmconfig_OBJECTS) $(gen_scmconfig_DEPENDENCIES) 
+gen-scmconfig$(EXEEXT): $(gen_scmconfig_OBJECTS) $(gen_scmconfig_DEPENDENCIES)
        $(AM_V_GEN) \
        rm -f gen-scmconfig$(EXEEXT); \
        if [ "$(cross_compiling)" = "yes" ]; then \
@@ -94,7 +94,7 @@ c-tokenize.$(OBJEXT): c-tokenize.c
        fi
 
 ## Override default rule; this should run on BUILD host.
-guile_filter_doc_snarfage$(EXEEXT): $(guile_filter_doc_snarfage_OBJECTS) 
$(guile_filter_doc_snarfage_DEPENDENCIES) 
+guile_filter_doc_snarfage$(EXEEXT): $(guile_filter_doc_snarfage_OBJECTS) 
$(guile_filter_doc_snarfage_DEPENDENCIES)
        $(AM_V_GEN) \
        rm -f guile_filter_doc_snarfage$(EXEEXT); \
        if [ "$(cross_compiling)" = "yes" ]; then \
@@ -466,7 +466,7 @@ endif HAVE_LD_VERSION_SCRIPT
 
 
 # These are headers visible as <guile/mumble.h>
-pkginclude_HEADERS = 
+pkginclude_HEADERS =
 
 # These are headers visible as <libguile/mumble.h>.
 modincludedir = $(pkgincludedir)/$(GUILE_EFFECTIVE_VERSION)/libguile
@@ -667,7 +667,7 @@ AM_V_FILTER_0 = @echo "  FILTER" $@;
 .c.x:
        $(AM_V_SNARF)$(GUILE_SNARF) -o $@ $< $(snarfcppopts)
 .c.doc:
-       -$(AM_V_FILTER)$(AWK) -f ./guile-func-name-check $< && 
(./guile-snarf-docs $(snarfcppopts) $< | ./guile_filter_doc_snarfage$(EXEEXT) 
--filter-snarfage) > $@ || { rm $@; false; }
+       -$(AM_V_FILTER)$(AWK) -f $(srcdir)/guile-func-name-check $< && 
(./guile-snarf-docs $(snarfcppopts) $< | ./guile_filter_doc_snarfage$(EXEEXT) 
--filter-snarfage) > $@ || { rm $@; false; }
 
 $(DOT_X_FILES) $(EXTRA_DOT_X_FILES): scmconfig.h snarf.h guile-snarf.in
 
diff --git a/libguile/guile-func-name-check.in b/libguile/guile-func-name-check
similarity index 100%
rename from libguile/guile-func-name-check.in
rename to libguile/guile-func-name-check


hooks/post-receive
-- 
GNU Guile