diff options
| -rw-r--r-- | .gitignore | 39 | ||||
| -rwxr-xr-x | autogen.sh | 5 | ||||
| -rw-r--r-- | configure.ac | 7 |
3 files changed, 46 insertions, 5 deletions
diff --git a/.gitignore b/.gitignore index ed1c8c5f21..bd7a1f2f63 100644 --- a/.gitignore +++ b/.gitignore @@ -27,11 +27,50 @@ gtk-doc.make TAGS COPYING INSTALL +ABOUT-NLS *.pc man/*.[185] po/*.gmo po/.intltool-merge-cache po/NetworkManager.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/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 include/nm-version.h diff --git a/autogen.sh b/autogen.sh index 213fb08329..67816be509 100755 --- a/autogen.sh +++ b/autogen.sh @@ -15,9 +15,8 @@ PKG_NAME=NetworkManager (cd $srcdir; gtkdocize || exit 1 - autoreconf --install --symlink && - intltoolize --force && - autoreconf && + autopoint --force + AUTOPOINT='intltoolize --automake --copy' autoreconf --force --install --verbose ./configure --enable-maintainer-mode $@ ) diff --git a/configure.ac b/configure.ac index af627a2019..0ff7efb8b8 100644 --- a/configure.ac +++ b/configure.ac @@ -75,11 +75,14 @@ AC_CHECK_FUNCS(select socket uname) dnl dnl translation support dnl +IT_PROG_INTLTOOL([0.40.0]) + +AM_GNU_GETTEXT([external]) +AM_GNU_GETTEXT_VERSION([0.17]) + GETTEXT_PACKAGE=NetworkManager AC_SUBST(GETTEXT_PACKAGE) AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package]) -IT_PROG_INTLTOOL([0.35.0]) -AM_GLIB_GNU_GETTEXT dnl dnl Documentation |