Commit 06569444 by Nils Goroll

revert to dcs_config.h and use a symlink for vmodtool-generated sources

parent e45da560
......@@ -22,8 +22,8 @@ benchmark_results
/autom4te.cache/
/compile
/config.guess
/config.h
/config.h.in
/dcs_config.h
/dcs_config.h.in
/config.log
/config.status
/config.sub
......
......@@ -36,4 +36,4 @@ else
@false
endif
dist_data_DATA = config.h
dist_data_DATA = dcs_config.h
......@@ -3,11 +3,7 @@ AC_COPYRIGHT([Copyright 2015 UPLEX - Nils Goroll Systemoptimierung])
AC_INIT([dcs_classifier], [trunk])
AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_SRCDIR(src/gen/gen_dcs_classifier.pl)
# vmodtool generates vcc_if.c which includes config.h, so though we
# would like to use a different name like dcs_config.h, we can't
# because this would further complicate vmodtool
AM_CONFIG_HEADER(config.h)
AM_CONFIG_HEADER(dcs_config.h)
AC_CANONICAL_SYSTEM
AC_LANG(C)
......
......@@ -96,7 +96,15 @@ libvmod_dcs.lo: dcs_varnish.c vcc_if.c vcc_if.h
vcc_if_INCLUDES = @VMOD_INCLUDES@
vmod_dcs.rst vmod_dcs.man.rst vcc_if.c: vcc_if.h
# vcc_if.c includes config.h, but we use dcs_config.h to avoid
# conflicts in the varnish2 setup (VCL inlince-C includes
# dcs_varnish2.c)
config.h: ../dcs_config.h
- rm $@
ln -s $< $@
vmod_dcs.rst vmod_dcs.man.rst vcc_if.c: vcc_if.h config.h
vcc_if.h: @VMODTOOL@ $(srcdir)/@VCCFILE@
@PYTHON@ @VMODTOOL@ $(srcdir)/@VCCFILE@
......
......@@ -28,7 +28,7 @@
*
*/
#include "config.h"
#include "dcs_config.h"
#include <stdio.h>
#include <ctype.h>
#include "dcs_match.h"
......
......@@ -28,7 +28,7 @@
*
*/
#include "config.h"
#include "dcs_config.h"
#ifdef DEBUG_K_MATCH
#include <stdlib.h>
......
......@@ -28,7 +28,7 @@
*
*/
#include "config.h"
#include "dcs_config.h"
#include <stdio.h>
#include <stdlib.h>
......
......@@ -28,7 +28,7 @@
*
*/
#include "config.h"
#include "dcs_config.h"
#include "dcs_varnish.c"
......
......@@ -1393,7 +1393,7 @@ dcs_register_subkey_match(struct dcs_matchstate *state, dcs_subkey_id_t subkey_i
EOF
_VCL (F_TYPE_C, VCL_TOP, <<'EOF');
#include "config.h"
#include "dcs_config.h"
#include <errno.h>
......
......@@ -28,7 +28,7 @@
*
*/
#include "config.h"
#include "dcs_config.h"
#include <stdio.h>
......
......@@ -28,7 +28,7 @@
*
*/
#include "config.h"
#include "dcs_config.h"
#include "vrt.h"
#include "vcc_if.h"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment