--- gforth/configure.in	2008/10/10 21:20:44	1.248
+++ gforth/configure.in	2008/10/15 15:27:33	1.255
@@ -118,12 +118,15 @@ AC_ARG_VAR(ac_cv_sizeof_int, [sizeof(int
 AC_ARG_VAR(ac_cv_sizeof_long, [sizeof(long)])
 AC_ARG_VAR(ac_cv_sizeof_long_long, [sizeof(long long)])
 AC_ARG_VAR(ac_cv_sizeof_intptr_t, [sizeof(intptr_t)])
+AC_ARG_VAR(ac_cv_sizeof_int128_t, [sizeof(int128_t)])
+AC_ARG_VAR(ac_cv_sizeof_uint128_t, [sizeof(uint128_t)])
 AC_ARG_VAR(ac_cv_c_bigendian, [Is the target big-endian ("yes" or "no")?])
 AC_ARG_VAR(no_dynamic_default, [run gforth with --dynamic (0) or --no-dynamic (1) by default])
 AC_ARG_VAR(condbranch_opt, [enable (1) or disable (0) using two dispatches for conditional branches])
 AC_ARG_VAR(skipcode, [assembly code for skipping 16 bytes of code])
 AC_ARG_VAR(asmcomment, [assembler comment start string])
 AC_ARG_VAR(arm_cacheflush, [file containing ARM cacheflush function (without .c)])
+AC_ARG_VAR(LTDL_LIBRARY_PATH, [additional directories for libltdl (for some 64-bit platforms)])
 
 #set up feature test macros, so the tests get them right:
 # turn on all POSIX, SUSv3, and GNU features if available
@@ -287,7 +290,7 @@ case "$host_cpu" in
 		#particular, the delay slots of LW, MFLO, etc.)
 		#
 		#Therefore we disable dynamic native code by default:
-		if test -z $no_dynamic_default; then
+		if test -z "$no_dynamic_default"; then
 		    no_dynamic_default=1
 		    AC_MSG_WARN([Disabling default dynamic native code generation (relocation and delay slot issues)])
 		fi
@@ -673,11 +676,8 @@ case "$host_os" in
 		DIRSEP="/"
 		PATHSEP=":"
 		DEFAULTSYSTEMPREFIX=""
-		if test "$wordsize" = 64; then
-		   LTDL_LIBRARY_PATH=`ldconfig -p |tail -n +2 |sed 's/^.* => //'|sed 's|/[[^/]]*$||'| grep 64 | sort -u | tr '[\n]' [:] | sed -e 's/:$//'`
-                   if test -n "$LTDL_LIBRARY_PATH"; then
-                      AC_DEFINE_UNQUOTED(LTDL_LIBRARY_PATH,"$LTDL_LIBRARY_PATH",[Define LTDL_LIBRARY_PATH for 64 bit Linux])
-                   fi                                                                
+		if test -z "$LTDL_LIBRARY_PATH" -a "$wordsize" = 64; then
+		   LTDL_LIBRARY_PATH=`/sbin/ldconfig -p |tail -n +2 |sed 's/^.* => //'|sed 's|/[[^/]]*$||'| grep 64 | sort -u | tr '\n' : | sed -e 's/:$//'`
 		fi
 		;;
 	*)
@@ -692,6 +692,9 @@ AC_SUBST(PATHSEP)
 AC_DEFINE_UNQUOTED(PATHSEP,'$PATHSEP',[a path separator character])
 AC_SUBST(DEFAULTSYSTEMPREFIX)
 AC_DEFINE_UNQUOTED(DEFAULTSYSTEMPREFIX,"$DEFAULTSYSTEMPREFIX",[default for environment variable GFORTHSYSTEMPREFIX])
+if test -n "$LTDL_LIBRARY_PATH"; then
+   AC_DEFINE_UNQUOTED(LTDL_LIBRARY_PATH,"$LTDL_LIBRARY_PATH",[Define LTDL_LIBRARY_PATH for 64 bit Linux])
+fi                                                                
 
 #work around SELinux brain damage (from Andrew Haley <12t8f3jakb74g2c@news.supernews.com>)
 #This magic incantation  seems to be completely undocumented.
@@ -869,10 +872,10 @@ AC_CHECK_FUNCS(expm1 log1p)
 AC_REPLACE_FUNCS(rint ecvt)
 dnl No check for select, because our replacement is no good under
 dnl anything but DOS
-AC_CHECK_HEADERS(sys/mman.h fnmatch.h alloca.h)
+AC_CHECK_HEADERS(sys/mman.h fnmatch.h alloca.h wchar.h)
 AC_FUNC_FNMATCH
 test $ac_cv_func_fnmatch_works = yes || AC_LIBOBJ(fnmatch)
-AC_CHECK_FUNCS(mmap sysconf getpagesize)
+AC_CHECK_FUNCS(mmap sysconf getpagesize wcwidth)
 AM_PATH_LISPDIR
 
 kernel_fi=kernl${vwordsize}${bytesex}.fi