From fd2e0e3dac68bd45fac8a51abf76408383ef0452 Mon Sep 17 00:00:00 2001 From: akr Date: Thu, 23 Feb 2012 03:23:40 +0000 Subject: * ext/dbm/extconf.rb: use DBM_SUFFIX only to detect header of Berkeley DB. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@34760 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ext/dbm/extconf.rb | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'ext') diff --git a/ext/dbm/extconf.rb b/ext/dbm/extconf.rb index e821690f93..00ac1a804c 100644 --- a/ext/dbm/extconf.rb +++ b/ext/dbm/extconf.rb @@ -148,12 +148,10 @@ def headers.db_check2(db, hdr) return false end - # Berkeley DB's ndbm.h (since 1.85 at least) includes db.h and - # it defines _DB_H_. - have_db_header = have_macro('_DB_H_', hdr, hsearch) - - # Mac OS X uses Berkeley DB 1 but ndbm.h doesn't include db.h. - have_db_header |= have_macro('DBM_SUFFIX', hdr, hsearch) + # Berkeley DB's ndbm.h (since 1.85 at least) defines DBM_SUFFIX. + # Note that _DB_H_ is not defined on Mac OS X because + # it uses Berkeley DB 1 but ndbm.h doesn't include db.h. + have_db_header = have_macro('DBM_SUFFIX', hdr, hsearch) # Old GDBM's ndbm.h, until 1.8.3, defines dbm_clearerr as a macro which # expands to no tokens. -- cgit v1.2.3