From: Joakim Verona Date: Mon, 3 Sep 2012 15:30:17 +0000 (+0200) Subject: upstream X-Git-Tag: emacs-25.0.90~3283 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=4a37733c693d59a9b83a3fb2d0c7f9461d149f60;p=emacs.git upstream --- 4a37733c693d59a9b83a3fb2d0c7f9461d149f60 diff --cc autogen/configure index 8268da38b52,12239818695..c4ea39bf333 --- a/autogen/configure +++ b/autogen/configure @@@ -663,15 -615,12 +664,8 @@@ gl_GNULIB_ENABLED_verify_FALS gl_GNULIB_ENABLED_verify_TRUE gl_GNULIB_ENABLED_strtoull_FALSE gl_GNULIB_ENABLED_strtoull_TRUE -gl_GNULIB_ENABLED_strtoll_FALSE -gl_GNULIB_ENABLED_strtoll_TRUE gl_GNULIB_ENABLED_stat_FALSE gl_GNULIB_ENABLED_stat_TRUE - <<<<<<< TREE - ======= - gl_GNULIB_ENABLED_sigprocmask_FALSE - gl_GNULIB_ENABLED_sigprocmask_TRUE --gl_GNULIB_ENABLED_pathmax_FALSE --gl_GNULIB_ENABLED_pathmax_TRUE - >>>>>>> MERGE-SOURCE gl_GNULIB_ENABLED_be453cec5eecf5731a274f2de7f2db36_FALSE gl_GNULIB_ENABLED_be453cec5eecf5731a274f2de7f2db36_TRUE gl_GNULIB_ENABLED_dosname_FALSE @@@ -832,7 -782,14 +824,6 @@@ GNULIB_SIGPROCMAS GNULIB_SIGNAL_H_SIGPIPE GNULIB_RAISE GNULIB_PTHREAD_SIGMASK - >>>>>>> MERGE-SOURCE -HAVE_SYS_SELECT_H -NEXT_AS_FIRST_DIRECTIVE_SYS_SELECT_H -NEXT_SYS_SELECT_H -REPLACE_SELECT -REPLACE_PSELECT -HAVE_PSELECT -GNULIB_SELECT -GNULIB_PSELECT REPLACE_TIMEGM REPLACE_NANOSLEEP REPLACE_MKTIME @@@ -1204,8 -1179,14 +1199,15 @@@ LIBXTR LIBGNUTLS_LIBS LIBGNUTLS_CFLAGS LIBSELINUX_LIBS ++<<<<<<< TREE ++======= + SETTINGS_LIBS + SETTINGS_CFLAGS + GOBJECT_LIBS + GOBJECT_CFLAGS ++>>>>>>> MERGE-SOURCE GCONF_LIBS GCONF_CFLAGS -GSETTINGS_LIBS -GSETTINGS_CFLAGS DBUS_OBJ DBUS_LIBS DBUS_CFLAGS @@@ -3340,69 -3198,15 +3343,70 @@@ as_fn_append ac_header_list " sys/param as_fn_append ac_header_list " pthread.h" as_fn_append ac_header_list " malloc/malloc.h" as_fn_append ac_header_list " maillock.h" +as_fn_append ac_func_list " gethostname" +as_fn_append ac_func_list " rename" +as_fn_append ac_func_list " closedir" +as_fn_append ac_func_list " mkdir" +as_fn_append ac_func_list " rmdir" +as_fn_append ac_func_list " getrusage" +as_fn_append ac_func_list " get_current_dir_name" +as_fn_append ac_func_list " random" +as_fn_append ac_func_list " lrand48" +as_fn_append ac_func_list " logb" +as_fn_append ac_func_list " frexp" +as_fn_append ac_func_list " fmod" +as_fn_append ac_func_list " rint" +as_fn_append ac_func_list " cbrt" +as_fn_append ac_func_list " setsid" +as_fn_append ac_func_list " strerror" +as_fn_append ac_func_list " fpathconf" +as_fn_append ac_func_list " select" +as_fn_append ac_func_list " euidaccess" +as_fn_append ac_func_list " getpagesize" +as_fn_append ac_func_list " setlocale" +as_fn_append ac_func_list " utimes" +as_fn_append ac_func_list " getrlimit" +as_fn_append ac_func_list " setrlimit" +as_fn_append ac_func_list " setpgid" +as_fn_append ac_func_list " getcwd" +as_fn_append ac_func_list " getwd" +as_fn_append ac_func_list " shutdown" +as_fn_append ac_func_list " getaddrinfo" +as_fn_append ac_func_list " __fpending" +as_fn_append ac_func_list " strsignal" +as_fn_append ac_func_list " setitimer" +as_fn_append ac_func_list " sendto" +as_fn_append ac_func_list " recvfrom" +as_fn_append ac_func_list " getsockname" +as_fn_append ac_func_list " getpeername" +as_fn_append ac_func_list " getifaddrs" +as_fn_append ac_func_list " freeifaddrs" +as_fn_append ac_func_list " gai_strerror" +as_fn_append ac_func_list " mkstemp" +as_fn_append ac_func_list " getline" +as_fn_append ac_func_list " getdelim" +as_fn_append ac_func_list " fsync" +as_fn_append ac_func_list " sync" +as_fn_append ac_func_list " difftime" +as_fn_append ac_func_list " posix_memalign" +as_fn_append ac_func_list " getpwent" +as_fn_append ac_func_list " endpwent" +as_fn_append ac_func_list " getgrent" +as_fn_append ac_func_list " endgrent" +as_fn_append ac_func_list " touchlock" +as_fn_append ac_func_list " cfmakeraw" +as_fn_append ac_func_list " cfsetspeed" +as_fn_append ac_func_list " copysign" +as_fn_append ac_func_list " __executable_start" as_fn_append ac_header_list " sys/un.h" +as_fn_append ac_func_list " grantpt" +as_fn_append ac_func_list " getpt" as_fn_append ac_func_list " tzset" +as_fn_append ac_func_list " snprintf" as_fn_append ac_func_list " readlinkat" + as_fn_append ac_header_list " execinfo.h" gl_getopt_required=GNU as_fn_append ac_header_list " getopt.h" -as_fn_append ac_func_list " gettimeofday" -as_fn_append ac_func_list " nanotime" -as_fn_append ac_header_list " sys/time.h" as_fn_append ac_header_list " wchar.h" as_fn_append ac_header_list " stdint.h" as_fn_append ac_header_list " inttypes.h" @@@ -7144,8 -6961,10 +7148,9 @@@ esa # Code from module crypto/sha512: # Code from module dosname: # Code from module dtoastr: - # Code from module dtotimespec: # Code from module dup2: # Code from module environ: + # Code from module execinfo: # Code from module extensions: # Code from module extern-inline: @@@ -11198,7 -10969,71 +11306,75 @@@ $as_echo "no" >&6; $as_echo "#define HAVE_GCONF 1" >>confdefs.h ++<<<<<<< TREE + for ac_func in g_type_init ++======= + SETTINGS_CFLAGS="$SETTINGS_CFLAGS $GCONF_CFLAGS" + SETTINGS_LIBS="$SETTINGS_LIBS $GCONF_LIBS" + fi + fi + + if test "$HAVE_GSETTINGS" = "yes" || test "$HAVE_GCONF" = "yes"; then + + succeeded=no + + if test "$PKG_CONFIG" = "no" ; then + HAVE_GOBJECT=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 gobject-2.0 >= 2.0" >&5 + $as_echo_n "checking for gobject-2.0 >= 2.0... " >&6; } + + if $PKG_CONFIG --exists "gobject-2.0 >= 2.0" 2>&5 && + GOBJECT_CFLAGS=`$PKG_CONFIG --cflags "gobject-2.0 >= 2.0" 2>&5` && + GOBJECT_LIBS=`$PKG_CONFIG --libs "gobject-2.0 >= 2.0" 2>&5`; then + edit_cflags=" + s,///*,/,g + s/^/ / + s/ -I/ $isystem/g + s/^ // + " + GOBJECT_CFLAGS=`$as_echo "$GOBJECT_CFLAGS" | sed -e "$edit_cflags"` + GOBJECT_LIBS=`$as_echo "$GOBJECT_LIBS" | sed -e 's,///*,/,g'` + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes CFLAGS='$GOBJECT_CFLAGS' LIBS='$GOBJECT_LIBS'" >&5 + $as_echo "yes CFLAGS='$GOBJECT_CFLAGS' LIBS='$GOBJECT_LIBS'" >&6; } + succeeded=yes + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } + GOBJECT_CFLAGS="" + GOBJECT_LIBS="" + ## If we have a custom action on failure, don't print errors, but + ## do set a variable so people can do so. + GOBJECT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gobject-2.0 >= 2.0"` + + 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_GOBJECT=yes + else + HAVE_GOBJECT=no + fi + + if test "$HAVE_GOBJECT" = "yes"; then + SETTINGS_CFLAGS="$SETTINGS_CFLAGS $GOBJECT_CFLAGS" + SETTINGS_LIBS="$SETTINGS_LIBS $GOBJECT_LIBS" + fi + SAVE_CFLAGS="$CFLAGS" + SAVE_LIBS="$LIBS" + CFLAGS="$SETTINGS_CFLAGS $CFLAGS" + LIBS="$SETTINGS_LIBS $LIBS" + for ac_func in g_type_init ++>>>>>>> MERGE-SOURCE 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 : @@@ -17677,31 -17494,25 +17863,27 @@@ cat >>confdefs.h <<_ACEO #define HAVE_DECL_GETENV $ac_have_decl _ACEOF ++<<<<<<< TREE ++======= + : - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for unsigned long long int" >&5 - $as_echo_n "checking for unsigned long long int... " >&6; } - if test "${ac_cv_type_unsigned_long_long_int+set}" = set; then : + + + + { $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 : $as_echo_n "(cached) " >&6 else - ac_cv_type_unsigned_long_long_int=yes - if test "x${ac_cv_prog_cc_c99-no}" = xno; then - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + ac_cv_c_restrict=no + # The order here caters to the fact that C++ does not require restrict. + for ac_kw in __restrict __restrict__ _Restrict restrict; do + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ - - /* For now, do not test the preprocessor; as of 2007 there are too many - implementations with broken preprocessors. Perhaps this can - be revisited in 2012. In the meantime, code should not expect - #if to work with literals wider than 32 bits. */ - /* Test literals. */ - long long int ll = 9223372036854775807ll; - long long int nll = -9223372036854775807LL; - unsigned long long int ull = 18446744073709551615ULL; - /* Test constant expressions. */ - typedef int a[((-9223372036854775807LL < 0 && 0 < 9223372036854775807ll) - ? 1 : -1)]; - typedef int b[(18446744073709551615ULL <= (unsigned long long int) -1 - ? 1 : -1)]; - int i = 63; + typedef int * int_ptr; + int foo (int_ptr $ac_kw ip) { + return ip[0]; + } int main () { @@@ -17715,18 -17523,281 +17894,282 @@@ int s[1] ; return 0; } - _ACEOF - if ac_fn_c_try_link "$LINENO"; then : - - else - ac_cv_type_unsigned_long_long_int=no + if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_c_restrict=$ac_kw fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - fi + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + test "$ac_cv_c_restrict" != no && break + done + fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_unsigned_long_long_int" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_restrict" >&5 + $as_echo "$ac_cv_c_restrict" >&6; } + + case $ac_cv_c_restrict in + restrict) ;; + no) $as_echo "#define restrict /**/" >>confdefs.h + ;; + *) cat >>confdefs.h <<_ACEOF + #define restrict $ac_cv_c_restrict + _ACEOF + ;; + esac + + + GNULIB_GETTIMEOFDAY=0; + HAVE_GETTIMEOFDAY=1; + HAVE_STRUCT_TIMEVAL=1; + HAVE_SYS_TIME_H=1; + REPLACE_GETTIMEOFDAY=0; + REPLACE_STRUCT_TIMEVAL=0; + + + + + + + + + + + + + + + + + if test $gl_cv_have_include_next = yes; then + gl_cv_next_sys_time_h='<'sys/time.h'>' + else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of " >&5 + $as_echo_n "checking absolute name of ... " >&6; } + if test "${gl_cv_next_sys_time_h+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + + if test $ac_cv_header_sys_time_h = yes; then + + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include + + _ACEOF + case "$host_os" in + aix*) gl_absname_cpp="$ac_cpp -C" ;; + *) gl_absname_cpp="$ac_cpp" ;; + esac + + case "$host_os" in + mingw*) + gl_dirsep_regex='[/\\]' + ;; + *) + gl_dirsep_regex='\/' + ;; + esac + gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g' + + gl_header_literal_regex=`echo 'sys/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|^/[^/]|//&| + p + q + }' + gl_cv_next_sys_time_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | + sed -n "$gl_absolute_header_sed"`'"' + else + gl_cv_next_sys_time_h='<'sys/time.h'>' + fi + + + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_sys_time_h" >&5 + $as_echo "$gl_cv_next_sys_time_h" >&6; } + fi + NEXT_SYS_TIME_H=$gl_cv_next_sys_time_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='<'sys/time.h'>' + else + # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include' + gl_next_as_first_directive=$gl_cv_next_sys_time_h + fi + NEXT_AS_FIRST_DIRECTIVE_SYS_TIME_H=$gl_next_as_first_directive + + + + + + if test $ac_cv_header_sys_time_h != yes; then + HAVE_SYS_TIME_H=0 + fi + + + + + + if test $ac_cv_header_sys_socket_h != yes; then + for ac_header in winsock2.h + do : + ac_fn_c_check_header_mongrel "$LINENO" "winsock2.h" "ac_cv_header_winsock2_h" "$ac_includes_default" + if test "x$ac_cv_header_winsock2_h" = x""yes; then : + cat >>confdefs.h <<_ACEOF + #define HAVE_WINSOCK2_H 1 + _ACEOF + + fi + + done + + fi + if test "$ac_cv_header_winsock2_h" = yes; then + HAVE_WINSOCK2_H=1 + UNISTD_H_HAVE_WINSOCK2_H=1 + SYS_IOCTL_H_HAVE_WINSOCK2_H=1 + else + HAVE_WINSOCK2_H=0 + fi + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct timeval" >&5 + $as_echo_n "checking for struct timeval... " >&6; } + if test "${gl_cv_sys_struct_timeval+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #if HAVE_SYS_TIME_H + #include + #endif + #include + #if HAVE_WINSOCK2_H + # include + #endif + + int + main () + { + static struct timeval x; x.tv_sec = x.tv_usec; + ; + return 0; + } + _ACEOF + if ac_fn_c_try_compile "$LINENO"; then : + gl_cv_sys_struct_timeval=yes + else + gl_cv_sys_struct_timeval=no + fi + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_sys_struct_timeval" >&5 + $as_echo "$gl_cv_sys_struct_timeval" >&6; } + if test $gl_cv_sys_struct_timeval != yes; then + HAVE_STRUCT_TIMEVAL=0 + else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for wide-enough struct timeval.tv_sec member" >&5 + $as_echo_n "checking for wide-enough struct timeval.tv_sec member... " >&6; } + if test "${gl_cv_sys_struct_timeval_tv_sec+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #if HAVE_SYS_TIME_H + #include + #endif + #include + #if HAVE_WINSOCK2_H + # include + #endif + + int + main () + { + static struct timeval x; + typedef int verify_tv_sec_type[ + sizeof (time_t) <= sizeof x.tv_sec ? 1 : -1 + ]; + + ; + return 0; + } + _ACEOF + if ac_fn_c_try_compile "$LINENO"; then : + gl_cv_sys_struct_timeval_tv_sec=yes + else + gl_cv_sys_struct_timeval_tv_sec=no + fi + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_sys_struct_timeval_tv_sec" >&5 + $as_echo "$gl_cv_sys_struct_timeval_tv_sec" >&6; } + if test $gl_cv_sys_struct_timeval_tv_sec != yes; then + REPLACE_STRUCT_TIMEVAL=1 + fi + fi + + + + + + ++>>>>>>> MERGE-SOURCE + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for unsigned long long int" >&5 + $as_echo_n "checking for unsigned long long int... " >&6; } + if test "${ac_cv_type_unsigned_long_long_int+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + ac_cv_type_unsigned_long_long_int=yes + if test "x${ac_cv_prog_cc_c99-no}" = xno; then + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + /* For now, do not test the preprocessor; as of 2007 there are too many + implementations with broken preprocessors. Perhaps this can + be revisited in 2012. In the meantime, code should not expect + #if to work with literals wider than 32 bits. */ + /* Test literals. */ + long long int ll = 9223372036854775807ll; + long long int nll = -9223372036854775807LL; + unsigned long long int ull = 18446744073709551615ULL; + /* Test constant expressions. */ + typedef int a[((-9223372036854775807LL < 0 && 0 < 9223372036854775807ll) + ? 1 : -1)]; + typedef int b[(18446744073709551615ULL <= (unsigned long long int) -1 + ? 1 : -1)]; + int i = 63; + int + main () + { + /* Test availability of runtime routines for shift and division. */ + long long int llmax = 9223372036854775807ll; + unsigned long long int ullmax = 18446744073709551615ull; + return ((ll << 63) | (ll >> 63) | (ll < i) | (ll > i) + | (llmax / ll) | (llmax % ll) + | (ull << 63) | (ull >> 63) | (ull << i) | (ull >> i) + | (ullmax / ull) | (ullmax % ull)); + ; + return 0; + } + + _ACEOF + if ac_fn_c_try_link "$LINENO"; then : + + else + ac_cv_type_unsigned_long_long_int=no + fi + rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + fi + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_unsigned_long_long_int" >&5 $as_echo "$ac_cv_type_unsigned_long_long_int" >&6; } if test $ac_cv_type_unsigned_long_long_int = yes; then @@@ -19779,7 -20237,8 +20222,12 @@@ $as_echo "$gl_cv_func_dup2_works" >&6; gl_LIBOBJS="$gl_LIBOBJS dup2.$ac_objext" ++<<<<<<< TREE +fi ++======= + + fi ++>>>>>>> MERGE-SOURCE @@@ -20365,14 -20919,141 +20906,147 @@@ don - gl_LIBOBJS="$gl_LIBOBJS getopt1.$ac_objext" + gl_LIBOBJS="$gl_LIBOBJS getopt1.$ac_objext" + + + + + GNULIB_GL_UNISTD_H_GETOPT=1 + fi + + + + + + - + REPLACE_GETOPT=0 - if test -n "$gl_replace_getopt"; then ++ ++ ++ if test -n "$gl_replace_getopt"; then : ++ + REPLACE_GETOPT=1 - fi ++ ++fi ++ + + if test $REPLACE_GETOPT = 1; then + + GETOPT_H=getopt.h + + $as_echo "#define __GETOPT_PREFIX rpl_" >>confdefs.h + + + + fi + + if test $REPLACE_GETOPT = 1; then + + + + + + + + + gl_LIBOBJS="$gl_LIBOBJS getopt.$ac_objext" + + + + + + + + + + gl_LIBOBJS="$gl_LIBOBJS getopt1.$ac_objext" + + + + + GNULIB_GL_UNISTD_H_GETOPT=1 + fi + + + + + + + ++<<<<<<< TREE ++======= + + + + + + gl_gettimeofday_timezone=void + if test $ac_cv_func_gettimeofday != yes; then + HAVE_GETTIMEOFDAY=0 + else + + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether gettimeofday clobbers localtime buffer" >&5 + $as_echo_n "checking whether gettimeofday clobbers localtime buffer... " >&6; } + if test "${gl_cv_func_gettimeofday_clobber+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + if test "$cross_compiling" = yes; then : + # When cross-compiling: + case "$host_os" in + # Guess all is fine on glibc systems. + *-gnu*) gl_cv_func_gettimeofday_clobber="guessing no" ;; + # If we don't know, assume the worst. + *) gl_cv_func_gettimeofday_clobber="guessing yes" ;; + esac + + else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include + #include + #include + #include + + int + main () + { + + time_t t = 0; + struct tm *lt; + struct tm saved_lt; + struct timeval tv; + lt = localtime (&t); + saved_lt = *lt; + gettimeofday (&tv, NULL); + return memcmp (lt, &saved_lt, sizeof (struct tm)) != 0; + + ; + return 0; + } + _ACEOF + if ac_fn_c_try_run "$LINENO"; then : + gl_cv_func_gettimeofday_clobber=no + else + gl_cv_func_gettimeofday_clobber=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_gettimeofday_clobber" >&5 + $as_echo "$gl_cv_func_gettimeofday_clobber" >&6; } + case "$gl_cv_func_gettimeofday_clobber" in + *yes) + REPLACE_GETTIMEOFDAY=1 + $as_echo "#define gmtime rpl_gmtime" >>confdefs.h - GNULIB_GL_UNISTD_H_GETOPT=1 - fi + $as_echo "#define localtime rpl_localtime" >>confdefs.h @@@ -20431,6 -21186,6 +21179,7 @@@ don ++>>>>>>> MERGE-SOURCE if test $ac_cv_func_lstat = yes; then case "$gl_cv_func_lstat_dereferences_slashed_symlink" in @@@ -20732,13 -21488,73 +21479,83 @@@ $as_echo "$gl_cv_func_working_mktime" > ++<<<<<<< TREE +<<<<<<< TREE +<<<<<<< TREE +======= +======= + + ++>>>>>>> MERGE-SOURCE ++======= + + + + if test $ac_cv_func_pselect = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether signature of pselect conforms to POSIX" >&5 + $as_echo_n "checking whether signature of pselect conforms to POSIX... " >&6; } + if test "${gl_cv_sig_pselect+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #include + + int + main () + { + int (*p) (int, fd_set *, fd_set *, fd_set *restrict, + struct timespec const *restrict, + sigset_t const *restrict) = pselect; + return !p; + ; + return 0; + } + _ACEOF + if ac_fn_c_try_link "$LINENO"; then : + gl_cv_sig_pselect=yes + else + gl_cv_sig_pselect=no + fi + rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_sig_pselect" >&5 + $as_echo "$gl_cv_sig_pselect" >&6; } + fi + + if test $ac_cv_func_pselect = no || test $gl_cv_sig_pselect = no; then + REPLACE_PSELECT=1 + fi + + if test $HAVE_PSELECT = 0 || test $REPLACE_PSELECT = 1; then + + + + + + + + + gl_LIBOBJS="$gl_LIBOBJS pselect.$ac_objext" + + fi + + + + + + GNULIB_PSELECT=1 + + + + + + + + + +>>>>>>> MERGE-SOURCE LIB_PTHREAD_SIGMASK= @@@ -21199,8 -22006,7 +22016,12 @@@ f ++<<<<<<< TREE +>>>>>>> MERGE-SOURCE + ac_fn_c_check_type "$LINENO" "socklen_t" "ac_cv_type_socklen_t" " ++======= + ac_fn_c_check_type "$LINENO" "socklen_t" "ac_cv_type_socklen_t" " ++>>>>>>> MERGE-SOURCE /* is not needed according to POSIX, but the in i386-unknown-freebsd4.10 and powerpc-apple-darwin5.5 required it. */ @@@ -21297,6 -22103,144 +22118,147 @@@ $as_echo "#define ssize_t int" >>confde fi ++<<<<<<< TREE ++======= + + + + ac_fn_c_check_member "$LINENO" "struct stat" "st_atim.tv_nsec" "ac_cv_member_struct_stat_st_atim_tv_nsec" "#include + #include + " + if test "x$ac_cv_member_struct_stat_st_atim_tv_nsec" = x""yes; then : + + cat >>confdefs.h <<_ACEOF + #define HAVE_STRUCT_STAT_ST_ATIM_TV_NSEC 1 + _ACEOF + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether struct stat.st_atim is of type struct timespec" >&5 + $as_echo_n "checking whether struct stat.st_atim is of type struct timespec... " >&6; } + if test "${ac_cv_typeof_struct_stat_st_atim_is_struct_timespec+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + + #include + #include + #if HAVE_SYS_TIME_H + # include + #endif + #include + struct timespec ts; + struct stat st; + + int + main () + { + + st.st_atim = ts; + + ; + return 0; + } + _ACEOF + if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_typeof_struct_stat_st_atim_is_struct_timespec=yes + else + ac_cv_typeof_struct_stat_st_atim_is_struct_timespec=no + fi + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_typeof_struct_stat_st_atim_is_struct_timespec" >&5 + $as_echo "$ac_cv_typeof_struct_stat_st_atim_is_struct_timespec" >&6; } + if test $ac_cv_typeof_struct_stat_st_atim_is_struct_timespec = yes; then + + $as_echo "#define TYPEOF_STRUCT_STAT_ST_ATIM_IS_STRUCT_TIMESPEC 1" >>confdefs.h + + fi + else + ac_fn_c_check_member "$LINENO" "struct stat" "st_atimespec.tv_nsec" "ac_cv_member_struct_stat_st_atimespec_tv_nsec" "#include + #include + " + if test "x$ac_cv_member_struct_stat_st_atimespec_tv_nsec" = x""yes; then : + + cat >>confdefs.h <<_ACEOF + #define HAVE_STRUCT_STAT_ST_ATIMESPEC_TV_NSEC 1 + _ACEOF + + + else + ac_fn_c_check_member "$LINENO" "struct stat" "st_atimensec" "ac_cv_member_struct_stat_st_atimensec" "#include + #include + " + if test "x$ac_cv_member_struct_stat_st_atimensec" = x""yes; then : + + cat >>confdefs.h <<_ACEOF + #define HAVE_STRUCT_STAT_ST_ATIMENSEC 1 + _ACEOF + + + else + ac_fn_c_check_member "$LINENO" "struct stat" "st_atim.st__tim.tv_nsec" "ac_cv_member_struct_stat_st_atim_st__tim_tv_nsec" "#include + #include + " + if test "x$ac_cv_member_struct_stat_st_atim_st__tim_tv_nsec" = x""yes; then : + + cat >>confdefs.h <<_ACEOF + #define HAVE_STRUCT_STAT_ST_ATIM_ST__TIM_TV_NSEC 1 + _ACEOF + + + fi + + fi + + fi + + fi + + + + + + ac_fn_c_check_member "$LINENO" "struct stat" "st_birthtimespec.tv_nsec" "ac_cv_member_struct_stat_st_birthtimespec_tv_nsec" "#include + #include + " + if test "x$ac_cv_member_struct_stat_st_birthtimespec_tv_nsec" = x""yes; then : + + cat >>confdefs.h <<_ACEOF + #define HAVE_STRUCT_STAT_ST_BIRTHTIMESPEC_TV_NSEC 1 + _ACEOF + + + else + ac_fn_c_check_member "$LINENO" "struct stat" "st_birthtimensec" "ac_cv_member_struct_stat_st_birthtimensec" "#include + #include + " + if test "x$ac_cv_member_struct_stat_st_birthtimensec" = x""yes; then : + + cat >>confdefs.h <<_ACEOF + #define HAVE_STRUCT_STAT_ST_BIRTHTIMENSEC 1 + _ACEOF + + + else + ac_fn_c_check_member "$LINENO" "struct stat" "st_birthtim.tv_nsec" "ac_cv_member_struct_stat_st_birthtim_tv_nsec" "#include + #include + " + if test "x$ac_cv_member_struct_stat_st_birthtim_tv_nsec" = x""yes; then : + + cat >>confdefs.h <<_ACEOF + #define HAVE_STRUCT_STAT_ST_BIRTHTIM_TV_NSEC 1 + _ACEOF + + + fi + + fi + + fi + + + ++>>>>>>> MERGE-SOURCE { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working stdalign.h" >&5 $as_echo_n "checking for working stdalign.h... " >&6; } if test "${gl_cv_header_working_stdalign_h+set}" = set; then : @@@ -22783,1778 -23828,17 +23743,1778 @@@ if test "x$ac_cv_func_strtoll" = x""yes _ACEOF fi -done - - if test $ac_cv_func_strtoll = no; then - HAVE_STRTOLL=0 - fi - fi +done + + if test $ac_cv_func_strtoll = no; then + HAVE_STRTOLL=0 + fi + fi + - if test $HAVE_STRTOLL = 0; then ++ if test $HAVE_STRTOLL = 0; then + + + + + + + + + gl_LIBOBJS="$gl_LIBOBJS strtoll.$ac_objext" + + + : + - fi ++ 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 "$ac_cv_type_unsigned_long_long_int" = yes; then + for ac_func in strtoull +do : + ac_fn_c_check_func "$LINENO" "strtoull" "ac_cv_func_strtoull" +if test "x$ac_cv_func_strtoull" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_STRTOULL 1 +_ACEOF + +fi +done + + if test $ac_cv_func_strtoull = no; then + HAVE_STRTOULL=0 + fi + fi + - if test $HAVE_STRTOULL = 0; then ++ if test $HAVE_STRTOULL = 0; then + + + + + + + + + gl_LIBOBJS="$gl_LIBOBJS strtoull.$ac_objext" + + + : + - fi ++ fi + + + + + + GNULIB_STRTOULL=1 + + + + + + gl_gnulib_enabled_strtoull=true + fi + } + func_gl_gnulib_m4code_verify () + { + if ! $gl_gnulib_enabled_verify; then + gl_gnulib_enabled_verify=true + fi + } + if test $REPLACE_GETOPT = 1; then + func_gl_gnulib_m4code_be453cec5eecf5731a274f2de7f2db36 + fi + if test $REPLACE_LSTAT = 1; then + func_gl_gnulib_m4code_dosname + fi + if test $REPLACE_LSTAT = 1; then + func_gl_gnulib_m4code_stat + fi + 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 + func_gl_gnulib_m4code_strtoull + fi + if test $ac_cv_func_strtoumax = no; then + func_gl_gnulib_m4code_verify + fi + + if $gl_gnulib_enabled_dosname; then + gl_GNULIB_ENABLED_dosname_TRUE= + gl_GNULIB_ENABLED_dosname_FALSE='#' +else + gl_GNULIB_ENABLED_dosname_TRUE='#' + gl_GNULIB_ENABLED_dosname_FALSE= +fi + + if $gl_gnulib_enabled_be453cec5eecf5731a274f2de7f2db36; then + gl_GNULIB_ENABLED_be453cec5eecf5731a274f2de7f2db36_TRUE= + gl_GNULIB_ENABLED_be453cec5eecf5731a274f2de7f2db36_FALSE='#' +else + gl_GNULIB_ENABLED_be453cec5eecf5731a274f2de7f2db36_TRUE='#' + gl_GNULIB_ENABLED_be453cec5eecf5731a274f2de7f2db36_FALSE= +fi + +<<<<<<< TREE +======= + if $gl_gnulib_enabled_pathmax; then + gl_GNULIB_ENABLED_pathmax_TRUE= + gl_GNULIB_ENABLED_pathmax_FALSE='#' +else + gl_GNULIB_ENABLED_pathmax_TRUE='#' + gl_GNULIB_ENABLED_pathmax_FALSE= +fi + + if $gl_gnulib_enabled_sigprocmask; then + gl_GNULIB_ENABLED_sigprocmask_TRUE= + gl_GNULIB_ENABLED_sigprocmask_FALSE='#' +else + gl_GNULIB_ENABLED_sigprocmask_TRUE='#' + gl_GNULIB_ENABLED_sigprocmask_FALSE= +fi + +>>>>>>> MERGE-SOURCE + if $gl_gnulib_enabled_stat; then + gl_GNULIB_ENABLED_stat_TRUE= + gl_GNULIB_ENABLED_stat_FALSE='#' +else + gl_GNULIB_ENABLED_stat_TRUE='#' + gl_GNULIB_ENABLED_stat_FALSE= +fi + + if $gl_gnulib_enabled_strtoull; then + gl_GNULIB_ENABLED_strtoull_TRUE= + gl_GNULIB_ENABLED_strtoull_FALSE='#' +else + gl_GNULIB_ENABLED_strtoull_TRUE='#' + gl_GNULIB_ENABLED_strtoull_FALSE= +fi + + if $gl_gnulib_enabled_verify; then + gl_GNULIB_ENABLED_verify_TRUE= + gl_GNULIB_ENABLED_verify_FALSE='#' +else + gl_GNULIB_ENABLED_verify_TRUE='#' + gl_GNULIB_ENABLED_verify_FALSE= +fi + + # End of code from modules + + + + + + + + + + gltests_libdeps= + gltests_ltlibdeps= + + + + + + + + + + gl_source_base='tests' + gltests_WITNESS=IN_`echo "${PACKAGE-$PACKAGE_TARNAME}" | LC_ALL=C tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ | LC_ALL=C sed -e 's/[^A-Z0-9_]/_/g'`_GNULIB_TESTS + + gl_module_indicator_condition=$gltests_WITNESS + + + + + + + + + + + LIBGNU_LIBDEPS="$gl_libdeps" + + LIBGNU_LTLIBDEPS="$gl_ltlibdeps" + + + +# UNIX98 PTYs. +for ac_func in grantpt +do : + ac_fn_c_check_func "$LINENO" "grantpt" "ac_cv_func_grantpt" +if test "x$ac_cv_func_grantpt" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_GRANTPT 1 +_ACEOF + +fi +done + + +# PTY-related GNU extensions. +for ac_func in getpt +do : + ac_fn_c_check_func "$LINENO" "getpt" "ac_cv_func_getpt" +if test "x$ac_cv_func_getpt" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_GETPT 1 +_ACEOF + +fi +done + + +# Check this now, so that we will NOT find the above functions in ncurses. +# That is because we have not set up to link ncurses in lib-src. +# It's better to believe a function is not available +# than to expect to find it in ncurses. +# Also we need tputs and friends to be able to build at all. +have_tputs_et_al=true +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing tputs" >&5 +$as_echo_n "checking for library containing tputs... " >&6; } +if test "${ac_cv_search_tputs+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + ac_func_search_save_LIBS=$LIBS +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char tputs (); +int +main () +{ +return tputs (); + ; + return 0; +} +_ACEOF +for ac_lib in '' ncurses terminfo termcap; do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + if ac_fn_c_try_link "$LINENO"; then : + ac_cv_search_tputs=$ac_res +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext + if test "${ac_cv_search_tputs+set}" = set; then : + break +fi +done +if test "${ac_cv_search_tputs+set}" = set; then : + +else + ac_cv_search_tputs=no +fi +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_tputs" >&5 +$as_echo "$ac_cv_search_tputs" >&6; } +ac_res=$ac_cv_search_tputs +if test "$ac_res" != no; then : + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + +else + have_tputs_et_al=false +fi + +if test "$have_tputs_et_al" != true; then + as_fn_error "I couldn't find termcap functions (tputs and friends). +Maybe some development libraries/packages are missing? Try installing +libncurses-dev(el), libterminfo-dev(el) or similar." "$LINENO" 5 +fi +# Must define this when any termcap library is found. + +$as_echo "#define HAVE_LIBNCURSES 1" >>confdefs.h + +## FIXME This was the cpp logic, but I am not sure it is right. +## The above test has not necessarily found libncurses. +HAVE_LIBNCURSES=yes + +## Use terminfo instead of termcap? +## Note only system files NOT using terminfo are: +## freebsd < 40000, ms-w32, msdos, netbsd < 599002500, and +## darwin|gnu without ncurses. +TERMINFO=no +LIBS_TERMCAP= +case "$opsys" in + ## cygwin: Fewer environment variables to go wrong, more terminal types. + ## hpux10-20: Use the system provided termcap(3) library. + ## openbsd: David Mazieres says this + ## is necessary. Otherwise Emacs dumps core when run -nw. + aix4-2|cygwin|hpux*|irix6-5|openbsd|sol2*|unixware) TERMINFO=yes ;; + + ## darwin: Prevents crashes when running Emacs in Terminal.app under 10.2. + ## The ncurses library has been moved out of the System framework in + ## Mac OS X 10.2. So if configure detects it, set the command-line + ## option to use it. + darwin|gnu*) + ## (HAVE_LIBNCURSES was not always true, but is since 2010-03-18.) + if test "x$HAVE_LIBNCURSES" = "xyes"; then + TERMINFO=yes + LIBS_TERMCAP="-lncurses" + fi + ;; + + freebsd) + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether FreeBSD is new enough to use terminfo" >&5 +$as_echo_n "checking whether FreeBSD is new enough to use terminfo... " >&6; } + if test "${emacs_cv_freebsd_terminfo+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +int +main () +{ +#if __FreeBSD_version < 400000 +fail; +#endif + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + emacs_cv_freebsd_terminfo=yes +else + emacs_cv_freebsd_terminfo=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi + + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $emacs_cv_freebsd_terminfo" >&5 +$as_echo "$emacs_cv_freebsd_terminfo" >&6; } + + if test $emacs_cv_freebsd_terminfo = yes; then + TERMINFO=yes + LIBS_TERMCAP="-lncurses" + else + LIBS_TERMCAP="-ltermcap" + fi + ;; + + netbsd) + if test $ac_cv_search_tputs = -lterminfo; then + TERMINFO=yes + LIBS_TERMCAP="-lterminfo" + else + LIBS_TERMCAP="-ltermcap" + fi + ;; + +esac + +case "$opsys" in + ## hpux: Make sure we get select from libc rather than from libcurses + ## because libcurses on HPUX 10.10 has a broken version of select. + ## We used to use -lc -lcurses, but this may be cleaner. + hpux*) LIBS_TERMCAP="-ltermcap" ;; + + openbsd) LIBS_TERMCAP="-lncurses" ;; + + ## Must use system termcap, if we use any termcap. It does special things. + sol2*) test "$TERMINFO" != yes && LIBS_TERMCAP="-ltermcap" ;; +esac + +TERMCAP_OBJ=tparam.o +if test $TERMINFO = yes; then + +$as_echo "#define TERMINFO 1" >>confdefs.h + + + ## Default used to be -ltermcap. Add a case above if need something else. + test "x$LIBS_TERMCAP" = "x" && LIBS_TERMCAP="-lcurses" + + TERMCAP_OBJ=terminfo.o +fi + + + + +# Do we have res_init, for detecting changes in /etc/resolv.conf? +resolv=no +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +#include +#include +int +main () +{ +return res_init(); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + have_res_init=yes +else + have_res_init=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +if test "$have_res_init" = no; then + OLIBS="$LIBS" + LIBS="$LIBS -lresolv" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for res_init with -lresolv" >&5 +$as_echo_n "checking for res_init with -lresolv... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +#include +#include +int +main () +{ +return res_init(); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + have_res_init=yes +else + have_res_init=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_res_init" >&5 +$as_echo "$have_res_init" >&6; } + if test "$have_res_init" = yes ; then + resolv=yes + fi + LIBS="$OLIBS" +fi + +if test "$have_res_init" = yes; then + +$as_echo "#define HAVE_RES_INIT 1" >>confdefs.h + +fi + +# Do we need the Hesiod library to provide the support routines? +LIBHESIOD= +if test "$with_hesiod" != no ; then + # Don't set $LIBS here -- see comments above. FIXME which comments? + ac_fn_c_check_func "$LINENO" "res_send" "ac_cv_func_res_send" +if test "x$ac_cv_func_res_send" = x""yes; then : + +else + ac_fn_c_check_func "$LINENO" "__res_send" "ac_cv_func___res_send" +if test "x$ac_cv_func___res_send" = x""yes; then : + +else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for res_send in -lresolv" >&5 +$as_echo_n "checking for res_send in -lresolv... " >&6; } +if test "${ac_cv_lib_resolv_res_send+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lresolv $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char res_send (); +int +main () +{ +return res_send (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_resolv_res_send=yes +else + ac_cv_lib_resolv_res_send=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv_res_send" >&5 +$as_echo "$ac_cv_lib_resolv_res_send" >&6; } +if test "x$ac_cv_lib_resolv_res_send" = x""yes; then : + resolv=yes +else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __res_send in -lresolv" >&5 +$as_echo_n "checking for __res_send in -lresolv... " >&6; } +if test "${ac_cv_lib_resolv___res_send+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lresolv $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char __res_send (); +int +main () +{ +return __res_send (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_resolv___res_send=yes +else + ac_cv_lib_resolv___res_send=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv___res_send" >&5 +$as_echo "$ac_cv_lib_resolv___res_send" >&6; } +if test "x$ac_cv_lib_resolv___res_send" = x""yes; then : + resolv=yes +fi + +fi + +fi + +fi + + if test "$resolv" = yes ; then + RESOLVLIB=-lresolv + else + RESOLVLIB= + fi + ac_fn_c_check_func "$LINENO" "hes_getmailhost" "ac_cv_func_hes_getmailhost" +if test "x$ac_cv_func_hes_getmailhost" = x""yes; then : + +else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for hes_getmailhost in -lhesiod" >&5 +$as_echo_n "checking for hes_getmailhost in -lhesiod... " >&6; } +if test "${ac_cv_lib_hesiod_hes_getmailhost+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lhesiod $RESOLVLIB $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char hes_getmailhost (); +int +main () +{ +return hes_getmailhost (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_hesiod_hes_getmailhost=yes +else + ac_cv_lib_hesiod_hes_getmailhost=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_hesiod_hes_getmailhost" >&5 +$as_echo "$ac_cv_lib_hesiod_hes_getmailhost" >&6; } +if test "x$ac_cv_lib_hesiod_hes_getmailhost" = x""yes; then : + hesiod=yes +else + : +fi + +fi + + + if test x"$hesiod" = xyes; then + +$as_echo "#define HAVE_LIBHESIOD 1" >>confdefs.h + + LIBHESIOD=-lhesiod + fi +fi + + +# Do we need libresolv (due to res_init or Hesiod)? +if test "$resolv" = yes ; then + +$as_echo "#define HAVE_LIBRESOLV 1" >>confdefs.h + + LIBRESOLV=-lresolv +else + LIBRESOLV= +fi + + +# These tell us which Kerberos-related libraries to use. +COM_ERRLIB= +CRYPTOLIB= +KRB5LIB= +DESLIB= +KRB4LIB= + +if test "${with_kerberos}" != no; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for com_err in -lcom_err" >&5 +$as_echo_n "checking for com_err in -lcom_err... " >&6; } +if test "${ac_cv_lib_com_err_com_err+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lcom_err $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char com_err (); +int +main () +{ +return com_err (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_com_err_com_err=yes +else + ac_cv_lib_com_err_com_err=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_com_err_com_err" >&5 +$as_echo "$ac_cv_lib_com_err_com_err" >&6; } +if test "x$ac_cv_lib_com_err_com_err" = x""yes; then : + have_com_err=yes +else + have_com_err=no +fi + + if test $have_com_err = yes; then + COM_ERRLIB=-lcom_err + LIBS="$COM_ERRLIB $LIBS" + +$as_echo "#define HAVE_LIBCOM_ERR 1" >>confdefs.h + + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mit_des_cbc_encrypt in -lcrypto" >&5 +$as_echo_n "checking for mit_des_cbc_encrypt in -lcrypto... " >&6; } +if test "${ac_cv_lib_crypto_mit_des_cbc_encrypt+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lcrypto $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char mit_des_cbc_encrypt (); +int +main () +{ +return mit_des_cbc_encrypt (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_crypto_mit_des_cbc_encrypt=yes +else + ac_cv_lib_crypto_mit_des_cbc_encrypt=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypto_mit_des_cbc_encrypt" >&5 +$as_echo "$ac_cv_lib_crypto_mit_des_cbc_encrypt" >&6; } +if test "x$ac_cv_lib_crypto_mit_des_cbc_encrypt" = x""yes; then : + have_crypto=yes +else + have_crypto=no +fi + + if test $have_crypto = yes; then + CRYPTOLIB=-lcrypto + LIBS="$CRYPTOLIB $LIBS" + +$as_echo "#define HAVE_LIBCRYPTO 1" >>confdefs.h + + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mit_des_cbc_encrypt in -lk5crypto" >&5 +$as_echo_n "checking for mit_des_cbc_encrypt in -lk5crypto... " >&6; } +if test "${ac_cv_lib_k5crypto_mit_des_cbc_encrypt+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lk5crypto $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char mit_des_cbc_encrypt (); +int +main () +{ +return mit_des_cbc_encrypt (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_k5crypto_mit_des_cbc_encrypt=yes +else + ac_cv_lib_k5crypto_mit_des_cbc_encrypt=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_k5crypto_mit_des_cbc_encrypt" >&5 +$as_echo "$ac_cv_lib_k5crypto_mit_des_cbc_encrypt" >&6; } +if test "x$ac_cv_lib_k5crypto_mit_des_cbc_encrypt" = x""yes; then : + have_k5crypto=yes +else + have_k5crypto=no +fi + + if test $have_k5crypto = yes; then + CRYPTOLIB=-lk5crypto + LIBS="$CRYPTOLIB $LIBS" + +$as_echo "#define HAVE_LIBK5CRYPTO 1" >>confdefs.h + + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for krb5_init_context in -lkrb5" >&5 +$as_echo_n "checking for krb5_init_context in -lkrb5... " >&6; } +if test "${ac_cv_lib_krb5_krb5_init_context+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lkrb5 $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char krb5_init_context (); +int +main () +{ +return krb5_init_context (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_krb5_krb5_init_context=yes +else + ac_cv_lib_krb5_krb5_init_context=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_krb5_krb5_init_context" >&5 +$as_echo "$ac_cv_lib_krb5_krb5_init_context" >&6; } +if test "x$ac_cv_lib_krb5_krb5_init_context" = x""yes; then : + have_krb5=yes +else + have_krb5=no +fi + + if test $have_krb5=yes; then + KRB5LIB=-lkrb5 + LIBS="$KRB5LIB $LIBS" + +$as_echo "#define HAVE_LIBKRB5 1" >>confdefs.h + + fi + if test "${with_kerberos5}" = no; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for des_cbc_encrypt in -ldes425" >&5 +$as_echo_n "checking for des_cbc_encrypt in -ldes425... " >&6; } +if test "${ac_cv_lib_des425_des_cbc_encrypt+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-ldes425 $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char des_cbc_encrypt (); +int +main () +{ +return des_cbc_encrypt (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_des425_des_cbc_encrypt=yes +else + ac_cv_lib_des425_des_cbc_encrypt=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_des425_des_cbc_encrypt" >&5 +$as_echo "$ac_cv_lib_des425_des_cbc_encrypt" >&6; } +if test "x$ac_cv_lib_des425_des_cbc_encrypt" = x""yes; then : + have_des425=yes +else + have_des425=no +fi + + if test $have_des425 = yes; then + DESLIB=-ldes425 + LIBS="$DESLIB $LIBS" + +$as_echo "#define HAVE_LIBDES425 1" >>confdefs.h + + else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for des_cbc_encrypt in -ldes" >&5 +$as_echo_n "checking for des_cbc_encrypt in -ldes... " >&6; } +if test "${ac_cv_lib_des_des_cbc_encrypt+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-ldes $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char des_cbc_encrypt (); +int +main () +{ +return des_cbc_encrypt (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_des_des_cbc_encrypt=yes +else + ac_cv_lib_des_des_cbc_encrypt=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_des_des_cbc_encrypt" >&5 +$as_echo "$ac_cv_lib_des_des_cbc_encrypt" >&6; } +if test "x$ac_cv_lib_des_des_cbc_encrypt" = x""yes; then : + have_des=yes +else + have_des=no +fi + + if test $have_des = yes; then + DESLIB=-ldes + LIBS="$DESLIB $LIBS" + +$as_echo "#define HAVE_LIBDES 1" >>confdefs.h + + fi + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for krb_get_cred in -lkrb4" >&5 +$as_echo_n "checking for krb_get_cred in -lkrb4... " >&6; } +if test "${ac_cv_lib_krb4_krb_get_cred+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lkrb4 $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char krb_get_cred (); +int +main () +{ +return krb_get_cred (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_krb4_krb_get_cred=yes +else + ac_cv_lib_krb4_krb_get_cred=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_krb4_krb_get_cred" >&5 +$as_echo "$ac_cv_lib_krb4_krb_get_cred" >&6; } +if test "x$ac_cv_lib_krb4_krb_get_cred" = x""yes; then : + have_krb4=yes +else + have_krb4=no +fi + + if test $have_krb4 = yes; then + KRB4LIB=-lkrb4 + LIBS="$KRB4LIB $LIBS" + +$as_echo "#define HAVE_LIBKRB4 1" >>confdefs.h + + else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for krb_get_cred in -lkrb" >&5 +$as_echo_n "checking for krb_get_cred in -lkrb... " >&6; } +if test "${ac_cv_lib_krb_krb_get_cred+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lkrb $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char krb_get_cred (); +int +main () +{ +return krb_get_cred (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_krb_krb_get_cred=yes +else + ac_cv_lib_krb_krb_get_cred=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_krb_krb_get_cred" >&5 +$as_echo "$ac_cv_lib_krb_krb_get_cred" >&6; } +if test "x$ac_cv_lib_krb_krb_get_cred" = x""yes; then : + have_krb=yes +else + have_krb=no +fi + + if test $have_krb = yes; then + KRB4LIB=-lkrb + LIBS="$KRB4LIB $LIBS" + +$as_echo "#define HAVE_LIBKRB 1" >>confdefs.h + + fi + fi + fi + + if test "${with_kerberos5}" != no; then + for ac_header in krb5.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "krb5.h" "ac_cv_header_krb5_h" "$ac_includes_default" +if test "x$ac_cv_header_krb5_h" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_KRB5_H 1 +_ACEOF + ac_fn_c_check_member "$LINENO" "krb5_error" "text" "ac_cv_member_krb5_error_text" "#include +" +if test "x$ac_cv_member_krb5_error_text" = x""yes; then : + +cat >>confdefs.h <<_ACEOF +#define HAVE_KRB5_ERROR_TEXT 1 +_ACEOF + + +fi +ac_fn_c_check_member "$LINENO" "krb5_error" "e_text" "ac_cv_member_krb5_error_e_text" "#include +" +if test "x$ac_cv_member_krb5_error_e_text" = x""yes; then : + +cat >>confdefs.h <<_ACEOF +#define HAVE_KRB5_ERROR_E_TEXT 1 +_ACEOF + + +fi + +fi + +done + + else + for ac_header in des.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "des.h" "ac_cv_header_des_h" "$ac_includes_default" +if test "x$ac_cv_header_des_h" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_DES_H 1 +_ACEOF + +else + for ac_header in kerberosIV/des.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "kerberosIV/des.h" "ac_cv_header_kerberosIV_des_h" "$ac_includes_default" +if test "x$ac_cv_header_kerberosIV_des_h" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_KERBEROSIV_DES_H 1 +_ACEOF + +else + for ac_header in kerberos/des.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "kerberos/des.h" "ac_cv_header_kerberos_des_h" "$ac_includes_default" +if test "x$ac_cv_header_kerberos_des_h" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_KERBEROS_DES_H 1 +_ACEOF + +fi + +done + +fi + +done + +fi + +done + + for ac_header in krb.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "krb.h" "ac_cv_header_krb_h" "$ac_includes_default" +if test "x$ac_cv_header_krb_h" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_KRB_H 1 +_ACEOF + +else + for ac_header in kerberosIV/krb.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "kerberosIV/krb.h" "ac_cv_header_kerberosIV_krb_h" "$ac_includes_default" +if test "x$ac_cv_header_kerberosIV_krb_h" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_KERBEROSIV_KRB_H 1 +_ACEOF + +else + for ac_header in kerberos/krb.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "kerberos/krb.h" "ac_cv_header_kerberos_krb_h" "$ac_includes_default" +if test "x$ac_cv_header_kerberos_krb_h" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_KERBEROS_KRB_H 1 +_ACEOF + +fi + +done + +fi + +done + +fi + +done + + fi + for ac_header in com_err.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "com_err.h" "ac_cv_header_com_err_h" "$ac_includes_default" +if test "x$ac_cv_header_com_err_h" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_COM_ERR_H 1 +_ACEOF + +fi + +done + +fi + + + + + + + +# Solaris requires -lintl if you want strerror (which calls dgettext) +# to return localized messages. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dgettext in -lintl" >&5 +$as_echo_n "checking for dgettext in -lintl... " >&6; } +if test "${ac_cv_lib_intl_dgettext+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lintl $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char dgettext (); +int +main () +{ +return dgettext (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_intl_dgettext=yes +else + ac_cv_lib_intl_dgettext=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_dgettext" >&5 +$as_echo "$ac_cv_lib_intl_dgettext" >&6; } +if test "x$ac_cv_lib_intl_dgettext" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBINTL 1 +_ACEOF + + LIBS="-lintl $LIBS" + +fi + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether localtime caches TZ" >&5 +$as_echo_n "checking whether localtime caches TZ... " >&6; } +if test "${emacs_cv_localtime_cache+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + if test x$ac_cv_func_tzset = xyes; then +if test "$cross_compiling" = yes; then : + # If we have tzset, assume the worst when cross-compiling. +emacs_cv_localtime_cache=yes +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +char TZ_GMT0[] = "TZ=GMT0"; +char TZ_PST8[] = "TZ=PST8"; +main() +{ + time_t now = time ((time_t *) 0); + int hour_GMT0, hour_unset; + if (putenv (TZ_GMT0) != 0) + exit (1); + hour_GMT0 = localtime (&now)->tm_hour; + unsetenv("TZ"); + hour_unset = localtime (&now)->tm_hour; + if (putenv (TZ_PST8) != 0) + exit (1); + if (localtime (&now)->tm_hour == hour_GMT0) + exit (1); + unsetenv("TZ"); + if (localtime (&now)->tm_hour != hour_unset) + exit (1); + exit (0); +} +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + emacs_cv_localtime_cache=no +else + emacs_cv_localtime_cache=yes +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + +else + # If we lack tzset, report that localtime does not cache TZ, + # since we can't invalidate the cache if we don't have tzset. + emacs_cv_localtime_cache=no +fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $emacs_cv_localtime_cache" >&5 +$as_echo "$emacs_cv_localtime_cache" >&6; } +if test $emacs_cv_localtime_cache = yes; then + +$as_echo "#define LOCALTIME_CACHE 1" >>confdefs.h + +fi + +if test "x$HAVE_TIMEVAL" = xyes; then + for ac_func in gettimeofday +do : + ac_fn_c_check_func "$LINENO" "gettimeofday" "ac_cv_func_gettimeofday" +if test "x$ac_cv_func_gettimeofday" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_GETTIMEOFDAY 1 +_ACEOF + +fi +done + + if test $ac_cv_func_gettimeofday = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether gettimeofday can accept two arguments" >&5 +$as_echo_n "checking whether gettimeofday can accept two arguments... " >&6; } +if test "${emacs_cv_gettimeofday_two_arguments+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#ifdef TIME_WITH_SYS_TIME +#include +#include +#else +#ifdef HAVE_SYS_TIME_H +#include +#else +#include +#endif +#endif +int +main () +{ +struct timeval time; + gettimeofday (&time, 0); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + emacs_cv_gettimeofday_two_arguments=yes +else + emacs_cv_gettimeofday_two_arguments=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $emacs_cv_gettimeofday_two_arguments" >&5 +$as_echo "$emacs_cv_gettimeofday_two_arguments" >&6; } + if test $emacs_cv_gettimeofday_two_arguments = no; then + +$as_echo "#define GETTIMEOFDAY_ONE_ARGUMENT 1" >>confdefs.h + + fi + fi +fi + +ok_so_far=yes +ac_fn_c_check_func "$LINENO" "socket" "ac_cv_func_socket" +if test "x$ac_cv_func_socket" = x""yes; then : + +else + ok_so_far=no +fi + +if test $ok_so_far = yes; then + ac_fn_c_check_header_mongrel "$LINENO" "netinet/in.h" "ac_cv_header_netinet_in_h" "$ac_includes_default" +if test "x$ac_cv_header_netinet_in_h" = x""yes; then : + +else + ok_so_far=no +fi + + +fi +if test $ok_so_far = yes; then + ac_fn_c_check_header_mongrel "$LINENO" "arpa/inet.h" "ac_cv_header_arpa_inet_h" "$ac_includes_default" +if test "x$ac_cv_header_arpa_inet_h" = x""yes; then : + +else + ok_so_far=no +fi + + +fi +if test $ok_so_far = yes; then + +$as_echo "#define HAVE_INET_SOCKETS 1" >>confdefs.h + +fi + +if test -f /usr/lpp/X11/bin/smt.exp; then + +$as_echo "#define HAVE_AIX_SMT_EXP 1" >>confdefs.h + +fi + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether system supports dynamic ptys" >&5 +$as_echo_n "checking whether system supports dynamic ptys... " >&6; } +if test -d /dev/pts && ls -d /dev/ptmx > /dev/null 2>&1 ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + +$as_echo "#define HAVE_DEV_PTMX 1" >>confdefs.h + +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + +ac_fn_c_check_type "$LINENO" "pid_t" "ac_cv_type_pid_t" "$ac_includes_default" +if test "x$ac_cv_type_pid_t" = x""yes; then : + +else + +cat >>confdefs.h <<_ACEOF +#define pid_t int +_ACEOF + +fi + +for ac_header in vfork.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "vfork.h" "ac_cv_header_vfork_h" "$ac_includes_default" +if test "x$ac_cv_header_vfork_h" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_VFORK_H 1 +_ACEOF + +fi + +done + +for ac_func in fork vfork +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" +eval as_val=\$$as_ac_var + if test "x$as_val" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF + +fi +done + +if test "x$ac_cv_func_fork" = xyes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working fork" >&5 +$as_echo_n "checking for working fork... " >&6; } +if test "${ac_cv_func_fork_works+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + if test "$cross_compiling" = yes; then : + ac_cv_func_fork_works=cross +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$ac_includes_default +int +main () +{ + + /* By Ruediger Kuhlmann. */ + return fork () < 0; + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + ac_cv_func_fork_works=yes +else + ac_cv_func_fork_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 + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_fork_works" >&5 +$as_echo "$ac_cv_func_fork_works" >&6; } + +else + ac_cv_func_fork_works=$ac_cv_func_fork +fi +if test "x$ac_cv_func_fork_works" = xcross; then + case $host in + *-*-amigaos* | *-*-msdosdjgpp*) + # Override, as these systems have only a dummy fork() stub + ac_cv_func_fork_works=no + ;; + *) + ac_cv_func_fork_works=yes + ;; + esac + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: result $ac_cv_func_fork_works guessed because of cross compilation" >&5 +$as_echo "$as_me: WARNING: result $ac_cv_func_fork_works guessed because of cross compilation" >&2;} +fi +ac_cv_func_vfork_works=$ac_cv_func_vfork +if test "x$ac_cv_func_vfork" = xyes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working vfork" >&5 +$as_echo_n "checking for working vfork... " >&6; } +if test "${ac_cv_func_vfork_works+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + if test "$cross_compiling" = yes; then : + ac_cv_func_vfork_works=cross +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +/* Thanks to Paul Eggert for this test. */ +$ac_includes_default +#include +#ifdef HAVE_VFORK_H +# include +#endif +/* On some sparc systems, changes by the child to local and incoming + argument registers are propagated back to the parent. The compiler + is told about this with #include , but some compilers + (e.g. gcc -O) don't grok . Test for this by using a + static variable whose address is put into a register that is + clobbered by the vfork. */ +static void +#ifdef __cplusplus +sparc_address_test (int arg) +# else +sparc_address_test (arg) int arg; +#endif +{ + static pid_t child; + if (!child) { + child = vfork (); + if (child < 0) { + perror ("vfork"); + _exit(2); + } + if (!child) { + arg = getpid(); + write(-1, "", 0); + _exit (arg); + } + } +} + +int +main () +{ + pid_t parent = getpid (); + pid_t child; + + sparc_address_test (0); + + child = vfork (); + + if (child == 0) { + /* Here is another test for sparc vfork register problems. This + test uses lots of local variables, at least as many local + variables as main has allocated so far including compiler + temporaries. 4 locals are enough for gcc 1.40.3 on a Solaris + 4.1.3 sparc, but we use 8 to be safe. A buggy compiler should + reuse the register of parent for one of the local variables, + since it will think that parent can't possibly be used any more + in this routine. Assigning to the local variable will thus + munge parent in the parent process. */ + pid_t + p = getpid(), p1 = getpid(), p2 = getpid(), p3 = getpid(), + p4 = getpid(), p5 = getpid(), p6 = getpid(), p7 = getpid(); + /* Convince the compiler that p..p7 are live; otherwise, it might + use the same hardware register for all 8 local variables. */ + if (p != p1 || p != p2 || p != p3 || p != p4 + || p != p5 || p != p6 || p != p7) + _exit(1); + + /* On some systems (e.g. IRIX 3.3), vfork doesn't separate parent + from child file descriptors. If the child closes a descriptor + before it execs or exits, this munges the parent's descriptor + as well. Test for this by closing stdout in the child. */ + _exit(close(fileno(stdout)) != 0); + } else { + int status; + struct stat st; + + while (wait(&status) != child) + ; + return ( + /* Was there some problem with vforking? */ + child < 0 + + /* Did the child fail? (This shouldn't happen.) */ + || status + + /* Did the vfork/compiler bug occur? */ + || parent != getpid() + + /* Did the file descriptor bug occur? */ + || fstat(fileno(stdout), &st) != 0 + ); + } +} +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + ac_cv_func_vfork_works=yes +else + ac_cv_func_vfork_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 + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_vfork_works" >&5 +$as_echo "$ac_cv_func_vfork_works" >&6; } + +fi; +if test "x$ac_cv_func_fork_works" = xcross; then + ac_cv_func_vfork_works=$ac_cv_func_vfork + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: result $ac_cv_func_vfork_works guessed because of cross compilation" >&5 +$as_echo "$as_me: WARNING: result $ac_cv_func_vfork_works guessed because of cross compilation" >&2;} +fi + +if test "x$ac_cv_func_vfork_works" = xyes; then + +$as_echo "#define HAVE_WORKING_VFORK 1" >>confdefs.h + +else + +$as_echo "#define vfork fork" >>confdefs.h + +fi +if test "x$ac_cv_func_fork_works" = xyes; then + +$as_echo "#define HAVE_WORKING_FORK 1" >>confdefs.h + +fi + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for nl_langinfo and CODESET" >&5 +$as_echo_n "checking for nl_langinfo and CODESET... " >&6; } +if test "${emacs_cv_langinfo_codeset+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +int +main () +{ +char* cs = nl_langinfo(CODESET); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + emacs_cv_langinfo_codeset=yes +else + emacs_cv_langinfo_codeset=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $emacs_cv_langinfo_codeset" >&5 +$as_echo "$emacs_cv_langinfo_codeset" >&6; } +if test $emacs_cv_langinfo_codeset = yes; then + +$as_echo "#define HAVE_LANGINFO_CODESET 1" >>confdefs.h + +fi + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for mbstate_t" >&5 +$as_echo_n "checking for mbstate_t... " >&6; } +if test "${ac_cv_type_mbstate_t+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$ac_includes_default +# include +int +main () +{ +mbstate_t x; return sizeof x; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_type_mbstate_t=yes +else + ac_cv_type_mbstate_t=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_mbstate_t" >&5 +$as_echo "$ac_cv_type_mbstate_t" >&6; } + if test $ac_cv_type_mbstate_t = yes; then + +$as_echo "#define HAVE_MBSTATE_T 1" >>confdefs.h + + else + +$as_echo "#define mbstate_t int" >>confdefs.h + + fi + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C restricted array declarations" >&5 +$as_echo_n "checking for C restricted array declarations... " >&6; } +if test "${emacs_cv_c_restrict_arr+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +void fred (int x[__restrict]); +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + emacs_cv_c_restrict_arr=yes +else + emacs_cv_c_restrict_arr=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $emacs_cv_c_restrict_arr" >&5 +$as_echo "$emacs_cv_c_restrict_arr" >&6; } +if test "$emacs_cv_c_restrict_arr" = yes; then + +$as_echo "#define __restrict_arr __restrict" >>confdefs.h + +fi + + + +# Set up the CFLAGS for real compilation, so we can substitute it. +CFLAGS="$REAL_CFLAGS" +CPPFLAGS="$REAL_CPPFLAGS" + +## Hack to detect a buggy GCC version. +if test "x$GCC" = xyes \ + && test x"`$CC --version 2> /dev/null | grep 'gcc.* 4.5.0'`" != x \ + && test x"`echo $CFLAGS | grep '\-O[23]'`" != x \ + && test x"`echo $CFLAGS | grep '\-fno-optimize-sibling-calls'`" = x; then + as_fn_error "GCC 4.5.0 has problems compiling Emacs; see etc/PROBLEMS'." "$LINENO" 5 +fi - if test $HAVE_STRTOLL = 0; then +version=$PACKAGE_VERSION +### Specify what sort of things we'll be editing into Makefile and config.h. +### Use configuration here uncanonicalized to avoid exceeding size limits. +## Unused? diff --cc configure.ac index 5bceff0f6a0,0e2154aab6e..605f73c5da3 --- a/configure.ac +++ b/configure.ac @@@ -1952,67 -2001,10 +2003,69 @@@ if test "${HAVE_GTK}" = "yes"; the gtk_widget_get_mapped gtk_adjustment_get_page_size \ gtk_orientable_set_orientation \ gtk_window_set_has_resize_grip) + + term_header=gtkutil.h fi + +HAVE_XWIDGETS=no +HAVE_WEBKIT=no +HAVE_GOOCANVAS=no +HAVE_CLUTTER=no +HAVE_GIR=no + +if test "${with_xwidgets}" != "no"; then + echo "xwidgets enabled, checking webkit, and others" + HAVE_XWIDGETS=yes + AC_DEFINE(HAVE_XWIDGETS, 1, [Define to 1 if you have xwidgets support.]) +#xwidgets +#TODO +# - enable only if gtk/gtk3 enabled +# - webkit, goocanvas, clutter +# - only webkit_osr is good so remove plain webkit laterish + +#webkit version for gtk3. + WEBKIT_REQUIRED=1.4.0 + WEBKIT_MODULES="webkitgtk-3.0 >= $WEBKIT_REQUIRED" + + if test "${with_gtk3}" = "yes"; then + PKG_CHECK_MODULES(WEBKIT, $WEBKIT_MODULES, HAVE_WEBKIT=yes, HAVE_WEBKIT=no) + if test $HAVE_WEBKIT = yes; then + AC_DEFINE(HAVE_WEBKIT_OSR, 1, [Define to 1 if you have webkit_osr support.]) + fi + fi + + if test "${with_xwdemo}" = "yes"; then +#clutter and goocanvas are just proof of concept so disable for now + CLUTTER_REQUIRED=1.0.0 + CLUTTER_MODULES="clutter-gtk-1.0 >= $CLUTTER_REQUIRED" + + PKG_CHECK_MODULES(CLUTTER, $CLUTTER_MODULES, HAVE_CLUTTER=yes, HAVE_CLUTTER=no) + if test $HAVE_CLUTTER = yes; then + AC_DEFINE(HAVE_CLUTTER, 1, [Define to 1 if you have clutter support.]) + fi + + + GOOCANVAS_REQUIRED=1.4.0 + GOOCANVAS_MODULES="goocanvasgtk-3.0 >= $GOOCANVAS_REQUIRED" + + PKG_CHECK_MODULES(GOOCANVAS, $GOOCANVAS_MODULES, HAVE_GOOCANVAS=yes, HAVE_GOOCANVAS=no) + if test $HAVE_GOOCANVAS = yes; then + AC_DEFINE(HAVE_GOOCANVAS, 1, [Define to 1 if you have goocanvas support.]) + fi + fi + + GIR_REQUIRED=1.32.1 + GIR_MODULES="gobject-introspection-1.0 >= $GIR_REQUIRED" + PKG_CHECK_MODULES(GIR, $GIR_MODULES, HAVE_GIR=yes, HAVE_GIR=no) + if test $HAVE_GIR = yes; then + AC_DEFINE(HAVE_GIR, 1, [Define to 1 if you have GIR support.]) + fi + + +fi + + dnl D-Bus has been tested under GNU/Linux only. Must be adapted for dnl other platforms. HAVE_DBUS=no diff --cc src/Makefile.in index e4baeb5ffd6,fe4cff5d8cc..a84fdd1caf8 --- a/src/Makefile.in +++ b/src/Makefile.in @@@ -348,11 -342,10 +352,12 @@@ base_obj = dispnew.o frame.o scroll.o x process.o gnutls.o callproc.o \ region-cache.o sound.o atimer.o \ doprnt.o intervals.o textprop.o composite.o xml.o \ + xwidget.o \ - $(MSDOS_OBJ) $(MSDOS_X_OBJ) $(NS_OBJ) $(CYGWIN_OBJ) $(FONT_OBJ) + $(MSDOS_OBJ) $(MSDOS_X_OBJ) $(NS_OBJ) $(CYGWIN_OBJ) $(FONT_OBJ) \ + $(WINDOW_SYSTEM_OBJ) obj = $(base_obj) $(NS_OBJC_OBJ) +xwidget.o: xwidget.c xwidget.h ## Object files used on some machine or other. ## These go in the DOC file on all machines in case they are needed. ## Some of them have no DOC entries, but it does no harm to have them @@@ -394,8 -387,8 +399,9 @@@ otherobj= $(TERMCAP_OBJ) $(PRE_ALLOC_OB ## duplicated symbols. If the standard libraries were compiled ## with GCC, we might need LIB_GCC again after them. LIBES = $(LIBS) $(LIBX_BASE) $(LIBX_OTHER) $(LIBSOUND) \ - $(RSVG_LIBS) $(IMAGEMAGICK_LIBS) $(DBUS_LIBS) \ + $(RSVG_LIBS) $(IMAGEMAGICK_LIBS) $(LIB_CLOCK_GETTIME) $(DBUS_LIBS) \ + $(WEBKIT_LIBS) $(CLUTTER_LIBS) $(GIR_LIBS) \ + $(LIB_EXECINFO) \ $(LIBXML2_LIBS) $(LIBGPM) $(LIBRESOLV) $(LIBS_SYSTEM) \ $(LIBS_TERMCAP) $(GETLOADAVG_LIBS) $(SETTINGS_LIBS) $(LIBSELINUX_LIBS) \ $(FREETYPE_LIBS) $(FONTCONFIG_LIBS) $(LIBOTF_LIBS) $(M17N_FLT_LIBS) \ diff --cc src/dispnew.c index 1078ebcb0b0,cac4c2da4c4..2bd6d7f2a6f --- a/src/dispnew.c +++ b/src/dispnew.c @@@ -46,24 -47,10 +46,14 @@@ along with GNU Emacs. If not, see