[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
trans-coord/gnun/server/gnun ChangeLog NEWS con...
|
From: |
Pavel Kharitonov |
|
Subject: |
trans-coord/gnun/server/gnun ChangeLog NEWS con... |
|
Date: |
Wed, 29 Jun 2016 16:36:42 +0000 (UTC) |
CVSROOT: /sources/trans-coord
Module name: trans-coord
Changes by: Pavel Kharitonov <ineiev> 16/06/29 16:36:42
Modified files:
gnun/server/gnun: ChangeLog NEWS configure.ac
Log message:
Check if xmllint supports --nonet and --path.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/ChangeLog?cvsroot=trans-coord&r1=1.445&r2=1.446
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/NEWS?cvsroot=trans-coord&r1=1.120&r2=1.121
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/configure.ac?cvsroot=trans-coord&r1=1.51&r2=1.52
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/ChangeLog,v
retrieving revision 1.445
retrieving revision 1.446
diff -u -b -r1.445 -r1.446
--- ChangeLog 29 Jun 2016 16:27:17 -0000 1.445
+++ ChangeLog 29 Jun 2016 16:36:42 -0000 1.446
@@ -1,5 +1,10 @@
2016-06-29 Pavel Kharitonov <address@hidden>
+ * configure.ac: Check if xmllint supports --nonet and --path.
+ * NEWS: Update.
+
+2016-06-29 Pavel Kharitonov <address@hidden>
+
* configure.ac: Improve warning format.
2016-06-29 Pavel Kharitonov <address@hidden>
Index: NEWS
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/NEWS,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -b -r1.120 -r1.121
--- NEWS 29 Jun 2016 16:22:22 -0000 1.120
+++ NEWS 29 Jun 2016 16:36:42 -0000 1.121
@@ -12,6 +12,8 @@
*** `gnun-validate-html' didn't work with bash versions that don't
support set -o pipefail.
+*** `configure' didn't detect inadequately old versions of xmllint.
+
*** Many utilities didn't work when mktemp had no -t option.
* Changes in GNUnited Nations 0.10 (2015-11-07)
Index: configure.ac
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/configure.ac,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -b -r1.51 -r1.52
--- configure.ac 29 Jun 2016 16:27:17 -0000 1.51
+++ configure.ac 29 Jun 2016 16:36:42 -0000 1.52
@@ -287,10 +287,8 @@
[have_vcs=yes], [have_vcs=no])
AC_PATH_PROG([XMLLINT], [xmllint])
-AS_CASE(["x$XMLLINT"], [x], ,
-[have_xmllint=yes
-AC_MSG_CHECKING([if XHTML DTDs are installed])
-have_dtds=no
+AS_CASE(["x$XMLLINT"], [x], [have_xmllint=no], [have_xmllint=yes])
+
cat > conftest.html <<'EOF'
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";>
@@ -303,16 +301,41 @@
</body>
</html>
EOF
-if $XMLLINT --valid --nonet --noout conftest.html 2> /dev/null ; then
- have_dtds=yes;
-fi
-rm -f conftest.html
+
+AS_CASE([$have_xmllint], [yes],
+[AC_MSG_CHECKING([if xmllint supports --path])
+AS_IF([$XMLLINT --path $ac_top_srcdir/dtd conftest.html > /dev/null 2>&1],
+[have_xmllint_path=yes],
+[have_xmllint_path=no
+ have_xmllint=no
+])
+AC_MSG_RESULT([$have_xmllint_path])
+])
+
+AS_CASE([$have_xmllint], [yes],
+[AC_MSG_CHECKING([if xmllint supports --nonet])
+
+have_xmllint_nonet=no
+AS_IF([$XMLLINT --nonet --noout conftest.html > /dev/null 2>&1],
+[have_xmllint_nonet=yes
+AC_MSG_RESULT([yes])
+],
+[AC_MSG_RESULT([no (will install our copy of XHML DTDs)])
+])
+
+have_dtds=no
+AS_CASE([$have_xmllint_nonet], [yes],
+[AC_MSG_CHECKING([if XHTML DTDs are installed])
+AS_IF([$XMLLINT --valid --nonet --noout conftest.html > /dev/null 2>&1],
+[have_dtds=yes])
+
if test "$have_dtds" = no; then
AC_MSG_RESULT([$have_dtds (will use our copy)])
else
AC_MSG_RESULT([$have_dtds])
fi
-])
+])])
+rm -f conftest.html
# Our validation scripts depend on awk and xmllint.
AS_CASE([$have_xmllint], [yes],