aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore38
-rwxr-xr-xautogen.sh11
-rw-r--r--configure.ac6
3 files changed, 49 insertions, 6 deletions
diff --git a/.gitignore b/.gitignore
index 47a599d8..0a2e10d0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -49,10 +49,48 @@ po/POTFILES
po/stamp-it
po/.intltool-merge-cache
po/ModemManager.pot
+po/Makevars.template
+po/Rules-quot
+po/boldquot.sed
+po/en@boldquot.header
+po/en@quot.header
+po/insert-header.sin
+po/quot.sed
+po/remove-potcdate.sin
m4/gtk-doc.m4
m4/intltool.m4
m4/libtool.m4
m4/lt*.m4
+m4/codeset.m4
+m4/gettext.m4
+m4/glibc2.m4
+m4/glibc21.m4
+m4/iconv.m4
+m4/intdiv0.m4
+m4/intl.m4
+m4/intldir.m4
+m4/intlmacosx.m4
+m4/intmax.m4
+m4/inttypes-pri.m4
+m4/inttypes_h.m4
+m4/lcmessage.m4
+m4/lib-ld.m4
+m4/lib-link.m4
+m4/lib-prefix.m4
+m4/lock.m4
+m4/longlong.m4
+m4/nls.m4
+m4/po.m4
+m4/printf-posix.m4
+m4/progtest.m4
+m4/size_max.m4
+m4/stdint_h.m4
+m4/uintmax_t.m4
+m4/visibility.m4
+m4/wchar_t.m4
+m4/wint_t.m4
+m4/xsize.m4
TAGS
+ABOUT-NLS
diff --git a/autogen.sh b/autogen.sh
index 62614d94..d99bad67 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -3,7 +3,7 @@
srcdir=`dirname $0`
test -z "$srcdir" && srcdir=.
-REQUIRED_AUTOMAKE_VERSION=1.7
+REQUIRED_AUTOMAKE_VERSION=1.9
PKG_NAME=ModemManager
(test -f $srcdir/configure.ac \
@@ -14,8 +14,9 @@ PKG_NAME=ModemManager
}
(cd $srcdir;
- autoreconf --install --symlink &&
- intltoolize --force &&
- autoreconf &&
- ./configure --enable-maintainer-mode $@
+ autopoint --force
+ AUTOPOINT='intltoolize --automake --copy' autoreconf --force --install --verbose
+ if test -z "$NOCONFIGURE"; then
+ ./configure --enable-maintainer-mode $@
+ fi
)
diff --git a/configure.ac b/configure.ac
index 8f27ae57..3c9a839a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -24,10 +24,14 @@ LT_INIT
dnl
dnl translation support
dnl
+IT_PROG_INTLTOOL([0.40.0])
+
+AM_GNU_GETTEXT([external])
+AM_GNU_GETTEXT_VERSION([0.17])
+
GETTEXT_PACKAGE=ModemManager
AC_SUBST(GETTEXT_PACKAGE)
AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package])
-IT_PROG_INTLTOOL([0.35.0])
PKG_CHECK_MODULES(MM,
dbus-glib-1 >= 0.86