Browse code
plugin: Remove GNUism in openvpn-plugin.h generation
The plugin path handling cleanup (4590c383) introduced GNUism and broke
builds on system not using GNU Make (like *BSD).
Revert back to let configure generate the header file. Instead let make
add an extra CFLAG that defines PLUGIN_LIBDIR.
Signed-off-by: Christian Hesse <mail@eworm.de>
Acked-by: Gert Doering <gert@greenie.muc.de>
Message-Id: <20170127084927.21040-1-list@eworm.de>
URL: http://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg13966.html
Signed-off-by: David Sommerseth <davids@openvpn.net>
Christian Hesse authored on 2017/01/27 17:49:27Showing 4 changed files
| ... | ... |
@@ -38,7 +38,7 @@ AC_DEFINE([OPENVPN_VERSION_MINOR], [PRODUCT_VERSION_MINOR], [OpenVPN minor versi |
| 38 | 38 |
AC_DEFINE([OPENVPN_VERSION_PATCH], ["PRODUCT_VERSION_PATCH"], [OpenVPN patch level - may be a string or integer]) |
| 39 | 39 |
|
| 40 | 40 |
AC_CONFIG_AUX_DIR([.]) |
| 41 |
-AC_CONFIG_HEADERS([config.h]) |
|
| 41 |
+AC_CONFIG_HEADERS([config.h include/openvpn-plugin.h]) |
|
| 42 | 42 |
AC_CONFIG_SRCDIR([src/openvpn/syshead.h]) |
| 43 | 43 |
AC_CONFIG_MACRO_DIR([m4]) |
| 44 | 44 |
|
| ... | ... |
@@ -16,10 +16,3 @@ MAINTAINERCLEANFILES = \ |
| 16 | 16 |
include_HEADERS = \ |
| 17 | 17 |
openvpn-plugin.h \ |
| 18 | 18 |
openvpn-msg.h |
| 19 |
- |
|
| 20 |
-openvpn-plugin.h: openvpn-plugin.h.in Makefile |
|
| 21 |
- $(AM_V_GEN)sed -e 's|\@PLUGINDIR\@|$(plugindir)|' \ |
|
| 22 |
- -e 's|\@OPENVPN_VERSION_MAJOR\@|$(OPENVPN_VERSION_MAJOR)|' \ |
|
| 23 |
- -e 's|\@OPENVPN_VERSION_MINOR\@|$(OPENVPN_VERSION_MINOR)|' \ |
|
| 24 |
- -e 's|\@OPENVPN_VERSION_PATCH\@|$(OPENVPN_VERSION_PATCH)|' \ |
|
| 25 |
- $< > $@.tmp && mv $@.tmp $@ |
| ... | ... |
@@ -27,7 +27,9 @@ AM_CFLAGS = \ |
| 27 | 27 |
$(OPTIONAL_CRYPTO_CFLAGS) \ |
| 28 | 28 |
$(OPTIONAL_LZO_CFLAGS) \ |
| 29 | 29 |
$(OPTIONAL_LZ4_CFLAGS) \ |
| 30 |
- $(OPTIONAL_PKCS11_HELPER_CFLAGS) |
|
| 30 |
+ $(OPTIONAL_PKCS11_HELPER_CFLAGS) \ |
|
| 31 |
+ -DPLUGIN_LIBDIR=\"${plugindir}\"
|
|
| 32 |
+ |
|
| 31 | 33 |
if WIN32 |
| 32 | 34 |
# we want unicode entry point but not the macro |
| 33 | 35 |
AM_CFLAGS += -municode -UUNICODE |