summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--ext/dbm/extconf.rb8
2 files changed, 8 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 814b4f937e..e11f87ade4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri May 25 00:53:41 2001 Akinori MUSHA <knu@iDaemons.org>
+
+ * ext/dbm/extconf.rb: fix support for *BSD and set $CFLAGS
+ properly.
+
Thu May 24 16:08:21 2001 WATANABE Hirofumi <eban@ruby-lang.org>
* mkconfig.rb: autoconf 2.50 support.
diff --git a/ext/dbm/extconf.rb b/ext/dbm/extconf.rb
index 1c1abd00dc..06556255ac 100644
--- a/ext/dbm/extconf.rb
+++ b/ext/dbm/extconf.rb
@@ -6,7 +6,7 @@ dblib = with_config("dbm-type", nil)
$dbm_conf_headers = {
"db" => ["db.h"],
- "db1" => ["db1/ndbm.h", "db1.h"],
+ "db1" => ["db1/ndbm.h", "db1.h", "ndbm.h"],
"db2" => ["db2/db.h", "db2.h", "db.h"],
"dbm" => ["ndbm.h"],
"gdbm" => ["gdbm-ndbm.h", "gdbm.h"],
@@ -28,12 +28,10 @@ def db_check(db)
if have_func(db_prefix("dbm_open")) || have_library(db, db_prefix("dbm_open"))
for hdr in $dbm_conf_headers.fetch(db, ["ndbm.h"])
if have_header(hdr.dup)
- $CFLAGS = "-DDBM_HDR='<"+hdr+">'"
- break
+ $CFLAGS += " " + hsearch + "-DDBM_HDR='<"+hdr+">'"
+ return true
end
end
- $CFLAGS = hsearch + "-DDBM_HDR='<"+hdr+">'"
- return true
end
return false
end