1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
|
diff -Naur tmp-old/configure.in tmp-new/configure.in
--- configure.in 2008-06-08 08:06:38.000000000 +0000
+++ configure.in 2008-06-08 08:15:29.000000000 +0000
@@ -104,6 +104,8 @@
KRB_PTHREADS
+PKG_CHECK_MODULES([sqlite], [sqlite3])
+
AC_ARG_ENABLE(dce,
AS_HELP_STRING([--enable-dce],[if you want support for DCE/DFS PAG's]))
if test "$enable_dce" = yes; then
diff -Naur tmp-old/lib/Makefile.am tmp-new/lib/Makefile.am
--- lib/Makefile.am 2008-06-07 16:53:11.000000000 +0000
+++ lib/Makefile.am 2008-06-07 16:55:58.000000000 +0000
@@ -18,6 +18,6 @@
dir_hcrypto = hcrypto
endif
-SUBDIRS = roken vers editline $(dir_com_err) sl wind asn1 sqlite \
+SUBDIRS = roken vers editline $(dir_com_err) sl wind asn1 \
$(dir_hcrypto) hx509 krb5 ntlm kafs gssapi hdb kadm5 \
auth $(dir_45) $(dir_otp) $(dir_dce)
diff -Naur tmp-old/lib/krb5/Makefile.am tmp-new/lib/krb5/Makefile.am
--- lib/krb5/Makefile.am 2008-06-07 16:54:02.000000000 +0000
+++ lib/krb5/Makefile.am 2008-06-08 08:17:00.000000000 +0000
@@ -2,7 +2,7 @@
include $(top_srcdir)/Makefile.am.common
-AM_CPPFLAGS += $(INCLUDE_krb4) $(INCLUDE_hcrypto) -I../com_err -I$(srcdir)/../com_err -I$(srcdir)/../sqlite
+AM_CPPFLAGS += $(INCLUDE_krb4) $(INCLUDE_hcrypto) -I../com_err -I$(srcdir)/../com_err $(sqlite_CFLAGS)
bin_PROGRAMS = verify_krb5_conf
@@ -53,7 +53,7 @@
libkrb5_la_LIBADD = \
$(LIB_pkinit) \
- ../sqlite/libsqlite.la \
+ $(sqlite_LIBS) \
$(LIB_com_err) \
$(LIB_hcrypto) \
$(top_builddir)/lib/asn1/libasn1.la \
diff -Naur tmp-old/lib/krb5/scache.c tmp-new/lib/krb5/scache.c
--- lib/krb5/scache.c 2008-06-07 16:54:30.000000000 +0000
+++ lib/krb5/scache.c 2008-06-07 17:01:43.000000000 +0000
@@ -32,7 +32,7 @@
*/
#include "krb5_locl.h"
-#include "sqlite3.h"
+#include <sqlite3.h>
RCSID("$Id: heimdal-system_sqlite.patch,v 1.1 2008/06/11 07:27:47 mueli Exp $");
|
