]>
Commit | Line | Data |
---|---|---|
44707fd2 JB |
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 @@ | |
45c9b47c | 4 | #include <grp.h> |
03da3507 | 5 | |
44707fd2 | 6 | #if defined(HAVE_DBM) || defined(HAVE_BDB_DBM) |
45c9b47c | 7 | -# if HAVE_NDBM_H |
03da3507 | 8 | -# include <ndbm.h> |
44707fd2 JB |
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 | |
6a4c3728 JB |
18 | --- inn-2.5.3/m4/berkeleydb.m4.orig 2013-06-11 21:16:28.320439059 +0200 |
19 | +++ inn-2.5.3/m4/berkeleydb.m4 2013-06-11 20:36:38.617155533 +0200 | |
20 | @@ -33,8 +33,13 @@ | |
21 | if test x"$DB_DIR" = xyes ; then | |
22 | AC_MSG_ERROR([cannot find Berkeley DB]) | |
44707fd2 | 23 | else |
6a4c3728 JB |
24 | + if test x"$DB_DIR" = x"/usr" ; then |
25 | + DB_CPPFLAGS= | |
26 | + DB_LDFLAGS= | |
44707fd2 | 27 | + else |
6a4c3728 JB |
28 | DB_CPPFLAGS="-I$DB_DIR/include" |
29 | DB_LDFLAGS="-L$DB_DIR/lib" | |
44707fd2 | 30 | + fi |
6a4c3728 JB |
31 | DB_LIBS="-ldb" |
32 | AC_MSG_RESULT([$DB_DIR]) | |
44707fd2 | 33 | fi |
6a4c3728 JB |
34 | --- inn-2.5.3/configure.ac.orig 2013-06-11 21:17:03.440438325 +0200 |
35 | +++ inn-2.5.3/configure.ac 2013-06-11 21:47:46.747066572 +0200 | |
36 | @@ -384,10 +384,6 @@ | |
37 | stdint.h string.h sys/bitypes.h sys/filio.h sys/loadavg.h \ | |
38 | sys/select.h sys/time.h unistd.h]) | |
03da3507 | 39 | |
2566fb4c | 40 | -dnl Some Linux systems have db1/ndbm.h instead of ndbm.h. Others have |
45c9b47c | 41 | -dnl gdbm-ndbm.h. |
6a4c3728 | 42 | -AC_CHECK_HEADERS([ndbm.h db1/ndbm.h gdbm-ndbm.h], [break]) |
03da3507 | 43 | - |
6a4c3728 JB |
44 | dnl Check for whether various symbols are declared. |
45 | AC_CHECK_DECLS([pread, pwrite, snprintf, setproctitle, strlcat, | |
46 | strlcpy, vsnprintf]) |