diff options
| author | Glenn Morris | 2011-06-28 20:47:07 -0700 |
|---|---|---|
| committer | Glenn Morris | 2011-06-28 20:47:07 -0700 |
| commit | e9dfbb4a2cc9fd0b5a542114803a60732a375599 (patch) | |
| tree | 583d322199da5238745af3696812bbd3c25379e5 | |
| parent | d34a9bb38f1f3337e7308c36601ddc2d25584ce1 (diff) | |
| download | emacs-e9dfbb4a2cc9fd0b5a542114803a60732a375599.tar.gz emacs-e9dfbb4a2cc9fd0b5a542114803a60732a375599.zip | |
* configure.in: Do not override user crt-dir, even if faulty.
| -rw-r--r-- | configure.in | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/configure.in b/configure.in index 956167bd4c8..d7e4efe51ed 100644 --- a/configure.in +++ b/configure.in | |||
| @@ -1040,6 +1040,8 @@ done | |||
| 1040 | if test "x$crt_files" != x; then | 1040 | if test "x$crt_files" != x; then |
| 1041 | 1041 | ||
| 1042 | ## If user specified a crt-dir, use that unconditionally. | 1042 | ## If user specified a crt-dir, use that unconditionally. |
| 1043 | crt_gcc=no | ||
| 1044 | |||
| 1043 | if test "X$CRT_DIR" = "X"; then | 1045 | if test "X$CRT_DIR" = "X"; then |
| 1044 | 1046 | ||
| 1045 | CRT_DIR=/usr/lib # default | 1047 | CRT_DIR=/usr/lib # default |
| @@ -1063,18 +1065,17 @@ if test "x$crt_files" != x; then | |||
| 1063 | hpux10-20) CRT_DIR=/lib ;; | 1065 | hpux10-20) CRT_DIR=/lib ;; |
| 1064 | esac | 1066 | esac |
| 1065 | 1067 | ||
| 1068 | test "x${GCC}" = xyes && crt_gcc=yes | ||
| 1069 | |||
| 1066 | fi # CRT_DIR = "" | 1070 | fi # CRT_DIR = "" |
| 1067 | 1071 | ||
| 1068 | crt_missing= | 1072 | crt_missing= |
| 1069 | crt_gcc=no | ||
| 1070 | test "x${GCC}" = xyes && crt_gcc=yes | ||
| 1071 | 1073 | ||
| 1072 | for file in $crt_files; do | 1074 | for file in $crt_files; do |
| 1073 | 1075 | ||
| 1074 | ## If we're using gcc, try to determine it automatically by asking | 1076 | ## If we're using gcc, try to determine it automatically by asking |
| 1075 | ## gcc. [If this doesn't work, CRT_DIR will remain at the | 1077 | ## gcc. [If this doesn't work, CRT_DIR will remain at the |
| 1076 | ## system-dependent default from above.] | 1078 | ## system-dependent default from above.] |
| 1077 | ## Note that this overrides a faulty with-crt-dir. | ||
| 1078 | if test $crt_gcc = yes && test ! -e $CRT_DIR/$file; then | 1079 | if test $crt_gcc = yes && test ! -e $CRT_DIR/$file; then |
| 1079 | 1080 | ||
| 1080 | crt_file=`$CC --print-file-name=$file 2>/dev/null` | 1081 | crt_file=`$CC --print-file-name=$file 2>/dev/null` |