Changeset 0bda20f in mod_gnutls


Ignore:
Timestamp:
May 27, 2016, 4:07:24 PM (5 years ago)
Author:
Thomas Klute <thomas2.klute@…>
Branches:
asyncio, debian/master, debian/stretch-backports, jessie-backports, master, proxy-ticket, upstream
Children:
d70dd6e
Parents:
eb34ac4
Message:

Make "make distcheck" work

This requires strict DIST/DISTCLEAN lists and working VPATH
installation. Note that most users will not want to use a VPATH build
because it defeats the expectation of having mod_gnutls installed into
the same directory as other Apache modules.

Files:
5 edited

Legend:

Unmodified
Added
Removed

  • Makefile.am

    reb34ac4 r0bda20f  
    1 AUTOMAKE_OPTIONS = foreign dist-bzip2
     1AUTOMAKE_OPTIONS = foreign dist-bzip2 no-dist-gzip
    22
    33EXTRA_DIST = m4/outoforder.m4 m4/apache.m4 \
    … …  
    88                NOTICE LICENSE
    99
     10AM_DISTCHECK_CONFIGURE_FLAGS = "--enable-vpath-install"
     11DISTCLEANFILES = config.nice
     12
    1013SUBDIRS = src test doc
    1114ACLOCAL_AMFLAGS = -I m4

  • configure.ac

    reb34ac4 r0bda20f  
    3535
    3636LIBGNUTLS_VERSION=`pkg-config --modversion gnutls`
     37
     38AC_ARG_ENABLE(vpath-install,
     39       AS_HELP_STRING([--enable-vpath-install],
     40               [Modify the Apache module directory provided by apxs to \
     41               follow --prefix, if necessary. Most users will not want this, \
     42               but it is required for VPATH builds including "make \
     43               distcheck".]),
     44       vpath_install=$enableval, vpath_install=no)
     45AM_CONDITIONAL([ENABLE_VPATH_INSTALL], [test "$vpath_install" = "yes"])
    3746
    3847AC_ARG_ENABLE(srp,

  • m4/apache.m4

    reb34ac4 r0bda20f  
    3939
    4040        AP_PREFIX="`$APXS_BIN -q prefix 2>/dev/null`"
     41        AP_EXEC_PREFIX="`$APXS_BIN -q exec_prefix 2>/dev/null`"
    4142
    4243        AP_BINDIR="`$APXS_BIN -q bindir 2>/dev/null`"
    … …  
    126127        AC_SUBST(AP_DEFS)
    127128        AC_SUBST(AP_PREFIX)
     129        AC_SUBST(AP_EXEC_PREFIX)
    128130        AC_SUBST(AP_CFLAGS)
    129131        AC_SUBST(AP_CPPFLAGS)

  • src/Makefile.am

    reb34ac4 r0bda20f  
    11# installation directory for Apache modules
     2if ENABLE_VPATH_INSTALL
     3apmodpkglibdir = $(subst ${AP_EXEC_PREFIX},${prefix},${AP_LIBEXECDIR})
     4else
    25apmodpkglibdir = ${AP_LIBEXECDIR}
     6endif
    37
    48mod_gnutls_la_SOURCES = mod_gnutls.c gnutls_io.c gnutls_cache.c gnutls_config.c gnutls_hooks.c

  • test/Makefile.am

    reb34ac4 r0bda20f  
    151151
    152152# Apache configuration and data files
    153 apache_data = base_apache.conf cgi_module.conf data/* mime.types proxy_mods.conf
    154 
    155 EXTRA_DIST = $(apache_data) $(cert_templates) *.uid.in common.bash \
    156         proxy_backend.bash runtests server-crl.template softhsm.bash
     153apache_data = base_apache.conf cgi_module.conf data/dump.cgi data/secret.txt data/test.txt mime.types proxy_mods.conf
     154
     155EXTRA_DIST = $(apache_data) $(cert_templates) $(shared_identities:=.uid.in) \
     156        common.bash proxy_backend.bash runtests server-crl.template \
     157        softhsm.bash
    157158
    158159# Lockfile for the main Apache process
Note: See TracChangeset for help on using the changeset viewer.