remove configure.am.tpl, pull in VERSION directly

from wouter@
2014-08-12 06:20:58 -05:00 · 2014-08-12 06:20:58 -05:00 · 46b6df7cb0
commit 46b6df7cb0
parent d6a485d1a1
3 changed files with 1 additions and 4 deletions
--- a/.gitignore
+++ b/.gitignore
@ -74,7 +74,6 @@ INSTALL
 /config.status
 /config.sub
 /configure
-/configure.ac
 /depcomp
 /config.h
 /config.h.in
--- a/configure.ac.tpl
+++ b/configure.ac.tpl
@ -1,4 +1,4 @@
-AC_INIT([libressl], [VERSION])
+AC_INIT([libressl], m4_esyscmd([tr -d '\n' < VERSION]))
 AC_CANONICAL_HOST
 AM_INIT_AUTOMAKE([subdir-objects])
 AC_CONFIG_MACRO_DIR([m4])
--- a/update.sh
+++ b/update.sh
@ -32,8 +32,6 @@ source $libcrypto_src/crypto/shlib_version
 libcrypto_version=$major:$minor:0
 echo libcrypto version $libcrypto_version

-sed -e "s/VERSION/${libressl_version}/" configure.ac.tpl > configure.ac
-
 CP='cp -p'

 copy_src() {