diff options
| author | Manoj Srivastava <srivasta@golden-gryphon.com> | 2014-04-27 18:05:39 -0700 |
|---|---|---|
| committer | Manoj Srivastava <srivasta@golden-gryphon.com> | 2014-04-27 18:05:39 -0700 |
| commit | 7d4c02d5c9108aa413fbb0ffa1dc8a39bc5f54a1 (patch) | |
| tree | 2abb9ad01d397bc1e208f57f528c1ec529761392 /mcon/U/i_ndbm.U | |
| parent | 5c913c35c09a82eead2c07534baa709a5dead3e7 (diff) | |
| parent | 8f5e5726134ce5b4bd436b16f367796d851df553 (diff) | |
Merge branch 'upstream'
Signed-off-by: Manoj Srivastava <srivasta@golden-gryphon.com>
Conflicts:
jmake/jmake.man
Diffstat (limited to 'mcon/U/i_ndbm.U')
| -rw-r--r-- | mcon/U/i_ndbm.U | 40 |
1 files changed, 18 insertions, 22 deletions
diff --git a/mcon/U/i_ndbm.U b/mcon/U/i_ndbm.U index f2b6aa7..42c30cb 100644 --- a/mcon/U/i_ndbm.U +++ b/mcon/U/i_ndbm.U @@ -1,11 +1,11 @@ -?RCS: $Id: i_ndbm.U 1 2006-08-24 12:32:52Z rmanfredi $ +?RCS: $Id: i_ndbm.U 167 2013-05-08 17:58:00Z rmanfredi $ ?RCS: ?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ?RCS: -?RCS: You may redistribute only under the terms of the Artistic Licence, +?RCS: You may redistribute only under the terms of the Artistic License, ?RCS: as specified in the README file that comes with the distribution. ?RCS: You may reuse parts of this distribution only within the terms of -?RCS: that same Artistic Licence; a copy of which may be found at the root +?RCS: that same Artistic License; a copy of which may be found at the root ?RCS: of the source tree for dist 4.0. ?RCS: ?RCS: $Log: i_ndbm.U,v $ @@ -15,7 +15,7 @@ ?RCS: Revision 3.0 1993/08/18 12:08:23 ram ?RCS: Baseline for dist 3.0 netwide release. ?RCS: -?MAKE:i_ndbm: Inhdr Inlibc Setvar +?MAKE:i_ndbm: Inhdr Trylink Setvar cat ?MAKE: -pick add $@ %< ?S:i_ndbm (d_ndbm): ?S: This variable conditionally defines the I_NDBM symbol, which @@ -28,26 +28,22 @@ ?C:. ?H:#$i_ndbm I_NDBM /**/ ?H:. -?T:t_ndbm d_dbm_open +?T:d_dbm_open ?LINT:set i_ndbm : see if ndbm.h is available -?X: t_ndbm is a tentative check. We might just have the .h, not the lib -- ADO -set ndbm.h t_ndbm -eval $inhdr -case "$t_ndbm" in -$define) - : see if dbm_open exists - set dbm_open d_dbm_open - eval $inlibc - case "$d_dbm_open" in - $undef) - t_ndbm="$undef" - echo "We won't be including <ndbm.h>" - ;; - esac - ;; -esac -val="$t_ndbm" +$cat >try.c <<EOC +#include <ndbm.h> +int main(void) +{ + static DBM *dbm; + dbm = dbm_open("file", 1, 2); + return dbm ? 0 : 1; +} +EOC +set d_dbm_open +eval $trylink + +val="$d_dbm_open" set i_ndbm eval $setvar |