Hacks

CVS patchset: 3205
CVS date: 1999/07/26 23:39:34

diff --git a/autogen.sh b/autogen.sh
index e1d0d9d..259c6cf 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,5 +1,8 @@
 #!/bin/sh
 
+export CFLAGS
+export LDFLAGS
+
 LTV="libtoolize (GNU libtool) 1.3.3"
 ACV="Autoconf version 2.13"
 AMV="automake (GNU automake) 1.4"

diff --git a/lib/dbindex.c b/lib/dbindex.c
index f1c7ace..c7a8066 100644 (file)
--- a/lib/dbindex.c
+++ b/lib/dbindex.c
@@ -51,6 +51,9 @@ int dbiGetFirstKey(dbiIndex * dbi, const char ** keyp) {
     DBT key, data;
     int rc;
 
+    if (dbi == NULL || dbi->db == NULL)
+       return 1;
+    
     rc = dbi->db->seq(dbi->db, &key, &data, R_FIRST);
     if (rc) {
        return 1;

diff --git a/perl/Makefile.PL b/perl/Makefile.PL
index befc216..f070fbf 100644 (file)
--- a/perl/Makefile.PL
+++ b/perl/Makefile.PL
@@ -3,11 +3,10 @@ use ExtUtils::MakeMaker;
 # the contents of the Makefile that is written.
 
 WriteMakefile(
-             #'LD'     => 'gcc -shared -Wl,-Bsymbolic',
              'NAME'    => 'rpm',
              'OBJECT'  => 'rpm.o constant.o /usr/lib/libdb1.a',
              'VERSION_FROM' => 'rpm.pm', # finds $VERSION
-             'LIBS'    => ['-lrpm -lz'],   # e.g., '-lm' 
+             'LIBS'    => ['-lrpm -lz -ldb1'],   # e.g., '-lm' 
              'CCFLAGS' => '-Dbool=char -DHAS_BOOL',
              'OPTIMIZE'=> '-g',
              'DEFINE'  => '-Wall',