aboutsummaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorSergey Poznyakoff <gray@gnu.org.ua>2013-10-18 17:17:51 +0300
committerSergey Poznyakoff <gray@gnu.org.ua>2013-10-18 17:23:30 +0300
commitf8804331ac83e7db86ec1212d1849de02a091cf2 (patch)
treee375c435d6a9b8197cecedb4a2cd96cd6d3b539d /configure.ac
parent803128db75e3efea8cd7be29732a7b4315205d13 (diff)
downloadvmod-binlog-f8804331ac83e7db86ec1212d1849de02a091cf2.tar.gz
vmod-binlog-f8804331ac83e7db86ec1212d1849de02a091cf2.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: Write it. * doc/vmod-binlog.3: Minor change,
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac25
1 files changed, 12 insertions, 13 deletions
diff --git a/configure.ac b/configure.ac
index c4c9872..1bfc079 100644
--- a/configure.ac
+++ b/configure.ac
@@ -84,20 +84,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'

Return to:

Send suggestions and report system problems to the System administrator.