minimize rebuild after reconfigure:

Don't add VERSIONSTRING to the c-flags of
gtk2_ardour, use a dedicated file instead.

7 files changed, 24 insertions, 5 deletions

diff --git a/gtk2_ardour/about.cc b/gtk2_ardour/about.cc
index 05226c03ba..1f79b47031 100644
--- a/gtk2_ardour/about.cc
+++ b/gtk2_ardour/about.cc
@@ -39,6 +39,10 @@
 
 #include "i18n.h"
 
+#ifdef WAF_BUILD
+#include "gtk2ardour-version.h"
+#endif
+
 using namespace Gtk;
 using namespace Gdk;
 using namespace std;
diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc
index 916907a046..28dba2f544 100644
--- a/gtk2_ardour/ardour_ui.cc
+++ b/gtk2_ardour/ardour_ui.cc
@@ -19,6 +19,7 @@
 
 #ifdef WAF_BUILD
 #include "gtk2ardour-config.h"
+#include "gtk2ardour-version.h"
 #endif
 
 #include <algorithm>
diff --git a/gtk2_ardour/main.cc b/gtk2_ardour/main.cc
index d924d9b30a..92f89abd76 100644
--- a/gtk2_ardour/main.cc
+++ b/gtk2_ardour/main.cc
@@ -60,6 +60,10 @@
 #include <fcntl.h> // Needed for '_fmode'
 #endif
 
+#ifdef WAF_BUILD
+#include "gtk2ardour-version.h"
+#endif
+
 using namespace std;
 using namespace Gtk;
 using namespace ARDOUR_COMMAND_LINE;
diff --git a/gtk2_ardour/startup.cc b/gtk2_ardour/startup.cc
index 38074e932a..4e073bf2f1 100644
--- a/gtk2_ardour/startup.cc
+++ b/gtk2_ardour/startup.cc
@@ -19,6 +19,7 @@
 
 #ifdef WAF_BUILD
 #include "gtk2ardour-config.h"
+#include "gtk2ardour-version.h"
 #endif
 
 #include <fstream>
diff --git a/gtk2_ardour/utils_videotl.cc b/gtk2_ardour/utils_videotl.cc
index 3b5882905b..24a27c1425 100644
--- a/gtk2_ardour/utils_videotl.cc
+++ b/gtk2_ardour/utils_videotl.cc
@@ -29,6 +29,13 @@
 #include "video_image_frame.h"
 #include "utils_videotl.h"
 
+#ifdef WAF_BUILD
+#include "gtk2ardour-version.h"
+#endif
+
+#ifndef ARDOUR_CURL_TIMEOUT
+#define ARDOUR_CURL_TIMEOUT (60)
+#endif
 #include "i18n.h"
 
 using namespace Gtk;
@@ -337,7 +344,7 @@ extern "C" {
 
 		curl_easy_setopt(curl, CURLOPT_WRITEDATA, (void *)&chunk);
 		curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, WriteMemoryCallback);
-		curl_easy_setopt(curl, CURLOPT_USERAGENT, ARDOUR_USER_AGENT);
+		curl_easy_setopt(curl, CURLOPT_USERAGENT, PROGRAM_NAME VERSIONSTRING);
 		curl_easy_setopt(curl, CURLOPT_TIMEOUT, ARDOUR_CURL_TIMEOUT);
 		curl_easy_setopt(curl, CURLOPT_NOSIGNAL, 1);
 #ifdef CURLERRORDEBUG
diff --git a/gtk2_ardour/video_image_frame.h b/gtk2_ardour/video_image_frame.h
index 8f9e004c67..aeb117da9f 100644
--- a/gtk2_ardour/video_image_frame.h
+++ b/gtk2_ardour/video_image_frame.h
@@ -20,9 +20,6 @@
 #ifndef __ardour_video_image_frame_h__
 #define __ardour_video_image_frame_h__
 
-#define ARDOUR_USER_AGENT (PROGRAM_NAME VERSIONSTRING)
-#define ARDOUR_CURL_TIMEOUT (60)
-
 #include <string>
 #include <glib.h>
 
diff --git a/gtk2_ardour/wscript b/gtk2_ardour/wscript
index e99d97b516..887da2006b 100644
--- a/gtk2_ardour/wscript
+++ b/gtk2_ardour/wscript
@@ -281,6 +281,12 @@ def configure(conf):
 
     conf.write_config_header('gtk2ardour-config.h', remove=False)
 
+    bak = conf.env['define_key']
+    conf.define('VERSIONSTRING', str (conf.env['VERSION']))
+    conf.env['define_key'] = {'VERSIONSTRING'}
+    conf.write_config_header('gtk2ardour-version.h')
+    conf.env['define_key'] = bak;
+
     # Boost headers
     autowaf.check_header(conf, 'cxx', 'boost/shared_ptr.hpp')
     autowaf.check_header(conf, 'cxx', 'boost/weak_ptr.hpp')
@@ -417,7 +423,6 @@ def build(bld):
 
     obj.defines = [
         'PACKAGE="' + I18N_PACKAGE + '"',
-        'VERSIONSTRING="' + str (bld.env['VERSION']) + '"',
         'DATA_DIR="' + os.path.normpath(bld.env['DATADIR']) + '"',
         'CONFIG_DIR="' + os.path.normpath(bld.env['SYSCONFDIR']) + '"',
         'LOCALEDIR="' + os.path.join(os.path.normpath(bld.env['DATADIR']), 'locale') + '"',