Update gnome-vfs partially from OE, removing the krb hack
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1210 311d38ba-8fff-0310-9ca6-ca027cbcb966
This commit is contained in:
parent
02aa1079f8
commit
dec4a3c179
|
@ -0,0 +1,51 @@
|
|||
removes kerberos completely to avoid conflicts with installed kerberos
|
||||
--- configure.in.orig 2007-01-05 19:42:26.418541610 +0200
|
||||
+++ configure.in 2007-01-05 19:42:56.604261797 +0200
|
||||
@@ -436,47 +436,6 @@
|
||||
])
|
||||
AM_CONDITIONAL(HAVE_CDDA, test $have_cdda = yes)
|
||||
AC_SUBST(CDDA_LIBS)
|
||||
-
|
||||
-dnl GSSAPI
|
||||
-dnl Check for Kerberos installation
|
||||
-have_gssapi=no
|
||||
-AC_PATH_PROG([KRB5_CONFIG], krb5-config, none, $PATH:/usr/kerberos/bin)
|
||||
-
|
||||
-if test "x$KRB5_CONFIG" != "xnone"; then
|
||||
- GSSAPI_LIBS="`${KRB5_CONFIG} --libs gssapi`"
|
||||
- GSSAPI_CFLAGS="`${KRB5_CONFIG} --cflags gssapi`"
|
||||
-
|
||||
- saved_CPPFLAGS="$CPPFLAGS"
|
||||
- saved_LIBS="$LIBS"
|
||||
- LIBS="$LIBS $GSSAPI_LIBS"
|
||||
- CPPFLAGS="$CPPFLAGS $GSSAPI_CFLAGS"
|
||||
- # MIT and Heimdal put gssapi.h in different places
|
||||
- AC_CHECK_HEADERS(gssapi/gssapi.h gssapi.h, [
|
||||
- AC_CHECK_FUNCS(gss_init_sec_context, [
|
||||
- AC_MSG_NOTICE([GSSAPI authentication support enabled])
|
||||
- AC_DEFINE(HAVE_GSSAPI, 1, [Define if GSSAPI support is enabled])
|
||||
- AC_CHECK_HEADERS(gssapi/gssapi_generic.h)
|
||||
- have_gssapi=yes
|
||||
-
|
||||
- # MIT Kerberos lacks GSS_C_NT_HOSTBASED_SERVICE
|
||||
- AC_CHECK_DECL([GSS_C_NT_HOSTBASED_SERVICE],,
|
||||
- [AC_DEFINE([GSS_C_NT_HOSTBASED_SERVICE], gss_nt_service_name,
|
||||
- [Define if GSS_C_NT_HOSTBASED_SERVICE is not defined otherwise])
|
||||
- ], [
|
||||
- #ifdef HAVE_GSSAPI_GSSAPI_H
|
||||
- #include <gssapi/gssapi.h>
|
||||
- #else
|
||||
- #include <gssapi.h>
|
||||
- #endif
|
||||
- ])
|
||||
- ])
|
||||
- break
|
||||
- ])
|
||||
- LIBS="$saved_LIBS"
|
||||
- CPPFLAGS="$saved_CPPFLAGS"
|
||||
-fi
|
||||
-AC_SUBST(GSSAPI_LIBS)
|
||||
-AC_SUBST(GSSAPI_CFLAGS)
|
||||
|
||||
dnl ******************************
|
||||
dnl http-method (neon checks)
|
|
@ -1,18 +1,19 @@
|
|||
LICENSE = "GPL"
|
||||
PR = "r3"
|
||||
|
||||
inherit gnome
|
||||
|
||||
DEPENDS = "libxml2 gconf dbus bzip2 gnome-mime-data zlib"
|
||||
RRECOMMENDS = "gnome-vfs-plugin-file gnome-mime-data shared-mime-info"
|
||||
|
||||
# This is to provide compatibility with the gnome-vfs DBus fork
|
||||
RPROVIDES = "gnome-vfs-plugin-dbus"
|
||||
PR = "r4"
|
||||
|
||||
SRC_URI += "file://gconftool-lossage.patch;patch=1;pnum=1"
|
||||
inherit gnome
|
||||
|
||||
# This is to provide compatibility with the gnome-vfs DBus fork
|
||||
PROVIDES = "gnome-vfs-plugin-dbus"
|
||||
RREPLACES = "gnome-vfs-dbus"
|
||||
|
||||
SRC_URI += "file://gconftool-lossage.patch;patch=1;pnum=1 \
|
||||
file://gnome-vfs-no-kerberos.patch;patch=1;pnum=0"
|
||||
|
||||
EXTRA_OECONF = "--disable-openssl --disable-samba"
|
||||
#export KRB5_CONFIG="none"
|
||||
|
||||
FILES_${PN} += " ${libdir}/vfs"
|
||||
FILES_${PN}-dev += " ${libdir}/gnome-vfs-2.0/include"
|
||||
|
|
|
@ -313,6 +313,3 @@ ac_cv_func_mmap_fixed_mapped=${ac_cv_func_mmap_fixed_mapped=yes}
|
|||
|
||||
#dbus
|
||||
ac_cv_have_abstract_sockets=${ac_cv_have_abstract_sockets=no}
|
||||
|
||||
# Nasty hack for gnome-vfs
|
||||
ac_cv_path_KRB5_CONFIG=${ac_cv_path_KRB5_CONFIG=none}
|
||||
|
|
|
@ -252,6 +252,3 @@ jm_cv_func_working_readdir=yes
|
|||
# xorg X11R7
|
||||
ac_cv_sys_linker_h=${ac_cv_sys_linker_h=no}
|
||||
ac_cv_file__usr_share_X11_sgml_defs_ent=${ac_cv_file__usr_share_X11_sgml_defs_ent=no}
|
||||
|
||||
# Nasty hack for gnome-vfs
|
||||
ac_cv_path_KRB5_CONFIG=${ac_cv_path_KRB5_CONFIG=none}
|
||||
|
|
Loading…
Reference in New Issue