--- gforth/configure.in	2010/12/27 15:34:00	1.285
+++ gforth/configure.in	2011/04/19 16:19:32	1.289
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 
-#Copyright (C) 1995,1996,1997,1998,2000,2003,2004,2005,2006,2007,2008,2009 Free Software Foundation, Inc.
+#Copyright (C) 1995,1996,1997,1998,2000,2003,2004,2005,2006,2007,2008,2009,2010 Free Software Foundation, Inc.
 
 #This file is part of Gforth.
 
@@ -669,6 +669,12 @@ AC_TRY_COMPILE(,[int __attribute__((unus
 AC_DEFINE_UNQUOTED(MAYBE_UNUSED,$MAYBE_UNUSED,[attribute for possibly unused variables])
 AC_MSG_RESULT($MAYBE_UNUSED)
 
+# Try if GCC understands __thread
+AC_MSG_CHECKING([whether gcc understands '__thread'])
+AC_TRY_COMPILE(,[extern __thread int foo;],PER_THREAD='__thread',)
+AC_DEFINE_UNQUOTED(PER_THREAD,$PER_THREAD,[storage class for thread-local variables])
+AC_MSG_RESULT($PER_THREAD)
+
 #try if m4 understands -s
 AC_MSG_CHECKING([how to invoke m4])
 if m4 -s /dev/null >/dev/null 2>&1; then
@@ -887,6 +893,11 @@ AC_PROG_LN_S
 AC_PROG_INSTALL
 AC_CHECK_PROGS(TEXI2DVI,texi2dvi4a2ps texi2dvi)
 
+dnl check for the presence of Emacs
+AC_CHECK_PROGS(EMACS,emacs xemacs)
+test -n "$EMACS" && gforth_elc=gforth.elc
+AC_SUBST(gforth_elc)
+
 dnl MacOS X has a libtool that does something else
 AC_CHECK_PROGS(GNU_LIBTOOL,"glibtool --tag=CC" libtool)
 
@@ -917,7 +928,7 @@ if test -z "$FFI_H_NAME"; then
   AC_CHECK_HEADER(ffi/ffi.h,FFI_H_NAME=ffi/ffi.h,)
 fi
 AC_SUBST(FFI_H_NAME)
-AC_CHECK_LIB(ffi,ffi_call)
+AC_CHECK_LIB(ffi,ffi_call,LIBS="$LIBS")
 if test -n "$FFI_H_NAME" -a $ac_cv_lib_ffi_ffi_call = yes
 then
   LIBFFIFLAG="true"
@@ -927,7 +938,7 @@ else
 fi
 #check for ffcall libraries
 #unfortunately, these four calls are separated out into a library each.
-AC_CHECK_LIB(avcall,__builtin_avcall)
+AC_CHECK_LIB(avcall,__builtin_avcall,LIBS="$LIBS")
 dnl AC_CHECK_LIB(callback,__vacall_r)
 dnl AC_CHECK_LIB(vacall,vacall)
 dnl AC_CHECK_LIB(trampoline,alloc_trampoline)