Merge branch 'master' of ssh://jmd@git.sv.gnu.org/srv/git/pspp

diff --git a/configure.ac b/configure.ac
index b00a75b14770f824c13737d9182307a347c02546..1abc80430659c53a3d972d03c9b5261081a90b08 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -15,6 +15,7 @@ AC_LIBTOOL_WIN32_DLL
 AC_LIBTOOL_DLOPEN
 AC_PROG_LIBTOOL
 PKG_PROG_PKG_CONFIG
+m4_pattern_forbid([PKG_CHECK_MODULES])
 
 AC_ARG_ENABLE(
   anachronistic-dependencies, 

diff --git a/src/libpspp/i18n.c b/src/libpspp/i18n.c
index bda2676c86788eabcfa24a937f7802cbe19c955d..db851217c80be27ae129a9c6252824929af51785 100644 (file)
--- a/src/libpspp/i18n.c
+++ b/src/libpspp/i18n.c
@@ -225,24 +225,24 @@ i18n_done (void)
 char
 get_system_decimal (void)
 {
-  char *radix_char = NULL;
+  char radix_char;
 
   char *ol = setlocale (LC_NUMERIC, NULL);
   setlocale (LC_NUMERIC, "");
 
 #if HAVE_NL_LANGINFO
-  radix_char = nl_langinfo (RADIXCHAR);
+  radix_char = nl_langinfo (RADIXCHAR)[0];
 #else
   {
-    char *buf = xmalloc (10);
-    snprintf (buf, 10, "%f", 2.5);
-    radix_char = &buf[1];
+    char buf[10];
+    snprintf (buf, sizeof buf, "%f", 2.5);
+    radix_char = buf[1];
   }
 #endif
 
   /* We MUST leave LC_NUMERIC untouched, since it would
      otherwise interfere with data_{in,out} */
   setlocale (LC_NUMERIC, ol);
-  return *radix_char;
+  return radix_char;
 }