diff options
author | Sergey Poznyakoff <gray@gnu.org.ua> | 2013-10-19 00:32:01 +0300 |
---|---|---|
committer | Sergey Poznyakoff <gray@gnu.org.ua> | 2013-10-19 00:32:01 +0300 |
commit | 075178eea1a7743f87546e4dc6460dd9f39b3731 (patch) | |
tree | 4abee4aa05f5e93829a2e53f6dff4c83b0dcf976 | |
parent | 58cfc819a0f7831ff06b536aace98b6bdfe4d71f (diff) | |
download | vmod-sql-075178eea1a7743f87546e4dc6460dd9f39b3731.tar.gz vmod-sql-075178eea1a7743f87546e4dc6460dd9f39b3731.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 69a7e49..d468b23 100644 --- a/Makefile.am +++ b/Makefile.am | |||
@@ -17,6 +17,8 @@ ACLOCAL_AMFLAGS = -I m4 | |||
17 | 17 | ||
18 | SUBDIRS = src #doc tests | 18 | SUBDIRS = src #doc 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 d820052..5cf8cfa 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -75,20 +75,19 @@ AC_CHECK_FILE([$VARNISHSRC/bin/varnishtest/varnishtest], | |||
75 | ) | 75 | ) |
76 | 76 | ||
77 | # vmod installation dir | 77 | # vmod installation dir |
78 | AC_ARG_VAR([VMODDIR], | 78 | AC_ARG_VAR([VMODDIR], [vmod installation directory]) |
79 | [vmod installation directory @<:@LIBDIR/varnish/vmods@:>@]) | 79 | AC_ARG_WITH([vmoddir], |
80 | AC_ARG_WITH([vmod-dir], | 80 | AC_HELP_STRING([--with-vmoddir=DIR], |
81 | AC_HELP_STRING([--with-vmod-dir@<:@=DIR@:>@], | 81 | [install modules to DIR]), |
82 | [install modules to DIR; if used without arguments, install them to the varnish module directory]), | ||
83 | [case "$withval" in | 82 | [case "$withval" in |
84 | yes) | 83 | /*) VMODDIR=$withval;; |
85 | VMODDIR=`pkg-config --variable=vmoddir varnishapi` | 84 | no) unset VMODDIR;; |
86 | if test -z "$VMODDIR"; then | 85 | *) AC_MSG_ERROR([argument to --with-vmoddir must be absolute pathname]) |
87 | AC_MSG_FAILURE([cannot determine vmod installation directory]) | 86 | esac],[VMODDIR=`pkg-config --variable=vmoddir varnishapi` |
88 | fi;; | 87 | if test -z "$VMODDIR"; then |
89 | /*) VMODDIR=$withval;; | 88 | AC_MSG_FAILURE([cannot determine vmod installation directory]) |
90 | *) AC_MSG_ERROR([argument to --with-vmod-dir must be absolute pathname]) | 89 | fi]) |
91 | esac]) | 90 | |
92 | 91 | ||
93 | if test -z "$VMODDIR"; then | 92 | if test -z "$VMODDIR"; then |
94 | VMODDIR='$(libdir)/varnish/mods' | 93 | VMODDIR='$(libdir)/varnish/mods' |