Author: jannis Date: 2009-06-20 02:26:54 +0000 (Sat, 20 Jun 2009) New Revision: 30061
Removed: thunar/branches/migration-to-gio/docs/reference/thunar-vfs/Makefile.am thunar/branches/migration-to-gio/docs/reference/thunar-vfs/thunar-vfs-docs.sgml thunar/branches/migration-to-gio/docs/reference/thunar-vfs/thunar-vfs-overrides.txt thunar/branches/migration-to-gio/docs/reference/thunar-vfs/thunar-vfs-sections.txt thunar/branches/migration-to-gio/docs/reference/thunar-vfs/thunar-vfs.types thunar/branches/migration-to-gio/docs/reference/thunar-vfs/tmpl/thunar-vfs-group.sgml thunar/branches/migration-to-gio/docs/reference/thunar-vfs/tmpl/thunar-vfs-info.sgml thunar/branches/migration-to-gio/docs/reference/thunar-vfs/tmpl/thunar-vfs-init-shutdown.sgml thunar/branches/migration-to-gio/docs/reference/thunar-vfs/tmpl/thunar-vfs-interactive-job.sgml thunar/branches/migration-to-gio/docs/reference/thunar-vfs/tmpl/thunar-vfs-job.sgml thunar/branches/migration-to-gio/docs/reference/thunar-vfs/tmpl/thunar-vfs-jobs.sgml thunar/branches/migration-to-gio/docs/reference/thunar-vfs/tmpl/thunar-vfs-mime-action.sgml thunar/branches/migration-to-gio/docs/reference/thunar-vfs/tmpl/thunar-vfs-mime-application.sgml thunar/branches/migration-to-gio/docs/reference/thunar-vfs/tmpl/thunar-vfs-mime-database.sgml thunar/branches/migration-to-gio/docs/reference/thunar-vfs/tmpl/thunar-vfs-mime-handler.sgml thunar/branches/migration-to-gio/docs/reference/thunar-vfs/tmpl/thunar-vfs-mime-info.sgml thunar/branches/migration-to-gio/docs/reference/thunar-vfs/tmpl/thunar-vfs-monitor.sgml thunar/branches/migration-to-gio/docs/reference/thunar-vfs/tmpl/thunar-vfs-operations.sgml thunar/branches/migration-to-gio/docs/reference/thunar-vfs/tmpl/thunar-vfs-path.sgml thunar/branches/migration-to-gio/docs/reference/thunar-vfs/tmpl/thunar-vfs-thumb-factory.sgml thunar/branches/migration-to-gio/docs/reference/thunar-vfs/tmpl/thunar-vfs-thumb.sgml thunar/branches/migration-to-gio/docs/reference/thunar-vfs/tmpl/thunar-vfs-trash-info.sgml thunar/branches/migration-to-gio/docs/reference/thunar-vfs/tmpl/thunar-vfs-trash-manager.sgml thunar/branches/migration-to-gio/docs/reference/thunar-vfs/tmpl/thunar-vfs-trash.sgml thunar/branches/migration-to-gio/docs/reference/thunar-vfs/tmpl/thunar-vfs-types.sgml thunar/branches/migration-to-gio/docs/reference/thunar-vfs/tmpl/thunar-vfs-uri.sgml thunar/branches/migration-to-gio/docs/reference/thunar-vfs/tmpl/thunar-vfs-user-manager.sgml thunar/branches/migration-to-gio/docs/reference/thunar-vfs/tmpl/thunar-vfs-user.sgml thunar/branches/migration-to-gio/docs/reference/thunar-vfs/tmpl/thunar-vfs-util.sgml thunar/branches/migration-to-gio/docs/reference/thunar-vfs/tmpl/thunar-vfs-volume-manager.sgml thunar/branches/migration-to-gio/docs/reference/thunar-vfs/tmpl/thunar-vfs-volume.sgml thunar/branches/migration-to-gio/docs/reference/thunar-vfs/version.xml.in thunar/branches/migration-to-gio/thunar-vfs/Makefile.am thunar/branches/migration-to-gio/thunar-vfs/abicheck.sh thunar/branches/migration-to-gio/thunar-vfs/make-thunar-vfs-alias.pl thunar/branches/migration-to-gio/thunar-vfs/thunar-vfs-1.pc.in thunar/branches/migration-to-gio/thunar-vfs/thunar-vfs-config.c thunar/branches/migration-to-gio/thunar-vfs/thunar-vfs-config.h.in thunar/branches/migration-to-gio/thunar-vfs/thunar-vfs-deep-count-job.c thunar/branches/migration-to-gio/thunar-vfs/thunar-vfs-deep-count-job.h thunar/branches/migration-to-gio/thunar-vfs/thunar-vfs-exec.c thunar/branches/migration-to-gio/thunar-vfs/thunar-vfs-exec.h thunar/branches/migration-to-gio/thunar-vfs/thunar-vfs-font-thumbnailer-1.desktop.in thunar/branches/migration-to-gio/thunar-vfs/thunar-vfs-font-thumbnailer.c thunar/branches/migration-to-gio/thunar-vfs/thunar-vfs-info.c thunar/branches/migration-to-gio/thunar-vfs/thunar-vfs-info.h thunar/branches/migration-to-gio/thunar-vfs/thunar-vfs-interactive-job.c thunar/branches/migration-to-gio/thunar-vfs/thunar-vfs-interactive-job.h thunar/branches/migration-to-gio/thunar-vfs/thunar-vfs-io-jobs.c thunar/branches/migration-to-gio/thunar-vfs/thunar-vfs-io-jobs.h thunar/branches/migration-to-gio/thunar-vfs/thunar-vfs-io-local-xfer.c thunar/branches/migration-to-gio/thunar-vfs/thunar-vfs-io-local-xfer.h thunar/branches/migration-to-gio/thunar-vfs/thunar-vfs-io-local.c thunar/branches/migration-to-gio/thunar-vfs/thunar-vfs-io-local.h thunar/branches/migration-to-gio/thunar-vfs/thunar-vfs-io-ops.c thunar/branches/migration-to-gio/thunar-vfs/thunar-vfs-io-ops.h thunar/branches/migration-to-gio/thunar-vfs/thunar-vfs-io-scandir.c thunar/branches/migration-to-gio/thunar-vfs/thunar-vfs-io-scandir.h thunar/branches/migration-to-gio/thunar-vfs/thunar-vfs-io-trash.c thunar/branches/migration-to-gio/thunar-vfs/thunar-vfs-io-trash.h thunar/branches/migration-to-gio/thunar-vfs/thunar-vfs-job-private.h thunar/branches/migration-to-gio/thunar-vfs/thunar-vfs-job.c thunar/branches/migration-to-gio/thunar-vfs/thunar-vfs-job.h thunar/branches/migration-to-gio/thunar-vfs/thunar-vfs-marshal.list thunar/branches/migration-to-gio/thunar-vfs/thunar-vfs-mime-action-private.h thunar/branches/migration-to-gio/thunar-vfs/thunar-vfs-mime-action.c thunar/branches/migration-to-gio/thunar-vfs/thunar-vfs-mime-action.h thunar/branches/migration-to-gio/thunar-vfs/thunar-vfs-mime-application.c thunar/branches/migration-to-gio/thunar-vfs/thunar-vfs-mime-application.h thunar/branches/migration-to-gio/thunar-vfs/thunar-vfs-mime-cache.c thunar/branches/migration-to-gio/thunar-vfs/thunar-vfs-mime-cache.h thunar/branches/migration-to-gio/thunar-vfs/thunar-vfs-mime-cleaner.c thunar/branches/migration-to-gio/thunar-vfs/thunar-vfs-mime-database-private.h thunar/branches/migration-to-gio/thunar-vfs/thunar-vfs-mime-database.c thunar/branches/migration-to-gio/thunar-vfs/thunar-vfs-mime-database.h thunar/branches/migration-to-gio/thunar-vfs/thunar-vfs-mime-handler-private.h thunar/branches/migration-to-gio/thunar-vfs/thunar-vfs-mime-handler.c thunar/branches/migration-to-gio/thunar-vfs/thunar-vfs-mime-handler.h thunar/branches/migration-to-gio/thunar-vfs/thunar-vfs-mime-info.c thunar/branches/migration-to-gio/thunar-vfs/thunar-vfs-mime-info.h thunar/branches/migration-to-gio/thunar-vfs/thunar-vfs-mime-legacy.c thunar/branches/migration-to-gio/thunar-vfs/thunar-vfs-mime-legacy.h thunar/branches/migration-to-gio/thunar-vfs/thunar-vfs-mime-parser.c thunar/branches/migration-to-gio/thunar-vfs/thunar-vfs-mime-parser.h thunar/branches/migration-to-gio/thunar-vfs/thunar-vfs-mime-provider.c thunar/branches/migration-to-gio/thunar-vfs/thunar-vfs-mime-provider.h thunar/branches/migration-to-gio/thunar-vfs/thunar-vfs-mime-sniffer.c thunar/branches/migration-to-gio/thunar-vfs/thunar-vfs-mime-sniffer.h thunar/branches/migration-to-gio/thunar-vfs/thunar-vfs-monitor-private.h thunar/branches/migration-to-gio/thunar-vfs/thunar-vfs-monitor.c thunar/branches/migration-to-gio/thunar-vfs/thunar-vfs-monitor.h thunar/branches/migration-to-gio/thunar-vfs/thunar-vfs-os-bsd.c thunar/branches/migration-to-gio/thunar-vfs/thunar-vfs-os-generic.c thunar/branches/migration-to-gio/thunar-vfs/thunar-vfs-os.h thunar/branches/migration-to-gio/thunar-vfs/thunar-vfs-path-private.h thunar/branches/migration-to-gio/thunar-vfs/thunar-vfs-path.c thunar/branches/migration-to-gio/thunar-vfs/thunar-vfs-path.h thunar/branches/migration-to-gio/thunar-vfs/thunar-vfs-pixbuf-thumbnailer.c thunar/branches/migration-to-gio/thunar-vfs/thunar-vfs-private.c thunar/branches/migration-to-gio/thunar-vfs/thunar-vfs-private.h thunar/branches/migration-to-gio/thunar-vfs/thunar-vfs-simple-job.c thunar/branches/migration-to-gio/thunar-vfs/thunar-vfs-simple-job.h thunar/branches/migration-to-gio/thunar-vfs/thunar-vfs-thumb-jpeg.c thunar/branches/migration-to-gio/thunar-vfs/thunar-vfs-thumb-jpeg.h thunar/branches/migration-to-gio/thunar-vfs/thunar-vfs-thumb-private.h thunar/branches/migration-to-gio/thunar-vfs/thunar-vfs-thumb.c thunar/branches/migration-to-gio/thunar-vfs/thunar-vfs-thumb.h thunar/branches/migration-to-gio/thunar-vfs/thunar-vfs-transfer-job.c thunar/branches/migration-to-gio/thunar-vfs/thunar-vfs-transfer-job.h thunar/branches/migration-to-gio/thunar-vfs/thunar-vfs-types.h thunar/branches/migration-to-gio/thunar-vfs/thunar-vfs-update-thumbnailers-cache.c thunar/branches/migration-to-gio/thunar-vfs/thunar-vfs-user.c thunar/branches/migration-to-gio/thunar-vfs/thunar-vfs-user.h thunar/branches/migration-to-gio/thunar-vfs/thunar-vfs-util.c thunar/branches/migration-to-gio/thunar-vfs/thunar-vfs-util.h thunar/branches/migration-to-gio/thunar-vfs/thunar-vfs-volume-freebsd.c thunar/branches/migration-to-gio/thunar-vfs/thunar-vfs-volume-freebsd.h thunar/branches/migration-to-gio/thunar-vfs/thunar-vfs-volume-hal.c thunar/branches/migration-to-gio/thunar-vfs/thunar-vfs-volume-hal.h thunar/branches/migration-to-gio/thunar-vfs/thunar-vfs-volume-manager.c thunar/branches/migration-to-gio/thunar-vfs/thunar-vfs-volume-none.c thunar/branches/migration-to-gio/thunar-vfs/thunar-vfs-volume-none.h thunar/branches/migration-to-gio/thunar-vfs/thunar-vfs-volume-private.h thunar/branches/migration-to-gio/thunar-vfs/thunar-vfs-volume.c thunar/branches/migration-to-gio/thunar-vfs/thunar-vfs-volume.h thunar/branches/migration-to-gio/thunar-vfs/thunar-vfs.c thunar/branches/migration-to-gio/thunar-vfs/thunar-vfs.h thunar/branches/migration-to-gio/thunar-vfs/thunar-vfs.symbols Modified: thunar/branches/migration-to-gio/ChangeLog thunar/branches/migration-to-gio/Makefile.am thunar/branches/migration-to-gio/acinclude.m4 thunar/branches/migration-to-gio/configure.in.in thunar/branches/migration-to-gio/docs/reference/Makefile.am Log: * Remove thunar-vfs. There might be some pieces left which will be cleaned up next. Update the list of functions and headers the configure script checks because a lot of them were only required for thunar-vfs. Modified: thunar/branches/migration-to-gio/ChangeLog =================================================================== --- thunar/branches/migration-to-gio/ChangeLog 2009-06-20 02:06:48 UTC (rev 30060) +++ thunar/branches/migration-to-gio/ChangeLog 2009-06-20 02:26:54 UTC (rev 30061) @@ -1,5 +1,12 @@ 2009-06-20 Jannis Pohlmann <jan...@xfce.org> + * Remove thunar-vfs. There might be some pieces left which will be + cleaned up next. Update the list of functions and headers the + configure script checks because a lot of them were only required for + thunar-vfs. + +2009-06-20 Jannis Pohlmann <jan...@xfce.org> + * Makefile.am, configure.in.in, plugins/, thunarx/, thunar/: thunarx-1 is dead, long live thunarx-2. thunarx-2 introduces three new functions: thunarx_file_info_get_file_info() which returns the Modified: thunar/branches/migration-to-gio/Makefile.am =================================================================== --- thunar/branches/migration-to-gio/Makefile.am 2009-06-20 02:06:48 UTC (rev 30060) +++ thunar/branches/migration-to-gio/Makefile.am 2009-06-20 02:26:54 UTC (rev 30061) @@ -7,7 +7,6 @@ po-doc \ tdb \ thunarx \ - thunar-vfs \ thunar \ tests \ docs \ Modified: thunar/branches/migration-to-gio/acinclude.m4 =================================================================== --- thunar/branches/migration-to-gio/acinclude.m4 2009-06-20 02:06:48 UTC (rev 30060) +++ thunar/branches/migration-to-gio/acinclude.m4 2009-06-20 02:26:54 UTC (rev 30061) @@ -112,159 +112,3 @@ fi fi ]) - - -dnl # BM_THUNAR_VFS_MONITOR_IMPL() -dnl # -dnl # Determine the file system monitoring to use for -dnl # thunar-vfs. -dnl # -dnl # Sets LIBFAM_CFLAGS and LIBFAM_LIBS and defines -dnl # HAVE_FAM_H and HAVE_LIBFAM if FAM/Gamin were -dnl # found. -dnl # -dnl # Sets $ac_bm_thunar_vfs_monitor_impl to "FAM", -dnl # "Gamin" or "none". -dnl # -AC_DEFUN([BM_THUNAR_VFS_MONITOR_IMPL], -[ -LIBFAM_CFLAGS="" -LIBFAM_LIBS="" -have_libfam=no -ac_bm_thunar_vfs_monitor_impl="none" -XDT_CHECK_PACKAGE([LIBFAM], [gamin], [0.1.0], -[ - have_libfam=yes - ac_bm_thunar_vfs_monitor_impl="Gamin" -], -[ - dnl Fallback to a generic FAM check - AC_CHECK_HEADERS([fam.h], - [ - AC_CHECK_LIB([fam], [FAMOpen], - [ - have_libfam="yes" LIBFAM_LIBS="-lfam" - ac_bm_thunar_vfs_monitor_impl="FAM" - ]) - ]) -]) -if test x"$have_libfam" = x"yes"; then - dnl Define appropriate symbols - AC_DEFINE([HAVE_FAM_H], [1], [Define to 1 if you have the <fam.h> header file.]) - AC_DEFINE([HAVE_LIBFAM], [1], [Define to 1 if the File Alteration Monitor is available.]) - - dnl Check for FAMNoExists (currently Gamin only) - save_LIBS="$LIBS" - LIBS="$LIBS $LIBFAM_LIBS" - AC_CHECK_FUNCS([FAMNoExists]) - LIBS="$save_LIBS" -fi -AC_SUBST([LIBFAM_CFLAGS]) -AC_SUBST([LIBFAM_LIBS]) -]) - - - -dnl # BM_THUNAR_VFS_OS_IMPL() -dnl # -dnl # Determine the operating system support to use -dnl # for thunar-vfs. -dnl # -dnl # Sets ac_bm_thunar_vfs_os_impl to "bsd" or "generic" and -dnl # defines the automake conditional THUNAR_VFS_OS_IMPL_BSD. -dnl # -AC_DEFUN([BM_THUNAR_VFS_OS_IMPL], -[ - dnl # Auto-detect target operating system support - AC_MSG_CHECKING([for operating system support]) - case "$target_os" in - dragonfly*|freebsd*|netbsd*|openbsd*|darwin*) - dnl # The BSD Family is fully supported - ac_bm_thunar_vfs_os_impl=bsd - ;; - - *) - dnl # Otherwise fallback to generic OS support - ac_bm_thunar_vfs_os_impl=generic - esac - AC_MSG_RESULT([$ac_bm_thunar_vfs_os_impl]) - - dnl # Set automake conditionals appropriately - AM_CONDITIONAL([THUNAR_VFS_OS_IMPL_BSD], [test x"$ac_bm_thunar_vfs_os_impl" = x"bsd"]) -]) - - - -dnl # BM_THUNAR_VFS_VOLUME_IMPL() -dnl # -dnl # Determines the volume manager implementation to -dnl # use for thunar-vfs. -dnl # -dnl # Sets ac_bm_thunar_vfs_volume_impl to "freebsd", -dnl # "hal" or "none". -dnl # -AC_DEFUN([BM_THUNAR_VFS_VOLUME_IMPL], -[ - dnl The --with-volume-manager option - AC_ARG_WITH([volume-manager], -AC_HELP_STRING([--with-volume-manager=@<:@auto/freebsd/hal/none@:>@], [The volume manager implementation @<:@default=auto@:>@]), - [], [with_volume_manager=auto]) - - dnl # Check if we should try to auto-detect - if test x"$with_volume_manager" = x"freebsd"; then - ac_bm_thunar_vfs_volume_impl=freebsd - elif test x"$with_volume_manager" = x"hal"; then - ac_bm_thunar_vfs_volume_impl=hal - elif test x"$with_volume_manager" = x"none"; then - ac_bm_thunar_vfs_volume_impl=none - else - dnl # Check if HAL is available - XDT_CHECK_PACKAGE([HAL], [hal-storage], [0.5.0], - [ - dnl # HAL is available, use it - ac_bm_thunar_vfs_volume_impl=hal - ], - [ - dnl # Check operating system type - case "$target_os" in - freebsd*) - dnl # FreeBSD is fully supported - ac_bm_thunar_vfs_volume_impl=freebsd - ;; - *) - dnl # Otherwise no volume support - ac_bm_thunar_vfs_volume_impl=none - ;; - esac - ]) - fi - - dnl # We need HAL >= 0.5.x and D-BUS >= 0.23 for the HAL volume manager - if test x"$ac_bm_thunar_vfs_volume_impl" = x"hal"; then - XDT_CHECK_PACKAGE([EXO_HAL], [exo-hal-0.3], [0.3.1.13]) - XDT_CHECK_PACKAGE([HAL], [hal-storage], [0.5.0]) - XDT_CHECK_PACKAGE([HAL_DBUS], [dbus-glib-1], [0.23]) - fi - - dnl # Set config.h variables depending on what we're going to use - AC_MSG_CHECKING([for the volume manager implemenation]) - case "$ac_bm_thunar_vfs_volume_impl" in - freebsd) - AC_DEFINE([THUNAR_VFS_VOLUME_IMPL_FREEBSD], [1], [Define to 1 if the FreeBSD volume manager implementation should be used]) - ;; - - hal) - AC_DEFINE([THUNAR_VFS_VOLUME_IMPL_HAL], [1], [Define to 1 if the HAL volume manager implementation should be used]) - ;; - - *) - AC_DEFINE([THUNAR_VFS_VOLUME_IMPL_NONE], [1], [Define to 1 if no volume manager implementation should be used]) - ;; - esac - AC_MSG_RESULT([$ac_bm_thunar_vfs_volume_impl]) - - dnl # Set automake conditionals appropriately - AM_CONDITIONAL([THUNAR_VFS_VOLUME_IMPL_FREEBSD], [test x"$ac_bm_thunar_vfs_volume_impl" = x"freebsd"]) - AM_CONDITIONAL([THUNAR_VFS_VOLUME_IMPL_HAL], [test x"$ac_bm_thunar_vfs_volume_impl" = x"hal"]) - AM_CONDITIONAL([THUNAR_VFS_VOLUME_IMPL_NONE], [test x"$ac_bm_thunar_vfs_volume_impl" = x"none"]) -]) Modified: thunar/branches/migration-to-gio/configure.in.in =================================================================== --- thunar/branches/migration-to-gio/configure.in.in 2009-06-20 02:06:48 UTC (rev 30060) +++ thunar/branches/migration-to-gio/configure.in.in 2009-06-20 02:26:54 UTC (rev 30061) @@ -113,50 +113,16 @@ dnl ********************************** dnl *** Check for standard headers *** dnl ********************************** -AC_CHECK_HEADERS([ctype.h dirent.h errno.h fcntl.h fnmatch.h fstab.h grp.h \ - limits.h locale.h math.h memory.h mntent.h paths.h pwd.h \ - regex.h sched.h setjmp.h signal.h stdarg.h stdlib.h \ - string.h syslog.h sys/xattr.h sys/extattr.h sys/cdio.h \ - sys/mman.h sys/mount.h sys/param.h sys/resource.h sys/stat.h \ - sys/statfs.h sys/statvfs.h sys/time.h sys/ucred.h sys/uio.h \ - sys/vfs.h sys/wait.h time.h wchar.h wctype.h]) +AC_CHECK_HEADERS([errno.h fcntl.h grp.h limits.h locale.h memory.h paths.h \ + pwd.h signal.h stdarg.h stdlib.h string.h sys/stat.h time.h]) dnl ************************************ dnl *** Check for standard functions *** dnl ************************************ AC_FUNC_MMAP() -AC_CHECK_FUNCS([attropen extattr_get_fd fgetxattr futimes getdents getfsspec \ - getfsstat lchmod localeconv localtime_r mbrtowc mkdtemp mkfifo \ - posix_madvise pread pwrite readdir_r sched_yield setgroupent \ - setmntent setpassent setpriority statfs statvfs statvfs1 \ - strcoll strlcpy strptime symlink syslog posix_fadvise]) +AC_CHECK_FUNCS([localeconv mkdtemp setgroupent setpassent strcoll \ + strlcpy strptime symlink]) -dnl ****************************************** -dnl *** Linux/glibc specified work-arounds *** -dnl ****************************************** -AC_MSG_CHECKING([whether we need _BSD_SOURCE and _XOPEN_SOURCE]) -AC_TRY_LINK([#include <features.h>], -[ - if (__GLIBC_PREREQ (2, 0)); -], -[ - AC_DEFINE([_XOPEN_SOURCE], [600], [Required to unbreak glibc]) - AC_DEFINE([_BSD_SOURCE], [1], [Required to unbreak glibc]) - AC_MSG_RESULT([yes]) -], -[ - AC_MSG_RESULT([no]) -]) - -dnl ************************************************************** -dnl *** Check for f_mntonname in statfs (trash implementation) *** -dnl ************************************************************** -AC_CHECK_MEMBERS([struct statfs.f_mntonname],,, -[ -#include <sys/param.h> -#include <sys/mount.h> -]) - dnl ****************************** dnl *** Check for i18n support *** dnl ****************************** @@ -173,15 +139,6 @@ XDT_CHECK_PACKAGE([GDK_PIXBUF], [gdk-pixbuf-2.0], [2.14.0]) XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.6.0]) -dnl ********************************************* -dnl *** Check for libpng (with various names) *** -dnl ********************************************* -XDT_CHECK_PACKAGE([LIBPNG], [libpng], [1.2.0], [], -[ - dnl # libpng.pc not found, try with libpng12.pc - XDT_CHECK_PACKAGE([LIBPNG], [libpng12], [1.2.0]) -]) - dnl ******************************************** dnl *** Check for session management support *** dnl ******************************************** @@ -201,13 +158,6 @@ XDT_CHECK_OPTIONAL_PACKAGE([DBUS], [dbus-glib-1], [0.34], [dbus], [D-BUS support]) -dnl ******************************************************* -dnl *** Optional support for gconf (GNOME thumbnailers) *** -dnl ******************************************************* -XDT_CHECK_OPTIONAL_PACKAGE([GCONF], [gconf-2.0], - [2.4.0], [gnome-thumbnailers], - [GNOME thumbnailer support]) - dnl ************************************************* dnl *** Optional support for startup notification *** dnl ************************************************* @@ -216,43 +166,7 @@ [0.4], [startup-notification], [startup notification library]) -dnl ****************************** -dnl *** Check for FreeType 2.x *** -dnl ****************************** -FREETYPE_LIBS="" -FREETYPE_CFLAGS="" -AC_PATH_PROG([FREETYPE_CONFIG], [freetype-config], [no]) -if test x"$FREETYPE_CONFIG" != x"no"; then - AC_MSG_CHECKING([FREETYPE_CFLAGS]) - FREETYPE_CFLAGS="`$FREETYPE_CONFIG --cflags`" - AC_MSG_RESULT([$FREETYPE_CFLAGS]) - - AC_MSG_CHECKING([FREETYPE_LIBS]) - FREETYPE_LIBS="`$FREETYPE_CONFIG --libs`" - AC_MSG_RESULT([$FREETYPE_LIBS]) -fi -AM_CONDITIONAL([HAVE_FREETYPE], [test x"$FREETYPE_CONFIG" != x"no"]) -AC_SUBST([FREETYPE_CFLAGS]) -AC_SUBST([FREETYPE_LIBS]) - dnl ************************* -dnl *** Check for libjpeg *** -dnl ************************* -LIBJPEG_LIBS="" -LIBJPEG_CFLAGS="" -AC_CHECK_LIB([jpeg], [jpeg_start_decompress], -[ - AC_CHECK_HEADER([jpeglib.h], - [ - LIBJPEG_LIBS="-ljpeg -lm" - AC_DEFINE([HAVE_LIBJPEG], [1], [Define to 1 if libjpeg is found]) - AC_DEFINE([HAVE_JPEGLIB_H], [1], [Define to 1 if jpeglib.h is found]) - ]) -], [-lm]) -AC_SUBST([LIBJPEG_CFLAGS]) -AC_SUBST([LIBJPEG_LIBS]) - -dnl ************************* dnl *** Check for gtk-doc *** dnl ************************* GTK_DOC_CHECK([1.0]) @@ -281,21 +195,6 @@ fi AM_CONDITIONAL([ENABLE_XML2PO], [test x"$enable_xml2po" = x"yes"]) -dnl ****************************************** -dnl *** Check for operating system support *** -dnl ****************************************** -BM_THUNAR_VFS_OS_IMPL() - -dnl **************************************************** -dnl *** Check for file system monitor implementation *** -dnl **************************************************** -BM_THUNAR_VFS_MONITOR_IMPL() - -dnl *********************************************** -dnl *** Check for volume manager implementation *** -dnl *********************************************** -BM_THUNAR_VFS_VOLUME_IMPL() - dnl *********************************** dnl *** Check for debugging support *** dnl *********************************** @@ -475,8 +374,6 @@ docs/manual/zh_TW/images/Makefile docs/papers/Makefile docs/reference/Makefile -docs/reference/thunar-vfs/Makefile -docs/reference/thunar-vfs/version.xml docs/reference/thunarx/Makefile docs/reference/thunarx/version.xml examples/Makefile @@ -501,9 +398,6 @@ tests/Makefile tests/data/Makefile thunar/Makefile -thunar-vfs/Makefile -thunar-vfs/thunar-vfs-1.pc -thunar-vfs/thunar-vfs-config.h thunarx/Makefile thunarx/thunarx-2.pc thunarx/thunarx-config.h @@ -515,7 +409,6 @@ echo echo "Build Configuration:" echo -echo "* Operating system support: $ac_bm_thunar_vfs_os_impl" if test x"$DBUS_FOUND" = x"yes"; then echo "* D-BUS support: yes" else @@ -526,18 +419,11 @@ else echo "* GIO UNIX features: no" fi -echo "* File System Monitor: $ac_bm_thunar_vfs_monitor_impl" -if test x"$GCONF_FOUND" = x"yes"; then -echo "* GNOME Thumbnailers: yes" -else -echo "* GNOME Thumbnailers: no" -fi if test x"$LIBSTARTUP_NOTIFICATION_FOUND" = x"yes"; then echo "* Startup Notification: yes" else echo "* Startup Notification: no" fi -echo "* Volume Manager: $ac_bm_thunar_vfs_volume_impl" echo "* Debug Support: $enable_debug" echo echo "Additional Plugins:" Modified: thunar/branches/migration-to-gio/docs/reference/Makefile.am =================================================================== --- thunar/branches/migration-to-gio/docs/reference/Makefile.am 2009-06-20 02:06:48 UTC (rev 30060) +++ thunar/branches/migration-to-gio/docs/reference/Makefile.am 2009-06-20 02:26:54 UTC (rev 30061) @@ -1,7 +1,6 @@ # $Id$ SUBDIRS = \ - thunar-vfs \ thunarx # vi:set ts=8 sw=8 noet ai nocindent syntax=automake: _______________________________________________ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits