diff options
| author | Daniel Borkmann <dborkman@redhat.com> | 2013-07-09 10:57:09 +0200 |
|---|---|---|
| committer | Daniel Borkmann <dborkman@redhat.com> | 2013-07-09 11:00:08 +0200 |
| commit | 65c34d8fec7707e93cecd0378d06fa9b184565e8 (patch) | |
| tree | 85c334d695ac352d0ec1297be27dd67bd445f816 | |
| parent | 26e0298eb2fc7f946a36d682de0f74aac2cafe83 (diff) | |
configure: let configure script generate config.h file
While we're at it, also let configure script generate the config.h
file. The generation of it is currently quite static, but that could
change in future. While at it, we also generate a GITVERSION define,
that we will use for ``--version'' output of the individual tools for
being able to provide better support since we can see what concrete
commit people are using when building from Git repo.
Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | Makefile | 1 | ||||
| -rw-r--r-- | config.h | 10 | ||||
| -rwxr-xr-x | configure | 20 |
4 files changed, 22 insertions, 10 deletions
@@ -35,6 +35,7 @@ Makefile # Ignore build config generated by configure Config +config.h # Other documentation ignores *.md @@ -214,6 +214,7 @@ toolkit: $(TOOLS) clean: $(foreach tool,$(TOOLS),$(tool)_clean) distclean: clean $(Q)$(call RM,Config) + $(Q)$(call RM,config.h) mrproper: distclean $(Q)$(GIT_REM) diff --git a/config.h b/config.h deleted file mode 100644 index a73edd5..0000000 --- a/config.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef CONFIG_H -#define CONFIG_H - -#define FILE_CLIENTS ".curvetun/clients" -#define FILE_SERVERS ".curvetun/servers" -#define FILE_PRIVKEY ".curvetun/priv.key" -#define FILE_PUBKEY ".curvetun/pub.key" -#define FILE_USERNAM ".curvetun/username" - -#endif /* CONFIG_H */ @@ -419,6 +419,24 @@ EOF fi } +gen_config_hdr() +{ + local _version="`git describe --always`" + echo "[*] Generating config.h ... " + + cat > config.h << EOF +#ifndef CONFIG_H +#define CONFIG_H +#define FILE_CLIENTS ".curvetun/clients" +#define FILE_SERVERS ".curvetun/servers" +#define FILE_PRIVKEY ".curvetun/priv.key" +#define FILE_PUBKEY ".curvetun/pub.key" +#define FILE_USERNAM ".curvetun/username" +#define GITVERSION "$_version" +#endif /* CONFIG_H */ +EOF +} + echo "# This file is autogenerated by the configure script" > Config check_pkg_config @@ -442,6 +460,8 @@ check_libpcap check_libcli check_libnet +gen_config_hdr + if [ "$MISSING_DEFS" == "1" ] ; then echo "[!] Some libraries or header definitions are missing or too old." echo " Thus certain tools will not be built (see below). Please" |