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
@@ -10,5 +10,6 @@ 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,5 +1,5 @@
 # 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
@@ -18,11 +18,11 @@ 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
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,5 +1,5 @@
 # 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
@@ -18,12 +18,11 @@ 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
diff --git a/tests/framelist00.at b/tests/framelist00.at
index 894d0f0..1faaeb0 100644
--- a/tests/framelist00.at
+++ b/tests/framelist00.at
@@ -1,5 +1,5 @@
 # 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
@@ -18,9 +18,9 @@ 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"
diff --git a/tests/framelist01.at b/tests/framelist01.at
index 59e5ca2..1e37262 100644
--- a/tests/framelist01.at
+++ b/tests/framelist01.at
@@ -1,5 +1,5 @@
 # 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
@@ -18,9 +18,9 @@ AT_SETUP([formats: framelist --frames])
 AT_KEYWORDS([script format framelist--frames framelist01])
 
 AT_CHECK([
-PREREQ_GUILE
+WITH_GUILE([
 genfile -f file -p $abs_srcdir/id3v2 10k
-idest -N -p $abs_top_srcdir/scheme --format framelist --frames TIT2,COMM,APIC file
+idest -N -p $abs_top_srcdir/scheme --format framelist --frames TIT2,COMM,APIC file])
 ],
 [0],
 [TIT2
diff --git a/tests/framelist02.at b/tests/framelist02.at
index c56d11e..6376ca7 100644
--- a/tests/framelist02.at
+++ b/tests/framelist02.at
@@ -1,5 +1,5 @@
 # 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
@@ -18,9 +18,9 @@ AT_SETUP([formats: framelist --single-line])
 AT_KEYWORDS([script format framelist--single-line framelist02])
 
 AT_CHECK([
-PREREQ_GUILE
+WITH_GUILE([
 genfile -f file -p $abs_srcdir/id3v2 10k
-idest -N -p $abs_top_srcdir/scheme --format framelist --single-line file
+idest -N -p $abs_top_srcdir/scheme --format framelist --single-line file])
 ],
 [0],
 [TIT2,TALB,TRCK,COMM,TPE1,TDRC,TCON,TCOP,TENC,USLT,WPUB,WXXX,WXXX,APIC,APIC
diff --git a/tests/list1.at b/tests/list1.at
index 80d869b..4464dfb 100644
--- a/tests/list1.at
+++ b/tests/list1.at
@@ -1,5 +1,5 @@
 # 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
@@ -18,12 +18,11 @@ AT_SETUP([examples: list1])
 AT_KEYWORDS([script examples list1])
 
 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/list1.scm file1 file2
+idest -N -S $abs_top_srcdir/examples/list1.scm file1 file2])
 ],
 [0],
 [file1
diff --git a/tests/list2.at b/tests/list2.at
index 73008c6..5bb082c 100644
--- a/tests/list2.at
+++ b/tests/list2.at
@@ -1,5 +1,5 @@
 # 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
@@ -18,12 +18,11 @@ AT_SETUP([examples: list2])
 AT_KEYWORDS([script examples list2])
 
 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/list2.scm TIT2,TALB,COMM,TENC file1 file2
+idest -N -S $abs_top_srcdir/examples/list2.scm TIT2,TALB,COMM,TENC f