diff options
| author | Glenn Morris | 2011-05-24 01:16:58 -0700 |
|---|---|---|
| committer | Glenn Morris | 2011-05-24 01:16:58 -0700 |
| commit | 4ba4c54add7f291e655fb0a5555f7049a9ed17e9 (patch) | |
| tree | fdb209e2070435f056aea0ce1ad113bb9e33e198 | |
| parent | 13c3daa4aed4b185596dd0bb6bc45bd941f1e3ab (diff) | |
| download | emacs-4ba4c54add7f291e655fb0a5555f7049a9ed17e9.tar.gz emacs-4ba4c54add7f291e655fb0a5555f7049a9ed17e9.zip | |
Remove dead code in configure.in.
* configure.in: Remove test for already configured source directory.
AM_INIT_AUTOMAKE has already done a more stringent test. (Bug#953)
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | configure.in | 11 |
2 files changed, 3 insertions, 11 deletions
| @@ -10,6 +10,9 @@ | |||
| 10 | 10 | ||
| 11 | 2011-05-24 Glenn Morris <rgm@gnu.org> | 11 | 2011-05-24 Glenn Morris <rgm@gnu.org> |
| 12 | 12 | ||
| 13 | * configure.in: Remove test for already configured source directory. | ||
| 14 | AM_INIT_AUTOMAKE has already done a more stringent test. (Bug#953) | ||
| 15 | |||
| 13 | * Makefile.in (TAGS, tags, check): Pass MFLAGS to sub-makes. | 16 | * Makefile.in (TAGS, tags, check): Pass MFLAGS to sub-makes. |
| 14 | 17 | ||
| 15 | * configure.in (OPT_MAKEFILES_IN): Remove. | 18 | * configure.in (OPT_MAKEFILES_IN): Remove. |
diff --git a/configure.in b/configure.in index c8f561a6c5e..aa7d890781c 100644 --- a/configure.in +++ b/configure.in | |||
| @@ -364,17 +364,6 @@ case "${srcdir}" in | |||
| 364 | * ) srcdir="`(cd ${srcdir}; pwd)`" ;; | 364 | * ) srcdir="`(cd ${srcdir}; pwd)`" ;; |
| 365 | esac | 365 | esac |
| 366 | 366 | ||
| 367 | #### Check if the source directory already has a configured system in it. | ||
| 368 | if test `pwd` != `(cd ${srcdir} && pwd)` \ | ||
| 369 | && test -f "${srcdir}/src/config.h" ; then | ||
| 370 | AC_MSG_WARN([[The directory tree `${srcdir}' is being used | ||
| 371 | as a build directory right now; it has been configured in its own | ||
| 372 | right. To configure in another directory as well, you MUST | ||
| 373 | use GNU make. If you do not have GNU make, then you must | ||
| 374 | now do `make distclean' in ${srcdir}, | ||
| 375 | and then run $0 again.]]) | ||
| 376 | fi | ||
| 377 | |||
| 378 | #### Given the configuration name, set machfile and opsysfile to the | 367 | #### Given the configuration name, set machfile and opsysfile to the |
| 379 | #### names of the m/*.h and s/*.h files we should use. | 368 | #### names of the m/*.h and s/*.h files we should use. |
| 380 | 369 | ||