Merge branch 'master' into develop

Perry Werneck
2 parents 9d199b5d af04ceac
Showing 3 changed files with 8 additions and 0 deletions Show diff stats
.gitignore
autogen.sh
configure.ac
@@ -64,3 +64,6 @@ conftest.*
 mstest.*
 *.cscope_file_list
 *.orig
+ABOUT-NLS
+intl
+po
@@ -35,6 +35,8 @@ fi
  
 automake --add-missing 2> /dev/null | true
  
+autopoint
+
 cd "$olddir"
 test -n "$NOCONFIGURE" || "$srcdir/configure" "$@"
  
@@ -54,6 +54,9 @@ AM_INIT_AUTOMAKE
 dnl Check for iconv
 AM_ICONV
  
+dnf Set gettext version
+AM_GNU_GETTEXT_VERSION([0.14])
+
 dnl Checks for programs.
 AC_PROG_CC
 AC_PROG_CXX
...	...	@@ -64,3 +64,6 @@ conftest.*
64	64	mstest.*
65	65	*.cscope_file_list
66	66	*.orig
	67	+ABOUT-NLS
	68	+intl
	69	+po
...	...
...	...	@@ -35,6 +35,8 @@ fi
35	35
36	36	automake --add-missing 2> /dev/null \| true
37	37
	38	+autopoint
	39	+
38	40	cd "$olddir"
39	41	test -n "$NOCONFIGURE" \|\| "$srcdir/configure" "$@"
40	42
...	...
...	...	@@ -54,6 +54,9 @@ AM_INIT_AUTOMAKE
54	54	dnl Check for iconv
55	55	AM_ICONV
56	56
	57	+dnf Set gettext version
	58	+AM_GNU_GETTEXT_VERSION([0.14])
	59	+
57	60	dnl Checks for programs.
58	61	AC_PROG_CC
59	62	AC_PROG_CXX
...	...