diff options
author | Sergey Poznyakoff <gray@gnu.org.ua> | 2013-10-19 00:33:41 +0300 |
---|---|---|
committer | Sergey Poznyakoff <gray@gnu.org.ua> | 2013-10-19 00:33:41 +0300 |
commit | aa4306ad7e683d74c214be2278c697b58a0936d6 (patch) | |
tree | 14ade48cb5127361ee5845389a70cdbc1cf0f3dd | |
parent | 0d499a8da2310909e04099db558b7823f4df3837 (diff) | |
download | vmod-tbf-aa4306ad7e683d74c214be2278c697b58a0936d6.tar.gz vmod-tbf-aa4306ad7e683d74c214be2278c697b58a0936d6.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-- | configure.ac | 25 |
2 files changed, 14 insertions, 13 deletions
diff --git a/Makefile.am b/Makefile.am index d458b68..7c1d758 100644 --- a/Makefile.am +++ b/Makefile.am | |||
@@ -17,6 +17,8 @@ ACLOCAL_AMFLAGS = -I m4 | |||
17 | 17 | ||
18 | SUBDIRS = src tests | 18 | SUBDIRS = src tests |
19 | 19 | ||
20 | AM_DISTCHECK_CONFIGURE_FLAGS=--without-vmoddir | ||
21 | |||
20 | EXTRA_DIST=git2chg.awk | 22 | EXTRA_DIST=git2chg.awk |
21 | 23 | ||
22 | .PHONY: ChangeLog | 24 | .PHONY: ChangeLog |
diff --git a/configure.ac b/configure.ac index 4ca4e6f..0bb6d3f 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -78,20 +78,19 @@ AC_CHECK_FILE([$VARNISHSRC/bin/varnishtest/varnishtest], | |||
78 | ) | 78 | ) |
79 | 79 | ||
80 | # vmod installation dir | 80 | # vmod installation dir |
81 | AC_ARG_VAR([VMODDIR], | 81 | AC_ARG_VAR([VMODDIR], [vmod installation directory]) |
82 | [vmod installation directory @<:@LIBDIR/varnish/vmods@:>@]) | 82 | AC_ARG_WITH([vmoddir], |
83 | AC_ARG_WITH([vmod-dir], | 83 | AC_HELP_STRING([--with-vmoddir=DIR], |
84 | AC_HELP_STRING([--with-vmod-dir@<:@=DIR@:>@], | 84 | [install modules to DIR]), |
85 | [install modules to DIR; if used without arguments, install them to the varnish module directory]), | ||
86 | [case "$withval" in | 85 | [case "$withval" in |
87 | yes) | 86 | /*) VMODDIR=$withval;; |
88 | VMODDIR=`pkg-config --variable=vmoddir varnishapi` | 87 | no) unset VMODDIR;; |
89 | if test -z "$VMODDIR"; then | 88 | *) AC_MSG_ERROR([argument to --with-vmoddir must be absolute pathname]) |
90 | AC_MSG_FAILURE([cannot determine vmod installation directory]) | 89 | esac],[VMODDIR=`pkg-config --variable=vmoddir varnishapi` |
91 | fi;; | 90 | if test -z "$VMODDIR"; then |
92 | /*) VMODDIR=$withval;; | 91 | AC_MSG_FAILURE([cannot determine vmod installation directory]) |
93 | *) AC_MSG_ERROR([argument to --with-vmod-dir must be absolute pathname]) | 92 | fi]) |
94 | esac]) | 93 | |
95 | 94 | ||
96 | if test -z "$VMODDIR"; then | 95 | if test -z "$VMODDIR"; then |
97 | VMODDIR='$(libdir)/varnish/mods' | 96 | VMODDIR='$(libdir)/varnish/mods' |