From 132b44e7f8bc2faec35c5aca49fa6f4db89814fa Mon Sep 17 00:00:00 2001 From: Stefan Sauer Date: Tue, 21 Jun 2011 15:05:37 +0200 Subject: [PATCH] buid: fix the bootstrapping Create the macrodir. Remove the GETTXT macro that was clashing with INTLTOOL. --- mediainfo/autogen.sh | 4 +++- mediainfo/configure.ac | 6 ++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/mediainfo/autogen.sh b/mediainfo/autogen.sh index 940d7d2d54..a2f799fe12 100755 --- a/mediainfo/autogen.sh +++ b/mediainfo/autogen.sh @@ -6,11 +6,13 @@ echo "#!/bin/sh" > autoregen.sh echo "./autogen.sh $@ \$@" >> autoregen.sh chmod +x autoregen.sh +mkdir -p m4 + test -n "$srcdir" || srcdir=$(dirname "$0") test -n "$srcdir" || srcdir=. ( cd "$srcdir" && - AUTOPOINT='intltoolize --automake --copy' autoreconf -fiv + AUTOPOINT='intltoolize --automake -c -f' autoreconf -fivm ) || exit test -n "$NOCONFIGURE" || "$srcdir/configure" "$@" diff --git a/mediainfo/configure.ac b/mediainfo/configure.ac index 9d6d4160ed..a07957026e 100644 --- a/mediainfo/configure.ac +++ b/mediainfo/configure.ac @@ -26,8 +26,10 @@ AC_SUBST(MI_PACKAGES) GETTEXT_PACKAGE=gst-mi AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE], ["$GETTEXT_PACKAGE"], [Gettext Package]) AC_SUBST(GETTEXT_PACKAGE) -AM_GNU_GETTEXT_VERSION([0.18.1]) -AM_GNU_GETTEXT([external]) +# AC_PROG_INTLTOOL is enough, the lines below caused: +# required file `./config.rpath' not found +#AM_GNU_GETTEXT_VERSION([0.18.1]) +#AM_GNU_GETTEXT([external]) dnl check for desktop utilities AC_PATH_PROG(UPDATE_DESKTOP_DATABASE, update-desktop-database)