diff options
| author | Glenn Morris | 2011-06-23 06:18:34 -0400 |
|---|---|---|
| committer | Glenn Morris | 2011-06-23 06:18:34 -0400 |
| commit | 4fc2b746f7bc9c3b2b8456411c762f5073ca0914 (patch) | |
| tree | e37ede442d03fe1c6b70aa986ff94c081858b3a6 | |
| parent | 02cfc6d6fc15fc078581df8c9819769519715022 (diff) | |
| download | emacs-4fc2b746f7bc9c3b2b8456411c762f5073ca0914.tar.gz emacs-4fc2b746f7bc9c3b2b8456411c762f5073ca0914.zip | |
Auto-commit of generated files.
| -rw-r--r-- | autogen/Makefile.in | 42 | ||||
| -rw-r--r-- | autogen/aclocal.m4 | 1 | ||||
| -rw-r--r-- | autogen/config.in | 23 | ||||
| -rwxr-xr-x | autogen/configure | 454 |
4 files changed, 294 insertions, 226 deletions
diff --git a/autogen/Makefile.in b/autogen/Makefile.in index 18127366751..41763bc9ba3 100644 --- a/autogen/Makefile.in +++ b/autogen/Makefile.in | |||
| @@ -24,7 +24,7 @@ | |||
| 24 | # the same distribution terms as the rest of that program. | 24 | # the same distribution terms as the rest of that program. |
| 25 | # | 25 | # |
| 26 | # Generated by gnulib-tool. | 26 | # Generated by gnulib-tool. |
| 27 | # Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=. --makefile-name=gnulib.mk --conditional-dependencies --no-libtool --macro-prefix=gl --no-vc-files careadlinkat crypto/md5 crypto/sha1 crypto/sha256 crypto/sha512 dtoastr filemode getloadavg getopt-gnu ignore-value intprops lstat mktime readlink socklen stdarg stdio strftime strtoumax symlink sys_stat | 27 | # Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=. --makefile-name=gnulib.mk --conditional-dependencies --no-libtool --macro-prefix=gl --no-vc-files alloca-opt careadlinkat crypto/md5 crypto/sha1 crypto/sha256 crypto/sha512 dtoastr filemode getloadavg getopt-gnu ignore-value intprops lstat mktime readlink socklen stdarg stdio strftime strtoumax symlink sys_stat |
| 28 | 28 | ||
| 29 | VPATH = @srcdir@ | 29 | VPATH = @srcdir@ |
| 30 | pkgdatadir = $(datadir)/@PACKAGE@ | 30 | pkgdatadir = $(datadir)/@PACKAGE@ |
| @@ -51,10 +51,10 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ | |||
| 51 | subdir = lib | 51 | subdir = lib |
| 52 | ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 | 52 | ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 |
| 53 | am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ | 53 | am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ |
| 54 | $(top_srcdir)/m4/c-strtod.m4 $(top_srcdir)/m4/extensions.m4 \ | 54 | $(top_srcdir)/m4/alloca.m4 $(top_srcdir)/m4/c-strtod.m4 \ |
| 55 | $(top_srcdir)/m4/filemode.m4 $(top_srcdir)/m4/getloadavg.m4 \ | 55 | $(top_srcdir)/m4/extensions.m4 $(top_srcdir)/m4/filemode.m4 \ |
| 56 | $(top_srcdir)/m4/getopt.m4 $(top_srcdir)/m4/gl-comp.m4 \ | 56 | $(top_srcdir)/m4/getloadavg.m4 $(top_srcdir)/m4/getopt.m4 \ |
| 57 | $(top_srcdir)/m4/gnulib-common.m4 \ | 57 | $(top_srcdir)/m4/gl-comp.m4 $(top_srcdir)/m4/gnulib-common.m4 \ |
| 58 | $(top_srcdir)/m4/include_next.m4 $(top_srcdir)/m4/inttypes.m4 \ | 58 | $(top_srcdir)/m4/include_next.m4 $(top_srcdir)/m4/inttypes.m4 \ |
| 59 | $(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/lstat.m4 \ | 59 | $(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/lstat.m4 \ |
| 60 | $(top_srcdir)/m4/md5.m4 $(top_srcdir)/m4/mktime.m4 \ | 60 | $(top_srcdir)/m4/md5.m4 $(top_srcdir)/m4/mktime.m4 \ |
| @@ -104,6 +104,7 @@ CTAGS = ctags | |||
| 104 | DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) | 104 | DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) |
| 105 | ACLOCAL = @ACLOCAL@ | 105 | ACLOCAL = @ACLOCAL@ |
| 106 | ALLOCA = @ALLOCA@ | 106 | ALLOCA = @ALLOCA@ |
| 107 | ALLOCA_H = @ALLOCA_H@ | ||
| 107 | ALSA_CFLAGS = @ALSA_CFLAGS@ | 108 | ALSA_CFLAGS = @ALSA_CFLAGS@ |
| 108 | ALSA_LIBS = @ALSA_LIBS@ | 109 | ALSA_LIBS = @ALSA_LIBS@ |
| 109 | AMTAR = @AMTAR@ | 110 | AMTAR = @AMTAR@ |
| @@ -732,10 +733,10 @@ x_default_search_path = @x_default_search_path@ | |||
| 732 | # statements but through direct file reference. Therefore this snippet must be | 733 | # statements but through direct file reference. Therefore this snippet must be |
| 733 | # present in all Makefile.am that need it. This is ensured by the applicability | 734 | # present in all Makefile.am that need it. This is ensured by the applicability |
| 734 | # 'all' defined above. | 735 | # 'all' defined above. |
| 735 | BUILT_SOURCES = arg-nonnull.h c++defs.h $(GETOPT_H) inttypes.h \ | 736 | BUILT_SOURCES = $(ALLOCA_H) arg-nonnull.h c++defs.h $(GETOPT_H) \ |
| 736 | $(STDARG_H) $(STDBOOL_H) $(STDDEF_H) $(STDINT_H) stdio.h \ | 737 | inttypes.h $(STDARG_H) $(STDBOOL_H) $(STDDEF_H) $(STDINT_H) \ |
| 737 | stdlib.h sys/stat.h time.h unistd.h warn-on-use.h | 738 | stdio.h stdlib.h sys/stat.h time.h unistd.h warn-on-use.h |
| 738 | EXTRA_DIST = allocator.h $(top_srcdir)/./arg-nonnull.h \ | 739 | EXTRA_DIST = alloca.in.h allocator.h $(top_srcdir)/./arg-nonnull.h \ |
| 739 | $(top_srcdir)/./c++defs.h careadlinkat.h md5.h sha1.h sha256.h \ | 740 | $(top_srcdir)/./c++defs.h careadlinkat.h md5.h sha1.h sha256.h \ |
| 740 | sha512.h dosname.h ftoastr.c ftoastr.h filemode.h getloadavg.c \ | 741 | sha512.h dosname.h ftoastr.c ftoastr.h filemode.h getloadavg.c \ |
| 741 | getopt.c getopt.in.h getopt1.c getopt_int.h ignore-value.h \ | 742 | getopt.c getopt.in.h getopt1.c getopt_int.h ignore-value.h \ |
| @@ -746,12 +747,12 @@ EXTRA_DIST = allocator.h $(top_srcdir)/./arg-nonnull.h \ | |||
| 746 | sys_stat.in.h time.in.h time_r.c u64.h unistd.in.h verify.h \ | 747 | sys_stat.in.h time.in.h time_r.c u64.h unistd.in.h verify.h \ |
| 747 | $(top_srcdir)/./warn-on-use.h | 748 | $(top_srcdir)/./warn-on-use.h |
| 748 | MOSTLYCLEANDIRS = sys | 749 | MOSTLYCLEANDIRS = sys |
| 749 | MOSTLYCLEANFILES = core *.stackdump arg-nonnull.h arg-nonnull.h-t \ | 750 | MOSTLYCLEANFILES = core *.stackdump alloca.h alloca.h-t arg-nonnull.h \ |
| 750 | c++defs.h c++defs.h-t getopt.h getopt.h-t inttypes.h \ | 751 | arg-nonnull.h-t c++defs.h c++defs.h-t getopt.h getopt.h-t \ |
| 751 | inttypes.h-t stdarg.h stdarg.h-t stdbool.h stdbool.h-t \ | 752 | inttypes.h inttypes.h-t stdarg.h stdarg.h-t stdbool.h \ |
| 752 | stddef.h stddef.h-t stdint.h stdint.h-t stdio.h stdio.h-t \ | 753 | stdbool.h-t stddef.h stddef.h-t stdint.h stdint.h-t stdio.h \ |
| 753 | stdlib.h stdlib.h-t sys/stat.h sys/stat.h-t time.h time.h-t \ | 754 | stdio.h-t stdlib.h stdlib.h-t sys/stat.h sys/stat.h-t time.h \ |
| 754 | unistd.h unistd.h-t warn-on-use.h warn-on-use.h-t | 755 | time.h-t unistd.h unistd.h-t warn-on-use.h warn-on-use.h-t |
| 755 | noinst_LIBRARIES = libgnu.a | 756 | noinst_LIBRARIES = libgnu.a |
| 756 | DEFAULT_INCLUDES = -I. -I../src -I$(top_srcdir)/src | 757 | DEFAULT_INCLUDES = -I. -I../src -I$(top_srcdir)/src |
| 757 | libgnu_a_SOURCES = allocator.c careadlinkat.c md5.c sha1.c sha256.c \ | 758 | libgnu_a_SOURCES = allocator.c careadlinkat.c md5.c sha1.c sha256.c \ |
| @@ -1052,6 +1053,17 @@ uninstall-am: | |||
| 1052 | mostlyclean-generic mostlyclean-local pdf pdf-am ps ps-am tags \ | 1053 | mostlyclean-generic mostlyclean-local pdf pdf-am ps ps-am tags \ |
| 1053 | uninstall uninstall-am | 1054 | uninstall uninstall-am |
| 1054 | 1055 | ||
| 1056 | |||
| 1057 | # We need the following in order to create <alloca.h> when the system | ||
| 1058 | # doesn't have one that works with the given compiler. | ||
| 1059 | @GL_GENERATE_ALLOCA_H_TRUE@alloca.h: alloca.in.h $(top_builddir)/config.status | ||
| 1060 | @GL_GENERATE_ALLOCA_H_TRUE@ $(AM_V_GEN)rm -f $@-t $@ && \ | ||
| 1061 | @GL_GENERATE_ALLOCA_H_TRUE@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ | ||
| 1062 | @GL_GENERATE_ALLOCA_H_TRUE@ cat $(srcdir)/alloca.in.h; \ | ||
| 1063 | @GL_GENERATE_ALLOCA_H_TRUE@ } > $@-t && \ | ||
| 1064 | @GL_GENERATE_ALLOCA_H_TRUE@ mv -f $@-t $@ | ||
| 1065 | @GL_GENERATE_ALLOCA_H_FALSE@alloca.h: $(top_builddir)/config.status | ||
| 1066 | @GL_GENERATE_ALLOCA_H_FALSE@ rm -f $@ | ||
| 1055 | # The arg-nonnull.h that gets inserted into generated .h files is the same as | 1067 | # The arg-nonnull.h that gets inserted into generated .h files is the same as |
| 1056 | # build-aux/arg-nonnull.h, except that it has the copyright header cut off. | 1068 | # build-aux/arg-nonnull.h, except that it has the copyright header cut off. |
| 1057 | arg-nonnull.h: $(top_srcdir)/./arg-nonnull.h | 1069 | arg-nonnull.h: $(top_srcdir)/./arg-nonnull.h |
diff --git a/autogen/aclocal.m4 b/autogen/aclocal.m4 index eaa2330e9ed..08bef24413f 100644 --- a/autogen/aclocal.m4 +++ b/autogen/aclocal.m4 | |||
| @@ -985,6 +985,7 @@ AC_SUBST([am__untar]) | |||
| 985 | ]) # _AM_PROG_TAR | 985 | ]) # _AM_PROG_TAR |
| 986 | 986 | ||
| 987 | m4_include([m4/00gnulib.m4]) | 987 | m4_include([m4/00gnulib.m4]) |
| 988 | m4_include([m4/alloca.m4]) | ||
| 988 | m4_include([m4/c-strtod.m4]) | 989 | m4_include([m4/c-strtod.m4]) |
| 989 | m4_include([m4/extensions.m4]) | 990 | m4_include([m4/extensions.m4]) |
| 990 | m4_include([m4/filemode.m4]) | 991 | m4_include([m4/filemode.m4]) |
diff --git a/autogen/config.in b/autogen/config.in index b3e14609845..23b98d256b9 100644 --- a/autogen/config.in +++ b/autogen/config.in | |||
| @@ -104,7 +104,8 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 104 | /* Define to 1 if you have the `alarm' function. */ | 104 | /* Define to 1 if you have the `alarm' function. */ |
| 105 | #undef HAVE_ALARM | 105 | #undef HAVE_ALARM |
| 106 | 106 | ||
| 107 | /* Define to 1 if you have `alloca', as a function or macro. */ | 107 | /* Define to 1 if you have 'alloca' after including <alloca.h>, a header that |
| 108 | may be supplied by this distribution. */ | ||
| 108 | #undef HAVE_ALLOCA | 109 | #undef HAVE_ALLOCA |
| 109 | 110 | ||
| 110 | /* Define to 1 if you have <alloca.h> and it should be used (not on Ultrix). | 111 | /* Define to 1 if you have <alloca.h> and it should be used (not on Ultrix). |
| @@ -1290,6 +1291,12 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 1290 | #undef volatile | 1291 | #undef volatile |
| 1291 | 1292 | ||
| 1292 | 1293 | ||
| 1294 | /* On AIX 3 this must be included before any other include file. */ | ||
| 1295 | #include <alloca.h> | ||
| 1296 | #if ! HAVE_ALLOCA | ||
| 1297 | # error "alloca not available on this machine" | ||
| 1298 | #endif | ||
| 1299 | |||
| 1293 | /* Define AMPERSAND_FULL_NAME if you use the convention | 1300 | /* Define AMPERSAND_FULL_NAME if you use the convention |
| 1294 | that & in the full name stands for the login id. */ | 1301 | that & in the full name stands for the login id. */ |
| 1295 | /* Turned on June 1996 supposing nobody will mind it. */ | 1302 | /* Turned on June 1996 supposing nobody will mind it. */ |
| @@ -1366,20 +1373,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 1366 | #include <string.h> | 1373 | #include <string.h> |
| 1367 | #include <stdlib.h> | 1374 | #include <stdlib.h> |
| 1368 | 1375 | ||
| 1369 | #ifdef HAVE_ALLOCA_H | ||
| 1370 | # include <alloca.h> | ||
| 1371 | #elif defined __GNUC__ | ||
| 1372 | # define alloca __builtin_alloca | ||
| 1373 | #elif defined _AIX | ||
| 1374 | # define alloca __alloca | ||
| 1375 | #else | ||
| 1376 | # include <stddef.h> | ||
| 1377 | # ifdef __cplusplus | ||
| 1378 | extern "C" | ||
| 1379 | # endif | ||
| 1380 | void *alloca (size_t); | ||
| 1381 | #endif | ||
| 1382 | |||
| 1383 | #ifndef HAVE_STRCHR | 1376 | #ifndef HAVE_STRCHR |
| 1384 | #define strchr(a, b) index (a, b) | 1377 | #define strchr(a, b) index (a, b) |
| 1385 | #endif | 1378 | #endif |
diff --git a/autogen/configure b/autogen/configure index d3cf11111a7..f3337ddbe31 100755 --- a/autogen/configure +++ b/autogen/configure | |||
| @@ -1070,12 +1070,15 @@ GNULIB_CANONICALIZE_FILE_NAME | |||
| 1070 | GNULIB_CALLOC_POSIX | 1070 | GNULIB_CALLOC_POSIX |
| 1071 | GNULIB_ATOLL | 1071 | GNULIB_ATOLL |
| 1072 | GNULIB__EXIT | 1072 | GNULIB__EXIT |
| 1073 | GL_GENERATE_ALLOCA_H_FALSE | ||
| 1074 | GL_GENERATE_ALLOCA_H_TRUE | ||
| 1075 | ALLOCA_H | ||
| 1076 | ALLOCA | ||
| 1073 | GL_COND_LIBTOOL_FALSE | 1077 | GL_COND_LIBTOOL_FALSE |
| 1074 | GL_COND_LIBTOOL_TRUE | 1078 | GL_COND_LIBTOOL_TRUE |
| 1075 | BLESSMAIL_TARGET | 1079 | BLESSMAIL_TARGET |
| 1076 | LIBS_MAIL | 1080 | LIBS_MAIL |
| 1077 | liblockfile | 1081 | liblockfile |
| 1078 | ALLOCA | ||
| 1079 | LIBXML2_LIBS | 1082 | LIBXML2_LIBS |
| 1080 | LIBXML2_CFLAGS | 1083 | LIBXML2_CFLAGS |
| 1081 | LIBXSM | 1084 | LIBXSM |
| @@ -6535,6 +6538,7 @@ esac | |||
| 6535 | 6538 | ||
| 6536 | 6539 | ||
| 6537 | 6540 | ||
| 6541 | # Code from module alloca-opt: | ||
| 6538 | # Code from module allocator: | 6542 | # Code from module allocator: |
| 6539 | # Code from module arg-nonnull: | 6543 | # Code from module arg-nonnull: |
| 6540 | # Code from module c++defs: | 6544 | # Code from module c++defs: |
| @@ -13313,201 +13317,6 @@ $as_echo "#define HAVE_H_ERRNO 1" >>confdefs.h | |||
| 13313 | 13317 | ||
| 13314 | fi | 13318 | fi |
| 13315 | 13319 | ||
| 13316 | # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works | ||
| 13317 | # for constant arguments. Useless! | ||
| 13318 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working alloca.h" >&5 | ||
| 13319 | $as_echo_n "checking for working alloca.h... " >&6; } | ||
| 13320 | if test "${ac_cv_working_alloca_h+set}" = set; then : | ||
| 13321 | $as_echo_n "(cached) " >&6 | ||
| 13322 | else | ||
| 13323 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
| 13324 | /* end confdefs.h. */ | ||
| 13325 | #include <alloca.h> | ||
| 13326 | int | ||
| 13327 | main () | ||
| 13328 | { | ||
| 13329 | char *p = (char *) alloca (2 * sizeof (int)); | ||
| 13330 | if (p) return 0; | ||
| 13331 | ; | ||
| 13332 | return 0; | ||
| 13333 | } | ||
| 13334 | _ACEOF | ||
| 13335 | if ac_fn_c_try_link "$LINENO"; then : | ||
| 13336 | ac_cv_working_alloca_h=yes | ||
| 13337 | else | ||
| 13338 | ac_cv_working_alloca_h=no | ||
| 13339 | fi | ||
| 13340 | rm -f core conftest.err conftest.$ac_objext \ | ||
| 13341 | conftest$ac_exeext conftest.$ac_ext | ||
| 13342 | fi | ||
| 13343 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_working_alloca_h" >&5 | ||
| 13344 | $as_echo "$ac_cv_working_alloca_h" >&6; } | ||
| 13345 | if test $ac_cv_working_alloca_h = yes; then | ||
| 13346 | |||
| 13347 | $as_echo "#define HAVE_ALLOCA_H 1" >>confdefs.h | ||
| 13348 | |||
| 13349 | fi | ||
| 13350 | |||
| 13351 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for alloca" >&5 | ||
| 13352 | $as_echo_n "checking for alloca... " >&6; } | ||
| 13353 | if test "${ac_cv_func_alloca_works+set}" = set; then : | ||
| 13354 | $as_echo_n "(cached) " >&6 | ||
| 13355 | else | ||
| 13356 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
| 13357 | /* end confdefs.h. */ | ||
| 13358 | #ifdef __GNUC__ | ||
| 13359 | # define alloca __builtin_alloca | ||
| 13360 | #else | ||
| 13361 | # ifdef _MSC_VER | ||
| 13362 | # include <malloc.h> | ||
| 13363 | # define alloca _alloca | ||
| 13364 | # else | ||
| 13365 | # ifdef HAVE_ALLOCA_H | ||
| 13366 | # include <alloca.h> | ||
| 13367 | # else | ||
| 13368 | # ifdef _AIX | ||
| 13369 | #pragma alloca | ||
| 13370 | # else | ||
| 13371 | # ifndef alloca /* predefined by HP cc +Olibcalls */ | ||
| 13372 | char *alloca (); | ||
| 13373 | # endif | ||
| 13374 | # endif | ||
| 13375 | # endif | ||
| 13376 | # endif | ||
| 13377 | #endif | ||
| 13378 | |||
| 13379 | int | ||
| 13380 | main () | ||
| 13381 | { | ||
| 13382 | char *p = (char *) alloca (1); | ||
| 13383 | if (p) return 0; | ||
| 13384 | ; | ||
| 13385 | return 0; | ||
| 13386 | } | ||
| 13387 | _ACEOF | ||
| 13388 | if ac_fn_c_try_link "$LINENO"; then : | ||
| 13389 | ac_cv_func_alloca_works=yes | ||
| 13390 | else | ||
| 13391 | ac_cv_func_alloca_works=no | ||
| 13392 | fi | ||
| 13393 | rm -f core conftest.err conftest.$ac_objext \ | ||
| 13394 | conftest$ac_exeext conftest.$ac_ext | ||
| 13395 | fi | ||
| 13396 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_alloca_works" >&5 | ||
| 13397 | $as_echo "$ac_cv_func_alloca_works" >&6; } | ||
| 13398 | |||
| 13399 | if test $ac_cv_func_alloca_works = yes; then | ||
| 13400 | |||
| 13401 | $as_echo "#define HAVE_ALLOCA 1" >>confdefs.h | ||
| 13402 | |||
| 13403 | else | ||
| 13404 | # The SVR3 libPW and SVR4 libucb both contain incompatible functions | ||
| 13405 | # that cause trouble. Some versions do not even contain alloca or | ||
| 13406 | # contain a buggy version. If you still want to use their alloca, | ||
| 13407 | # use ar to extract alloca.o from them instead of compiling alloca.c. | ||
| 13408 | |||
| 13409 | ALLOCA=\${LIBOBJDIR}alloca.$ac_objext | ||
| 13410 | |||
| 13411 | $as_echo "#define C_ALLOCA 1" >>confdefs.h | ||
| 13412 | |||
| 13413 | |||
| 13414 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether \`alloca.c' needs Cray hooks" >&5 | ||
| 13415 | $as_echo_n "checking whether \`alloca.c' needs Cray hooks... " >&6; } | ||
| 13416 | if test "${ac_cv_os_cray+set}" = set; then : | ||
| 13417 | $as_echo_n "(cached) " >&6 | ||
| 13418 | else | ||
| 13419 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
| 13420 | /* end confdefs.h. */ | ||
| 13421 | #if defined CRAY && ! defined CRAY2 | ||
| 13422 | webecray | ||
| 13423 | #else | ||
| 13424 | wenotbecray | ||
| 13425 | #endif | ||
| 13426 | |||
| 13427 | _ACEOF | ||
| 13428 | if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | | ||
| 13429 | $EGREP "webecray" >/dev/null 2>&1; then : | ||
| 13430 | ac_cv_os_cray=yes | ||
| 13431 | else | ||
| 13432 | ac_cv_os_cray=no | ||
| 13433 | fi | ||
| 13434 | rm -f conftest* | ||
| 13435 | |||
| 13436 | fi | ||
| 13437 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_os_cray" >&5 | ||
| 13438 | $as_echo "$ac_cv_os_cray" >&6; } | ||
| 13439 | if test $ac_cv_os_cray = yes; then | ||
| 13440 | for ac_func in _getb67 GETB67 getb67; do | ||
| 13441 | as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` | ||
| 13442 | ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" | ||
| 13443 | eval as_val=\$$as_ac_var | ||
| 13444 | if test "x$as_val" = x""yes; then : | ||
| 13445 | |||
| 13446 | cat >>confdefs.h <<_ACEOF | ||
| 13447 | #define CRAY_STACKSEG_END $ac_func | ||
| 13448 | _ACEOF | ||
| 13449 | |||
| 13450 | break | ||
| 13451 | fi | ||
| 13452 | |||
| 13453 | done | ||
| 13454 | fi | ||
| 13455 | |||
| 13456 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking stack direction for C alloca" >&5 | ||
| 13457 | $as_echo_n "checking stack direction for C alloca... " >&6; } | ||
| 13458 | if test "${ac_cv_c_stack_direction+set}" = set; then : | ||
| 13459 | $as_echo_n "(cached) " >&6 | ||
| 13460 | else | ||
| 13461 | if test "$cross_compiling" = yes; then : | ||
| 13462 | ac_cv_c_stack_direction=0 | ||
| 13463 | else | ||
| 13464 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
| 13465 | /* end confdefs.h. */ | ||
| 13466 | $ac_includes_default | ||
| 13467 | int | ||
| 13468 | find_stack_direction () | ||
| 13469 | { | ||
| 13470 | static char *addr = 0; | ||
| 13471 | auto char dummy; | ||
| 13472 | if (addr == 0) | ||
| 13473 | { | ||
| 13474 | addr = &dummy; | ||
| 13475 | return find_stack_direction (); | ||
| 13476 | } | ||
| 13477 | else | ||
| 13478 | return (&dummy > addr) ? 1 : -1; | ||
| 13479 | } | ||
| 13480 | |||
| 13481 | int | ||
| 13482 | main () | ||
| 13483 | { | ||
| 13484 | return find_stack_direction () < 0; | ||
| 13485 | } | ||
| 13486 | _ACEOF | ||
| 13487 | if ac_fn_c_try_run "$LINENO"; then : | ||
| 13488 | ac_cv_c_stack_direction=1 | ||
| 13489 | else | ||
| 13490 | ac_cv_c_stack_direction=-1 | ||
| 13491 | fi | ||
| 13492 | rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ | ||
| 13493 | conftest.$ac_objext conftest.beam conftest.$ac_ext | ||
| 13494 | fi | ||
| 13495 | |||
| 13496 | fi | ||
| 13497 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_stack_direction" >&5 | ||
| 13498 | $as_echo "$ac_cv_c_stack_direction" >&6; } | ||
| 13499 | cat >>confdefs.h <<_ACEOF | ||
| 13500 | #define STACK_DIRECTION $ac_cv_c_stack_direction | ||
| 13501 | _ACEOF | ||
| 13502 | |||
| 13503 | |||
| 13504 | fi | ||
| 13505 | |||
| 13506 | |||
| 13507 | if test x"$ac_cv_func_alloca_works" != xyes; then | ||
| 13508 | as_fn_error "a system implementation of alloca is required " "$LINENO" 5 | ||
| 13509 | fi | ||
| 13510 | |||
| 13511 | # fmod, logb, and frexp are found in -lm on most systems. | 13320 | # fmod, logb, and frexp are found in -lm on most systems. |
| 13512 | # On HPUX 9.01, -lm does not contain logb, so check for sqrt. | 13321 | # On HPUX 9.01, -lm does not contain logb, so check for sqrt. |
| 13513 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqrt in -lm" >&5 | 13322 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqrt in -lm" >&5 |
| @@ -13962,6 +13771,197 @@ fi | |||
| 13962 | LIBC_FATAL_STDERR_=1 | 13771 | LIBC_FATAL_STDERR_=1 |
| 13963 | export LIBC_FATAL_STDERR_ | 13772 | export LIBC_FATAL_STDERR_ |
| 13964 | 13773 | ||
| 13774 | # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works | ||
| 13775 | # for constant arguments. Useless! | ||
| 13776 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working alloca.h" >&5 | ||
| 13777 | $as_echo_n "checking for working alloca.h... " >&6; } | ||
| 13778 | if test "${ac_cv_working_alloca_h+set}" = set; then : | ||
| 13779 | $as_echo_n "(cached) " >&6 | ||
| 13780 | else | ||
| 13781 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
| 13782 | /* end confdefs.h. */ | ||
| 13783 | #include <alloca.h> | ||
| 13784 | int | ||
| 13785 | main () | ||
| 13786 | { | ||
| 13787 | char *p = (char *) alloca (2 * sizeof (int)); | ||
| 13788 | if (p) return 0; | ||
| 13789 | ; | ||
| 13790 | return 0; | ||
| 13791 | } | ||
| 13792 | _ACEOF | ||
| 13793 | if ac_fn_c_try_link "$LINENO"; then : | ||
| 13794 | ac_cv_working_alloca_h=yes | ||
| 13795 | else | ||
| 13796 | ac_cv_working_alloca_h=no | ||
| 13797 | fi | ||
| 13798 | rm -f core conftest.err conftest.$ac_objext \ | ||
| 13799 | conftest$ac_exeext conftest.$ac_ext | ||
| 13800 | fi | ||
| 13801 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_working_alloca_h" >&5 | ||
| 13802 | $as_echo "$ac_cv_working_alloca_h" >&6; } | ||
| 13803 | if test $ac_cv_working_alloca_h = yes; then | ||
| 13804 | |||
| 13805 | $as_echo "#define HAVE_ALLOCA_H 1" >>confdefs.h | ||
| 13806 | |||
| 13807 | fi | ||
| 13808 | |||
| 13809 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for alloca" >&5 | ||
| 13810 | $as_echo_n "checking for alloca... " >&6; } | ||
| 13811 | if test "${ac_cv_func_alloca_works+set}" = set; then : | ||
| 13812 | $as_echo_n "(cached) " >&6 | ||
| 13813 | else | ||
| 13814 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
| 13815 | /* end confdefs.h. */ | ||
| 13816 | #ifdef __GNUC__ | ||
| 13817 | # define alloca __builtin_alloca | ||
| 13818 | #else | ||
| 13819 | # ifdef _MSC_VER | ||
| 13820 | # include <malloc.h> | ||
| 13821 | # define alloca _alloca | ||
| 13822 | # else | ||
| 13823 | # ifdef HAVE_ALLOCA_H | ||
| 13824 | # include <alloca.h> | ||
| 13825 | # else | ||
| 13826 | # ifdef _AIX | ||
| 13827 | #pragma alloca | ||
| 13828 | # else | ||
| 13829 | # ifndef alloca /* predefined by HP cc +Olibcalls */ | ||
| 13830 | char *alloca (); | ||
| 13831 | # endif | ||
| 13832 | # endif | ||
| 13833 | # endif | ||
| 13834 | # endif | ||
| 13835 | #endif | ||
| 13836 | |||
| 13837 | int | ||
| 13838 | main () | ||
| 13839 | { | ||
| 13840 | char *p = (char *) alloca (1); | ||
| 13841 | if (p) return 0; | ||
| 13842 | ; | ||
| 13843 | return 0; | ||
| 13844 | } | ||
| 13845 | _ACEOF | ||
| 13846 | if ac_fn_c_try_link "$LINENO"; then : | ||
| 13847 | ac_cv_func_alloca_works=yes | ||
| 13848 | else | ||
| 13849 | ac_cv_func_alloca_works=no | ||
| 13850 | fi | ||
| 13851 | rm -f core conftest.err conftest.$ac_objext \ | ||
| 13852 | conftest$ac_exeext conftest.$ac_ext | ||
| 13853 | fi | ||
| 13854 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_alloca_works" >&5 | ||
| 13855 | $as_echo "$ac_cv_func_alloca_works" >&6; } | ||
| 13856 | |||
| 13857 | if test $ac_cv_func_alloca_works = yes; then | ||
| 13858 | |||
| 13859 | $as_echo "#define HAVE_ALLOCA 1" >>confdefs.h | ||
| 13860 | |||
| 13861 | else | ||
| 13862 | # The SVR3 libPW and SVR4 libucb both contain incompatible functions | ||
| 13863 | # that cause trouble. Some versions do not even contain alloca or | ||
| 13864 | # contain a buggy version. If you still want to use their alloca, | ||
| 13865 | # use ar to extract alloca.o from them instead of compiling alloca.c. | ||
| 13866 | |||
| 13867 | |||
| 13868 | |||
| 13869 | |||
| 13870 | |||
| 13871 | ALLOCA=\${LIBOBJDIR}alloca.$ac_objext | ||
| 13872 | |||
| 13873 | $as_echo "#define C_ALLOCA 1" >>confdefs.h | ||
| 13874 | |||
| 13875 | |||
| 13876 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether \`alloca.c' needs Cray hooks" >&5 | ||
| 13877 | $as_echo_n "checking whether \`alloca.c' needs Cray hooks... " >&6; } | ||
| 13878 | if test "${ac_cv_os_cray+set}" = set; then : | ||
| 13879 | $as_echo_n "(cached) " >&6 | ||
| 13880 | else | ||
| 13881 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
| 13882 | /* end confdefs.h. */ | ||
| 13883 | #if defined CRAY && ! defined CRAY2 | ||
| 13884 | webecray | ||
| 13885 | #else | ||
| 13886 | wenotbecray | ||
| 13887 | #endif | ||
| 13888 | |||
| 13889 | _ACEOF | ||
| 13890 | if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | | ||
| 13891 | $EGREP "webecray" >/dev/null 2>&1; then : | ||
| 13892 | ac_cv_os_cray=yes | ||
| 13893 | else | ||
| 13894 | ac_cv_os_cray=no | ||
| 13895 | fi | ||
| 13896 | rm -f conftest* | ||
| 13897 | |||
| 13898 | fi | ||
| 13899 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_os_cray" >&5 | ||
| 13900 | $as_echo "$ac_cv_os_cray" >&6; } | ||
| 13901 | if test $ac_cv_os_cray = yes; then | ||
| 13902 | for ac_func in _getb67 GETB67 getb67; do | ||
| 13903 | as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` | ||
| 13904 | ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" | ||
| 13905 | eval as_val=\$$as_ac_var | ||
| 13906 | if test "x$as_val" = x""yes; then : | ||
| 13907 | |||
| 13908 | cat >>confdefs.h <<_ACEOF | ||
| 13909 | #define CRAY_STACKSEG_END $ac_func | ||
| 13910 | _ACEOF | ||
| 13911 | |||
| 13912 | break | ||
| 13913 | fi | ||
| 13914 | |||
| 13915 | done | ||
| 13916 | fi | ||
| 13917 | |||
| 13918 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking stack direction for C alloca" >&5 | ||
| 13919 | $as_echo_n "checking stack direction for C alloca... " >&6; } | ||
| 13920 | if test "${ac_cv_c_stack_direction+set}" = set; then : | ||
| 13921 | $as_echo_n "(cached) " >&6 | ||
| 13922 | else | ||
| 13923 | if test "$cross_compiling" = yes; then : | ||
| 13924 | ac_cv_c_stack_direction=0 | ||
| 13925 | else | ||
| 13926 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
| 13927 | /* end confdefs.h. */ | ||
| 13928 | $ac_includes_default | ||
| 13929 | int | ||
| 13930 | find_stack_direction (int *addr, int depth) | ||
| 13931 | { | ||
| 13932 | int dir, dummy = 0; | ||
| 13933 | if (! addr) | ||
| 13934 | addr = &dummy; | ||
| 13935 | *addr = addr < &dummy ? 1 : addr == &dummy ? 0 : -1; | ||
| 13936 | dir = depth ? find_stack_direction (addr, depth - 1) : 0; | ||
| 13937 | return dir + dummy; | ||
| 13938 | } | ||
| 13939 | |||
| 13940 | int | ||
| 13941 | main (int argc, char **argv) | ||
| 13942 | { | ||
| 13943 | return find_stack_direction (0, argc + !argv + 20) < 0; | ||
| 13944 | } | ||
| 13945 | _ACEOF | ||
| 13946 | if ac_fn_c_try_run "$LINENO"; then : | ||
| 13947 | ac_cv_c_stack_direction=1 | ||
| 13948 | else | ||
| 13949 | ac_cv_c_stack_direction=-1 | ||
| 13950 | fi | ||
| 13951 | rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ | ||
| 13952 | conftest.$ac_objext conftest.beam conftest.$ac_ext | ||
| 13953 | fi | ||
| 13954 | |||
| 13955 | fi | ||
| 13956 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_stack_direction" >&5 | ||
| 13957 | $as_echo "$ac_cv_c_stack_direction" >&6; } | ||
| 13958 | cat >>confdefs.h <<_ACEOF | ||
| 13959 | #define STACK_DIRECTION $ac_cv_c_stack_direction | ||
| 13960 | _ACEOF | ||
| 13961 | |||
| 13962 | |||
| 13963 | fi | ||
| 13964 | |||
| 13965 | 13965 | ||
| 13966 | 13966 | ||
| 13967 | 13967 | ||
| @@ -16682,6 +16682,61 @@ fi | |||
| 16682 | gl_source_base='lib' | 16682 | gl_source_base='lib' |
| 16683 | 16683 | ||
| 16684 | 16684 | ||
| 16685 | if test $ac_cv_func_alloca_works = no; then | ||
| 16686 | : | ||
| 16687 | fi | ||
| 16688 | |||
| 16689 | # Define an additional variable used in the Makefile substitution. | ||
| 16690 | if test $ac_cv_working_alloca_h = yes; then | ||
| 16691 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for alloca as a compiler built-in" >&5 | ||
| 16692 | $as_echo_n "checking for alloca as a compiler built-in... " >&6; } | ||
| 16693 | if test "${gl_cv_rpl_alloca+set}" = set; then : | ||
| 16694 | $as_echo_n "(cached) " >&6 | ||
| 16695 | else | ||
| 16696 | |||
| 16697 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
| 16698 | /* end confdefs.h. */ | ||
| 16699 | |||
| 16700 | #if defined __GNUC__ || defined _AIX || defined _MSC_VER | ||
| 16701 | Need own alloca | ||
| 16702 | #endif | ||
| 16703 | |||
| 16704 | _ACEOF | ||
| 16705 | if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | | ||
| 16706 | $EGREP "Need own alloca" >/dev/null 2>&1; then : | ||
| 16707 | gl_cv_rpl_alloca=yes | ||
| 16708 | else | ||
| 16709 | gl_cv_rpl_alloca=no | ||
| 16710 | fi | ||
| 16711 | rm -f conftest* | ||
| 16712 | |||
| 16713 | |||
| 16714 | fi | ||
| 16715 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_rpl_alloca" >&5 | ||
| 16716 | $as_echo "$gl_cv_rpl_alloca" >&6; } | ||
| 16717 | if test $gl_cv_rpl_alloca = yes; then | ||
| 16718 | |||
| 16719 | $as_echo "#define HAVE_ALLOCA 1" >>confdefs.h | ||
| 16720 | |||
| 16721 | ALLOCA_H=alloca.h | ||
| 16722 | else | ||
| 16723 | ALLOCA_H= | ||
| 16724 | fi | ||
| 16725 | else | ||
| 16726 | ALLOCA_H=alloca.h | ||
| 16727 | fi | ||
| 16728 | |||
| 16729 | if test -n "$ALLOCA_H"; then | ||
| 16730 | GL_GENERATE_ALLOCA_H_TRUE= | ||
| 16731 | GL_GENERATE_ALLOCA_H_FALSE='#' | ||
| 16732 | else | ||
| 16733 | GL_GENERATE_ALLOCA_H_TRUE='#' | ||
| 16734 | GL_GENERATE_ALLOCA_H_FALSE= | ||
| 16735 | fi | ||
| 16736 | |||
| 16737 | |||
| 16738 | |||
| 16739 | |||
| 16685 | 16740 | ||
| 16686 | 16741 | ||
| 16687 | : | 16742 | : |
| @@ -18798,6 +18853,9 @@ fi | |||
| 18798 | if $condition; then | 18853 | if $condition; then |
| 18799 | func_gl_gnulib_m4code_dosname | 18854 | func_gl_gnulib_m4code_dosname |
| 18800 | fi | 18855 | fi |
| 18856 | if $condition; then | ||
| 18857 | func_gl_gnulib_m4code_verify | ||
| 18858 | fi | ||
| 18801 | fi | 18859 | fi |
| 18802 | } | 18860 | } |
| 18803 | func_gl_gnulib_m4code_strtoull () | 18861 | func_gl_gnulib_m4code_strtoull () |
| @@ -21098,6 +21156,10 @@ if test -z "${GL_COND_LIBTOOL_TRUE}" && test -z "${GL_COND_LIBTOOL_FALSE}"; then | |||
| 21098 | as_fn_error "conditional \"GL_COND_LIBTOOL\" was never defined. | 21156 | as_fn_error "conditional \"GL_COND_LIBTOOL\" was never defined. |
| 21099 | Usually this means the macro was only invoked conditionally." "$LINENO" 5 | 21157 | Usually this means the macro was only invoked conditionally." "$LINENO" 5 |
| 21100 | fi | 21158 | fi |
| 21159 | if test -z "${GL_GENERATE_ALLOCA_H_TRUE}" && test -z "${GL_GENERATE_ALLOCA_H_FALSE}"; then | ||
| 21160 | as_fn_error "conditional \"GL_GENERATE_ALLOCA_H\" was never defined. | ||
| 21161 | Usually this means the macro was only invoked conditionally." "$LINENO" 5 | ||
| 21162 | fi | ||
| 21101 | 21163 | ||
| 21102 | if test -z "${GL_GENERATE_STDINT_H_TRUE}" && test -z "${GL_GENERATE_STDINT_H_FALSE}"; then | 21164 | if test -z "${GL_GENERATE_STDINT_H_TRUE}" && test -z "${GL_GENERATE_STDINT_H_FALSE}"; then |
| 21103 | as_fn_error "conditional \"GL_GENERATE_STDINT_H\" was never defined. | 21165 | as_fn_error "conditional \"GL_GENERATE_STDINT_H\" was never defined. |