autoconf-2.65-fix-m4-detection-test-on-dash.patch 1.7 KB

123456789101112131415161718192021222324252627282930313233343536
  1. Patch taken upstream at
  2. http://git.savannah.gnu.org/cgit/autoconf.git/commit/?id=7f75858f577f11a844781764f30cd42cfe8a5669,
  3. with the following modifications:
  4. * Changes to NEWS file removed to avoid conflicts
  5. * Changes also made manually to the generated configure
  6. script. Otherwise, host-autoconf is needed to compile
  7. host-autoconf !
  8. Index: autoconf-2.65.old/configure
  9. ===================================================================
  10. --- autoconf-2.65.old.orig/configure 2009-12-15 16:11:05.175566911 +0100
  11. +++ autoconf-2.65.old/configure 2009-12-15 16:11:37.739562146 +0100
  12. @@ -2380,7 +2380,7 @@
  13. ac_snippet=change'quote(<,>)in''dir(<if''def>,mac,bug)'
  14. ac_snippet=${ac_snippet}pat'subst(a,\(b\)\|\(a\),\1)d'nl
  15. test -z "`$ac_path_M4 -F conftest.m4f </dev/null 2>&1`" \
  16. - && test -z "`echo $ac_snippet | $ac_path_M4 --trace=mac 2>&1`" \
  17. + && test -z "`$as_echo $ac_snippet | $ac_path_M4 --trace=mac 2>&1`" \
  18. && test -f conftest.m4f \
  19. && ac_cv_path_M4=$ac_path_M4 ac_path_M4_found=:
  20. rm -f conftest.m4f
  21. Index: autoconf-2.65.old/m4/m4.m4
  22. ===================================================================
  23. --- autoconf-2.65.old.orig/m4/m4.m4 2009-12-15 16:11:05.207566124 +0100
  24. +++ autoconf-2.65.old/m4/m4.m4 2009-12-15 16:11:18.595562030 +0100
  25. @@ -29,7 +29,7 @@
  26. ac_snippet=change'quote(<,>)in''dir(<if''def>,mac,bug)'
  27. ac_snippet=${ac_snippet}pat'subst(a,\(b\)\|\(a\),\1)d'nl
  28. test -z "`$ac_path_M4 -F conftest.m4f </dev/null 2>&1`" \
  29. - && test -z "`echo $ac_snippet | $ac_path_M4 --trace=mac 2>&1`" \
  30. + && test -z "`AS_ECHO([$ac_snippet]) | $ac_path_M4 --trace=mac 2>&1`" \
  31. && test -f conftest.m4f \
  32. && ac_cv_path_M4=$ac_path_M4 ac_path_M4_found=:
  33. rm -f conftest.m4f],