--- gforth/envos.fs.in	2008/07/15 16:11:49	1.7
+++ gforth/envos.fs.in	2012/12/31 15:25:18	1.17
@@ -1,6 +1,6 @@
 \ envos.fs set os-specific environmental queries 	07jul97jaw
 
-\ Copyright (C) 1997,1999,2000,2003,2006,2007,2008 Free Software Foundation, Inc.
+\ Copyright (C) 1997,1999,2000,2003,2006,2007,2008,2009,2010,2012 Free Software Foundation, Inc.
 
 \ This file is part of Gforth.
 
@@ -26,10 +26,31 @@ get-current environment-wordlist set-cur
     s" @host_os@" ;
 set-current
 
+: lib-suffix ( -- c-addr u ) \ gforth
+\G the suffix for loading shared objects
+    s" @LIB_SUFFIX@" ;
+
+: arch-modifier ( -- c-addr u ) \ gforth
+\G the file name or directory modifier for the architecture
+    s" @ARCH@" ;
+
 : libtool-command ( -- c-addr u ) \ gforth
 \G name of the GNU libtool command
     s" @GNU_LIBTOOL@" ;
 
 : libtool-cc ( -- c-addr u ) \ gforth
 \G invocation string of the C compiler used for libtool
-    s" @CC@" ;
+    s" @LIBTOOL_CC@ @CFLAGS@" ;
+
+: libtool-flags ( -- c-addr u ) \ gforth
+\G force no undefined for cygwin
+    [ s" @host_os@" s" cygwin" str= ] [IF]  s"  -no-undefined "
+    [ELSE]  s" "  [THEN] ;
+
+\ test for the presence of libffi or ffcall
+@FFCALLFLAG@ constant ffcall-present \ libffi present (on building)
+@LIBFFIFLAG@ constant libffi-present \ ffcall libs present (on building)
+
+: include-ffi.h-string ( -- c-addr u )
+  s" #include <@FFI_H_NAME@>" ;
+