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 @@ -14,12 +14,14 @@ # You should have received a copy of the GNU General Public License # along with vmod-sql. 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 d820052..5cf8cfa 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 ########### |