[SCM] tango branch, master, updated. debian/8.0.5+dfsg-1-1-g1dd4c13

[Picca Frédéric-Emma?==?UTF-8?Q?nuel]

The following commit has been merged in the master branch:
commit a81fdfdb1f46c9da8d2dcadcf739d0b38bda6a48
Author: Picca Frédéric-Emmanuel <picca at debian.org>
Date:   Mon May 28 10:12:07 2012 +0200

    one more question for the upstream

diff --git a/debian/todo b/debian/todo
index 30f7b18..72a62a8 100644
--- a/debian/todo
+++ b/debian/todo
@@ -1,2 +1,25 @@
 - ask the ESRf if they want tango7 + tango8 // installation for production
-  - compilation / execution
\ No newline at end of file
+  - compilation / execution
+
+- add the 
+
+diff --git a/lib/cpp/log4tango/Makefile.am b/lib/cpp/log4tango/Makefile.am
+index e0231d5..3d0ea84 100644
+--- a/lib/cpp/log4tango/Makefile.am
++++ b/lib/cpp/log4tango/Makefile.am
+@@ -1,5 +1,7 @@
+ SUBDIRS = config src include tests
+ 
++ACLOCAL_AMFLAGS = -I m4
++
+ if DOC
+ SUBDIRS += doc
+ endif
+@@ -20,7 +22,7 @@ EXTRA_DIST = log4tango.pc.in \
+ 		m4/PETI_PEDANTIC_GCC.m4 \
+ 		m4/AC_FUNC_SNPRINTF.m4 \
+ 		m4/AC_C_INT64_T.m4
+-		
++
+ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = log4tango.pc		

-- 
TANGO distributed control system.