diff options
| author | Glenn Morris | 2011-06-17 06:18:17 -0400 |
|---|---|---|
| committer | Glenn Morris | 2011-06-17 06:18:17 -0400 |
| commit | ce4331ef48cff5ea38895a6b153967d54799cd47 (patch) | |
| tree | b3f45b7dd3a19c47d87bf8330277066afa9271c2 | |
| parent | d1067961b16f71cb0d9c2f3ff59d34ea5854b76e (diff) | |
| download | emacs-ce4331ef48cff5ea38895a6b153967d54799cd47.tar.gz emacs-ce4331ef48cff5ea38895a6b153967d54799cd47.zip | |
Auto-commit of generated files.
| -rwxr-xr-x | autogen/configure | 99 |
1 files changed, 64 insertions, 35 deletions
diff --git a/autogen/configure b/autogen/configure index f419c9117ed..ef25fb2735c 100755 --- a/autogen/configure +++ b/autogen/configure | |||
| @@ -7633,6 +7633,43 @@ fi | |||
| 7633 | 7633 | ||
| 7634 | 7634 | ||
| 7635 | 7635 | ||
| 7636 | ## If we're using gcc, and the user hasn't specified a crt-dir, try to | ||
| 7637 | ## determine it automatically by asking gcc. [If this doesn't work, | ||
| 7638 | ## CRT_DIR will remain empty and system-dependent code will be used | ||
| 7639 | ## below.] | ||
| 7640 | ## | ||
| 7641 | if test "x${GCC}z$CRT_DIR" = xyesz; then | ||
| 7642 | crt_file=`$CC 2>/dev/null --print-file-name=crt1.o` | ||
| 7643 | case "$crt_file" in | ||
| 7644 | */*) | ||
| 7645 | CRT_DIR=`$as_dirname -- "$crt_file" || | ||
| 7646 | $as_expr X"$crt_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ | ||
| 7647 | X"$crt_file" : 'X\(//\)[^/]' \| \ | ||
| 7648 | X"$crt_file" : 'X\(//\)$' \| \ | ||
| 7649 | X"$crt_file" : 'X\(/\)' \| . 2>/dev/null || | ||
| 7650 | $as_echo X"$crt_file" | | ||
| 7651 | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ | ||
| 7652 | s//\1/ | ||
| 7653 | q | ||
| 7654 | } | ||
| 7655 | /^X\(\/\/\)[^/].*/{ | ||
| 7656 | s//\1/ | ||
| 7657 | q | ||
| 7658 | } | ||
| 7659 | /^X\(\/\/\)$/{ | ||
| 7660 | s//\1/ | ||
| 7661 | q | ||
| 7662 | } | ||
| 7663 | /^X\(\/\).*/{ | ||
| 7664 | s//\1/ | ||
| 7665 | q | ||
| 7666 | } | ||
| 7667 | s/.*/./; q'` | ||
| 7668 | ;; | ||
| 7669 | esac | ||
| 7670 | fi | ||
| 7671 | |||
| 7672 | |||
| 7636 | ## If user specified a crt-dir, use that unconditionally. | 7673 | ## If user specified a crt-dir, use that unconditionally. |
| 7637 | if test "X$CRT_DIR" = "X"; then | 7674 | if test "X$CRT_DIR" = "X"; then |
| 7638 | 7675 | ||
| @@ -16015,16 +16052,21 @@ $as_echo "#define GL_TRIGGER_STDC_LIMIT_MACROS 1" >>confdefs.h | |||
| 16015 | 16052 | ||
| 16016 | 16053 | ||
| 16017 | 16054 | ||
| 16018 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether lstat correctly handles trailing slash" >&5 | 16055 | |
| 16056 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether lstat correctly handles trailing slash" >&5 | ||
| 16019 | $as_echo_n "checking whether lstat correctly handles trailing slash... " >&6; } | 16057 | $as_echo_n "checking whether lstat correctly handles trailing slash... " >&6; } |
| 16020 | if test "${ac_cv_func_lstat_dereferences_slashed_symlink+set}" = set; then : | 16058 | if test "${gl_cv_func_lstat_dereferences_slashed_symlink+set}" = set; then : |
| 16021 | $as_echo_n "(cached) " >&6 | 16059 | $as_echo_n "(cached) " >&6 |
| 16022 | else | 16060 | else |
| 16023 | rm -f conftest.sym conftest.file | 16061 | rm -f conftest.sym conftest.file |
| 16024 | echo >conftest.file | 16062 | echo >conftest.file |
| 16025 | if test "$as_ln_s" = "ln -s" && ln -s conftest.file conftest.sym; then | 16063 | if test "$as_ln_s" = "ln -s" && ln -s conftest.file conftest.sym; then |
| 16026 | if test "$cross_compiling" = yes; then : | 16064 | if test "$cross_compiling" = yes; then : |
| 16027 | ac_cv_func_lstat_dereferences_slashed_symlink=no | 16065 | # When cross-compiling, be pessimistic so we will end up using the |
| 16066 | # replacement version of lstat that checks for trailing slashes and | ||
| 16067 | # calls lstat a second time when necessary. | ||
| 16068 | gl_cv_func_lstat_dereferences_slashed_symlink=no | ||
| 16069 | |||
| 16028 | else | 16070 | else |
| 16029 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext | 16071 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 16030 | /* end confdefs.h. */ | 16072 | /* end confdefs.h. */ |
| @@ -16033,54 +16075,41 @@ int | |||
| 16033 | main () | 16075 | main () |
| 16034 | { | 16076 | { |
| 16035 | struct stat sbuf; | 16077 | struct stat sbuf; |
| 16036 | /* Linux will dereference the symlink and fail, as required by POSIX. | 16078 | /* Linux will dereference the symlink and fail, as required by |
| 16037 | That is better in the sense that it means we will not | 16079 | POSIX. That is better in the sense that it means we will not |
| 16038 | have to compile and use the lstat wrapper. */ | 16080 | have to compile and use the lstat wrapper. */ |
| 16039 | return lstat ("conftest.sym/", &sbuf) == 0; | 16081 | return lstat ("conftest.sym/", &sbuf) == 0; |
| 16082 | |||
| 16040 | ; | 16083 | ; |
| 16041 | return 0; | 16084 | return 0; |
| 16042 | } | 16085 | } |
| 16043 | _ACEOF | 16086 | _ACEOF |
| 16044 | if ac_fn_c_try_run "$LINENO"; then : | 16087 | if ac_fn_c_try_run "$LINENO"; then : |
| 16045 | ac_cv_func_lstat_dereferences_slashed_symlink=yes | 16088 | gl_cv_func_lstat_dereferences_slashed_symlink=yes |
| 16046 | else | 16089 | else |
| 16047 | ac_cv_func_lstat_dereferences_slashed_symlink=no | 16090 | gl_cv_func_lstat_dereferences_slashed_symlink=no |
| 16048 | fi | 16091 | fi |
| 16049 | rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ | 16092 | rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ |
| 16050 | conftest.$ac_objext conftest.beam conftest.$ac_ext | 16093 | conftest.$ac_objext conftest.beam conftest.$ac_ext |
| 16051 | fi | 16094 | fi |
| 16052 | 16095 | ||
| 16053 | else | 16096 | else |
| 16054 | # If the `ln -s' command failed, then we probably don't even | 16097 | # If the 'ln -s' command failed, then we probably don't even |
| 16055 | # have an lstat function. | 16098 | # have an lstat function. |
| 16056 | ac_cv_func_lstat_dereferences_slashed_symlink=no | 16099 | gl_cv_func_lstat_dereferences_slashed_symlink=no |
| 16057 | fi | 16100 | fi |
| 16058 | rm -f conftest.sym conftest.file | 16101 | rm -f conftest.sym conftest.file |
| 16059 | 16102 | ||
| 16060 | fi | 16103 | fi |
| 16061 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_lstat_dereferences_slashed_symlink" >&5 | 16104 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_lstat_dereferences_slashed_symlink" >&5 |
| 16062 | $as_echo "$ac_cv_func_lstat_dereferences_slashed_symlink" >&6; } | 16105 | $as_echo "$gl_cv_func_lstat_dereferences_slashed_symlink" >&6; } |
| 16063 | 16106 | test $gl_cv_func_lstat_dereferences_slashed_symlink = yes && | |
| 16064 | test $ac_cv_func_lstat_dereferences_slashed_symlink = yes && | ||
| 16065 | 16107 | ||
| 16066 | cat >>confdefs.h <<_ACEOF | 16108 | cat >>confdefs.h <<_ACEOF |
| 16067 | #define LSTAT_FOLLOWS_SLASHED_SYMLINK 1 | 16109 | #define LSTAT_FOLLOWS_SLASHED_SYMLINK 1 |
| 16068 | _ACEOF | 16110 | _ACEOF |
| 16069 | 16111 | ||
| 16070 | 16112 | ||
| 16071 | if test "x$ac_cv_func_lstat_dereferences_slashed_symlink" = xno; then | ||
| 16072 | |||
| 16073 | |||
| 16074 | |||
| 16075 | |||
| 16076 | |||
| 16077 | |||
| 16078 | |||
| 16079 | |||
| 16080 | gl_LIBOBJS="$gl_LIBOBJS lstat.$ac_objext" | ||
| 16081 | |||
| 16082 | fi | ||
| 16083 | |||
| 16084 | 16113 | ||
| 16085 | GNULIB_MKTIME=0; | 16114 | GNULIB_MKTIME=0; |
| 16086 | GNULIB_NANOSLEEP=0; | 16115 | GNULIB_NANOSLEEP=0; |