aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Poznyakoff <gray@gnu.org.ua>2014-02-14 07:34:20 +0000
committerSergey Poznyakoff <gray@gnu.org.ua>2014-02-14 07:34:20 +0000
commit202897fc6cd655c966ede924645f437cdb5afaae (patch)
tree1554eef3e6c262e16738544304d9c93326bb0e99
parentff2c1a2d44c211caa4fd749d2c3b14e7d0c15982 (diff)
downloadgdbm-202897fc6cd655c966ede924645f437cdb5afaae.tar.gz
gdbm-202897fc6cd655c966ede924645f437cdb5afaae.tar.bz2
Optionally install compatibility headers into a separate directory.
* configure.ac: Version 1.11.90 (COMPATINCLUDEDIR): New substitution variable. * compat/Makefile.am (compatincludedir): New variable. (include_HEADERS): Rename to compatinclude_HEADERS. * NEWS: Document COMPATINCLUDEDIR. * README: Likewise.
-rw-r--r--ChangeLog11
-rw-r--r--NEWS18
-rw-r--r--README6
-rw-r--r--compat/Makefile.am5
-rw-r--r--configure.ac6
5 files changed, 38 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index 3321b1f..2c26fbe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2014-02-14 Sergey Poznyakoff <gray@gnu.org.ua>
+
+ Optionally install compatibility headers into a separate directory.
+
+ * configure.ac: Version 1.11.90
+ (COMPATINCLUDEDIR): New substitution variable.
+ * compat/Makefile.am (compatincludedir): New variable.
+ (include_HEADERS): Rename to compatinclude_HEADERS.
+ * NEWS: Document COMPATINCLUDEDIR.
+ * README: Likewise.
+
2014-02-12 Sergey Poznyakoff <gray@gnu.org.ua>
* src/gdbmimp.c (gdbm_import_from_file): Read record sizes as
diff --git a/NEWS b/NEWS
index eff9842..a369e4e 100644
--- a/NEWS
+++ b/NEWS
@@ -1,9 +1,21 @@
-GNU dbm NEWS -- history of user-visible changes. 2013-12-25
-Copyright (C) 1990-2013 Free Software Foundation, Inc.
+GNU dbm NEWS -- history of user-visible changes. 2014-02-14
+Copyright (C) 1990-2014 Free Software Foundation, Inc.
See the end of file for copying conditions.
Please send gdbm bug reports to <bug-gdbm@gnu.org>.
+Version 1.11.90
+
+* New configuration variable COMPATINCLUDEDIR
+
+When used with --enable-libgdbm-compat, this variable points to the
+directory where the headers file dbm.h and ndbm.h will be installed.
+Use this variable to avoid conflicts with already installed headers.
+E.g.:
+
+ ./configure --enable-libgdbm-compat COMPATINCLUDEDIR=/usr/include/gdbm
+
+
Version 1.11, 2013-12-25
* Improved dump format.
@@ -234,7 +246,7 @@ Version 0.9
----------------------------------------------------------------------
Copyright information:
-Copyright (C) 1990-2013 Free Software Foundation, Inc.
+Copyright (C) 1990-2014 Free Software Foundation, Inc.
Permission is granted to anyone to make or distribute verbatim copies
of this document as received, in any medium, provided that the
diff --git a/README b/README
index 0844c87..99e680a 100644
--- a/README
+++ b/README
@@ -36,7 +36,11 @@ if mmap is available. To disable mmap, use --disable-memory-mapped-io.
** --enable-libgdbm-compat
Build and install libgdbm_compat, a compatibility layer which provides
-UNIX-like dbm and ndbm interfaces.
+UNIX-like dbm and ndbm interfaces. It includes two header files:
+dbm.h and ndbm.h, which are installed into $includedir. If you wish
+to install them elsewhere, define the variable COMPATINCLUDEDIR, e.g.
+
+ ./configure --enable-libgdbm-compat COMPATINCLUDEDIR=/usr/include/gdbm
** --enable-gdbm-export
diff --git a/compat/Makefile.am b/compat/Makefile.am
index 42554b6..c1ad4aa 100644
--- a/compat/Makefile.am
+++ b/compat/Makefile.am
@@ -1,5 +1,5 @@
# This file is part of GDBM. -*- Makefile -*-
-# Copyright (C) 2007, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2007, 2011, 2014 Free Software Foundation, Inc.
#
# GDBM is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -25,7 +25,8 @@ VI_AGE = 0
lib_LTLIBRARIES = libgdbm_compat.la
libgdbm_compat_la_LIBADD = ../src/libgdbm.la
-include_HEADERS = dbm.h ndbm.h
+compatincludedir=$(COMPATINCLUDEDIR)
+compatinclude_HEADERS = dbm.h ndbm.h
noinst_HEADERS = dbm-priv.h
DBM_CF=\
diff --git a/configure.ac b/configure.ac
index 4747a7f..a5d32a8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
# This file is part of GDBM. -*- autoconf -*-
-# Copyright (C) 2007, 2009, 2011, 2013 Free Software Foundation, Inc.
+# Copyright (C) 2007, 2009, 2011, 2013, 2014 Free Software Foundation, Inc.
#
# GDBM is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -16,7 +16,7 @@
m4_define([_GDBM_VERSION_MAJOR], 1)
m4_define([_GDBM_VERSION_MINOR], 11)
-dnl m4_define([_GDBM_VERSION_PATCH], 0)
+m4_define([_GDBM_VERSION_PATCH], 90)
AC_INIT([gdbm],
_GDBM_VERSION_MAJOR._GDBM_VERSION_MINOR[]m4_ifdef([_GDBM_VERSION_PATCH],._GDBM_VERSION_PATCH),
@@ -49,6 +49,8 @@ AC_ARG_ENABLE([libgdbm-compat],
[Build and install libgdbm_compat. (Default is NO.)]),
[want_compat=$enableval],
[want_compat=no])
+AC_ARG_VAR([COMPATINCLUDEDIR],[installation directory for dbm.h and ndbm.h])
+test -z "$COMPATINCLUDEDIR" && COMPATINCLUDEDIR='$(includedir)'
AC_ARG_ENABLE([gdbm-export],
AC_HELP_STRING(

Return to:

Send suggestions and report system problems to the System administrator.