[5207] * configure.ac, tp/defs.in, tp/tests/run_parser_all.sh:

[Patrice Dumas]

Revision: 5207
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=5207
Author:   pertusus
Date:     2013-02-25 21:35:30 +0000 (Mon, 25 Feb 2013)
Log Message:
-----------
        * configure.ac, tp/defs.in, tp/tests/run_parser_all.sh:
        determine whether diff accepts -a and sets DIFF_A_OPTION to -a if so.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/configure.ac
    trunk/tp/defs.in
    trunk/tp/tests/run_parser_all.sh

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2013-02-25 21:20:23 UTC (rev 5206)
+++ trunk/ChangeLog     2013-02-25 21:35:30 UTC (rev 5207)
@@ -2,6 +2,8 @@
 
        * tp/Texinfo/Parser.pm: use tell to find the position of the 
        beginning of the line.
+       * configure.ac, tp/defs.in, tp/tests/run_parser_all.sh:
+       determine whether diff accepts -a and sets DIFF_A_OPTION to -a if so.
 
 2013-02-24  Karl Berry  <address@hidden>
 

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac  2013-02-25 21:20:23 UTC (rev 5206)
+++ trunk/configure.ac  2013-02-25 21:35:30 UTC (rev 5207)
@@ -115,7 +115,24 @@
 fi
 AC_SUBST([DIFF_U_OPTION])
 
+dnl check whether diff accepts the -a option (specific of GNU diff)
+AC_MSG_CHECKING(whether diff accepts -a)
+diff_accepts_a_option=no
+echo foo >conftest.dtx
+echo foo | diff -a - conftest.dtx >/dev/null 2>&1
+error_status_diff_a=$?
+if test $error_status_diff_a = 0; then
+  diff_accepts_a_option=yes
+fi
+AC_MSG_RESULT($diff_accepts_a_option)
+rm -f conftest.dtx
 
+DIFF_A_OPTION=
+if test "z$diff_accepts_a_option" = 'zyes' ; then
+  DIFF_U_OPTION=-a
+fi
+AC_SUBST([DIFF_A_OPTION])
+
 # Needed on sysV68 for sigblock, sigsetmask.  But check for it in libc first.
 AC_CHECK_FUNC(sigblock, , [AC_CHECK_LIB(bsd, sigblock)])
 

Modified: trunk/tp/defs.in
===================================================================
--- trunk/tp/defs.in    2013-02-25 21:20:23 UTC (rev 5206)
+++ trunk/tp/defs.in    2013-02-25 21:35:30 UTC (rev 5207)
@@ -1,3 +1,4 @@
 PATH_SEPARATOR="@PATH_SEPARATOR@"
 PERL="@PERL@"
 DIFF_U_OPTION="@DIFF_U_OPTION@"
+DIFF_A_OPTION="@DIFF_A_OPTION@"

Modified: trunk/tp/tests/run_parser_all.sh
===================================================================
--- trunk/tp/tests/run_parser_all.sh    2013-02-25 21:20:23 UTC (rev 5206)
+++ trunk/tp/tests/run_parser_all.sh    2013-02-25 21:35:30 UTC (rev 5207)
@@ -355,7 +355,7 @@
                 ${outdir}$dir/*_l2h.css
         fi
 
-        diff -a $DIFF_U_OPTION -r "${staging_dir_res}$dir" "${outdir}$dir" 
2>>$logfile > "$diffs_dir/$diff_base.diff"
+        diff $DIFF_A_OPTION $DIFF_U_OPTION -r "${staging_dir_res}$dir" 
"${outdir}$dir" 2>>$logfile > "$diffs_dir/$diff_base.diff"
         dif_ret=$?
         if [ $dif_ret != 0 ]; then
           echo "D: ${mydir}$diffs_dir/$diff_base.diff"