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.

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
 
 SUBDIRS = src tests
 
+AM_DISTCHECK_CONFIGURE_FLAGS=--without-vmoddir
+
 EXTRA_DIST=git2chg.awk
 
 .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],
 )
 
 # 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'