--- gforth/lib.fs	2007/12/31 17:34:58	1.21
+++ gforth/lib.fs	2008/02/12 20:28:51	1.23
@@ -6,7 +6,7 @@
 
 \ Gforth is free software; you can redistribute it and/or
 \ modify it under the terms of the GNU General Public License
-\ as published by the Free Software Foundation; either version 2
+\ as published by the Free Software Foundation, either version 3
 \ of the License, or (at your option) any later version.
 
 \ This program is distributed in the hope that it will be useful,
@@ -15,13 +15,17 @@
 \ GNU General Public License for more details.
 
 \ You should have received a copy of the GNU General Public License
-\ along with this program; if not, write to the Free Software
-\ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
+\ along with this program. If not, see http://www.gnu.org/licenses/.
 
-[IFDEF] av-call-int
+s" libavcall.so"     open-lib 0<>
+s" libcallback.so"   open-lib 0<> and
+s" libvacall.so"     open-lib 0<> and
+s" libtrampoline.so" open-lib 0<> and [if]
+    .( including fflib.fs [ffcall] )
     include fflib.fs
 [ELSE]
-    [IFDEF] ffi-call
+    s" libffi.so" open-lib [if]
+        .( including libffi.fs )
 	include libffi.fs
     [ELSE]
         .( Neither libffi nor ffcall are available ) cr