diff options
author | Sergey Poznyakoff <gray@gnu.org> | 2018-05-19 22:59:10 +0300 |
---|---|---|
committer | Sergey Poznyakoff <gray@gnu.org> | 2018-05-19 22:59:10 +0300 |
commit | 008b71a4d58ad33cf5a41e2aa55b9393e8420531 (patch) | |
tree | 2923a1840dcd1c2108bfe13b6817bfd8ddcc19d2 /configure.ac | |
parent | 0f0c3dba3f676bf7a163586855f07ef427da3b4a (diff) | |
download | gdbm-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.
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 39 |
1 files changed, 2 insertions, 37 deletions
diff --git a/configure.ac b/configure.ac index 3511f0d..25c4ff4 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -17,7 +17,7 @@ | |||
17 | 17 | ||
18 | m4_define([_GDBM_VERSION_MAJOR], 1) | 18 | m4_define([_GDBM_VERSION_MAJOR], 1) |
19 | m4_define([_GDBM_VERSION_MINOR], 14) | 19 | m4_define([_GDBM_VERSION_MINOR], 14) |
20 | m4_define([_GDBM_VERSION_PATCH], 1) | 20 | m4_define([_GDBM_VERSION_PATCH], 90) |
21 | 21 | ||
22 | AC_INIT([gdbm], | 22 | AC_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], | |||
53 | AC_ARG_VAR([COMPATINCLUDEDIR],[installation directory for dbm.h and ndbm.h]) | 53 | AC_ARG_VAR([COMPATINCLUDEDIR],[installation directory for dbm.h and ndbm.h]) |
54 | test -z "$COMPATINCLUDEDIR" && COMPATINCLUDEDIR='$(includedir)' | 54 | test -z "$COMPATINCLUDEDIR" && COMPATINCLUDEDIR='$(includedir)' |
55 | 55 | ||
56 | AC_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 | |||
63 | AC_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 | |||
70 | AC_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 | |||
77 | AC_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 | |||
84 | dnl Check for programs | 56 | dnl Check for programs |
85 | AC_PROG_CC | 57 | AC_PROG_CC |
86 | AC_PROG_CPP | 58 | AC_PROG_CPP |
@@ -132,11 +104,7 @@ AC_TYPE_OFF_T | |||
132 | AC_CHECK_SIZEOF(off_t) | 104 | AC_CHECK_SIZEOF(off_t) |
133 | AC_CHECK_MEMBERS([struct stat.st_blksize]) | 105 | AC_CHECK_MEMBERS([struct stat.st_blksize]) |
134 | 106 | ||
135 | AC_SUBST(GDBM183_LIBRARY) | ||
136 | AC_SUBST(GDBM183_LIBDIR) | ||
137 | AC_SUBST(GDBM183_INCLUDEDIR) | ||
138 | AM_CONDITIONAL([COMPAT_OPT], [test "$want_compat" = yes]) | 107 | AM_CONDITIONAL([COMPAT_OPT], [test "$want_compat" = yes]) |
139 | AM_CONDITIONAL([ENABLE_EXPORT], [test "$want_export" = yes]) | ||
140 | 108 | ||
141 | # Check for Curses libs. | 109 | # Check for Curses libs. |
142 | for lib in ncurses curses termcap | 110 | for lib in ncurses curses termcap |
@@ -214,7 +182,6 @@ cat <<EOF | |||
214 | GDBM settings summary: | 182 | GDBM settings summary: |
215 | 183 | ||
216 | Compatibility library ......................... $status_compat | 184 | Compatibility library ......................... $status_compat |
217 | Compatibility export tool ..................... $status_export | ||
218 | Memory mapped I/O ............................. $mapped_io | 185 | Memory mapped I/O ............................. $mapped_io |
219 | GNU Readline .................................. $status_readline | 186 | GNU Readline .................................. $status_readline |
220 | Debugging support ............................. $status_debug | 187 | Debugging support ............................. $status_debug |
@@ -223,7 +190,6 @@ Debugging support ............................. $status_debug | |||
223 | EOF | 190 | EOF |
224 | ], | 191 | ], |
225 | [status_compat=$want_compat | 192 | [status_compat=$want_compat |
226 | status_export=$want_export | ||
227 | mapped_io=$mapped_io | 193 | mapped_io=$mapped_io |
228 | status_readline=$status_readline | 194 | status_readline=$status_readline |
229 | status_debug=$status_debug]) | 195 | status_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 | ||
238 | AC_OUTPUT | 203 | AC_OUTPUT |