Re: SunOS patch for memcmp() - Mailing list pgsql-patches

From Bruce Momjian
Subject Re: SunOS patch for memcmp()
Date
Msg-id 200112170743.fBH7hmI18466@candle.pha.pa.us
Whole thread Raw
List pgsql-patches
> > > SunOS        Tatsuo Ishii
> > >               Are we giving up on this one? Still relevant?
> >
> > What should we do? The only remaining issue is a non-8-bit-clean
> > memcmp, which seems pretty easy to fix it.
>
> OK, here is a patch to allow SunOS to pass the regression tests.  One
> attachment is the patch, which is quite small except that the line
> numbers in configure changed with autoconf, and that bloated the patch.
> The second attachment is the file memcmp.c which should be placed in
> src/utils.  I got this from NetBSD.

OK, here is an even better, smaller version.  You need to put memcmp.c
in src/backend/port, rather than src/utils.  Because memcmp.c is used
only by the backend, it seems it belongs properly in ports.  strdup() is
in utils because it is used by PG client apps.

Again, configure line number changes bloat the patch.

--
  Bruce Momjian                        |  http://candle.pha.pa.us
  pgman@candle.pha.pa.us               |  (610) 853-3000
  +  If your life is a hard drive,     |  830 Blythe Avenue
  +  Christ can be your backup.        |  Drexel Hill, Pennsylvania 19026
Index: configure.in
===================================================================
RCS file: /cvsroot/pgsql/configure.in,v
retrieving revision 1.158
diff -c -r1.158 configure.in
*** configure.in    2001/12/13 22:00:22    1.158
--- configure.in    2001/12/17 07:39:34
***************
*** 809,814 ****
--- 809,817 ----
  AC_FUNC_ACCEPT_ARGTYPES
  PGAC_FUNC_GETTIMEOFDAY_1ARG

+ # SunOS doesn't handle negative byte comparisons properly with +/- return
+ PGAC_FUNC_MEMCMP
+
  AC_CHECK_FUNCS([fcvt getopt_long memmove pstat setproctitle setsid sigprocmask sysconf waitpid dlopen fdatasync])

  dnl Check whether <unistd.h> declares fdatasync().
Index: config/c-library.m4
===================================================================
RCS file: /cvsroot/pgsql/config/c-library.m4,v
retrieving revision 1.9
diff -c -r1.9 c-library.m4
*** config/c-library.m4    2001/09/07 19:52:53    1.9
--- config/c-library.m4    2001/12/17 07:39:34
***************
*** 36,41 ****
--- 36,65 ----
  fi])# PGAC_FUNC_GETTIMEOFDAY_1ARG


+ # PGAC_FUNC_MEMCMP
+ # -----------
+ # Check if memcmp() properly handles negative bytes and returns +/-.
+ # SunOS does not.
+ # AC_FUNC_MEMCMP
+ AC_DEFUN(PGAC_FUNC_MEMCMP,
+ [AC_CACHE_CHECK(for 8-bit clean memcmp, pgac_cv_func_memcmp_clean,
+ [AC_TRY_RUN([
+ main()
+ {
+   char c0 = 0x40, c1 = 0x80, c2 = 0x81;
+   exit(memcmp(&c0, &c2, 1) < 0 && memcmp(&c1, &c2, 1) < 0 ? 0 : 1);
+ }
+ ], pgac_cv_func_memcmp_clean=yes, pgac_cv_func_memcmp_clean=no,
+ pgac_cv_func_memcmp_clean=no)])
+ if test $pgac_cv_func_memcmp_clean = no ; then
+   MEMCMP=memcmp.o
+ else
+   MEMCMP=
+ fi
+ AC_SUBST(MEMCMP)dnl
+ ])
+
+
  # PGAC_UNION_SEMUN
  # ----------------
  # Check if `union semun' exists. Define HAVE_UNION_SEMUN if so.
Index: src/Makefile.global.in
===================================================================
RCS file: /cvsroot/pgsql/src/Makefile.global.in,v
retrieving revision 1.140
diff -c -r1.140 Makefile.global.in
*** src/Makefile.global.in    2001/10/13 15:24:23    1.140
--- src/Makefile.global.in    2001/12/17 07:39:35
***************
*** 328,333 ****
--- 328,334 ----
  STRERROR = @STRERROR@
  SNPRINTF = @SNPRINTF@
  STRDUP = @STRDUP@
+ MEMCMP = @MEMCMP@
  STRTOUL = @STRTOUL@


Index: src/backend/port/Makefile.in
===================================================================
RCS file: /cvsroot/pgsql/src/backend/port/Makefile.in,v
retrieving revision 1.29
diff -c -r1.29 Makefile.in
*** src/backend/port/Makefile.in    2001/05/08 19:38:57    1.29
--- src/backend/port/Makefile.in    2001/12/17 07:39:35
***************
*** 22,28 ****
  include $(top_builddir)/src/Makefile.global

  OBJS = dynloader.o @INET_ATON@ @STRERROR@ @MISSING_RANDOM@ @SRANDOM@
! OBJS+= @GETHOSTNAME@ @GETRUSAGE@ @STRCASECMP@ @TAS@ @ISINF@
  OBJS+= @STRTOL@ @STRTOUL@ @SNPRINTF@
  ifdef STRDUP
  OBJS += $(top_builddir)/src/utils/strdup.o
--- 22,28 ----
  include $(top_builddir)/src/Makefile.global

  OBJS = dynloader.o @INET_ATON@ @STRERROR@ @MISSING_RANDOM@ @SRANDOM@
! OBJS+= @GETHOSTNAME@ @GETRUSAGE@ @MEMCMP@ @STRCASECMP@ @TAS@ @ISINF@
  OBJS+= @STRTOL@ @STRTOUL@ @SNPRINTF@
  ifdef STRDUP
  OBJS += $(top_builddir)/src/utils/strdup.o
Index: configure
===================================================================
RCS file: /cvsroot/pgsql/configure,v
retrieving revision 1.166
diff -c -r1.166 configure
*** configure    2001/12/13 22:00:22    1.166
--- configure    2001/12/17 07:39:29
***************
*** 6149,6163 ****

  fi

  for ac_func in fcvt getopt_long memmove pstat setproctitle setsid sigprocmask sysconf waitpid dlopen fdatasync
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
! echo "configure:6156: checking for $ac_func" >&5
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 6161 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
--- 6149,6205 ----

  fi

+ # SunOS doesn't handle negative byte comparisons properly with +/- return
+ echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6
+ echo "configure:6155: checking for 8-bit clean memcmp" >&5
+ if eval "test \"`echo '$''{'pgac_cv_func_memcmp_clean'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   if test "$cross_compiling" = yes; then
+   pgac_cv_func_memcmp_clean=no
+ else
+   cat > conftest.$ac_ext <<EOF
+ #line 6163 "configure"
+ #include "confdefs.h"
+
+ main()
+ {
+   char c0 = 0x40, c1 = 0x80, c2 = 0x81;
+   exit(memcmp(&c0, &c2, 1) < 0 && memcmp(&c1, &c2, 1) < 0 ? 0 : 1);
+ }
+
+ EOF
+ if { (eval echo configure:6173: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} &&
(./conftest;exit) 2>/dev/null 
+ then
+   pgac_cv_func_memcmp_clean=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -fr conftest*
+   pgac_cv_func_memcmp_clean=no
+ fi
+ rm -fr conftest*
+ fi
+
+ fi
+
+ echo "$ac_t""$pgac_cv_func_memcmp_clean" 1>&6
+ if test $pgac_cv_func_memcmp_clean = no ; then
+   MEMCMP=memcmp.o
+ else
+   MEMCMP=
+ fi
+
+
  for ac_func in fcvt getopt_long memmove pstat setproctitle setsid sigprocmask sysconf waitpid dlopen fdatasync
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
! echo "configure:6198: checking for $ac_func" >&5
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 6203 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
***************
*** 6180,6186 ****

  ; return 0; }
  EOF
! if { (eval echo configure:6184: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
  else
--- 6222,6228 ----

  ; return 0; }
  EOF
! if { (eval echo configure:6226: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
  else
***************
*** 6206,6212 ****


  cat > conftest.$ac_ext <<EOF
! #line 6210 "configure"
  #include "confdefs.h"
  #include <unistd.h>
  EOF
--- 6248,6254 ----


  cat > conftest.$ac_ext <<EOF
! #line 6252 "configure"
  #include "confdefs.h"
  #include <unistd.h>
  EOF
***************
*** 6222,6233 ****


  echo $ac_n "checking for PS_STRINGS""... $ac_c" 1>&6
! echo "configure:6226: checking for PS_STRINGS" >&5
  if eval "test \"`echo '$''{'pgac_cv_var_PS_STRINGS'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 6231 "configure"
  #include "confdefs.h"
  #include <machine/vmparam.h>
  #include <sys/exec.h>
--- 6264,6275 ----


  echo $ac_n "checking for PS_STRINGS""... $ac_c" 1>&6
! echo "configure:6268: checking for PS_STRINGS" >&5
  if eval "test \"`echo '$''{'pgac_cv_var_PS_STRINGS'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 6273 "configure"
  #include "confdefs.h"
  #include <machine/vmparam.h>
  #include <sys/exec.h>
***************
*** 6237,6243 ****
  PS_STRINGS->ps_argvstr = "foo";
  ; return 0; }
  EOF
! if { (eval echo configure:6241: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    pgac_cv_var_PS_STRINGS=yes
  else
--- 6279,6285 ----
  PS_STRINGS->ps_argvstr = "foo";
  ; return 0; }
  EOF
! if { (eval echo configure:6283: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    pgac_cv_var_PS_STRINGS=yes
  else
***************
*** 6259,6270 ****

  SNPRINTF=''
  echo $ac_n "checking for snprintf""... $ac_c" 1>&6
! echo "configure:6263: checking for snprintf" >&5
  if eval "test \"`echo '$''{'ac_cv_func_snprintf'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 6268 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char snprintf(); below.  */
--- 6301,6312 ----

  SNPRINTF=''
  echo $ac_n "checking for snprintf""... $ac_c" 1>&6
! echo "configure:6305: checking for snprintf" >&5
  if eval "test \"`echo '$''{'ac_cv_func_snprintf'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 6310 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char snprintf(); below.  */
***************
*** 6287,6293 ****

  ; return 0; }
  EOF
! if { (eval echo configure:6291: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_snprintf=yes"
  else
--- 6329,6335 ----

  ; return 0; }
  EOF
! if { (eval echo configure:6333: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_snprintf=yes"
  else
***************
*** 6311,6322 ****
  fi

  echo $ac_n "checking for vsnprintf""... $ac_c" 1>&6
! echo "configure:6315: checking for vsnprintf" >&5
  if eval "test \"`echo '$''{'ac_cv_func_vsnprintf'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 6320 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char vsnprintf(); below.  */
--- 6353,6364 ----
  fi

  echo $ac_n "checking for vsnprintf""... $ac_c" 1>&6
! echo "configure:6357: checking for vsnprintf" >&5
  if eval "test \"`echo '$''{'ac_cv_func_vsnprintf'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 6362 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char vsnprintf(); below.  */
***************
*** 6339,6345 ****

  ; return 0; }
  EOF
! if { (eval echo configure:6343: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_vsnprintf=yes"
  else
--- 6381,6387 ----

  ; return 0; }
  EOF
! if { (eval echo configure:6385: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_vsnprintf=yes"
  else
***************
*** 6364,6370 ****


  cat > conftest.$ac_ext <<EOF
! #line 6368 "configure"
  #include "confdefs.h"
  #include <stdio.h>
  EOF
--- 6406,6412 ----


  cat > conftest.$ac_ext <<EOF
! #line 6410 "configure"
  #include "confdefs.h"
  #include <stdio.h>
  EOF
***************
*** 6379,6385 ****
  rm -f conftest*

  cat > conftest.$ac_ext <<EOF
! #line 6383 "configure"
  #include "confdefs.h"
  #include <stdio.h>
  EOF
--- 6421,6427 ----
  rm -f conftest*

  cat > conftest.$ac_ext <<EOF
! #line 6425 "configure"
  #include "confdefs.h"
  #include <stdio.h>
  EOF
***************
*** 6396,6407 ****

  # do this one the hard way in case isinf() is a macro
  echo $ac_n "checking for isinf""... $ac_c" 1>&6
! echo "configure:6400: checking for isinf" >&5
  if eval "test \"`echo '$''{'ac_cv_func_isinf'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 6405 "configure"
  #include "confdefs.h"
  #include <math.h>

--- 6438,6449 ----

  # do this one the hard way in case isinf() is a macro
  echo $ac_n "checking for isinf""... $ac_c" 1>&6
! echo "configure:6442: checking for isinf" >&5
  if eval "test \"`echo '$''{'ac_cv_func_isinf'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 6447 "configure"
  #include "confdefs.h"
  #include <math.h>

***************
*** 6409,6415 ****
  double x = 0.0; int res = isinf(x);
  ; return 0; }
  EOF
! if { (eval echo configure:6413: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    ac_cv_func_isinf=yes
  else
--- 6451,6457 ----
  double x = 0.0; int res = isinf(x);
  ; return 0; }
  EOF
! if { (eval echo configure:6455: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    ac_cv_func_isinf=yes
  else
***************
*** 6435,6446 ****
    for ac_func in fpclass fp_class fp_class_d class
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
! echo "configure:6439: checking for $ac_func" >&5
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 6444 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
--- 6477,6488 ----
    for ac_func in fpclass fp_class fp_class_d class
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
! echo "configure:6481: checking for $ac_func" >&5
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 6486 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
***************
*** 6463,6469 ****

  ; return 0; }
  EOF
! if { (eval echo configure:6467: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
  else
--- 6505,6511 ----

  ; return 0; }
  EOF
! if { (eval echo configure:6509: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
  else
***************
*** 6491,6502 ****


  echo $ac_n "checking for getrusage""... $ac_c" 1>&6
! echo "configure:6495: checking for getrusage" >&5
  if eval "test \"`echo '$''{'ac_cv_func_getrusage'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 6500 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char getrusage(); below.  */
--- 6533,6544 ----


  echo $ac_n "checking for getrusage""... $ac_c" 1>&6
! echo "configure:6537: checking for getrusage" >&5
  if eval "test \"`echo '$''{'ac_cv_func_getrusage'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 6542 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char getrusage(); below.  */
***************
*** 6519,6525 ****

  ; return 0; }
  EOF
! if { (eval echo configure:6523: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_getrusage=yes"
  else
--- 6561,6567 ----

  ; return 0; }
  EOF
! if { (eval echo configure:6565: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_getrusage=yes"
  else
***************
*** 6544,6555 ****


  echo $ac_n "checking for srandom""... $ac_c" 1>&6
! echo "configure:6548: checking for srandom" >&5
  if eval "test \"`echo '$''{'ac_cv_func_srandom'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 6553 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char srandom(); below.  */
--- 6586,6597 ----


  echo $ac_n "checking for srandom""... $ac_c" 1>&6
! echo "configure:6590: checking for srandom" >&5
  if eval "test \"`echo '$''{'ac_cv_func_srandom'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 6595 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char srandom(); below.  */
***************
*** 6572,6578 ****

  ; return 0; }
  EOF
! if { (eval echo configure:6576: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_srandom=yes"
  else
--- 6614,6620 ----

  ; return 0; }
  EOF
! if { (eval echo configure:6618: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_srandom=yes"
  else
***************
*** 6597,6608 ****


  echo $ac_n "checking for gethostname""... $ac_c" 1>&6
! echo "configure:6601: checking for gethostname" >&5
  if eval "test \"`echo '$''{'ac_cv_func_gethostname'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 6606 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char gethostname(); below.  */
--- 6639,6650 ----


  echo $ac_n "checking for gethostname""... $ac_c" 1>&6
! echo "configure:6643: checking for gethostname" >&5
  if eval "test \"`echo '$''{'ac_cv_func_gethostname'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 6648 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char gethostname(); below.  */
***************
*** 6625,6631 ****

  ; return 0; }
  EOF
! if { (eval echo configure:6629: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_gethostname=yes"
  else
--- 6667,6673 ----

  ; return 0; }
  EOF
! if { (eval echo configure:6671: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_gethostname=yes"
  else
***************
*** 6650,6661 ****


  echo $ac_n "checking for random""... $ac_c" 1>&6
! echo "configure:6654: checking for random" >&5
  if eval "test \"`echo '$''{'ac_cv_func_random'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 6659 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char random(); below.  */
--- 6692,6703 ----


  echo $ac_n "checking for random""... $ac_c" 1>&6
! echo "configure:6696: checking for random" >&5
  if eval "test \"`echo '$''{'ac_cv_func_random'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 6701 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char random(); below.  */
***************
*** 6678,6684 ****

  ; return 0; }
  EOF
! if { (eval echo configure:6682: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_random=yes"
  else
--- 6720,6726 ----

  ; return 0; }
  EOF
! if { (eval echo configure:6724: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_random=yes"
  else
***************
*** 6703,6714 ****


  echo $ac_n "checking for inet_aton""... $ac_c" 1>&6
! echo "configure:6707: checking for inet_aton" >&5
  if eval "test \"`echo '$''{'ac_cv_func_inet_aton'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 6712 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char inet_aton(); below.  */
--- 6745,6756 ----


  echo $ac_n "checking for inet_aton""... $ac_c" 1>&6
! echo "configure:6749: checking for inet_aton" >&5
  if eval "test \"`echo '$''{'ac_cv_func_inet_aton'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 6754 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char inet_aton(); below.  */
***************
*** 6731,6737 ****

  ; return 0; }
  EOF
! if { (eval echo configure:6735: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_inet_aton=yes"
  else
--- 6773,6779 ----

  ; return 0; }
  EOF
! if { (eval echo configure:6777: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_inet_aton=yes"
  else
***************
*** 6756,6767 ****


  echo $ac_n "checking for strerror""... $ac_c" 1>&6
! echo "configure:6760: checking for strerror" >&5
  if eval "test \"`echo '$''{'ac_cv_func_strerror'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 6765 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char strerror(); below.  */
--- 6798,6809 ----


  echo $ac_n "checking for strerror""... $ac_c" 1>&6
! echo "configure:6802: checking for strerror" >&5
  if eval "test \"`echo '$''{'ac_cv_func_strerror'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 6807 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char strerror(); below.  */
***************
*** 6784,6790 ****

  ; return 0; }
  EOF
! if { (eval echo configure:6788: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_strerror=yes"
  else
--- 6826,6832 ----

  ; return 0; }
  EOF
! if { (eval echo configure:6830: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_strerror=yes"
  else
***************
*** 6809,6820 ****


  echo $ac_n "checking for strdup""... $ac_c" 1>&6
! echo "configure:6813: checking for strdup" >&5
  if eval "test \"`echo '$''{'ac_cv_func_strdup'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 6818 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char strdup(); below.  */
--- 6851,6862 ----


  echo $ac_n "checking for strdup""... $ac_c" 1>&6
! echo "configure:6855: checking for strdup" >&5
  if eval "test \"`echo '$''{'ac_cv_func_strdup'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 6860 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char strdup(); below.  */
***************
*** 6837,6843 ****

  ; return 0; }
  EOF
! if { (eval echo configure:6841: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_strdup=yes"
  else
--- 6879,6885 ----

  ; return 0; }
  EOF
! if { (eval echo configure:6883: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_strdup=yes"
  else
***************
*** 6862,6873 ****


  echo $ac_n "checking for strtol""... $ac_c" 1>&6
! echo "configure:6866: checking for strtol" >&5
  if eval "test \"`echo '$''{'ac_cv_func_strtol'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 6871 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char strtol(); below.  */
--- 6904,6915 ----


  echo $ac_n "checking for strtol""... $ac_c" 1>&6
! echo "configure:6908: checking for strtol" >&5
  if eval "test \"`echo '$''{'ac_cv_func_strtol'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 6913 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char strtol(); below.  */
***************
*** 6890,6896 ****

  ; return 0; }
  EOF
! if { (eval echo configure:6894: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_strtol=yes"
  else
--- 6932,6938 ----

  ; return 0; }
  EOF
! if { (eval echo configure:6936: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_strtol=yes"
  else
***************
*** 6915,6926 ****


  echo $ac_n "checking for strtoul""... $ac_c" 1>&6
! echo "configure:6919: checking for strtoul" >&5
  if eval "test \"`echo '$''{'ac_cv_func_strtoul'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 6924 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char strtoul(); below.  */
--- 6957,6968 ----


  echo $ac_n "checking for strtoul""... $ac_c" 1>&6
! echo "configure:6961: checking for strtoul" >&5
  if eval "test \"`echo '$''{'ac_cv_func_strtoul'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 6966 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char strtoul(); below.  */
***************
*** 6943,6949 ****

  ; return 0; }
  EOF
! if { (eval echo configure:6947: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_strtoul=yes"
  else
--- 6985,6991 ----

  ; return 0; }
  EOF
! if { (eval echo configure:6989: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_strtoul=yes"
  else
***************
*** 6968,6979 ****


  echo $ac_n "checking for strcasecmp""... $ac_c" 1>&6
! echo "configure:6972: checking for strcasecmp" >&5
  if eval "test \"`echo '$''{'ac_cv_func_strcasecmp'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 6977 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char strcasecmp(); below.  */
--- 7010,7021 ----


  echo $ac_n "checking for strcasecmp""... $ac_c" 1>&6
! echo "configure:7014: checking for strcasecmp" >&5
  if eval "test \"`echo '$''{'ac_cv_func_strcasecmp'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 7019 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char strcasecmp(); below.  */
***************
*** 6996,7002 ****

  ; return 0; }
  EOF
! if { (eval echo configure:7000: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_strcasecmp=yes"
  else
--- 7038,7044 ----

  ; return 0; }
  EOF
! if { (eval echo configure:7042: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_strcasecmp=yes"
  else
***************
*** 7021,7032 ****


  echo $ac_n "checking for cbrt""... $ac_c" 1>&6
! echo "configure:7025: checking for cbrt" >&5
  if eval "test \"`echo '$''{'ac_cv_func_cbrt'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 7030 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char cbrt(); below.  */
--- 7063,7074 ----


  echo $ac_n "checking for cbrt""... $ac_c" 1>&6
! echo "configure:7067: checking for cbrt" >&5
  if eval "test \"`echo '$''{'ac_cv_func_cbrt'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 7072 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char cbrt(); below.  */
***************
*** 7049,7055 ****

  ; return 0; }
  EOF
! if { (eval echo configure:7053: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_cbrt=yes"
  else
--- 7091,7097 ----

  ; return 0; }
  EOF
! if { (eval echo configure:7095: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_cbrt=yes"
  else
***************
*** 7070,7076 ****
  else
    echo "$ac_t""no" 1>&6
  echo $ac_n "checking for cbrt in -lm""... $ac_c" 1>&6
! echo "configure:7074: checking for cbrt in -lm" >&5
  ac_lib_var=`echo m'_'cbrt | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
--- 7112,7118 ----
  else
    echo "$ac_t""no" 1>&6
  echo $ac_n "checking for cbrt in -lm""... $ac_c" 1>&6
! echo "configure:7116: checking for cbrt in -lm" >&5
  ac_lib_var=`echo m'_'cbrt | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
***************
*** 7078,7084 ****
    ac_save_LIBS="$LIBS"
  LIBS="-lm  $LIBS"
  cat > conftest.$ac_ext <<EOF
! #line 7082 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
--- 7120,7126 ----
    ac_save_LIBS="$LIBS"
  LIBS="-lm  $LIBS"
  cat > conftest.$ac_ext <<EOF
! #line 7124 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
***************
*** 7089,7095 ****
  cbrt()
  ; return 0; }
  EOF
! if { (eval echo configure:7093: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
--- 7131,7137 ----
  cbrt()
  ; return 0; }
  EOF
! if { (eval echo configure:7135: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
***************
*** 7127,7138 ****


  echo $ac_n "checking for rint""... $ac_c" 1>&6
! echo "configure:7131: checking for rint" >&5
  if eval "test \"`echo '$''{'ac_cv_func_rint'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 7136 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char rint(); below.  */
--- 7169,7180 ----


  echo $ac_n "checking for rint""... $ac_c" 1>&6
! echo "configure:7173: checking for rint" >&5
  if eval "test \"`echo '$''{'ac_cv_func_rint'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 7178 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char rint(); below.  */
***************
*** 7155,7161 ****

  ; return 0; }
  EOF
! if { (eval echo configure:7159: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_rint=yes"
  else
--- 7197,7203 ----

  ; return 0; }
  EOF
! if { (eval echo configure:7201: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_rint=yes"
  else
***************
*** 7176,7182 ****
  else
    echo "$ac_t""no" 1>&6
  echo $ac_n "checking for rint in -lm""... $ac_c" 1>&6
! echo "configure:7180: checking for rint in -lm" >&5
  ac_lib_var=`echo m'_'rint | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
--- 7218,7224 ----
  else
    echo "$ac_t""no" 1>&6
  echo $ac_n "checking for rint in -lm""... $ac_c" 1>&6
! echo "configure:7222: checking for rint in -lm" >&5
  ac_lib_var=`echo m'_'rint | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
***************
*** 7184,7190 ****
    ac_save_LIBS="$LIBS"
  LIBS="-lm $HPUXMATHLIB $LIBS"
  cat > conftest.$ac_ext <<EOF
! #line 7188 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
--- 7226,7232 ----
    ac_save_LIBS="$LIBS"
  LIBS="-lm $HPUXMATHLIB $LIBS"
  cat > conftest.$ac_ext <<EOF
! #line 7230 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
***************
*** 7195,7201 ****
  rint()
  ; return 0; }
  EOF
! if { (eval echo configure:7199: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
--- 7237,7243 ----
  rint()
  ; return 0; }
  EOF
! if { (eval echo configure:7241: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
***************
*** 7224,7232 ****

  # Readline versions < 2.1 don't have rl_completion_append_character
  echo $ac_n "checking for rl_completion_append_character""... $ac_c" 1>&6
! echo "configure:7228: checking for rl_completion_append_character" >&5
  cat > conftest.$ac_ext <<EOF
! #line 7230 "configure"
  #include "confdefs.h"
  #include <stdio.h>
  #ifdef HAVE_READLINE_READLINE_H
--- 7266,7274 ----

  # Readline versions < 2.1 don't have rl_completion_append_character
  echo $ac_n "checking for rl_completion_append_character""... $ac_c" 1>&6
! echo "configure:7270: checking for rl_completion_append_character" >&5
  cat > conftest.$ac_ext <<EOF
! #line 7272 "configure"
  #include "confdefs.h"
  #include <stdio.h>
  #ifdef HAVE_READLINE_READLINE_H
***************
*** 7239,7245 ****
  rl_completion_append_character = 'x';
  ; return 0; }
  EOF
! if { (eval echo configure:7243: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    echo "$ac_t""yes" 1>&6
  cat >> confdefs.h <<\EOF
--- 7281,7287 ----
  rl_completion_append_character = 'x';
  ; return 0; }
  EOF
! if { (eval echo configure:7285: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    echo "$ac_t""yes" 1>&6
  cat >> confdefs.h <<\EOF
***************
*** 7257,7268 ****
  for ac_func in rl_completion_matches rl_filename_completion_function
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
! echo "configure:7261: checking for $ac_func" >&5
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 7266 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
--- 7299,7310 ----
  for ac_func in rl_completion_matches rl_filename_completion_function
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
! echo "configure:7303: checking for $ac_func" >&5
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 7308 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
***************
*** 7285,7291 ****

  ; return 0; }
  EOF
! if { (eval echo configure:7289: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
  else
--- 7327,7333 ----

  ; return 0; }
  EOF
! if { (eval echo configure:7331: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
  else
***************
*** 7312,7327 ****


  echo $ac_n "checking for finite""... $ac_c" 1>&6
! echo "configure:7316: checking for finite" >&5
  cat > conftest.$ac_ext <<EOF
! #line 7318 "configure"
  #include "confdefs.h"
  #include <math.h>
  int main() {
  int dummy=finite(1.0);
  ; return 0; }
  EOF
! if { (eval echo configure:7325: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    cat >> confdefs.h <<\EOF
  #define HAVE_FINITE 1
--- 7354,7369 ----


  echo $ac_n "checking for finite""... $ac_c" 1>&6
! echo "configure:7358: checking for finite" >&5
  cat > conftest.$ac_ext <<EOF
! #line 7360 "configure"
  #include "confdefs.h"
  #include <math.h>
  int main() {
  int dummy=finite(1.0);
  ; return 0; }
  EOF
! if { (eval echo configure:7367: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    cat >> confdefs.h <<\EOF
  #define HAVE_FINITE 1
***************
*** 7336,7351 ****
  rm -f conftest*

  echo $ac_n "checking for sigsetjmp""... $ac_c" 1>&6
! echo "configure:7340: checking for sigsetjmp" >&5
  cat > conftest.$ac_ext <<EOF
! #line 7342 "configure"
  #include "confdefs.h"
  #include <setjmp.h>
  int main() {
  sigjmp_buf x; sigsetjmp(x, 1);
  ; return 0; }
  EOF
! if { (eval echo configure:7349: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    cat >> confdefs.h <<\EOF
  #define HAVE_SIGSETJMP 1
--- 7378,7393 ----
  rm -f conftest*

  echo $ac_n "checking for sigsetjmp""... $ac_c" 1>&6
! echo "configure:7382: checking for sigsetjmp" >&5
  cat > conftest.$ac_ext <<EOF
! #line 7384 "configure"
  #include "confdefs.h"
  #include <setjmp.h>
  int main() {
  sigjmp_buf x; sigsetjmp(x, 1);
  ; return 0; }
  EOF
! if { (eval echo configure:7391: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    cat >> confdefs.h <<\EOF
  #define HAVE_SIGSETJMP 1
***************
*** 7365,7376 ****
    case $enable_syslog in
      yes)
        echo $ac_n "checking for syslog""... $ac_c" 1>&6
! echo "configure:7369: checking for syslog" >&5
  if eval "test \"`echo '$''{'ac_cv_func_syslog'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 7374 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char syslog(); below.  */
--- 7407,7418 ----
    case $enable_syslog in
      yes)
        echo $ac_n "checking for syslog""... $ac_c" 1>&6
! echo "configure:7411: checking for syslog" >&5
  if eval "test \"`echo '$''{'ac_cv_func_syslog'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 7416 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char syslog(); below.  */
***************
*** 7393,7399 ****

  ; return 0; }
  EOF
! if { (eval echo configure:7397: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_syslog=yes"
  else
--- 7435,7441 ----

  ; return 0; }
  EOF
! if { (eval echo configure:7439: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_syslog=yes"
  else
***************
*** 7432,7450 ****


  echo $ac_n "checking for optreset""... $ac_c" 1>&6
! echo "configure:7436: checking for optreset" >&5
  if eval "test \"`echo '$''{'pgac_cv_var_int_optreset'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 7441 "configure"
  #include "confdefs.h"
  #include <unistd.h>
  int main() {
  extern int optreset; optreset = 1;
  ; return 0; }
  EOF
! if { (eval echo configure:7448: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    pgac_cv_var_int_optreset=yes
  else
--- 7474,7492 ----


  echo $ac_n "checking for optreset""... $ac_c" 1>&6
! echo "configure:7478: checking for optreset" >&5
  if eval "test \"`echo '$''{'pgac_cv_var_int_optreset'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 7483 "configure"
  #include "confdefs.h"
  #include <unistd.h>
  int main() {
  extern int optreset; optreset = 1;
  ; return 0; }
  EOF
! if { (eval echo configure:7490: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    pgac_cv_var_int_optreset=yes
  else
***************
*** 7470,7485 ****
  # This check should come after all modifications of compiler or linker
  # variables, and before any other run tests.
  echo $ac_n "checking test program""... $ac_c" 1>&6
! echo "configure:7474: checking test program" >&5
  if test "$cross_compiling" = yes; then
    echo "$ac_t""cross-compiling" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 7479 "configure"
  #include "confdefs.h"
  int main() { return 0; }
  EOF
! if { (eval echo configure:7483: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} &&
(./conftest;exit) 2>/dev/null 
  then
    echo "$ac_t""ok" 1>&6
  else
--- 7512,7527 ----
  # This check should come after all modifications of compiler or linker
  # variables, and before any other run tests.
  echo $ac_n "checking test program""... $ac_c" 1>&6
! echo "configure:7516: checking test program" >&5
  if test "$cross_compiling" = yes; then
    echo "$ac_t""cross-compiling" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 7521 "configure"
  #include "confdefs.h"
  int main() { return 0; }
  EOF
! if { (eval echo configure:7525: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} &&
(./conftest;exit) 2>/dev/null 
  then
    echo "$ac_t""ok" 1>&6
  else
***************
*** 7499,7505 ****


  echo $ac_n "checking whether long int is 64 bits""... $ac_c" 1>&6
! echo "configure:7503: checking whether long int is 64 bits" >&5
  if eval "test \"`echo '$''{'pgac_cv_type_long_int_64'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
--- 7541,7547 ----


  echo $ac_n "checking whether long int is 64 bits""... $ac_c" 1>&6
! echo "configure:7545: checking whether long int is 64 bits" >&5
  if eval "test \"`echo '$''{'pgac_cv_type_long_int_64'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
***************
*** 7508,7514 ****
  echo "configure: warning: 64 bit arithmetic disabled when cross-compiling" 1>&2
  else
    cat > conftest.$ac_ext <<EOF
! #line 7512 "configure"
  #include "confdefs.h"
  typedef long int int64;

--- 7550,7556 ----
  echo "configure: warning: 64 bit arithmetic disabled when cross-compiling" 1>&2
  else
    cat > conftest.$ac_ext <<EOF
! #line 7554 "configure"
  #include "confdefs.h"
  typedef long int int64;

***************
*** 7537,7543 ****
    exit(! does_int64_work());
  }
  EOF
! if { (eval echo configure:7541: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} &&
(./conftest;exit) 2>/dev/null 
  then
    pgac_cv_type_long_int_64=yes
  else
--- 7579,7585 ----
    exit(! does_int64_work());
  }
  EOF
! if { (eval echo configure:7583: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} &&
(./conftest;exit) 2>/dev/null 
  then
    pgac_cv_type_long_int_64=yes
  else
***************
*** 7564,7570 ****

  if test x"$HAVE_LONG_INT_64" = x"no" ; then
    echo $ac_n "checking whether long long int is 64 bits""... $ac_c" 1>&6
! echo "configure:7568: checking whether long long int is 64 bits" >&5
  if eval "test \"`echo '$''{'pgac_cv_type_long_long_int_64'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
--- 7606,7612 ----

  if test x"$HAVE_LONG_INT_64" = x"no" ; then
    echo $ac_n "checking whether long long int is 64 bits""... $ac_c" 1>&6
! echo "configure:7610: checking whether long long int is 64 bits" >&5
  if eval "test \"`echo '$''{'pgac_cv_type_long_long_int_64'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
***************
*** 7573,7579 ****
  echo "configure: warning: 64 bit arithmetic disabled when cross-compiling" 1>&2
  else
    cat > conftest.$ac_ext <<EOF
! #line 7577 "configure"
  #include "confdefs.h"
  typedef long long int int64;

--- 7615,7621 ----
  echo "configure: warning: 64 bit arithmetic disabled when cross-compiling" 1>&2
  else
    cat > conftest.$ac_ext <<EOF
! #line 7619 "configure"
  #include "confdefs.h"
  typedef long long int int64;

***************
*** 7602,7608 ****
    exit(! does_int64_work());
  }
  EOF
! if { (eval echo configure:7606: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} &&
(./conftest;exit) 2>/dev/null 
  then
    pgac_cv_type_long_long_int_64=yes
  else
--- 7644,7650 ----
    exit(! does_int64_work());
  }
  EOF
! if { (eval echo configure:7648: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} &&
(./conftest;exit) 2>/dev/null 
  then
    pgac_cv_type_long_long_int_64=yes
  else
***************
*** 7632,7638 ****

  if [ x"$HAVE_LONG_LONG_INT_64" = xyes ] ; then
    cat > conftest.$ac_ext <<EOF
! #line 7636 "configure"
  #include "confdefs.h"

  #define INT64CONST(x)  x##LL
--- 7674,7680 ----

  if [ x"$HAVE_LONG_LONG_INT_64" = xyes ] ; then
    cat > conftest.$ac_ext <<EOF
! #line 7678 "configure"
  #include "confdefs.h"

  #define INT64CONST(x)  x##LL
***************
*** 7642,7648 ****

  ; return 0; }
  EOF
! if { (eval echo configure:7646: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    cat >> confdefs.h <<\EOF
  #define HAVE_LL_CONSTANTS 1
--- 7684,7690 ----

  ; return 0; }
  EOF
! if { (eval echo configure:7688: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    cat >> confdefs.h <<\EOF
  #define HAVE_LL_CONSTANTS 1
***************
*** 7660,7666 ****
  if [ x"$HAVE_LONG_LONG_INT_64" = xyes ] ; then
    if [ x$SNPRINTF = x ] ; then
      echo $ac_n "checking whether snprintf handles 'long long int' as %lld""... $ac_c" 1>&6
! echo "configure:7664: checking whether snprintf handles 'long long int' as %lld" >&5
      if test "$cross_compiling" = yes; then
     echo "$ac_t""assuming not on target machine" 1>&6
      # Force usage of our own snprintf, since we cannot test foreign snprintf
--- 7702,7708 ----
  if [ x"$HAVE_LONG_LONG_INT_64" = xyes ] ; then
    if [ x$SNPRINTF = x ] ; then
      echo $ac_n "checking whether snprintf handles 'long long int' as %lld""... $ac_c" 1>&6
! echo "configure:7706: checking whether snprintf handles 'long long int' as %lld" >&5
      if test "$cross_compiling" = yes; then
     echo "$ac_t""assuming not on target machine" 1>&6
      # Force usage of our own snprintf, since we cannot test foreign snprintf
***************
*** 7669,7675 ****

  else
    cat > conftest.$ac_ext <<EOF
! #line 7673 "configure"
  #include "confdefs.h"
  #include <stdio.h>
  typedef long long int int64;
--- 7711,7717 ----

  else
    cat > conftest.$ac_ext <<EOF
! #line 7715 "configure"
  #include "confdefs.h"
  #include <stdio.h>
  typedef long long int int64;
***************
*** 7696,7702 ****
    exit(! does_int64_snprintf_work());
  }
  EOF
! if { (eval echo configure:7700: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} &&
(./conftest;exit) 2>/dev/null 
  then
     echo "$ac_t""yes" 1>&6
        INT64_FORMAT='"%lld"'
--- 7738,7744 ----
    exit(! does_int64_snprintf_work());
  }
  EOF
! if { (eval echo configure:7742: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} &&
(./conftest;exit) 2>/dev/null 
  then
     echo "$ac_t""yes" 1>&6
        INT64_FORMAT='"%lld"'
***************
*** 7707,7713 ****
    rm -fr conftest*
     echo "$ac_t""no" 1>&6
      echo $ac_n "checking whether snprintf handles 'long long int' as %qd""... $ac_c" 1>&6
! echo "configure:7711: checking whether snprintf handles 'long long int' as %qd" >&5
      if test "$cross_compiling" = yes; then
     echo "$ac_t""assuming not on target machine" 1>&6
      # Force usage of our own snprintf, since we cannot test foreign snprintf
--- 7749,7755 ----
    rm -fr conftest*
     echo "$ac_t""no" 1>&6
      echo $ac_n "checking whether snprintf handles 'long long int' as %qd""... $ac_c" 1>&6
! echo "configure:7753: checking whether snprintf handles 'long long int' as %qd" >&5
      if test "$cross_compiling" = yes; then
     echo "$ac_t""assuming not on target machine" 1>&6
      # Force usage of our own snprintf, since we cannot test foreign snprintf
***************
*** 7716,7722 ****

  else
    cat > conftest.$ac_ext <<EOF
! #line 7720 "configure"
  #include "confdefs.h"
  #include <stdio.h>
  typedef long long int int64;
--- 7758,7764 ----

  else
    cat > conftest.$ac_ext <<EOF
! #line 7762 "configure"
  #include "confdefs.h"
  #include <stdio.h>
  typedef long long int int64;
***************
*** 7743,7749 ****
    exit(! does_int64_snprintf_work());
  }
  EOF
! if { (eval echo configure:7747: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} &&
(./conftest;exit) 2>/dev/null 
  then
     echo "$ac_t""yes" 1>&6
      INT64_FORMAT='"%qd"'
--- 7785,7791 ----
    exit(! does_int64_snprintf_work());
  }
  EOF
! if { (eval echo configure:7789: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} &&
(./conftest;exit) 2>/dev/null 
  then
     echo "$ac_t""yes" 1>&6
      INT64_FORMAT='"%qd"'
***************
*** 7783,7794 ****
  for ac_func in strtoll strtoq
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
! echo "configure:7787: checking for $ac_func" >&5
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 7792 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
--- 7825,7836 ----
  for ac_func in strtoll strtoq
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
! echo "configure:7829: checking for $ac_func" >&5
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 7834 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
***************
*** 7811,7817 ****

  ; return 0; }
  EOF
! if { (eval echo configure:7815: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
  else
--- 7853,7859 ----

  ; return 0; }
  EOF
! if { (eval echo configure:7857: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
  else
***************
*** 7838,7849 ****
  for ac_func in strtoull strtouq
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
! echo "configure:7842: checking for $ac_func" >&5
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 7847 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
--- 7880,7891 ----
  for ac_func in strtoull strtouq
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
! echo "configure:7884: checking for $ac_func" >&5
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 7889 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
***************
*** 7866,7872 ****

  ; return 0; }
  EOF
! if { (eval echo configure:7870: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
  else
--- 7908,7914 ----

  ; return 0; }
  EOF
! if { (eval echo configure:7912: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
  else
***************
*** 7892,7903 ****


  echo $ac_n "checking for atexit""... $ac_c" 1>&6
! echo "configure:7896: checking for atexit" >&5
  if eval "test \"`echo '$''{'ac_cv_func_atexit'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 7901 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char atexit(); below.  */
--- 7934,7945 ----


  echo $ac_n "checking for atexit""... $ac_c" 1>&6
! echo "configure:7938: checking for atexit" >&5
  if eval "test \"`echo '$''{'ac_cv_func_atexit'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 7943 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char atexit(); below.  */
***************
*** 7920,7926 ****

  ; return 0; }
  EOF
! if { (eval echo configure:7924: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_atexit=yes"
  else
--- 7962,7968 ----

  ; return 0; }
  EOF
! if { (eval echo configure:7966: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_atexit=yes"
  else
***************
*** 7943,7954 ****
  for ac_func in on_exit
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
! echo "configure:7947: checking for $ac_func" >&5
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 7952 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
--- 7985,7996 ----
  for ac_func in on_exit
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
! echo "configure:7989: checking for $ac_func" >&5
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 7994 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
***************
*** 7971,7977 ****

  ; return 0; }
  EOF
! if { (eval echo configure:7975: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
  else
--- 8013,8019 ----

  ; return 0; }
  EOF
! if { (eval echo configure:8017: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
  else
***************
*** 8004,8010 ****


  echo $ac_n "checking size of unsigned long""... $ac_c" 1>&6
! echo "configure:8008: checking size of unsigned long" >&5
  if eval "test \"`echo '$''{'ac_cv_sizeof_unsigned_long'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
--- 8046,8052 ----


  echo $ac_n "checking size of unsigned long""... $ac_c" 1>&6
! echo "configure:8050: checking size of unsigned long" >&5
  if eval "test \"`echo '$''{'ac_cv_sizeof_unsigned_long'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
***************
*** 8012,8018 ****
    ac_cv_sizeof_unsigned_long=4
  else
    cat > conftest.$ac_ext <<EOF
! #line 8016 "configure"
  #include "confdefs.h"
  #include <stdio.h>
  main()
--- 8054,8060 ----
    ac_cv_sizeof_unsigned_long=4
  else
    cat > conftest.$ac_ext <<EOF
! #line 8058 "configure"
  #include "confdefs.h"
  #include <stdio.h>
  main()
***************
*** 8023,8029 ****
    exit(0);
  }
  EOF
! if { (eval echo configure:8027: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} &&
(./conftest;exit) 2>/dev/null 
  then
    ac_cv_sizeof_unsigned_long=`cat conftestval`
  else
--- 8065,8071 ----
    exit(0);
  }
  EOF
! if { (eval echo configure:8069: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} &&
(./conftest;exit) 2>/dev/null 
  then
    ac_cv_sizeof_unsigned_long=`cat conftestval`
  else
***************
*** 8049,8055 ****


  echo $ac_n "checking alignment of short""... $ac_c" 1>&6
! echo "configure:8053: checking alignment of short" >&5
  if eval "test \"`echo '$''{'pgac_cv_alignof_short'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
--- 8091,8097 ----


  echo $ac_n "checking alignment of short""... $ac_c" 1>&6
! echo "configure:8095: checking alignment of short" >&5
  if eval "test \"`echo '$''{'pgac_cv_alignof_short'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
***************
*** 8057,8063 ****
    pgac_cv_alignof_short='sizeof(short)'
  else
    cat > conftest.$ac_ext <<EOF
! #line 8061 "configure"
  #include "confdefs.h"
  #include <stdio.h>
  struct { char filler; short field; } mystruct;
--- 8099,8105 ----
    pgac_cv_alignof_short='sizeof(short)'
  else
    cat > conftest.$ac_ext <<EOF
! #line 8103 "configure"
  #include "confdefs.h"
  #include <stdio.h>
  struct { char filler; short field; } mystruct;
***************
*** 8069,8075 ****
    exit(0);
  }
  EOF
! if { (eval echo configure:8073: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} &&
(./conftest;exit) 2>/dev/null 
  then
    pgac_cv_alignof_short=`cat conftestval`
  else
--- 8111,8117 ----
    exit(0);
  }
  EOF
! if { (eval echo configure:8115: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} &&
(./conftest;exit) 2>/dev/null 
  then
    pgac_cv_alignof_short=`cat conftestval`
  else
***************
*** 8089,8095 ****


  echo $ac_n "checking alignment of int""... $ac_c" 1>&6
! echo "configure:8093: checking alignment of int" >&5
  if eval "test \"`echo '$''{'pgac_cv_alignof_int'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
--- 8131,8137 ----


  echo $ac_n "checking alignment of int""... $ac_c" 1>&6
! echo "configure:8135: checking alignment of int" >&5
  if eval "test \"`echo '$''{'pgac_cv_alignof_int'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
***************
*** 8097,8103 ****
    pgac_cv_alignof_int='sizeof(int)'
  else
    cat > conftest.$ac_ext <<EOF
! #line 8101 "configure"
  #include "confdefs.h"
  #include <stdio.h>
  struct { char filler; int field; } mystruct;
--- 8139,8145 ----
    pgac_cv_alignof_int='sizeof(int)'
  else
    cat > conftest.$ac_ext <<EOF
! #line 8143 "configure"
  #include "confdefs.h"
  #include <stdio.h>
  struct { char filler; int field; } mystruct;
***************
*** 8109,8115 ****
    exit(0);
  }
  EOF
! if { (eval echo configure:8113: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} &&
(./conftest;exit) 2>/dev/null 
  then
    pgac_cv_alignof_int=`cat conftestval`
  else
--- 8151,8157 ----
    exit(0);
  }
  EOF
! if { (eval echo configure:8155: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} &&
(./conftest;exit) 2>/dev/null 
  then
    pgac_cv_alignof_int=`cat conftestval`
  else
***************
*** 8129,8135 ****


  echo $ac_n "checking alignment of long""... $ac_c" 1>&6
! echo "configure:8133: checking alignment of long" >&5
  if eval "test \"`echo '$''{'pgac_cv_alignof_long'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
--- 8171,8177 ----


  echo $ac_n "checking alignment of long""... $ac_c" 1>&6
! echo "configure:8175: checking alignment of long" >&5
  if eval "test \"`echo '$''{'pgac_cv_alignof_long'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
***************
*** 8137,8143 ****
    pgac_cv_alignof_long='sizeof(long)'
  else
    cat > conftest.$ac_ext <<EOF
! #line 8141 "configure"
  #include "confdefs.h"
  #include <stdio.h>
  struct { char filler; long field; } mystruct;
--- 8179,8185 ----
    pgac_cv_alignof_long='sizeof(long)'
  else
    cat > conftest.$ac_ext <<EOF
! #line 8183 "configure"
  #include "confdefs.h"
  #include <stdio.h>
  struct { char filler; long field; } mystruct;
***************
*** 8149,8155 ****
    exit(0);
  }
  EOF
! if { (eval echo configure:8153: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} &&
(./conftest;exit) 2>/dev/null 
  then
    pgac_cv_alignof_long=`cat conftestval`
  else
--- 8191,8197 ----
    exit(0);
  }
  EOF
! if { (eval echo configure:8195: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} &&
(./conftest;exit) 2>/dev/null 
  then
    pgac_cv_alignof_long=`cat conftestval`
  else
***************
*** 8170,8176 ****

  if [ x"$HAVE_LONG_LONG_INT_64" = xyes ] ; then
    echo $ac_n "checking alignment of long long int""... $ac_c" 1>&6
! echo "configure:8174: checking alignment of long long int" >&5
  if eval "test \"`echo '$''{'pgac_cv_alignof_long_long_int'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
--- 8212,8218 ----

  if [ x"$HAVE_LONG_LONG_INT_64" = xyes ] ; then
    echo $ac_n "checking alignment of long long int""... $ac_c" 1>&6
! echo "configure:8216: checking alignment of long long int" >&5
  if eval "test \"`echo '$''{'pgac_cv_alignof_long_long_int'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
***************
*** 8178,8184 ****
    pgac_cv_alignof_long_long_int='sizeof(long long int)'
  else
    cat > conftest.$ac_ext <<EOF
! #line 8182 "configure"
  #include "confdefs.h"
  #include <stdio.h>
  struct { char filler; long long int field; } mystruct;
--- 8220,8226 ----
    pgac_cv_alignof_long_long_int='sizeof(long long int)'
  else
    cat > conftest.$ac_ext <<EOF
! #line 8224 "configure"
  #include "confdefs.h"
  #include <stdio.h>
  struct { char filler; long long int field; } mystruct;
***************
*** 8190,8196 ****
    exit(0);
  }
  EOF
! if { (eval echo configure:8194: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} &&
(./conftest;exit) 2>/dev/null 
  then
    pgac_cv_alignof_long_long_int=`cat conftestval`
  else
--- 8232,8238 ----
    exit(0);
  }
  EOF
! if { (eval echo configure:8236: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} &&
(./conftest;exit) 2>/dev/null 
  then
    pgac_cv_alignof_long_long_int=`cat conftestval`
  else
***************
*** 8211,8217 ****

  fi
  echo $ac_n "checking alignment of double""... $ac_c" 1>&6
! echo "configure:8215: checking alignment of double" >&5
  if eval "test \"`echo '$''{'pgac_cv_alignof_double'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
--- 8253,8259 ----

  fi
  echo $ac_n "checking alignment of double""... $ac_c" 1>&6
! echo "configure:8257: checking alignment of double" >&5
  if eval "test \"`echo '$''{'pgac_cv_alignof_double'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
***************
*** 8219,8225 ****
    pgac_cv_alignof_double='sizeof(double)'
  else
    cat > conftest.$ac_ext <<EOF
! #line 8223 "configure"
  #include "confdefs.h"
  #include <stdio.h>
  struct { char filler; double field; } mystruct;
--- 8261,8267 ----
    pgac_cv_alignof_double='sizeof(double)'
  else
    cat > conftest.$ac_ext <<EOF
! #line 8265 "configure"
  #include "confdefs.h"
  #include <stdio.h>
  struct { char filler; double field; } mystruct;
***************
*** 8231,8237 ****
    exit(0);
  }
  EOF
! if { (eval echo configure:8235: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} &&
(./conftest;exit) 2>/dev/null 
  then
    pgac_cv_alignof_double=`cat conftestval`
  else
--- 8273,8279 ----
    exit(0);
  }
  EOF
! if { (eval echo configure:8277: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} &&
(./conftest;exit) 2>/dev/null 
  then
    pgac_cv_alignof_double=`cat conftestval`
  else
***************
*** 8281,8292 ****
  #endif"

  echo $ac_n "checking for int8""... $ac_c" 1>&6
! echo "configure:8285: checking for int8" >&5
  if eval "test \"`echo '$''{'pgac_cv_have_int8'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 8290 "configure"
  #include "confdefs.h"
  $pgac_type_includes
  int main() {
--- 8323,8334 ----
  #endif"

  echo $ac_n "checking for int8""... $ac_c" 1>&6
! echo "configure:8327: checking for int8" >&5
  if eval "test \"`echo '$''{'pgac_cv_have_int8'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 8332 "configure"
  #include "confdefs.h"
  $pgac_type_includes
  int main() {
***************
*** 8296,8302 ****
    return 0;
  ; return 0; }
  EOF
! if { (eval echo configure:8300: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    pgac_cv_have_int8=yes
  else
--- 8338,8344 ----
    return 0;
  ; return 0; }
  EOF
! if { (eval echo configure:8342: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    pgac_cv_have_int8=yes
  else
***************
*** 8317,8328 ****
    fi

  echo $ac_n "checking for uint8""... $ac_c" 1>&6
! echo "configure:8321: checking for uint8" >&5
  if eval "test \"`echo '$''{'pgac_cv_have_uint8'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 8326 "configure"
  #include "confdefs.h"
  $pgac_type_includes
  int main() {
--- 8359,8370 ----
    fi

  echo $ac_n "checking for uint8""... $ac_c" 1>&6
! echo "configure:8363: checking for uint8" >&5
  if eval "test \"`echo '$''{'pgac_cv_have_uint8'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 8368 "configure"
  #include "confdefs.h"
  $pgac_type_includes
  int main() {
***************
*** 8332,8338 ****
    return 0;
  ; return 0; }
  EOF
! if { (eval echo configure:8336: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    pgac_cv_have_uint8=yes
  else
--- 8374,8380 ----
    return 0;
  ; return 0; }
  EOF
! if { (eval echo configure:8378: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    pgac_cv_have_uint8=yes
  else
***************
*** 8353,8364 ****
    fi

  echo $ac_n "checking for int64""... $ac_c" 1>&6
! echo "configure:8357: checking for int64" >&5
  if eval "test \"`echo '$''{'pgac_cv_have_int64'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 8362 "configure"
  #include "confdefs.h"
  $pgac_type_includes
  int main() {
--- 8395,8406 ----
    fi

  echo $ac_n "checking for int64""... $ac_c" 1>&6
! echo "configure:8399: checking for int64" >&5
  if eval "test \"`echo '$''{'pgac_cv_have_int64'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 8404 "configure"
  #include "confdefs.h"
  $pgac_type_includes
  int main() {
***************
*** 8368,8374 ****
    return 0;
  ; return 0; }
  EOF
! if { (eval echo configure:8372: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    pgac_cv_have_int64=yes
  else
--- 8410,8416 ----
    return 0;
  ; return 0; }
  EOF
! if { (eval echo configure:8414: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    pgac_cv_have_int64=yes
  else
***************
*** 8389,8400 ****
    fi

  echo $ac_n "checking for uint64""... $ac_c" 1>&6
! echo "configure:8393: checking for uint64" >&5
  if eval "test \"`echo '$''{'pgac_cv_have_uint64'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 8398 "configure"
  #include "confdefs.h"
  $pgac_type_includes
  int main() {
--- 8431,8442 ----
    fi

  echo $ac_n "checking for uint64""... $ac_c" 1>&6
! echo "configure:8435: checking for uint64" >&5
  if eval "test \"`echo '$''{'pgac_cv_have_uint64'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 8440 "configure"
  #include "confdefs.h"
  $pgac_type_includes
  int main() {
***************
*** 8404,8410 ****
    return 0;
  ; return 0; }
  EOF
! if { (eval echo configure:8408: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    pgac_cv_have_uint64=yes
  else
--- 8446,8452 ----
    return 0;
  ; return 0; }
  EOF
! if { (eval echo configure:8450: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    pgac_cv_have_uint64=yes
  else
***************
*** 8425,8436 ****
    fi

  echo $ac_n "checking for sig_atomic_t""... $ac_c" 1>&6
! echo "configure:8429: checking for sig_atomic_t" >&5
  if eval "test \"`echo '$''{'pgac_cv_have_sig_atomic_t'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 8434 "configure"
  #include "confdefs.h"
  $pgac_type_includes
  int main() {
--- 8467,8478 ----
    fi

  echo $ac_n "checking for sig_atomic_t""... $ac_c" 1>&6
! echo "configure:8471: checking for sig_atomic_t" >&5
  if eval "test \"`echo '$''{'pgac_cv_have_sig_atomic_t'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 8476 "configure"
  #include "confdefs.h"
  $pgac_type_includes
  int main() {
***************
*** 8440,8446 ****
    return 0;
  ; return 0; }
  EOF
! if { (eval echo configure:8444: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    pgac_cv_have_sig_atomic_t=yes
  else
--- 8482,8488 ----
    return 0;
  ; return 0; }
  EOF
! if { (eval echo configure:8486: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    pgac_cv_have_sig_atomic_t=yes
  else
***************
*** 8463,8474 ****


  echo $ac_n "checking for POSIX signal interface""... $ac_c" 1>&6
! echo "configure:8467: checking for POSIX signal interface" >&5
  if eval "test \"`echo '$''{'pgac_cv_func_posix_signals'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 8472 "configure"
  #include "confdefs.h"
  #include <signal.h>

--- 8505,8516 ----


  echo $ac_n "checking for POSIX signal interface""... $ac_c" 1>&6
! echo "configure:8509: checking for POSIX signal interface" >&5
  if eval "test \"`echo '$''{'pgac_cv_func_posix_signals'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 8514 "configure"
  #include "confdefs.h"
  #include <signal.h>

***************
*** 8479,8485 ****
  sigaction(0, &act, &oact);
  ; return 0; }
  EOF
! if { (eval echo configure:8483: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    pgac_cv_func_posix_signals=yes
  else
--- 8521,8527 ----
  sigaction(0, &act, &oact);
  ; return 0; }
  EOF
! if { (eval echo configure:8525: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    pgac_cv_func_posix_signals=yes
  else
***************
*** 8509,8515 ****
  # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:8513: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_path_TCLSH'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
--- 8551,8557 ----
  # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:8555: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_path_TCLSH'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
***************
*** 8545,8551 ****
  done

  echo $ac_n "checking for tclConfig.sh""... $ac_c" 1>&6
! echo "configure:8549: checking for tclConfig.sh" >&5
  # Let user override test
  if test -z "$TCL_CONFIG_SH"; then
      pgac_test_dirs="$with_tclconfig"
--- 8587,8593 ----
  done

  echo $ac_n "checking for tclConfig.sh""... $ac_c" 1>&6
! echo "configure:8591: checking for tclConfig.sh" >&5
  # Let user override test
  if test -z "$TCL_CONFIG_SH"; then
      pgac_test_dirs="$with_tclconfig"
***************
*** 8578,8584 ****
  # Check for Tk configuration script tkConfig.sh
  if test "$with_tk" = yes; then
      echo $ac_n "checking for tkConfig.sh""... $ac_c" 1>&6
! echo "configure:8582: checking for tkConfig.sh" >&5
  # Let user override test
  if test -z "$TK_CONFIG_SH"; then
      pgac_test_dirs="$with_tkconfig $with_tclconfig"
--- 8620,8626 ----
  # Check for Tk configuration script tkConfig.sh
  if test "$with_tk" = yes; then
      echo $ac_n "checking for tkConfig.sh""... $ac_c" 1>&6
! echo "configure:8624: checking for tkConfig.sh" >&5
  # Let user override test
  if test -z "$TK_CONFIG_SH"; then
      pgac_test_dirs="$with_tkconfig $with_tclconfig"
***************
*** 8617,8623 ****
  # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:8621: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_NSGMLS'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
--- 8659,8665 ----
  # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:8663: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_NSGMLS'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
***************
*** 8653,8659 ****
  # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:8657: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_JADE'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
--- 8695,8701 ----
  # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:8699: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_JADE'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
***************
*** 8684,8690 ****


  echo $ac_n "checking for DocBook V3.1""... $ac_c" 1>&6
! echo "configure:8688: checking for DocBook V3.1" >&5
  if eval "test \"`echo '$''{'pgac_cv_check_docbook'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
--- 8726,8732 ----


  echo $ac_n "checking for DocBook V3.1""... $ac_c" 1>&6
! echo "configure:8730: checking for DocBook V3.1" >&5
  if eval "test \"`echo '$''{'pgac_cv_check_docbook'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
***************
*** 8717,8723 ****


    echo $ac_n "checking for DocBook stylesheets""... $ac_c" 1>&6
! echo "configure:8721: checking for DocBook stylesheets" >&5
  if eval "test \"`echo '$''{'pgac_cv_path_stylesheets'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
--- 8759,8765 ----


    echo $ac_n "checking for DocBook stylesheets""... $ac_c" 1>&6
! echo "configure:8763: checking for DocBook stylesheets" >&5
  if eval "test \"`echo '$''{'pgac_cv_path_stylesheets'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
***************
*** 8756,8762 ****
  # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:8760: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_SGMLSPL'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
--- 8798,8804 ----
  # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:8802: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_SGMLSPL'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
***************
*** 9011,9016 ****
--- 9053,9059 ----
  s%@MSGMERGE@%$MSGMERGE%g
  s%@XGETTEXT@%$XGETTEXT%g
  s%@localedir@%$localedir%g
+ s%@MEMCMP@%$MEMCMP%g
  s%@SNPRINTF@%$SNPRINTF%g
  s%@ISINF@%$ISINF%g
  s%@GETRUSAGE@%$GETRUSAGE%g

/*-------------------------------------------------------------------------
 *
 * memcmp.c
 *      compares memory bytes
 *
 * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
 * Portions Copyright (c) 1994, Regents of the University of California
 *
 *
 * IDENTIFICATION
 *      $Header: /cvsroot/pgsql/src/utils/memcmp.c,v 1.8 2001/01/24 19:43:33 momjian Exp $
 *
 * This file was taken from NetBSD and is used by SunOS because memcmp
 * on that platform does not properly compare negative bytes.
 *
 *-------------------------------------------------------------------------
 */

#include <string.h>

/*
 * Compare memory regions.
 */
int
memcmp(const void *s1, const void *s2, size_t n)
{
    if (n != 0) {
        const unsigned char *p1 = s1, *p2 = s2;

        do {
            if (*p1++ != *p2++)
                return (*--p1 - *--p2);
        } while (--n != 0);
    }
    return 0;
}

pgsql-patches by date:

Previous
From: Brent Verner
Date:
Subject: Re: system catalog relation of a table and a serial sequence
Next
From: Bruce Momjian
Date:
Subject: SunOS patch for memcmp()