Attachment #23787 for bug #38149

View | Details | Raw Unified | Return to bug 38149
Collapse All | Expand All

Lines 9-14 Link Here

(-)/var/tmp/portage/lufs-0.9.7-r1/work/lufs-0.9.7/config.h.in (+3 lines)
9	/* Define if libchipcard is present. */	9	/* Define if libchipcard is present. */
10	#undef HAS_LIBCHIPCARD	10	#undef HAS_LIBCHIPCARD
11		11
		12	/* Define if using libgnome-2 rather than 1. */
		13	#undef HAS_LIBGNOME_2
		14
12	/* Define if ssh is found. */	15	/* Define if ssh is found. */
13	#undef HAS_SSH	16	#undef HAS_SSH
14		17




dnl Checking gnome
AC_CHECK_PROG(GCONF, gnome-config, gnome-config)
AC_CHECK_PROG(GVFSCONF, gnome-vfs-config, gnome-vfs-config)
AC_CHECK_PROG(PKGCONF, pkg-config, pkg-config)
AC_CHECK_LIB(gnomevfs, gnome_vfs_init, HAS_GNOMEVFS=1,)
AC_CHECK_LIB(gnomevfs-2, gnome_vfs_init, HAS_GNOMEVFS2=1,`$PKGCONF --libs-only-l gnome-vfs-2.0`)
if test "$GCONF" -a "$GVFSCONF" -a "$HAS_GNOMEVFS"
then
    AC_DEFINE([HAS_GVFS], 1, [Define if gvfs is to be built.])

    GVFS_LDADD="`$GCONF --libs gnome` `$GVFSCONF --libs`"
    GVFS_CFLAGS="`$GCONF --cflags gnome` `$GVFSCONF --cflags`"
    opt_fs="$opt_fs gvfs"
elif test "$PKGCONF" -a "$HAS_GNOMEVFS2"
then
    AC_DEFINE([HAS_GVFS], 1, [Define if gvfs is to be built.])
    AC_DEFINE([HAS_LIBGNOME_2], 1, [Define if using libgnome-2 rather than 1.])
    define_has_libgnome_2="#define HAS_LIBGNOME_2"
    AC_SUBST(define_has_libgnome_2)

    GVFS_LDADD="`$PKGCONF --libs libgnome-2.0` `$PKGCONF --libs gnome-vfs-2.0`"
    GVFS_CFLAGS="`$PKGCONF --cflags libgnome-2.0` `$PKGCONF --cflags gnome-vfs-2.0`"
    opt_fs="$opt_fs gvfs"
fi
AC_SUBST(GVFS_LDADD)
AC_SUBST(GVFS_CFLAGS)

Lines 36-43 Link Here

(-)/var/tmp/portage/lufs-0.9.7-r1/work/lufs-0.9.7/filesystems/gvfs/gvfs.cpp (+9 lines)
36	#include <lufs/fs.h>	36	#include <lufs/fs.h>
37		37
38	#include "gvfs.h"	38	#include "gvfs.h"
		39	#include "config.h"
39		40
		41	#ifdef HAS_LIBGNOME_2
		42	#include <libgnome/libgnome.h>
		43	#else
40	#include <gnome.h>	44	#include <gnome.h>
		45	#endif
41	#include <libgnomevfs/gnome-vfs.h>	46	#include <libgnomevfs/gnome-vfs.h>
42		47
43	extern "C" {	48	extern "C" {
Lines 275-281 GVFS::do_readdir(char* d, struct directo Link Here
275	goto out_uri;	280	goto out_uri;
276	}	281	}
277		282
		283	#ifdef HAS_LIBGNOME_2
		284	if(gnome_vfs_directory_open_from_uri(&dir, uri, GNOME_VFS_FILE_INFO_DEFAULT) != GNOME_VFS_OK){
		285	#else
278	if(gnome_vfs_directory_open_from_uri(&dir, uri, GNOME_VFS_FILE_INFO_DEFAULT, NULL) != GNOME_VFS_OK){	286	if(gnome_vfs_directory_open_from_uri(&dir, uri, GNOME_VFS_FILE_INFO_DEFAULT, NULL) != GNOME_VFS_OK){
		287	#endif
279	WARN("could not open directory!");	288	WARN("could not open directory!");
280	goto out_info;	289	goto out_info;
281	}	290	}

Return to bug 38149

Lines 164-170 AC_SUBST(SSHPROG) Link Here

(-)/var/tmp/portage/lufs-0.9.7-r1/work/lufs-0.9.7/configure.in (+12 lines)
164	dnl Checking gnome	164	dnl Checking gnome
165	AC_CHECK_PROG(GCONF, gnome-config, gnome-config)	165	AC_CHECK_PROG(GCONF, gnome-config, gnome-config)
166	AC_CHECK_PROG(GVFSCONF, gnome-vfs-config, gnome-vfs-config)	166	AC_CHECK_PROG(GVFSCONF, gnome-vfs-config, gnome-vfs-config)
		167	AC_CHECK_PROG(PKGCONF, pkg-config, pkg-config)
167	AC_CHECK_LIB(gnomevfs, gnome_vfs_init, HAS_GNOMEVFS=1,)	168	AC_CHECK_LIB(gnomevfs, gnome_vfs_init, HAS_GNOMEVFS=1,)
		169	AC_CHECK_LIB(gnomevfs-2, gnome_vfs_init, HAS_GNOMEVFS2=1,`$PKGCONF --libs-only-l gnome-vfs-2.0`)
168	if test "$GCONF" -a "$GVFSCONF" -a "$HAS_GNOMEVFS"	170	if test "$GCONF" -a "$GVFSCONF" -a "$HAS_GNOMEVFS"
169	then	171	then
170	AC_DEFINE([HAS_GVFS], 1, [Define if gvfs is to be built.])	172	AC_DEFINE([HAS_GVFS], 1, [Define if gvfs is to be built.])
Lines 172-177 then Link Here
172	GVFS_LDADD="`$GCONF --libs gnome` `$GVFSCONF --libs`"	174	GVFS_LDADD="`$GCONF --libs gnome` `$GVFSCONF --libs`"
173	GVFS_CFLAGS="`$GCONF --cflags gnome` `$GVFSCONF --cflags`"	175	GVFS_CFLAGS="`$GCONF --cflags gnome` `$GVFSCONF --cflags`"
174	opt_fs="$opt_fs gvfs"	176	opt_fs="$opt_fs gvfs"
		177	elif test "$PKGCONF" -a "$HAS_GNOMEVFS2"
		178	then
		179	AC_DEFINE([HAS_GVFS], 1, [Define if gvfs is to be built.])
		180	AC_DEFINE([HAS_LIBGNOME_2], 1, [Define if using libgnome-2 rather than 1.])
		181	define_has_libgnome_2="#define HAS_LIBGNOME_2"
		182	AC_SUBST(define_has_libgnome_2)
		183
		184	GVFS_LDADD="`$PKGCONF --libs libgnome-2.0` `$PKGCONF --libs gnome-vfs-2.0`"
		185	GVFS_CFLAGS="`$PKGCONF --cflags libgnome-2.0` `$PKGCONF --cflags gnome-vfs-2.0`"
		186	opt_fs="$opt_fs gvfs"
175	fi	187	fi
176	AC_SUBST(GVFS_LDADD)	188	AC_SUBST(GVFS_LDADD)
177	AC_SUBST(GVFS_CFLAGS)	189	AC_SUBST(GVFS_CFLAGS)