Re: Cannot build gawk 3.1.1 on Solaris 7

[Aharon Robbins]

Thanks for all this Paul.   Most of this is already fixed in my
development version.  I did add AM_GNU_GETTEXT_VERSION to configure.in.
It seems that m4/ssize_t.m4 isn't needed at all for current autoconf.

I fixed the original poster's problem in my development version, and
this gives me the option of continuing to ship the intl/ directory
with gawk, which I want to do for a little while longer.  Probably
for 3.2 I'll switch doing it the way the others do.

Thanks all.

Arnold

> Date: Thu, 10 Oct 2002 02:13:44 -0700 (PDT)
> From: Paul Eggert <address@hidden>
> To: address@hidden
> CC: address@hidden, address@hidden, address@hidden,
>    address@hidden
> Subject: Re: Cannot build gawk 3.1.1 on Solaris 7
>
> > From: Aharon Robbins <address@hidden>
> > Date: Thu, 10 Oct 2002 09:03:14 +0200
> > 
> > How is anyone supposed to use --with-included-gettext
> > if I don't ship that directory?
>
> They're not.
>
> > Or is the assumption that on non-glibc systems one shouldn't
> > enable gettext at all?  That seems rather draconian.
>
> Yes that would be drastic, but that's not the assumption.
>
> The assumption is that if you want gettext on non-glibc, then
> you port and install GNU gettext first; then you install Gawk.
> This is how coreutils, diffutils, etc. do it.
>
> > I'm using automake 1.7, gettext 0.11.5 and autoconf 2.54, so
> > I'm current on all my tools.  And I WILL NOT use development
> > versions of those tools, only released ones.
>
> OK, here is a more complete version of my proposed patch, relative to
> gawk 3.1.1.  I've tested this with automake 1.7, gettext 0.11.5 and
> autoconf 2.54.  After applying this patch, run the following commands:
>
> rm m4/jm-mktime.m4 m4/largefile.m4
> rm -r intl
> autoreconf -v -i -f
> configure
> make
>
> 2002-10-10  Paul Eggert  <address@hidden>
>
>       * Makefile.am (SUBDIRS): Remove intl.
>       (INCLUDES): Remove.
>       * awk.h: Include locale.h before gettext.h, to avoid problem
>       on Solaris 8 + GCC 3.2.
>       * configure.in (AM_GNU_GETTEXT): Switch from no-libtool to external,
>       so that we don't have to worry about shipping intl.
>       (AM_GNU_GETTEXT_VERSION): New macro.
>       (AM_OUTPUT): Remove intl/Makefile.
>       * m4/ssize_t.m4 (GAWK_AC_TYPE_SSIZE_T): Modernize for Autoconf 2.54.
>       * intl/*, m4/jm-mktime.m4, m4/largefile.m4: Remove.
>
> diff -Naurp gawk-3.1.1/Makefile.am gawk-3.1.1-fixed/Makefile.am
> --- gawk-3.1.1/Makefile.am    2002-04-28 14:27:54.000000000 +0000
> +++ gawk-3.1.1-fixed/Makefile.am      2002-10-10 08:22:48.000000000 +0000
> @@ -61,11 +61,9 @@ EXTRA_DIST = \
>       ylwrap
>  
>  # The order to do things in.
> -# Build in intl first in case we need the local gettext version.
> -# Build explicitly  "." next in order to build gawk first, so
> +# Build explicitly "." first in order to build gawk first, so
>  # that `make check' without a prior `make' works.
>  SUBDIRS = \
> -     intl \
>       . \
>       awklib \
>       doc \
> @@ -125,8 +123,6 @@ DEFPATH="\".$(PATH_SEPARATOR)$(awkdatadi
>  
>  DEFS= -DDEFPATH=$(DEFPATH) -DHAVE_CONFIG_H -DGAWK 
> -DLOCALEDIR="\"$(datadir)/locale\""
>  
> -INCLUDES = -I$(srcdir)/intl
> -
>  # We want hard links for install-exec-hook, below
>  LN= ln
>  
> diff -Naurp gawk-3.1.1/awk.h gawk-3.1.1-fixed/awk.h
> --- gawk-3.1.1/awk.h  2002-04-16 11:40:18.000000000 +0000
> +++ gawk-3.1.1-fixed/awk.h    2002-10-10 08:36:47.000000000 +0000
> @@ -49,10 +49,6 @@
>  #include <ctype.h>
>  #include <setjmp.h>
>  
> -#include "gettext.h"
> -#define _(msgid)  gettext(msgid)
> -#define N_(msgid) msgid
> -
>  #if ! (defined(HAVE_LIBINTL_H) && defined(ENABLE_NLS) && ENABLE_NLS > 0)
>  #ifndef LOCALEDIR
>  #define LOCALEDIR NULL
> @@ -62,6 +58,9 @@
>  #ifdef HAVE_LOCALE_H
>  #include <locale.h>
>  #endif /* HAVE_LOCALE_H */
> +#include "gettext.h"
> +#define _(msgid)  gettext(msgid)
> +#define N_(msgid) msgid
>  #if defined(HAVE_STDARG_H) && defined(__STDC__) && __STDC__
>  #include <stdarg.h>
>  #else
> diff -Naurp gawk-3.1.1/configure.in gawk-3.1.1-fixed/configure.in
> --- gawk-3.1.1/configure.in   2002-04-29 12:23:32.000000000 +0000
> +++ gawk-3.1.1-fixed/configure.in     2002-10-10 08:42:48.000000000 +0000
> @@ -96,7 +96,8 @@ AM_PROG_CC_STDC
>  AM_C_PROTOTYPES
>  
>  dnl initialize GNU gettext
> -AM_GNU_GETTEXT([no-libtool], [need-ngettext])
> +AM_GNU_GETTEXT([external], [need-ngettext])
> +AM_GNU_GETTEXT_VERSION(0.11.5)
>  
>  dnl checks for header files
>  AC_HEADER_STDC
> @@ -199,6 +200,5 @@ AC_SUBST(PATH_SEPARATOR)
>  AC_OUTPUT(Makefile \
>       awklib/Makefile \
>       doc/Makefile \
> -     intl/Makefile \
>       po/Makefile.in \
>       test/Makefile)
> diff -Naurp gawk-3.1.1/m4/ssize_t.m4 gawk-3.1.1-fixed/m4/ssize_t.m4
> --- gawk-3.1.1/m4/ssize_t.m4  2000-11-26 15:19:27.000000000 +0000
> +++ gawk-3.1.1-fixed/m4/ssize_t.m4    2002-10-10 08:19:28.000000000 +0000
> @@ -8,17 +8,6 @@ dnl On Fujitsu UXP/V systems ssize_t is 
>  AC_DEFUN(GAWK_AC_TYPE_SSIZE_T,
>    [
>      AC_CHECK_HEADERS(unistd.h)
> -    AC_CHECK_TYPE(ssize_t, int,
> -      [
> -#include <sys/types.h>
> -#if STDC_HEADERS
> -# include <stdlib.h>
> -# include <stddef.h>
> -#endif
> -#if HAVE_UNISTD_H
> -# include <unistd.h>
> -#endif
> -      ]
> -    )
> +    AC_CHECK_TYPE(ssize_t, int)
>    ]
>  )
>