mirror of
https://git.savannah.gnu.org/git/guile.git
synced 2025-06-17 17:20:29 +02:00
(struct stat st_blocks): Change AC_STRUCT_ST_BLOCKS to
a plain AC_CHECK_MEMBERS, we don't want AC_LIBOBJ(fileblocks) which the former gives. Remove the commented-out code that was to have munged fileblocks out of LIBOBJS. This fixes mingw, where the lack of st_blocks and absense of the fileblocks.c replacement caused build failure. Reported by "The Senator". (struct stat st_rdev, st_blksize): Combine into a single AC_CHECK_MEMBERS.
This commit is contained in:
parent
7fe93be20b
commit
de1f549a0a
1 changed files with 10 additions and 13 deletions
23
configure.in
23
configure.in
|
@ -920,10 +920,16 @@ then
|
||||||
AC_ERROR([No native alloca found.])
|
AC_ERROR([No native alloca found.])
|
||||||
fi
|
fi
|
||||||
|
|
||||||
AC_CHECK_MEMBERS([struct stat.st_rdev])
|
# Reasons for checking:
|
||||||
AC_CHECK_MEMBERS([struct stat.st_blksize])
|
#
|
||||||
|
# st_rdev
|
||||||
AC_STRUCT_ST_BLOCKS
|
# st_blksize
|
||||||
|
# st_blocks not in mingw
|
||||||
|
#
|
||||||
|
# Note AC_STRUCT_ST_BLOCKS is not used here because we don't want the
|
||||||
|
# AC_LIBOBJ(fileblocks) replacement which that macro gives.
|
||||||
|
#
|
||||||
|
AC_CHECK_MEMBERS([struct stat.st_rdev, struct stat.st_blksize, struct stat.st_blocks])
|
||||||
|
|
||||||
AC_CACHE_CHECK([for S_ISLNK in sys/stat.h], ac_cv_macro_S_ISLNK,
|
AC_CACHE_CHECK([for S_ISLNK in sys/stat.h], ac_cv_macro_S_ISLNK,
|
||||||
[AC_TRY_CPP([#include <sys/stat.h>
|
[AC_TRY_CPP([#include <sys/stat.h>
|
||||||
|
@ -1138,15 +1144,6 @@ case "$GCC" in
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
## NOTE the code below sets LIBOBJS directly and so is now forbidden
|
|
||||||
## -- I'm disabling it for now in the hopes that the newer autoconf
|
|
||||||
## will DTRT -- if not, we need to fix up the sed command to match the
|
|
||||||
## others...
|
|
||||||
##
|
|
||||||
## Remove fileblocks.o from the object list. This file gets added by
|
|
||||||
## the Autoconf macro AC_STRUCT_ST_BLOCKS. But there is no need.
|
|
||||||
#LIBOBJS="`echo ${LIBOBJS} | sed 's/fileblocks\.o//g'`"
|
|
||||||
|
|
||||||
## If we're creating a shared library (using libtool!), then we'll
|
## If we're creating a shared library (using libtool!), then we'll
|
||||||
## need to generate a list of .lo files corresponding to the .o files
|
## need to generate a list of .lo files corresponding to the .o files
|
||||||
## given in LIBOBJS. We'll call it LIBLOBJS.
|
## given in LIBOBJS. We'll call it LIBLOBJS.
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue