From 8af68511ccafa380d27832451528748e66c3e5b9 Mon Sep 17 00:00:00 2001 From: ice0 Date: Aug 15 2018 10:34:13 +0000 Subject: Removed workaround, bumped intltool version requirement >= 0.51.0 --- diff --git a/synfig-core/bootstrap.sh b/synfig-core/bootstrap.sh index ed05eb9..a6b982a 100755 --- a/synfig-core/bootstrap.sh +++ b/synfig-core/bootstrap.sh @@ -45,8 +45,8 @@ AUTOPOINT='intltoolize --automake --copy' autoreconf --force --install --verbose # TODO: Drop this hack, and bump our intltool version requiement once the issue # is fixed in intltool -echo "patching po/Makefile.in.in..." -sed 's/itlocaledir = $(prefix)\/$(DATADIRNAME)\/locale/itlocaledir = $(datarootdir)\/locale/' < po/Makefile.in.in > po/Makefile.in.in.tmp -mv --force po/Makefile.in.in.tmp po/Makefile.in.in +#echo "patching po/Makefile.in.in..." +#sed 's/itlocaledir = $(prefix)\/$(DATADIRNAME)\/locale/itlocaledir = $(datarootdir)\/locale/' < po/Makefile.in.in > po/Makefile.in.in.tmp +#mv --force po/Makefile.in.in.tmp po/Makefile.in.in echo "Done! Please run ./configure now." diff --git a/synfig-core/configure.ac b/synfig-core/configure.ac index 2e47b8f..e70f93d 100644 --- a/synfig-core/configure.ac +++ b/synfig-core/configure.ac @@ -337,7 +337,7 @@ AM_CONDITIONAL(WITH_JPEG, test $with_jpeg = yes) AC_LIB_LTDL -IT_PROG_INTLTOOL([0.35.0]) +IT_PROG_INTLTOOL([0.51.0]) GETTEXT_PACKAGE=synfig AC_SUBST(GETTEXT_PACKAGE) diff --git a/synfig-studio/bootstrap.sh b/synfig-studio/bootstrap.sh index 8b77521..9a91ff4 100755 --- a/synfig-studio/bootstrap.sh +++ b/synfig-studio/bootstrap.sh @@ -26,7 +26,7 @@ AUTOPOINT='intltoolize --automake --copy' autoreconf --force --install --verbose # TODO: Drop this hack, and bump our intltool version requiement once the issue # is fixed in intltool -sed 's/itlocaledir = $(prefix)\/$(DATADIRNAME)\/locale/itlocaledir = $(datarootdir)\/locale/' < po/Makefile.in.in > po/Makefile.in.in.tmp -mv --force po/Makefile.in.in.tmp po/Makefile.in.in +#sed 's/itlocaledir = $(prefix)\/$(DATADIRNAME)\/locale/itlocaledir = $(datarootdir)\/locale/' < po/Makefile.in.in > po/Makefile.in.in.tmp +#mv --force po/Makefile.in.in.tmp po/Makefile.in.in echo "Done! Please run ./configure now." diff --git a/synfig-studio/configure.ac b/synfig-studio/configure.ac index e84b1b1..dccf249 100755 --- a/synfig-studio/configure.ac +++ b/synfig-studio/configure.ac @@ -66,7 +66,7 @@ AC_SUBST(LIBTOOL_DEPS) AC_LIBTOOL_PATCH ## AM_GLIB_GNU_GETTEXT([external]) -IT_PROG_INTLTOOL([0.35.0]) +IT_PROG_INTLTOOL([0.51.0]) GETTEXT_PACKAGE=synfigstudio AC_SUBST(GETTEXT_PACKAGE)