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 | |
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.
-rw-r--r-- | Makefile.am | 2 | ||||
-rw-r--r-- | README | 24 | ||||
-rw-r--r-- | configure.ac | 27 |
3 files changed, 34 insertions, 19 deletions
diff --git a/Makefile.am b/Makefile.am index 2e97059..107edb8 100644 --- a/Makefile.am +++ b/Makefile.am @@ -17,6 +17,8 @@ ACLOCAL_AMFLAGS = -I m4 SUBDIRS = src tests +AM_DISTCHECK_CONFIGURE_FLAGS=--without-vmoddir + EXTRA_DIST=git2chg.awk .PHONY: ChangeLog @@ -1,3 +1,7 @@ +Vmod-basicauth README +Copyright (C) 2013 Sergey Poznyakoff +See the end of file for copying conditions. + * Overview This module implements basic HTTP authentication against the password file @@ -21,11 +25,7 @@ In order to compile the package you need to have Varnish source tree. At least Varnish 3.0.1 is required. Supposing that the varnish source tree is available under /usr/src/varnish-3.0.1, run: - ./configure --with-varnish-source=/usr/src/varnish-3.0.1 --with-vmod-dir - -The first option tells configure where Varnish sources reside, the -second one (--with-vmod-dir) instructs it to place created module -files to the standard Varnish module directory. + ./configure --with-varnish-source=/usr/src/varnish-3.0.1 Once configured, do @@ -49,6 +49,20 @@ install. To read it without installing the module, run Send bug reports and suggestions to <gray@gnu.org> +* Copyright information: + +Copyright (C) 2013 Sergey Poznyakoff + + Permission is granted to anyone to make or distribute verbatim copies + of this document as received, in any medium, provided that the + copyright notice and this permission notice are preserved, + thus giving the recipient permission to redistribute in turn. + + Permission is granted to distribute modified versions + of this document, or of portions of it, + under the above conditions, provided also that they + carry prominent notices stating who last changed them. + Local Variables: mode: outline paragraph-separate: "[ ]*$" 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' |