From 29d89f012826cd6b19040c8511dec39cca7fbd01 Mon Sep 17 00:00:00 2001
From: Robin Gareus <robin@gareus.org>
Date: Sat, 4 Oct 2014 17:57:05 +0200
Subject: [PATCH] update VST scanner lookup (prepare for moving to BINDIR)

---
 libs/ardour/plugin_manager.cc | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/libs/ardour/plugin_manager.cc b/libs/ardour/plugin_manager.cc
index aa2db88278..2a7eeb9394 100644
--- a/libs/ardour/plugin_manager.cc
+++ b/libs/ardour/plugin_manager.cc
@@ -115,16 +115,23 @@ PluginManager::PluginManager ()
 	char* s;
 	string lrdf_path;
 
-	string  scan_p = Glib::build_filename(ARDOUR::ardour_dll_directory(), "fst");
-	if (!PBD::find_file (PBD::Searchpath(scan_p),
+#if defined WINDOWS_VST_SUPPORT || defined LXVST_SUPPORT
+	PBD::Searchpath vstsp(Glib::build_filename(ARDOUR::ardour_dll_directory(), "fst"));
+#ifdef PLATFORM_WINDOWS
+	vstsp += Glib::build_filename(g_win32_get_package_installation_directory_of_module (0), "bin");
+#else
+	vstsp += Glib::getenv("PATH");
+#endif
+	if (!PBD::find_file (vstsp,
 #ifdef PLATFORM_WINDOWS
 				"ardour-vst-scanner.exe"
 #else
 				"ardour-vst-scanner"
 #endif
 				, scanner_bin_path)) {
-		PBD::warning << "VST scanner app (ardour-vst-scanner) not found in path " << scan_p <<  endmsg;
+		PBD::warning << "VST scanner app (ardour-vst-scanner) not found in path " << vstsp.to_string() <<  endmsg;
 	}
+#endif
 
 	load_statuses ();