Attachment #31001 for bug #51864

View | Details | Raw Unified | Return to bug 51864
Collapse All | Expand All

Lines 7-13 Link Here

(-)misc/gretl/Makefile (-2 / +2 lines)
7	#	7	#
8		8
9	PORTNAME= gretl	9	PORTNAME= gretl
10	PORTVERSION= 1.0.7	10	PORTVERSION= 1.0.8
11	CATEGORIES= misc	11	CATEGORIES= misc
12	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}	12	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
13	MASTER_SITE_SUBDIR= ${PORTNAME}	13	MASTER_SITE_SUBDIR= ${PORTNAME}
Lines 38-44 Link Here
38		38
39	.if ${HAVE_GNOME:Mlibgnomeui}!=""	39	.if ${HAVE_GNOME:Mlibgnomeui}!=""
40	PKGNAMESUFFIX= -gnome	40	PKGNAMESUFFIX= -gnome
41	USE_GNOME+= gnomeprefix libgnomeprintui	41	USE_GNOME+= gnomeprefix libgnomeprintui libgnomeui
42	PLIST_SUB+= GRETLDATADIR="share/gnome"	42	PLIST_SUB+= GRETLDATADIR="share/gnome"
43	.else	43	.else
44	CONFIGURE_ARGS+= --without-gnome	44	CONFIGURE_ARGS+= --without-gnome

Line 1 Link Here

(-)misc/gretl/distinfo (-1 / +1 lines)
1	MD5 (gretl-1.0.7.tar.bz2) = ab7be0659523ea851ec1a3bad837eeee	1	MD5 (gretl-1.0.8.tar.bz2) = de3023ee1c2e0f2e769c63ad7c0f99da




--- aclocal.m4.dist	Thu Oct 10 11:39:35 2002
+++ aclocal.m4	Mon Oct 21 09:34:35 2002
@@ -11,7 +11,7 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
-# gettext.m4 serial 13 (gettext-0.11.1)
+# gettext.m4 serial 17 (gettext-0.11.5)
 dnl Copyright (C) 1995-2002 Free Software Foundation, Inc.
 dnl This file is free software, distributed under the terms of the GNU
 dnl General Public License.  As a special exception to the GNU General
@@ -46,7 +46,9 @@
 dnl    $(top_builddir)/intl/libintl.a will be created.
 dnl If NEEDSYMBOL is specified and is 'need-ngettext', then GNU gettext
 dnl    implementations (in libc or libintl) without the ngettext() function
-dnl    will be ignored.
+dnl    will be ignored.  If NEEDSYMBOL is specified and is
+dnl    'need-formatstring-macros', then GNU gettext implementations that don't
+dnl    support the ISO C 99 <inttypes.h> formatstring macros will be ignored.
 dnl INTLDIR is used to find the intl libraries.  If empty,
 dnl    the value `$(top_builddir)/intl/' is used.
 dnl
@@ -73,9 +75,9 @@
   ifelse([$1], [], , [ifelse([$1], [external], , [ifelse([$1], [no-libtool], , [ifelse([$1], [use-libtool], ,
     [errprint([ERROR: invalid first argument to AM_GNU_GETTEXT
 ])])])])])
-  ifelse([$2], [], , [ifelse([$2], [need-ngettext], ,
+  ifelse([$2], [], , [ifelse([$2], [need-ngettext], , [ifelse([$2], [need-formatstring-macros], ,
     [errprint([ERROR: invalid second argument to AM_GNU_GETTEXT
-])])])
+])])])])
   define(gt_included_intl, ifelse([$1], [external], [no], [yes]))
   define(gt_libtool_suffix_prefix, ifelse([$1], [use-libtool], [l], []))
 
@@ -88,6 +90,21 @@
   AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
   AC_REQUIRE([AC_LIB_RPATH])
 
+  dnl Sometimes libintl requires libiconv, so first search for libiconv.
+  dnl Ideally we would do this search only after the
+  dnl      if test "$USE_NLS" = "yes"; then
+  dnl        if test "$gt_cv_func_gnugettext_libc" != "yes"; then
+  dnl tests. But if configure.in invokes AM_ICONV after AM_GNU_GETTEXT
+  dnl the configure script would need to contain the same shell code
+  dnl again, outside any 'if'. There are two solutions:
+  dnl - Invoke AM_ICONV_LINKFLAGS_BODY here, outside any 'if'.
+  dnl - Control the expansions in more detail using AC_PROVIDE_IFELSE.
+  dnl Since AC_PROVIDE_IFELSE is only in autoconf >= 2.52 and not
+  dnl documented, we avoid it.
+  ifelse(gt_included_intl, yes, , [
+    AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY])
+  ])
+
   AC_MSG_CHECKING([whether NLS is requested])
   dnl Default is enabled NLS
   AC_ARG_ENABLE(nls,
@@ -123,13 +140,20 @@
         dnl to fall back to GNU NLS library.
 
         dnl Add a version number to the cache macros.
-        define([gt_api_version], ifelse([$2], [need-ngettext], 2, 1))
+        define([gt_api_version], ifelse([$2], [need-formatstring-macros], 3, ifelse([$2], [need-ngettext], 2, 1)))
         define([gt_cv_func_gnugettext_libc], [gt_cv_func_gnugettext]gt_api_version[_libc])
         define([gt_cv_func_gnugettext_libintl], [gt_cv_func_gnugettext]gt_api_version[_libintl])
 
         AC_CACHE_CHECK([for GNU gettext in libc], gt_cv_func_gnugettext_libc,
          [AC_TRY_LINK([#include <libintl.h>
-extern int _nl_msg_cat_cntr;
+]ifelse([$2], [need-formatstring-macros],
+[#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
+#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
+#endif
+changequote(,)dnl
+typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
+changequote([,])dnl
+], [])[extern int _nl_msg_cat_cntr;
 extern int *_nl_domain_bindings;],
             [bindtextdomain ("", "");
 return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_domain_bindings],
@@ -154,30 +178,42 @@
             LIBS="$LIBS $LIBINTL"
             dnl Now see whether libintl exists and does not depend on libiconv.
             AC_TRY_LINK([#include <libintl.h>
-extern int _nl_msg_cat_cntr;
-extern int *_nl_domain_bindings;
+]ifelse([$2], [need-formatstring-macros],
+[#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
+#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
+#endif
+changequote(,)dnl
+typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
+changequote([,])dnl
+], [])[extern int _nl_msg_cat_cntr;
 extern
 #ifdef __cplusplus
 "C"
 #endif
 const char *_nl_expand_alias ();],
               [bindtextdomain ("", "");
-return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_domain_bindings + *_nl_expand_alias (0)],
+return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias (0)],
               gt_cv_func_gnugettext_libintl=yes,
               gt_cv_func_gnugettext_libintl=no)
             dnl Now see whether libintl exists and depends on libiconv.
             if test "$gt_cv_func_gnugettext_libintl" != yes && test -n "$LIBICONV"; then
               LIBS="$LIBS $LIBICONV"
               AC_TRY_LINK([#include <libintl.h>
-extern int _nl_msg_cat_cntr;
-extern int *_nl_domain_bindings;
+]ifelse([$2], [need-formatstring-macros],
+[#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
+#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
+#endif
+changequote(,)dnl
+typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
+changequote([,])dnl
+], [])[extern int _nl_msg_cat_cntr;
 extern
 #ifdef __cplusplus
 "C"
 #endif
 const char *_nl_expand_alias ();],
                 [bindtextdomain ("", "");
-return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_domain_bindings + *_nl_expand_alias (0)],
+return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias (0)],
                [LIBINTL="$LIBINTL $LIBICONV"
                 LTLIBINTL="$LTLIBINTL $LTLIBICONV"
                 gt_cv_func_gnugettext_libintl=yes
@@ -465,7 +501,7 @@
         ;;
       esac
     done],
-   [# Capture the value of obsolete $ALL_LINGUAS because we need it to compute
+   [# Capture the value of obsolete ALL_LINGUAS because we need it to compute
     # POFILES, GMOFILES, UPDATEPOFILES, DUMMYPOFILES, CATALOGS. But hide it
     # from automake.
     eval 'ALL_LINGUAS''="$ALL_LINGUAS"'
@@ -494,6 +530,10 @@
   AC_REQUIRE([AC_FUNC_ALLOCA])dnl
   AC_REQUIRE([AC_FUNC_MMAP])dnl
   AC_REQUIRE([jm_GLIBC21])dnl
+  AC_REQUIRE([gt_INTDIV0])dnl
+  AC_REQUIRE([jm_AC_TYPE_UINTMAX_T])dnl
+  AC_REQUIRE([gt_HEADER_INTTYPES_H])dnl
+  AC_REQUIRE([gt_INTTYPES_PRI])dnl
 
   AC_CHECK_HEADERS([argz.h limits.h locale.h nl_types.h malloc.h stddef.h \
 stdlib.h string.h unistd.h sys/param.h])
@@ -503,7 +543,9 @@
 
   AM_ICONV
   AM_LANGINFO_CODESET
-  AM_LC_MESSAGES
+  if test $ac_cv_header_locale_h = yes; then
+    AM_LC_MESSAGES
+  fi
 
   dnl intl/plural.c is generated from intl/plural.y. It requires bison,
   dnl because plural.y uses bison specific features. It requires at least
@@ -1322,7 +1364,7 @@
 AC_LIB_PROG_LD_GNU
 ])
 
-# iconv.m4 serial AM3 (gettext-0.11)
+# iconv.m4 serial AM4 (gettext-0.11.3)
 dnl Copyright (C) 2000-2002 Free Software Foundation, Inc.
 dnl This file is free software, distributed under the terms of the GNU
 dnl General Public License.  As a special exception to the GNU General
@@ -1332,11 +1374,8 @@
 
 dnl From Bruno Haible.
 
-AC_DEFUN([AM_ICONV_LINK],
+AC_DEFUN([AM_ICONV_LINKFLAGS_BODY],
 [
-  dnl Some systems have iconv in libc, some have it in libiconv (OSF/1 and
-  dnl those with the standalone portable GNU libiconv installed).
-
   dnl Prerequisites of AC_LIB_LINKFLAGS_BODY.
   AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
   AC_REQUIRE([AC_LIB_RPATH])
@@ -1344,6 +1383,16 @@
   dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV
   dnl accordingly.
   AC_LIB_LINKFLAGS_BODY([iconv])
+])
+
+AC_DEFUN([AM_ICONV_LINK],
+[
+  dnl Some systems have iconv in libc, some have it in libiconv (OSF/1 and
+  dnl those with the standalone portable GNU libiconv installed).
+
+  dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV
+  dnl accordingly.
+  AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY])
 
   dnl Add $INCICONV to CPPFLAGS before performing the following checks,
   dnl because if the user has installed libiconv and not disabled its use
@@ -1393,7 +1442,7 @@
 
 AC_DEFUN([AM_ICONV],
 [
-  AC_REQUIRE([AM_ICONV_LINK])
+  AM_ICONV_LINK
   if test "$am_cv_func_iconv" = yes; then
     AC_MSG_CHECKING([for iconv declaration])
     AC_CACHE_VAL(am_cv_proto_iconv, [




--- cli/Makefile.in.orig	Mon Apr 28 21:44:49 2003
+++ cli/Makefile.in	Sun May  4 03:10:33 2003
@@ -9,7 +9,7 @@
 exec_prefix = @exec_prefix@
 bindir = @bindir@
 datadir = @datadir@
-localedir = $(datadir)/locale
+localedir = $(prefix)/share/locale
 
 have_readline = @have_readline@
 READLINE_LIBS = @READLINE_LIBS@
@@ -17,6 +17,10 @@
 
 GMP_CFLAGS = @GMP_CFLAGS@
 
+CPPFLAGS = @CPPFLAGS@
+LDFLAGS = @LDFLAGS@

 ifeq ($(CC),)
   CC = gcc
 endif
@@ -41,7 +45,7 @@
   LN = ln -sf
 endif
 ifeq ($(USE_NLS),yes)
-  datadir = @datadir@
-  localedir = $(datadir)/locale
+  localedir = $(prefix)/share/locale
   DEFS = -DLOCALEDIR=\"$(localedir)\" -DHAVE_CONFIG_H
 endif
 
 GRETLLIB = ../lib/libgretl-1.0.la
 
 DEFS = -DLOCALEDIR=\"$(localedir)\" -DHAVE_CONFIG_H
-LIBS = $(CLI_LIBS)
+LIBS = $(CLI_LIBS) $(INTL_LIBS)
 
 # Directories
 tooldir = $(topsrc)/tools
@@ -45,7 +48,7 @@
 SRCS = gretlcli.c common.c complete.c
 OBJS = gretlcli.o $(RL_OBJ)
 
-override CFLAGS += -I.. -I$(topsrc) -I$(libsrc) $(GMP_CFLAGS) $(READLINE_CFLAGS) $(DEFS)
+override CFLAGS += -I.. -I$(topsrc) -I$(libsrc) $(GMP_CFLAGS) $(READLINE_CFLAGS) $(DEFS) $(CPPFLAGS)
 
 CLI = gretlcli
 LIBTOOL = ../libtool
@@ -51,7 +55,7 @@
 	$(CC) -MM -MG -I$(libsrc) $(DEFS) $< >$*.d 2>/dev/null
 
 $(CLI): $(OBJS)
-	../libtool --mode=link $(CC) -o $@ $^ $(GRETLLIB) $(READLINE_LIBS) 
+	../libtool --mode=link $(CC) -o $@ $^ $(GRETLLIB) $(READLINE_LIBS) $(INTL_LIBS) $(LDFLAGS)
--include gretlcli.d
+	../libtool --mode=link $(CC) -o $@ $^ $(GRETLLIB) $(CLI_LIBS) $(LDFLAGS)
 
 -include gretlcli.d
 

Lines 1-11 Link Here

(-)misc/gretl/files/patch-doc::manual.xml (-11 lines)
1	--- doc/manual.xml.orig Wed Feb 5 02:02:07 2003
2	+++ doc/manual.xml Mon Apr 14 12:30:41 2003
3	@@ -1,6 +1,6 @@
4	<?xml version="1.0"?>
5	-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
6	-"/usr/share/sgml/docbook-xml-4.2/docbookx.dtd" [
7	+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
8	+ "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
9
10	<!ENTITY version "1.0.3">
11	<!ENTITY latex "LaTeX">

Lines 1-5 Link Here

(-)misc/gretl/files/patch-lib::Makefile.in (-4 / +4 lines)
1	--- lib/Makefile.in.orig Wed Apr 9 03:57:16 2003	1	--- lib/Makefile.in.orig Mon Apr 21 23:24:57 2003
2	+++ lib/Makefile.in Mon Apr 14 17:50:12 2003	2	+++ lib/Makefile.in Sun May 4 03:12:41 2003
3	@@ -16,6 +16,11 @@	3	@@ -16,6 +16,11 @@
4	GMP_LIBS = @GMP_LIBS@	4	GMP_LIBS = @GMP_LIBS@
5	have_gtk = @have_gtk@	5	have_gtk = @have_gtk@
Lines 43-50 Link Here
43		43
44	$(LIBGRETL): $(OBJS) $(LOBJS) $(CEPHES_OBJ) $(CEPHES_LOBJ)	44	$(LIBGRETL): $(OBJS) $(LOBJS) $(CEPHES_OBJ) $(CEPHES_LOBJ)
45	$(LIBTOOL) --mode=link $(CC) -o $@ $(LOBJS) $(CEPHES_LOBJ) \	45	$(LIBTOOL) --mode=link $(CC) -o $@ $(LOBJS) $(CEPHES_LOBJ) \
46	- -rpath $(prefix)/lib $(LIBS) -version-info 0:6:0	46	- -rpath $(prefix)/lib $(LIBS) -version-info 0:7:0
47	+ -rpath $(prefix)/lib $(LIBS) -version-info 0:6:0 $(LDFLAGS)	47	+ -rpath $(prefix)/lib $(LIBS) -version-info 0:7:0 $(LDFLAGS)
48		48
49	-include $(OBJS:.o=.d)	49	-include $(OBJS:.o=.d)
50		50




--- plugin/Makefile.in.orig	Tue Apr 22 00:29:01 2003
+++ plugin/Makefile.in	Sun May  4 03:14:38 2003
@@ -7,6 +7,10 @@
 MAKE = @MAKE@
 INSTALL = @INSTALL@
 LN = @LN_S@
+ 
+CPPFLAGS = @CPPFLAGS@
+LDFLAGS = @LDFLAGS@
+INTL_LIBS = @LTLIBINTL@
 
 have_gtk = @have_gtk@
 have_gmp = @have_gmp@
@@ -38,8 +42,8 @@
@@ -36,8 +40,8 @@
 override CFLAGS += -I.. -DHAVE_CONFIG_H
 
 LIBTOOL = ../libtool

 
 GRETLINC = -I$(topsrc)/lib/src
 GRETLLIB = ../lib/libgretl-1.0.la
@@ -48,7 +52,7 @@
   GTK_CFLAGS += -DGTK_DISABLE_DEPRECATED
   GRETL_LIBOLE2_CFLAGS := -I$(topsrc)/plugin $(shell pkg-config --cflags glib-2.0)
 else

 endif  
 
 SRCS = excel_import.c gnumeric_import.c gretl_matrix.c import_common.c \
@@ -129,11 +133,11 @@
 .PHONY: 
 
 install: $(GRETLLIB) $(PLUGINS) installdirs
-	$(LIBTOOL) --mode=install $(INSTALL_PROGRAM) \
+	$(LIBTOOL) --mode=install $(INSTALL_DATA) \
 	$(PLUGINS) $(plugindir)
 
 install-strip: $(GRETLLIB) $(PLUGINS) installdirs
-	$(LIBTOOL) --mode=install $(INSTALL_PROGRAM) -s \
+	$(LIBTOOL) --mode=install $(INSTALL_DATA) -s \
 	$(PLUGINS) $(plugindir)
 
 install-lapack: $(GRETLLIB) $(LAPACK_PLUGINS) installdirs
-	$(LIBTOOL) --mode=install $(INSTALL_PROGRAM) \
+	$(LIBTOOL) --mode=install $(INSTALL_DATA) \
 	$(LAPACK_PLUGINS) $(plugindir)
 
 installdirs:




--- plugin/tramo-x12a.c.orig	Tue Feb 18 05:20:25 2003
+++ plugin/tramo-x12a.c	Sun May  4 03:27:36 2003
@@ -187,7 +187,7 @@
     else strcpy(seats, "seats");
 }
 
-static void truncate (char *str, int n)
+static void truncate_ (char *str, int n)
 {
     int len = strlen(str);
 
@@ -361,11 +361,11 @@
     /* formulate name of new variable to add */
     strcpy(varname, pdinfo->varname[0]);
     if (opt == TRAMO_SEATS) {
-	truncate(varname, 5);
+	truncate_(varname, 5);
 	strcat(varname, "_");
 	strncat(varname, tramo_series_strings[code], 2);
     } else {
-	truncate(varname, 4);
+	truncate_(varname, 4);
 	strcat(varname, "_");
 	strcat(varname, x12a_series_strings[code]);
     }




--- share/bcih/Makefile.in.orig	Sat Apr 26 04:32:37 2003
+++ share/bcih/Makefile.in	Sun May  4 03:16:24 2003
@@ -4,7 +4,10 @@
 INSTALL_DATA = cp -fp
 
 CC = @CC@
 prefix = @prefix@
+datadir = @datadir@
 
 VPATH = $(topsrc)/share/bcih
 
-gretldir = $(prefix)/share/gretl
+datadir = @datadir@
+gretldir = $(datadir)/gretl
+INSTALL_DATA = @INSTALL_DATA@
+
 VPATH = $(topsrc)/share/bcih
 
 bcih.bin: mkbin bcih.dat
@@ -21,4 +24,4 @@
 	rm -f mkbin bcih.bin
 
 distclean: clean
-	rm -f Makefile
\ No newline at end of file
+	rm -f Makefile




%%GNOME:%%etc/gconf/gconf.xml.defaults/schemas/apps/gretl/%gconf.xml
%%GNOME:%%etc/gconf/schemas/gretl.schemas
include/gretl/calendar.h
include/gretl/cmdlist.h
include/gretl/commands.h
include/gretl/compare.h
include/gretl/dataio.h
include/gretl/describe.h
include/gretl/discrete.h
include/gretl/errors.h
include/gretl/estimate.h
include/gretl/generate.h
include/gretl/graphing.h
include/gretl/gretl_cmdlist.h
include/gretl/gretl_commands.h
include/gretl/gretl_errors.h
include/gretl/gretl_utils.h
include/gretl/gretl_win32.h
include/gretl/interact.h

lib/gretl/gnumeric_import.so
lib/gretl/johansen.so
lib/gretl/lad.so
lib/gretl/leverage.so
lib/gretl/mp_ols.so
lib/gretl/panel_data.so
lib/gretl/progress_bar.so
lib/gretl/range-mean.so
lib/gretl/stats_tables.so
lib/gretl/sur.so
lib/gretl/tramo-x12a.so
lib/libgretl-1.0.a
lib/libgretl-1.0.so
lib/libgretl-1.0.so.0

%%GRETLDATADIR%%/gretl/data/greene/wg_descriptions
%%GRETLDATADIR%%/gretl/data/gretldata.dtd
%%GRETLDATADIR%%/gretl/data/hamilton.gdt
%%GRETLDATADIR%%/gretl/data/leverage.gdt
%%GRETLDATADIR%%/gretl/data/longley.gdt
%%GRETLDATADIR%%/gretl/db/bcih.bin
%%GRETLDATADIR%%/gretl/db/bcih.idx

Return to bug 51864

Lines 1-207 Link Here

(-)misc/gretl/files/patch-aclocal.m4 (-207 lines)
1	--- aclocal.m4.dist Thu Oct 10 11:39:35 2002
2	+++ aclocal.m4 Mon Oct 21 09:34:35 2002
3	@@ -11,7 +11,7 @@
4	# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
5	# PARTICULAR PURPOSE.
6
7	-# gettext.m4 serial 13 (gettext-0.11.1)
8	+# gettext.m4 serial 17 (gettext-0.11.5)
9	dnl Copyright (C) 1995-2002 Free Software Foundation, Inc.
10	dnl This file is free software, distributed under the terms of the GNU
11	dnl General Public License. As a special exception to the GNU General
12	@@ -46,7 +46,9 @@
13	dnl $(top_builddir)/intl/libintl.a will be created.
14	dnl If NEEDSYMBOL is specified and is 'need-ngettext', then GNU gettext
15	dnl implementations (in libc or libintl) without the ngettext() function
16	-dnl will be ignored.
17	+dnl will be ignored. If NEEDSYMBOL is specified and is
18	+dnl 'need-formatstring-macros', then GNU gettext implementations that don't
19	+dnl support the ISO C 99 <inttypes.h> formatstring macros will be ignored.
20	dnl INTLDIR is used to find the intl libraries. If empty,
21	dnl the value `$(top_builddir)/intl/' is used.
22	dnl
23	@@ -73,9 +75,9 @@
24	ifelse([$1], [], , [ifelse([$1], [external], , [ifelse([$1], [no-libtool], , [ifelse([$1], [use-libtool], ,
25	[errprint([ERROR: invalid first argument to AM_GNU_GETTEXT
26	])])])])])
27	- ifelse([$2], [], , [ifelse([$2], [need-ngettext], ,
28	+ ifelse([$2], [], , [ifelse([$2], [need-ngettext], , [ifelse([$2], [need-formatstring-macros], ,
29	[errprint([ERROR: invalid second argument to AM_GNU_GETTEXT
30	-])])])
31	+])])])])
32	define(gt_included_intl, ifelse([$1], [external], [no], [yes]))
33	define(gt_libtool_suffix_prefix, ifelse([$1], [use-libtool], [l], []))
34
35	@@ -88,6 +90,21 @@
36	AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
37	AC_REQUIRE([AC_LIB_RPATH])
38
39	+ dnl Sometimes libintl requires libiconv, so first search for libiconv.
40	+ dnl Ideally we would do this search only after the
41	+ dnl if test "$USE_NLS" = "yes"; then
42	+ dnl if test "$gt_cv_func_gnugettext_libc" != "yes"; then
43	+ dnl tests. But if configure.in invokes AM_ICONV after AM_GNU_GETTEXT
44	+ dnl the configure script would need to contain the same shell code
45	+ dnl again, outside any 'if'. There are two solutions:
46	+ dnl - Invoke AM_ICONV_LINKFLAGS_BODY here, outside any 'if'.
47	+ dnl - Control the expansions in more detail using AC_PROVIDE_IFELSE.
48	+ dnl Since AC_PROVIDE_IFELSE is only in autoconf >= 2.52 and not
49	+ dnl documented, we avoid it.
50	+ ifelse(gt_included_intl, yes, , [
51	+ AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY])
52	+ ])
53	+
54	AC_MSG_CHECKING([whether NLS is requested])
55	dnl Default is enabled NLS
56	AC_ARG_ENABLE(nls,
57	@@ -123,13 +140,20 @@
58	dnl to fall back to GNU NLS library.
59
60	dnl Add a version number to the cache macros.
61	- define([gt_api_version], ifelse([$2], [need-ngettext], 2, 1))
62	+ define([gt_api_version], ifelse([$2], [need-formatstring-macros], 3, ifelse([$2], [need-ngettext], 2, 1)))
63	define([gt_cv_func_gnugettext_libc], [gt_cv_func_gnugettext]gt_api_version[_libc])
64	define([gt_cv_func_gnugettext_libintl], [gt_cv_func_gnugettext]gt_api_version[_libintl])
65
66	AC_CACHE_CHECK([for GNU gettext in libc], gt_cv_func_gnugettext_libc,
67	[AC_TRY_LINK([#include <libintl.h>
68	-extern int _nl_msg_cat_cntr;
69	+]ifelse([$2], [need-formatstring-macros],
70	+[#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
71	+#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
72	+#endif
73	+changequote(,)dnl
74	+typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
75	+changequote([,])dnl
76	+], [])[extern int _nl_msg_cat_cntr;
77	extern int *_nl_domain_bindings;],
78	[bindtextdomain ("", "");
79	return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_domain_bindings],
80	@@ -154,30 +178,42 @@
81	LIBS="$LIBS $LIBINTL"
82	dnl Now see whether libintl exists and does not depend on libiconv.
83	AC_TRY_LINK([#include <libintl.h>
84	-extern int _nl_msg_cat_cntr;
85	-extern int *_nl_domain_bindings;
86	+]ifelse([$2], [need-formatstring-macros],
87	+[#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
88	+#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
89	+#endif
90	+changequote(,)dnl
91	+typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
92	+changequote([,])dnl
93	+], [])[extern int _nl_msg_cat_cntr;
94	extern
95	#ifdef __cplusplus
96	"C"
97	#endif
98	const char *_nl_expand_alias ();],
99	[bindtextdomain ("", "");
100	-return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + _nl_domain_bindings + _nl_expand_alias (0)],
101	+return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias (0)],
102	gt_cv_func_gnugettext_libintl=yes,
103	gt_cv_func_gnugettext_libintl=no)
104	dnl Now see whether libintl exists and depends on libiconv.
105	if test "$gt_cv_func_gnugettext_libintl" != yes && test -n "$LIBICONV"; then
106	LIBS="$LIBS $LIBICONV"
107	AC_TRY_LINK([#include <libintl.h>
108	-extern int _nl_msg_cat_cntr;
109	-extern int *_nl_domain_bindings;
110	+]ifelse([$2], [need-formatstring-macros],
111	+[#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
112	+#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
113	+#endif
114	+changequote(,)dnl
115	+typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
116	+changequote([,])dnl
117	+], [])[extern int _nl_msg_cat_cntr;
118	extern
119	#ifdef __cplusplus
120	"C"
121	#endif
122	const char *_nl_expand_alias ();],
123	[bindtextdomain ("", "");
124	-return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + _nl_domain_bindings + _nl_expand_alias (0)],
125	+return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias (0)],
126	[LIBINTL="$LIBINTL $LIBICONV"
127	LTLIBINTL="$LTLIBINTL $LTLIBICONV"
128	gt_cv_func_gnugettext_libintl=yes
129	@@ -465,7 +501,7 @@
130	;;
131	esac
132	done],
133	- [# Capture the value of obsolete $ALL_LINGUAS because we need it to compute
134	+ [# Capture the value of obsolete ALL_LINGUAS because we need it to compute
135	# POFILES, GMOFILES, UPDATEPOFILES, DUMMYPOFILES, CATALOGS. But hide it
136	# from automake.
137	eval 'ALL_LINGUAS''="$ALL_LINGUAS"'
138	@@ -494,6 +530,10 @@
139	AC_REQUIRE([AC_FUNC_ALLOCA])dnl
140	AC_REQUIRE([AC_FUNC_MMAP])dnl
141	AC_REQUIRE([jm_GLIBC21])dnl
142	+ AC_REQUIRE([gt_INTDIV0])dnl
143	+ AC_REQUIRE([jm_AC_TYPE_UINTMAX_T])dnl
144	+ AC_REQUIRE([gt_HEADER_INTTYPES_H])dnl
145	+ AC_REQUIRE([gt_INTTYPES_PRI])dnl
146
147	AC_CHECK_HEADERS([argz.h limits.h locale.h nl_types.h malloc.h stddef.h \
148	stdlib.h string.h unistd.h sys/param.h])
149	@@ -503,7 +543,9 @@
150
151	AM_ICONV
152	AM_LANGINFO_CODESET
153	- AM_LC_MESSAGES
154	+ if test $ac_cv_header_locale_h = yes; then
155	+ AM_LC_MESSAGES
156	+ fi
157
158	dnl intl/plural.c is generated from intl/plural.y. It requires bison,
159	dnl because plural.y uses bison specific features. It requires at least
160	@@ -1322,7 +1364,7 @@
161	AC_LIB_PROG_LD_GNU
162	])
163
164	-# iconv.m4 serial AM3 (gettext-0.11)
165	+# iconv.m4 serial AM4 (gettext-0.11.3)
166	dnl Copyright (C) 2000-2002 Free Software Foundation, Inc.
167	dnl This file is free software, distributed under the terms of the GNU
168	dnl General Public License. As a special exception to the GNU General
169	@@ -1332,11 +1374,8 @@
170
171	dnl From Bruno Haible.
172
173	-AC_DEFUN([AM_ICONV_LINK],
174	+AC_DEFUN([AM_ICONV_LINKFLAGS_BODY],
175	[
176	- dnl Some systems have iconv in libc, some have it in libiconv (OSF/1 and
177	- dnl those with the standalone portable GNU libiconv installed).
178	-
179	dnl Prerequisites of AC_LIB_LINKFLAGS_BODY.
180	AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
181	AC_REQUIRE([AC_LIB_RPATH])
182	@@ -1344,6 +1383,16 @@
183	dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV
184	dnl accordingly.
185	AC_LIB_LINKFLAGS_BODY([iconv])
186	+])
187	+
188	+AC_DEFUN([AM_ICONV_LINK],
189	+[
190	+ dnl Some systems have iconv in libc, some have it in libiconv (OSF/1 and
191	+ dnl those with the standalone portable GNU libiconv installed).
192	+
193	+ dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV
194	+ dnl accordingly.
195	+ AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY])
196
197	dnl Add $INCICONV to CPPFLAGS before performing the following checks,
198	dnl because if the user has installed libiconv and not disabled its use
199	@@ -1393,7 +1442,7 @@
200
201	AC_DEFUN([AM_ICONV],
202	[
203	- AC_REQUIRE([AM_ICONV_LINK])
204	+ AM_ICONV_LINK
205	if test "$am_cv_func_iconv" = yes; then
206	AC_MSG_CHECKING([for iconv declaration])
207	AC_CACHE_VAL(am_cv_proto_iconv, [

Lines 1-8 Link Here

(-)misc/gretl/files/patch-cli::Makefile.in (-34 / +23 lines)
1	--- cli/Makefile.in.orig Wed Apr 9 03:57:13 2003	1	--- cli/Makefile.in.orig Mon Apr 28 21:44:49 2003
2	+++ cli/Makefile.in Mon Apr 14 16:59:22 2003	2	+++ cli/Makefile.in Sun May 4 03:10:33 2003
3	@@ -15,6 +15,10 @@	3	@@ -9,7 +9,7 @@
4	RL_OBJ = @RL_OBJ@	4	exec_prefix = @exec_prefix@
5	USE_NLS = @USE_NLS@	5	bindir = @bindir@
		6	datadir = @datadir@
		7	-localedir = $(datadir)/locale
		8	+localedir = $(prefix)/share/locale
		9
		10	have_readline = @have_readline@
		11	READLINE_LIBS = @READLINE_LIBS@
		12	@@ -17,6 +17,10 @@
		13
		14	GMP_CFLAGS = @GMP_CFLAGS@
6		15
7	+CPPFLAGS = @CPPFLAGS@	16	+CPPFLAGS = @CPPFLAGS@
8	+LDFLAGS = @LDFLAGS@	17	+LDFLAGS = @LDFLAGS@
Lines 11-51 Link Here
11	ifeq ($(CC),)	20	ifeq ($(CC),)
12	CC = gcc	21	CC = gcc
13	endif	22	endif
14	@@ -25,15 +29,14 @@	23	@@ -41,7 +45,7 @@
15	LN = ln -sf
16	endif
17	ifeq ($(USE_NLS),yes)
18	- datadir = @datadir@
19	- localedir = $(datadir)/locale
20	+ localedir = $(prefix)/share/locale
21	DEFS = -DLOCALEDIR=\"$(localedir)\" -DHAVE_CONFIG_H
22	endif
23
24	GRETLLIB = ../lib/libgretl-1.0.la
25		24
26	# General compile options and libs:	25	DEFS = -DLOCALEDIR=\"$(localedir)\" -DHAVE_CONFIG_H
27	-LIBS = $(CLI_LIBS)
28	+LIBS = $(CLI_LIBS) $(INTL_LIBS)
29
30	# Directories
31	tooldir = $(topsrc)/tools
32	@@ -45,7 +48,7 @@
33	SRCS = gretlcli.c common.c complete.c
34	OBJS = gretlcli.o $(RL_OBJ)
35		26
36	-override CFLAGS += -I.. -I$(topsrc) -I$(libsrc) $(DEFS)	27	-override CFLAGS += -I.. -I$(topsrc) -I$(libsrc) $(GMP_CFLAGS) $(READLINE_CFLAGS) $(DEFS)
37	+override CFLAGS += -I.. -I$(topsrc) -I$(libsrc) $(DEFS) $(CPPFLAGS)	28	+override CFLAGS += -I.. -I$(topsrc) -I$(libsrc) $(GMP_CFLAGS) $(READLINE_CFLAGS) $(DEFS) $(CPPFLAGS)
38		29
39	CLI = gretlcli	30	CLI = gretlcli
40	LIBTOOL = ../libtool	31	LIBTOOL = ../libtool
41	@@ -55,9 +58,7 @@	32	@@ -51,7 +55,7 @@
42	$(CC) -MM -MG -I.. -I$(topsrc) -I$(libsrc) $(DEFS) $< >$*.d 2>/dev/null	33	$(CC) -MM -MG -I$(libsrc) $(DEFS) $< >$*.d 2>/dev/null
43		34
44	$(CLI): $(OBJS)	35	$(CLI): $(OBJS)
45	- ../libtool --mode=link $(CC) -o $@ $^ $(GRETLLIB) $(CLI_LIBS)	36	- ../libtool --mode=link $(CC) -o $@ $^ $(GRETLLIB) $(READLINE_LIBS)
46	-	37	+ ../libtool --mode=link $(CC) -o $@ $^ $(GRETLLIB) $(READLINE_LIBS) $(INTL_LIBS) $(LDFLAGS)
47	--include gretlcli.d
48	+ ../libtool --mode=link $(CC) -o $@ $^ $(GRETLLIB) $(CLI_LIBS) $(LDFLAGS)
49		38
50	.PHONY :	39	-include gretlcli.d
51		40

Lines 1-17 Link Here

(-)misc/gretl/files/patch-plugin::Makefile.in (-17 / +12 lines)
1	--- plugin/Makefile.in.orig Wed Apr 9 08:46:09 2003	1	--- plugin/Makefile.in.orig Tue Apr 22 00:29:01 2003
2	+++ plugin/Makefile.in Mon Apr 14 12:45:07 2003	2	+++ plugin/Makefile.in Sun May 4 03:14:38 2003
3	@@ -8,6 +8,10 @@	3	@@ -7,6 +7,10 @@
		4	MAKE = @MAKE@
4	INSTALL = @INSTALL@	5	INSTALL = @INSTALL@
5	LN = @LN_S@	6	LN = @LN_S@
6		7	+
7	+CPPFLAGS = @CPPFLAGS@	8	+CPPFLAGS = @CPPFLAGS@
8	+LDFLAGS = @LDFLAGS@	9	+LDFLAGS = @LDFLAGS@
9	+INTL_LIBS = @LTLIBINTL@	10	+INTL_LIBS = @LTLIBINTL@
10	+	11
11	have_gtk = @have_gtk@	12	have_gtk = @have_gtk@
12	GTK_CFLAGS = @GTK_CFLAGS@	13	have_gmp = @have_gmp@
13	GTK_LIBS = @GTK_LIBS@	14	@@ -38,8 +42,8 @@
14	@@ -36,8 +40,8 @@
15	override CFLAGS += -I.. -DHAVE_CONFIG_H	15	override CFLAGS += -I.. -DHAVE_CONFIG_H
16		16
17	LIBTOOL = ../libtool	17	LIBTOOL = ../libtool
Lines 22-28 Link Here
22		22
23	GRETLINC = -I$(topsrc)/lib/src	23	GRETLINC = -I$(topsrc)/lib/src
24	GRETLLIB = ../lib/libgretl-1.0.la	24	GRETLLIB = ../lib/libgretl-1.0.la
25	@@ -46,7 +50,7 @@	25	@@ -48,7 +52,7 @@
26	GTK_CFLAGS += -DGTK_DISABLE_DEPRECATED	26	GTK_CFLAGS += -DGTK_DISABLE_DEPRECATED
27	GRETL_LIBOLE2_CFLAGS := -I$(topsrc)/plugin $(shell pkg-config --cflags glib-2.0)	27	GRETL_LIBOLE2_CFLAGS := -I$(topsrc)/plugin $(shell pkg-config --cflags glib-2.0)
28	else	28	else
Lines 31-52 Link Here
31	endif	31	endif
32		32
33	SRCS = excel_import.c gnumeric_import.c gretl_matrix.c import_common.c \	33	SRCS = excel_import.c gnumeric_import.c gretl_matrix.c import_common.c \
34	@@ -130,15 +134,15 @@	34	@@ -129,11 +133,11 @@
35	.PHONY:	35	.PHONY:
36		36
37	install: $(PLUGINS) installdirs	37	install: $(GRETLLIB) $(PLUGINS) installdirs
38	- $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) \	38	- $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) \
39	+ $(LIBTOOL) --mode=install $(INSTALL_DATA) \	39	+ $(LIBTOOL) --mode=install $(INSTALL_DATA) \
40	$(PLUGINS) $(plugindir)	40	$(PLUGINS) $(plugindir)
41		41
42	install-strip: $(PLUGINS) installdirs	42	install-strip: $(GRETLLIB) $(PLUGINS) installdirs
43	- $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) -s \	43	- $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) -s \
44	+ $(LIBTOOL) --mode=install $(INSTALL_DATA) -s \	44	+ $(LIBTOOL) --mode=install $(INSTALL_DATA) -s \
45	$(PLUGINS) $(plugindir)	45	$(PLUGINS) $(plugindir)
46
47	install-lapack: $(GRETLLIB) $(LAPACK_PLUGINS) installdirs
48	- $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) \
49	+ $(LIBTOOL) --mode=install $(INSTALL_DATA) \
50	$(LAPACK_PLUGINS) $(plugindir)
51		46
52	installdirs:	47	installdirs:

Line 0 Link Here

(-)misc/gretl/files/patch-plugin::tramo-x12a.c (+25 lines)
	1	--- plugin/tramo-x12a.c.orig Tue Feb 18 05:20:25 2003
	2	+++ plugin/tramo-x12a.c Sun May 4 03:27:36 2003
	3	@@ -187,7 +187,7 @@
	4	else strcpy(seats, "seats");
	5	}
	6
	7	-static void truncate (char *str, int n)
	8	+static void truncate_ (char *str, int n)
	9	{
	10	int len = strlen(str);
	11
	12	@@ -361,11 +361,11 @@
	13	/* formulate name of new variable to add */
	14	strcpy(varname, pdinfo->varname[0]);
	15	if (opt == TRAMO_SEATS) {
	16	- truncate(varname, 5);
	17	+ truncate_(varname, 5);
	18	strcat(varname, "_");
	19	strncat(varname, tramo_series_strings[code], 2);
	20	} else {
	21	- truncate(varname, 4);
	22	+ truncate_(varname, 4);
	23	strcat(varname, "_");
	24	strcat(varname, x12a_series_strings[code]);
	25	}

Lines 1-17 Link Here

(-)misc/gretl/files/patch-share::bcih::Makefile.in (-11 / +15 lines)
1	--- share/bcih/Makefile.in.orig Wed Apr 9 03:57:19 2003	1	--- share/bcih/Makefile.in.orig Sat Apr 26 04:32:37 2003
2	+++ share/bcih/Makefile.in Mon Apr 14 16:07:21 2003	2	+++ share/bcih/Makefile.in Sun May 4 03:16:24 2003
3	@@ -2,11 +2,12 @@	3	@@ -4,7 +4,10 @@
		4	INSTALL_DATA = cp -fp
4		5
5	CC = @CC@
6	prefix = @prefix@	6	prefix = @prefix@
7	+datadir = @datadir@
8
9	VPATH = $(topsrc)/share/bcih
10
11	-gretldir = $(prefix)/share/gretl	7	-gretldir = $(prefix)/share/gretl
12	-INSTALL_DATA = cp -fp	8	+datadir = @datadir@
13	+gretldir = $(datadir)/gretl	9	+gretldir = $(datadir)/gretl
14	+INSTALL_DATA = @INSTALL_DATA@	10	+INSTALL_DATA = @INSTALL_DATA@
		11	+
		12	VPATH = $(topsrc)/share/bcih
		13
		14	bcih.bin: mkbin bcih.dat
		15	@@ -21,4 +24,4 @@
		16	rm -f mkbin bcih.bin
15		17
16	mkbin: mkbin.c	18	distclean: clean
17	$(CC) -o $@ $<	19	- rm -f Makefile
		20	\ No newline at end of file
		21	+ rm -f Makefile

Lines 5-20 Link Here

(-)misc/gretl/pkg-plist (-3 / +6 lines)
5	%%GNOME:%%etc/gconf/gconf.xml.defaults/schemas/apps/gretl/%gconf.xml	5	%%GNOME:%%etc/gconf/gconf.xml.defaults/schemas/apps/gretl/%gconf.xml
6	%%GNOME:%%etc/gconf/schemas/gretl.schemas	6	%%GNOME:%%etc/gconf/schemas/gretl.schemas
7	include/gretl/calendar.h	7	include/gretl/calendar.h
8	include/gretl/cmdlist.h
9	include/gretl/commands.h
10	include/gretl/compare.h	8	include/gretl/compare.h
11	include/gretl/dataio.h	9	include/gretl/dataio.h
12	include/gretl/describe.h	10	include/gretl/describe.h
13	include/gretl/discrete.h	11	include/gretl/discrete.h
14	include/gretl/errors.h
15	include/gretl/estimate.h	12	include/gretl/estimate.h
16	include/gretl/generate.h	13	include/gretl/generate.h
17	include/gretl/graphing.h	14	include/gretl/graphing.h
		15	include/gretl/gretl_cmdlist.h
		16	include/gretl/gretl_commands.h
		17	include/gretl/gretl_errors.h
18	include/gretl/gretl_utils.h	18	include/gretl/gretl_utils.h
19	include/gretl/gretl_win32.h	19	include/gretl/gretl_win32.h
20	include/gretl/interact.h	20	include/gretl/interact.h
Lines 37-48 Link Here
37	lib/gretl/gnumeric_import.so	37	lib/gretl/gnumeric_import.so
38	lib/gretl/johansen.so	38	lib/gretl/johansen.so
39	lib/gretl/lad.so	39	lib/gretl/lad.so
		40	lib/gretl/leverage.so
40	lib/gretl/mp_ols.so	41	lib/gretl/mp_ols.so
41	lib/gretl/panel_data.so	42	lib/gretl/panel_data.so
42	lib/gretl/progress_bar.so	43	lib/gretl/progress_bar.so
43	lib/gretl/range-mean.so	44	lib/gretl/range-mean.so
44	lib/gretl/stats_tables.so	45	lib/gretl/stats_tables.so
45	lib/gretl/sur.so	46	lib/gretl/sur.so
		47	lib/gretl/tramo-x12a.so
46	lib/libgretl-1.0.a	48	lib/libgretl-1.0.a
47	lib/libgretl-1.0.so	49	lib/libgretl-1.0.so
48	lib/libgretl-1.0.so.0	50	lib/libgretl-1.0.so.0
Lines 157-162 Link Here
157	%%GRETLDATADIR%%/gretl/data/greene/wg_descriptions	159	%%GRETLDATADIR%%/gretl/data/greene/wg_descriptions
158	%%GRETLDATADIR%%/gretl/data/gretldata.dtd	160	%%GRETLDATADIR%%/gretl/data/gretldata.dtd
159	%%GRETLDATADIR%%/gretl/data/hamilton.gdt	161	%%GRETLDATADIR%%/gretl/data/hamilton.gdt
		162	%%GRETLDATADIR%%/gretl/data/leverage.gdt
160	%%GRETLDATADIR%%/gretl/data/longley.gdt	163	%%GRETLDATADIR%%/gretl/data/longley.gdt
161	%%GRETLDATADIR%%/gretl/db/bcih.bin	164	%%GRETLDATADIR%%/gretl/db/bcih.bin
162	%%GRETLDATADIR%%/gretl/db/bcih.idx	165	%%GRETLDATADIR%%/gretl/db/bcih.idx