diff options
| -rw-r--r-- | extension/ChangeLog | 3 | ||||
| -rw-r--r-- | extension/configh.in | 7 | ||||
| -rwxr-xr-x | extension/configure | 70 | ||||
| -rw-r--r-- | extension/configure.ac | 2 |
4 files changed, 82 insertions, 0 deletions
diff --git a/extension/ChangeLog b/extension/ChangeLog index bd16f10f..4144bf50 100644 --- a/extension/ChangeLog +++ b/extension/ChangeLog @@ -3,6 +3,9 @@ * filefuncs.c (fill_stat_array): For _WIN32 use a blocksize of 4096 for the "blksize" element, per Eli Zaretskii. + * configure.ac [AC_STRUCT_ST_BLKSIZE]: Add call that was missing. + ARGH!!!! + 2013-05-14 Eli Zaretskii <eliz@gnu.org> * rwarray.c [__MINGW32__]: Include winsock2.h instead of diff --git a/extension/configh.in b/extension/configh.in index 9162ce4d..cc84f4d0 100644 --- a/extension/configh.in +++ b/extension/configh.in @@ -87,6 +87,13 @@ /* Define to 1 if you have the <string.h> header file. */ #undef HAVE_STRING_H +/* Define to 1 if `st_blksize' is a member of `struct stat'. */ +#undef HAVE_STRUCT_STAT_ST_BLKSIZE + +/* Define to 1 if your `struct stat' has `st_blksize'. Deprecated, use + `HAVE_STRUCT_STAT_ST_BLKSIZE' instead. */ +#undef HAVE_ST_BLKSIZE + /* Define to 1 if you have the <sys/select.h> header file. */ #undef HAVE_SYS_SELECT_H diff --git a/extension/configure b/extension/configure index f848b9be..23b050d3 100755 --- a/extension/configure +++ b/extension/configure @@ -1817,6 +1817,63 @@ fi } # ac_fn_c_try_link +# ac_fn_c_check_member LINENO AGGR MEMBER VAR INCLUDES +# ---------------------------------------------------- +# Tries to find if the field MEMBER exists in type AGGR, after including +# INCLUDES, setting cache variable VAR accordingly. +ac_fn_c_check_member () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2.$3" >&5 +$as_echo_n "checking for $2.$3... " >&6; } +if eval \${$4+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$5 +int +main () +{ +static $2 ac_aggr; +if (ac_aggr.$3) +return 0; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + eval "$4=yes" +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$5 +int +main () +{ +static $2 ac_aggr; +if (sizeof ac_aggr.$3) +return 0; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + eval "$4=yes" +else + eval "$4=no" +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +eval ac_res=\$$4 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + +} # ac_fn_c_check_member + # ac_fn_c_check_func LINENO FUNC VAR # ---------------------------------- # Tests whether FUNC exists, setting the cache variable VAR accordingly @@ -6382,6 +6439,19 @@ $as_echo "#define HAVE_DCGETTEXT 1" >>confdefs.h +ac_fn_c_check_member "$LINENO" "struct stat" "st_blksize" "ac_cv_member_struct_stat_st_blksize" "$ac_includes_default" +if test "x$ac_cv_member_struct_stat_st_blksize" = xyes; then : + +cat >>confdefs.h <<_ACEOF +#define HAVE_STRUCT_STAT_ST_BLKSIZE 1 +_ACEOF + + +$as_echo "#define HAVE_ST_BLKSIZE 1" >>confdefs.h + +fi + + if test -n "$ac_tool_prefix"; then for ac_prog in ar lib "link -lib" diff --git a/extension/configure.ac b/extension/configure.ac index 53ed588e..40f29681 100644 --- a/extension/configure.ac +++ b/extension/configure.ac @@ -38,6 +38,8 @@ AM_INIT_AUTOMAKE([-Wall -Werror]) AM_GNU_GETTEXT([external]) AM_GNU_GETTEXT_VERSION([0.18.1]) +dnl checks for structure members +AC_STRUCT_ST_BLKSIZE AM_PROG_AR AC_SYS_LARGEFILE |