From 92d9a56eeac3477063be26ef237ea8da63c5b67e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20W=C3=A4ckerlin?= <marc@mrw.sh>
Date: Mon, 20 Aug 2007 16:09:31 +0000
Subject: [PATCH] Release 3-2-4 with tag: REL_mrw-c++-3-2-4

---
 ChangeLog                                | 3 +++
 makefile.am                              | 2 +-
 mrw/autofunctiontracelog4cxx.cpp         | 3 ++-
 mrw/autofunctiontracestdlog.cpp          | 3 ++-
 mrw/log4cxxconfiguration.cpp             | 3 ++-
 mrw/mrwautofunctiontracelog4cxx_test.cpp | 3 ++-
 mrw/stacktrace.cpp                       | 3 ++-
 mrw/stacktrace.hpp                       | 3 ++-
 8 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 5ec5f59..fa9ebcb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+* Mon Aug 20 2007 Marc Waeckerlin - mrw-c++-3.2.5 (mrw)
+	- New checkinstall.sh, cause checkinstall does not work otherwise
+	- "#if _REENTRANT" needs "defined(...)"
 * Tue Aug 16 2007 Marc Waeckerlin - mrw-c++-3.2.4 (mrw)
 	- Changed specfiles to eilminate build problems
 * Sun Aug 5 2007 Marc Waeckerlin - mrw-c++-3.2.3 (mrw)
diff --git a/makefile.am b/makefile.am
index daf1a2b..80ab1d1 100644
--- a/makefile.am
+++ b/makefile.am
@@ -11,7 +11,7 @@
 
 SUBDIRS = mrw
 
-EXTRA_DIST = bootstrap.sh
+EXTRA_DIST = bootstrap.sh checkinstall.sh
 
 nobase_include_HEADERS = mrw/arg.hpp        mrw/list.hpp \
                          mrw/unistd.hpp \
diff --git a/mrw/autofunctiontracelog4cxx.cpp b/mrw/autofunctiontracelog4cxx.cpp
index 3f68437..b3e77c2 100644
--- a/mrw/autofunctiontracelog4cxx.cpp
+++ b/mrw/autofunctiontracelog4cxx.cpp
@@ -23,7 +23,8 @@
 #include <mrw/stacktrace.hpp>
 #include <log4cxx/logger.h>
 
-#if (__GNUC__==3 && __GNUC_MINOR__<4 || __GNUC__<3) && _REENTRANT && !_MT
+#if (__GNUC__==3 && __GNUC_MINOR__<4 || __GNUC__<3) \
+  && defined(_REENTRANT) && !defined(_MT)
 #define _MT
 #endif
 
diff --git a/mrw/autofunctiontracestdlog.cpp b/mrw/autofunctiontracestdlog.cpp
index c32fe3b..ad35965 100644
--- a/mrw/autofunctiontracestdlog.cpp
+++ b/mrw/autofunctiontracestdlog.cpp
@@ -21,7 +21,8 @@
 #include <iostream>
 #include <iomanip>
 
-#if (__GNUC__==3 && __GNUC_MINOR__<4 || __GNUC__<3) && _REENTRANT && !_MT
+#if (__GNUC__==3 && __GNUC_MINOR__<4 || __GNUC__<3) \
+  && defined(_REENTRANT) && !defined(_MT)
 #define _MT
 #endif
 
diff --git a/mrw/log4cxxconfiguration.cpp b/mrw/log4cxxconfiguration.cpp
index b7cf589..102d08e 100644
--- a/mrw/log4cxxconfiguration.cpp
+++ b/mrw/log4cxxconfiguration.cpp
@@ -27,7 +27,8 @@
 #include <log4cxx/helpers/properties.h>
 #include <fstream>
 
-#if (__GNUC__==3 && __GNUC_MINOR__<4 || __GNUC__<3) && _REENTRANT && !_MT
+#if (__GNUC__==3 && __GNUC_MINOR__<4 || __GNUC__<3) \
+  && defined(_REENTRANT) && !defined(_MT)
 #define _MT
 #endif
 
diff --git a/mrw/mrwautofunctiontracelog4cxx_test.cpp b/mrw/mrwautofunctiontracelog4cxx_test.cpp
index 6a889a7..a6a071c 100644
--- a/mrw/mrwautofunctiontracelog4cxx_test.cpp
+++ b/mrw/mrwautofunctiontracelog4cxx_test.cpp
@@ -35,7 +35,8 @@
 #include <mrw/stacktrace.hpp>
 #include <map>
 
-#if (__GNUC__==3 && __GNUC_MINOR__<4 || __GNUC__<3) && _REENTRANT && !_MT
+#if (__GNUC__==3 && __GNUC_MINOR__<4 || __GNUC__<3) \
+  && defined(_REENTRANT) && !defined(_MT)
 #define _MT
 #endif
 
diff --git a/mrw/stacktrace.cpp b/mrw/stacktrace.cpp
index def645d..fd54252 100644
--- a/mrw/stacktrace.cpp
+++ b/mrw/stacktrace.cpp
@@ -53,7 +53,8 @@
   }
 #endif
 
-#if (__GNUC__==3 && __GNUC_MINOR__<4 || __GNUC__<3) && _REENTRANT && !_MT
+#if (__GNUC__==3 && __GNUC_MINOR__<4 || __GNUC__<3) \
+  && defined(_REENTRANT) && !defined(_MT)
 #define _MT
 #endif
 
diff --git a/mrw/stacktrace.hpp b/mrw/stacktrace.hpp
index 57553db..0405869 100644
--- a/mrw/stacktrace.hpp
+++ b/mrw/stacktrace.hpp
@@ -20,7 +20,8 @@
 #include <sys/mman.h>
 #include <bfd.h>
 
-#if (__GNUC__==3 && __GNUC_MINOR__<4 || __GNUC__<3) && _REENTRANT && !_MT
+#if (__GNUC__==3 && __GNUC_MINOR__<4 || __GNUC__<3) \
+  && defined(_REENTRANT) && !defined(_MT)
 #define _MT
 #endif
 #ifdef _MT