Adopt use of gnulib for portability.

[pspp-builds.git] / src / glob.c

diff --git a/src/glob.c b/src/glob.c
index 3ea676707c269b94841ee430bcf1108ab890669c..1b5de09955e0bc4ee2611c4fda74e2d1c5cbe5f0 100644 (file)
--- a/src/glob.c
+++ b/src/glob.c
@@ -20,19 +20,10 @@
 #include <config.h>
 #include "glob.h"
 #include "error.h"
+#include "progname.h"
 #include <stdlib.h>
 #include <stdio.h>
-
-#if TIME_WITH_SYS_TIME
-#include <sys/time.h>
-#include <time.h>
-#else
-#if HAVE_SYS_TIME_H
-#include <sys/time.h>
-#else
 #include <time.h>
-#endif
-#endif
 
 #if HAVE_LIBHISTORY
 #if HAVE_READLINE_HISTORY_H
@@ -76,7 +67,7 @@ extern void stifle_history ();
 #include "error.h"
 #include "file-handle.h"
 #include "filename.h"
-#include "getline.h"
+#include "getl.h"
 #include "hash.h"
 #include "lexer.h"
 #include "magic.h"
@@ -87,6 +78,8 @@ extern void stifle_history ();
 #include "version.h"
 #include "vfm.h"
 
+#include "gettext.h"
+
 /* var.h */
 struct dictionary *default_dict;
 struct expression *process_if_expr;
@@ -117,6 +110,8 @@ static void get_date (void);
 void
 init_glob (int argc UNUSED, char **argv)
 {
+  set_program_name (argv[0]);
+
   /* FIXME: Allow i18n of other locale items (besides LC_MESSAGES). */
 #if ENABLE_NLS
 #if HAVE_LC_MESSAGES