fixed building of the configure files and fixed the NETSYS variable

galax-0.7.2-camomile-0.7.1.patch (text/plain), 4.01 KB, created by Guy Cirino on 2007-06-11 15:51:31 UTC

diff -urdN galax-0.7.2/base/galax_camomile.ml galax-0.7.2-patched/base/galax_camomile.ml
--- galax-0.7.2/base/galax_camomile.ml	2007-02-02 06:08:45.000000000 +0800
+++ galax-0.7.2-patched/base/galax_camomile.ml	2007-06-11 22:23:27.000000000 +0800
@@ -15,7 +15,8 @@
      This module is a wrapper over Camomile operations.
 *)
 
-module TextUTF8 = Camomile.UNF.Make(Camomile.UTF8)
+module TextUTF8 = CamomileLibrary.Default.Camomile.UNF.Make(
+				CamomileLibrary.Default.Camomile.UTF8)
 
 let nfc x = TextUTF8.nfc x
 let nfd x = TextUTF8.nfd x
@@ -35,5 +36,5 @@
   Buffer.contents b
 
 let utf8_codepoint_compare s1 s2 =
-  Camomile.UTF8.compare s1 s2
+  CamomileLibrary.Default.Camomile.UTF8.compare s1 s2
 
diff -urdN galax-0.7.2/code_selection/code/code_fn.ml galax-0.7.2-patched/code_selection/code/code_fn.ml
--- galax-0.7.2/code_selection/code/code_fn.ml	2007-02-02 06:08:45.000000000 +0800
+++ galax-0.7.2-patched/code_selection/code/code_fn.ml	2007-06-11 22:23:27.000000000 +0800
@@ -1058,10 +1058,10 @@
       begin
 	try
 	  let codept_list = ref [] in
-	  Camomile.UTF8.iter (fun uc -> let ic = Camomile.UChar.code uc in codept_list := (!codept_list) @ [ic]) s';
+	  CamomileLibrary.Default.Camomile.UTF8.iter (fun uc -> let ic = CamomileLibrary.Default.Camomile.UChar.code uc in codept_list := (!codept_list) @ [ic]) s';
 	  Cursor.cursor_of_list (List.map (fun i -> _integer (Decimal._integer_of_int i)) (!codept_list))
 	with 
-	| Camomile.UChar.Out_of_range -> raise(Query(Unicode_Error("Unicode character cannot be represented by positive integer.")))
+	| CamomileLibrary.Default.Camomile.UChar.Out_of_range -> raise(Query(Unicode_Error("Unicode character cannot be represented by positive integer.")))
       end
 (* F&O Section 7.5.1 fn:contains *)
 
diff -urdN galax-0.7.2/config/Makefile.galax-inst galax-0.7.2-patched/config/Makefile.galax-inst
--- galax-0.7.2/config/Makefile.galax-inst	2007-02-02 06:08:46.000000000 +0800
+++ galax-0.7.2-patched/config/Makefile.galax-inst	2007-06-11 22:25:12.000000000 +0800
@@ -117,6 +117,11 @@
 -I $(CONF_OCAML_LIBPXP_ISO88591) \
 -I $(CONF_OCAML_LIBCAMOMILE)
 
+#brought over the netsys dependency from Makefile.galax
+ifeq ($(CONF_WITH_NETSYS), true)
+OCAML_LIB_INCLUDES+=-I $(CONF_OCAML_LIBNETSYS) 
+endif
+
 # GALAX_ALL_INCLUDES:	All of the directories to search for MLI files
 #
 GALAX_ALL_INCLUDES=$(GALAX_INCLUDES) $(OCAML_LIB_INCLUDES)
@@ -170,8 +175,13 @@
 unix.cma \
 str.cma \
 bigarray.cma \
-pcre.cma \
-netstring.cma \
+pcre.cma
+
+ifeq ($(CONF_WITH_NETSYS), true)
+OCAML_LIBS+=netsys.cma 
+endif
+
+OCAML_LIBS+=netstring.cma \
 pxp_engine.cma \
 pxp_lex_utf8.cma pxp_lex_link_utf8.cmo \
 pxp_lex_iso88591.cma pxp_lex_link_iso88591.cmo \
@@ -201,8 +211,13 @@
 unix.cmxa \
 str.cmxa \
 bigarray.cmxa \
-pcre.cmxa \
-netstring.cmxa \
+pcre.cmxa
+
+ifeq ($(CONF_WITH_NETSYS), true)
+OCAML_OPTLIBS+=netsys.cmxa
+endif
+
+OCAML_OPTLIBS+=netstring.cmxa \
 pxp_engine.cmxa \
 pxp_lex_utf8.cmxa pxp_lex_link_utf8.cmx \
 pxp_lex_iso88591.cmxa pxp_lex_link_iso88591.cmx \
diff -urdN galax-0.7.2/configure galax-0.7.2-patched/configure
--- galax-0.7.2/configure	2007-02-06 04:05:46.000000000 +0800
+++ galax-0.7.2-patched/configure	2007-06-11 22:23:27.000000000 +0800
@@ -674,7 +674,7 @@
 	exit 1
 fi
 
-if [ ${ocaml_minor_version} -ge 3 ] 
+if [ ${ocaml_minor_version} -ge 3 -o -n "${ocaml_netsys}"  ] 
 then
   printf "%s" "Checking for OCaml netsys library... "
   if [ -z "$ocaml_netsys" ]
@@ -762,7 +762,7 @@
 printf "%s" "Checking for Camomile..."
 if [ -z "$ocaml_camomile" ]
 then
-	if [ -n "$ocaml_pkglib" -a -d "$ocaml_pkglib/camomile" -a -f "$ocaml_pkglib/camomile/camomile.cmi" ]
+	if [ -n "$ocaml_pkglib" -a -d "$ocaml_pkglib/camomile" -a -f "$ocaml_pkglib/camomile/camomileLibrary.cmi" ]
 	then
 		ocaml_camomile="$ocaml_pkglib/camomile"
 	elif [ -n "$tool_ocamlfind" ]
@@ -770,7 +770,7 @@
 		ocaml_camomile=`$tool_ocamlfind query camomile 2>/dev/null`
 	fi
 fi
-if [ -n "$ocaml_camomile" -a -f "$ocaml_camomile/camomile.cmi" ]
+if [ -n "$ocaml_camomile" -a -f "$ocaml_camomile/camomileLibrary.cmi" ]
 then
 	echo "found"
 else