On Mon, Jan 21, 2002 at 05:04:01PM -0500, Rodent of Unusual Size wrote:
> Thomas Eibner wrote:
> > 
> > Moving around on the way that find-dbm-lib looks for the libs works for
> > me on my Debian box. Is this going to break something else?
> 
> Without testing this patch (my 7.1 system just hung again),
> wouldn't we have to fix the CFLAGS to include "-I/usr/include/gdbm",
> though?

Like this? I had to put the gdbm test after db1 since debian only has
the gdbm-ndbm.h (but it has the db1/ndbm.h)

-- 
  Thomas Eibner <http://thomas.eibner.dk/> DnsZone <http://dnszone.org/>
  mod_pointer <http://stderr.net/mod_pointer> 

Index: src/helpers/find-dbm-lib
===================================================================
RCS file: /home/cvspublic/apache-1.3/src/helpers/find-dbm-lib,v
retrieving revision 1.12
diff -u -r1.12 find-dbm-lib
--- src/helpers/find-dbm-lib    17 Jan 2002 13:20:51 -0000      1.12
+++ src/helpers/find-dbm-lib    21 Jan 2002 22:07:31 -0000
@@ -13,9 +13,7 @@
            *-linux*)
                # many systems don't have -ldbm
                DBM_LIB=""
-               if ./helpers/TestCompile lib dbm dbm_open; then
-                   DBM_LIB="-ldbm"
-               elif ./helpers/TestCompile lib ndbm dbm_open; then
+               if ./helpers/TestCompile lib ndbm dbm_open; then
                    DBM_LIB="-lndbm"
                    if ./helpers/TestCompile lib db1 dbm_open; then
                        # Red Hat needs this; ndbm.h lives in db1
@@ -25,6 +23,11 @@
                    # For Red Hat 7, if not handled by the ndbm case above
                    DBM_LIB="-ldb1"
                    CFLAGS="$CFLAGS -I/usr/include/db1"
+                elif ./helpers/TestCompile lib gdbm dbm_open; then
+                    DBM_LIB="-lgdbm"
+                    CFLAGS="$CFLAGS -I/usr/include/gdbm"
+               elif ./helpers/TestCompile lib dbm dbm_open; then
+                   DBM_LIB="-ldbm"
                fi
                if [ "x$DBM_LIB" != "x" ]; then
                    LIBS="$LIBS $DBM_LIB"

Reply via email to