switch to external gettext
2008-10-03 Paolo Bonzini <bonzini@gnu.org> Jim Meyering <meyering@redhat.com> * Makefile.am: Remove intl subdir. Require Automake 1.10. * configure.ac: Remove useless macros, switch to external gettext. * lib/Makefile.am: Remove intl subdir from CPPFLAGS. * sed/Makefile.am: Remove intl subdir from CPPFLAGS.
This commit is contained in:
1 parent
a9afc06ca2
commit
113e401ea4
10 files changed
+26
-110
No files matched your search
+1
-1
@@ -11,6 +11,6 @@ config.sub
|
||||
config_h.in
|
||||
configure
|
||||
depcomp
|
||||
intl
|
||||
m4
|
||||
mdate-sh
|
||||
missing
|
||||
@@ -1,3 +1,12 @@
|
||||
2008-10-03 Paolo Bonzini <bonzini@gnu.org>
|
||||
Jim Meyering <meyering@redhat.com>
|
||||
|
||||
* autoboot.conf: Add localcharset.
|
||||
* Makefile.am: Remove intl subdir. Require Automake 1.10.
|
||||
* configure.ac: Remove useless macros, switch to external gettext.
|
||||
* lib/Makefile.am: Remove intl subdir from CPPFLAGS.
|
||||
* sed/Makefile.am: Remove intl subdir from CPPFLAGS.
|
||||
|
||||
2008-09-29 Paolo Bonzini <bonzini@gnu.org>
|
||||
|
||||
* autoboot: Sync with gnulib's build-aux/bootstrap.
|
||||
|
||||
+3
-3
@@ -1,12 +1,12 @@
|
||||
## Process this file with automake to produce Makefile.in
|
||||
|
||||
# Automake requirements
|
||||
AUTOMAKE_OPTIONS = gnits 1.8
|
||||
ACLOCAL_AMFLAGS = -I build-aux
|
||||
AUTOMAKE_OPTIONS = gnits 1.10
|
||||
ACLOCAL_AMFLAGS = -I m4
|
||||
|
||||
PACKAGE = sed
|
||||
|
||||
SUBDIRS = intl lib pcre po sed doc testsuite
|
||||
SUBDIRS = lib pcre po sed doc testsuite
|
||||
|
||||
noinst_DATA = bootstrap.sh
|
||||
noinst_HEADERS = basicdefs.h
|
||||
|
||||
+2
-2
@@ -18,8 +18,8 @@
|
||||
|
||||
# gnulib modules used by this package.
|
||||
gnulib_modules="
|
||||
acl alloca extensions getline getopt gettext memchr memcmp memmove \
|
||||
mkstemp obstack pathmax snprintf stdbool stat-macros \
|
||||
acl alloca extensions getline getopt gettext localcharset \
|
||||
memchr memcmp memmove mkstemp obstack pathmax snprintf stdbool stat-macros \
|
||||
strerror strverscmp unlocked-io vasnprintf verify"
|
||||
|
||||
SKIP_PO=t
|
||||
|
||||
+2
-12
@@ -40,20 +40,10 @@
|
||||
# include <stdbool.h>
|
||||
#endif
|
||||
|
||||
#if ENABLE_NLS
|
||||
# include <libintl.h>
|
||||
#else
|
||||
# define gettext(msgid) (msgid)
|
||||
# define ngettext(sing, plur, n) ((n) == 1 ? (sing) : (plur))
|
||||
#endif
|
||||
#include <gettext.h>
|
||||
#define N_(String) gettext_noop(String)
|
||||
#define _(String) gettext(String)
|
||||
|
||||
#ifdef gettext_noop
|
||||
# define N_(String) gettext_noop(String)
|
||||
#else
|
||||
# define N_(String) (String)
|
||||
#endif
|
||||
|
||||
/* type countT is used to keep track of line numbers, etc. */
|
||||
typedef unsigned long countT;
|
||||
|
||||
|
||||
@@ -1,83 +1,4 @@
|
||||
absolute-header.m4
|
||||
acl.m4
|
||||
alloca.m4
|
||||
codeset.m4
|
||||
config.rpath
|
||||
eoverflow.m4
|
||||
error.m4
|
||||
exitfail.m4
|
||||
extensions.m4
|
||||
float_h.m4
|
||||
getdelim.m4
|
||||
getline.m4
|
||||
getopt.m4
|
||||
gettext.m4
|
||||
gettimeofday.m4
|
||||
glibc2.m4
|
||||
glibc21.m4
|
||||
gnulib-common.m4
|
||||
gnulib-comp.m4
|
||||
gnulib-tool.m4
|
||||
iconv.m4
|
||||
include_next.m4
|
||||
inline.m4
|
||||
install-sh
|
||||
intdiv0.m4
|
||||
intl.m4
|
||||
intldir.m4
|
||||
intlmacosx.m4
|
||||
intmax.m4
|
||||
intmax_t.m4
|
||||
inttypes-h.m4
|
||||
inttypes-pri.m4
|
||||
inttypes_h.m4
|
||||
lcmessage.m4
|
||||
lib-ld.m4
|
||||
lib-link.m4
|
||||
lib-prefix.m4
|
||||
link-warning.h
|
||||
localcharset.m4
|
||||
lock.m4
|
||||
longdouble.m4
|
||||
longlong.m4
|
||||
malloc.m4
|
||||
mbrtowc.m4
|
||||
mbstate_t.m4
|
||||
memchr.m4
|
||||
memcmp.m4
|
||||
memmove.m4
|
||||
mkstemp.m4
|
||||
nls.m4
|
||||
pathmax.m4
|
||||
po.m4
|
||||
printf-posix.m4
|
||||
progtest.m4
|
||||
quote.m4
|
||||
quotearg.m4
|
||||
realloc.m4
|
||||
signed.m4
|
||||
size_max.m4
|
||||
snprintf.m4
|
||||
stdbool.m4
|
||||
stdint.m4
|
||||
stdint_h.m4
|
||||
stdio_h.m4
|
||||
stdlib_h.m4
|
||||
strerror.m4
|
||||
strverscmp.m4
|
||||
sys_stat_h.m4
|
||||
sys_time_h.m4
|
||||
tempname.m4
|
||||
texinfo.tex
|
||||
uintmax_t.m4
|
||||
ulonglong.m4
|
||||
unistd_h.m4
|
||||
unlocked-io.m4
|
||||
vasnprintf.m4
|
||||
visibility.m4
|
||||
wchar.m4
|
||||
wchar_t.m4
|
||||
wctype.m4
|
||||
wint_t.m4
|
||||
xalloc.m4
|
||||
xsize.m4
|
||||
+4
-8
@@ -12,14 +12,10 @@ AC_DEFINE_UNQUOTED(SED_FEATURE_VERSION, "$SED_FEATURE_VERSION",
|
||||
AC_SUBST(SED_FEATURE_VERSION)
|
||||
|
||||
AC_PROG_CC
|
||||
gl_DISABLE_THREADS
|
||||
AC_USE_SYSTEM_EXTENSIONS
|
||||
AC_GNU_SOURCE
|
||||
gl_EARLY
|
||||
AC_SYS_LARGEFILE
|
||||
AC_SYS_LONG_FILE_NAMES
|
||||
|
||||
gl_INIT
|
||||
gl_DISABLE_THREADS
|
||||
AC_SYS_LONG_FILE_NAMES
|
||||
AC_CACHE_CHECK([whether -lcP is needed], [sed_cv_libcp_needed], [
|
||||
AC_TRY_RUN([
|
||||
#include <stdio.h>
|
||||
@@ -52,7 +48,7 @@ AC_CHECK_TYPE(ssize_t, int)
|
||||
|
||||
AC_FUNC_VPRINTF
|
||||
AM_GNU_GETTEXT_VERSION(0.15)
|
||||
AM_GNU_GETTEXT(no-libtool, need-ngettext, ../intl)
|
||||
AM_GNU_GETTEXT([external])
|
||||
|
||||
AC_CHECK_FUNCS_ONCE(isatty bcopy bzero isascii memcpy memset strchr strtoul
|
||||
popen pathconf isblank fchown fchmod setlocale wcrtomb
|
||||
@@ -75,5 +71,5 @@ AC_CONFIG_FILES([bootstrap.sh], chmod +x bootstrap.sh)
|
||||
AC_CONFIG_FILES([testsuite/version.good:testsuite/version.gin])
|
||||
AC_CONFIG_FILES([Makefile doc/Makefile \
|
||||
lib/Makefile sed/Makefile testsuite/Makefile \
|
||||
po/Makefile.in intl/Makefile pcre/Makefile])
|
||||
po/Makefile.in pcre/Makefile])
|
||||
AC_OUTPUT
|
||||
@@ -51,6 +51,7 @@ stdbool.h
|
||||
stdbool.in.h
|
||||
stdint.h
|
||||
stdint.in.h
|
||||
stdio-write.c
|
||||
stdio.h
|
||||
stdio.in.h
|
||||
stdlib.h
|
||||
|
||||
+2
-2
@@ -4,6 +4,6 @@ include gnulib.mk
|
||||
|
||||
SUFFIXES += .a .o .c .y .l .h .sh .elc .el
|
||||
|
||||
AM_CPPFLAGS += -I$(top_srcdir)/lib -I$(top_srcdir)/intl -I$(top_srcdir)/pcre \
|
||||
-I$(top_srcdir) -I$(top_builddir)/lib -I$(top_builddir)/intl
|
||||
AM_CPPFLAGS += -I$(top_srcdir)/lib -I$(top_srcdir)/pcre \
|
||||
-I$(top_srcdir) -I$(top_builddir)/lib
|
||||
|
||||
+2
-3
@@ -6,9 +6,8 @@ localedir = $(datadir)/locale
|
||||
sed_SOURCES = sed.c compile.c execute.c regexp.c fmt.c mbcs.c utils.c
|
||||
noinst_HEADERS = sed.h utils.h
|
||||
|
||||
AM_CPPFLAGS = -I$(top_srcdir)/lib -I$(top_srcdir)/intl -I$(top_srcdir)/pcre \
|
||||
-I$(top_srcdir) -I$(top_builddir)/lib \
|
||||
-I$(top_builddir)/intl -DLOCALEDIR=\"$(localedir)\"
|
||||
AM_CPPFLAGS = -I$(top_srcdir)/lib -I$(top_srcdir)/pcre \
|
||||
-I$(top_srcdir) -I$(top_builddir)/lib -DLOCALEDIR=\"$(localedir)\"
|
||||
|
||||
sed_LDADD = ../pcre/libpcre.a @INTLLIBS@ @LIB_ACL@ ../lib/libsed.a
|
||||
sed_DEPENDENCIES = ../pcre/libpcre.a ../lib/libsed.a
|
||||
|
||||
Reference in new issue
Block a user