Index: /trunk/aclocal.m4
===================================================================
--- /trunk/aclocal.m4	(revision 201)
+++ /trunk/aclocal.m4	(revision 202)
@@ -1202,4 +1202,20 @@
 ])
 
+AC_DEFUN([GCC_WEMPTY_BODY],[
+  AC_LANG_ASSERT(C)
+  if test "X$CC" != "X"; then
+    AC_CACHE_CHECK([whether ${CC} accepts -Wno-empty-body],
+      empty_body,
+      [empty_body_cflags="$CFLAGS"
+       CFLAGS="$CFLAGS -Wno-empty-body"
+       AC_TRY_COMPILE(,, empty_body=yes, empty_body=no)
+       CFLAGS="$empty_body_cflags"
+      ])
+    if test $empty_body = yes; then
+      CFLAGS="$CFLAGS -Wno-empty-body"
+    fi
+  fi
+])
+
 AC_DEFUN([SAMHAIN_POSIX],[
 	AC_MSG_CHECKING([whether _POSIX_SOURCE is necessary])
Index: /trunk/configure.ac
===================================================================
--- /trunk/configure.ac	(revision 201)
+++ /trunk/configure.ac	(revision 202)
@@ -194,4 +194,9 @@
 AC_SUBST(selectconfig)
 AC_DEFINE_UNQUOTED(UID_CAST, ${uid_cast})
+
+dnl Test whether gcc supports -Wno-empty-body
+dnl Suppresses warnings from glibc pthread_cleanup_pop
+dnl
+GCC_WEMPTY_BODY
 
 
Index: /trunk/docs/Changelog
===================================================================
--- /trunk/docs/Changelog	(revision 201)
+++ /trunk/docs/Changelog	(revision 202)
@@ -1,3 +1,6 @@
 2.5.1:
+	* use -Wno-empty-body if supported to suppress warnings about
+	  glibc pthread_cleanup_pop implementation
+	* fix text relocations for i386 in src/sh_tiger1.s
 	* implement server->client SCAN command to initiate file check
 	* implement @if / @else conditionals with more tests in config file
Index: /trunk/test/testext.sh
===================================================================
--- /trunk/test/testext.sh	(revision 201)
+++ /trunk/test/testext.sh	(revision 202)
@@ -93,4 +93,5 @@
 	echo "SetType=log"                  >> testrc_1ext
 	echo "SetChecksum=$CHKSUM"          >> testrc_1ext
+	echo "SetEnviron=TZ=Europe/Berlin"  >> testrc_1ext
 	echo "SetFilterOr=ALERT"            >> testrc_1ext
 	echo "CloseCommand"                 >> testrc_1ext