From 1a9d3c43ecae725e30a2cdaf8e3b6612a1107b37 Mon Sep 17 00:00:00 2001 From: John Darrington Date: Mon, 5 Apr 2004 09:58:14 +0000 Subject: [PATCH] Fixed configuration problems with gsl --- configure.ac | 3 ++- po/en_GB.po | 26 +++++++++++++------------- po/pspp.pot | 26 +++++++++++++------------- src/main.c | 9 +-------- 4 files changed, 29 insertions(+), 35 deletions(-) diff --git a/configure.ac b/configure.ac index ffe69d86..5015f73a 100644 --- a/configure.ac +++ b/configure.ac @@ -27,7 +27,8 @@ AC_CHECK_LIB(gmp, mpf_get_str,, ) AC_CHECK_LIB(gslcblas,main,,AC_MSG_ERROR([You must install libgslcblas])) -AC_CHECK_LIB(gsl,gsl_set_error_handler,,AC_MSG_ERROR([You must install libgsl])) +AC_CHECK_LIB(gsl, gsl_cdf_chisq_Q,, + AC_MSG_ERROR([You must install libgsl version 1.4 or later])) AC_CHECK_FUNC(getopt_long,, AC_MSG_ERROR(`This application depends upon getopt_long')) diff --git a/po/en_GB.po b/po/en_GB.po index bd7290a8..f9803f1b 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PSPP 0.3.1\n" "Report-Msgid-Bugs-To: pspp-dev@gnu.org\n" -"POT-Creation-Date: 2004-04-03 14:42+0800\n" +"POT-Creation-Date: 2004-04-04 14:18+0800\n" "PO-Revision-Date: 2004-01-23 13:04+0800\n" "Last-Translator: John Darrington \n" "Language-Team: John Darrington \n" @@ -730,7 +730,7 @@ msgid "" msgstr "" #: src/data-list.c:768 src/data-list.c:898 src/descript.c:826 src/print.c:792 -#: src/sysfile-info.c:132 src/sysfile-info.c:365 src/vfm.c:833 +#: src/sysfile-info.c:132 src/sysfile-info.c:365 src/vfm.c:832 msgid "Variable" msgstr "" @@ -2212,42 +2212,42 @@ msgstr "" msgid "" msgstr "" -#: src/lexer.c:987 src/pfm-read.c:135 src/repeat.c:222 +#: src/lexer.c:993 src/pfm-read.c:135 src/repeat.c:222 msgid "Unexpected end of file." msgstr "" -#: src/lexer.c:1013 +#: src/lexer.c:1019 msgid "binary" msgstr "" -#: src/lexer.c:1013 +#: src/lexer.c:1019 msgid "octal" msgstr "" -#: src/lexer.c:1013 +#: src/lexer.c:1019 msgid "hex" msgstr "" -#: src/lexer.c:1027 +#: src/lexer.c:1033 #, c-format msgid "String of %s digits has %d characters, which is not a multiple of %d." msgstr "" -#: src/lexer.c:1056 +#: src/lexer.c:1062 #, c-format msgid "`%c' is not a valid %s digit." msgstr "" -#: src/lexer.c:1087 +#: src/lexer.c:1093 msgid "Unterminated string constant." msgstr "" -#: src/lexer.c:1159 +#: src/lexer.c:1165 #, c-format msgid "String exceeds 255 characters in length (%d characters)." msgstr "" -#: src/lexer.c:1174 +#: src/lexer.c:1180 msgid "" "Sorry, literal strings may not contain null characters. Replacing with " "spaces." @@ -3964,7 +3964,7 @@ msgstr "" msgid "Documents in the active file:" msgstr "" -#: src/sysfile-info.c:372 src/sysfile-info.c:530 src/vfm.c:835 +#: src/sysfile-info.c:372 src/sysfile-info.c:530 src/vfm.c:834 msgid "Label" msgstr "" @@ -3987,7 +3987,7 @@ msgstr "" msgid "Missing Values: " msgstr "" -#: src/sysfile-info.c:529 src/vfm.c:834 src/crosstabs.q:1158 +#: src/sysfile-info.c:529 src/vfm.c:833 src/crosstabs.q:1158 #: src/crosstabs.q:1185 src/crosstabs.q:1205 src/crosstabs.q:1227 #: src/frequencies.q:1021 src/frequencies.q:1138 msgid "Value" diff --git a/po/pspp.pot b/po/pspp.pot index 56ff9bdf..ac333afa 100644 --- a/po/pspp.pot +++ b/po/pspp.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: pspp-dev@gnu.org\n" -"POT-Creation-Date: 2004-04-03 14:42+0800\n" +"POT-Creation-Date: 2004-04-04 14:18+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -731,7 +731,7 @@ msgid "" msgstr "" #: src/data-list.c:768 src/data-list.c:898 src/descript.c:826 src/print.c:792 -#: src/sysfile-info.c:132 src/sysfile-info.c:365 src/vfm.c:833 +#: src/sysfile-info.c:132 src/sysfile-info.c:365 src/vfm.c:832 msgid "Variable" msgstr "" @@ -2212,42 +2212,42 @@ msgstr "" msgid "" msgstr "" -#: src/lexer.c:987 src/pfm-read.c:135 src/repeat.c:222 +#: src/lexer.c:993 src/pfm-read.c:135 src/repeat.c:222 msgid "Unexpected end of file." msgstr "" -#: src/lexer.c:1013 +#: src/lexer.c:1019 msgid "binary" msgstr "" -#: src/lexer.c:1013 +#: src/lexer.c:1019 msgid "octal" msgstr "" -#: src/lexer.c:1013 +#: src/lexer.c:1019 msgid "hex" msgstr "" -#: src/lexer.c:1027 +#: src/lexer.c:1033 #, c-format msgid "String of %s digits has %d characters, which is not a multiple of %d." msgstr "" -#: src/lexer.c:1056 +#: src/lexer.c:1062 #, c-format msgid "`%c' is not a valid %s digit." msgstr "" -#: src/lexer.c:1087 +#: src/lexer.c:1093 msgid "Unterminated string constant." msgstr "" -#: src/lexer.c:1159 +#: src/lexer.c:1165 #, c-format msgid "String exceeds 255 characters in length (%d characters)." msgstr "" -#: src/lexer.c:1174 +#: src/lexer.c:1180 msgid "" "Sorry, literal strings may not contain null characters. Replacing with " "spaces." @@ -3964,7 +3964,7 @@ msgstr "" msgid "Documents in the active file:" msgstr "" -#: src/sysfile-info.c:372 src/sysfile-info.c:530 src/vfm.c:835 +#: src/sysfile-info.c:372 src/sysfile-info.c:530 src/vfm.c:834 msgid "Label" msgstr "" @@ -3987,7 +3987,7 @@ msgstr "" msgid "Missing Values: " msgstr "" -#: src/sysfile-info.c:529 src/vfm.c:834 src/crosstabs.q:1158 +#: src/sysfile-info.c:529 src/vfm.c:833 src/crosstabs.q:1158 #: src/crosstabs.q:1185 src/crosstabs.q:1205 src/crosstabs.q:1227 #: src/frequencies.q:1021 src/frequencies.q:1138 msgid "Value" diff --git a/src/main.c b/src/main.c index b0582c1b..4c216030 100644 --- a/src/main.c +++ b/src/main.c @@ -56,13 +56,6 @@ void bug_handler(int sig); we hit end-of-file unexpectedly (or whatever). */ int start_interactive; -/* Initialise error handling on the gsl library */ -static void -err_handler_gsl (const char *reason, const char *file, - int line, int gsl_errno UNUSED) -{ - msg(FE, _("gsl error at %s:%d; reason: \"%s\""), file,line,reason); -} /* Program entry point. */ int @@ -70,7 +63,7 @@ main (int argc, char **argv) { signal (SIGSEGV, bug_handler); - gsl_set_error_handler(err_handler_gsl); + gsl_set_error_handler_off(); /* Initialization. */ if (!outp_init ()) -- 2.30.2