Merge pull request #114 from wolfSSL/devin/1745348721-version-header-fix-v2

ColtonWilley · web-flow · commit 2b57ff24b812 · 2025-04-28T10:33:20.000-07:00
Fix version.h changes after builds
diff --git a/configure.ac b/configure.ac
@@ -13,6 +13,7 @@ AC_CONFIG_MACRO_DIR([m4])
 
 dnl m4_include([m4/ax_check_openssl.m4])
 dnl m4_include([m4/ax_check_wolfssl.m4])
+m4_include([m4/hexversion.m4])
 
 AM_INIT_AUTOMAKE([1.11  -Wall -Werror -Wno-portability foreign tar-ustar subdir-objects no-define color-tests])
 LT_INIT([disable-static pic-only])
@@ -130,6 +131,7 @@ CFLAGS="$CFLAGS $USER_C_EXTRA_FLAGS"
 AC_SUBST([AM_CPPFLAGS])
 AC_SUBST([AM_CFLAGS])
 AC_SUBST([AM_LDFLAGS])
+CREATE_HEX_VERSION
 
 AC_CONFIG_FILES([Makefile
         include/wolfprovider/version.h
diff --git a/include/wolfprovider/version.h b/include/wolfprovider/version.h
@@ -27,8 +27,8 @@
 extern "C" {
 #endif
 
-#define LIBWOLFPROV_VERSION_STRING "1.1.0-RC"
-#define LIBWOLFPROV_VERSION_HEX @HEX_VERSION@
+#define LIBWOLFPROV_VERSION_STRING "1.0.2"
+#define LIBWOLFPROV_VERSION_HEX 0x01000002
 
 #ifdef __cplusplus
 }
diff --git a/m4/hexversion.m4 b/m4/hexversion.m4
@@ -0,0 +1,6 @@
+AC_DEFUN([CREATE_HEX_VERSION],[
+
+  HEX_VERSION=`echo $VERSION | sed 's|[\-a-z0-9]*$||' | \
+    awk -F. '{printf "0x%0.2d%0.3d%0.3d", $[]1, $[]2, $[]3}'`
+  AC_SUBST([HEX_VERSION])
+])

Original file line number	Diff line number	Diff line change
`@@ -27,8 +27,8 @@`
`27`	`27`	`extern "C" {`
`28`	`28`	`#endif`
`29`	`29`
`30`		`-#define LIBWOLFPROV_VERSION_STRING "1.1.0-RC"`
`31`		`-#define LIBWOLFPROV_VERSION_HEX @HEX_VERSION@`
	`30`	`+#define LIBWOLFPROV_VERSION_STRING "1.0.2"`
	`31`	`+#define LIBWOLFPROV_VERSION_HEX 0x01000002`
`32`	`32`
`33`	`33`	`#ifdef __cplusplus`
`34`	`34`	`}`