From: Joel Rosdahl Date: Sun, 15 Sep 2019 20:31:25 +0000 (+0200) Subject: Move dev mode configure check to the top X-Git-Tag: v4.0~784 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5dec0a5f921683ac0dcba73b979caea6cae9ecd7;p=thirdparty%2Fccache.git Move dev mode configure check to the top This makes it possible to make decisions depending on dev mode futher down in configure. --- diff --git a/configure.ac b/configure.ac index 2d95eb6dd..504aede9a 100644 --- a/configure.ac +++ b/configure.ac @@ -5,6 +5,19 @@ AC_PREREQ(2.52) AC_MSG_NOTICE([configuring ccache]) +dnl Enable developer mode if dev.mk.in exists. +if test ! -f $srcdir/dev_mode_disabled; then + dev_mode=yes + 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 "extern const char CCACHE_VERSION@<:@@:>@; const char CCACHE_VERSION@<:@@:>@ = \"$version\";" >src/version.cpp +else + dev_mode=no + AC_MSG_NOTICE(developer mode disabled) +fi + AC_CONFIG_HEADER(config.h) AC_CANONICAL_HOST @@ -249,17 +262,6 @@ if test "$ac_cv_c_extern_inline" != no ; then Define to 1 if your compiler supports extern inline) fi -dnl Enable developer mode if dev.mk.in exists. -if test ! -f $srcdir/dev_mode_disabled; 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 "extern const char CCACHE_VERSION@<:@@:>@; const char CCACHE_VERSION@<:@@:>@ = \"$version\";" >src/version.cpp -else - AC_MSG_NOTICE(developer mode disabled) -fi - if test ! -f $srcdir/src/version.cpp -a ! -f src/version.cpp ; then AC_MSG_WARN(unable to determine ccache version) echo "extern const char CCACHE_VERSION@<:@@:>@; const char CCACHE_VERSION@<:@@:>@ = \"unknown\";" >src/version.cpp