fixup lib fetching on linux

Author: cboulay

build_mex.m

@@ -2,25 +2,17 @@
 % For Octave on Linux, you need the package liboctave-dev installed
 % You also need the liblsl64 binary in the bin folder and a configured
 % C compiler (mex -setup)
-binarypath = fullfile(fileparts(mfilename('fullpath')), 'bin');
-if ispc
-    if exist(fullfile(binarypath, 'liblsl64.lib'), 'file')
-        libs = {'-llsl64'};
-    elseif exist(fullfile(binarypath, 'lsl.lib'), 'file')
-        libs = {'-llsl'};
-    else
-        error('Neither liblsl64.lib nor lsl.lib found in bin/');
-    end
-elseif ismac
-    if exist(fullfile(binarypath, 'liblsl64.dylib'), 'file')
-        libs = {'-llsl64'};
-    elseif exist(fullfile(binarypath, 'liblsl.dylib'), 'file')
-        libs = {'-llsl'};
-    end    
-elseif isunix
-	libs = {'-llsl64','-ldl'};
+libs = {};
+lsl_fname = lsl_get_dll();
+if contains(lsl_fname, '32')
+    libs{end+1} = '-llsl32';
+elseif contains(lsl_fname, '64')
+    libs{end+1} = '-llsl64';
 else
-    libs = {'-llsl64'};
+    libs{end+1} = '-llsl';
+end
+if isunix
+    libs{end+1} = '-ldl';
 end
 
 ext = ['.' mexext];

lsl_get_dll.m

@@ -48,6 +48,8 @@
         new_sopath = fullfile(binarypath, 'lsl.dll');
     elseif ismac && exist(fullfile(binarypath, 'liblsl.dylib'), 'file')
         new_sopath = fullfile(binarypath, 'liblsl.dylib');
+    elseif exist('/usr/lib/liblsl.so', 'file')
+        new_sopath = fullfile('/usr/lib/liblsl.so');
     else
         new_sopath = fullfile('/usr/lib/', so_fname);
     end
@@ -92,8 +94,8 @@
         [~, lib_ix] = min(cellfun(@length, {dylib_list.name}));
         lsl_fname = fullfile(dylib_list(lib_ix).folder, dylib_list(lib_ix).name);
     elseif isunix
-        error(['Automatic extraction of debian package not yet supported.', ...
-            ' Please install manually: ' fullfile(binarypath, liblsl_url_fname)]);
+        error(['liblsl debian package must be installed manually:', ...
+            ' sudo dpkg -i ' fullfile(binarypath, liblsl_url_fname)]);
     end
 end