GNULIB_PRINTF
GNULIB_POPEN
GNULIB_PERROR
-GNULIB_PCLOSE
GNULIB_OBSTACK_PRINTF_POSIX
GNULIB_OBSTACK_PRINTF
- GNULIB_GETS
GNULIB_GETLINE
GNULIB_GETDELIM
GNULIB_GETCHAR
STDARG_H
NEXT_AS_FIRST_DIRECTIVE_STDARG_H
NEXT_STDARG_H
++<<<<<<< TREE
++=======
+ GL_GENERATE_STDALIGN_H_FALSE
+ GL_GENERATE_STDALIGN_H_TRUE
+ STDALIGN_H
+ NEXT_AS_FIRST_DIRECTIVE_SIGNAL_H
+ NEXT_SIGNAL_H
+ LIB_PTHREAD_SIGMASK
+ REPLACE_RAISE
+ REPLACE_PTHREAD_SIGMASK
+ HAVE_SIGHANDLER_T
+ HAVE_TYPE_VOLATILE_SIG_ATOMIC_T
+ HAVE_STRUCT_SIGACTION_SA_SIGACTION
+ HAVE_SIGACTION
+ HAVE_SIGINFO_T
+ HAVE_SIGSET_T
+ HAVE_RAISE
+ HAVE_PTHREAD_SIGMASK
+ HAVE_POSIX_SIGNALBLOCKING
+ GNULIB_SIGACTION
+ GNULIB_SIGPROCMASK
+ GNULIB_SIGNAL_H_SIGPIPE
+ GNULIB_RAISE
+ GNULIB_PTHREAD_SIGMASK
++>>>>>>> MERGE-SOURCE
REPLACE_TIMEGM
REPLACE_NANOSLEEP
REPLACE_MKTIME
CFLAGS_SOUND
ALSA_LIBS
ALSA_CFLAGS
+ LIBSOUND
PKG_CONFIG
++<<<<<<< TREE
+LIBSOUND
++=======
+ CRT_DIR
++>>>>>>> MERGE-SOURCE
START_FILES
LIB_MATH
+CRT_DIR
LIBS_SYSTEM
C_SWITCH_SYSTEM
UNEXEC_OBJ
as_fn_append ac_header_list " inttypes.h"
as_fn_append ac_func_list " lstat"
as_fn_append ac_func_list " alarm"
-as_fn_append ac_func_list " pthread_sigmask"
as_fn_append ac_func_list " readlink"
- as_fn_append ac_header_list " sys/socket.h"
- as_fn_append ac_func_list " tzset"
as_fn_append ac_func_list " strtoimax"
as_fn_append ac_func_list " strtoumax"
as_fn_append ac_func_list " symlink"
# Suppress obsolescent Autoconf test for size_t; Emacs assumes C89 or better.
-# Likewise for obsolescent test for uid_t, gid_t; Emacs assumes them.
+
- # Check whether --enable-largefile was given.
- if test "${enable_largefile+set}" = set; then :
- enableval=$enable_largefile;
- fi
+
- if test "$enable_largefile" != no; then
++## If user specified a crt-dir, use that unconditionally.
++if test "X$CRT_DIR" = "X"; then
+
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for special C compiler options needed for large files" >&5
- $as_echo_n "checking for special C compiler options needed for large files... " >&6; }
- if test "${ac_cv_sys_largefile_CC+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
- ac_cv_sys_largefile_CC=no
- if test "$GCC" != yes; then
- ac_save_CC=$CC
- while :; do
- # IRIX 6.2 and later do not support large files by default,
- # so use the C compiler's -n32 option if that helps.
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
- #include <sys/types.h>
- /* Check that off_t can represent 2**63 - 1 correctly.
- We can't simply define LARGE_OFF_T to be 9223372036854775807,
- since some C++ compilers masquerading as C compilers
- incorrectly reject 9223372036854775807. */
- #define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
- int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
- && LARGE_OFF_T % 2147483647 == 1)
- ? 1 : -1];
- int
- main ()
- {
++ 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
++ ;;
+
- ;
- return 0;
- }
- _ACEOF
- if ac_fn_c_try_compile "$LINENO"; then :
- break
- fi
- rm -f core conftest.err conftest.$ac_objext
- CC="$CC -n32"
- if ac_fn_c_try_compile "$LINENO"; then :
- ac_cv_sys_largefile_CC=' -n32'; break
- fi
- rm -f core conftest.err conftest.$ac_objext
- break
- done
- CC=$ac_save_CC
- rm -f conftest.$ac_ext
- fi
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_CC" >&5
- $as_echo "$ac_cv_sys_largefile_CC" >&6; }
- if test "$ac_cv_sys_largefile_CC" != no; then
- CC=$CC$ac_cv_sys_largefile_CC
++ powerpc64-*-linux-gnu* | sparc64-*-linux-gnu*) CRT_DIR=/usr/lib64 ;;
++ esac
++
++ case "$opsys" in
++ hpux10-20) CRT_DIR=/lib ;;
++ esac
++
++ ## Default is /usr/lib.
++ test "X$CRT_DIR" = "X" && CRT_DIR=/usr/lib
++
++ ## 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 "x${GCC}" = xyes; then
++ crt_file=`$CC --print-file-name=crt1.o 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
+
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _FILE_OFFSET_BITS value needed for large files" >&5
- $as_echo_n "checking for _FILE_OFFSET_BITS value needed for large files... " >&6; }
- if test "${ac_cv_sys_file_offset_bits+set}" = set; then :
- $as_echo_n "(cached) " >&6
+else
- while :; do
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
- #include <sys/types.h>
- /* Check that off_t can represent 2**63 - 1 correctly.
- We can't simply define LARGE_OFF_T to be 9223372036854775807,
- since some C++ compilers masquerading as C compilers
- incorrectly reject 9223372036854775807. */
- #define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
- int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
- && LARGE_OFF_T % 2147483647 == 1)
- ? 1 : -1];
- int
- main ()
- {
-
- ;
- return 0;
- }
- _ACEOF
- if ac_fn_c_try_compile "$LINENO"; then :
- ac_cv_sys_file_offset_bits=no; break
- fi
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
- #define _FILE_OFFSET_BITS 64
- #include <sys/types.h>
- /* Check that off_t can represent 2**63 - 1 correctly.
- We can't simply define LARGE_OFF_T to be 9223372036854775807,
- since some C++ compilers masquerading as C compilers
- incorrectly reject 9223372036854775807. */
- #define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
- int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
- && LARGE_OFF_T % 2147483647 == 1)
- ? 1 : -1];
- int
- main ()
- {
-
- ;
- return 0;
- }
- _ACEOF
- if ac_fn_c_try_compile "$LINENO"; then :
- ac_cv_sys_file_offset_bits=64; break
- fi
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- ac_cv_sys_file_offset_bits=unknown
- break
- done
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_file_offset_bits" >&5
- $as_echo "$ac_cv_sys_file_offset_bits" >&6; }
- case $ac_cv_sys_file_offset_bits in #(
- no | unknown) ;;
- *)
- cat >>confdefs.h <<_ACEOF
- #define _FILE_OFFSET_BITS $ac_cv_sys_file_offset_bits
- _ACEOF
- ;;
- esac
- rm -rf conftest*
- if test $ac_cv_sys_file_offset_bits = unknown; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _LARGE_FILES value needed for large files" >&5
- $as_echo_n "checking for _LARGE_FILES value needed for large files... " >&6; }
- if test "${ac_cv_sys_large_files+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
- while :; do
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
- #include <sys/types.h>
- /* Check that off_t can represent 2**63 - 1 correctly.
- We can't simply define LARGE_OFF_T to be 9223372036854775807,
- since some C++ compilers masquerading as C compilers
- incorrectly reject 9223372036854775807. */
- #define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
- int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
- && LARGE_OFF_T % 2147483647 == 1)
- ? 1 : -1];
- int
- main ()
- {
-
- ;
- return 0;
- }
- _ACEOF
- if ac_fn_c_try_compile "$LINENO"; then :
- ac_cv_sys_large_files=no; break
- fi
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
- #define _LARGE_FILES 1
- #include <sys/types.h>
- /* Check that off_t can represent 2**63 - 1 correctly.
- We can't simply define LARGE_OFF_T to be 9223372036854775807,
- since some C++ compilers masquerading as C compilers
- incorrectly reject 9223372036854775807. */
- #define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
- int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
- && LARGE_OFF_T % 2147483647 == 1)
- ? 1 : -1];
- int
- main ()
- {
-
- ;
- return 0;
- }
- _ACEOF
- if ac_fn_c_try_compile "$LINENO"; then :
- ac_cv_sys_large_files=1; break
- fi
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- ac_cv_sys_large_files=unknown
- break
- done
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_large_files" >&5
- $as_echo "$ac_cv_sys_large_files" >&6; }
- case $ac_cv_sys_large_files in #(
- no | unknown) ;;
- *)
- cat >>confdefs.h <<_ACEOF
- #define _LARGE_FILES $ac_cv_sys_large_files
- _ACEOF
- ;;
- esac
- rm -rf conftest*
- fi
-
-
- fi
-
-
-
- ## If user specified a crt-dir, use that unconditionally.
- if test "X$CRT_DIR" = "X"; then
-
- 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
-
- ## Default is /usr/lib.
- test "X$CRT_DIR" = "X" && CRT_DIR=/usr/lib
-
- ## 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 "x${GCC}" = xyes; then
- crt_file=`$CC --print-file-name=crt1.o 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
-
- else
-
- ## Some platforms don't use any of these files, so it is not
- ## appropriate to put this test outside the if block.
- test -e $CRT_DIR/crtn.o || test -e $CRT_DIR/crt0.o || \
- as_fn_error "crt*.o not found in specified location." "$LINENO" 5
++
++ ## Some platforms don't use any of these files, so it is not
++ ## appropriate to put this test outside the if block.
++ test -e $CRT_DIR/crtn.o || test -e $CRT_DIR/crt0.o || \
++ as_fn_error "crt*.o not found in specified location." "$LINENO" 5
+
+fi
esac
++<<<<<<< TREE
++>>>>>>> MERGE-SOURCE
++=======
+ # 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 test "${ac_cv_path_PKG_CONFIG+set}" = set; 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
+
+
+
+>>>>>>> MERGE-SOURCE
fi
++<<<<<<< TREE
+<<<<<<< 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" = x""yes; then :
+ cat >>confdefs.h <<_ACEOF
+#define HAVE_SYS_SOCKET_H 1
+_ACEOF
+
+fi
+
+done
++=======
+
+
++>>>>>>> MERGE-SOURCE
+>>>>>>> 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
#if HAVE_NET_IF_H
#include <net/if.h>
#endif
- "
- if test "x$ac_cv_member_struct_ifreq_ifr_addr_sa_len" = x""yes; then :
-
- cat >>confdefs.h <<_ACEOF
- #define HAVE_STRUCT_IFREQ_IFR_ADDR_SA_LEN 1
- _ACEOF
-
-
- fi
- >>>>>>> MERGE-SOURCE
-
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5
- $as_echo_n "checking whether byte ordering is bigendian... " >&6; }
- if test "${ac_cv_c_bigendian+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
- ac_cv_c_bigendian=unknown
- # See if we're dealing with a universal compiler.
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
- #ifndef __APPLE_CC__
- not a universal capable compiler
- #endif
- typedef int dummy;
-
- _ACEOF
- if ac_fn_c_try_compile "$LINENO"; then :
-
- # Check for potential -arch flags. It is not universal unless
- # there are at least two -arch flags with different values.
- ac_arch=
- ac_prev=
- for ac_word in $CC $CFLAGS $CPPFLAGS $LDFLAGS; do
- if test -n "$ac_prev"; then
- case $ac_word in
- i?86 | x86_64 | ppc | ppc64)
- if test -z "$ac_arch" || test "$ac_arch" = "$ac_word"; then
- ac_arch=$ac_word
- else
- ac_cv_c_bigendian=universal
- break
- fi
- ;;
- esac
- ac_prev=
- elif test "x$ac_word" = "x-arch"; then
- ac_prev=arch
- fi
- done
- fi
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- if test $ac_cv_c_bigendian = unknown; then
- # See if sys/param.h defines the BYTE_ORDER macro.
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
- #include <sys/types.h>
- #include <sys/param.h>
-
- int
- main ()
- {
- #if ! (defined BYTE_ORDER && defined BIG_ENDIAN \
- && defined LITTLE_ENDIAN && BYTE_ORDER && BIG_ENDIAN \
- && LITTLE_ENDIAN)
- bogus endian macros
- #endif
-
- ;
- return 0;
- }
- _ACEOF
- if ac_fn_c_try_compile "$LINENO"; then :
- # It does; now see whether it defined to BIG_ENDIAN or not.
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
- #include <sys/types.h>
- #include <sys/param.h>
-
- int
- main ()
- {
- #if BYTE_ORDER != BIG_ENDIAN
- not big endian
- #endif
-
- ;
- return 0;
- }
- _ACEOF
- if ac_fn_c_try_compile "$LINENO"; then :
- ac_cv_c_bigendian=yes
- else
- ac_cv_c_bigendian=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
- if test $ac_cv_c_bigendian = unknown; then
- # See if <limits.h> defines _LITTLE_ENDIAN or _BIG_ENDIAN (e.g., Solaris).
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
- #include <limits.h>
-
- int
- main ()
- {
- #if ! (defined _LITTLE_ENDIAN || defined _BIG_ENDIAN)
- bogus endian macros
- #endif
-
- ;
- return 0;
- }
- _ACEOF
- if ac_fn_c_try_compile "$LINENO"; then :
- # It does; now see whether it defined to _BIG_ENDIAN or not.
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
- #include <limits.h>
-
- int
- main ()
- {
- #ifndef _BIG_ENDIAN
- not big endian
- #endif
-
- ;
- return 0;
- }
- _ACEOF
- if ac_fn_c_try_compile "$LINENO"; then :
- ac_cv_c_bigendian=yes
- else
- ac_cv_c_bigendian=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
- if test $ac_cv_c_bigendian = unknown; then
- # Compile a test program.
- if test "$cross_compiling" = yes; then :
- # Try to guess by grepping values from an object file.
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
- short int ascii_mm[] =
- { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
- short int ascii_ii[] =
- { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
- int use_ascii (int i) {
- return ascii_mm[i] + ascii_ii[i];
- }
- short int ebcdic_ii[] =
- { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
- short int ebcdic_mm[] =
- { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
- int use_ebcdic (int i) {
- return ebcdic_mm[i] + ebcdic_ii[i];
- }
- extern int foo;
-
- int
- main ()
- {
- return use_ascii (foo) == use_ebcdic (foo);
- ;
- return 0;
- }
- _ACEOF
- if ac_fn_c_try_compile "$LINENO"; then :
- if grep BIGenDianSyS conftest.$ac_objext >/dev/null; then
- ac_cv_c_bigendian=yes
- fi
- if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then
- if test "$ac_cv_c_bigendian" = unknown; then
- ac_cv_c_bigendian=no
- else
- # finding both strings is unlikely to happen, but who knows?
- ac_cv_c_bigendian=unknown
- fi
- fi
- fi
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
- $ac_includes_default
- int
- main ()
- {
-
- /* Are we little or big endian? From Harbison&Steele. */
- union
- {
- long int l;
- char c[sizeof (long int)];
- } u;
- u.l = 1;
- return u.c[sizeof (long int) - 1] == 1;
-
- ;
- return 0;
- }
- _ACEOF
- if ac_fn_c_try_run "$LINENO"; then :
- ac_cv_c_bigendian=no
- else
- ac_cv_c_bigendian=yes
- fi
- rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
- conftest.$ac_objext conftest.beam conftest.$ac_ext
- fi
+ "
+ if test "x$ac_cv_member_struct_ifreq_ifr_addr_sa_len" = x""yes; then :
- fi
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_bigendian" >&5
- $as_echo "$ac_cv_c_bigendian" >&6; }
- case $ac_cv_c_bigendian in #(
- yes)
- $as_echo "#define WORDS_BIGENDIAN 1" >>confdefs.h
- ;; #(
- no)
- ;; #(
- universal)
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_STRUCT_IFREQ_IFR_ADDR_SA_LEN 1
+ _ACEOF
- $as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h
- ;; #(
- *)
- as_fn_error "unknown endianness
- presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;;
- esac
+ fi
++>>>>>>> MERGE-SOURCE
+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for __attribute__ ((__aligned__ (expr)))" >&5
LIB_PTHREAD=
- for ac_header in pthread.h
- do :
- ac_fn_c_check_header_mongrel "$LINENO" "pthread.h" "ac_cv_header_pthread_h" "$ac_includes_default"
- if test "x$ac_cv_header_pthread_h" = x""yes; then :
- cat >>confdefs.h <<_ACEOF
- #define HAVE_PTHREAD_H 1
- _ACEOF
- fi
- done
if test "$ac_cv_header_pthread_h"; then
- if test "$GMALLOC_OBJ" = gmalloc.o; then
- emacs_pthread_function=pthread_atfork
- else
- emacs_pthread_function=pthread_self
- fi
- as_ac_Lib=`$as_echo "ac_cv_lib_pthread_$emacs_pthread_function" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $emacs_pthread_function in -lpthread" >&5
-$as_echo_n "checking for $emacs_pthread_function in -lpthread... " >&6; }
-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_self in -lpthread" >&5
+$as_echo_n "checking for pthread_self in -lpthread... " >&6; }
+if test "${ac_cv_lib_pthread_pthread_self+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
gl_dirsep_regex='[/\\]'
;;
*)
- gl_dirsep_regex='/'
+ gl_dirsep_regex='\/'
;;
esac
+ gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
++<<<<<<< TREE
+ gl_absolute_header_sed='\#'"${gl_dirsep_regex}"'getopt.h#{
+ s#.*"\(.*'"${gl_dirsep_regex}"'getopt.h\)".*#\1#
+ s#^/[^/]#//&#
++=======
+ gl_header_literal_regex=`echo 'getopt.h' \
+ | sed -e "$gl_make_literal_regex_sed"`
+ gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
+ s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
+ s|^/[^/]|//&|
++>>>>>>> MERGE-SOURCE
p
q
}'
gl_dirsep_regex='[/\\]'
;;
*)
- gl_dirsep_regex='/'
+ gl_dirsep_regex='\/'
;;
esac
+ gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
++<<<<<<< TREE
+ gl_absolute_header_sed='\#'"${gl_dirsep_regex}"'stdint.h#{
+ s#.*"\(.*'"${gl_dirsep_regex}"'stdint.h\)".*#\1#
+ s#^/[^/]#//&#
++=======
+ gl_header_literal_regex=`echo 'stdint.h' \
+ | sed -e "$gl_make_literal_regex_sed"`
+ gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
+ s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
+ s|^/[^/]|//&|
++>>>>>>> MERGE-SOURCE
p
q
}'
gl_dirsep_regex='[/\\]'
;;
*)
- gl_dirsep_regex='/'
+ gl_dirsep_regex='\/'
;;
esac
+ gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
++<<<<<<< TREE
+ gl_absolute_header_sed='\#'"${gl_dirsep_regex}"'inttypes.h#{
+ s#.*"\(.*'"${gl_dirsep_regex}"'inttypes.h\)".*#\1#
+ s#^/[^/]#//&#
++=======
+ gl_header_literal_regex=`echo 'inttypes.h' \
+ | sed -e "$gl_make_literal_regex_sed"`
+ gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
+ s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
+ s|^/[^/]|//&|
++>>>>>>> MERGE-SOURCE
p
q
}'
++<<<<<<< TREE
+
+
+<<<<<<< TREE
+=======
++=======
++>>>>>>> MERGE-SOURCE
GNULIB_PTHREAD_SIGMASK=0;
- GNULIB_RAISE=0;
GNULIB_SIGNAL_H_SIGPIPE=0;
GNULIB_SIGPROCMASK=0;
GNULIB_SIGACTION=0;
++<<<<<<< TREE
+>>>>>>> MERGE-SOURCE
+
+
++=======
++>>>>>>> MERGE-SOURCE
if test $ac_cv_header_sys_socket_h = no; then
for ac_header in ws2tcpip.h
do :
GNULIB_GETCHAR=0;
GNULIB_GETDELIM=0;
GNULIB_GETLINE=0;
- GNULIB_GETS=0;
GNULIB_OBSTACK_PRINTF=0;
GNULIB_OBSTACK_PRINTF_POSIX=0;
- GNULIB_PCLOSE=0;
GNULIB_PERROR=0;
GNULIB_POPEN=0;
GNULIB_PRINTF=0;
++<<<<<<< TREE
+<<<<<<< TREE
+=======
+
+
++=======
++>>>>>>> MERGE-SOURCE
ac_fn_c_check_decl "$LINENO" "strtoimax" "ac_cv_have_decl_strtoimax" "$ac_includes_default"
if test "x$ac_cv_have_decl_strtoimax" = x""yes; then :
ac_have_decl=1
++<<<<<<< TREE
++=======
+ ac_fn_c_check_type "$LINENO" "mode_t" "ac_cv_type_mode_t" "$ac_includes_default"
+ if test "x$ac_cv_type_mode_t" = x""yes; then :
+
+ else
+
+ cat >>confdefs.h <<_ACEOF
+ #define mode_t int
+ _ACEOF
+
+ fi
+
+
+
+
+
+
+
+
+
++>>>>>>> MERGE-SOURCE
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C/C++ restrict keyword" >&5
$as_echo_n "checking for C/C++ restrict keyword... " >&6; }
if test "${ac_cv_c_restrict+set}" = set; then :
gl_dirsep_regex='[/\\]'
;;
*)
- gl_dirsep_regex='/'
+ gl_dirsep_regex='\/'
;;
esac
+ gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
++<<<<<<< TREE
+ gl_absolute_header_sed='\#'"${gl_dirsep_regex}"'time.h#{
+ s#.*"\(.*'"${gl_dirsep_regex}"'time.h\)".*#\1#
+ s#^/[^/]#//&#
++=======
+ gl_header_literal_regex=`echo 'time.h' \
+ | sed -e "$gl_make_literal_regex_sed"`
+ gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
+ s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
+ s|^/[^/]|//&|
++>>>>>>> MERGE-SOURCE
p
q
}'
++<<<<<<< TREE
+<<<<<<< TREE
+=======
++=======
+
+
++>>>>>>> MERGE-SOURCE
LIB_PTHREAD_SIGMASK=
gl_dirsep_regex='[/\\]'
;;
*)
- gl_dirsep_regex='/'
+ gl_dirsep_regex='\/'
;;
esac
+ gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
++<<<<<<< TREE
+ gl_absolute_header_sed='\#'"${gl_dirsep_regex}"'signal.h#{
+ s#.*"\(.*'"${gl_dirsep_regex}"'signal.h\)".*#\1#
+ s#^/[^/]#//&#
++=======
+ gl_header_literal_regex=`echo 'signal.h' \
+ | sed -e "$gl_make_literal_regex_sed"`
+ gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
+ s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
+ s|^/[^/]|//&|
++>>>>>>> MERGE-SOURCE
p
q
}'
gl_dirsep_regex='[/\\]'
;;
*)
- gl_dirsep_regex='/'
+ gl_dirsep_regex='\/'
;;
esac
+ gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
++<<<<<<< TREE
+ gl_absolute_header_sed='\#'"${gl_dirsep_regex}"'stdarg.h#{
+ s#.*"\(.*'"${gl_dirsep_regex}"'stdarg.h\)".*#\1#
+ s#^/[^/]#//&#
++=======
+ gl_header_literal_regex=`echo 'stdarg.h' \
+ | sed -e "$gl_make_literal_regex_sed"`
+ gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
+ s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
+ s|^/[^/]|//&|
++>>>>>>> MERGE-SOURCE
p
q
}'
gl_dirsep_regex='[/\\]'
;;
*)
- gl_dirsep_regex='/'
+ gl_dirsep_regex='\/'
;;
esac
+ gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
++<<<<<<< TREE
+ gl_absolute_header_sed='\#'"${gl_dirsep_regex}"'stddef.h#{
+ s#.*"\(.*'"${gl_dirsep_regex}"'stddef.h\)".*#\1#
+ s#^/[^/]#//&#
++=======
+ gl_header_literal_regex=`echo 'stddef.h' \
+ | sed -e "$gl_make_literal_regex_sed"`
+ gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
+ s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
+ s|^/[^/]|//&|
++>>>>>>> MERGE-SOURCE
p
q
}'
gl_dirsep_regex='[/\\]'
;;
*)
- gl_dirsep_regex='/'
+ gl_dirsep_regex='\/'
;;
esac
+ gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
++<<<<<<< TREE
+ gl_absolute_header_sed='\#'"${gl_dirsep_regex}"'stdio.h#{
+ s#.*"\(.*'"${gl_dirsep_regex}"'stdio.h\)".*#\1#
+ s#^/[^/]#//&#
++=======
+ gl_header_literal_regex=`echo 'stdio.h' \
+ | sed -e "$gl_make_literal_regex_sed"`
+ gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
+ s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
+ s|^/[^/]|//&|
++>>>>>>> MERGE-SOURCE
p
q
}'
gl_dirsep_regex='[/\\]'
;;
*)
- gl_dirsep_regex='/'
+ gl_dirsep_regex='\/'
;;
esac
+ gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
++<<<<<<< TREE
+ gl_absolute_header_sed='\#'"${gl_dirsep_regex}"'stdlib.h#{
+ s#.*"\(.*'"${gl_dirsep_regex}"'stdlib.h\)".*#\1#
+ s#^/[^/]#//&#
++=======
+ gl_header_literal_regex=`echo 'stdlib.h' \
+ | sed -e "$gl_make_literal_regex_sed"`
+ gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
+ s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
+ s|^/[^/]|//&|
++>>>>>>> MERGE-SOURCE
p
q
}'
gl_dirsep_regex='[/\\]'
;;
*)
- gl_dirsep_regex='/'
+ gl_dirsep_regex='\/'
;;
esac
+ gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
++<<<<<<< TREE
+ gl_absolute_header_sed='\#'"${gl_dirsep_regex}"'sys/stat.h#{
+ s#.*"\(.*'"${gl_dirsep_regex}"'sys/stat.h\)".*#\1#
+ s#^/[^/]#//&#
++=======
+ gl_header_literal_regex=`echo 'sys/stat.h' \
+ | sed -e "$gl_make_literal_regex_sed"`
+ gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
+ s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
+ s|^/[^/]|//&|
++>>>>>>> MERGE-SOURCE
p
q
}'
++<<<<<<< TREE
++=======
+
+
+
+
+
+
+ if test $WINDOWS_64_BIT_ST_SIZE = 1; then
+
+ $as_echo "#define _GL_WINDOWS_64_BIT_ST_SIZE 1" >>confdefs.h
+
+ fi
+
++>>>>>>> MERGE-SOURCE
ac_fn_c_check_type "$LINENO" "nlink_t" "ac_cv_type_nlink_t" "#include <sys/types.h>
#include <sys/stat.h>
"
gl_dirsep_regex='[/\\]'
;;
*)
- gl_dirsep_regex='/'
+ gl_dirsep_regex='\/'
;;
esac
+ gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g'
++<<<<<<< TREE
+ gl_absolute_header_sed='\#'"${gl_dirsep_regex}"'unistd.h#{
+ s#.*"\(.*'"${gl_dirsep_regex}"'unistd.h\)".*#\1#
+ s#^/[^/]#//&#
++=======
+ gl_header_literal_regex=`echo 'unistd.h' \
+ | sed -e "$gl_make_literal_regex_sed"`
+ gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{
+ s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/
+ s|^/[^/]|//&|
++>>>>>>> MERGE-SOURCE
p
q
}'
+
gl_gnulib_enabled_dosname=false
gl_gnulib_enabled_be453cec5eecf5731a274f2de7f2db36=false
+<<<<<<< TREE
+=======
gl_gnulib_enabled_pathmax=false
gl_gnulib_enabled_sigprocmask=false
+>>>>>>> MERGE-SOURCE
gl_gnulib_enabled_stat=false
- gl_gnulib_enabled_strtoll=false
gl_gnulib_enabled_strtoull=false
gl_gnulib_enabled_verify=false
func_gl_gnulib_m4code_dosname ()
if test $HAVE_READLINK = 0 || test $REPLACE_READLINK = 1; then
func_gl_gnulib_m4code_stat
fi
++<<<<<<< TREE
+<<<<<<< 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
++=======
+ if { test $HAVE_STRTOIMAX = 0 || test $REPLACE_STRTOIMAX = 1; } && test $ac_cv_type_long_long_int = yes; then
++>>>>>>> MERGE-SOURCE
func_gl_gnulib_m4code_strtoll
fi
++<<<<<<< TREE
+ if test $ac_cv_func_strtoumax = no; then
++>>>>>>> MERGE-SOURCE
++=======
+ if test $HAVE_STRTOIMAX = 0 || test $REPLACE_STRTOIMAX = 1; then
+>>>>>>> MERGE-SOURCE
func_gl_gnulib_m4code_verify
fi
if test $ac_cv_func_strtoumax = no && test $ac_cv_type_unsigned_long_long_int = yes; then