diff options
author | Sergey Poznyakoff <gray@gnu.org.ua> | 2013-10-19 00:19:46 +0300 |
---|---|---|
committer | Sergey Poznyakoff <gray@gnu.org.ua> | 2013-10-19 00:21:08 +0300 |
commit | f97dace54f55dd877555f050eec892a0f2b4d51b (patch) | |
tree | 5c382d61877eeb2484acfe4fec86942ce9bf1fdc /configure.ac | |
parent | cc91d59a61ae557f366f6717cd8d6c37c2d3e9d9 (diff) | |
download | vmod-basicauth-f97dace54f55dd877555f050eec892a0f2b4d51b.tar.gz vmod-basicauth-f97dace54f55dd877555f050eec892a0f2b4d51b.tar.bz2 |
Get rid of the --with-vmod-dir option.
* Makefile.am: Add default options for distcheck.
* configure.ac: Remove --with-vmod-dir, default to
the standard Varnish module location, Provide
the --without-vmoddir option for use in distcheck.
* README: Update.
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/configure.ac b/configure.ac index 3ec841b..e01fe05 100644 --- a/configure.ac +++ b/configure.ac @@ -23,7 +23,7 @@ AM_CONFIG_HEADER(config.h) AC_CANONICAL_SYSTEM AC_LANG(C) -AM_INIT_AUTOMAKE([gnu tar-ustar]) +AM_INIT_AUTOMAKE([1.14 gnu tar-ustar]) AC_GNU_SOURCE AC_PROG_CC @@ -75,20 +75,19 @@ AC_CHECK_FILE([$VARNISHSRC/bin/varnishtest/varnishtest], ) # vmod installation dir -AC_ARG_VAR([VMODDIR], - [vmod installation directory @<:@LIBDIR/varnish/vmods@:>@]) -AC_ARG_WITH([vmod-dir], - AC_HELP_STRING([--with-vmod-dir@<:@=DIR@:>@], - [install modules to DIR; if used without arguments, install them to the varnish module directory]), +AC_ARG_VAR([VMODDIR], [vmod installation directory]) +AC_ARG_WITH([vmoddir], + AC_HELP_STRING([--with-vmoddir=DIR], + [install modules to DIR]), [case "$withval" in - yes) - VMODDIR=`pkg-config --variable=vmoddir varnishapi` - if test -z "$VMODDIR"; then - AC_MSG_FAILURE([cannot determine vmod installation directory]) - fi;; - /*) VMODDIR=$withval;; - *) AC_MSG_ERROR([argument to --with-vmod-dir must be absolute pathname]) - esac]) + /*) VMODDIR=$withval;; + no) unset VMODDIR;; + *) AC_MSG_ERROR([argument to --with-vmoddir must be absolute pathname]) + esac],[VMODDIR=`pkg-config --variable=vmoddir varnishapi` + if test -z "$VMODDIR"; then + AC_MSG_FAILURE([cannot determine vmod installation directory]) + fi]) + if test -z "$VMODDIR"; then VMODDIR='$(libdir)/varnish/mods' |