diff options
| author | Glenn Morris | 2013-10-03 06:17:43 -0400 |
|---|---|---|
| committer | Glenn Morris | 2013-10-03 06:17:43 -0400 |
| commit | 8a3fafec9bfc4029c606ec857bf9a51bc400b622 (patch) | |
| tree | 1e0bf8f70b738cb82ba1fb83433520545813fca0 | |
| parent | acbadd0046cb1643eeaf8595ede1a69cc25d3158 (diff) | |
| download | emacs-8a3fafec9bfc4029c606ec857bf9a51bc400b622.tar.gz emacs-8a3fafec9bfc4029c606ec857bf9a51bc400b622.zip | |
Auto-commit of generated files.
| -rw-r--r-- | autogen/Makefile.in | 2 | ||||
| -rw-r--r-- | autogen/config.in | 3 | ||||
| -rwxr-xr-x | autogen/configure | 72 |
3 files changed, 74 insertions, 3 deletions
diff --git a/autogen/Makefile.in b/autogen/Makefile.in index 19904e8631e..51180d9b21f 100644 --- a/autogen/Makefile.in +++ b/autogen/Makefile.in | |||
| @@ -1017,6 +1017,7 @@ REPLACE_FUTIMENS = @REPLACE_FUTIMENS@ | |||
| 1017 | REPLACE_GETCWD = @REPLACE_GETCWD@ | 1017 | REPLACE_GETCWD = @REPLACE_GETCWD@ |
| 1018 | REPLACE_GETDELIM = @REPLACE_GETDELIM@ | 1018 | REPLACE_GETDELIM = @REPLACE_GETDELIM@ |
| 1019 | REPLACE_GETDOMAINNAME = @REPLACE_GETDOMAINNAME@ | 1019 | REPLACE_GETDOMAINNAME = @REPLACE_GETDOMAINNAME@ |
| 1020 | REPLACE_GETDTABLESIZE = @REPLACE_GETDTABLESIZE@ | ||
| 1020 | REPLACE_GETGROUPS = @REPLACE_GETGROUPS@ | 1021 | REPLACE_GETGROUPS = @REPLACE_GETGROUPS@ |
| 1021 | REPLACE_GETLINE = @REPLACE_GETLINE@ | 1022 | REPLACE_GETLINE = @REPLACE_GETLINE@ |
| 1022 | REPLACE_GETLOGIN_R = @REPLACE_GETLOGIN_R@ | 1023 | REPLACE_GETLOGIN_R = @REPLACE_GETLOGIN_R@ |
| @@ -2720,6 +2721,7 @@ uninstall-am: | |||
| 2720 | @BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_FTRUNCATE''@|$(REPLACE_FTRUNCATE)|g' \ | 2721 | @BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_FTRUNCATE''@|$(REPLACE_FTRUNCATE)|g' \ |
| 2721 | @BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_GETCWD''@|$(REPLACE_GETCWD)|g' \ | 2722 | @BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_GETCWD''@|$(REPLACE_GETCWD)|g' \ |
| 2722 | @BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_GETDOMAINNAME''@|$(REPLACE_GETDOMAINNAME)|g' \ | 2723 | @BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_GETDOMAINNAME''@|$(REPLACE_GETDOMAINNAME)|g' \ |
| 2724 | @BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_GETDTABLESIZE''@|$(REPLACE_GETDTABLESIZE)|g' \ | ||
| 2723 | @BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_GETLOGIN_R''@|$(REPLACE_GETLOGIN_R)|g' \ | 2725 | @BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_GETLOGIN_R''@|$(REPLACE_GETLOGIN_R)|g' \ |
| 2724 | @BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_GETGROUPS''@|$(REPLACE_GETGROUPS)|g' \ | 2726 | @BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_GETGROUPS''@|$(REPLACE_GETGROUPS)|g' \ |
| 2725 | @BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_GETPAGESIZE''@|$(REPLACE_GETPAGESIZE)|g' \ | 2727 | @BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_GETPAGESIZE''@|$(REPLACE_GETPAGESIZE)|g' \ |
diff --git a/autogen/config.in b/autogen/config.in index c68a257f31c..0d48daca6bc 100644 --- a/autogen/config.in +++ b/autogen/config.in | |||
| @@ -867,6 +867,9 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 867 | /* Define to 1 if you have the `sendto' function. */ | 867 | /* Define to 1 if you have the `sendto' function. */ |
| 868 | #undef HAVE_SENDTO | 868 | #undef HAVE_SENDTO |
| 869 | 869 | ||
| 870 | /* Define to 1 if you have the `setdtablesize' function. */ | ||
| 871 | #undef HAVE_SETDTABLESIZE | ||
| 872 | |||
| 870 | /* Define to 1 if you have the `setitimer' function. */ | 873 | /* Define to 1 if you have the `setitimer' function. */ |
| 871 | #undef HAVE_SETITIMER | 874 | #undef HAVE_SETITIMER |
| 872 | 875 | ||
diff --git a/autogen/configure b/autogen/configure index 5da983cdd72..0959be77352 100755 --- a/autogen/configure +++ b/autogen/configure | |||
| @@ -1147,6 +1147,7 @@ REPLACE_ISATTY | |||
| 1147 | REPLACE_GETPAGESIZE | 1147 | REPLACE_GETPAGESIZE |
| 1148 | REPLACE_GETGROUPS | 1148 | REPLACE_GETGROUPS |
| 1149 | REPLACE_GETLOGIN_R | 1149 | REPLACE_GETLOGIN_R |
| 1150 | REPLACE_GETDTABLESIZE | ||
| 1150 | REPLACE_GETDOMAINNAME | 1151 | REPLACE_GETDOMAINNAME |
| 1151 | REPLACE_GETCWD | 1152 | REPLACE_GETCWD |
| 1152 | REPLACE_FTRUNCATE | 1153 | REPLACE_FTRUNCATE |
| @@ -18182,6 +18183,7 @@ $as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h | |||
| 18182 | REPLACE_FTRUNCATE=0; | 18183 | REPLACE_FTRUNCATE=0; |
| 18183 | REPLACE_GETCWD=0; | 18184 | REPLACE_GETCWD=0; |
| 18184 | REPLACE_GETDOMAINNAME=0; | 18185 | REPLACE_GETDOMAINNAME=0; |
| 18186 | REPLACE_GETDTABLESIZE=0; | ||
| 18185 | REPLACE_GETLOGIN_R=0; | 18187 | REPLACE_GETLOGIN_R=0; |
| 18186 | REPLACE_GETGROUPS=0; | 18188 | REPLACE_GETGROUPS=0; |
| 18187 | REPLACE_GETPAGESIZE=0; | 18189 | REPLACE_GETPAGESIZE=0; |
| @@ -22659,9 +22661,11 @@ int result = 0; | |||
| 22659 | /* Many gnulib modules require POSIX conformance of EBADF. */ | 22661 | /* Many gnulib modules require POSIX conformance of EBADF. */ |
| 22660 | if (dup2 (2, 1000000) == -1 && errno != EBADF) | 22662 | if (dup2 (2, 1000000) == -1 && errno != EBADF) |
| 22661 | result |= 16; | 22663 | result |= 16; |
| 22662 | /* Flush out a cygwin core dump. */ | 22664 | /* Flush out some cygwin core dumps. */ |
| 22663 | if (dup2 (2, -1) != -1 || errno != EBADF) | 22665 | if (dup2 (2, -1) != -1 || errno != EBADF) |
| 22664 | result |= 32; | 22666 | result |= 32; |
| 22667 | dup2 (2, 255); | ||
| 22668 | dup2 (2, 256); | ||
| 22665 | return result; | 22669 | return result; |
| 22666 | 22670 | ||
| 22667 | ; | 22671 | ; |
| @@ -22686,6 +22690,17 @@ $as_echo "$gl_cv_func_dup2_works" >&6; } | |||
| 22686 | *yes) ;; | 22690 | *yes) ;; |
| 22687 | *) | 22691 | *) |
| 22688 | REPLACE_DUP2=1 | 22692 | REPLACE_DUP2=1 |
| 22693 | for ac_func in setdtablesize | ||
| 22694 | do : | ||
| 22695 | ac_fn_c_check_func "$LINENO" "setdtablesize" "ac_cv_func_setdtablesize" | ||
| 22696 | if test "x$ac_cv_func_setdtablesize" = x""yes; then : | ||
| 22697 | cat >>confdefs.h <<_ACEOF | ||
| 22698 | #define HAVE_SETDTABLESIZE 1 | ||
| 22699 | _ACEOF | ||
| 22700 | |||
| 22701 | fi | ||
| 22702 | done | ||
| 22703 | |||
| 22689 | ;; | 22704 | ;; |
| 22690 | esac | 22705 | esac |
| 22691 | fi | 22706 | fi |
| @@ -28236,11 +28251,62 @@ done | |||
| 28236 | 28251 | ||
| 28237 | 28252 | ||
| 28238 | 28253 | ||
| 28239 | if test $ac_cv_func_getdtablesize != yes; then | 28254 | |
| 28255 | if test $ac_cv_func_getdtablesize = yes; then | ||
| 28256 | # Cygwin 1.7.25 automatically increases the RLIMIT_NOFILE soft limit | ||
| 28257 | # up to an unchangeable hard limit; all other platforms correctly | ||
| 28258 | # require setrlimit before getdtablesize() can report a larger value. | ||
| 28259 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether getdtablesize works" >&5 | ||
| 28260 | $as_echo_n "checking whether getdtablesize works... " >&6; } | ||
| 28261 | if test "${gl_cv_func_getdtablesize_works+set}" = set; then : | ||
| 28262 | $as_echo_n "(cached) " >&6 | ||
| 28263 | else | ||
| 28264 | if test "$cross_compiling" = yes; then : | ||
| 28265 | case "$host_os" in | ||
| 28266 | cygwin*) # on cygwin 1.5.25, getdtablesize() automatically grows | ||
| 28267 | gl_cv_func_getdtablesize_works="guessing no" ;; | ||
| 28268 | *) gl_cv_func_getdtablesize_works="guessing yes" ;; | ||
| 28269 | esac | ||
| 28270 | else | ||
| 28271 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
| 28272 | /* end confdefs.h. */ | ||
| 28273 | |||
| 28274 | #include <unistd.h> | ||
| 28275 | int | ||
| 28276 | main () | ||
| 28277 | { | ||
| 28278 | int size = getdtablesize(); | ||
| 28279 | if (dup2 (0, getdtablesize()) != -1) | ||
| 28280 | return 1; | ||
| 28281 | if (size != getdtablesize()) | ||
| 28282 | return 2; | ||
| 28283 | |||
| 28284 | ; | ||
| 28285 | return 0; | ||
| 28286 | } | ||
| 28287 | _ACEOF | ||
| 28288 | if ac_fn_c_try_run "$LINENO"; then : | ||
| 28289 | gl_cv_func_getdtablesize_works=yes | ||
| 28290 | else | ||
| 28291 | gl_cv_func_getdtablesize_works=no | ||
| 28292 | fi | ||
| 28293 | rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ | ||
| 28294 | conftest.$ac_objext conftest.beam conftest.$ac_ext | ||
| 28295 | fi | ||
| 28296 | |||
| 28297 | |||
| 28298 | fi | ||
| 28299 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_getdtablesize_works" >&5 | ||
| 28300 | $as_echo "$gl_cv_func_getdtablesize_works" >&6; } | ||
| 28301 | case "$gl_cv_func_getdtablesize_works" in | ||
| 28302 | *yes) ;; | ||
| 28303 | *) REPLACE_GETDTABLESIZE=1 ;; | ||
| 28304 | esac | ||
| 28305 | else | ||
| 28240 | HAVE_GETDTABLESIZE=0 | 28306 | HAVE_GETDTABLESIZE=0 |
| 28241 | fi | 28307 | fi |
| 28242 | 28308 | ||
| 28243 | if test $HAVE_GETDTABLESIZE = 0; then | 28309 | if test $HAVE_GETDTABLESIZE = 0 || test $REPLACE_GETDTABLESIZE = 1; then |
| 28244 | 28310 | ||
| 28245 | 28311 | ||
| 28246 | 28312 | ||