Attachment 314783 Details for Bug 452212 – rebased patch

[patch] rebased patch

heimdal-1.2-system-sqlite-fixed.patch (text/plain), 1.58 KB, created by Alexander Boström on 2008-08-22 07:48:10 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alexander Boström

Created: 2008-08-22 07:48:10 UTC

Size: 1.58 KB

patch

obsolete

>--- ./lib/krb5/scache.c.systemsqlite	2008-05-23 04:36:09.000000000 +0200
>+++ ./lib/krb5/scache.c	2008-08-15 12:59:01.000000000 +0200
>@@ -32,7 +32,7 @@
>  */
> 
> #include "krb5_locl.h"
>-#include "sqlite3.h"
>+#include <sqlite3.h>
> 
> RCSID("$Id$");
> 
>--- ./lib/krb5/Makefile.am.systemsqlite	2008-08-15 12:58:49.000000000 +0200
>+++ ./lib/krb5/Makefile.am	2008-08-15 12:59:01.000000000 +0200
>@@ -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 \
>--- ./lib/Makefile.am.systemsqlite	2008-05-23 04:37:54.000000000 +0200
>+++ ./lib/Makefile.am	2008-08-15 12:59:01.000000000 +0200
>@@ -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)
>--- ./configure.in.systemsqlite	2008-08-15 12:58:49.000000000 +0200
>+++ ./configure.in	2008-08-15 12:59:01.000000000 +0200
>@@ -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

Actions: View | Diff

Attachments on bug 452212: 314783