aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2012-09-27 06:17:43 -0400
committerGlenn Morris2012-09-27 06:17:43 -0400
commitf077f61d681b15e91b9ecd8ad3aab646d293f2c1 (patch)
tree3c5f04ab816d6372bf1fc0dbf9ac827173303b10
parenta88324d49c3dbc0c86a0e378880d7db27e9f32e5 (diff)
downloademacs-f077f61d681b15e91b9ecd8ad3aab646d293f2c1.tar.gz
emacs-f077f61d681b15e91b9ecd8ad3aab646d293f2c1.zip
Auto-commit of generated files.
-rw-r--r--autogen/Makefile.in13
-rw-r--r--autogen/aclocal.m41
-rw-r--r--autogen/config.in3
-rwxr-xr-xautogen/configure160
4 files changed, 167 insertions, 10 deletions
diff --git a/autogen/Makefile.in b/autogen/Makefile.in
index 103a2e94ef3..e3264ff0c3f 100644
--- a/autogen/Makefile.in
+++ b/autogen/Makefile.in
@@ -36,7 +36,7 @@
36# the same distribution terms as the rest of that program. 36# the same distribution terms as the rest of that program.
37# 37#
38# Generated by gnulib-tool. 38# Generated by gnulib-tool.
39# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --avoid=errno --avoid=fcntl --avoid=fcntl-h --avoid=fstat --avoid=msvc-inval --avoid=msvc-nothrow --avoid=raise --avoid=select --avoid=sigprocmask --avoid=sys_types --avoid=threadlib --makefile-name=gnulib.mk --conditional-dependencies --no-libtool --macro-prefix=gl --no-vc-files alloca-opt c-ctype c-strcase careadlinkat crypto/md5 crypto/sha1 crypto/sha256 crypto/sha512 dtoastr dtotimespec dup2 environ execinfo filemode getloadavg getopt-gnu gettime gettimeofday ignore-value intprops largefile lstat manywarnings mktime pselect pthread_sigmask readlink socklen stat-time stdalign stdarg stdbool stdio strftime strtoimax strtoumax symlink sys_stat sys_time time timespec-add timespec-sub utimens warnings 39# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --avoid=errno --avoid=fcntl --avoid=fcntl-h --avoid=fstat --avoid=msvc-inval --avoid=msvc-nothrow --avoid=raise --avoid=select --avoid=sigprocmask --avoid=sys_types --avoid=threadlib --makefile-name=gnulib.mk --conditional-dependencies --no-libtool --macro-prefix=gl --no-vc-files alloca-opt c-ctype c-strcase careadlinkat crypto/md5 crypto/sha1 crypto/sha256 crypto/sha512 dtoastr dtotimespec dup2 environ execinfo filemode getloadavg getopt-gnu gettime gettimeofday ignore-value intprops largefile lstat manywarnings mktime pselect pthread_sigmask readlink socklen stat-time stdalign stdarg stdbool stdio strftime strtoimax strtoumax symlink sys_stat sys_time time timer-time timespec-add timespec-sub utimens warnings
40 40
41VPATH = @srcdir@ 41VPATH = @srcdir@
42pkgdatadir = $(datadir)/@PACKAGE@ 42pkgdatadir = $(datadir)/@PACKAGE@
@@ -95,11 +95,11 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
95 $(top_srcdir)/m4/sys_socket_h.m4 \ 95 $(top_srcdir)/m4/sys_socket_h.m4 \
96 $(top_srcdir)/m4/sys_stat_h.m4 $(top_srcdir)/m4/sys_time_h.m4 \ 96 $(top_srcdir)/m4/sys_stat_h.m4 $(top_srcdir)/m4/sys_time_h.m4 \
97 $(top_srcdir)/m4/time_h.m4 $(top_srcdir)/m4/time_r.m4 \ 97 $(top_srcdir)/m4/time_h.m4 $(top_srcdir)/m4/time_r.m4 \
98 $(top_srcdir)/m4/timespec.m4 $(top_srcdir)/m4/tm_gmtoff.m4 \ 98 $(top_srcdir)/m4/timer_time.m4 $(top_srcdir)/m4/timespec.m4 \
99 $(top_srcdir)/m4/unistd_h.m4 $(top_srcdir)/m4/utimbuf.m4 \ 99 $(top_srcdir)/m4/tm_gmtoff.m4 $(top_srcdir)/m4/unistd_h.m4 \
100 $(top_srcdir)/m4/utimens.m4 $(top_srcdir)/m4/utimes.m4 \ 100 $(top_srcdir)/m4/utimbuf.m4 $(top_srcdir)/m4/utimens.m4 \
101 $(top_srcdir)/m4/warnings.m4 $(top_srcdir)/m4/wchar_t.m4 \ 101 $(top_srcdir)/m4/utimes.m4 $(top_srcdir)/m4/warnings.m4 \
102 $(top_srcdir)/configure.ac 102 $(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/configure.ac
103am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ 103am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
104 $(ACLOCAL_M4) 104 $(ACLOCAL_M4)
105mkinstalldirs = $(install_sh) -d 105mkinstalldirs = $(install_sh) -d
@@ -566,6 +566,7 @@ LIB_MATH = @LIB_MATH@
566LIB_PTHREAD = @LIB_PTHREAD@ 566LIB_PTHREAD = @LIB_PTHREAD@
567LIB_PTHREAD_SIGMASK = @LIB_PTHREAD_SIGMASK@ 567LIB_PTHREAD_SIGMASK = @LIB_PTHREAD_SIGMASK@
568LIB_STANDARD = @LIB_STANDARD@ 568LIB_STANDARD = @LIB_STANDARD@
569LIB_TIMER_TIME = @LIB_TIMER_TIME@
569LN_S = @LN_S@ 570LN_S = @LN_S@
570LTLIBINTL = @LTLIBINTL@ 571LTLIBINTL = @LTLIBINTL@
571LTLIBOBJS = @LTLIBOBJS@ 572LTLIBOBJS = @LTLIBOBJS@
diff --git a/autogen/aclocal.m4 b/autogen/aclocal.m4
index 38f7863ba9d..0bc91e263c2 100644
--- a/autogen/aclocal.m4
+++ b/autogen/aclocal.m4
@@ -1043,6 +1043,7 @@ m4_include([m4/sys_stat_h.m4])
1043m4_include([m4/sys_time_h.m4]) 1043m4_include([m4/sys_time_h.m4])
1044m4_include([m4/time_h.m4]) 1044m4_include([m4/time_h.m4])
1045m4_include([m4/time_r.m4]) 1045m4_include([m4/time_r.m4])
1046m4_include([m4/timer_time.m4])
1046m4_include([m4/timespec.m4]) 1047m4_include([m4/timespec.m4])
1047m4_include([m4/tm_gmtoff.m4]) 1048m4_include([m4/tm_gmtoff.m4])
1048m4_include([m4/unistd_h.m4]) 1049m4_include([m4/unistd_h.m4])
diff --git a/autogen/config.in b/autogen/config.in
index 2f2555c75c9..8852686c360 100644
--- a/autogen/config.in
+++ b/autogen/config.in
@@ -958,6 +958,9 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
958/* Define to 1 if you have the tiff library (-ltiff). */ 958/* Define to 1 if you have the tiff library (-ltiff). */
959#undef HAVE_TIFF 959#undef HAVE_TIFF
960 960
961/* Define to 1 if you have the `timer_settime' function. */
962#undef HAVE_TIMER_SETTIME
963
961/* Define if struct tm has the tm_gmtoff member. */ 964/* Define if struct tm has the tm_gmtoff member. */
962#undef HAVE_TM_GMTOFF 965#undef HAVE_TM_GMTOFF
963 966
diff --git a/autogen/configure b/autogen/configure
index e771c7fd0f7..11e046c551b 100755
--- a/autogen/configure
+++ b/autogen/configure
@@ -631,6 +631,7 @@ WINDOWS_64_BIT_OFF_T
631HAVE_UNISTD_H 631HAVE_UNISTD_H
632NEXT_AS_FIRST_DIRECTIVE_UNISTD_H 632NEXT_AS_FIRST_DIRECTIVE_UNISTD_H
633NEXT_UNISTD_H 633NEXT_UNISTD_H
634LIB_TIMER_TIME
634PTHREAD_H_DEFINES_STRUCT_TIMESPEC 635PTHREAD_H_DEFINES_STRUCT_TIMESPEC
635SYS_TIME_H_DEFINES_STRUCT_TIMESPEC 636SYS_TIME_H_DEFINES_STRUCT_TIMESPEC
636TIME_H_DEFINES_STRUCT_TIMESPEC 637TIME_H_DEFINES_STRUCT_TIMESPEC
@@ -5723,6 +5724,9 @@ else
5723 test "x$NON_GCC_TEST_OPTIONS" != x && CC="$CC $NON_GCC_TEST_OPTIONS" 5724 test "x$NON_GCC_TEST_OPTIONS" != x && CC="$CC $NON_GCC_TEST_OPTIONS"
5724fi 5725fi
5725 5726
5727# Avoid gnulib's threadlib module, as we do threads our own way.
5728
5729
5726# Initialize gnulib right after choosing the compiler. 5730# Initialize gnulib right after choosing the compiler.
5727 5731
5728ac_ext=c 5732ac_ext=c
@@ -7006,6 +7010,7 @@ esac
7006 # Code from module sys_time: 7010 # Code from module sys_time:
7007 # Code from module time: 7011 # Code from module time:
7008 # Code from module time_r: 7012 # Code from module time_r:
7013 # Code from module timer-time:
7009 # Code from module timespec: 7014 # Code from module timespec:
7010 # Code from module timespec-add: 7015 # Code from module timespec-add:
7011 # Code from module timespec-sub: 7016 # Code from module timespec-sub:
@@ -19229,6 +19234,7 @@ done
19229 19234
19230 19235
19231 19236
19237
19232 ac_fn_c_check_type "$LINENO" "sigset_t" "ac_cv_type_sigset_t" " 19238 ac_fn_c_check_type "$LINENO" "sigset_t" "ac_cv_type_sigset_t" "
19233 #include <signal.h> 19239 #include <signal.h>
19234 /* Mingw defines sigset_t not in <signal.h>, but in <sys/types.h>. */ 19240 /* Mingw defines sigset_t not in <signal.h>, but in <sys/types.h>. */
@@ -21655,11 +21661,61 @@ $as_echo "$gl_cv_sig_pselect" >&6; }
21655 LIB_PTHREAD_SIGMASK= 21661 LIB_PTHREAD_SIGMASK=
21656 21662
21657 21663
21658 if test $ac_cv_func_pthread_sigmask = yes; then 21664
21659 : 21665
21666 if test "$gl_threads_api" = posix; then
21667 if test $ac_cv_func_pthread_sigmask = yes; then
21668 :
21669 else
21670 if test -n "$LIBMULTITHREAD"; then
21671 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_sigmask in $LIBMULTITHREAD" >&5
21672$as_echo_n "checking for pthread_sigmask in $LIBMULTITHREAD... " >&6; }
21673if test "${gl_cv_func_pthread_sigmask_in_LIBMULTITHREAD+set}" = set; then :
21674 $as_echo_n "(cached) " >&6
21675else
21676 gl_save_LIBS="$LIBS"
21677 LIBS="$LIBS $LIBMULTITHREAD"
21678 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
21679/* end confdefs.h. */
21680#include <pthread.h>
21681 #include <signal.h>
21682
21683int
21684main ()
21685{
21686return pthread_sigmask (0, (sigset_t *) 0, (sigset_t *) 0);
21687 ;
21688 return 0;
21689}
21690
21691_ACEOF
21692if ac_fn_c_try_link "$LINENO"; then :
21693 gl_cv_func_pthread_sigmask_in_LIBMULTITHREAD=yes
21694else
21695 gl_cv_func_pthread_sigmask_in_LIBMULTITHREAD=no
21696fi
21697rm -f core conftest.err conftest.$ac_objext \
21698 conftest$ac_exeext conftest.$ac_ext
21699 LIBS="$gl_save_LIBS"
21700
21701fi
21702{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_pthread_sigmask_in_LIBMULTITHREAD" >&5
21703$as_echo "$gl_cv_func_pthread_sigmask_in_LIBMULTITHREAD" >&6; }
21704 if test $gl_cv_func_pthread_sigmask_in_LIBMULTITHREAD = yes; then
21705 LIB_PTHREAD_SIGMASK="$LIBMULTITHREAD"
21706 else
21707 HAVE_PTHREAD_SIGMASK=0
21708 fi
21709 else
21710 HAVE_PTHREAD_SIGMASK=0
21711 fi
21712 fi
21660 else 21713 else
21661 HAVE_PTHREAD_SIGMASK=0 21714 if test $ac_cv_func_pthread_sigmask = yes; then
21662 REPLACE_PTHREAD_SIGMASK=1 21715 REPLACE_PTHREAD_SIGMASK=1
21716 else
21717 HAVE_PTHREAD_SIGMASK=0
21718 fi
21663 fi 21719 fi
21664 21720
21665 21721
@@ -23576,6 +23632,102 @@ $as_echo "$gl_cv_time_r_posix" >&6; }
23576 23632
23577 23633
23578 23634
23635
23636
23637
23638
23639
23640 LIB_TIMER_TIME=
23641
23642 gl_saved_libs=$LIBS
23643 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing timer_settime" >&5
23644$as_echo_n "checking for library containing timer_settime... " >&6; }
23645if test "${ac_cv_search_timer_settime+set}" = set; then :
23646 $as_echo_n "(cached) " >&6
23647else
23648 ac_func_search_save_LIBS=$LIBS
23649cat confdefs.h - <<_ACEOF >conftest.$ac_ext
23650/* end confdefs.h. */
23651
23652/* Override any GCC internal prototype to avoid an error.
23653 Use char because int might match the return type of a GCC
23654 builtin and then its argument prototype would still apply. */
23655#ifdef __cplusplus
23656extern "C"
23657#endif
23658char timer_settime ();
23659int
23660main ()
23661{
23662return timer_settime ();
23663 ;
23664 return 0;
23665}
23666_ACEOF
23667for ac_lib in '' rt posix4; do
23668 if test -z "$ac_lib"; then
23669 ac_res="none required"
23670 else
23671 ac_res=-l$ac_lib
23672 LIBS="-l$ac_lib $ac_func_search_save_LIBS"
23673 fi
23674 if ac_fn_c_try_link "$LINENO"; then :
23675 ac_cv_search_timer_settime=$ac_res
23676fi
23677rm -f core conftest.err conftest.$ac_objext \
23678 conftest$ac_exeext
23679 if test "${ac_cv_search_timer_settime+set}" = set; then :
23680 break
23681fi
23682done
23683if test "${ac_cv_search_timer_settime+set}" = set; then :
23684
23685else
23686 ac_cv_search_timer_settime=no
23687fi
23688rm conftest.$ac_ext
23689LIBS=$ac_func_search_save_LIBS
23690fi
23691{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_timer_settime" >&5
23692$as_echo "$ac_cv_search_timer_settime" >&6; }
23693ac_res=$ac_cv_search_timer_settime
23694if test "$ac_res" != no; then :
23695 test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
23696 test "$ac_cv_search_timer_settime" = "none required" ||
23697 LIB_TIMER_TIME=$ac_cv_search_timer_settime
23698fi
23699
23700 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
23701/* end confdefs.h. */
23702
23703#include <features.h>
23704#ifdef __GNU_LIBRARY__
23705 #if ((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2) || (__GLIBC__ > 2)) \
23706 && !defined __UCLIBC__
23707 Thread emulation available
23708 #endif
23709#endif
23710
23711_ACEOF
23712if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
23713 $EGREP "Thread" >/dev/null 2>&1; then :
23714 LIB_TIMER_TIME="$LIB_TIMER_TIME $LIBMULTITHREAD"
23715fi
23716rm -f conftest*
23717
23718 for ac_func in timer_settime
23719do :
23720 ac_fn_c_check_func "$LINENO" "timer_settime" "ac_cv_func_timer_settime"
23721if test "x$ac_cv_func_timer_settime" = x""yes; then :
23722 cat >>confdefs.h <<_ACEOF
23723#define HAVE_TIMER_SETTIME 1
23724_ACEOF
23725
23726fi
23727done
23728
23729 LIBS=$gl_saved_libs
23730
23579 : 23731 :
23580 23732
23581 23733