From eafba6c3100dee37254573d403f49d9bd88da1e6 Mon Sep 17 00:00:00 2001
From: Theodore Ts'o <tytso@mit.edu>
Date: Thu, 10 Jul 2008 10:21:42 -0400
Subject: [PATCH] Don't use thread local storage if using diet libc

...because the diet libc doesn't support TLS.

Addresses-Sourceforge-Bug: #2000654

Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
---
 configure    | 12 ++++++++++--
 configure.in | 12 ++++++++++--
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/configure b/configure
index 8982258..39d1ca8 100755
--- a/configure
+++ b/configure
@@ -2004,10 +2004,12 @@ IFS=$ac_save_IFS
 case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
 
 
+WITH_DIET_LIBC=
 
 # Check whether --with-diet-libc was given.
 if test "${with_diet_libc+set}" = set; then
   withval=$with_diet_libc; CC="diet cc -nostdinc"
+WITH_DIET_LIBC=yes
 { echo "$as_me:$LINENO: result: CC=$CC" >&5
 echo "${ECHO_T}CC=$CC" >&6; }
 fi
@@ -4349,8 +4351,14 @@ else
 fi
 
 else
-  try_tls="yes"
-echo "Try using thread local support by default"
+  if test -n "$WITH_DIET_LIBC"
+then
+	try_tls=""
+	echo "Diet libc does not support thread local support"
+else
+	try_tls="yes"
+	echo "Try using thread local support by default"
+fi
 
 fi
 
diff --git a/configure.in b/configure.in
index c16893e..f8a7edf 100644
--- a/configure.in
+++ b/configure.in
@@ -65,9 +65,11 @@ AC_CANONICAL_HOST
 dnl
 dnl Use diet libc
 dnl 
+WITH_DIET_LIBC=
 AC_ARG_WITH([diet-libc],
 [  --with-diet-libc        use diet libc],
 CC="diet cc -nostdinc"
+WITH_DIET_LIBC=yes
 AC_MSG_RESULT(CC=$CC))dnl
 dnl
 dnl set $(CC) from --with-cc=value
@@ -529,8 +531,14 @@ else
 	echo "Enabling thread local support"
 fi]
 ,
-try_tls="yes"
-echo "Try using thread local support by default"
+if test -n "$WITH_DIET_LIBC"
+then
+	try_tls=""
+	echo "Diet libc does not support thread local support"
+else
+	try_tls="yes"
+	echo "Try using thread local support by default"
+fi
 )
 if test "$try_tls" = "yes"
 then
-- 
1.8.3.1