changeset 8883:bbe46b42f8e6 octave-forge

sparsersb: a nicer error message on missing librsb-config, and using mlock() in the oct-file.
author michelemartone
date Sat, 12 Nov 2011 13:09:49 +0000
parents c47ac161e75d
children 380d18eadd90
files main/sparsersb/src/autogen.sh main/sparsersb/src/sparsersb.cc
diffstat 2 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/main/sparsersb/src/autogen.sh	Sat Nov 12 11:47:29 2011 +0000
+++ b/main/sparsersb/src/autogen.sh	Sat Nov 12 13:09:49 2011 +0000
@@ -5,6 +5,8 @@
 echo "dnl --- DO NOT EDIT --- Automatically generated by autogen.sh" > configure.in
 cat configure.base >> configure.in
 cat <<EOF >> configure.in
+AC_PATH_PROG(LIBRSB_CONFIG,librsb-config)
+test -z "\$LIBRSB_CONFIG" && AC_MSG_ERROR('librsb-config not found in the path. Did you install librsb ?')
 if test x\$LIBRSB_CONFIG = x ; then LIBRSB_CONFIG=librsb-config ; fi
 LIBRSB_CXXFLAGS="\`\$LIBRSB_CONFIG --cflags\`"
 LIBRSB_LIBS="\`\$LIBRSB_CONFIG --ldflags | sed s/-static//g\` -lgomp"
--- a/main/sparsersb/src/sparsersb.cc	Sat Nov 12 11:47:29 2011 +0000
+++ b/main/sparsersb/src/sparsersb.cc	Sat Nov 12 13:09:49 2011 +0000
@@ -1174,7 +1174,7 @@
 		octave_sparse_rsb_matrix::register_type ();
 		install_sparsersb_ops ();
 		sparse_rsb_loaded=true;
-		//mlock (RSBOI_FNS);
+		mlock();
 	}
 	return;
 	err: