diff --git a/autogen.sh b/autogen.sh index 8f2d9c295f..fa26641569 100755 --- a/autogen.sh +++ b/autogen.sh @@ -72,17 +72,6 @@ fi tool_run "$autopoint" patch -p0 < common/gettext.patch -# autopoint -# older autopoint (< 0.12) has a tendency to complain about mkinstalldirs -if test -e mkinstalldirs; then rm mkinstalldirs; fi -# first remove patch if necessary, then run autopoint, then reapply -if test -f po/Makefile.in.in; -then - patch -p0 -R < common/gettext.patch -fi -tool_run "$autopoint" -patch -p0 < common/gettext.patch - tool_run "$aclocal" "-I m4 -I common/m4 $ACLOCAL_FLAGS" tool_run "$libtoolize" "--copy --force" tool_run "$autoheader" diff --git a/common b/common index c6f697f5a1..59d3c4334b 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit c6f697f5a14c01e88a7cdf417b8e06b4417921c3 +Subproject commit 59d3c4334b32261908261a163b4633532293492d