build system: use PACKAGE_NAME/_VERSION instead of self-defined variables

Rakefile

@@ -95,7 +95,7 @@ def setup_globals
 
   cflags_common            = "-Wall -Wno-comment -Wfatal-errors #{c(:WLOGICAL_OP)} #{c(:WNO_MISMATCHED_TAGS)} #{c(:WNO_SELF_ASSIGN)} #{c(:QUNUSED_ARGUMENTS)}"
   cflags_common           += " #{c(:OPTIMIZATION_CFLAGS)} -D_FILE_OFFSET_BITS=64 #{c(:MATROSKA_CFLAGS)} #{c(:EBML_CFLAGS)} #{c(:EXTRA_CFLAGS)} #{c(:DEBUG_CFLAGS)} #{c(:PROFILING_CFLAGS)} #{c(:USER_CPPFLAGS)}"
-  cflags_common           += " -DPACKAGE=\\\"#{c(:PACKAGE)}\\\" -DVERSION=\\\"#{c(:VERSION)}\\\" -DMTX_LOCALE_DIR=\\\"#{c(:localedir)}\\\" -DMTX_PKG_DATA_DIR=\\\"#{c(:pkgdatadir)}\\\" -DMTX_DOC_DIR=\\\"#{c(:docdir)}\\\""
+  cflags_common           += " -DMTX_LOCALE_DIR=\\\"#{c(:localedir)}\\\" -DMTX_PKG_DATA_DIR=\\\"#{c(:pkgdatadir)}\\\" -DMTX_DOC_DIR=\\\"#{c(:docdir)}\\\""
   cflags_common           += " -mno-ms-bitfields -DWINVER=0x0500 -D_WIN32_WINNT=0x0500 " if c?(:MINGW)
   cflags_common           += " -fPIC " if c?(:USE_QT) && !c?(:MINGW)
   cflags_common           += " -DQT_STATICPLUGIN" if c?(:USE_QT) && c?(:MINGW)

build-config.in

@@ -1,7 +1,3 @@
-# What are we dealing with?
-PACKAGE = @PACKAGE@
-VERSION = @VERSION@
-
 shell = @SHELL@
 
 # Where to?

configure.in

@@ -1,13 +1,8 @@
-AC_INIT(src/merge/mkvmerge.cpp)
+AC_INIT([MKVToolNix],[7.6.0])
 AC_PREREQ(2.50)
 
 AC_CONFIG_HEADERS(config.h:config.h.in)
 
-PACKAGE="mkvtoolnix"
-VERSION="7.6.0"
-AC_SUBST(PACKAGE)
-AC_SUBST(VERSION)
-
 dnl Optional features that are built and those that aren't
 opt_features_yes=""
 opt_features_no=""

lib/avilib-0.6.10/avilib.c

@@ -1621,7 +1621,7 @@ static int avi_close_output_file(avi_t *AVI)
    if (AVI->writing_app != NULL)
      strncpy(id_str, AVI->writing_app, MAX_INFO_STRLEN - 1);
    else
-     snprintf(id_str, MAX_INFO_STRLEN - 1, "%s-%s", PACKAGE, VERSION);
+     snprintf(id_str, MAX_INFO_STRLEN - 1, "%s-%s", PACKAGE_NAME, PACKAGE_VERSION);
    real_id_len = id_len = strlen(id_str)+1;
    if (id_len&1) id_len++;
 

src/common/version.cpp

@@ -131,7 +131,7 @@ get_version_info(const std::string &program,
 
   if (!program.empty())
     info.push_back(program);
-  info.push_back((boost::format("v%1% ('%2%')") % VERSION % VERSIONNAME).str());
+  info.push_back((boost::format("v%1% ('%2%')") % PACKAGE_VERSION % VERSIONNAME).str());
 
   if (flags & vif_architecture)
 #if defined(ARCH_64BIT)
@@ -154,12 +154,12 @@ get_version_info(const std::string &program,
 
 int
 compare_current_version_to(const std::string &other_version_str) {
-  return version_number_t(VERSION).compare(version_number_t(other_version_str));
+  return version_number_t(PACKAGE_VERSION).compare(version_number_t(other_version_str));
 }
 
 version_number_t
 get_current_version() {
-  return version_number_t(VERSION);
+  return version_number_t(PACKAGE_VERSION);
 }
 
 #if defined(HAVE_CURL_EASY_H)

src/extract/xtr_avi.cpp

@@ -61,7 +61,7 @@ xtr_avi_c::create_file(xtr_base_c *master,
 
   std::string writing_app = "mkvextract";
   if (!hack_engaged(ENGAGE_NO_VARIABLE_DATA))
-    writing_app += (boost::format(" %1%") % VERSION).str();
+    writing_app += (boost::format(" %1%") % PACKAGE_VERSION).str();
   m_avi->writing_app = safestrdup(writing_app.c_str());
 
   char ccodec[5];

src/mmg/mmg_dialog.cpp

@@ -470,7 +470,7 @@ mmg_dialog::save(wxString file_name,
 
   cfg.SetPath(wxT("/mkvmergeGUI"));
   cfg.Write(wxT("file_version"), MMG_CONFIG_FILE_VERSION_MAX);
-  cfg.Write(wxT("gui_version"), wxT(VERSION));
+  cfg.Write(wxT("gui_version"), wxT(PACKAGE_VERSION));
   cfg.Write(wxT("output_file_name"), tc_output->GetValue());
   cfg.Write(wxT("cli_options"), cli_options);
 

src/tools/ac3parser.cpp

@@ -39,7 +39,7 @@ show_help() {
 
 static void
 show_version() {
-  mxinfo("ac3parser v" VERSION "\n");
+  mxinfo("ac3parser v" PACKAGE_VERSION "\n");
   mxexit();
 }
 

src/tools/checksum.cpp

@@ -69,7 +69,7 @@ show_help() {
 
 static void
 show_version() {
-  mxinfo("checksum v" VERSION "\n");
+  mxinfo("checksum v" PACKAGE_VERSION "\n");
   mxexit();
 }
 

src/tools/diracparser.cpp

@@ -155,7 +155,7 @@ show_help() {
 
 static void
 show_version() {
-  mxinfo("diracparser v" VERSION "\n");
+  mxinfo("diracparser v" PACKAGE_VERSION "\n");
   mxexit();
 }
 

src/tools/ebml_validator.cpp

@@ -81,7 +81,7 @@ show_help() {
 
 static void
 show_version() {
-  mxinfo("ebml_validator v" VERSION "\n");
+  mxinfo("ebml_validator v" PACKAGE_VERSION "\n");
   mxexit();
 }
 

src/tools/mpls_dump.cpp

@@ -26,7 +26,7 @@ show_help() {
 
 static void
 show_version() {
-  mxinfo("mpls_dump v" VERSION "\n");
+  mxinfo("mpls_dump v" PACKAGE_VERSION "\n");
   mxexit();
 }
 

src/tools/vc1parser.cpp

@@ -276,7 +276,7 @@ show_help() {
 
 static void
 show_version() {
-  mxinfo("vc1parser v" VERSION "\n");
+  mxinfo("vc1parser v" PACKAGE_VERSION "\n");
   mxexit();
 }