diff --git a/ChangeLog b/ChangeLog
index 02149f7093dcccd39411bab947223ba1451774bd..72d45c31b674e489ebc0a46ee20357d9e0bc53b9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Dec  2 13:10:04 CET 2005 Daniel Veillard <veillard@redhat.com>
+
+	* configure.in src/Makefile.am: more warnings from compiler and
+	  link static in work environement
+
 Thu Dec  1 18:32:43 CET 2005 Daniel Veillard <veillard@redhat.com>
 
 	* Makefile.am configure.in docs/apibuild.py docs/libxen-api.xml
diff --git a/configure.in b/configure.in
index 6e049c8c78db0f53550c04fd15121d8cabea99c9..bd57d6e0a2e6a39c7bd80f7c01ec71aebc33c700 100644
--- a/configure.in
+++ b/configure.in
@@ -47,6 +47,19 @@ test "x$U" != "x" && AC_MSG_ERROR(Compiler not ANSI compliant)
 
 AM_PROG_LIBTOOL
 
+dnl
+dnl specific tests to setup DV devel environments with debug etc ...
+dnl
+if [[ "${LOGNAME}" = "veillard" -a "`pwd`" = "/u/veillard/libxen" ]] ; then
+    if test "${GCC}" = "yes" ; then
+	CFLAGS="-g -O -pedantic -W -Wformat -Wunused -Wimplicit -Wreturn-type -Wswitch -Wcomment -Wtrigraphs -Wformat -Wchar-subscripts -Wuninitialized -Wparentheses -Wshadow -Wpointer-arith -Wcast-align -Wwrite-strings -Waggregate-return -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Winline -Wredundant-decls -Wall"
+    fi
+    STATIC_BINARIES="-static"
+else
+    STATIC_BINARIES=
+fi
+AC_SUBST(STATIC_BINARIES)
+
 dnl search for the low level Xen library
 AC_SEARCH_LIBS(xc_domain_create, [xenctrl], [], [AC_MSG_ERROR([Xen control library not found])])
 AC_SEARCH_LIBS(xs_read, [xenstore], [], [AC_MSG_ERROR([Xen store library not found])])
diff --git a/src/Makefile.am b/src/Makefile.am
index f21e663d0e71f0b31400a2ba7a380a51152fbd26..8ee97eb827b9e04c3dfdb9f15f805dcd0dd67b81 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,7 +2,7 @@
 
 INCLUDES = -I$(top_builddir)/include -I@srcdir@/include
 DEPS = libxen.la
-LDADDS = libxen.la
+LDADDS = @STATIC_BINARIES@ libxen.la
 
 EXTRA_DIST = libxen_sym.version