diff --git a/ChangeLog b/ChangeLog
index 6080c5b..145adaa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-01-15 19:40  tchernobog
+
+	* trunk/ChangeLog, trunk/Makefile.am, trunk/configure.ac,
+	  trunk/src/Makefile.am, trunk/src/main.cc, trunk/src/testsuite,
+	  trunk/src/testsuite/Makefile.am: - Lay out directory for keeping
+	  tests - Create Makefile for sources, add main.cc that just prints
+	  the license as a test for the rules.
+
 2006-01-13 17:30  tchernobog
 
 	* trunk/ChangeLog, trunk/configure.ac, trunk/doc/Makefile.am: - Add
diff --git a/configure.ac b/configure.ac
index 7af67a8..b9ccc72 100644
--- a/configure.ac
+++ b/configure.ac
@@ -47,7 +47,7 @@ AM_INIT_AUTOMAKE([dejagnu])
 dnl gettext & libtool
 AC_PROG_LIBTOOL
 AM_GNU_GETTEXT([external])
-AM_GNU_GETTEXT_VERSION([0.14.5])
+AM_GNU_GETTEXT_VERSION([0.14.1])
 
 dnl various requisites
 GTKMM_VERSION=2.8.0
diff --git a/m4/ac_pkg_swig.m4 b/m4/ac_pkg_swig.m4
index c627a74..c1260ff 100644
--- a/m4/ac_pkg_swig.m4
+++ b/m4/ac_pkg_swig.m4
@@ -25,11 +25,12 @@ dnl @author Andrew Collier <abcollier@yahoo.com>
 dnl @version 2004-09-20
 dnl @license GPLWithACException
 
+dnl Matteo Settenvini : changed warnings with errors
+
 AC_DEFUN([AC_PROG_SWIG],[
         AC_PATH_PROG([SWIG],[swig])
         if test -z "$SWIG" ; then
-                AC_MSG_WARN([cannot find 'swig' program. You should look at http://www.swig.org])
-                SWIG='echo "Error: SWIG is not installed. You should look at http://www.swig.org" ; false'
+                AC_MSG_ERROR([cannot find 'swig' program. You should look at http://www.swig.org])
         elif test -n "$1" ; then
                 AC_MSG_CHECKING([for SWIG version])
                 [swig_version=`$SWIG -version 2>&1 | grep 'SWIG Version' | sed 's/.*\([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\).*/\1/g'`]
@@ -70,15 +71,14 @@ AC_DEFUN([AC_PROG_SWIG],[
                         if test $available_major -ne $required_major \
                                 -o $available_minor -ne $required_minor \
                                 -o $available_patch -lt $required_patch ; then
-                                AC_MSG_WARN([SWIG version >= $1 is required.  You have $swig_version.  You should look at http://www.swig.org])
-                                SWIG='echo "Error: SWIG version >= $1 is required.  You have '"$swig_version"'.  You should look at http://www.swig.org" ; false'
+                                AC_MSG_ERROR([SWIG version >= $1 is required.  You have $swig_version.  You should look at http://www.swig.org])
                         else
                                 AC_MSG_NOTICE([SWIG executable is '$SWIG'])
                                 SWIG_LIB=`$SWIG -swiglib`
                                 AC_MSG_NOTICE([SWIG library directory is '$SWIG_LIB'])
                         fi
                 else
-                        AC_MSG_WARN([cannot determine SWIG version])
+                        AC_MSG_ERROR([cannot determine SWIG version])
                         SWIG='echo "Error: Cannot determine SWIG version.  You should look at http://www.swig.org" ; false'
                 fi
         fi