summaryrefslogtreecommitdiff
path: root/Makefile.am
diff options
context:
space:
mode:
authorPaolo Bonzini <bonzini@gnu.org>2009-11-20 21:45:37 +0100
committerPaolo Bonzini <bonzini@gnu.org>2009-11-20 22:52:21 +0100
commitde741047d4a3f38d04e2652894c33e532a3881cd (patch)
treef126ecbff9c812e8756efb4eb15bf889859ed518 /Makefile.am
parentb88789855b94284885af19ca30d1a6fdd4b59886 (diff)
downloadgrep-de741047d4a3f38d04e2652894c33e532a3881cd.tar.gz
upgrade to external gettext, modernize handling of m4 subdirectory
* configure.ac.in (AM_GNU_GETTEXT_VERSION): Bump to 0.17. (AC_OUTPUT): Remove m4/Makefile creation. * Makefile.am (subdirs): Remove m4 subdirectory. (EXTRA_DIST): Add build-aux/config.rpath. * intl/*: Remove. * m4/Makefile.am: Remove. * m4/codeset.m4: Remove. * m4/glibc.m4: Remove. * m4/glibc21.m4: Remove. * m4/header.m4: Remove. * m4/install.m4: Remove. * m4/isc-posix.m4: Remove. * m4/lcmessage.m4: Remove. * m4/sanity.m4: Remove. * m4/gettext.m4: Upgrade to gettext-0.17. * m4/iconv.m4: Upgrade to gettext-0.17. * m4/lib-ld.m4: New file, from gettext-0.17. * m4/lib-link.m4: New file, from gettext-0.17. * m4/lib-prefix.m4: New file, from gettext-0.17. * m4/nls.m4: New file, from gettext-0.17. * m4/po.m4: New file, from gettext-0.17. * m4/progtest.m4: Upgrade to gettext-0.17. * m4/Makefile.am (EXTRA_DIST): Add the new files. * po/Makefile.in.in: Upgrade to gettext-0.17. * po/Makevars: New. * po/cat-id-tbl.c: New. * src/Makefile.am: Replace @INTLLIBS@ with @LIBINTL@.
Diffstat (limited to 'Makefile.am')
-rw-r--r--Makefile.am6
1 files changed, 3 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am
index b96b7772..df1db76a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -16,12 +16,12 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
-AUTOMAKE_OPTIONS = gnu
+AUTOMAKE_OPTIONS = gnu 1.10
ACLOCAL_AMFLAGS = -I m4
-SUBDIRS = intl po lib doc src tests m4 vms bootstrap
+SUBDIRS = po lib doc src tests vms bootstrap
-EXTRA_DIST = TODO README README-alpha
+EXTRA_DIST = build-aux/config.rpath TODO README README-alpha
# make cvs-clean blatantly stolen from KDE CVS ;)