inn-db.patch

   1 --- inn-2.4.4/authprogs/ckpasswd.c.orig 2008-05-05 12:18:36.000000000 +0200
   2 +++ inn-2.4.4/authprogs/ckpasswd.c      2008-06-12 23:17:16.157845226 +0200
   3 @@ -26,11 +26,11 @@
   4  #include <grp.h>
   5
   6  #if defined(HAVE_DBM) || defined(HAVE_BDB_DBM)
   7 -# if HAVE_NDBM_H
   8 -#  include <ndbm.h>
   9 -# elif HAVE_BDB_DBM
  10 +# if HAVE_BDB_DBM
  11  #  define DB_DBM_HSEARCH 1
  12  #  include <db.h>
  13 +# elif HAVE_NDBM_H
  14 +#  include <ndbm.h>
  15  # elif HAVE_GDBM_NDBM_H
  16  #  include <gdbm-ndbm.h>
  17  # elif HAVE_DB1_NDBM_H
  18 --- inn-2.4.4/configure.in.orig 2008-05-05 12:18:36.000000000 +0200
  19 +++ inn-2.4.4/configure.in      2008-06-12 23:24:11.005485208 +0200
  20 @@ -670,8 +670,13 @@
  21              fi
  22          fi
  23      else
  24 +       if test "$BERKELEY_DB_DIR" = "/usr" ; then
  25 +        BERKELEY_DB_LDFLAGS=
  26 +        BERKELEY_DB_CFLAGS=
  27 +       else
  28          BERKELEY_DB_LDFLAGS="-L$BERKELEY_DB_DIR/lib"
  29          BERKELEY_DB_CFLAGS="-I$BERKELEY_DB_DIR/include"
  30 +       fi
  31          BERKELEY_DB_LIB="-ldb"
  32          AC_MSG_RESULT($BERKELEY_DB_DIR)
  33      fi
  34 @@ -993,17 +998,11 @@
  35  AC_HEADER_SYS_WAIT
  36
  37  dnl Generic checks for header files.
  38 -AC_CHECK_HEADERS(crypt.h inttypes.h limits.h ndbm.h pam/pam_appl.h stdbool.h \
  39 +AC_CHECK_HEADERS(crypt.h inttypes.h limits.h pam/pam_appl.h stdbool.h \
  40                   stddef.h stdint.h string.h sys/bitypes.h sys/filio.h \
  41                   sys/loadavg.h sys/param.h sys/select.h sys/sysinfo.h \
  42                   sys/time.h unistd.h)
  43
  44 -dnl Some Linux systems have db1/ndbm.h instead of ndbm.h.  Others have
  45 -dnl gdbm-ndbm.h.
  46 -if test x"$ac_cv_header_ndbm_h" = xno ; then
  47 -    AC_CHECK_HEADERS(db1/ndbm.h gdbm-ndbm.h)
  48 -fi
  49 -
  50  dnl Check to see if herrno is declared.
  51  AC_DEFUN([INN_NEED_HERRNO_DECLARATION],
  52  [AC_CACHE_CHECK([whether h_errno must be declared], inn_cv_herrno_need_decl,