trans-coord/gnun/server/gnun configure.ac Makef...

[Pavel Kharitonov]

CVSROOT:        /sources/trans-coord
Module name:    trans-coord
Changes by:     Pavel Kharitonov <ineiev>       12/03/22 07:50:06

Modified files:
        gnun/server/gnun: configure.ac Makefile.am ChangeLog 

Log message:
        Update XMLLINT-related logic.
        
        * configure.ac (HAVE_XMLLINT, HAVE_VALIDATION): Rename
        `HAVE_XMLLINT' to `HAVE_VALIDATION'.
        * Makefile.am  (HAVE_XMLLINT, HAVE_VALIDATION): Likewise.
        * configure.ac (have_validation): New variable.
        (Results): Remove obsolete message about GRACE support; use
        `have_validation' instead of `have_xmllint'.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/configure.ac?cvsroot=trans-coord&r1=1.34&r2=1.35
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/Makefile.am?cvsroot=trans-coord&r1=1.26&r2=1.27
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/ChangeLog?cvsroot=trans-coord&r1=1.260&r2=1.261

Patches:
Index: configure.ac
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/configure.ac,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -b -r1.34 -r1.35
--- configure.ac        17 Mar 2012 15:00:25 -0000      1.34
+++ configure.ac        22 Mar 2012 07:50:06 -0000      1.35
@@ -210,7 +210,11 @@
   fi
 fi
 
-AM_CONDITIONAL([HAVE_XMLLINT], [test "$have_xmllint" = yes])
+# Our validation scripts depend on awk and xmllint.
+AS_CASE([$have_xmllint], [yes],
+        [have_validation=$decent_awk], [have_validation=no])
+
+AM_CONDITIONAL([HAVE_VALIDATION], [test "$have_validation" = yes])
 AM_CONDITIONAL([NO_DTD], [test "$have_dtds" = no])
 
 AC_CONFIG_FILES([Makefile doc/Makefile dtd/Makefile config.mk])
@@ -229,8 +233,7 @@
 echo "gnun-clear-previous...                  $decent_msgattrib"
 echo "gnun-add-fuzzy-diff...                  $have_wdiff"
 echo "POT/HTML generation...                  $gnun_cv_recent_po4a"
-echo "HTML validation...                      $have_xmllint"
-echo "GRACE support...                        $decent_awk"
+echo "HTML validation...                      $have_validation"
 echo "NOTIFY/ANNOUNCE support...              $have_mail"
 echo "VCS support...                          $have_vcs $cvs $svn $bzr"
 echo "Use Multiviews naming conventions...    $enable_multiviews"

Index: Makefile.am
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/Makefile.am,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- Makefile.am 17 Mar 2012 15:00:23 -0000      1.26
+++ Makefile.am 22 Mar 2012 07:50:06 -0000      1.27
@@ -21,7 +21,7 @@
 
 bin_SCRIPTS =
 
-if HAVE_XMLLINT
+if HAVE_VALIDATION
 bin_SCRIPTS += gnun-validate-html
 endif
 

Index: ChangeLog
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/ChangeLog,v
retrieving revision 1.260
retrieving revision 1.261
diff -u -b -r1.260 -r1.261
--- ChangeLog   17 Mar 2012 15:00:22 -0000      1.260
+++ ChangeLog   22 Mar 2012 07:50:06 -0000      1.261
@@ -1,3 +1,14 @@
+2012-03-22  Pavel Kharitonov  <address@hidden>
+
+       Update XMLLINT-related logic.
+
+       * configure.ac (HAVE_XMLLINT, HAVE_VALIDATION): Rename
+       HAVE_XMLLINT to HAVE_VALIDATION.
+       * Makefile.am  (HAVE_XMLLINT, HAVE_VALIDATION): Likewise.
+       * configure.ac (have_validation): New variable.
+       (Results): Remove obsolete message about GRACE support; use
+       `have_validation' instead of `have_xmllint'.
+
 2012-03-17  Pavel Kharitonov  <address@hidden>
 
        Introduce compendia.