# HG changeset patch
# User jwe
# Date 1110486285 0
# Node ID 16a6247730d9a0904ff7ea3c94732e73878169f3
# Parent  083039a30a3f304d587111b9412a2be2a5fb466b
[project @ 2005-03-10 20:24:45 by jwe]

diff -r 083039a30a3f -r 16a6247730d9 ChangeLog
--- a/ChangeLog	Wed Mar 09 22:03:47 2005 +0000
+++ b/ChangeLog	Thu Mar 10 20:24:45 2005 +0000
@@ -1,3 +1,7 @@
+2005-03-10  John W. Eaton  <jwe@octave.org>
+
+	* mkoctfile.in: Accept -R DIR.
+
 2005-03-09  John W. Eaton  <jwe@octave.org>
 
 	* examples/Makefile.in (bin-dist): Delete target.
diff -r 083039a30a3f -r 16a6247730d9 mkoctfile.in
--- a/mkoctfile.in	Wed Mar 09 22:03:47 2005 +0000
+++ b/mkoctfile.in	Thu Mar 10 20:24:45 2005 +0000
@@ -128,6 +128,10 @@
   -M, --depend            Generate dependency files (.d) for C and C++
                           source files.
 
+  -RDIR                   Add -RDIR to link command.
+
+  -W                      Pass flags though the compiler like -Wl,-rpath=...
+
   -c, --compile           Compile, but do not link.
 
   -o FILE, --output FILE  Output file name.  Default extension is .oct
@@ -161,8 +165,6 @@
 
   -v, --verbose           Echo commands as they are executed.
 
-  -W                      Pass flags though the compiler like -Wl,-rpath=...
-
   FILE                    Compile or link FILE.  Recognized file types are:
 
                             .c    C source
@@ -182,7 +184,7 @@
     -D*)
       defs="$defs $1"
     ;;
-    -[lL]*)
+    -[lLR]*)
       ldflags="$ldflags $1"
     ;;
     -M | --depend)
diff -r 083039a30a3f -r 16a6247730d9 src/ChangeLog
--- a/src/ChangeLog	Wed Mar 09 22:03:47 2005 +0000
+++ b/src/ChangeLog	Thu Mar 10 20:24:45 2005 +0000
@@ -1,3 +1,8 @@
+2005-03-10  John W. Eaton  <jwe@octave.org>
+
+	* toplev.cc (Foctave_config_info): Print error instead of crashing
+	if struct does not contain field we are looking for.
+
 2005-03-09  John W. Eaton  <jwe@octave.org>
 
 	* load-save.cc (Fload, Fsave): Accept -text as an alias for -ascii.
diff -r 083039a30a3f -r 16a6247730d9 src/toplev.cc
--- a/src/toplev.cc	Wed Mar 09 22:03:47 2005 +0000
+++ b/src/toplev.cc	Thu Mar 10 20:24:45 2005 +0000
@@ -790,7 +790,11 @@
       if (! error_state)
 	{
 	  Cell c = m.contents (arg.c_str ());
-	  retval = c(0);
+
+	  if (c.is_empty ())
+	    error ("octave_config_info: no info for `%s'", arg.c_str ());
+	  else
+	    retval = c(0);
 	}
     }
   else if (nargin == 0)