Commit e752f6ac86804b03a912c3d4fc9e1a66c1e32595
Exists in
master
and in
2 other branches
Merge branch 'master' into develop
Showing
3 changed files
with
8 additions
and
0 deletions
Show diff stats
.gitignore
autogen.sh
@@ -35,6 +35,8 @@ fi | @@ -35,6 +35,8 @@ fi | ||
35 | 35 | ||
36 | automake --add-missing 2> /dev/null | true | 36 | automake --add-missing 2> /dev/null | true |
37 | 37 | ||
38 | +autopoint | ||
39 | + | ||
38 | cd "$olddir" | 40 | cd "$olddir" |
39 | test -n "$NOCONFIGURE" || "$srcdir/configure" "$@" | 41 | test -n "$NOCONFIGURE" || "$srcdir/configure" "$@" |
40 | 42 |
configure.ac
@@ -54,6 +54,9 @@ AM_INIT_AUTOMAKE | @@ -54,6 +54,9 @@ AM_INIT_AUTOMAKE | ||
54 | dnl Check for iconv | 54 | dnl Check for iconv |
55 | AM_ICONV | 55 | AM_ICONV |
56 | 56 | ||
57 | +dnf Set gettext version | ||
58 | +AM_GNU_GETTEXT_VERSION([0.14]) | ||
59 | + | ||
57 | dnl Checks for programs. | 60 | dnl Checks for programs. |
58 | AC_PROG_CC | 61 | AC_PROG_CC |
59 | AC_PROG_CXX | 62 | AC_PROG_CXX |