===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/glob.c,v
retrieving revision 1.55
retrieving revision 1.59
diff -u -p -r1.55 -r1.59
--- OpenXM_contrib2/asir2000/parse/glob.c	2005/01/27 23:58:21	1.55
+++ OpenXM_contrib2/asir2000/parse/glob.c	2005/10/10 15:16:38	1.59
@@ -45,7 +45,7 @@
  * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE,
  * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE.
  *
- * $OpenXM: OpenXM_contrib2/asir2000/parse/glob.c,v 1.54 2004/12/18 09:25:58 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/parse/glob.c,v 1.58 2005/08/24 06:28:39 noro Exp $ 
 */
 #include "ca.h"
 #include "al.h"
@@ -85,6 +85,7 @@ INFILE asir_infile;
 JMP_BUF main_env,debug_env,timer_env,exec_env;
 int little_endian,debug_mode,no_debug_on_error;
 char *asir_libdir;
+char *asir_contrib_dir;
 char *asir_pager;
 
 NODE usrf,sysf,noargsysf,ubinf,parif;
@@ -193,6 +194,7 @@ int do_asirrc;
 int do_file;
 char *do_filename;
 int do_message;
+int do_terse;
 int do_fep;
 int read_exec_file;
 int asir_setenv;
@@ -226,10 +228,12 @@ void asir_terminate(int status)
 			LONGJMP(exec_env,status);
 	} else {
 		if ( user_quit_handler ) {
-			fprintf(stderr,"Calling the registered quit callbacks...");
+			if ( !do_terse )
+				fprintf(stderr,"Calling the registered quit callbacks...");
 			for ( n = user_quit_handler; n; n = NEXT(n) )
 				bevalf((FUNC)BDY(n),0);
-			fprintf(stderr, "done.\n");
+			if ( !do_terse )
+				fprintf(stderr, "done.\n");
 		}
 		tty_reset();
 #if defined(MPI)
@@ -555,11 +559,13 @@ void int_handler(int sig)
 				restore_handler();
 				if ( c == 'u' ) {
 					if ( user_int_handler ) {
-						fprintf(stderr,
-							"Calling the registered exception callbacks...");
+						if ( !do_terse )
+							fprintf(stderr,
+								"Calling the registered exception callbacks...");
 						for ( t = user_int_handler; t; t = NEXT(t) )
 							bevalf((FUNC)BDY(t),0);
-						fprintf(stderr, "done.\n");
+						if ( !do_terse )
+							fprintf(stderr, "done.\n");
 					}
 				}
 				if ( read_exec_file ) {
@@ -762,10 +768,11 @@ char *get_pariversion() 
 {
 #if PARI
 #if 0
-	return "PARI 2.2.4, copyright (C) 2002 The PARI Group.\nPARI 2.0.17, copyright 1989-1999, C. Batut, K. Belabas, D. Bernardi,\n   H. Cohen and M. Olivier.\n";
-#endif
+	return PARIVERSION", Copyright (C) 2000-2005 The PARI Group.\n";
+#else
 	return "PARI 2.0.17, copyright 1989-1999, C. Batut, K. Belabas, D. Bernardi,\n   H. Cohen and M. Olivier.\n";
 #endif
+#endif
 	return "";
 }
 
@@ -780,7 +787,7 @@ char *get_intervalversion()
 
 void copyright()
 {
-	char *format = "This is Risa/Asir%s, Version %d (%s Distribution).\nCopyright (C) 1994-2000, all rights reserved, FUJITSU LABORATORIES LIMITED.\nCopyright 2000-2005, Risa/Asir committers, http://www.openxm.org/.\nGC 6.2(alpha6) copyright 1988-2003, H-J. Boehm, A. J. Demers, Xerox, SGI, HP.\n%s";
+	char *format = "This is Risa/Asir%s, Version %d (%s Distribution).\nCopyright (C) 1994-2000, all rights reserved, FUJITSU LABORATORIES LIMITED.\nCopyright 2000-2005, Risa/Asir committers, http://www.openxm.org/.\nGC 6.5 Copyright 1988-2005, H-J. Boehm, A. J. Demers, Xerox, SGI, HP.\n%s";
 	printf(format, get_intervalversion(), get_asir_version(), get_asir_distribution(), get_pariversion());
 }
 
@@ -789,7 +796,7 @@ char *scopyright()
 	static char *notice;
 	char *s1, *s2, *s3;
 	int d, len;
-	char *format = "This is Risa/Asir%s, Version %d (%s Distribution).\nCopyright (C) 1994-2000, all rights reserved, FUJITSU LABORATORIES LIMITED.\nCopyright 2000-2005, Risa/Asir committers, http://www.openxm.org/.\nGC 6.2(alpha6) copyright 1988-2003, H-J. Boehm, A. J. Demers, Xerox, SGI, HP.\n%s";
+	char *format = "This is Risa/Asir%s, Version %d (%s Distribution).\nCopyright (C) 1994-2000, all rights reserved, FUJITSU LABORATORIES LIMITED.\nCopyright 2000-2005, Risa/Asir committers, http://www.openxm.org/.\nGC 6.5 copyright 1988-2005, H-J. Boehm, A. J. Demers, Xerox, SGI, HP.\n%s";
 	if (!notice) {
 		s1 = get_intervalversion();
 		s2 = get_asir_distribution();