Get rid of configure-dev; dev mode is given by dev.mk.in presence

diff --git a/autogen.sh b/autogen.sh
index f1b566c475351c25a0769efdf6fddd2326dd7dec..6c96c672203b9c5c327dd836f9c3f918fc0dd224 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -4,4 +4,4 @@ set -e
 
 autoheader
 autoconf
-echo "Now run ./configure-dev and make"
+echo "Now run ./configure and make"

diff --git a/configure-dev b/configure-dev
deleted file mode 100755 (executable)
index 36d62b6..0000000
--- a/configure-dev
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-`dirname $0`/configure --enable-dev "$@"

diff --git a/configure.ac b/configure.ac
index b2d69baac151396cb9b3a3231f656c32ac25f9fb..9d9978a9c2fac060c3af4811732c4b99cf8c1381 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -10,12 +10,6 @@ AC_CONFIG_HEADER(config.h)
 AC_SUBST(extra_sources)
 AC_SUBST(include_dev_mk)
 
-ccache_dev=no
-AC_ARG_ENABLE(
-    dev,
-    AS_HELP_STRING(--enable-dev, enable developer mode (requires GNU make)),
-    [include_dev_mk='include dev.mk'; ccache_dev=yes])
-
 dnl Checks for programs.
 AC_PROG_CC
 AC_PROG_CPP
@@ -281,7 +275,19 @@ if test "$ac_cv_c_extern_inline" != no ; then
               Define to 1 if your compiler supports extern inline)
 fi
 
-AC_CONFIG_FILES([Makefile dev.mk])
+dnl Enable developer mode if dev.mk.in exists.
+if test -f $srcdir/dev.mk.in; then
+    AC_MSG_NOTICE(Enabling developer mode)
+    AC_CONFIG_FILES([dev.mk])
+    include_dev_mk='include dev.mk'
+    version=`(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
+    AC_MSG_WARN(unable to determine ccache version)
+    echo "const char CCACHE_VERSION@<:@@:>@ = \"unknown\";" >version.c
+fi
+
+AC_CONFIG_FILES([Makefile])
 AC_OUTPUT
 
 cat <<EOF >config.h.tmp
@@ -292,14 +298,6 @@ cat config.h >>config.h.tmp
 echo '#endif' >>config.h.tmp
 mv config.h.tmp config.h
 
-if test "x$ccache_dev" = "xyes"; then
-    version=`(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 version.c; then
-    AC_MSG_WARN(unable to determine ccache version)
-    echo "const char CCACHE_VERSION@<:@@:>@ = \"unknown\";" >version.c
-fi
-
 mkdir -p .deps
 
 if test x$use_bundled_zlib = xyes; then

diff --git a/dev.mk.in b/dev.mk.in
index 28f9eeab66d06e77e28405c91f74e1d24f74b9e5..def8c845e4b4eeb4dc74b606dad6d4e153f63186 100644 (file)
--- a/dev.mk.in
+++ b/dev.mk.in
@@ -24,7 +24,7 @@ files_to_clean += *.xml
 
 source_dist_files = \
     $(sources) $(headers) zlib/*.c zlib/*.h \
-    config.h.in configure configure-dev dev.mk.in install-sh Makefile.in \
+    config.h.in configure install-sh Makefile.in \
     test.sh COPYING INSTALL.txt NEWS.txt README.txt
 dist_files = \
     $(addprefix $(srcdir)/, $(source_dist_files)) \