aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Poznyakoff <gray@gnu.org>2018-05-19 22:59:10 +0300
committerSergey Poznyakoff <gray@gnu.org>2018-05-19 22:59:10 +0300
commit008b71a4d58ad33cf5a41e2aa55b9393e8420531 (patch)
tree2923a1840dcd1c2108bfe13b6817bfd8ddcc19d2
parent0f0c3dba3f676bf7a163586855f07ef427da3b4a (diff)
downloadgdbm-008b71a4d58ad33cf5a41e2aa55b9393e8420531.tar.gz
gdbm-008b71a4d58ad33cf5a41e2aa55b9393e8420531.tar.bz2
Remove gdbm-1.8.3 compatibility layer
* configure.ac: Remove gdbm-1.8.3 compatibility layer. Version 1.14.90 * Makefile.am (ACLOCAL_AMFLAGS): Remove deprecated variable. (MAYBE_EXPORT): Remove variable and conditional. * NEWS: Update. * NOTE-WARNING: Update. * README: Update. * doc/gdbm.texi: Update. * export/.gitignore: Remove. * export/Makefile.am: Remove. * export/export.c: Remove.
-rw-r--r--Makefile.am6
-rw-r--r--NEWS11
-rw-r--r--NOTE-WARNING35
-rw-r--r--README20
-rw-r--r--configure.ac39
-rw-r--r--doc/gdbm.texi27
-rw-r--r--export/.gitignore5
-rw-r--r--export/Makefile.am21
-rw-r--r--export/export.c103
9 files changed, 26 insertions, 241 deletions
diff --git a/Makefile.am b/Makefile.am
index 43a6c2f..6e00dec 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -15,16 +15,12 @@
15# You should have received a copy of the GNU General Public License 15# You should have received a copy of the GNU General Public License
16# along with GDBM. If not, see <http://www.gnu.org/licenses/>. */ 16# along with GDBM. If not, see <http://www.gnu.org/licenses/>. */
17 17
18ACLOCAL_AMFLAGS = -I m4
19EXTRA_DIST = build-aux/config.rpath NOTE-WARNING git2chg.awk 18EXTRA_DIST = build-aux/config.rpath NOTE-WARNING git2chg.awk
20 19
21if COMPAT_OPT 20if COMPAT_OPT
22 MAYBE_COMPAT = compat 21 MAYBE_COMPAT = compat
23endif 22endif
24if ENABLE_EXPORT 23SUBDIRS = po src doc $(MAYBE_COMPAT) tests
25 MAYBE_EXPORT = export
26endif
27SUBDIRS = po src doc $(MAYBE_COMPAT) $(MAYBE_EXPORT) tests
28 24
29AM_DISTCHECK_CONFIGURE_FLAGS = --enable-libgdbm-compat 25AM_DISTCHECK_CONFIGURE_FLAGS = --enable-libgdbm-compat
30 26
diff --git a/NEWS b/NEWS
index 9aceab0..e004eec 100644
--- a/NEWS
+++ b/NEWS
@@ -1,9 +1,18 @@
1GNU dbm NEWS -- history of user-visible changes. 2018-01-03 1GNU dbm NEWS -- history of user-visible changes. 2018-05-19
2Copyright (C) 1990-2018 Free Software Foundation, Inc. 2Copyright (C) 1990-2018 Free Software Foundation, Inc.
3See the end of file for copying conditions. 3See the end of file for copying conditions.
4 4
5Please send gdbm bug reports to <bug-gdbm@gnu.org>. 5Please send gdbm bug reports to <bug-gdbm@gnu.org>.
6 6
7Version 1.14.90
8
9* Implement database consistency checks
10
11* Improved error checking
12
13* Removed gdbm-1.8.3 compatibility layer
14
15
7Version 1.14.1 - 2018-01-03 16Version 1.14.1 - 2018-01-03
8 17
9* Increment soname current version number. 18* Increment soname current version number.
diff --git a/NOTE-WARNING b/NOTE-WARNING
index 6b1c197..3f21c13 100644
--- a/NOTE-WARNING
+++ b/NOTE-WARNING
@@ -7,28 +7,17 @@ system architectures, or potentially even different compilers. Differences
7in byte order, the size of file offsets, and even structure packing make 7in byte order, the size of file offsets, and even structure packing make
8gdbm files non-portable. 8gdbm files non-portable.
9 9
10Gdbm version 1.9 includes `large file' support, enabling it on operating 10Therefore, if you intend to send your database to somebody over the wire,
11systems where it is not the default. `Large file' support is essentially 11please dump it into a portable format using gdbm_dump and send the resulting
12when a system uses 64bit file offsets. Gdbm has, of course, supported `large 12file instead. The receiving party will be able to recreate the database from
13files' on systems where it was the default for a very long time. 13the dump using the gdbm_load command.
14 14
15On some systems, such as Solaris, this functionality is not enabled by 15Please refer to the documentation, chapters 22 and 23, for a detailed
16default. Gdbm will now enable it. THIS MEANS THAT GDBM 1.9 MAY NOT BE 16discussion of these two tools. Run `info gdbm gdbm_dump', if gdbm is
17ABLE TO ACCESS DATABASES CREATED BY PREVIOUS VERIONS ON THE SAME SYSTEM. 17already installed on your system, or `info -f doc/gdbm.info gdbm_dump'
18 18to read the docs from the source tree.
19Running the `configure' script with the `--disable-largefile' flag should 19
20produce a backwards-compatible build on such a system. However, for maximum 20The documentation is also available online at
21compatibility, and increased functionality, you may want to have your 21http://www.gnu.org.ua/software/gdbm/manual.
22application produce a portable copy of your database with the 1.8.3 version
23of the library, and then load it back into version 1.9.
24
25Gdbm 1.9 contains a utility designed to help you produce such a portable
26copy: gdbmexport. To build it, configure the package with the
27--enable-gdbm-export option. For the information on how to use this
28utility, refer to the documentation, chapter 17 "Export a database into
29a portable format." (run `info gdbm gdbmexport' to access it, once
30gdbm 1.9 has been installed, or `info -f doc/gdbm.info gdbmexport' to
31access the shipped info file).
32
33 22
34 23
diff --git a/README b/README
index 84b1deb..4481b51 100644
--- a/README
+++ b/README
@@ -1,5 +1,4 @@
1GNU dbm README 1GNU dbm README
2Copyright (C) 2011, 2016-2018 Free Software Foundation, Inc.
3See the end of file for copying conditions. 2See the end of file for copying conditions.
4 3
5* Introduction 4* Introduction
@@ -42,23 +41,6 @@ to install them elsewhere, define the variable COMPATINCLUDEDIR, e.g.
42 41
43 ./configure --enable-libgdbm-compat COMPATINCLUDEDIR=/usr/include/gdbm 42 ./configure --enable-libgdbm-compat COMPATINCLUDEDIR=/usr/include/gdbm
44 43
45** --enable-gdbm-export
46
47Build and install gdbmexport with the specified gdbm 1.8 library.
48
49** --with-gdbm183-library=LIB
50
51Build gdbmexport with specified (static) library. LIB must be
52a loader argument valid for the use with cc(1), e.g.: -lgdbm-1.8.
53
54** --gdbm183-libdir=DIR
55
56Build gdbmexport with the gdbm library from the specified directory.
57
58** --gdbm183-includedir=DIR
59
60Build gdbmexport with gdbm.h from the specified directory.
61
62** --without-readline 44** --without-readline
63 45
64Don't compile GNU Readline support. By default, configure enables 46Don't compile GNU Readline support. By default, configure enables
@@ -99,7 +81,7 @@ To track the development, visit
99 81
100* Copyright information: 82* Copyright information:
101 83
102Copyright (C) 2011, 2016 Free Software Foundation, Inc. 84Copyright (C) 2011, 2016-2018 Free Software Foundation, Inc.
103 85
104 Permission is granted to anyone to make or distribute verbatim copies 86 Permission is granted to anyone to make or distribute verbatim copies
105 of this document as received, in any medium, provided that the 87 of this document as received, in any medium, provided that the
diff --git a/configure.ac b/configure.ac
index 3511f0d..25c4ff4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -17,7 +17,7 @@
17 17
18m4_define([_GDBM_VERSION_MAJOR], 1) 18m4_define([_GDBM_VERSION_MAJOR], 1)
19m4_define([_GDBM_VERSION_MINOR], 14) 19m4_define([_GDBM_VERSION_MINOR], 14)
20m4_define([_GDBM_VERSION_PATCH], 1) 20m4_define([_GDBM_VERSION_PATCH], 90)
21 21
22AC_INIT([gdbm], 22AC_INIT([gdbm],
23 _GDBM_VERSION_MAJOR._GDBM_VERSION_MINOR[]m4_ifdef([_GDBM_VERSION_PATCH],._GDBM_VERSION_PATCH), 23 _GDBM_VERSION_MAJOR._GDBM_VERSION_MINOR[]m4_ifdef([_GDBM_VERSION_PATCH],._GDBM_VERSION_PATCH),
@@ -53,34 +53,6 @@ AC_ARG_ENABLE([libgdbm-compat],
53AC_ARG_VAR([COMPATINCLUDEDIR],[installation directory for dbm.h and ndbm.h]) 53AC_ARG_VAR([COMPATINCLUDEDIR],[installation directory for dbm.h and ndbm.h])
54test -z "$COMPATINCLUDEDIR" && COMPATINCLUDEDIR='$(includedir)' 54test -z "$COMPATINCLUDEDIR" && COMPATINCLUDEDIR='$(includedir)'
55 55
56AC_ARG_ENABLE([gdbm-export],
57 AC_HELP_STRING(
58 [--enable-gdbm-export],
59 [Build and install gdbmexport with specified gdbm 1.8 library. (Default is NO.)]),
60 [want_export=$enableval],
61 [want_export=no])
62
63AC_ARG_WITH([gdbm183-library],
64 AC_HELP_STRING(
65 [--with-gdbm183-library],
66 [Build gdbmexport with specified (static) library.]),
67 [GDBM183_LIBRARY=$withval],
68 [GDBM183_LIBRARY="-lgdbm"])
69
70AC_ARG_WITH([gdbm183-libdir],
71 AC_HELP_STRING(
72 [--with-gdbm183-libdir],
73 [Build gdbmexport with the gdbm library in the specified directory.]),
74 [GDBM183_LIBDIR=$withval],
75 [GDBM183_LIBDIR="/usr/local/lib"])
76
77AC_ARG_WITH([gdbm183-includedir],
78 AC_HELP_STRING(
79 [--with-gdbm183-includedir],
80 [Build gdbmexport with gdbm.h in the specified directory.]),
81 [GDBM183_INCLUDEDIR=$withval],
82 [GDBM183_INCLUDEDIR="/usr/local/include"])
83
84dnl Check for programs 56dnl Check for programs
85AC_PROG_CC 57AC_PROG_CC
86AC_PROG_CPP 58AC_PROG_CPP
@@ -132,11 +104,7 @@ AC_TYPE_OFF_T
132AC_CHECK_SIZEOF(off_t) 104AC_CHECK_SIZEOF(off_t)
133AC_CHECK_MEMBERS([struct stat.st_blksize]) 105AC_CHECK_MEMBERS([struct stat.st_blksize])
134 106
135AC_SUBST(GDBM183_LIBRARY)
136AC_SUBST(GDBM183_LIBDIR)
137AC_SUBST(GDBM183_INCLUDEDIR)
138AM_CONDITIONAL([COMPAT_OPT], [test "$want_compat" = yes]) 107AM_CONDITIONAL([COMPAT_OPT], [test "$want_compat" = yes])
139AM_CONDITIONAL([ENABLE_EXPORT], [test "$want_export" = yes])
140 108
141# Check for Curses libs. 109# Check for Curses libs.
142for lib in ncurses curses termcap 110for lib in ncurses curses termcap
@@ -214,7 +182,6 @@ cat <<EOF
214GDBM settings summary: 182GDBM settings summary:
215 183
216Compatibility library ......................... $status_compat 184Compatibility library ......................... $status_compat
217Compatibility export tool ..................... $status_export
218Memory mapped I/O ............................. $mapped_io 185Memory mapped I/O ............................. $mapped_io
219GNU Readline .................................. $status_readline 186GNU Readline .................................. $status_readline
220Debugging support ............................. $status_debug 187Debugging support ............................. $status_debug
@@ -223,7 +190,6 @@ Debugging support ............................. $status_debug
223EOF 190EOF
224], 191],
225[status_compat=$want_compat 192[status_compat=$want_compat
226status_export=$want_export
227mapped_io=$mapped_io 193mapped_io=$mapped_io
228status_readline=$status_readline 194status_readline=$status_readline
229status_debug=$status_debug]) 195status_debug=$status_debug])
@@ -232,7 +198,6 @@ AC_CONFIG_FILES([Makefile
232 src/Makefile 198 src/Makefile
233 src/gdbm.h 199 src/gdbm.h
234 doc/Makefile 200 doc/Makefile
235 compat/Makefile 201 compat/Makefile])
236 export/Makefile])
237 202
238AC_OUTPUT 203AC_OUTPUT
diff --git a/doc/gdbm.texi b/doc/gdbm.texi
index 1631a6a..2aac1c3 100644
--- a/doc/gdbm.texi
+++ b/