This is an automated email from the git hooks/post-receive script.
glondu pushed a commit to branch master
in repository pxp.
commit 434e47c4bc3091f7988f74359191fb67f3661d2f
Author: Stephane Glondu <st...@glondu.net>
Date: Mon May 4 20:19:43 2015 -0300
Imported Upstream version 1.2.5
---
README | 2 ++
configure | 14 ++++++++++++--
doc/README | 2 ++
tools/src/lexpp/Makefile | 2 +-
4 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/README b/README
index 356ca1a..c929e40 100644
--- a/README
+++ b/README
@@ -141,6 +141,8 @@ Detailed feature list
Recent Changes
------------------------------------------------------------------------------
+- 1.2.5: Build against ocamlnet-4.
+
- 1.2.4: Fixed bug in namespace-aware parsing (thanks to ygrek and Thomas
Leonard)
diff --git a/configure b/configure
index e306d6b..fc586bb 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
-# $Id: configure 759 2013-05-31 11:19:07Z gerd $
+# $Id: configure 762 2015-01-12 18:06:36Z gerd $
# defaults:
with_lex=1
@@ -9,7 +9,7 @@ with_wlex_compat=1
with_ulex=1
with_pp=1
lexlist="utf8,iso88591,iso88592,iso88593,iso88594,iso88595,iso88596,iso88597,iso88598,iso88599,iso885910,iso885913,iso885914,iso885915,iso885916"
-version="1.2.4"
+version="1.2.5"
exec_suffix=""
help_lex="Enable/disable ocamllex-based lexical analyzer for the -lexlist
encodings"
@@ -180,6 +180,15 @@ else
exit 1
fi
+printf "%s" "Checking for netunidata... "
+if ocamlfind query netunidata >/dev/null 2>/dev/null; then
+ echo "found"
+ netunidata="netunidata"
+else
+ echo "not found"
+ netunidata=""
+fi
+
######################################################################
# Check wlex
@@ -440,6 +449,7 @@ LEX_OPT = $lex_opt
CAMLP4_LOC = $camlp4_loc
CAMLP4_STYLE = $camlp4_style
CAMLP4_OPTS = $camlp4_opts
+NETUNIDATA = $netunidata
_EOF_
######################################################################
diff --git a/doc/README b/doc/README
index 356ca1a..c929e40 100644
--- a/doc/README
+++ b/doc/README
@@ -141,6 +141,8 @@ Detailed feature list
Recent Changes
------------------------------------------------------------------------------
+- 1.2.5: Build against ocamlnet-4.
+
- 1.2.4: Fixed bug in namespace-aware parsing (thanks to ygrek and Thomas
Leonard)
diff --git a/tools/src/lexpp/Makefile b/tools/src/lexpp/Makefile
index c07f319..8ed825a 100644
--- a/tools/src/lexpp/Makefile
+++ b/tools/src/lexpp/Makefile
@@ -10,7 +10,7 @@ OBJS = uni_types.cmo uni_lexer.cmo uni_parser.cmo
lexpp_file.cmo \
mll_lexer.cmo \
ucs2_to_utf8.cmo main.cmo
-PACKAGES=netstring
+PACKAGES=netstring $(NETUNIDATA)
uni_lexer.ml: uni_lexer.mll
$(OCAMLLEX) uni_lexer.mll
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-ocaml-maint/packages/pxp.git
_______________________________________________
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits
