Replace the specific VERSION32 kludge with a clean more reusable solution

diff --git a/activex/axvlc.inf.in b/activex/axvlc.inf.in
index a0d1dc588a1577e44245aa983ae6bdcc79175b79..bd32f6571b1db488b5b6072d325fffa1f9a55f8b 100644 (file)
--- a/activex/axvlc.inf.in
+++ b/activex/axvlc.inf.in
@@ -9,13 +9,13 @@
   axvlc.dll=axvlc.dll\r
 \r
 [axvlc.dll]\r
-  FileVersion=@VERSION32@\r
+  FileVersion=@VERSION_MAJOR@,@VERSION_MINOR@,@VERSION_REVISION@,0\r
   clsid={E23FE9C6-778E-49d4-B537-38FCDE4887D8}\r
   RegisterServer=no\r
   hook=nsiinstaller\r
 \r
 [vlc-@VERSION@-win32.exe]\r
-  FileVersion=@VERSION32@\r
+  FileVersion=@VERSION_MAJOR@,@VERSION_MINOR@,@VERSION_REVISION@,0\r
   file-win32-x86=thiscab\r
 \r
 [nsiinstaller]\r

diff --git a/configure.ac b/configure.ac
index 413400776b2ac9879454c8f9995f67b6055e370b..e0d0d0c4c0f4c051de233bf3d94ae407d9dacd2b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -4438,6 +4438,9 @@ AC_DEFINE_UNQUOTED(PACKAGE_VERSION_MAJOR,"${VERSION_MAJOR}", [version major numb
 AC_DEFINE_UNQUOTED(PACKAGE_VERSION_MINOR,"${VERSION_MINOR}", [version minor number])
 AC_DEFINE_UNQUOTED(PACKAGE_VERSION_REVISION,"${VERSION_REVISION}", [version minor number])
 AC_DEFINE_UNQUOTED(PACKAGE_VERSION_EXTRA,"${VERSION_EXTRA}", [version minor number])
+AC_SUBST(VERSION_MAJOR)
+AC_SUBST(VERSION_MINOR)
+AC_SUBST(VERSION_REVISION)
 
 dnl Old definitions for version-dependant plugins
 dnl VLC_SYMBOL="`echo ${VERSION} | sed -e 'y/.-+/___/'`"
@@ -4448,11 +4451,6 @@ dnl New definitions with value matching 0.8.2 release
 AC_DEFINE_UNQUOTED(MODULE_SUFFIX, "__0_8_2", [String suffix for module functions])
 AC_DEFINE_UNQUOTED(MODULE_SYMBOL, 0_8_2, [Symbol suffix for module functions])
 
-dnl Version number for ActiveX INF
-VERSION32="`echo -n ${VERSION} | sed -e 's/@<:@a-z\-@:>@//g' | sed -e 'y/./,/'`"
-VERSION32="`echo -n ${VERSION32}',0'`"
-AC_SUBST(VERSION32)
-
 DATA_PATH="${ac_tool_prefix}/share/vlc"
 AC_SUBST(DATA_PATH)
 PLUGIN_PATH="${ac_tool_prefix}/lib/vlc"