about summary refs log tree commit diff
path: root/aclocal.m4
diff options
context:
space:
mode:
authorMichael Biebl <biebl@debian.org>2011-04-04 22:36:02 +0200
committerMichael Biebl <biebl@debian.org>2011-04-04 22:36:02 +0200
commitc980bdf58dc973dd5617aaa6f9466f9e44fcbf58 (patch)
treed92f417ab2d0b49d6a006fbd48602744fe245380 /aclocal.m4
parente22c6e05e9ebc6cce941762020c5710b8014677b (diff)
Imported Upstream version 0.8.3.999 upstream/0.8.3.999
Diffstat (limited to 'aclocal.m4')
-rw-r--r--aclocal.m434
1 files changed, 1 insertions, 33 deletions
diff --git a/aclocal.m4 b/aclocal.m4
index 7791f12a..778d6e6c 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -452,39 +452,6 @@ sed 's/^/| /' conftest.foo >&AS_MESSAGE_LOG_FD
 fi])
 
 
-# nls.m4 serial 5 (gettext-0.18)
-dnl Copyright (C) 1995-2003, 2005-2006, 2008-2010 Free Software Foundation,
-dnl Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-dnl
-dnl This file can can be used in projects which are not available under
-dnl the GNU General Public License or the GNU Library General Public
-dnl License but which still want to provide support for the GNU gettext
-dnl functionality.
-dnl Please note that the actual code of the GNU gettext library is covered
-dnl by the GNU Library General Public License, and the rest of the GNU
-dnl gettext package package is covered by the GNU General Public License.
-dnl They are *not* in the public domain.
-
-dnl Authors:
-dnl   Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
-dnl   Bruno Haible <haible@clisp.cons.org>, 2000-2003.
-
-AC_PREREQ([2.50])
-
-AC_DEFUN([AM_NLS],
-[
-  AC_MSG_CHECKING([whether NLS is requested])
-  dnl Default is enabled NLS
-  AC_ARG_ENABLE([nls],
-    [  --disable-nls           do not use Native Language Support],
-    USE_NLS=$enableval, USE_NLS=yes)
-  AC_MSG_RESULT([$USE_NLS])
-  AC_SUBST([USE_NLS])
-])
-
 # pkg.m4 - Macros to locate and utilise pkg-config.            -*- Autoconf -*-
 # serial 1 (pkg-config-0.24)
 # 
@@ -1701,3 +1668,4 @@ m4_include([m4/ltoptions.m4])
 m4_include([m4/ltsugar.m4])
 m4_include([m4/ltversion.m4])
 m4_include([m4/lt~obsolete.m4])
+m4_include([m4/nls.m4])