diff options
| author | Tobias Brunner <tobias@strongswan.org> | 2017-09-26 12:23:36 +0200 |
|---|---|---|
| committer | Tobias Brunner <tobias@strongswan.org> | 2017-10-02 17:21:42 +0200 |
| commit | 0ae19f0ced8d64bb6996a8ae01406cebacff04a1 (patch) | |
| tree | c49a71a1b8cc792445798f774d6f4322aaf4ffd0 /src/libstrongswan | |
| parent | 7dd29ab4ed5f1a233b3c63f1f3504434aef4997f (diff) | |
| download | strongswan-0ae19f0ced8d64bb6996a8ae01406cebacff04a1.tar.bz2 strongswan-0ae19f0ced8d64bb6996a8ae01406cebacff04a1.tar.xz | |
configure: Fix gperf length parameter determination
gperf is not actually a build dependency as the generated files are
shipped in the tarball. So the type depends on the gperf version on
the host that ran gperf and created the tarball, which might not be
the same as that on the actual build host, and gperf might not even
be installed there, leaving the type undetermined.
Fixes: e0e43229736a ("configure: Detect type of length parameter for gperf generated function")
Diffstat (limited to 'src/libstrongswan')
| -rw-r--r-- | src/libstrongswan/.gitignore | 2 | ||||
| -rw-r--r-- | src/libstrongswan/Makefile.am | 9 | ||||
| -rw-r--r-- | src/libstrongswan/crypto/proposal/proposal_keywords_static.h.in (renamed from src/libstrongswan/crypto/proposal/proposal_keywords_static.h) | 2 |
3 files changed, 11 insertions, 2 deletions
diff --git a/src/libstrongswan/.gitignore b/src/libstrongswan/.gitignore index 46b69ab15..1f2695f77 100644 --- a/src/libstrongswan/.gitignore +++ b/src/libstrongswan/.gitignore @@ -1,2 +1,2 @@ oid.[ch] -proposal_keywords_static.c +proposal_keywords_static.[ch] diff --git a/src/libstrongswan/Makefile.am b/src/libstrongswan/Makefile.am index b4d8452f1..75b1d14ac 100644 --- a/src/libstrongswan/Makefile.am +++ b/src/libstrongswan/Makefile.am @@ -195,16 +195,19 @@ endif EXTRA_DIST = \ asn1/oid.txt asn1/oid.pl \ crypto/proposal/proposal_keywords_static.txt \ +crypto/proposal/proposal_keywords_static.h.in \ plugins/plugin_constructors.py \ Android.mk BUILT_SOURCES = \ $(srcdir)/asn1/oid.c $(srcdir)/asn1/oid.h \ +$(srcdir)/crypto/proposal/proposal_keywords_static.h \ $(srcdir)/crypto/proposal/proposal_keywords_static.c \ settings/settings_parser.h MAINTAINERCLEANFILES = \ $(srcdir)/asn1/oid.c $(srcdir)/asn1/oid.h \ +$(srcdir)/crypto/proposal/proposal_keywords_static.h \ $(srcdir)/crypto/proposal/proposal_keywords_static.c $(srcdir)/asn1/oid.c : $(srcdir)/asn1/oid.pl $(srcdir)/asn1/oid.txt @@ -215,6 +218,12 @@ $(srcdir)/asn1/oid.h : $(srcdir)/asn1/oid.pl $(srcdir)/asn1/oid.txt $(AM_V_GEN) \ (cd $(srcdir)/asn1/ && $(PERL) oid.pl) +$(srcdir)/crypto/proposal/proposal_keywords_static.h: $(srcdir)/crypto/proposal/proposal_keywords_static.h.in + $(AM_V_GEN) \ + sed \ + -e "s:\@GPERF_LEN_TYPE\@:$(GPERF_LEN_TYPE):" \ + $< > $@ + $(srcdir)/crypto/proposal/proposal_keywords_static.c: $(srcdir)/crypto/proposal/proposal_keywords_static.txt \ $(srcdir)/crypto/proposal/proposal_keywords_static.h $(AM_V_GEN) \ diff --git a/src/libstrongswan/crypto/proposal/proposal_keywords_static.h b/src/libstrongswan/crypto/proposal/proposal_keywords_static.h.in index c046fab92..ee9f7b9da 100644 --- a/src/libstrongswan/crypto/proposal/proposal_keywords_static.h +++ b/src/libstrongswan/crypto/proposal/proposal_keywords_static.h.in @@ -19,7 +19,7 @@ #include "proposal_keywords.h" const proposal_token_t* proposal_get_token_static(register const char *str, - register GPERF_LEN_TYPE len); + register @GPERF_LEN_TYPE@ len); #endif /* PROPOSAL_KEYWORDS_STATIC_H_ */ |