aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2011-05-24 01:16:58 -0700
committerGlenn Morris2011-05-24 01:16:58 -0700
commit4ba4c54add7f291e655fb0a5555f7049a9ed17e9 (patch)
treefdb209e2070435f056aea0ce1ad113bb9e33e198
parent13c3daa4aed4b185596dd0bb6bc45bd941f1e3ab (diff)
downloademacs-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--ChangeLog3
-rw-r--r--configure.in11
2 files changed, 3 insertions, 11 deletions
diff --git a/ChangeLog b/ChangeLog
index 61d23540e55..1175988d897 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,9 @@
10 10
112011-05-24 Glenn Morris <rgm@gnu.org> 112011-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)`" ;;
365esac 365esac
366 366
367#### Check if the source directory already has a configured system in it.
368if 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.]])
376fi
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