summaryrefslogtreecommitdiffabout
authorSergey Poznyakoff <gray@gnu.org.ua>2013-10-18 21:29:59 (GMT)
committer Sergey Poznyakoff <gray@gnu.org.ua>2013-10-18 21:29:59 (GMT)
commitb9581bc92dee8ad1c479deb01fefc451885cc548 (patch) (side-by-side diff)
treef6411e9caed4db730c4ad30ff39237506ce1b3db
parent0b7dd9ce3d77e4d99de006f3a3a86134e2d7f809 (diff)
downloadvmod-dbrw-b9581bc92dee8ad1c479deb01fefc451885cc548.tar.gz
vmod-dbrw-b9581bc92dee8ad1c479deb01fefc451885cc548.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.
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--Makefile.am2
-rw-r--r--configure.ac25
2 files changed, 14 insertions, 13 deletions
diff --git a/Makefile.am b/Makefile.am
index fa15223..24af3e4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -14,12 +14,14 @@
# You should have received a copy of the GNU General Public License
# along with vmod-dbrw. If not, see <http://www.gnu.org/licenses/>.
ACLOCAL_AMFLAGS = -I m4
SUBDIRS = src doc #tests
+AM_DISTCHECK_CONFIGURE_FLAGS=--without-vmoddir
+
EXTRA_DIST=git2chg.awk
.PHONY: ChangeLog
ChangeLog:
$(AM_V_GEN)if test -d .git; then \
git log --pretty='format:%ct %an <%ae>%n%n%s%n%n%b%n' | \
diff --git a/configure.ac b/configure.ac
index 8405cfc..715728b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -72,26 +72,25 @@ AC_CHECK_FILE([$VARNISHSRC/include/varnishapi.h],
AC_CHECK_FILE([$VARNISHSRC/bin/varnishtest/varnishtest],
[],
[AC_MSG_FAILURE([cannot find "$VARNISHSRC/bin/varnishtest/varnishtest". Please build your varnish source directory])]
)
# 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'
fi
###########

Return to:

Send suggestions and report system problems to the System administrator.