gcl.git - GNU Common Lisp

diff --git a/gcl/configure b/gcl/configure
index 3a77f1d81..af8f815ac 100755
--- a/gcl/configure
+++ b/gcl/configure

@@ -4621,13 +4621,19 @@ fi

done

-ac_fn_c_check_header_mongrel "$LINENO" "malloc/malloc.h" "ac_cv_header_malloc_malloc_h" "$ac_includes_default"

+for ac_header in malloc/malloc.h

+do :

+ ac_fn_c_check_header_mongrel "$LINENO" "malloc/malloc.h" "ac_cv_header_malloc_malloc_h" "$ac_includes_default"

if test "x$ac_cv_header_malloc_malloc_h" = xyes; then :

+ cat >>confdefs.h <<_ACEOF

+#define HAVE_MALLOC_MALLOC_H 1

+_ACEOF

else

as_fn_error $? "need malloc.h on macosx" "$LINENO" 5

fi

+done

ac_fn_c_check_member "$LINENO" "struct _malloc_zone_t" "memalign" "ac_cv_member_struct__malloc_zone_t_memalign" "

#include <malloc/malloc.h>

@@ -4648,9 +4654,14 @@ esac

# sysconf

-ac_fn_c_check_header_mongrel "$LINENO" "unistd.h" "ac_cv_header_unistd_h" "$ac_includes_default"

+for ac_header in unistd.h

+do :

+ ac_fn_c_check_header_mongrel "$LINENO" "unistd.h" "ac_cv_header_unistd_h" "$ac_includes_default"

if test "x$ac_cv_header_unistd_h" = xyes; then :

- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysconf in -lc" >&5

+ cat >>confdefs.h <<_ACEOF

+#define HAVE_UNISTD_H 1

+_ACEOF

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysconf in -lc" >&5

$as_echo_n "checking for sysconf in -lc... " >&6; }

if ${ac_cv_lib_c_sysconf+:} false; then :

$as_echo_n "(cached) " >&6

@@ -4770,6 +4781,7 @@ fi

fi

+done

@@ -4786,9 +4798,14 @@ if test $use_gmp = yes ; then

PATCHED_SYMBOLS=""

if test "$enable_dynsysgmp" = "yes" ; then

- ac_fn_c_check_header_mongrel "$LINENO" "gmp.h" "ac_cv_header_gmp_h" "$ac_includes_default"

+ for ac_header in gmp.h

+do :

+ ac_fn_c_check_header_mongrel "$LINENO" "gmp.h" "ac_cv_header_gmp_h" "$ac_includes_default"

if test "x$ac_cv_header_gmp_h" = xyes; then :

- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __gmpz_init in -lgmp" >&5

+ cat >>confdefs.h <<_ACEOF

+#define HAVE_GMP_H 1

+_ACEOF

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __gmpz_init in -lgmp" >&5

$as_echo_n "checking for __gmpz_init in -lgmp... " >&6; }

if ${ac_cv_lib_gmp___gmpz_init+:} false; then :

$as_echo_n "(cached) " >&6

@@ -4870,6 +4887,7 @@ else

echo "Cannot use dynamic gmp lib"

fi

+done

fi

@@ -5383,9 +5401,14 @@ fi

fi

if test "$enable_statsysbfd" = "yes" || test "$enable_dynsysbfd" = "yes" ; then

- ac_fn_c_check_header_mongrel "$LINENO" "bfd.h" "ac_cv_header_bfd_h" "$ac_includes_default"

+ for ac_header in bfd.h

+do :

+ ac_fn_c_check_header_mongrel "$LINENO" "bfd.h" "ac_cv_header_bfd_h" "$ac_includes_default"

if test "x$ac_cv_header_bfd_h" = xyes; then :

- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bfd_init in -lbfd" >&5

+ cat >>confdefs.h <<_ACEOF

+#define HAVE_BFD_H 1

+_ACEOF

+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bfd_init in -lbfd" >&5

$as_echo_n "checking for bfd_init in -lbfd... " >&6; }

if ${ac_cv_lib_bfd_bfd_init+:} false; then :

$as_echo_n "(cached) " >&6

@@ -5472,6 +5495,7 @@ fi

fi

+done

$as_echo "#define HAVE_LIBBFD 1" >>confdefs.h

@@ -5656,7 +5680,7 @@ if test "$enable_locbfd" = "yes" ; then

# check for gettext. It is part of glibc, but others

# need GNU gettext separately.

-# AC_CHECK_HEADER(libintl.h, true,

+# AC_CHECK_HEADERS(libintl.h, true,

# AC_MSG_ERROR(libintl.h (gettext) not found))

# AC_SEARCH_LIBS(dgettext, intl, true, AC_MSG_ERROR(gettext library not found))

@@ -6067,7 +6091,7 @@ fi

if test "$HAVE_SBRK" = "1" ; then

-# AC_CHECK_HEADER(sys/personality.h, true,

+# AC_CHECK_HEADERS(sys/personality.h, true,

# AC_MSG_RESULT(sys/personality.h not found))

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ADDR_NO_RANDOMIZE constant" >&5

diff --git a/gcl/configure.in b/gcl/configure.in
index cd28d6212..da101d3da 100644
--- a/gcl/configure.in
+++ b/gcl/configure.in

@@ -655,7 +655,7 @@ fi

case $use in

*macosx)

- AC_CHECK_HEADER(malloc/malloc.h,,[AC_MSG_ERROR([need malloc.h on macosx])])

+ AC_CHECK_HEADERS(malloc/malloc.h,,[AC_MSG_ERROR([need malloc.h on macosx])])

AC_CHECK_MEMBER([struct _malloc_zone_t.memalign],

AC_DEFINE(HAVE_MALLOC_ZONE_MEMALIGN,1,[memalign element present]), [],

[

@@ -670,7 +670,7 @@ esac

# sysconf

-AC_CHECK_HEADER(unistd.h,

+AC_CHECK_HEADERS(unistd.h,

AC_CHECK_LIB(c,sysconf,

AC_MSG_CHECKING("for _SC_CLK_TCK")

AC_TRY_RUN([#include <unistd.h>

@@ -701,7 +701,7 @@ if test $use_gmp = yes ; then

PATCHED_SYMBOLS=""

if test "$enable_dynsysgmp" = "yes" ; then

- AC_CHECK_HEADER(gmp.h,

+ AC_CHECK_HEADERS(gmp.h,

AC_CHECK_LIB(gmp,__gmpz_init,

AC_MSG_CHECKING("for external gmp version")

AC_TRY_RUN([#include <gmp.h>

@@ -903,7 +903,7 @@ dnl TLIBS="$TLIBS -rdynamic"

fi

if test "$enable_statsysbfd" = "yes" || test "$enable_dynsysbfd" = "yes" ; then

- AC_CHECK_HEADER(bfd.h,

+ AC_CHECK_HEADERS(bfd.h,

AC_CHECK_LIB(bfd,bfd_init,

#

# Old binutils appear to need CONST defined to const

@@ -993,7 +993,7 @@ if test "$enable_locbfd" = "yes" ; then

# check for gettext. It is part of glibc, but others

# need GNU gettext separately.

-# AC_CHECK_HEADER(libintl.h, true,

+# AC_CHECK_HEADERS(libintl.h, true,

# AC_MSG_ERROR(libintl.h (gettext) not found))

# AC_SEARCH_LIBS(dgettext, intl, true, AC_MSG_ERROR(gettext library not found))

@@ -1157,7 +1157,7 @@ fi

if test "$HAVE_SBRK" = "1" ; then

-# AC_CHECK_HEADER(sys/personality.h, true,

+# AC_CHECK_HEADERS(sys/personality.h, true,

# AC_MSG_RESULT(sys/personality.h not found))

AC_MSG_CHECKING([for ADDR_NO_RANDOMIZE constant])

diff --git a/gcl/h/gclincl.h.in b/gcl/h/gclincl.h.in
index f7d9bac39..0dc44f00c 100644
--- a/gcl/h/gclincl.h.in
+++ b/gcl/h/gclincl.h.in

@@ -267,6 +267,9 @@ SGC is enabled. */

/* Define to 1 if you have the <asm/signal.h> header file. */

#undef HAVE_ASM_SIGNAL_H

+/* Define to 1 if you have the <bfd.h> header file. */

+#undef HAVE_BFD_H

+

/* Define to 1 if you have the <elf_abi.h> header file. */

#undef HAVE_ELF_ABI_H

@@ -285,6 +288,9 @@ SGC is enabled. */

/* Define to 1 if you have the `getwd' function. */

#undef HAVE_GETWD

+/* Define to 1 if you have the <gmp.h> header file. */

+#undef HAVE_GMP_H

+

/* Have ieeefp fpclass function */

#undef HAVE_IEEEFP

@@ -300,6 +306,9 @@ SGC is enabled. */

/* Define to 1 if you have the <japi.h> header file. */

#undef HAVE_JAPI_H

+/* Define to 1 if you have the <malloc/malloc.h> header file. */

+#undef HAVE_MALLOC_MALLOC_H

+

/* memalign element present */

#undef HAVE_MALLOC_ZONE_MEMALIGN

@@ -312,9 +321,6 @@ SGC is enabled. */

/* Define to 1 if you have the <readline/readline.h> header file. */

#undef HAVE_READLINE_READLINE_H

-/* Define to 1 if you have the <rpc/rpc.h> header file. */

-#undef HAVE_RPC_RPC_H

-

/* Define to 1 if you have the <stdint.h> header file. */

#undef HAVE_STDINT_H