Fix developer mode detection

This broke in 81714b62b50563055faf301f5e4faec6652a426b.

diff --git a/autogen.sh b/autogen.sh
index 6c96c672203b9c5c327dd836f9c3f918fc0dd224..eb3d9ba12d50fd764e50a61c1d90fa5cb87adc17 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -2,6 +2,7 @@
 
 set -e
 
+rm -f dev_mode_disabled
 autoheader
 autoconf
 echo "Now run ./configure and make"

diff --git a/configure.ac b/configure.ac
index b9c0ba70a7df29671ecf9538d5b9b2073b3d7209..0ed10547c3d593f847fab51b1c3b1b879a50f4f6 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -144,13 +144,17 @@ if test "$ac_cv_c_extern_inline" != no ; then
 fi
 
 dnl Enable developer mode if dev.mk.in exists.
-if test -f $srcdir/dev.mk.in && test "$RUN_FROM_BUILD_FARM" != yes; then
-    AC_MSG_NOTICE(Enabling developer mode)
+if test ! -f $srcdir/dev_mode_disabled && test "$RUN_FROM_BUILD_FARM" != yes; then
+    AC_MSG_NOTICE(Developer mode enabled)
     AC_CONFIG_FILES([dev.mk])
     include_dev_mk='include dev.mk'
     version=`(git --git-dir=$srcdir/.git describe --dirty 2>/dev/null || echo vunknown) | sed -e 's/v//' -e 's/-/+/' -e 's/-/_/g'`
     echo "const char CCACHE_VERSION@<:@@:>@ = \"$version\";" >version.c
-elif test ! -f $srcdir/version.c; then
+else
+    AC_MSG_NOTICE(Developer mode disabled)
+fi
+
+if test ! -f $srcdir/version.c; then
     AC_MSG_WARN(unable to determine ccache version)
     echo "const char CCACHE_VERSION@<:@@:>@ = \"unknown\";" >version.c
 fi

diff --git a/dev.mk.in b/dev.mk.in
index 6fd9638ca23f9f995dc4bc791491606bf13ae214..914e7e5f902f6e6640ae5be4dedc4818ba5fc4ac 100644 (file)
--- a/dev.mk.in
+++ b/dev.mk.in
@@ -105,6 +105,7 @@ $(dist_archives): $(dist_files)
        (cd $(srcdir) && \
         rsync -r --relative $(source_dist_files) $$dir) && \
        cp $(built_dist_files) $$dir && \
+       echo "Remove this file to enable developer mode." >$$dir/dev_mode_disabled && \
        (cd $$tmpdir && \
         tarcompression= && \
         case $@ in \