Include gnulib as a submodule. Fix testsuite.

Guile 2.x outputs spurious diagnostics to stderr when compiling input files.
The only way to disable it is to disable compilation by setting environment
variable GUILE_AUTO_COMPILE to 0.  However, even if compilation is disabled,
Guile still checks whether the compiled file exists and complains on stderr
if it is older than the input file.  This diagnostics begins with ;;;.  Delete
this using sed prior to comparing stderr with the expected text.

* .gitmodules: Add gnulib
* gnulib: New module.
* bootstrap: Update from gnulib
* gint: Upgrade.
* scheme/idest/batch/setlyrics.scm: Fix typo.
* src/Makefile.am: Use AM_CPPFLAGS instead of obsolete includes.

* tests/atlocal.in: Set GUILE_AUTO_COMPILE=0
* tests/testsuite.at (WITH_GUILE): New macro.
* tests/delcomm.at: Use WITH_GUILE.
* tests/fmt-shortlist.at: Likewise.
* tests/framelist00.at: Likewise.
* tests/framelist01.at: Likewise.
* tests/framelist02.at: Likewise.
* tests/list1.at: Likewise.
* tests/list2.at: Likewise.
* tests/lyrics00.at: Likewise.
* tests/pic00.at: Likewise.
* tests/pic01.at: Likewise.
* tests/script00.at: Likewise.
* tests/script01.at: Likewise.
* tests/script02.at: Likewise.
* tests/script03.at: Likewise.
* tests/script04.at: Likewise.
* tests/script05.at: Likewise.
* tests/script06.at: Likewise.
* tests/script07.at: Likewise.
* tests/script08.at: Likewise.
* tests/setlyrics.at: Likewise.
* tests/setpic.at: Likewise.
* tests/settitle.at: Likewise.
* tests/shortlist.at: Likewise.

25 files changed, 76 insertions, 76 deletions

diff --git a/tests/atlocal.in b/tests/atlocal.in
index a302b99..35ad063 100644
--- a/tests/atlocal.in
+++ b/tests/atlocal.in
@@ -1,14 +1,15 @@
 # @configure_input@                                     -*- shell-script -*-
 # Configurable variable values for the Idest test suite.
 # Copyright (C) 2011 Sergey Poznyakoff
 
 PATH=@abs_top_builddir@/src:$PATH
 
 XFAILFILE=$abs_builddir/.badversion
 
 trap "cleanup; test -r $XFAILFILE && cat $XFAILFILE; exit $?" 1 2 13 15
 
 GUILE_VERSION="@GUILE_VERSION@"
 INSTALL_PROG="@INSTALL@"
-
+GUILE_AUTO_COMPILE=0
+export GUILE_AUTO_COMPILE
 
diff --git a/tests/delcomm.at b/tests/delcomm.at
index f263061..236f05a 100644
--- a/tests/delcomm.at
+++ b/tests/delcomm.at
@@ -1,37 +1,37 @@
 # This file is part of idest  -*- autotest -*-
-# Copyright (C) 2011 Sergey Poznyakoff
+# Copyright (C) 2011, 2015 Sergey Poznyakoff
 #
 # Idest is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 3, or (at your option)
 # any later version.
 #
 # Idest is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with idest.  If not, see <http://www.gnu.org/licenses/>.
 
 AT_SETUP([examples: delcomm])
 AT_KEYWORDS([script examples delcomm])
 
 AT_CHECK([
-PREREQ_GUILE
+WITH_GUILE([
 genfile -f file1 -s $abs_srcdir/id3v1 10k
 genfile -f file2 -p $abs_srcdir/id3v2 10k
 
-idest -N -S $abs_top_srcdir/examples/delcomm.scm file1 file2
+idest -N -S $abs_top_srcdir/examples/delcomm.scm file1 file2])
 echo file1
 idest -a file1
 echo file2
 idest -a file2
 ],
 [0],
 [file1
 TIT2: File
 TPE1: Sergey Poznyakoff
 TALB: Idest Test Suite
 TDRC: 2011
 TRCK: 1
diff --git a/tests/fmt-shortlist.at b/tests/fmt-shortlist.at
index 925646c..d529d84 100644
--- a/tests/fmt-shortlist.at
+++ b/tests/fmt-shortlist.at
@@ -1,33 +1,32 @@
 # This file is part of idest  -*- autotest -*-
-# Copyright (C) 2011 Sergey Poznyakoff
+# Copyright (C) 2011, 2015 Sergey Poznyakoff
 #
 # Idest is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 3, or (at your option)
 # any later version.
 #
 # Idest is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with idest.  If not, see <http://www.gnu.org/licenses/>.
 
 AT_SETUP([formats: shortlist])
 AT_KEYWORDS([script format shortlist])
 
 AT_CHECK([
-PREREQ_GUILE
-
+WITH_GUILE([
 genfile -f file1 -s $abs_srcdir/id3v1 10k
 genfile -f file2 -p $abs_srcdir/id3v2 10k
 
-idest -N -p $abs_top_srcdir/scheme --format shortlist file1 file2
+idest -N -p $abs_top_srcdir/scheme --format shortlist file1 file2])
 ],
 [0],
 [file1: File by Sergey Poznyakoff, 2011
 file2: File by Sergey Poznyakoff, 2011
 ])
 
 AT_CLEANUP
diff --git a/tests/framelist00.at b/tests/framelist00.at
index 894d0f0..1faaeb0 100644
--- a/tests/framelist00.at
+++ b/tests/framelist00.at
@@ -1,35 +1,35 @@
 # This file is part of idest  -*- autotest -*-
-# Copyright (C) 2011 Sergey Poznyakoff
+# Copyright (C) 2011, 2015 Sergey Poznyakoff
 #
 # Idest is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 3, or (at your option)
 # any later version.
 #
 # Idest is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with idest.  If not, see <http://www.gnu.org/licenses/>.
 
 AT_SETUP([formats: framelist --full])
 AT_KEYWORDS([script format framelist--full framelist00])
 
 AT_CHECK([
-PREREQ_GUILE
+WITH_GUILE([
 genfile -f file -p $abs_srcdir/id3v2 10k
-idest -N -p $abs_top_srcdir/scheme --format framelist --full file
+idest -N -p $abs_top_srcdir/scheme --format framelist --full file])
 ],
 [0],
 [TIT2 descr="Title/songname/content description"
 TALB descr="Album/movie/show title"
 TRCK descr="Track number/position in set"
 COMM descr="Comments" lang="eng" condesc=""
 TPE1 descr="Lead performer(s)/soloist(s)"
 TDRC descr="Recording time"
 TCON descr="Content type"