From: Adam C. <ad...@us...> - 2009-09-27 17:03:01
|
Update of /cvsroot/hcoop/domtool2/pcre/smlnj In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv32321/pcre/smlnj Modified Files: libpcre-h.sml Log Message: Make dynamic linking smarter, so this stuff works before running 'make install' Index: libpcre-h.sml =================================================================== RCS file: /cvsroot/hcoop/domtool2/pcre/smlnj/libpcre-h.sml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** libpcre-h.sml 15 Dec 2007 16:42:49 -0000 1.1 --- libpcre-h.sml 27 Sep 2009 17:02:50 -0000 1.2 *************** *** 1,6 **** structure LibpcreH = struct local val lh = DynLinkage.open_lib ! { name = "/usr/local/lib/pcre_sml.so", global = true, lazy = true } handle DynLinkage.DynLinkError s => raise Fail s in --- 1,9 ---- structure LibpcreH = struct local + val global = "/usr/local/lib/pcre_sml.so" + val locl = "openssl/pcre_sml.so" + val lh = DynLinkage.open_lib ! { name = if Posix.FileSys.access (global, []) then global else locl, global = true, lazy = true } handle DynLinkage.DynLinkError s => raise Fail s in |