diff options
author | Stefan Kost <ensonic@users.sf.net> | 2011-06-21 15:05:37 +0200 |
---|---|---|
committer | Stefan Kost <ensonic@users.sf.net> | 2011-06-21 15:05:37 +0200 |
commit | 3c8f41ac4a6a0bac3db2460e754fdaeeaaab72c2 (patch) | |
tree | e526362980a38845bb98f4833401e326fb787a19 | |
parent | d1c2d5db910d4c5da9e9a157c86fa170910d96f9 (diff) |
buid: fix the bootstrapping
Create the macrodir. Remove the GETTXT macro that was clashing with INTLTOOL.
-rwxr-xr-x | autogen.sh | 4 | ||||
-rw-r--r-- | configure.ac | 6 |
2 files changed, 7 insertions, 3 deletions
@@ -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/configure.ac b/configure.ac index 9d6d416..a079570 100644 --- a/configure.ac +++ b/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) |