summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Kost <ensonic@users.sf.net>2011-06-21 15:05:37 +0200
committerStefan Kost <ensonic@users.sf.net>2011-06-21 15:05:37 +0200
commit3c8f41ac4a6a0bac3db2460e754fdaeeaaab72c2 (patch)
treee526362980a38845bb98f4833401e326fb787a19
parentd1c2d5db910d4c5da9e9a157c86fa170910d96f9 (diff)
buid: fix the bootstrapping
Create the macrodir. Remove the GETTXT macro that was clashing with INTLTOOL.
-rwxr-xr-xautogen.sh4
-rw-r--r--configure.ac6
2 files changed, 7 insertions, 3 deletions
diff --git a/autogen.sh b/autogen.sh
index 940d7d2..a2f799f 100755
--- a/autogen.sh
+++ b/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/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)