--- gforth/lib.fs	2008/07/26 20:57:05	1.27
+++ gforth/lib.fs	2008/10/09 20:57:43	1.36
@@ -17,28 +17,25 @@
 \ You should have received a copy of the GNU General Public License
 \ along with this program. If not, see http://www.gnu.org/licenses/.
 
-s" libavcall.so"     open-lib 0<>
-s" libcallback.so"   open-lib 0<> and [if]
-    .( including fflib.fs [ffcall] )
-    include fflib.fs
-[ELSE]
-    s" libffi.so" open-lib [if]
-        .( including libffi.fs )
-	include libffi.fs
-    [ELSE]
-        .( Neither libffi nor ffcall are available ) cr
-        abort
-        .( Using oldlib.fs; incompatible with fflib.fs and libffi.fs) cr
-	include oldlib.fs
-    [THEN]
-[THEN]
+libffi-present [if]
+    require ./libffi.fs
+[else]
+    ffcall-present [if]
+	require ./fflib.fs
+    [else]
+	.( Neither libffi nor ffcall are configured ) cr
+	.( If you have installed one of them, you can use libffi.fs or fflib.fs directly ) cr
+	.( Or you can just use the new, documented and better, but different, libcc.fs ) cr
+	abort
+    [then]
+[then]
 
 \ testing stuff
 
 [IFUNDEF] libc
     s" os-type" environment? [IF]
 	2dup s" linux-gnu" str= [IF]  2drop
-	    library libc libc.so.6
+	    library libc libc.so.6 
 	[ELSE] 2dup s" cygwin" str= [IF]  2drop
 		library libc cygwin1.dll
 	    [ELSE]  2dup s" bsd" search nip nip [IF]  2drop
@@ -53,7 +50,7 @@ s" libcallback.so"   open-lib 0<> and [i
     [THEN]
 [THEN]
 
-[ifdef] testing
+0 [if]
 
 library libc libc.so.6