diff options
| author | Joel Rosdahl <joel@rosdahl.net> | 2010-02-26 21:24:09 +0100 |
|---|---|---|
| committer | Joel Rosdahl <joel@rosdahl.net> | 2010-02-26 21:24:09 +0100 |
| commit | 1af0bd848651c62cdf72eea9918f5d57402de838 (patch) | |
| tree | d89ebafda73e4fba6b6ae8f0e23c65a53daa279f /configure.ac | |
| parent | f9cf675f44d23330d5673c689dade222a3aa283c (diff) | |
| download | ccache-1af0bd848651c62cdf72eea9918f5d57402de838.tar.gz | |
Portability: don't require GNU make
The part of Makefile.in that requires GNU make has been split into dev.mk.in,
and the configure script has learned a new --enable-dev option that makes
Makefile include dev.mk. The configure script doesn't check for GNU make
anymore. There is also a new configure-dev convenience script that runs
configure with --enable-dev.
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 26 |
1 files changed, 8 insertions, 18 deletions
diff --git a/configure.ac b/configure.ac index 8d506f9e..078673c2 100644 --- a/configure.ac +++ b/configure.ac @@ -8,6 +8,12 @@ AC_MSG_NOTICE([Configuring ccache]) AC_CONFIG_HEADER(config.h) AC_SUBST(extra_sources) +AC_SUBST(include_dev_mk) + +AC_ARG_ENABLE( + dev, + AS_HELP_STRING(--enable-dev, enable developer mode (requires GNU make)), + [include_dev_mk='include dev.mk']) dnl Checks for programs. AC_PROG_CC @@ -108,23 +114,7 @@ else mkdir -p zlib fi -dnl Check for GNU make. -AC_PATH_PROGS(MAKE, gmake make) -AC_CACHE_CHECK( - for GNU make, - ccache_cv_gnu_make, - [ - if $ac_cv_path_MAKE --version | head -1 | grep GNU >/dev/null 2>&1; then - ccache_cv_gnu_make=yes - else - ccache_cv_gnu_make=no - fi - ]) -if test x$ccache_cv_gnu_make = xno; then - AC_MSG_ERROR(Please install GNU make as gmake or make) -fi - -AC_CONFIG_FILES([Makefile]) +AC_CONFIG_FILES([Makefile dev.mk]) AC_OUTPUT mkdir -p .deps @@ -133,4 +123,4 @@ if test x$use_bundled_zlib = xyes; then AC_MSG_WARN(using bundled zlib) fi -AC_MSG_NOTICE(now please build ccache by running $ac_cv_path_MAKE) +AC_MSG_NOTICE(now build ccache by running make) |