* configure.ac (--enable-profiling): Doc fix.

2 files changed, 11 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index a139c0dfb6..39f9b31bf5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2012-11-21  Glenn Morris  <[email protected]>
+
+	* configure.ac (--enable-profiling): Doc fix.
+
 2012-11-03  Eli Zaretskii  <[email protected]>
 
 	* config.bat: Copy lib/execinfo.in.h to lib/execinfo.in-h if needed.
diff --git a/configure.ac b/configure.ac
index 4564bc3085..3246372ca4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -329,10 +329,15 @@ if test "${enableval}" != "no"; then
 fi)
 
 
+dnl The name of this option is unfortunate.  It predates, and has no
+dnl relation to, the "sampling-based elisp profiler" added in 24.3.
+dnl Actually, it stops it working.
+dnl http://lists.gnu.org/archive/html/emacs-devel/2012-11/msg00393.html
 AC_ARG_ENABLE(profiling,
 [AS_HELP_STRING([--enable-profiling],
-		[build emacs with profiling support.
-		 This might not work on all platforms])],
+		[build emacs with low-level, gprof profiling support.
+                Mainly useful for debugging Emacs itself.  May not work on
+                all platforms.  Stops profiler.el working.])],
 [ac_enable_profiling="${enableval}"],[])
 if test x$ac_enable_profiling != x ; then
    PROFILING_CFLAGS="-DPROFILING=1 -pg"