} # ac_fn_c_check_func
++<<<<<<< TREE
++=======
+ # 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_type LINENO TYPE VAR INCLUDES
+ # -------------------------------------------
+ # Tests whether TYPE exists after having included INCLUDES, setting cache
+ # variable VAR accordingly.
+ ac_fn_c_check_type ()
+ {
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+ $as_echo_n "checking for $2... " >&6; }
+ if eval \${$3+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ eval "$3=no"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+ $4
+ int
+ main ()
+ {
+ if (sizeof ($2))
+ return 0;
+ ;
+ return 0;
+ }
+ _ACEOF
+ if ac_fn_c_try_compile "$LINENO"; then :
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+ $4
+ int
+ main ()
+ {
+ if (sizeof (($2)))
+ return 0;
+ ;
+ return 0;
+ }
+ _ACEOF
+ if ac_fn_c_try_compile "$LINENO"; then :
+
+ else
+ eval "$3=yes"
+ 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=\$$3
+ { $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_type
+
++>>>>>>> MERGE-SOURCE
# ac_fn_c_compute_int LINENO EXPR VAR INCLUDES
# --------------------------------------------
# Tries to find the compile-time value of EXPR in a program that includes
# Code from module lstat:
# Code from module mktime:
# Code from module multiarch:
++<<<<<<< TREE
++=======
+ # Code from module nocrash:
+ # Code from module pthread_sigmask:
++>>>>>>> MERGE-SOURCE
# Code from module readlink:
++<<<<<<< TREE
++=======
+ # Code from module signal:
+ # Code from module sigprocmask:
+ # Code from module snippet/_Noreturn:
+ # Code from module snippet/arg-nonnull:
+ # Code from module snippet/c++defs:
+ # Code from module snippet/warn-on-use:
++>>>>>>> MERGE-SOURCE
# Code from module socklen:
# Code from module ssize_t:
# Code from module stat:
++<<<<<<< TREE
++=======
+ crt_files=
+
+ for file in x $LIB_STANDARD $START_FILES; do
+ case "$file" in
+ *CRT_DIR*) crt_files="$crt_files `echo $file | sed -e 's|.*/||'`" ;;
+ esac
+ done
+
+ if test "x$crt_files" != x; then
+
+ ## If user specified a crt-dir, use that unconditionally.
+ crt_gcc=no
+
+ if test "X$CRT_DIR" = "X"; then
+
+ CRT_DIR=/usr/lib # default
+
+ case "$canonical" in
+ x86_64-*-linux-gnu* | s390x-*-linux-gnu*)
+ ## On x86-64 and s390x GNU/Linux distributions, the standard library
+ ## can be in a variety of places. We only try /usr/lib64 and /usr/lib.
+ ## For anything else (eg /usr/lib32), it is up the user to specify
+ ## the location (bug#5655).
+ ## Test for crtn.o, not just the directory, because sometimes the
+ ## directory exists but does not have the relevant files (bug#1287).
+ ## FIXME better to test for binary compatibility somehow.
+ test -e /usr/lib64/crtn.o && CRT_DIR=/usr/lib64
+ ;;
+
+ powerpc64-*-linux-gnu* | sparc64-*-linux-gnu*) CRT_DIR=/usr/lib64 ;;
+ esac
+
+ case "$opsys" in
+ hpux10-20) CRT_DIR=/lib ;;
+ esac
+
+ test "x${GCC}" = xyes && crt_gcc=yes
+
+ fi # CRT_DIR = ""
+
+ crt_missing=
+
+ for file in $crt_files; do
+
+ ## If we're using gcc, try to determine it automatically by asking
+ ## gcc. [If this doesn't work, CRT_DIR will remain at the
+ ## system-dependent default from above.]
+ if test $crt_gcc = yes && test ! -e $CRT_DIR/$file; then
+
+ crt_file=`$CC --print-file-name=$file 2>/dev/null`
+ case "$crt_file" in
+ */*)
+ CRT_DIR=`$as_dirname -- "$crt_file" ||
+ $as_expr X"$crt_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ X"$crt_file" : 'X\(//\)[^/]' \| \
+ X"$crt_file" : 'X\(//\)$' \| \
+ X"$crt_file" : 'X\(/\)' \| . 2>/dev/null ||
+ $as_echo X"$crt_file" |
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)[^/].*/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\).*/{
+ s//\1/
+ q
+ }
+ s/.*/./; q'`
+ ;;
+ esac
+ fi
+
+ crt_gcc=no
+
+ test -e $CRT_DIR/$file || crt_missing="$crt_missing $file"
+ done # $crt_files
+
+ test "x$crt_missing" = x || \
+ as_fn_error $? "Required file(s) not found:$crt_missing
+ Try using the --with-crt-dir option." "$LINENO" 5
+
+ fi # crt_files != ""
+
+
+
+
++>>>>>>> MERGE-SOURCE
fi
++<<<<<<< TREE
++=======
+ for ac_header in sys/socket.h
+ do :
+ ac_fn_c_check_header_mongrel "$LINENO" "sys/socket.h" "ac_cv_header_sys_socket_h" "$ac_includes_default"
+ if test "x$ac_cv_header_sys_socket_h" = xyes; then :
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_SYS_SOCKET_H 1
+ _ACEOF
+
+ fi
+
+ done
+
++>>>>>>> MERGE-SOURCE
for ac_header in net/if.h
do :
ac_fn_c_check_header_compile "$LINENO" "net/if.h" "ac_cv_header_net_if_h" "$ac_includes_default
done
++<<<<<<< TREE
++=======
+ for ac_header in ifaddrs.h
+ do :
+ ac_fn_c_check_header_compile "$LINENO" "ifaddrs.h" "ac_cv_header_ifaddrs_h" "$ac_includes_default
+ #if HAVE_SYS_SOCKET_H
+ #include <sys/socket.h>
+ #endif
+ "
+ if test "x$ac_cv_header_ifaddrs_h" = xyes; then :
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_IFADDRS_H 1
+ _ACEOF
+
+ fi
+
+ done
+
+ for ac_header in net/if_dl.h
+ do :
+ ac_fn_c_check_header_compile "$LINENO" "net/if_dl.h" "ac_cv_header_net_if_dl_h" "$ac_includes_default
+ #if HAVE_SYS_SOCKET_H
+ #include <sys/socket.h>
+ #endif
+ "
+ if test "x$ac_cv_header_net_if_dl_h" = xyes; then :
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_NET_IF_DL_H 1
+ _ACEOF
+
+ fi
+
+ done
+
+ for ac_func in getifaddrs freeifaddrs
+ do :
+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+ if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+ cat >>confdefs.h <<_ACEOF
+ #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+
+ fi
+ done
+
++>>>>>>> MERGE-SOURCE
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether struct tm is in sys/time.h or time.h" >&5
$as_echo_n "checking whether struct tm is in sys/time.h or time.h... " >&6; }
fi
++<<<<<<< TREE
++=======
+ ac_fn_c_check_member "$LINENO" "struct ifreq" "ifr_addr.sa_len" "ac_cv_member_struct_ifreq_ifr_addr_sa_len" "$ac_includes_default
+ #if HAVE_SYS_SOCKET_H
+ #include <sys/socket.h>
+ #endif
+ #if HAVE_NET_IF_H
+ #include <net/if.h>
+ #endif
+ "
+ if test "x$ac_cv_member_struct_ifreq_ifr_addr_sa_len" = xyes; then :
+
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_STRUCT_IFREQ_IFR_ADDR_SA_LEN 1
+ _ACEOF
+
+
+ fi
++>>>>>>> MERGE-SOURCE
fi
++<<<<<<< TREE
++=======
+ HAVE_GSETTINGS=no
+ if test "${HAVE_X11}" = "yes" && test "${with_gsettings}" = "yes"; then
+
+ succeeded=no
+
+ # Extract the first word of "pkg-config", so it can be a program name with args.
+ set dummy pkg-config; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+ if ${ac_cv_path_PKG_CONFIG+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ case $PKG_CONFIG in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ for as_dir in $PATH
+ do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+ done
+ IFS=$as_save_IFS
+
+ test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
+ ;;
+ esac
+ fi
+ PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+ if test -n "$PKG_CONFIG"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+ $as_echo "$PKG_CONFIG" >&6; }
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+
+
+
+ if test "$PKG_CONFIG" = "no" ; then
+ HAVE_GSETTINGS=no
+ else
+ PKG_CONFIG_MIN_VERSION=0.9.0
+ if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gio-2.0 >= 2.26" >&5
+ $as_echo_n "checking for gio-2.0 >= 2.26... " >&6; }
+
+ if $PKG_CONFIG --exists "gio-2.0 >= 2.26" 2>&5; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+ succeeded=yes
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking GSETTINGS_CFLAGS" >&5
+ $as_echo_n "checking GSETTINGS_CFLAGS... " >&6; }
+ GSETTINGS_CFLAGS=`$PKG_CONFIG --cflags "gio-2.0 >= 2.26"|sed -e 's,///*,/,g'`
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GSETTINGS_CFLAGS" >&5
+ $as_echo "$GSETTINGS_CFLAGS" >&6; }
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking GSETTINGS_LIBS" >&5
+ $as_echo_n "checking GSETTINGS_LIBS... " >&6; }
+ GSETTINGS_LIBS=`$PKG_CONFIG --libs "gio-2.0 >= 2.26"|sed -e 's,///*,/,g'`
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GSETTINGS_LIBS" >&5
+ $as_echo "$GSETTINGS_LIBS" >&6; }
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ GSETTINGS_CFLAGS=""
+ GSETTINGS_LIBS=""
+ ## If we have a custom action on failure, don't print errors, but
+ ## do set a variable so people can do so.
+ GSETTINGS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gio-2.0 >= 2.26"`
+
+ fi
+
+
+
+ else
+ echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
+ echo "*** See http://www.freedesktop.org/software/pkgconfig"
+ fi
+ fi
+
+ if test $succeeded = yes; then
+ HAVE_GSETTINGS=yes
+ else
+ HAVE_GSETTINGS=no
+ fi
+
+ if test "$HAVE_GSETTINGS" = "yes"; then
+
+ $as_echo "#define HAVE_GSETTINGS 1" >>confdefs.h
+
+ SETTINGS_CFLAGS="$GSETTINGS_CFLAGS"
+ SETTINGS_LIBS="$GSETTINGS_LIBS"
+ fi
+ fi
+
++>>>>>>> MERGE-SOURCE
HAVE_GCONF=no
if test "${HAVE_X11}" = "yes" && test "${with_gconf}" = "yes"; then
$as_echo "#define HAVE_GCONF 1" >>confdefs.h
- SETTINGS_CFLAGS="$SETTINGS_CFLAGS $GCONF_CFLAGS"
- SETTINGS_LIBS="$SETTINGS_LIBS $GCONF_LIBS"
- fi
-fi
-
-if test "$HAVE_GSETTINGS" = "yes" || test "$HAVE_GCONF" = "yes"; then
- SAVE_CFLAGS="$CFLAGS"
- SAVE_LDFLAGS="$LDFLAGS"
- CFLAGS="$SETTINGS_CFLAGS $CFLAGS"
- LDFLAGS="$SETTINGS_LIBS $LDFLAGS"
- for ac_func in g_type_init
+ for ac_func in g_type_init
do :
ac_fn_c_check_func "$LINENO" "g_type_init" "ac_cv_func_g_type_init"
- if test "x$ac_cv_func_g_type_init" = x""yes; then :
+ if test "x$ac_cv_func_g_type_init" = xyes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_G_TYPE_INIT 1
_ACEOF
++<<<<<<< TREE
++=======
+ GNULIB_PTHREAD_SIGMASK=0;
+ GNULIB_SIGNAL_H_SIGPIPE=0;
+ GNULIB_SIGPROCMASK=0;
+ GNULIB_SIGACTION=0;
+ HAVE_POSIX_SIGNALBLOCKING=1;
+ HAVE_PTHREAD_SIGMASK=1;
+ HAVE_SIGSET_T=1;
+ HAVE_SIGINFO_T=1;
+ HAVE_SIGACTION=1;
+ HAVE_STRUCT_SIGACTION_SA_SIGACTION=1;
+
+ HAVE_TYPE_VOLATILE_SIG_ATOMIC_T=1;
+
+ HAVE_SIGHANDLER_T=1;
+ REPLACE_PTHREAD_SIGMASK=0;
+
+
+
+
+ ac_fn_c_check_type "$LINENO" "sigset_t" "ac_cv_type_sigset_t" "
+ #include <signal.h>
+ /* Mingw defines sigset_t not in <signal.h>, but in <sys/types.h>. */
+ #include <sys/types.h>
+
+ "
+ if test "x$ac_cv_type_sigset_t" = xyes; then :
+
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_SIGSET_T 1
+ _ACEOF
+
+ gl_cv_type_sigset_t=yes
+ else
+ gl_cv_type_sigset_t=no
+ fi
+
+ if test $gl_cv_type_sigset_t != yes; then
+ HAVE_SIGSET_T=0
+ fi
+
+
+
++>>>>>>> MERGE-SOURCE
if test $ac_cv_header_sys_socket_h = no; then
++<<<<<<< TREE
++=======
+
+
+ ac_fn_c_check_decl "$LINENO" "strtoimax" "ac_cv_have_decl_strtoimax" "$ac_includes_default"
+ if test "x$ac_cv_have_decl_strtoimax" = xyes; then :
+ ac_have_decl=1
+ else
+ ac_have_decl=0
+ fi
+
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_DECL_STRTOIMAX $ac_have_decl
+ _ACEOF
+
+
+
++>>>>>>> MERGE-SOURCE
ac_fn_c_check_decl "$LINENO" "strtoumax" "ac_cv_have_decl_strtoumax" "$ac_includes_default"
- if test "x$ac_cv_have_decl_strtoumax" = x""yes; then :
+ if test "x$ac_cv_have_decl_strtoumax" = xyes; then :
ac_have_decl=1
else
ac_have_decl=0
}
_ACEOF
if ac_fn_c_try_run "$LINENO"; then :
- gl_cv_func_working_mktime=yes
+ gl_cv_func_working_mktime=yes
+ else
+ gl_cv_func_working_mktime=no
+ fi
+ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
+ fi
+
+
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_working_mktime" >&5
+ $as_echo "$gl_cv_func_working_mktime" >&6; }
+
+ if test $gl_cv_func_working_mktime = no; then
+ REPLACE_MKTIME=1
+ else
+ REPLACE_MKTIME=0
+ fi
+
+ if test $REPLACE_MKTIME = 1; then
+
+
+
+
+
+
+
+
+ gl_LIBOBJS="$gl_LIBOBJS mktime.$ac_objext"
+
+
+
+
+ fi
+
+
+
+
+
+ GNULIB_MKTIME=1
+
+
+
+
+
+
+
+
++<<<<<<< TREE
++=======
+ LIB_PTHREAD_SIGMASK=
+
+
+ if test $ac_cv_func_pthread_sigmask = yes; then
+ :
+ else
+ HAVE_PTHREAD_SIGMASK=0
+ REPLACE_PTHREAD_SIGMASK=1
+ fi
+
+
+
+
+ if test $HAVE_PTHREAD_SIGMASK = 1; then
+
+
+ if test -z "$LIB_PTHREAD_SIGMASK"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether pthread_sigmask works without -lpthread" >&5
+ $as_echo_n "checking whether pthread_sigmask works without -lpthread... " >&6; }
+ if ${gl_cv_func_pthread_sigmask_in_libc_works+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+
+ if test "$cross_compiling" = yes; then :
+
+ case "$host_os" in
+ freebsd* | hpux* | solaris | solaris2.[2-9]*)
+ gl_cv_func_pthread_sigmask_in_libc_works="guessing no";;
+ *)
+ gl_cv_func_pthread_sigmask_in_libc_works="guessing yes";;
+ esac
+
+ else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+ #include <pthread.h>
+ #include <signal.h>
+ #include <stddef.h>
+ int main ()
+ {
+ sigset_t set;
+ sigemptyset (&set);
+ return pthread_sigmask (1729, &set, NULL) != 0;
+ }
+ _ACEOF
+ if ac_fn_c_try_run "$LINENO"; then :
+ gl_cv_func_pthread_sigmask_in_libc_works=no
+ else
+ gl_cv_func_pthread_sigmask_in_libc_works=yes
+ fi
+ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
+ fi
+
+
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_pthread_sigmask_in_libc_works" >&5
+ $as_echo "$gl_cv_func_pthread_sigmask_in_libc_works" >&6; }
+ case "$gl_cv_func_pthread_sigmask_in_libc_works" in
+ *no)
+ REPLACE_PTHREAD_SIGMASK=1
+
+ $as_echo "#define PTHREAD_SIGMASK_INEFFECTIVE 1" >>confdefs.h
+
+ ;;
+ esac
+ fi
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether pthread_sigmask returns error numbers" >&5
+ $as_echo_n "checking whether pthread_sigmask returns error numbers... " >&6; }
+ if ${gl_cv_func_pthread_sigmask_return_works+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+
+ gl_save_LIBS="$LIBS"
+ LIBS="$LIBS $LIB_PTHREAD_SIGMASK"
+ if test "$cross_compiling" = yes; then :
+ case "$host_os" in
+ cygwin*)
+ gl_cv_func_pthread_sigmask_return_works="guessing no";;
+ *)
+ gl_cv_func_pthread_sigmask_return_works="guessing yes";;
+ esac
+
+ else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+ #include <pthread.h>
+ #include <signal.h>
+ #include <stddef.h>
+ int main ()
+ {
+ sigset_t set;
+ sigemptyset (&set);
+ if (pthread_sigmask (1729, &set, NULL) == -1)
+ return 1;
+ return 0;
+ }
+ _ACEOF
+ if ac_fn_c_try_run "$LINENO"; then :
+ gl_cv_func_pthread_sigmask_return_works=yes
+ else
+ gl_cv_func_pthread_sigmask_return_works=no
+ fi
+ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
+ fi
+
+ LIBS="$gl_save_LIBS"
+
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_pthread_sigmask_return_works" >&5
+ $as_echo "$gl_cv_func_pthread_sigmask_return_works" >&6; }
+ case "$gl_cv_func_pthread_sigmask_return_works" in
+ *no)
+ REPLACE_PTHREAD_SIGMASK=1
+
+ $as_echo "#define PTHREAD_SIGMASK_FAILS_WITH_ERRNO 1" >>confdefs.h
+
+ ;;
+ esac
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether pthread_sigmask unblocks signals correctly" >&5
+ $as_echo_n "checking whether pthread_sigmask unblocks signals correctly... " >&6; }
+ if ${gl_cv_func_pthread_sigmask_unblock_works+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+
+ case "$host_os" in
+ irix*)
+ gl_cv_func_pthread_sigmask_unblock_works="guessing no";;
+ *)
+ gl_cv_func_pthread_sigmask_unblock_works="guessing yes";;
+ esac
+ gl_save_LIBS="$LIBS"
+ LIBS="$LIBS $LIBMULTITHREAD"
+ if test "$cross_compiling" = yes; then :
+ :
+ else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+ #include <pthread.h>
+ #include <signal.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <unistd.h>
+ static volatile int sigint_occurred;
+ static void
+ sigint_handler (int sig)
+ {
+ sigint_occurred++;
+ }
+ int main ()
+ {
+ sigset_t set;
+ int pid = getpid ();
+ char command[80];
+ signal (SIGINT, sigint_handler);
+ sigemptyset (&set);
+ sigaddset (&set, SIGINT);
+ if (!(pthread_sigmask (SIG_BLOCK, &set, NULL) == 0))
+ return 1;
+ sprintf (command, "sh -c 'sleep 1; kill -%d %d' &", SIGINT, pid);
+ if (!(system (command) == 0))
+ return 2;
+ sleep (2);
+ if (!(sigint_occurred == 0))
+ return 3;
+ if (!(pthread_sigmask (SIG_UNBLOCK, &set, NULL) == 0))
+ return 4;
+ if (!(sigint_occurred == 1)) /* This fails on IRIX. */
+ return 5;
+ return 0;
+ }
+ _ACEOF
+ if ac_fn_c_try_run "$LINENO"; then :
+ :
else
- gl_cv_func_working_mktime=no
+ gl_cv_func_pthread_sigmask_unblock_works=no
fi
rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
conftest.$ac_objext conftest.beam conftest.$ac_ext
++>>>>>>> MERGE-SOURCE
if test $ac_cv_func_readlink = no; then
HAVE_READLINK=0
++<<<<<<< TREE
++=======
+
+
+
+
+
+
+
+
+
+
+
+ if test $gl_cv_have_include_next = yes; then
+ gl_cv_next_signal_h='<'signal.h'>'
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <signal.h>" >&5
+ $as_echo_n "checking absolute name of <signal.h>... " >&6; }
+ if ${gl_cv_next_signal_h+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+ #include <signal.h>
+
+ _ACEOF
+ case "$host_os" in
+ aix*) gl_absname_cpp="$ac_cpp -C" ;;
+ *) gl_absname_cpp="$ac_cpp" ;;
+ esac
+ gl_cv_next_signal_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
+ sed -n '\#/signal.h#{
+ s#.*"\(.*/signal.h\)".*#\1#
+ s#^/[^/]#//&#
+ p
+ q
+ }'`'"'
+
+
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_signal_h" >&5
+ $as_echo "$gl_cv_next_signal_h" >&6; }
+ fi
+ NEXT_SIGNAL_H=$gl_cv_next_signal_h
+
+ if test $gl_cv_have_include_next = yes || test $gl_cv_have_include_next = buggy; then
+ # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include_next'
+ gl_next_as_first_directive='<'signal.h'>'
+ else
+ # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include'
+ gl_next_as_first_directive=$gl_cv_next_signal_h
+ fi
+ NEXT_AS_FIRST_DIRECTIVE_SIGNAL_H=$gl_next_as_first_directive
+
+
+
+
+
+ # AIX declares sig_atomic_t to already include volatile, and C89 compilers
+ # then choke on 'volatile sig_atomic_t'. C99 requires that it compile.
+ ac_fn_c_check_type "$LINENO" "volatile sig_atomic_t" "ac_cv_type_volatile_sig_atomic_t" "
+ #include <signal.h>
+
+ "
+ if test "x$ac_cv_type_volatile_sig_atomic_t" = xyes; then :
+
+ else
+ HAVE_TYPE_VOLATILE_SIG_ATOMIC_T=0
+ fi
+
+
+
+
+
+ ac_fn_c_check_type "$LINENO" "sighandler_t" "ac_cv_type_sighandler_t" "
+ #include <signal.h>
+
+ "
+ if test "x$ac_cv_type_sighandler_t" = xyes; then :
+
+ else
+ HAVE_SIGHANDLER_T=0
+ fi
+
+
+
+
++>>>>>>> MERGE-SOURCE
ac_fn_c_check_type "$LINENO" "socklen_t" "ac_cv_type_socklen_t" "
/* <sys/types.h> is not needed according to POSIX, but the
<sys/socket.h> in i386-unknown-freebsd4.10 and
- if test "$ac_cv_have_decl_strtoumax" != yes; then
- HAVE_DECL_STRTOUMAX=0
++<<<<<<< TREE
++=======
- for ac_func in strtoumax
- do :
- ac_fn_c_check_func "$LINENO" "strtoumax" "ac_cv_func_strtoumax"
- if test "x$ac_cv_func_strtoumax" = x""yes; then :
- cat >>confdefs.h <<_ACEOF
- #define HAVE_STRTOUMAX 1
+ if test "$ac_cv_have_decl_strtoimax" != yes; then
+ HAVE_DECL_STRTOIMAX=0
+ fi
+
+ if test $ac_cv_func_strtoimax = no; then
+
+
+
+
+
+
+
+
+ gl_LIBOBJS="$gl_LIBOBJS strtoimax.$ac_objext"
+
+
+ ac_fn_c_check_decl "$LINENO" "strtoll" "ac_cv_have_decl_strtoll" "$ac_includes_default"
+ if test "x$ac_cv_have_decl_strtoll" = xyes; then :
+ ac_have_decl=1
+ else
+ ac_have_decl=0
+ fi
+
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_DECL_STRTOLL $ac_have_decl
_ACEOF
+
+
fi
- done
+
+
+
+
+ GNULIB_STRTOIMAX=1
+
+
+
+
+
+
+
+
+
++>>>>>>> MERGE-SOURCE
+ if test "$ac_cv_have_decl_strtoumax" != yes; then
+ HAVE_DECL_STRTOUMAX=0
fi
- if test "$ac_cv_have_decl_strtoumax" != yes && test $ac_cv_func_strtoumax = no; then
+ if test $ac_cv_func_strtoumax = no; then
gl_gnulib_enabled_be453cec5eecf5731a274f2de7f2db36=true
fi
}
++<<<<<<< TREE
++=======
+ func_gl_gnulib_m4code_sigprocmask ()
+ {
+ if ! $gl_gnulib_enabled_sigprocmask; then
+
+
+
+ if test $gl_cv_type_sigset_t = yes; then
+ ac_fn_c_check_func "$LINENO" "sigprocmask" "ac_cv_func_sigprocmask"
+ if test "x$ac_cv_func_sigprocmask" = xyes; then :
+ gl_cv_func_sigprocmask=1
+ fi
+
+ fi
+ if test -z "$gl_cv_func_sigprocmask"; then
+ HAVE_POSIX_SIGNALBLOCKING=0
+ fi
+
+ if test $HAVE_POSIX_SIGNALBLOCKING = 0; then
+
+
+
+
+
+
+
+
+ gl_LIBOBJS="$gl_LIBOBJS sigprocmask.$ac_objext"
+
+ :
+ fi
+
+
+
+
+
+ GNULIB_SIGPROCMASK=1
+
+
+
+
+
+ gl_gnulib_enabled_sigprocmask=true
+ fi
+ }
++>>>>>>> MERGE-SOURCE
func_gl_gnulib_m4code_stat ()
{
if ! $gl_gnulib_enabled_stat; then
fi
fi
}
++<<<<<<< TREE
++=======
+ func_gl_gnulib_m4code_strtoll ()
+ {
+ if ! $gl_gnulib_enabled_strtoll; then
+
+
+
+ if test "$ac_cv_type_long_long_int" = yes; then
+ for ac_func in strtoll
+ do :
+ ac_fn_c_check_func "$LINENO" "strtoll" "ac_cv_func_strtoll"
+ if test "x$ac_cv_func_strtoll" = xyes; then :
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_STRTOLL 1
+ _ACEOF
+
+ fi
+ done
+
+ if test $ac_cv_func_strtoll = no; then
+ HAVE_STRTOLL=0
+ fi
+ fi
+
+ if test $HAVE_STRTOLL = 0; then
+
+
+
+
+
+
+
+
+ gl_LIBOBJS="$gl_LIBOBJS strtoll.$ac_objext"
+
+
+ :
+
+ fi
+
+
+
+
+
+ GNULIB_STRTOLL=1
+
+
+
+
+
+ gl_gnulib_enabled_strtoll=true
+ fi
+ }
++>>>>>>> MERGE-SOURCE
func_gl_gnulib_m4code_strtoull ()
{
if ! $gl_gnulib_enabled_strtoull; then
if test $HAVE_READLINK = 0 || test $REPLACE_READLINK = 1; then
func_gl_gnulib_m4code_stat
fi
++<<<<<<< TREE
+ if test "$ac_cv_have_decl_strtoumax" != yes && test $ac_cv_func_strtoumax = no; then
++=======
+ if test $ac_cv_func_strtoimax = no; then
+ func_gl_gnulib_m4code_verify
+ fi
+ if test $ac_cv_func_strtoimax = no && test $ac_cv_type_long_long_int = yes; then
+ func_gl_gnulib_m4code_strtoll
+ fi
+ if test $ac_cv_func_strtoumax = no; then
++>>>>>>> MERGE-SOURCE
func_gl_gnulib_m4code_verify
fi
- if test "$ac_cv_have_decl_strtoumax" != yes && test $ac_cv_func_strtoumax = no && test $ac_cv_type_unsigned_long_long_int = yes; then
+ if test $ac_cv_func_strtoumax = no && test $ac_cv_type_unsigned_long_long_int = yes; then
func_gl_gnulib_m4code_strtoull
fi
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${gl_GNULIB_ENABLED_be453cec5eecf5731a274f2de7f2db36_TRUE}" && test -z "${gl_GNULIB_ENABLED_be453cec5eecf5731a274f2de7f2db36_FALSE}"; then
- as_fn_error "conditional \"gl_GNULIB_ENABLED_be453cec5eecf5731a274f2de7f2db36\" was never defined.
+ as_fn_error $? "conditional \"gl_GNULIB_ENABLED_be453cec5eecf5731a274f2de7f2db36\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
++<<<<<<< TREE
++=======
+ if test -z "${gl_GNULIB_ENABLED_sigprocmask_TRUE}" && test -z "${gl_GNULIB_ENABLED_sigprocmask_FALSE}"; then
+ as_fn_error $? "conditional \"gl_GNULIB_ENABLED_sigprocmask\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
++>>>>>>> MERGE-SOURCE
if test -z "${gl_GNULIB_ENABLED_stat_TRUE}" && test -z "${gl_GNULIB_ENABLED_stat_FALSE}"; then
- as_fn_error "conditional \"gl_GNULIB_ENABLED_stat\" was never defined.
+ as_fn_error $? "conditional \"gl_GNULIB_ENABLED_stat\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
++<<<<<<< TREE
++=======
+ if test -z "${gl_GNULIB_ENABLED_strtoll_TRUE}" && test -z "${gl_GNULIB_ENABLED_strtoll_FALSE}"; then
+ as_fn_error $? "conditional \"gl_GNULIB_ENABLED_strtoll\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
++>>>>>>> MERGE-SOURCE
if test -z "${gl_GNULIB_ENABLED_strtoull_TRUE}" && test -z "${gl_GNULIB_ENABLED_strtoull_FALSE}"; then
- as_fn_error "conditional \"gl_GNULIB_ENABLED_strtoull\" was never defined.
+ as_fn_error $? "conditional \"gl_GNULIB_ENABLED_strtoull\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${gl_GNULIB_ENABLED_verify_TRUE}" && test -z "${gl_GNULIB_ENABLED_verify_FALSE}"; then