From: Peter Johnson Date: Mon, 15 Apr 2002 04:20:38 +0000 (-0000) Subject: Update to gettext 0.11.1. X-Git-Tag: v0.2.0~250 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8cd76bac56ceebde3de8ad3325ba5a95b8320381;p=yasm Update to gettext 0.11.1. svn path=/trunk/yasm/; revision=589 --- diff --git a/.cvsignore b/.cvsignore index ba35409f..e279b16e 100644 --- a/.cvsignore +++ b/.cvsignore @@ -12,7 +12,7 @@ configure.scan config.* stamp-h* aclocal.m4 -intl +m4 ABOUT-NLS *.tar.gz *.yp diff --git a/Makefile.am b/Makefile.am index 17f53943..95138483 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,14 +1,13 @@ # $IdPath$ -SUBDIRS = tools intl po +SUBDIRS = tools m4 po CFLAGS = @ANSI_CFLAGS@ AM_YFLAGS = -d INCLUDES = \ -I$(top_srcdir) \ -I$(top_srcdir)/src \ - -I$(top_srcdir)/check \ - -Iintl + -I$(top_srcdir)/check bin_PROGRAMS = yasm TESTS = @@ -19,7 +18,7 @@ yasm_LDADD = @LIBOBJS@ $(INTLLIBS) BUILT_SOURCES = CLEANFILES = -EXTRA_DIST = \ +EXTRA_DIST = config/config.rpath \ check/Makefile.inc \ src/Makefile.inc @@ -33,3 +32,5 @@ EXTRA_DIST += \ Mkfiles/Makefile.flat \ Mkfiles/Makefile.dj Mkfiles/dj/config.h \ Mkfiles/Makefile.vc Mkfiles/vc/config.h + +ACLOCAL_AMFLAGS = -I m4 diff --git a/acinclude.m4 b/acinclude.m4 deleted file mode 100644 index 0aa50681..00000000 --- a/acinclude.m4 +++ /dev/null @@ -1,18 +0,0 @@ -# $IdPath$ - -# This test replaces the one in autoconf. -# Currently this macro should have the same name as the autoconf macro -# because gettext's gettext.m4 (distributed in the automake package) -# still uses it. Otherwise, the use in gettext.m4 makes autoheader -# give these diagnostics: -# configure.in:##: AC_TRY_COMPILE was called before AC_ISC_POSIX - -undefine([AC_ISC_POSIX]) - -AC_DEFUN([AC_ISC_POSIX], - [ - dnl This test replaces the obsolescent AC_ISC_POSIX kludge. - AC_CHECK_LIB(cposix, strerror, [LIBS="$LIBS -lcposix"]) - ] -) - diff --git a/autogen.sh b/autogen.sh index 2afcd764..dd1faca5 100755 --- a/autogen.sh +++ b/autogen.sh @@ -3,6 +3,8 @@ # Run this to set up the build system: configure, makefiles, etc. # (based on the version in enlightenment's cvs) +ACLOCAL_FLAGS="-I m4" + package="yasm" srcdir=`dirname $0` @@ -73,10 +75,10 @@ if test ! -d "config"; then fi rm -f stamp-h.in -echo " aclocal $ACLOCAL_FLAGS" -aclocal $ACLOCAL_FLAGS || exit 1 echo " gettextize -f" echo "N" | gettextize -f || exit 1 +echo " aclocal $ACLOCAL_FLAGS" +aclocal $ACLOCAL_FLAGS || exit 1 echo " autoheader" autoheader || exit 1 echo " automake -a" diff --git a/configure.ac b/configure.ac index 5582b223..b5550d7b 100644 --- a/configure.ac +++ b/configure.ac @@ -137,7 +137,7 @@ AC_REPLACE_FUNCS([strsep mergesort]) # Check for gettext() and other i18n/l10n things. # ALL_LINGUAS="" -AM_GNU_GETTEXT +AM_GNU_GETTEXT([external]) # autoheader templates for AM_GNU_GETTEXT checks. AH_TEMPLATE([ENABLE_NLS], []) AH_TEMPLATE([HAVE_CATGETS], []) @@ -277,7 +277,7 @@ AC_CONFIG_FILES([Makefile tools/Makefile tools/lemon/Makefile tools/re2c/Makefile - intl/Makefile + m4/Makefile po/Makefile.in ]) AC_OUTPUT diff --git a/configure.in b/configure.in deleted file mode 100644 index 5582b223..00000000 --- a/configure.in +++ /dev/null @@ -1,283 +0,0 @@ -# Process this file with autoconf to produce a configure script. -# $IdPath$ - -# Minimum required perl version for development -PERL_VERSION=5.004 - -# -# autoconf setup -# -AC_PREREQ(2.50) -AC_INIT([yasm], [0.1.0], [bug-yasm@tortall.net]) -AC_CONFIG_SRCDIR([src/main.c]) -AC_CONFIG_AUX_DIR(config) -AM_CONFIG_HEADER([config.h]) - -AM_INIT_AUTOMAKE(yasm, 0.1.0) - -# -# autoconf command-line options -# -AC_ARG_ENABLE(dev, -[ --enable-dev Enable full development build capability], -[case "${enableval}" in - yes) dev=true ;; - no) dev=false ;; - *) AC_MSG_ERROR([bad value ${enableval} for --enable-dev]) ;; -esac],[dev=false]) -AM_CONDITIONAL(DEV, test x$dev = xtrue) - -AC_ARG_ENABLE(morewarn, -[ --enable-morewarn Enable lots of extra GCC warnings], -[case "${enableval}" in - yes) morewarn=true ;; - no) morewarn=false ;; - *) AC_MSG_ERROR([bad value ${enableval} for --enable-morewarn]) ;; -esac],[morewarn=false]) - -AC_ARG_ENABLE(warnerror, -[ --enable-warnerror Treat GCC warnings as errors], -[case "${enableval}" in - yes) warnerror=true ;; - no) warnerror=false ;; - *) AC_MSG_ERROR([bad value ${enableval} for --enable-warnerror]) ;; -esac],[warnerror=false]) - -AC_ARG_ENABLE(profiling, -[ --enable-profiling Enable profiling (requires GCC)], -[case "${enableval}" in - yes) profiling=true ;; - no) profiling=false ;; - *) AC_MSG_ERROR([bad value ${enableval} for --enable-profiling]) ;; -esac],[profiling=false]) - -AC_ARG_ENABLE(dmalloc, -[ --enable-dmalloc Enable debug malloc (requires dmalloc library)], -[case "${enableval}" in - yes) dmalloc=true ;; - no) dmalloc=false ;; - *) AC_MSG_ERROR([bad value ${enableval} for --enable-dmalloc]) ;; -esac],[dmalloc=false]) - -# -# Checks for programs. -# -# lex and yacc are only required for development. -AC_PROG_YACC -AC_PROG_CC_STDC -AC_PROG_INSTALL -AC_PROG_LN_S -AM_PROG_LEX -AC_PROG_RANLIB - -# REQUIRE a standard (ANSI/ISO) C compiler -if test "$ac_cv_prog_cc_stdc" = no; then - AC_MSG_ERROR([A standard (ANSI/ISO C89) C compiler is required.]) -fi - -# Check for Perl (for gen_instr.pl and the like, needed only for development) -AC_PATH_PROGS(PERL, $PERL perl5 perl) -# Check for groff (for rendering manpages, needed only for development) -AC_PATH_PROGS(GROFF, $GROFF groff) - -# Check for compiler output filename suffixes. -AC_OBJEXT -AC_EXEEXT - -# -# Checks for libraries. -# - -# dmalloc library (optional) -if ${dmalloc}; then - AC_CHECK_LIB(dmalloc, dmalloc_shutdown) -fi - -# -# Checks for header files. -# -AC_HEADER_STDC -AC_HEADER_SYS_WAIT -AC_CHECK_HEADERS([alloca.h limits.h sys/cdefs.h sys/ipc.h sys/msg.h sys/param.h sys/types.h sys/queue.h unistd.h]) - -# dmalloc library (optional) -if ${dmalloc}; then - AC_CHECK_HEADERS([dmalloc.h]) -fi - -# REQUIRE standard C headers -if test "$ac_cv_header_stdc" != yes; then - AC_MSG_ERROR([Standard (ANSI/ISO C89) header files are required.]) -fi - -# -# Checks for typedefs, structures, and compiler characteristics. -# -AC_C_CONST -AC_C_INLINE -AC_C_PROTOTYPES -# PID_T is used by the test suite (not required). -AC_TYPE_PID_T -AC_TYPE_SIZE_T - -# -# Checks for library functions. -# -AC_FUNC_FORK -AC_FUNC_MALLOC -AC_FUNC_VPRINTF -AC_CHECK_FUNCS([abort memcpy memmove strrchr toascii vsnprintf]) -# Look for the case-insensitive comparison functions -AC_CHECK_FUNCS([strcasecmp strncasecmp stricmp strcmpi]) -# Check for stuff wanted by the test suite. None of this is required. -AC_CHECK_FUNCS([msgctl msgget msgrcv msgsnd strerror snprintf wait]) -AC_REPLACE_FUNCS([strsep mergesort]) - -# -# Check for gettext() and other i18n/l10n things. -# -ALL_LINGUAS="" -AM_GNU_GETTEXT -# autoheader templates for AM_GNU_GETTEXT checks. -AH_TEMPLATE([ENABLE_NLS], []) -AH_TEMPLATE([HAVE_CATGETS], []) -AH_TEMPLATE([HAVE_GETTEXT], []) -AH_TEMPLATE([HAVE_LC_MESSAGES], []) -AH_TEMPLATE([HAVE_STPCPY], []) - -# Check for GNU C Library -AH_TEMPLATE([HAVE_GNU_C_LIBRARY], [Define if you have the GNU C Library]) -AC_CACHE_CHECK([for GNU C Library], yasm_cv_header_gnulib, - AC_EGREP_CPP(gnulib, - [#include - #ifdef __GNU_LIBRARY__ - gnulib - #endif - ], yasm_cv_header_gnulib=yes, yasm_cv_header_gnulib=no)) -if test "$yasm_cv_header_gnulib" = yes; then - AC_DEFINE([HAVE_GNU_C_LIBRARY]) -fi - -# Force x86 architecture only for now. -ARCH=x86 -AC_SUBST([ARCH]) - -# Require things for --enable-dmalloc option. -DMALLOCFLAGS= -if ${dmalloc}; then - if test "$ac_cv_header_dmalloc_h" != yes || - test "$ac_cv_lib_dmalloc_dmalloc_shutdown" != yes; then - AC_MSG_ERROR([dmalloc required for --enable-dmalloc.]) - else - AC_DEFINE([DMALLOC], 1, [Enable dmalloc library debugging.]) - fi -else - if ${morewarn}; then - DMALLOCFLAGS="-Wredundant-decls" - fi -fi - -# Require things for --enable-dev option. -if ${dev}; then - # Require Perl - if test -z "$PERL" || test "$PERL" = ":"; then - AC_MSG_ERROR([Perl not found in \$PATH]) - fi - - # Require Perl >= PERL_VERSION - AC_MSG_CHECKING([for minimum required perl version >= $PERL_VERSION]) - _perl_version=`PERL_VERSION=$PERL_VERSION $PERL -e 'print "$]"; if ($] >= $ENV{PERL_VERSION}) { exit(0); } else { exit(1); }' 2>&5` - _perl_res=$? - AC_MSG_RESULT([$_perl_version]) - - if test "$_perl_res" != 0; then - AC_MSG_ERROR([Perl $PERL_VERSION or higher is required.]) - fi - - # Require groff - if test -z "$GROFF" || test "$GROFF" = ":"; then - AC_MSG_ERROR([groff not found in \$PATH]) - fi -fi - -# -# Add some more CFLAGS for various options. -# - -# "Check" tests can use fork/wait/msg* if ALL are available. -AH_TEMPLATE([USE_FORKWAITMSG], [Combined test for fork/wait/msg*]) -if ${check}; then - if test "$ac_cv_func_fork" = yes && - test "$ac_cv_func_wait" = yes && - test "$ac_cv_func_msgctl" = yes && - test "$ac_cv_func_msgget" = yes && - test "$ac_cv_func_msgrcv" = yes && - test "$ac_cv_func_msgsnd" = yes; then - AC_DEFINE([USE_FORKWAITMSG]) - AC_DEFINE([_GNU_SOURCE], 1, - [Make sure we see all GNU extensions.]) - AC_DEFINE([_SVID_SOURCE], 1, - [Make sure we see all SVID extensions.]) - fi -fi - -# Enable debugging if --enable-dev, otherwise optimize -if ${dev}; then - DEVFLAGS=" -g" -else - DEVFLAGS=" -O" -fi - -# More warnings to help write clean code -if ${morewarn}; then - MOREWARNFLAGS="-Wbad-function-cast -Wcast-align -Wcast-qual -Wchar-subscripts -Winline -Wmissing-prototypes -Wnested-externs -Wpointer-arith -Wshadow -Wstrict-prototypes -Wwrite-strings" -fi - -# Turn warnings into errors -if ${warnerror}; then - WARNERRORFLAGS="-Werror" -fi - -# Enable output of profiling information -if ${profiling}; then - PROFILINGFLAGS="-pg" -fi - -# If we're using GCC, then we can enable the above CFLAGS as well as turn on -# -ansi -pedantic -Wall. -if test "$GCC" = yes; then - ANSI_CFLAGS="-ansi -pedantic -Wall $MOREWARNFLAGS $WARNERRORFLAGS $DEVFLAGS $PROFILINGFLAGS $DMALLOCFLAGS" -else - ANSI_CFLAGS="" -fi -AC_SUBST(ANSI_CFLAGS) - -# Check for target-specific bogus sys/queue.h -AH_TEMPLATE([HAVE_BOGUS_SYS_QUEUE_H], - [Workaround for bad implementations.]) -case "$host" in -*-*-sunos4*) - AC_DEFINE([HAVE_BOGUS_SYS_QUEUE_H]) - ;; -*-sni-sysv*) - AC_DEFINE([HAVE_BOGUS_SYS_QUEUE_H]) - ;; -*-*-sco3.2v4*) - AC_DEFINE([HAVE_BOGUS_SYS_QUEUE_H]) - ;; -*-*-sco3.2v5*) - AC_DEFINE([HAVE_BOGUS_SYS_QUEUE_H]) - ;; -*-*-linux*) - AC_DEFINE([HAVE_BOGUS_SYS_QUEUE_H]) - ;; -esac - -AC_CONFIG_FILES([Makefile - tools/Makefile - tools/lemon/Makefile - tools/re2c/Makefile - intl/Makefile - po/Makefile.in -]) -AC_OUTPUT diff --git a/po/Makevars b/po/Makevars new file mode 100644 index 00000000..99df71c9 --- /dev/null +++ b/po/Makevars @@ -0,0 +1,25 @@ +# Makefile variables for PO directory in any package using GNU gettext. + +# Usually the message domain is the same as the package name. +DOMAIN = $(PACKAGE) + +# These two variables depend on the location of this directory. +subdir = po +top_builddir = .. + +# These options get passed to xgettext. +XGETTEXT_OPTIONS = --keyword=_ --keyword=N_ + +# This is the copyright holder that gets inserted into the header of the +# $(DOMAIN).pot file. Set this to the copyright holder of the surrounding +# package. (Note that the msgstr strings, extracted from the package's +# sources, belong to the copyright holder of the package.) Translators are +# expected to transfer the copyright for their translations to this person +# or entity, or to disclaim their copyright. The empty string stands for +# the public domain; in this case the translators are expected to disclaim +# their copyright. +COPYRIGHT_HOLDER = Peter Johnson and other YASM developers + +# This is the list of locale categories, beyond LC_MESSAGES, for which the +# message catalogs shall be used. It is usually empty. +EXTRA_LOCALE_CATEGORIES =