--- gforth/configure.in	2012/03/22 01:45:42	1.303
+++ gforth/configure.in	2012/06/21 23:28:00	1.308
@@ -127,6 +127,16 @@ else
   NO_CROSS="#"
 fi])
 
+AC_ARG_WITH(arch,
+	AC_HELP_STRING([--with-arch=<arch>],
+			[  Build gforth binaries with <arch> postfix]),
+[if test "$withval" = "no"; then
+  ARCH=""
+else
+  ARCH=-${withval}
+fi])
+AC_SUBST(ARCH)
+
 #variables mentioned in INSTALL
 AC_ARG_VAR(SH, [The shell])
 AC_ARG_VAR(CC, [The C compiler (must support GNU C 2.x).])
@@ -203,6 +213,7 @@ AC_SUBST(engine_fast2)
 AC_SUBST(no_dynamic)
 AC_SUBST(image_i)
 AC_SUBST(signals_o)
+AC_SUBST(mi_prefix)
 
 #this is used to disable some (not generally essential) part of the
 #Makefile that some makes don't grok.  It would be better to test for
@@ -214,14 +225,18 @@ test "$make_type" = "GNU Make" && GNUMAK
 AC_MSG_RESULT($make_type)
 AC_SUBST(GNUMAKE)
 
-AC_MSG_CHECKING([whether the linker accepts -export-dynamic])
-OLDLDFLAGS=$LDFLAGS
-LDFLAGS="$LDFLAGS -export-dynamic"
-dnl AC_TRY_LINK gives false positive on rs6000-ibm-aix4.2.1.0
-dnl AC_TRY_LINK(,,ac_export_dynamic=yes,ac_export_dynamic=no)
-AC_TRY_RUN(main(){exit(0);},ac_export_dynamic=yes,ac_export_dynamic=no,ac_export_dynamic=no)
-test $ac_export_dynamic = yes|| LDFLAGS=$OLDLDFLAGS
-AC_MSG_RESULT($ac_export_dynamic)
+if test "$ac_export_dynamic" != yes; then
+  AC_MSG_CHECKING([whether the linker accepts -export-dynamic])
+  OLDLDFLAGS=$LDFLAGS
+  LDFLAGS="$LDFLAGS -export-dynamic"
+  dnl AC_TRY_LINK gives false positive on rs6000-ibm-aix4.2.1.0
+  dnl AC_TRY_LINK(,,ac_export_dynamic=yes,ac_export_dynamic=no)
+  AC_TRY_RUN(main(){exit(0);},ac_export_dynamic=yes,ac_export_dynamic=no,ac_export_dynamic=no)
+  test $ac_export_dynamic = yes|| LDFLAGS=$OLDLDFLAGS
+  AC_MSG_RESULT($ac_export_dynamic)
+else
+  LDFLAGS="$LDFLAGS -export-dynamic"
+fi
 
 #terminology is a bit unusual here: The host is the system on which
 #gforth will run; the system on which configure will run is the `build'
@@ -695,10 +710,12 @@ AC_DEFINE_UNQUOTED(MAYBE_UNUSED,$MAYBE_U
 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_CACHE_CHECK([whether gcc understands '__thread'], [ac_cv_thread],
+     [AC_TRY_COMPILE(,[extern __thread int foo;],
+                        [ac_cv_thread=yes],
+                        [ac_cv_thread=no])])
+test x$ac_cv_thread = xyes && 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])
@@ -915,6 +932,13 @@ dnl This check is just for making later
 dnl using sin here is no good idea since it is built-into gcc and typechecked
 AC_CHECK_LIB(m,asin)
 AC_CHECK_LIB(ltdl,lt_dlinit)
+dnl ,LIB_SUFFIX=.la,LIB_SUFFIX=.so)
+if test "x$ac_cv_lib_ltdl_lt_dlinit" = xyes; then
+  LIB_SUFFIX=.la
+else
+  LIB_SUFFIX=.so
+fi
+AC_SUBST(LIB_SUFFIX)
 AC_CHECK_LIB(rt,clock_gettime)
 
 if test -n "$GNU_LIBTOOL" -a $ac_cv_lib_ltdl_lt_dlinit = yes; then
@@ -1001,7 +1025,7 @@ if test -z "$GFORTH"; then
 else
   GFORTH_FI=`cd / && $GFORTH --debug -e bye 2>&1 |grep "Opened image file: "|sed 's/Opened image file: //'`
   PREFORTH="$GFORTH -i $GFORTH_FI" ;
-  KERNLX_FI1=`echo $GFORTH_FI | sed -e s/lib/share/g -e s/gforth.fi/kernl*.fi/g`
+  KERNLX_FI1=`echo $GFORTH_FI | sed -e s/lib[64]*/share/g -e s/gforth.fi/kernl*.fi/g`
   KERNLX_FI2=`echo $GFORTH_FI | sed -e s/gforth.fi/kernl*.fi/g`
   test -f $KERNLX_FI1 && KERNLX_FI=$KERNLX_FI1
   test -f $KERNLX_FI2 && KERNLX_FI=$KERNLX_FI2