--- gforth/configure.in	2012/04/03 22:40:14	1.307
+++ gforth/configure.in	2012/07/23 12:49:06	1.313
@@ -20,12 +20,12 @@ dnl Process this file with autoconf to p
 
 dnl We use some automake macros here,
 dnl but don't use automake for creating Makefile.in
-AC_INIT([gforth],[0.7.9-20120317],[https://savannah.gnu.org/bugs/?func=addbug&group=gforth])
+AC_INIT([gforth],[0.7.9-20120723],[https://savannah.gnu.org/bugs/?func=addbug&group=gforth])
 AC_PREREQ(2.54)
 #snapshots have numbers major.minor.release-YYYYMMDD
 #note that lexicographic ordering must be heeded.
 #I.e., 0.4.1-YYYYMMDD must not exist before 0.4.1!
-UPDATED="March 17, 2012"
+UPDATED="July 23, 2012"
 AC_SUBST(UPDATED)
 AC_CONFIG_HEADERS(engine/config.h)
 
@@ -110,6 +110,20 @@ else
   platform=${withval}
 fi])
 
+AC_ARG_ENABLE(lib,
+	AC_HELP_STRING([--enable-lib],
+		       [  Compile Gforth as shared library (default disabled).]),
+	,enable_lib=no)
+if test "$enable_lib" != "no"; then
+   AC_DEFINE(HAS_LIB,,[Define if you want to build as shared library])
+   libengines=libgforths
+   libinstall=libinstall
+   LIB_VERSION=0:8:0
+fi
+AC_SUBST(libengines)
+AC_SUBST(libinstall)
+AC_SUBST(LIB_VERSION)
+
 AC_ARG_WITH(cross,
 	AC_HELP_STRING([--with-cross=<arch>],
 			[  Build gforth using a cross compiler.]),
@@ -213,6 +227,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
@@ -943,7 +958,6 @@ AC_CHECK_LIB(rt,clock_gettime)
 if test -n "$GNU_LIBTOOL" -a $ac_cv_lib_ltdl_lt_dlinit = yes; then
   build_libcc_named=build-libcc-named
 else
-  build_libcc_named=""
   AC_MSG_WARN([No GNU_LIBTOOL found, skip pre-building libcc-based libraries])
 fi
 AC_SUBST(build_libcc_named)
@@ -1024,7 +1038,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
@@ -1065,9 +1079,10 @@ chmod +x libforth
 chmod +x gforthker
 test -d kernel||mkdir kernel
 if test $srcdir != "."; then ln -sf $srcdir/gforth.el .; fi
-$srcdir/mkinstalldirs include/gforth/$PACKAGE_VERSION
+$srcdir/mkinstalldirs include/gforth$ARCH/$PACKAGE_VERSION
 $srcdir/mkinstalldirs arch/$machine
-ln -sf ../../../engine/config.h ../../../engine/libcc.h include/gforth/$PACKAGE_VERSION]],
+ln -sf ../../../engine/config.h ../../../engine/libcc.h include/gforth$ARCH/$PACKAGE_VERSION]],
 [PACKAGE_VERSION=$PACKAGE_VERSION
- machine=$machine])
+ machine=$machine
+ ARCH=$ARCH])
 AC_OUTPUT