buid: fix the bootstrapping

Create the macrodir. Remove the GETTXT macro that was clashing with INTLTOOL.
This commit is contained in:
Stefan Sauer 2011-06-21 15:05:37 +02:00
parent 6a6e1e86ed
commit 132b44e7f8
2 changed files with 7 additions and 3 deletions

View file

@ -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" "$@"

View file

@ -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)