diff -crN ./gnome-vfs/Makefile.in /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/Makefile.in *** ./gnome-vfs/Makefile.in Mon Sep 8 14:19:42 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/Makefile.in Thu Dec 18 21:13:05 2003 *************** *** 1,6 **** ! # Makefile.in generated automatically by automake 1.4-p6 from Makefile.am ! # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. --- 1,8 ---- ! # Makefile.in generated by automake 1.7.1 from Makefile.am. ! # @configure_input@ ! # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 ! # Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. *************** *** 10,87 **** # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. ! ! SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ - prefix = @prefix@ - exec_prefix = @exec_prefix@ - - bindir = @bindir@ - sbindir = @sbindir@ - libexecdir = @libexecdir@ - datadir = @datadir@ - sysconfdir = @sysconfdir@ - sharedstatedir = @sharedstatedir@ - localstatedir = @localstatedir@ - libdir = @libdir@ - infodir = @infodir@ - mandir = @mandir@ - includedir = @includedir@ - oldincludedir = /usr/include - - DESTDIR = - pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ - top_builddir = . ! ACLOCAL = @ACLOCAL@ ! AUTOCONF = @AUTOCONF@ ! AUTOMAKE = @AUTOMAKE@ ! AUTOHEADER = @AUTOHEADER@ ! INSTALL = @INSTALL@ ! INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) ! INSTALL_DATA = @INSTALL_DATA@ ! INSTALL_SCRIPT = @INSTALL_SCRIPT@ ! transform = @program_transform_name@ ! NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : - host_alias = @host_alias@ host_triplet = @host@ ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ ! AS = @AS@ AWK = @AWK@ BONOBO_ACTIVATION_REQUIRED = @BONOBO_ACTIVATION_REQUIRED@ BONOBO_IDLDIR = @BONOBO_IDLDIR@ BONOBO_REQUIRED = @BONOBO_REQUIRED@ BZ2_LIBS = @BZ2_LIBS@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ CFLAGS = @CFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ ! CXX = @CXX@ DATADIRNAME = @DATADIRNAME@ DB2HTML = @DB2HTML@ ! DLLTOOL = @DLLTOOL@ ECHO = @ECHO@ ENABLE_PROFILER = @ENABLE_PROFILER@ EXEEXT = @EXEEXT@ FAM_LIBS = @FAM_LIBS@ GCONFTOOL = @GCONFTOOL@ GCONF_REQUIRED = @GCONF_REQUIRED@ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ --- 12,85 ---- # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. ! @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = . ! am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ ! install_sh_DATA = $(install_sh) -c -m 644 ! install_sh_PROGRAM = $(install_sh) -c ! install_sh_SCRIPT = $(install_sh) -c ! INSTALL_HEADER = $(INSTALL_DATA) ! transform = $(program_transform_name) NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : host_triplet = @host@ + ACLOCAL = @ACLOCAL@ ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ ! ALLOCA = @ALLOCA@ ! AMDEP_FALSE = @AMDEP_FALSE@ ! AMDEP_TRUE = @AMDEP_TRUE@ ! AMTAR = @AMTAR@ ! AUTOCONF = @AUTOCONF@ ! AUTOHEADER = @AUTOHEADER@ ! AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BONOBO_ACTIVATION_REQUIRED = @BONOBO_ACTIVATION_REQUIRED@ BONOBO_IDLDIR = @BONOBO_IDLDIR@ BONOBO_REQUIRED = @BONOBO_REQUIRED@ + BUILD_CDEMENU_MODULE_FALSE = @BUILD_CDEMENU_MODULE_FALSE@ + BUILD_CDEMENU_MODULE_TRUE = @BUILD_CDEMENU_MODULE_TRUE@ BZ2_LIBS = @BZ2_LIBS@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ + CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ ! CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ DB2HTML = @DB2HTML@ ! DEFS = @DEFS@ ! DEPDIR = @DEPDIR@ ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ + ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ + ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ENABLE_PROFILER = @ENABLE_PROFILER@ + ENABLE_PROFILER_FALSE = @ENABLE_PROFILER_FALSE@ + ENABLE_PROFILER_TRUE = @ENABLE_PROFILER_TRUE@ EXEEXT = @EXEEXT@ FAM_LIBS = @FAM_LIBS@ GCONFTOOL = @GCONFTOOL@ GCONF_REQUIRED = @GCONF_REQUIRED@ + GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ + GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ *************** *** 90,99 **** --- 88,114 ---- GMSGFMT = @GMSGFMT@ GNOME_ACLOCAL_DIR = @GNOME_ACLOCAL_DIR@ GNOME_ACLOCAL_FLAGS = @GNOME_ACLOCAL_FLAGS@ + GNOME_INTERFACE_VERSION = @GNOME_INTERFACE_VERSION@ GNOME_VFS_DIR = @GNOME_VFS_DIR@ GTKDOC = @GTKDOC@ + HAVE_CDDA_FALSE = @HAVE_CDDA_FALSE@ + HAVE_CDDA_TRUE = @HAVE_CDDA_TRUE@ + HAVE_DOCBOOK_FALSE = @HAVE_DOCBOOK_FALSE@ + HAVE_DOCBOOK_TRUE = @HAVE_DOCBOOK_TRUE@ HAVE_GTK_DOC = @HAVE_GTK_DOC@ + HAVE_GTK_DOC_FALSE = @HAVE_GTK_DOC_FALSE@ + HAVE_GTK_DOC_TRUE = @HAVE_GTK_DOC_TRUE@ + HAVE_LIBEFS_FALSE = @HAVE_LIBEFS_FALSE@ + HAVE_LIBEFS_TRUE = @HAVE_LIBEFS_TRUE@ + HAVE_SSL_FALSE = @HAVE_SSL_FALSE@ + HAVE_SSL_TRUE = @HAVE_SSL_TRUE@ HTML_DIR = @HTML_DIR@ + INSIDE_GNOME_DOCU_FALSE = @INSIDE_GNOME_DOCU_FALSE@ + INSIDE_GNOME_DOCU_TRUE = @INSIDE_GNOME_DOCU_TRUE@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ + INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLLIBS = @INTLLIBS@ INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@ *************** *** 127,135 **** --- 142,154 ---- LIBGNUTLS_CONFIG = @LIBGNUTLS_CONFIG@ LIBGNUTLS_LIBS = @LIBGNUTLS_LIBS@ LIBIDL_REQUIRED = @LIBIDL_REQUIRED@ + LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ + MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ + MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MKINSTALLDIRS = @MKINSTALLDIRS@ MODULES_CFLAGS = @MODULES_CFLAGS@ *************** *** 144,161 **** MODULES_XML_LIBS = @MODULES_XML_LIBS@ MONIKERS_CFLAGS = @MONIKERS_CFLAGS@ MONIKERS_LIBS = @MONIKERS_LIBS@ ! OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ ORBIT_IDL = @ORBIT_IDL@ ORBIT_REQUIRED = @ORBIT_REQUIRED@ PACKAGE = @PACKAGE@ PKG_CONFIG = @PKG_CONFIG@ POFILES = @POFILES@ POPT_LIBS = @POPT_LIBS@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ RANLIB = @RANLIB@ STRIP = @STRIP@ TEST_CFLAGS = @TEST_CFLAGS@ TEST_LIBS = @TEST_LIBS@ --- 163,192 ---- MODULES_XML_LIBS = @MODULES_XML_LIBS@ MONIKERS_CFLAGS = @MONIKERS_CFLAGS@ MONIKERS_LIBS = @MONIKERS_LIBS@ ! MSGFMT = @MSGFMT@ OBJEXT = @OBJEXT@ + OPENSSL_CFLAGS = @OPENSSL_CFLAGS@ + OPENSSL_LIBS = @OPENSSL_LIBS@ ORBIT_IDL = @ORBIT_IDL@ ORBIT_REQUIRED = @ORBIT_REQUIRED@ PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ + PLATFORM_GNOME_2_FALSE = @PLATFORM_GNOME_2_FALSE@ + PLATFORM_GNOME_2_TRUE = @PLATFORM_GNOME_2_TRUE@ POFILES = @POFILES@ POPT_LIBS = @POPT_LIBS@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ RANLIB = @RANLIB@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ STRIP = @STRIP@ TEST_CFLAGS = @TEST_CFLAGS@ TEST_LIBS = @TEST_LIBS@ *************** *** 173,181 **** VFS_SIZE_IS = @VFS_SIZE_IS@ VFS_SIZE_PRINTF = @VFS_SIZE_PRINTF@ WARN_CFLAGS = @WARN_CFLAGS@ ! WARN_CXXFLAGS = @WARN_CXXFLAGS@ XML_REQUIRED = @XML_REQUIRED@ ! SUBDIRS_GNOME = monikers doc schemas SUBDIRS = \ --- 204,245 ---- VFS_SIZE_IS = @VFS_SIZE_IS@ VFS_SIZE_PRINTF = @VFS_SIZE_PRINTF@ WARN_CFLAGS = @WARN_CFLAGS@ ! XGETTEXT = @XGETTEXT@ XML_REQUIRED = @XML_REQUIRED@ ! ac_ct_CC = @ac_ct_CC@ ! ac_ct_RANLIB = @ac_ct_RANLIB@ ! ac_ct_STRIP = @ac_ct_STRIP@ ! am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ ! am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ ! am__include = @am__include@ ! am__quote = @am__quote@ ! bindir = @bindir@ ! build = @build@ ! build_alias = @build_alias@ ! build_cpu = @build_cpu@ ! build_os = @build_os@ ! build_vendor = @build_vendor@ ! datadir = @datadir@ ! exec_prefix = @exec_prefix@ ! host = @host@ ! host_alias = @host_alias@ ! host_cpu = @host_cpu@ ! host_os = @host_os@ ! host_vendor = @host_vendor@ ! includedir = @includedir@ ! infodir = @infodir@ ! install_sh = @install_sh@ ! libdir = @libdir@ ! libexecdir = @libexecdir@ ! localstatedir = @localstatedir@ ! mandir = @mandir@ ! oldincludedir = @oldincludedir@ ! prefix = @prefix@ ! program_transform_name = @program_transform_name@ ! sbindir = @sbindir@ ! sharedstatedir = @sharedstatedir@ ! sysconfdir = @sysconfdir@ ! target_alias = @target_alias@ SUBDIRS_GNOME = monikers doc schemas SUBDIRS = \ *************** *** 204,295 **** pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = gnome-vfs-2.0.pc gnome-vfs-module-2.0.pc ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = config.h ! CONFIG_CLEAN_FILES = gnome-vfs.spec gnome-vfs-2.0.pc \ ! gnome-vfs-module-2.0.pc ! DATA = $(pkgconfig_DATA) ! ! DIST_COMMON = README ./stamp-h.in AUTHORS COPYING COPYING.LIB ChangeLog \ ! INSTALL Makefile.am Makefile.in NEWS TODO acconfig.h acinclude.m4 \ ! aclocal.m4 config.guess config.h.in config.sub configure configure.in \ ! gnome-vfs-2.0.pc.in gnome-vfs-module-2.0.pc.in gnome-vfs.spec.in \ ! install-sh ltmain.sh missing mkinstalldirs ! ! ! DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) - TAR = gtar - GZIP_ENV = --best - all: all-redirect .SUFFIXES: - $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps Makefile ! Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ! cd $(top_builddir) \ ! && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status ! ! $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in acinclude.m4 ! cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) ! config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) $(SHELL) ./config.status --recheck ! $(srcdir)/configure: @MAINTAINER_MODE_TRUE@$(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) cd $(srcdir) && $(AUTOCONF) ! config.h: stamp-h ! @if test ! -f $@; then \ ! rm -f stamp-h; \ ! $(MAKE) stamp-h; \ ! else :; fi ! stamp-h: $(srcdir)/config.h.in $(top_builddir)/config.status ! cd $(top_builddir) \ ! && CONFIG_FILES= CONFIG_HEADERS=config.h \ ! $(SHELL) ./config.status ! @echo timestamp > stamp-h 2> /dev/null ! $(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@$(srcdir)/stamp-h.in @if test ! -f $@; then \ ! rm -f $(srcdir)/stamp-h.in; \ ! $(MAKE) $(srcdir)/stamp-h.in; \ else :; fi - $(srcdir)/stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) acconfig.h - cd $(top_srcdir) && $(AUTOHEADER) - @echo timestamp > $(srcdir)/stamp-h.in 2> /dev/null ! mostlyclean-hdr: ! clean-hdr: distclean-hdr: ! -rm -f config.h ! ! maintainer-clean-hdr: gnome-vfs.spec: $(top_builddir)/config.status gnome-vfs.spec.in ! cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status gnome-vfs-2.0.pc: $(top_builddir)/config.status gnome-vfs-2.0.pc.in ! cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status gnome-vfs-module-2.0.pc: $(top_builddir)/config.status gnome-vfs-module-2.0.pc.in ! cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status install-pkgconfigDATA: $(pkgconfig_DATA) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(pkgconfigdir) @list='$(pkgconfig_DATA)'; for p in $$list; do \ ! if test -f $(srcdir)/$$p; then \ ! echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pkgconfigdir)/$$p"; \ ! $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pkgconfigdir)/$$p; \ ! else if test -f $$p; then \ ! echo " $(INSTALL_DATA) $$p $(DESTDIR)$(pkgconfigdir)/$$p"; \ ! $(INSTALL_DATA) $$p $(DESTDIR)$(pkgconfigdir)/$$p; \ ! fi; fi; \ done uninstall-pkgconfigDATA: @$(NORMAL_UNINSTALL) ! list='$(pkgconfig_DATA)'; for p in $$list; do \ ! rm -f $(DESTDIR)$(pkgconfigdir)/$$p; \ done # This directory's subdirectories are mostly independent; you can cd --- 268,366 ---- pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = gnome-vfs-2.0.pc gnome-vfs-module-2.0.pc + subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = config.h ! CONFIG_CLEAN_FILES = gnome-vfs.spec gnome-vfs-2.0.pc \ ! gnome-vfs-module-2.0.pc ! depcomp = ! am__depfiles_maybe = ! DIST_SOURCES = ! DATA = $(pkgconfig_DATA) ! ! ! RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \ ! ps-recursive install-info-recursive uninstall-info-recursive \ ! all-recursive install-data-recursive install-exec-recursive \ ! installdirs-recursive install-recursive uninstall-recursive \ ! check-recursive installcheck-recursive ! DIST_COMMON = README AUTHORS COPYING COPYING.LIB ChangeLog INSTALL \ ! Makefile.am Makefile.in NEWS TODO acconfig.h acinclude.m4 \ ! aclocal.m4 config.guess config.h.in config.sub configure \ ! configure.in gnome-vfs-2.0.pc.in gnome-vfs-module-2.0.pc.in \ ! gnome-vfs.spec.in install-sh ltmain.sh missing mkinstalldirs ! DIST_SUBDIRS = $(SUBDIRS) ! all: config.h ! $(MAKE) $(AM_MAKEFLAGS) all-recursive .SUFFIXES: ! am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ ! configure.lineno ! $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) ! cd $(top_srcdir) && \ ! $(AUTOMAKE) --gnu --ignore-deps Makefile ! Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status ! cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe) ! $(top_builddir)/config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) $(SHELL) ./config.status --recheck ! $(srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) cd $(srcdir) && $(AUTOCONF) ! $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in acinclude.m4 ! cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) ! ! config.h: stamp-h1 @if test ! -f $@; then \ ! rm -f stamp-h1; \ ! $(MAKE) stamp-h1; \ else :; fi ! stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status ! @rm -f stamp-h1 ! cd $(top_builddir) && $(SHELL) ./config.status config.h ! $(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(top_srcdir)/configure.in $(ACLOCAL_M4) $(top_srcdir)/acconfig.h ! cd $(top_srcdir) && $(AUTOHEADER) ! touch $(srcdir)/config.h.in distclean-hdr: ! -rm -f config.h stamp-h1 gnome-vfs.spec: $(top_builddir)/config.status gnome-vfs.spec.in ! cd $(top_builddir) && $(SHELL) ./config.status $@ gnome-vfs-2.0.pc: $(top_builddir)/config.status gnome-vfs-2.0.pc.in ! cd $(top_builddir) && $(SHELL) ./config.status $@ gnome-vfs-module-2.0.pc: $(top_builddir)/config.status gnome-vfs-module-2.0.pc.in ! cd $(top_builddir) && $(SHELL) ./config.status $@ ! ! mostlyclean-libtool: ! -rm -f *.lo + clean-libtool: + -rm -rf .libs _libs + + distclean-libtool: + -rm -f libtool + uninstall-info-am: + pkgconfigDATA_INSTALL = $(INSTALL_DATA) install-pkgconfigDATA: $(pkgconfig_DATA) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(pkgconfigdir) @list='$(pkgconfig_DATA)'; for p in $$list; do \ ! if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ ! f="`echo $$p | sed -e 's|^.*/||'`"; \ ! echo " $(pkgconfigDATA_INSTALL) $$d$$p $(DESTDIR)$(pkgconfigdir)/$$f"; \ ! $(pkgconfigDATA_INSTALL) $$d$$p $(DESTDIR)$(pkgconfigdir)/$$f; \ done uninstall-pkgconfigDATA: @$(NORMAL_UNINSTALL) ! @list='$(pkgconfig_DATA)'; for p in $$list; do \ ! f="`echo $$p | sed -e 's|^.*/||'`"; \ ! echo " rm -f $(DESTDIR)$(pkgconfigdir)/$$f"; \ ! rm -f $(DESTDIR)$(pkgconfigdir)/$$f; \ done # This directory's subdirectories are mostly independent; you can cd *************** *** 298,310 **** # (1) if the variable is set in `config.status', edit `config.status' # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. ! ! @SET_MAKE@ ! ! all-recursive install-data-recursive install-exec-recursive \ ! installdirs-recursive install-recursive uninstall-recursive \ ! check-recursive installcheck-recursive info-recursive dvi-recursive: ! @set fnord $(MAKEFLAGS); amf=$$2; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ list='$(SUBDIRS)'; for subdir in $$list; do \ --- 369,376 ---- # (1) if the variable is set in `config.status', edit `config.status' # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. ! $(RECURSIVE_TARGETS): ! @set fnord $$MAKEFLAGS; amf=$$2; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ list='$(SUBDIRS)'; for subdir in $$list; do \ *************** *** 324,336 **** mostlyclean-recursive clean-recursive distclean-recursive \ maintainer-clean-recursive: ! @set fnord $(MAKEFLAGS); amf=$$2; \ dot_seen=no; \ ! rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \ ! rev="$$subdir $$rev"; \ ! test "$$subdir" != "." || dot_seen=yes; \ done; \ ! test "$$dot_seen" = "no" && rev=". $$rev"; \ target=`echo $@ | sed s/-recursive//`; \ for subdir in $$rev; do \ echo "Making $$target in $$subdir"; \ --- 390,407 ---- mostlyclean-recursive clean-recursive distclean-recursive \ maintainer-clean-recursive: ! @set fnord $$MAKEFLAGS; amf=$$2; \ dot_seen=no; \ ! case "$@" in \ ! distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ ! *) list='$(SUBDIRS)' ;; \ ! esac; \ ! rev=''; for subdir in $$list; do \ ! if test "$$subdir" = "."; then :; else \ ! rev="$$subdir $$rev"; \ ! fi; \ done; \ ! rev="$$rev ."; \ target=`echo $@ | sed s/-recursive//`; \ for subdir in $$rev; do \ echo "Making $$target in $$subdir"; \ *************** *** 346,520 **** list='$(SUBDIRS)'; for subdir in $$list; do \ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ done tags: TAGS ! ID: $(HEADERS) $(SOURCES) $(LISP) ! list='$(SOURCES) $(HEADERS)'; \ ! unique=`for i in $$list; do echo $$i; done | \ ! awk ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ ! here=`pwd` && cd $(srcdir) \ ! && mkid -f$$here/ID $$unique $(LISP) ! TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) $(LISP) tags=; \ here=`pwd`; \ list='$(SUBDIRS)'; for subdir in $$list; do \ ! if test "$$subdir" = .; then :; else \ test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \ ! fi; \ done; \ ! list='$(SOURCES) $(HEADERS)'; \ ! unique=`for i in $$list; do echo $$i; done | \ ! awk ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ ! test -z "$(ETAGS_ARGS)config.h.in$$unique$(LISP)$$tags" \ ! || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags config.h.in $$unique $(LISP) -o $$here/TAGS) ! ! mostlyclean-tags: ! ! clean-tags: distclean-tags: ! -rm -f TAGS ID ! ! maintainer-clean-tags: distdir = $(PACKAGE)-$(VERSION) - top_distdir = $(distdir) ! # This target untars the dist file and tries a VPATH configuration. Then ! # it guarantees that the distribution is self-contained by making another ! # tarfile. ! distcheck: dist ! -rm -rf $(distdir) ! GZIP=$(GZIP_ENV) $(TAR) zxf $(distdir).tar.gz ! mkdir $(distdir)/=build ! mkdir $(distdir)/=inst ! dc_install_base=`cd $(distdir)/=inst && pwd`; \ ! cd $(distdir)/=build \ ! && ../configure --srcdir=.. --prefix=$$dc_install_base \ ! && $(MAKE) $(AM_MAKEFLAGS) \ ! && $(MAKE) $(AM_MAKEFLAGS) dvi \ ! && $(MAKE) $(AM_MAKEFLAGS) check \ ! && $(MAKE) $(AM_MAKEFLAGS) install \ ! && $(MAKE) $(AM_MAKEFLAGS) installcheck \ ! && $(MAKE) $(AM_MAKEFLAGS) dist ! -rm -rf $(distdir) ! @banner="$(distdir).tar.gz is ready for distribution"; \ ! dashes=`echo "$$banner" | sed s/./=/g`; \ ! echo "$$dashes"; \ ! echo "$$banner"; \ ! echo "$$dashes" ! dist: distdir ! -chmod -R a+r $(distdir) ! GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir) ! -rm -rf $(distdir) ! dist-all: distdir ! -chmod -R a+r $(distdir) ! GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir) ! -rm -rf $(distdir) distdir: $(DISTFILES) ! -rm -rf $(distdir) mkdir $(distdir) ! -chmod 777 $(distdir) ! @for file in $(DISTFILES); do \ ! d=$(srcdir); \ if test -d $$d/$$file; then \ ! cp -pr $$d/$$file $(distdir)/$$file; \ else \ test -f $(distdir)/$$file \ ! || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ ! || cp -p $$d/$$file $(distdir)/$$file || :; \ fi; \ done ! for subdir in $(SUBDIRS); do \ if test "$$subdir" = .; then :; else \ test -d $(distdir)/$$subdir \ || mkdir $(distdir)/$$subdir \ || exit 1; \ ! chmod 777 $(distdir)/$$subdir; \ ! (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(distdir) distdir=../$(distdir)/$$subdir distdir) \ || exit 1; \ fi; \ done ! info-am: ! info: info-recursive ! dvi-am: ! dvi: dvi-recursive check-am: all-am check: check-recursive ! installcheck-am: ! installcheck: installcheck-recursive ! all-recursive-am: config.h ! $(MAKE) $(AM_MAKEFLAGS) all-recursive ! install-exec-am: install-exec: install-exec-recursive - - install-data-am: install-pkgconfigDATA install-data: install-data-recursive install-am: all-am @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - install: install-recursive - uninstall-am: uninstall-pkgconfigDATA - uninstall: uninstall-recursive - all-am: Makefile $(DATA) config.h - all-redirect: all-recursive-am - install-strip: - $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install - installdirs: installdirs-recursive - installdirs-am: - $(mkinstalldirs) $(DESTDIR)$(pkgconfigdir) - mostlyclean-generic: clean-generic: distclean-generic: -rm -f Makefile $(CONFIG_CLEAN_FILES) - -rm -f config.cache config.log stamp-h stamp-h[0-9]* maintainer-clean-generic: ! mostlyclean-am: mostlyclean-hdr mostlyclean-tags mostlyclean-generic ! mostlyclean: mostlyclean-recursive ! clean-am: clean-hdr clean-tags clean-generic mostlyclean-am ! clean: clean-recursive ! distclean-am: distclean-hdr distclean-tags distclean-generic clean-am ! -rm -f libtool ! distclean: distclean-recursive ! -rm -f config.status ! maintainer-clean-am: maintainer-clean-hdr maintainer-clean-tags \ ! maintainer-clean-generic distclean-am ! @echo "This command is intended for maintainers to use;" ! @echo "it deletes files that may require special tools to rebuild." maintainer-clean: maintainer-clean-recursive ! -rm -f config.status ! .PHONY: mostlyclean-hdr distclean-hdr clean-hdr maintainer-clean-hdr \ ! uninstall-pkgconfigDATA install-pkgconfigDATA install-data-recursive \ ! uninstall-data-recursive install-exec-recursive \ ! uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \ ! all-recursive check-recursive installcheck-recursive info-recursive \ ! dvi-recursive mostlyclean-recursive distclean-recursive clean-recursive \ ! maintainer-clean-recursive tags tags-recursive mostlyclean-tags \ ! distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ ! dvi-am dvi check check-am installcheck-am installcheck all-recursive-am \ ! install-exec-am install-exec install-data-am install-data install-am \ ! install uninstall-am uninstall all-redirect all-am all installdirs-am \ ! installdirs mostlyclean-generic distclean-generic clean-generic \ ! maintainer-clean-generic clean mostlyclean distclean maintainer-clean # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. --- 417,709 ---- list='$(SUBDIRS)'; for subdir in $$list; do \ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ done + ctags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ + test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ + done + + ETAGS = etags + ETAGSFLAGS = + + CTAGS = ctags + CTAGSFLAGS = tags: TAGS ! ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) ! list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ ! unique=`for i in $$list; do \ ! if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ ! done | \ ! $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ ! mkid -fID $$unique ! TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ ! $(TAGS_FILES) $(LISP) tags=; \ here=`pwd`; \ list='$(SUBDIRS)'; for subdir in $$list; do \ ! if test "$$subdir" = .; then :; else \ test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \ ! fi; \ done; \ ! list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ ! unique=`for i in $$list; do \ ! if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ ! done | \ ! $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ ! test -z "$(ETAGS_ARGS)$$tags$$unique" \ ! || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ! $$tags $$unique ! ! ctags: CTAGS ! CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ ! $(TAGS_FILES) $(LISP) ! tags=; \ ! here=`pwd`; \ ! list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ ! unique=`for i in $$list; do \ ! if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ ! done | \ ! $(AWK) ' { files[$$0] = 1; } \ ! END { for (i in files) print i; }'`; \ ! test -z "$(CTAGS_ARGS)$$tags$$unique" \ ! || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ ! $$tags $$unique ! ! GTAGS: ! here=`$(am__cd) $(top_builddir) && pwd` \ ! && cd $(top_srcdir) \ ! && gtags -i $(GTAGS_ARGS) $$here distclean-tags: ! -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags ! DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + top_distdir = . distdir = $(PACKAGE)-$(VERSION) ! am__remove_distdir = \ ! { test ! -d $(distdir) \ ! || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \ ! && rm -fr $(distdir); }; } ! ! GZIP_ENV = --best ! distuninstallcheck_listfiles = find . -type f -print ! distcleancheck_listfiles = find . -type f -print ! distdir: $(DISTFILES) ! $(am__remove_distdir) mkdir $(distdir) ! $(mkinstalldirs) $(distdir)/. $(distdir)/libgnomevfs $(distdir)/modules/extfs $(distdir)/po $(distdir)/test ! @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ ! topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ ! list='$(DISTFILES)'; for file in $$list; do \ ! case $$file in \ ! $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ ! $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ ! esac; \ ! if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ ! dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ ! if test "$$dir" != "$$file" && test "$$dir" != "."; then \ ! dir="/$$dir"; \ ! $(mkinstalldirs) "$(distdir)$$dir"; \ ! else \ ! dir=''; \ ! fi; \ if test -d $$d/$$file; then \ ! if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ ! cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ ! fi; \ ! cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ else \ test -f $(distdir)/$$file \ ! || cp -p $$d/$$file $(distdir)/$$file \ ! || exit 1; \ fi; \ done ! list='$(SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ test -d $(distdir)/$$subdir \ || mkdir $(distdir)/$$subdir \ || exit 1; \ ! (cd $$subdir && \ ! $(MAKE) $(AM_MAKEFLAGS) \ ! top_distdir="$(top_distdir)" \ ! distdir=../$(distdir)/$$subdir \ ! distdir) \ || exit 1; \ fi; \ done ! -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ ! ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ ! ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ ! ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \ ! || chmod -R a+r $(distdir) ! dist-gzip: distdir ! $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz ! $(am__remove_distdir) ! ! dist dist-all: distdir ! $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz ! $(am__remove_distdir) ! ! # This target untars the dist file and tries a VPATH configuration. Then ! # it guarantees that the distribution is self-contained by making another ! # tarfile. ! distcheck: dist ! $(am__remove_distdir) ! GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf - ! chmod -R a-w $(distdir); chmod a+w $(distdir) ! mkdir $(distdir)/=build ! mkdir $(distdir)/=inst ! chmod a-w $(distdir) ! dc_install_base=`$(am__cd) $(distdir)/=inst && pwd` \ ! && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ ! && cd $(distdir)/=build \ ! && ../configure --srcdir=.. --prefix="$$dc_install_base" \ ! $(DISTCHECK_CONFIGURE_FLAGS) \ ! && $(MAKE) $(AM_MAKEFLAGS) \ ! && $(MAKE) $(AM_MAKEFLAGS) dvi \ ! && $(MAKE) $(AM_MAKEFLAGS) check \ ! && $(MAKE) $(AM_MAKEFLAGS) install \ ! && $(MAKE) $(AM_MAKEFLAGS) installcheck \ ! && $(MAKE) $(AM_MAKEFLAGS) uninstall \ ! && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \ ! distuninstallcheck \ ! && chmod -R a-w "$$dc_install_base" \ ! && ({ \ ! (cd ../.. && $(mkinstalldirs) "$$dc_destdir") \ ! && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \ ! && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \ ! && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \ ! distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \ ! } || { rm -rf "$$dc_destdir"; exit 1; }) \ ! && rm -rf "$$dc_destdir" \ ! && $(MAKE) $(AM_MAKEFLAGS) dist-gzip \ ! && rm -f $(distdir).tar.gz \ ! && $(MAKE) $(AM_MAKEFLAGS) distcleancheck ! $(am__remove_distdir) ! @echo "$(distdir).tar.gz is ready for distribution" | \ ! sed 'h;s/./=/g;p;x;p;x' ! distuninstallcheck: ! cd $(distuninstallcheck_dir) \ ! && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ ! || { echo "ERROR: files left after uninstall:" ; \ ! if test -n "$(DESTDIR)"; then \ ! echo " (check DESTDIR support)"; \ ! fi ; \ ! $(distuninstallcheck_listfiles) ; \ ! exit 1; } >&2 ! distcleancheck: distclean ! if test '$(srcdir)' = . ; then \ ! echo "ERROR: distcleancheck can only run from a VPATH build" ; \ ! exit 1 ; \ ! fi ! test `$(distcleancheck_listfiles) | wc -l` -eq 0 \ ! || { echo "ERROR: files left in build directory after distclean:" ; \ ! $(distcleancheck_listfiles) ; \ ! exit 1; } >&2 check-am: all-am check: check-recursive ! all-am: Makefile $(DATA) config.h ! installdirs: installdirs-recursive ! installdirs-am: ! $(mkinstalldirs) $(DESTDIR)$(pkgconfigdir) ! install: install-recursive install-exec: install-exec-recursive install-data: install-data-recursive + uninstall: uninstall-recursive install-am: all-am @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + installcheck: installcheck-recursive + install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: clean-generic: distclean-generic: -rm -f Makefile $(CONFIG_CLEAN_FILES) maintainer-clean-generic: ! @echo "This command is intended for maintainers to use" ! @echo "it deletes files that may require special tools to rebuild." ! clean: clean-recursive ! clean-am: clean-generic clean-libtool mostlyclean-am ! distclean: distclean-recursive ! -rm -f $(am__CONFIG_DISTCLEAN_FILES) ! distclean-am: clean-am distclean-generic distclean-hdr distclean-libtool \ ! distclean-tags ! dvi: dvi-recursive ! dvi-am: ! info: info-recursive ! info-am: ! ! install-data-am: install-pkgconfigDATA ! ! install-exec-am: ! ! install-info: install-info-recursive ! ! install-man: ! ! installcheck-am: maintainer-clean: maintainer-clean-recursive ! -rm -f $(am__CONFIG_DISTCLEAN_FILES) ! -rm -rf autom4te.cache ! maintainer-clean-am: distclean-am maintainer-clean-generic ! ! mostlyclean: mostlyclean-recursive ! ! mostlyclean-am: mostlyclean-generic mostlyclean-libtool ! ! pdf: pdf-recursive ! ! pdf-am: ! ps: ps-recursive + ps-am: + + uninstall-am: uninstall-info-am uninstall-pkgconfigDATA + + uninstall-info: uninstall-info-recursive + + .PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \ + clean-generic clean-libtool clean-recursive ctags \ + ctags-recursive dist dist-all dist-gzip distcheck distclean \ + distclean-generic distclean-hdr distclean-libtool \ + distclean-recursive distclean-tags distcleancheck distdir \ + distuninstallcheck dvi dvi-am dvi-recursive info info-am \ + info-recursive install install-am install-data install-data-am \ + install-data-recursive install-exec install-exec-am \ + install-exec-recursive install-info install-info-am \ + install-info-recursive install-man install-pkgconfigDATA \ + install-recursive install-strip installcheck installcheck-am \ + installdirs installdirs-am installdirs-recursive \ + maintainer-clean maintainer-clean-generic \ + maintainer-clean-recursive mostlyclean mostlyclean-generic \ + mostlyclean-libtool mostlyclean-recursive pdf pdf-am \ + pdf-recursive ps ps-am ps-recursive tags tags-recursive \ + uninstall uninstall-am uninstall-info-am \ + uninstall-info-recursive uninstall-pkgconfigDATA \ + uninstall-recursive # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff -crN ./gnome-vfs/aclocal.m4 /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/aclocal.m4 *** ./gnome-vfs/aclocal.m4 Mon Sep 8 14:04:05 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/aclocal.m4 Thu Dec 18 21:11:44 2003 *************** *** 1,14 **** ! dnl aclocal.m4 generated automatically by aclocal 1.4-p6 ! dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. ! dnl This file is free software; the Free Software Foundation ! dnl gives unlimited permission to copy and/or distribute it, ! dnl with or without modifications, as long as this notice is preserved. ! ! dnl This program is distributed in the hope that it will be useful, ! dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without ! dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A ! dnl PARTICULAR PURPOSE. AC_DEFUN(AM_GNOME_CHECK_TYPE, [AC_CACHE_CHECK([$1 in ], ac_cv_type_$1, --- 1,15 ---- ! # generated automatically by aclocal 1.7.1 -*- Autoconf -*- ! # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002 ! # Free Software Foundation, Inc. ! # This file is free software; the Free Software Foundation ! # gives unlimited permission to copy and/or distribute it, ! # with or without modifications, as long as this notice is preserved. ! ! # This program is distributed in the hope that it will be useful, ! # but WITHOUT ANY WARRANTY, to the extent permitted by law; without ! # even the implied warranty of MERCHANTABILITY or FITNESS FOR A ! # PARTICULAR PURPOSE. AC_DEFUN(AM_GNOME_CHECK_TYPE, [AC_CACHE_CHECK([$1 in ], ac_cv_type_$1, *************** *** 196,257 **** dnl end of Autoconf macros for libgnutls ! # Like AC_CONFIG_HEADER, but automatically create stamp file. ! AC_DEFUN([AM_CONFIG_HEADER], ! [AC_PREREQ([2.12]) ! AC_CONFIG_HEADER([$1]) ! dnl When config.status generates a header, we must update the stamp-h file. ! dnl This file resides in the same directory as the config header ! dnl that is generated. We must strip everything past the first ":", ! dnl and everything past the last "/". ! AC_OUTPUT_COMMANDS(changequote(<<,>>)dnl ! ifelse(patsubst(<<$1>>, <<[^ ]>>, <<>>), <<>>, ! <>CONFIG_HEADERS" || echo timestamp > patsubst(<<$1>>, <<^\([^:]*/\)?.*>>, <<\1>>)stamp-h<<>>dnl>>, ! <>; do ! case " <<$>>CONFIG_HEADERS " in ! *" <<$>>am_file "*<<)>> ! echo timestamp > `echo <<$>>am_file | sed -e 's%:.*%%' -e 's%[^/]*$%%'`stamp-h$am_indx ! ;; ! esac ! am_indx=`expr "<<$>>am_indx" + 1` ! done<<>>dnl>>) ! changequote([,]))]) ! ! # Do all the work for Automake. This macro actually does too much -- ! # some checks are only needed if your package does certain things. ! # But this isn't really a big deal. ! # serial 1 ! dnl Usage: ! dnl AM_INIT_AUTOMAKE(package,version, [no-define]) AC_DEFUN([AM_INIT_AUTOMAKE], [AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl ! AC_REQUIRE([AC_PROG_INSTALL]) ! PACKAGE=[$1] ! AC_SUBST(PACKAGE) ! VERSION=[$2] ! AC_SUBST(VERSION) ! dnl test to see if srcdir already configured ! if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) fi ! ifelse([$3],, ! AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) ! AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])) ! AC_REQUIRE([AM_SANITY_CHECK]) ! AC_REQUIRE([AC_ARG_PROGRAM]) ! dnl FIXME This is truly gross. ! missing_dir=`cd $ac_aux_dir && pwd` ! AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}, $missing_dir) ! AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir) ! AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}, $missing_dir) ! AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir) ! AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir) ! AC_REQUIRE([AC_PROG_MAKE_SET])]) # Copyright 2002 Free Software Foundation, Inc. --- 197,349 ---- dnl end of Autoconf macros for libgnutls ! # Like AC_CONFIG_HEADER, but automatically create stamp file. -*- Autoconf -*- ! # Copyright 1996, 1997, 2000, 2001 Free Software Foundation, Inc. ! ! # This program is free software; you can redistribute it and/or modify ! # it under the terms of the GNU General Public License as published by ! # the Free Software Foundation; either version 2, or (at your option) ! # any later version. ! ! # This program is distributed in the hope that it will be useful, ! # but WITHOUT ANY WARRANTY; without even the implied warranty of ! # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ! # GNU General Public License for more details. ! ! # You should have received a copy of the GNU General Public License ! # along with this program; if not, write to the Free Software ! # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ! # 02111-1307, USA. ! ! AC_PREREQ([2.52]) ! # serial 6 ! # AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS. ! AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)]) + # Do all the work for Automake. -*- Autoconf -*- + + # This macro actually does too much some checks are only needed if + # your package does certain things. But this isn't really a big deal. + + # Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002 + # Free Software Foundation, Inc. + + # This program is free software; you can redistribute it and/or modify + # it under the terms of the GNU General Public License as published by + # the Free Software Foundation; either version 2, or (at your option) + # any later version. + + # This program is distributed in the hope that it will be useful, + # but WITHOUT ANY WARRANTY; without even the implied warranty of + # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + # GNU General Public License for more details. + + # You should have received a copy of the GNU General Public License + # along with this program; if not, write to the Free Software + # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + # 02111-1307, USA. + + # serial 8 + + # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be + # written in clear, in which case automake, when reading aclocal.m4, + # will think it sees a *use*, and therefore will trigger all it's + # C support machinery. Also note that it means that autoscan, seeing + # CC etc. in the Makefile, will ask for an AC_PROG_CC use... + + + AC_PREREQ([2.54]) + + # Autoconf 2.50 wants to disallow AM_ names. We explicitly allow + # the ones we care about. + m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl + + # AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) + # AM_INIT_AUTOMAKE([OPTIONS]) + # ----------------------------------------------- + # The call with PACKAGE and VERSION arguments is the old style + # call (pre autoconf-2.50), which is being phased out. PACKAGE + # and VERSION should now be passed to AC_INIT and removed from + # the call to AM_INIT_AUTOMAKE. + # We support both call styles for the transition. After + # the next Automake release, Autoconf can make the AC_INIT + # arguments mandatory, and then we can depend on a new Autoconf + # release and drop the old call support. AC_DEFUN([AM_INIT_AUTOMAKE], [AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl ! AC_REQUIRE([AC_PROG_INSTALL])dnl ! # test to see if srcdir already configured ! if test "`cd $srcdir && pwd`" != "`pwd`" && ! test -f $srcdir/config.status; then AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) fi ! ! # test whether we have cygpath ! if test -z "$CYGPATH_W"; then ! if (cygpath --version) >/dev/null 2>/dev/null; then ! CYGPATH_W='cygpath -w' ! else ! CYGPATH_W=echo ! fi ! fi ! AC_SUBST([CYGPATH_W]) ! ! # Define the identity of the package. ! dnl Distinguish between old-style and new-style calls. ! m4_ifval([$2], ! [m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl ! AC_SUBST([PACKAGE], [$1])dnl ! AC_SUBST([VERSION], [$2])], ! [_AM_SET_OPTIONS([$1])dnl ! AC_SUBST([PACKAGE], [AC_PACKAGE_TARNAME])dnl ! AC_SUBST([VERSION], [AC_PACKAGE_VERSION])])dnl ! ! _AM_IF_OPTION([no-define],, ! [AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) ! AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl ! ! # Some tools Automake needs. ! AC_REQUIRE([AM_SANITY_CHECK])dnl ! AC_REQUIRE([AC_ARG_PROGRAM])dnl ! AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}) ! AM_MISSING_PROG(AUTOCONF, autoconf) ! AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) ! AM_MISSING_PROG(AUTOHEADER, autoheader) ! AM_MISSING_PROG(MAKEINFO, makeinfo) ! AM_MISSING_PROG(AMTAR, tar) ! AM_PROG_INSTALL_SH ! AM_PROG_INSTALL_STRIP ! # We need awk for the "check" target. The system "awk" is bad on ! # some platforms. ! AC_REQUIRE([AC_PROG_AWK])dnl ! AC_REQUIRE([AC_PROG_MAKE_SET])dnl ! ! _AM_IF_OPTION([no-dependencies],, ! [AC_PROVIDE_IFELSE([AC_PROG_CC], ! [_AM_DEPENDENCIES(CC)], ! [define([AC_PROG_CC], ! defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl ! AC_PROVIDE_IFELSE([AC_PROG_CXX], ! [_AM_DEPENDENCIES(CXX)], ! [define([AC_PROG_CXX], ! defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl ! ]) ! ]) ! ! ! # When config.status generates a header, we must update the stamp-h file. ! # This file resides in the same directory as the config header ! # that is generated. The stamp files are numbered to have different names. ! ! # Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the ! # loop where config.status creates the headers, so we can generate ! # our stamp files there. ! AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], ! [_am_stamp_count=`expr ${_am_stamp_count-0} + 1` ! echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count]) # Copyright 2002 Free Software Foundation, Inc. *************** *** 273,309 **** # ---------------------------- # Automake X.Y traces this macro to ensure aclocal.m4 has been # generated from the m4 files accompanying Automake X.Y. ! AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.4"]) # AM_SET_CURRENT_AUTOMAKE_VERSION # ------------------------------- # Call AM_AUTOMAKE_VERSION so it can be traced. # This function is AC_REQUIREd by AC_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], ! [AM_AUTOMAKE_VERSION([1.4-p6])]) # # Check to make sure that the build environment is sane. # AC_DEFUN([AM_SANITY_CHECK], [AC_MSG_CHECKING([whether build environment is sane]) # Just in case sleep 1 ! echo timestamp > conftestfile # Do `set' in a subshell so we don't clobber the current shell's # arguments. Must try -L first in case configure is actually a # symlink; some systems play weird games with the mod time of symlinks # (eg FreeBSD returns the mod time of the symlink's containing # directory). if ( ! set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null` ! if test "[$]*" = "X"; then # -L didn't work. ! set X `ls -t $srcdir/configure conftestfile` fi ! if test "[$]*" != "X $srcdir/configure conftestfile" \ ! && test "[$]*" != "X conftestfile $srcdir/configure"; then # If neither matched, then we have a broken ls. This can happen # if, for instance, CONFIG_SHELL is bash and it inherits a --- 365,467 ---- # ---------------------------- # Automake X.Y traces this macro to ensure aclocal.m4 has been # generated from the m4 files accompanying Automake X.Y. ! AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.7"]) # AM_SET_CURRENT_AUTOMAKE_VERSION # ------------------------------- # Call AM_AUTOMAKE_VERSION so it can be traced. # This function is AC_REQUIREd by AC_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], ! [AM_AUTOMAKE_VERSION([1.7.1])]) ! ! # Helper functions for option handling. -*- Autoconf -*- ! ! # Copyright 2001, 2002 Free Software Foundation, Inc. ! ! # This program is free software; you can redistribute it and/or modify ! # it under the terms of the GNU General Public License as published by ! # the Free Software Foundation; either version 2, or (at your option) ! # any later version. ! ! # This program is distributed in the hope that it will be useful, ! # but WITHOUT ANY WARRANTY; without even the implied warranty of ! # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ! # GNU General Public License for more details. ! ! # You should have received a copy of the GNU General Public License ! # along with this program; if not, write to the Free Software ! # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ! # 02111-1307, USA. ! ! # serial 2 ! ! # _AM_MANGLE_OPTION(NAME) ! # ----------------------- ! AC_DEFUN([_AM_MANGLE_OPTION], ! [[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) ! ! # _AM_SET_OPTION(NAME) ! # ------------------------------ ! # Set option NAME. Presently that only means defining a flag for this option. ! AC_DEFUN([_AM_SET_OPTION], ! [m4_define(_AM_MANGLE_OPTION([$1]), 1)]) ! ! # _AM_SET_OPTIONS(OPTIONS) ! # ---------------------------------- ! # OPTIONS is a space-separated list of Automake options. ! AC_DEFUN([_AM_SET_OPTIONS], ! [AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) ! ! # _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET]) ! # ------------------------------------------- ! # Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. ! AC_DEFUN([_AM_IF_OPTION], ! [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) # # Check to make sure that the build environment is sane. # + # Copyright 1996, 1997, 2000, 2001 Free Software Foundation, Inc. + + # This program is free software; you can redistribute it and/or modify + # it under the terms of the GNU General Public License as published by + # the Free Software Foundation; either version 2, or (at your option) + # any later version. + + # This program is distributed in the hope that it will be useful, + # but WITHOUT ANY WARRANTY; without even the implied warranty of + # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + # GNU General Public License for more details. + + # You should have received a copy of the GNU General Public License + # along with this program; if not, write to the Free Software + # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + # 02111-1307, USA. + + # serial 3 + + # AM_SANITY_CHECK + # --------------- AC_DEFUN([AM_SANITY_CHECK], [AC_MSG_CHECKING([whether build environment is sane]) # Just in case sleep 1 ! echo timestamp > conftest.file # Do `set' in a subshell so we don't clobber the current shell's # arguments. Must try -L first in case configure is actually a # symlink; some systems play weird games with the mod time of symlinks # (eg FreeBSD returns the mod time of the symlink's containing # directory). if ( ! set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null` ! if test "$[*]" = "X"; then # -L didn't work. ! set X `ls -t $srcdir/configure conftest.file` fi ! rm -f conftest.file ! if test "$[*]" != "X $srcdir/configure conftest.file" \ ! && test "$[*]" != "X conftest.file $srcdir/configure"; then # If neither matched, then we have a broken ls. This can happen # if, for instance, CONFIG_SHELL is bash and it inherits a *************** *** 313,319 **** alias in your environment]) fi ! test "[$]2" = conftestfile ) then # Ok. --- 471,477 ---- alias in your environment]) fi ! test "$[2]" = conftest.file ) then # Ok. *************** *** 322,350 **** AC_MSG_ERROR([newly created file is older than distributed files! Check your system clock]) fi - rm -f conftest* AC_MSG_RESULT(yes)]) ! dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY) ! dnl The program must properly implement --version. AC_DEFUN([AM_MISSING_PROG], ! [AC_MSG_CHECKING(for working $2) ! # Run test in a subshell; some versions of sh will print an error if ! # an executable is not found, even if stderr is redirected. ! # Redirect stdin to placate older versions of autoconf. Sigh. ! if ($2 --version) < /dev/null > /dev/null 2>&1; then ! $1=$2 ! AC_MSG_RESULT(found) else ! $1="$3/missing $2" ! AC_MSG_RESULT(missing) fi ! AC_SUBST($1)]) # Add --enable-maintainer-mode option to configure. # From Jim Meyering ! # serial 1 AC_DEFUN([AM_MAINTAINER_MODE], [AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) --- 480,1021 ---- AC_MSG_ERROR([newly created file is older than distributed files! Check your system clock]) fi AC_MSG_RESULT(yes)]) ! # -*- Autoconf -*- ! ! ! # Copyright 1997, 1999, 2000, 2001 Free Software Foundation, Inc. ! ! # This program is free software; you can redistribute it and/or modify ! # it under the terms of the GNU General Public License as published by ! # the Free Software Foundation; either version 2, or (at your option) ! # any later version. ! ! # This program is distributed in the hope that it will be useful, ! # but WITHOUT ANY WARRANTY; without even the implied warranty of ! # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ! # GNU General Public License for more details. ! ! # You should have received a copy of the GNU General Public License ! # along with this program; if not, write to the Free Software ! # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ! # 02111-1307, USA. ! ! # serial 3 ! ! # AM_MISSING_PROG(NAME, PROGRAM) ! # ------------------------------ AC_DEFUN([AM_MISSING_PROG], ! [AC_REQUIRE([AM_MISSING_HAS_RUN]) ! $1=${$1-"${am_missing_run}$2"} ! AC_SUBST($1)]) ! ! ! # AM_MISSING_HAS_RUN ! # ------------------ ! # Define MISSING if not defined so far and test if it supports --run. ! # If it does, set am_missing_run to use it, otherwise, to nothing. ! AC_DEFUN([AM_MISSING_HAS_RUN], ! [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl ! test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing" ! # Use eval to expand $SHELL ! if eval "$MISSING --run true"; then ! am_missing_run="$MISSING --run " else ! am_missing_run= ! AC_MSG_WARN([`missing' script is too old or missing]) fi ! ]) ! ! # AM_AUX_DIR_EXPAND ! ! # Copyright 2001 Free Software Foundation, Inc. ! ! # This program is free software; you can redistribute it and/or modify ! # it under the terms of the GNU General Public License as published by ! # the Free Software Foundation; either version 2, or (at your option) ! # any later version. ! ! # This program is distributed in the hope that it will be useful, ! # but WITHOUT ANY WARRANTY; without even the implied warranty of ! # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ! # GNU General Public License for more details. ! ! # You should have received a copy of the GNU General Public License ! # along with this program; if not, write to the Free Software ! # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ! # 02111-1307, USA. ! ! # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets ! # $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to ! # `$srcdir', `$srcdir/..', or `$srcdir/../..'. ! # ! # Of course, Automake must honor this variable whenever it calls a ! # tool from the auxiliary directory. The problem is that $srcdir (and ! # therefore $ac_aux_dir as well) can be either absolute or relative, ! # depending on how configure is run. This is pretty annoying, since ! # it makes $ac_aux_dir quite unusable in subdirectories: in the top ! # source directory, any form will work fine, but in subdirectories a ! # relative path needs to be adjusted first. ! # ! # $ac_aux_dir/missing ! # fails when called from a subdirectory if $ac_aux_dir is relative ! # $top_srcdir/$ac_aux_dir/missing ! # fails if $ac_aux_dir is absolute, ! # fails when called from a subdirectory in a VPATH build with ! # a relative $ac_aux_dir ! # ! # The reason of the latter failure is that $top_srcdir and $ac_aux_dir ! # are both prefixed by $srcdir. In an in-source build this is usually ! # harmless because $srcdir is `.', but things will broke when you ! # start a VPATH build or use an absolute $srcdir. ! # ! # So we could use something similar to $top_srcdir/$ac_aux_dir/missing, ! # iff we strip the leading $srcdir from $ac_aux_dir. That would be: ! # am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"` ! # and then we would define $MISSING as ! # MISSING="\${SHELL} $am_aux_dir/missing" ! # This will work as long as MISSING is not called from configure, because ! # unfortunately $(top_srcdir) has no meaning in configure. ! # However there are other variables, like CC, which are often used in ! # configure, and could therefore not use this "fixed" $ac_aux_dir. ! # ! # Another solution, used here, is to always expand $ac_aux_dir to an ! # absolute PATH. The drawback is that using absolute paths prevent a ! # configured tree to be moved without reconfiguration. ! ! # Rely on autoconf to set up CDPATH properly. ! AC_PREREQ([2.50]) ! ! AC_DEFUN([AM_AUX_DIR_EXPAND], [ ! # expand $ac_aux_dir to an absolute path ! am_aux_dir=`cd $ac_aux_dir && pwd` ! ]) ! ! # AM_PROG_INSTALL_SH ! # ------------------ ! # Define $install_sh. ! ! # Copyright 2001 Free Software Foundation, Inc. ! ! # This program is free software; you can redistribute it and/or modify ! # it under the terms of the GNU General Public License as published by ! # the Free Software Foundation; either version 2, or (at your option) ! # any later version. ! ! # This program is distributed in the hope that it will be useful, ! # but WITHOUT ANY WARRANTY; without even the implied warranty of ! # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ! # GNU General Public License for more details. ! ! # You should have received a copy of the GNU General Public License ! # along with this program; if not, write to the Free Software ! # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ! # 02111-1307, USA. ! ! AC_DEFUN([AM_PROG_INSTALL_SH], ! [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl ! install_sh=${install_sh-"$am_aux_dir/install-sh"} ! AC_SUBST(install_sh)]) ! ! # AM_PROG_INSTALL_STRIP ! ! # Copyright 2001 Free Software Foundation, Inc. ! ! # This program is free software; you can redistribute it and/or modify ! # it under the terms of the GNU General Public License as published by ! # the Free Software Foundation; either version 2, or (at your option) ! # any later version. ! ! # This program is distributed in the hope that it will be useful, ! # but WITHOUT ANY WARRANTY; without even the implied warranty of ! # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ! # GNU General Public License for more details. ! ! # You should have received a copy of the GNU General Public License ! # along with this program; if not, write to the Free Software ! # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ! # 02111-1307, USA. ! ! # One issue with vendor `install' (even GNU) is that you can't ! # specify the program used to strip binaries. This is especially ! # annoying in cross-compiling environments, where the build's strip ! # is unlikely to handle the host's binaries. ! # Fortunately install-sh will honor a STRIPPROG variable, so we ! # always use install-sh in `make install-strip', and initialize ! # STRIPPROG with the value of the STRIP variable (set by the user). ! AC_DEFUN([AM_PROG_INSTALL_STRIP], ! [AC_REQUIRE([AM_PROG_INSTALL_SH])dnl ! # Installed binaries are usually stripped using `strip' when the user ! # run `make install-strip'. However `strip' might not be the right ! # tool to use in cross-compilation environments, therefore Automake ! # will honor the `STRIP' environment variable to overrule this program. ! dnl Don't test for $cross_compiling = yes, because it might be `maybe'. ! if test "$cross_compiling" != no; then ! AC_CHECK_TOOL([STRIP], [strip], :) ! fi ! INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s" ! AC_SUBST([INSTALL_STRIP_PROGRAM])]) ! ! # serial 4 -*- Autoconf -*- ! ! # Copyright 1999, 2000, 2001 Free Software Foundation, Inc. ! ! # This program is free software; you can redistribute it and/or modify ! # it under the terms of the GNU General Public License as published by ! # the Free Software Foundation; either version 2, or (at your option) ! # any later version. ! ! # This program is distributed in the hope that it will be useful, ! # but WITHOUT ANY WARRANTY; without even the implied warranty of ! # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ! # GNU General Public License for more details. ! ! # You should have received a copy of the GNU General Public License ! # along with this program; if not, write to the Free Software ! # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ! # 02111-1307, USA. ! ! ! # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be ! # written in clear, in which case automake, when reading aclocal.m4, ! # will think it sees a *use*, and therefore will trigger all it's ! # C support machinery. Also note that it means that autoscan, seeing ! # CC etc. in the Makefile, will ask for an AC_PROG_CC use... ! ! ! ! # _AM_DEPENDENCIES(NAME) ! # ---------------------- ! # See how the compiler implements dependency checking. ! # NAME is "CC", "CXX", "GCJ", or "OBJC". ! # We try a few techniques and use that to set a single cache variable. ! # ! # We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was ! # modified to invoke _AM_DEPENDENCIES(CC); we would have a circular ! # dependency, and given that the user is not expected to run this macro, ! # just rely on AC_PROG_CC. ! AC_DEFUN([_AM_DEPENDENCIES], ! [AC_REQUIRE([AM_SET_DEPDIR])dnl ! AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl ! AC_REQUIRE([AM_MAKE_INCLUDE])dnl ! AC_REQUIRE([AM_DEP_TRACK])dnl ! ! ifelse([$1], CC, [depcc="$CC" am_compiler_list=], ! [$1], CXX, [depcc="$CXX" am_compiler_list=], ! [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'], ! [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], ! [depcc="$$1" am_compiler_list=]) ! ! AC_CACHE_CHECK([dependency style of $depcc], ! [am_cv_$1_dependencies_compiler_type], ! [if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then ! # We make a subdir and do the tests there. Otherwise we can end up ! # making bogus files that we don't know about and never remove. For ! # instance it was reported that on HP-UX the gcc test will end up ! # making a dummy file named `D' -- because `-MD' means `put the output ! # in D'. ! mkdir conftest.dir ! # Copy depcomp to subdir because otherwise we won't find it if we're ! # using a relative directory. ! cp "$am_depcomp" conftest.dir ! cd conftest.dir ! ! am_cv_$1_dependencies_compiler_type=none ! if test "$am_compiler_list" = ""; then ! am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp` ! fi ! for depmode in $am_compiler_list; do ! # We need to recreate these files for each test, as the compiler may ! # overwrite some of them when testing with obscure command lines. ! # This happens at least with the AIX C compiler. ! echo '#include "conftest.h"' > conftest.c ! echo 'int i;' > conftest.h ! echo "${am__include} ${am__quote}conftest.Po${am__quote}" > confmf ! ! case $depmode in ! nosideeffect) ! # after this tag, mechanisms are not by side-effect, so they'll ! # only be used when explicitly requested ! if test "x$enable_dependency_tracking" = xyes; then ! continue ! else ! break ! fi ! ;; ! none) break ;; ! esac ! # We check with `-c' and `-o' for the sake of the "dashmstdout" ! # mode. It turns out that the SunPro C++ compiler does not properly ! # handle `-M -o', and we need to detect this. ! if depmode=$depmode \ ! source=conftest.c object=conftest.o \ ! depfile=conftest.Po tmpdepfile=conftest.TPo \ ! $SHELL ./depcomp $depcc -c -o conftest.o conftest.c >/dev/null 2>&1 && ! grep conftest.h conftest.Po > /dev/null 2>&1 && ! ${MAKE-make} -s -f confmf > /dev/null 2>&1; then ! am_cv_$1_dependencies_compiler_type=$depmode ! break ! fi ! done ! ! cd .. ! rm -rf conftest.dir ! else ! am_cv_$1_dependencies_compiler_type=none ! fi ! ]) ! AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type]) ! AM_CONDITIONAL([am__fastdep$1], [ ! test "x$enable_dependency_tracking" != xno \ ! && test "$am_cv_$1_dependencies_compiler_type" = gcc3]) ! ]) ! ! ! # AM_SET_DEPDIR ! # ------------- ! # Choose a directory name for dependency files. ! # This macro is AC_REQUIREd in _AM_DEPENDENCIES ! AC_DEFUN([AM_SET_DEPDIR], ! [rm -f .deps 2>/dev/null ! mkdir .deps 2>/dev/null ! if test -d .deps; then ! DEPDIR=.deps ! else ! # MS-DOS does not allow filenames that begin with a dot. ! DEPDIR=_deps ! fi ! rmdir .deps 2>/dev/null ! AC_SUBST([DEPDIR]) ! ]) ! ! ! # AM_DEP_TRACK ! # ------------ ! AC_DEFUN([AM_DEP_TRACK], ! [AC_ARG_ENABLE(dependency-tracking, ! [ --disable-dependency-tracking Speeds up one-time builds ! --enable-dependency-tracking Do not reject slow dependency extractors]) ! if test "x$enable_dependency_tracking" != xno; then ! am_depcomp="$ac_aux_dir/depcomp" ! AMDEPBACKSLASH='\' ! fi ! AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) ! AC_SUBST([AMDEPBACKSLASH]) ! ]) ! ! # Generate code to set up dependency tracking. -*- Autoconf -*- ! ! # Copyright 1999, 2000, 2001, 2002 Free Software Foundation, Inc. ! ! # This program is free software; you can redistribute it and/or modify ! # it under the terms of the GNU General Public License as published by ! # the Free Software Foundation; either version 2, or (at your option) ! # any later version. ! ! # This program is distributed in the hope that it will be useful, ! # but WITHOUT ANY WARRANTY; without even the implied warranty of ! # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ! # GNU General Public License for more details. ! ! # You should have received a copy of the GNU General Public License ! # along with this program; if not, write to the Free Software ! # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ! # 02111-1307, USA. ! ! #serial 2 ! ! # _AM_OUTPUT_DEPENDENCY_COMMANDS ! # ------------------------------ ! AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], ! [for mf in $CONFIG_FILES; do ! # Strip MF so we end up with the name of the file. ! mf=`echo "$mf" | sed -e 's/:.*$//'` ! # Check whether this is an Automake generated Makefile or not. ! # We used to match only the files named `Makefile.in', but ! # some people rename them; so instead we look at the file content. ! # Grep'ing the first line is not enough: some people post-process ! # each Makefile.in and add a new line on top of each file to say so. ! # So let's grep whole file. ! if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then ! dirpart=`AS_DIRNAME("$mf")` ! else ! continue ! fi ! grep '^DEP_FILES *= *[[^ @%:@]]' < "$mf" > /dev/null || continue ! # Extract the definition of DEP_FILES from the Makefile without ! # running `make'. ! DEPDIR=`sed -n -e '/^DEPDIR = / s///p' < "$mf"` ! test -z "$DEPDIR" && continue ! # When using ansi2knr, U may be empty or an underscore; expand it ! U=`sed -n -e '/^U = / s///p' < "$mf"` ! test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR" ! # We invoke sed twice because it is the simplest approach to ! # changing $(DEPDIR) to its actual value in the expansion. ! for file in `sed -n -e ' ! /^DEP_FILES = .*\\\\$/ { ! s/^DEP_FILES = // ! :loop ! s/\\\\$// ! p ! n ! /\\\\$/ b loop ! p ! } ! /^DEP_FILES = / s/^DEP_FILES = //p' < "$mf" | \ ! sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do ! # Make sure the directory exists. ! test -f "$dirpart/$file" && continue ! fdir=`AS_DIRNAME(["$file"])` ! AS_MKDIR_P([$dirpart/$fdir]) ! # echo "creating $dirpart/$file" ! echo '# dummy' > "$dirpart/$file" ! done ! done ! ])# _AM_OUTPUT_DEPENDENCY_COMMANDS ! ! ! # AM_OUTPUT_DEPENDENCY_COMMANDS ! # ----------------------------- ! # This macro should only be invoked once -- use via AC_REQUIRE. ! # ! # This code is only required when automatic dependency tracking ! # is enabled. FIXME. This creates each `.P' file that we will ! # need in order to bootstrap the dependency handling code. ! AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], ! [AC_CONFIG_COMMANDS([depfiles], ! [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS], ! [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) ! ]) ! ! # Check to see how 'make' treats includes. -*- Autoconf -*- ! ! # Copyright (C) 2001, 2002 Free Software Foundation, Inc. ! ! # This program is free software; you can redistribute it and/or modify ! # it under the terms of the GNU General Public License as published by ! # the Free Software Foundation; either version 2, or (at your option) ! # any later version. ! ! # This program is distributed in the hope that it will be useful, ! # but WITHOUT ANY WARRANTY; without even the implied warranty of ! # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ! # GNU General Public License for more details. ! ! # You should have received a copy of the GNU General Public License ! # along with this program; if not, write to the Free Software ! # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ! # 02111-1307, USA. ! ! # serial 2 ! ! # AM_MAKE_INCLUDE() ! # ----------------- ! # Check to see how make treats includes. ! AC_DEFUN([AM_MAKE_INCLUDE], ! [am_make=${MAKE-make} ! cat > confinc << 'END' ! doit: ! @echo done ! END ! # If we don't find an include directive, just comment out the code. ! AC_MSG_CHECKING([for style of include used by $am_make]) ! am__include="#" ! am__quote= ! _am_result=none ! # First try GNU make style include. ! echo "include confinc" > confmf ! # We grep out `Entering directory' and `Leaving directory' ! # messages which can occur if `w' ends up in MAKEFLAGS. ! # In particular we don't look at `^make:' because GNU make might ! # be invoked under some other name (usually "gmake"), in which ! # case it prints its new name instead of `make'. ! if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then ! am__include=include ! am__quote= ! _am_result=GNU ! fi ! # Now try BSD make style include. ! if test "$am__include" = "#"; then ! echo '.include "confinc"' > confmf ! if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then ! am__include=.include ! am__quote="\"" ! _am_result=BSD ! fi ! fi ! AC_SUBST(am__include) ! AC_SUBST(am__quote) ! AC_MSG_RESULT($_am_result) ! rm -f confinc confmf ! ]) ! ! # AM_CONDITIONAL -*- Autoconf -*- ! ! # Copyright 1997, 2000, 2001 Free Software Foundation, Inc. ! ! # This program is free software; you can redistribute it and/or modify ! # it under the terms of the GNU General Public License as published by ! # the Free Software Foundation; either version 2, or (at your option) ! # any later version. ! ! # This program is distributed in the hope that it will be useful, ! # but WITHOUT ANY WARRANTY; without even the implied warranty of ! # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ! # GNU General Public License for more details. ! ! # You should have received a copy of the GNU General Public License ! # along with this program; if not, write to the Free Software ! # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ! # 02111-1307, USA. ! ! # serial 5 ! ! AC_PREREQ(2.52) ! ! # AM_CONDITIONAL(NAME, SHELL-CONDITION) ! # ------------------------------------- ! # Define a conditional. ! AC_DEFUN([AM_CONDITIONAL], ! [ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], ! [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl ! AC_SUBST([$1_TRUE]) ! AC_SUBST([$1_FALSE]) ! if $2; then ! $1_TRUE= ! $1_FALSE='#' ! else ! $1_TRUE='#' ! $1_FALSE= ! fi ! AC_CONFIG_COMMANDS_PRE( ! [if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then ! AC_MSG_ERROR([conditional "$1" was never defined. ! Usually this means the macro was only invoked conditionally.]) ! fi])]) # Add --enable-maintainer-mode option to configure. # From Jim Meyering ! # Copyright 1996, 1998, 2000, 2001, 2002 Free Software Foundation, Inc. ! ! # This program is free software; you can redistribute it and/or modify ! # it under the terms of the GNU General Public License as published by ! # the Free Software Foundation; either version 2, or (at your option) ! # any later version. ! ! # This program is distributed in the hope that it will be useful, ! # but WITHOUT ANY WARRANTY; without even the implied warranty of ! # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ! # GNU General Public License for more details. ! ! # You should have received a copy of the GNU General Public License ! # along with this program; if not, write to the Free Software ! # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ! # 02111-1307, USA. ! ! # serial 2 AC_DEFUN([AM_MAINTAINER_MODE], [AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) *************** *** 354,378 **** (and sometimes confusing) to the casual installer], USE_MAINTAINER_MODE=$enableval, USE_MAINTAINER_MODE=no) ! AC_MSG_RESULT($USE_MAINTAINER_MODE) ! AM_CONDITIONAL(MAINTAINER_MODE, test $USE_MAINTAINER_MODE = yes) MAINT=$MAINTAINER_MODE_TRUE AC_SUBST(MAINT)dnl ] ) ! # Define a conditional. ! ! AC_DEFUN([AM_CONDITIONAL], ! [AC_SUBST($1_TRUE) ! AC_SUBST($1_FALSE) ! if $2; then ! $1_TRUE= ! $1_FALSE='#' ! else ! $1_TRUE='#' ! $1_FALSE= ! fi]) # gnome-common.m4 # --- 1025,1038 ---- (and sometimes confusing) to the casual installer], USE_MAINTAINER_MODE=$enableval, USE_MAINTAINER_MODE=no) ! AC_MSG_RESULT([$USE_MAINTAINER_MODE]) ! AM_CONDITIONAL(MAINTAINER_MODE, [test $USE_MAINTAINER_MODE = yes]) MAINT=$MAINTAINER_MODE_TRUE AC_SUBST(MAINT)dnl ] ) ! AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE]) # gnome-common.m4 # *************** *** 395,497 **** AM_CONDITIONAL(INSIDE_GNOME_DOCU, false) ]) AC_DEFUN([GNOME_DEBUG_CHECK], [ AC_ARG_ENABLE(debug, [ --enable-debug turn on debugging [default=no]], enable_debug="$enableval", enable_debug=no) if test x$enable_debug = xyes ; then ! AC_DEFINE(GNOME_ENABLE_DEBUG,1, ! [Enable additional debugging at the expense of performance and size]) fi ]) ! -*- mode: autoconf -*- ! # GNOME_AUTOGEN_OBSOLETE ! # this marker is checked for in the aclocal.m4 file to check for bad macros ... ! AU_DEFUN([AM_GNOME2_GETTEXT], [AM_GLIB_GNU_GETTEXT]) ! AU_DEFUN([GNOME_GTKDOC_CHECK], [GTK_DOC_CHECK]) ! AU_DEFUN([GNOME2_X_CHECKS], []) ! AU_DEFUN([GNOME_PTHREAD_CHECK], []) ! AU_DEFUN([GNOME_CHECK_PKGCONFIG], []) ! AU_DEFUN([GNOME_REQUIRE_PKGCONFIG], []) ! AU_DEFUN([GNOME_PLATFORM_GNOME_2], []) ! AU_DEFUN([GNOME_CHECK_CXX], ! [ ! # see if a C++ compiler exists and works ! AC_PROG_CXX ! if test "x$ac_cv_prog_cxx_works" = xno; then ! AC_MSG_WARN(ifelse([$1], , "No C++ compiler", [$1])) ! fi ! AM_CONDITIONAL(CXX_PRESENT, test "x$ac_cv_prog_cxx_works" != xno) ! ]) ! ! # for aclocal-1.4's benefit ! # AC_DEFUN([AM_GNOME2_GETTEXT], []) ! # AC_DEFUN([GNOME_GTKDOC_CHECK], []) ! # AC_DEFUN([GNOME2_X_CHECKS], []) ! # AC_DEFUN([GNOME_PTHREAD_CHECK], []) ! # AC_DEFUN([GNOME_CHECK_PKGCONFIG], []) ! # AC_DEFUN([GNOME_REQUIRE_PKGCONFIG], []) ! # AC_DEFUN([GNOME_PLATFORM_GNOME_2], []) ! # AC_DEFUN([GNOME_CHECK_CXX], []) ! ! dnl -*- mode: autoconf -*- ! ! # serial 1 ! ! dnl Usage: ! dnl GTK_DOC_CHECK([minimum-gtk-doc-version]) ! AC_DEFUN([GTK_DOC_CHECK], ! [ ! AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first ! AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first ! dnl for overriding the documentation installation directory ! AC_ARG_WITH(html-dir, ! AC_HELP_STRING([--with-html-dir=PATH], [path to installed docs]),, ! [with_html_dir='${datadir}/gtk-doc/html']) ! HTML_DIR="$with_html_dir" ! AC_SUBST(HTML_DIR) ! ! dnl enable/disable documentation building ! AC_ARG_ENABLE(gtk-doc, ! AC_HELP_STRING([--enable-gtk-doc], ! [use gtk-doc to build documentation [default=no]]),, ! enable_gtk_doc=no) ! have_gtk_doc=no ! if test -z "$PKG_CONFIG"; then ! AC_PATH_PROG(PKG_CONFIG, pkg-config, no) ! fi ! if test "$PKG_CONFIG" != "no" && $PKG_CONFIG --exists gtk-doc; then ! have_gtk_doc=yes ! fi ! dnl do we want to do a version check? ! ifelse([$1],[],, ! [gtk_doc_min_version=$1 ! if test "$have_gtk_doc" = yes; then ! AC_MSG_CHECKING([gtk-doc version >= $gtk_doc_min_version]) ! if $PKG_CONFIG --atleast-version $gtk_doc_min_version gtk-doc; then ! AC_MSG_RESULT(yes) ! else ! AC_MSG_RESULT(no) ! have_gtk_doc=no ! fi ! fi ]) - if test x$enable_gtk_doc = xyes; then - if test "$have_gtk_doc" != yes; then - enable_gtk_doc=no - fi - fi ! AM_CONDITIONAL(ENABLE_GTK_DOC, test x$enable_gtk_doc = xyes) ! AM_CONDITIONAL(GTK_DOC_USE_LIBTOOL, test -n "$LIBTOOL") ]) # libtool.m4 - Configure libtool for the host system. -*-Shell-script-*- # serial 46 AC_PROG_LIBTOOL --- 1055,1191 ---- AM_CONDITIONAL(INSIDE_GNOME_DOCU, false) ]) + AC_DEFUN([GNOME_GTKDOC_CHECK], + [ + AC_CHECK_PROG(GTKDOC, gtkdoc-mkdb, true, false) + AM_CONDITIONAL(HAVE_GTK_DOC, $GTKDOC) + AC_SUBST(HAVE_GTK_DOC) + + dnl Let people disable the gtk-doc stuff. + AC_ARG_ENABLE(gtk-doc, [ --enable-gtk-doc Use gtk-doc to build documentation [default=auto]], enable_gtk_doc="$enableval", enable_gtk_doc=auto) + + if test x$enable_gtk_doc = xauto ; then + if test x$GTKDOC = xtrue ; then + enable_gtk_doc=yes + else + enable_gtk_doc=no + fi + fi + + dnl NOTE: We need to use a separate automake conditional for this + dnl to make this work with the tarballs. + AM_CONDITIONAL(ENABLE_GTK_DOC, test x$enable_gtk_doc = xyes) + ]) + AC_DEFUN([GNOME_DEBUG_CHECK], [ AC_ARG_ENABLE(debug, [ --enable-debug turn on debugging [default=no]], enable_debug="$enableval", enable_debug=no) if test x$enable_debug = xyes ; then ! AC_DEFINE(GNOME_ENABLE_DEBUG, 1, [Enable additional debugging at the expense of performance and size]) fi ]) ! dnl ! dnl GNOME_PLATFORM_GNOME_2(default, [force]) ! dnl ! dnl If the first parameter is `yes', then the default is ! dnl the GNOME 2.x platform, otherwise the GNOME 1.x one. ! dnl ! dnl If the optional second parameter is `force', then use ! dnl the default value without command line argument. ! dnl ! ! AC_DEFUN([GNOME_PLATFORM_GNOME_2],[ ! AC_REQUIRE([GNOME_REQUIRE_PKGCONFIG]) ! if test x$1 = xyes ; then ! platform_gnome_2_default=yes ! else ! platform_gnome_2_default=no ! fi ! if test x$2 = xforce ; then ! platform_gnome_2="$platform_gnome_2_default"; ! else ! AC_ARG_ENABLE(platform-gnome-2, [ --enable-platform-gnome-2 enable GNOME 2.x platform [default=no]],[platform_gnome_2="$enableval"],[platform_gnome_2="$platform_gnome_2_default"]) ! fi ! AM_CONDITIONAL(PLATFORM_GNOME_2, test $platform_gnome_2 = yes) ! AC_MSG_CHECKING(for GNOME Platform) ! if test $platform_gnome_2 = yes; then ! AC_MSG_RESULT(GNOME 2.x) ! GNOME_INTERFACE_VERSION=2 ! GNOME_REQUIRE_PKGCONFIG ! else ! AC_MSG_RESULT(GNOME 1.x) ! GNOME_INTERFACE_VERSION=1 ! fi ! AC_SUBST(GNOME_INTERFACE_VERSION) ! ]) ! dnl ! dnl GNOME_CHECK_PKGCONFIG (script-if-enabled, [failflag]) ! dnl ! AC_DEFUN([GNOME_CHECK_PKGCONFIG],[ ! AC_PATH_PROG(PKG_CONFIG, pkg-config) ! have_pkgconfig=no ! if test -x "$PKG_CONFIG" ; then ! have_pkgconfig=yes ! else ! PKG_CONFIG= ! fi ! AC_MSG_CHECKING(for pkg-config) ! pkgconfig_required_version=0.8.0 ! if test x$have_pkgconfig = xyes ; then ! if ! $PKG_CONFIG --atleast-pkgconfig-version $pkgconfig_required_version; then ! echo "*** Your version of pkg-config is too old. You need version $pkgconfig_required_version or newer." ! echo "*** See http://www.freedesktop.org/software/pkgconfig" ! have_pkgconfig=no ! fi ! fi ! if test x$have_pkgconfig = xyes ; then ! AC_MSG_RESULT(yes) ! else ! PKG_CONFIG= ! AC_MSG_RESULT(not found) ! if test x$2 = xfail; then ! AC_MSG_ERROR([ ! *** You need the latest pkg-config (at least $pkgconfig_required_version). ! *** Get the latest version of pkg-config from ! *** http://www.freedesktop.org/software/pkgconfig.]) ! fi ! fi ! AC_SUBST(PKG_CONFIG) ! AC_PROVIDE([GNOME_REQUIRE_PKGCONFIG]) ]) ! dnl ! dnl GNOME_REQUIRE_PKGCONFIG ! dnl ! AC_DEFUN([GNOME_REQUIRE_PKGCONFIG],[ ! GNOME_CHECK_PKGCONFIG([], fail) ]) + #serial 1 + # This test replaces the one in autoconf. + # Currently this macro should have the same name as the autoconf macro + # because gettext's gettext.m4 (distributed in the automake package) + # still uses it. Otherwise, the use in gettext.m4 makes autoheader + # give these diagnostics: + # configure.in:556: AC_TRY_COMPILE was called before AC_ISC_POSIX + # configure.in:556: AC_TRY_RUN was called before AC_ISC_POSIX + + undefine([AC_ISC_POSIX]) + + AC_DEFUN([AC_ISC_POSIX], + [ + dnl This test replaces the obsolescent AC_ISC_POSIX kludge. + AC_CHECK_LIB(cposix, strerror, [LIBS="$LIBS -lcposix"]) + ] + ) + # libtool.m4 - Configure libtool for the host system. -*-Shell-script-*- # serial 46 AC_PROG_LIBTOOL *************** *** 521,528 **** AC_REQUIRE([AC_PROG_LD])dnl AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl AC_REQUIRE([AC_PROG_NM])dnl - AC_REQUIRE([LT_AC_PROG_SED])dnl - AC_REQUIRE([AC_PROG_LN_S])dnl AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl AC_REQUIRE([AC_OBJEXT])dnl --- 1215,1220 ---- *************** *** 690,701 **** lt_cv_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern char \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" lt_cv_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" ;; ! irix* | nonstopux*) symcode='[[BCDEGRST]]' ;; - osf*) - symcode='[[BCDEGQRST]]' - ;; solaris* | sysv5*) symcode='[[BDT]]' ;; --- 1382,1390 ---- lt_cv_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern char \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" lt_cv_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" ;; ! irix*) symcode='[[BCDEGRST]]' ;; solaris* | sysv5*) symcode='[[BDT]]' ;; *************** *** 792,798 **** save_CFLAGS="$CFLAGS" LIBS="conftstm.$ac_objext" CFLAGS="$CFLAGS$no_builtin_flag" ! if AC_TRY_EVAL(ac_link) && test -s conftest$ac_exeext; then pipe_works=yes fi LIBS="$save_LIBS" --- 1481,1487 ---- save_CFLAGS="$CFLAGS" LIBS="conftstm.$ac_objext" CFLAGS="$CFLAGS$no_builtin_flag" ! if AC_TRY_EVAL(ac_link) && test -s conftest; then pipe_works=yes fi LIBS="$save_LIBS" *************** *** 1336,1342 **** # like `-m68040'. lt_cv_prog_cc_pic='-m68020 -resident32 -malways-restore-a4' ;; ! beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) # PIC is the default for these OSes. ;; darwin* | rhapsody*) --- 2025,2031 ---- # like `-m68040'. lt_cv_prog_cc_pic='-m68020 -resident32 -malways-restore-a4' ;; ! beos* | irix5* | irix6* | osf3* | osf4* | osf5*) # PIC is the default for these OSes. ;; darwin* | rhapsody*) *************** *** 1379,1385 **** lt_cv_prog_cc_pic='+Z' ;; ! irix5* | irix6* | nonstopux*) lt_cv_prog_cc_wl='-Wl,' lt_cv_prog_cc_static='-non_shared' # PIC (with -KPIC) is the default. --- 2068,2074 ---- lt_cv_prog_cc_pic='+Z' ;; ! irix5* | irix6*) lt_cv_prog_cc_wl='-Wl,' lt_cv_prog_cc_static='-non_shared' # PIC (with -KPIC) is the default. *************** *** 1423,1429 **** sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) lt_cv_prog_cc_pic='-KPIC' lt_cv_prog_cc_static='-Bstatic' ! lt_cv_prog_cc_wl='-Wl,' ;; uts4*) --- 2112,2122 ---- sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) lt_cv_prog_cc_pic='-KPIC' lt_cv_prog_cc_static='-Bstatic' ! if test "x$host_vendor" = xsni; then ! lt_cv_prog_cc_wl='-LD' ! else ! lt_cv_prog_cc_wl='-Wl,' ! fi ;; uts4*) *************** *** 1645,1650 **** --- 2338,2344 ---- old_archive_from_new_cmds= old_archive_from_expsyms_cmds= export_dynamic_flag_spec= + use_runtimelinking= whole_archive_flag_spec= thread_safe_flag_spec= hardcode_into_libs=no *************** *** 1788,1794 **** # If the export-symbols file already is a .def file (1st line # is EXPORTS), use it as is. # If DATA tags from a recent dlltool are present, honour them! ! archive_expsym_cmds='if test "x`sed 1q $export_symbols`" = xEXPORTS; then cp $export_symbols $output_objdir/$soname-def; else echo EXPORTS > $output_objdir/$soname-def; --- 2482,2488 ---- # If the export-symbols file already is a .def file (1st line # is EXPORTS), use it as is. # If DATA tags from a recent dlltool are present, honour them! ! archive_expsym_cmds='if test "x`head -1 $export_symbols`" = xEXPORTS; then cp $export_symbols $output_objdir/$soname-def; else echo EXPORTS > $output_objdir/$soname-def; *************** *** 1797,1803 **** set dummy \$symbol; case \[$]# in 2) echo " \[$]2 @ \$_lt_hint ; " >> $output_objdir/$soname-def;; - 4) echo " \[$]2 \[$]3 \[$]4 ; " >> $output_objdir/$soname-def; _lt_hint=`expr \$_lt_hint - 1`;; *) echo " \[$]2 @ \$_lt_hint \[$]3 ; " >> $output_objdir/$soname-def;; esac; _lt_hint=`expr 1 + \$_lt_hint`; --- 2491,2496 ---- *************** *** 1902,1926 **** aix_use_runtimelinking=no exp_sym_flag='-Bexport' no_entry_flag="" else ! aix_use_runtimelinking=no ! ! # Test if we are trying to use run time linking or normal ! # AIX style linking. If -brtl is somewhere in LDFLAGS, we ! # need to do runtime linking. ! case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*) ! for ld_flag in $LDFLAGS; do ! case $ld_flag in ! *-brtl*) ! aix_use_runtimelinking=yes ! break ! ;; ! esac ! done ! esac ! exp_sym_flag='-bexport' no_entry_flag='-bnoentry' fi # When large executables or shared objects are built, AIX ld can --- 2595,2607 ---- aix_use_runtimelinking=no exp_sym_flag='-Bexport' no_entry_flag="" + use_runtimelinking="" else ! aix_use_runtimelinking=yes ! export_dynamic_flag_spec='-bexpall' exp_sym_flag='-bexport' no_entry_flag='-bnoentry' + use_runtimelinking='-brtl' fi # When large executables or shared objects are built, AIX ld can *************** *** 1955,1969 **** shared_flag='-shared' else # not using gcc ! if test "$host_cpu" = ia64; then ! shared_flag='${wl}-G' ! else ! if test "$aix_use_runtimelinking" = yes; then ! shared_flag='${wl}-G' ! else ! shared_flag='${wl}-bM:SRE' ! fi ! fi fi # It seems that -bexpall can do strange things, so it is better to --- 2636,2642 ---- shared_flag='-shared' else # not using gcc ! shared_flag='${wl}-G' fi # It seems that -bexpall can do strange things, so it is better to *************** *** 1973,1980 **** # Warning - without using the other runtime loading flags (-brtl), # -berok will link without error, but may produce a broken library. allow_undefined_flag='-berok' ! hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:/usr/lib:/lib' ! archive_expsym_cmds="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag" else if test "$host_cpu" = ia64; then hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib' --- 2646,2653 ---- # Warning - without using the other runtime loading flags (-brtl), # -berok will link without error, but may produce a broken library. allow_undefined_flag='-berok' ! hardcode_libdir_flag_spec='${wl}-bnolibpath ${wl}-blibpath:$libdir:/usr/lib:/lib' ! archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"' ~$AR -crlo $output_objdir/$libname$release.a $output_objdir/$soname' else if test "$host_cpu" = ia64; then hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib' *************** *** 1987,1993 **** allow_undefined_flag='${wl}-berok' # This is a bit strange, but is similar to how AIX traditionally builds # it's shared libraries. ! archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"' ~$AR -crlo $objdir/$libname$release.a $objdir/$soname' fi fi ;; --- 2660,2666 ---- allow_undefined_flag='${wl}-berok' # This is a bit strange, but is similar to how AIX traditionally builds # it's shared libraries. ! archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"' ~$AR -crlo $output_objdir/$libname$release.a $output_objdir/$soname' fi fi ;; *************** *** 2029,2037 **** esac # FIXME: Relying on posixy $() will cause problems for # cross-compilation, but unfortunately the echo tests do not ! # yet detect zsh echo's removal of \ escapes. Also zsh mangles ! # `"' quotes if we put them in here... so don't! ! archive_cmds='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs && $CC $(test .$module = .yes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib ${lib}-master.o $deplibs$linker_flags $(test .$module != .yes && echo -install_name $rpath/$soname $verstring)' # We need to add '_' to the symbols in $export_symbols first #archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols' hardcode_direct=yes --- 2702,2709 ---- esac # FIXME: Relying on posixy $() will cause problems for # cross-compilation, but unfortunately the echo tests do not ! # yet detect zsh echo's removal of \ escapes. ! archive_cmds='$nonopt $(test "x$module" = xyes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs$linker_flags -install_name $rpath/$soname $verstring' # We need to add '_' to the symbols in $export_symbols first #archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols' hardcode_direct=yes *************** *** 2083,2096 **** export_dynamic_flag_spec='${wl}-E' ;; ! irix5* | irix6* | nonstopux*) if test "$GCC" = yes; then archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' else archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' - hardcode_libdir_flag_spec='-rpath $libdir' fi hardcode_libdir_separator=: link_all_deplibs=yes ;; --- 2755,2767 ---- export_dynamic_flag_spec='${wl}-E' ;; ! irix5* | irix6*) if test "$GCC" = yes; then archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' else archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' fi + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' hardcode_libdir_separator=: link_all_deplibs=yes ;; *************** *** 2118,2124 **** hardcode_direct=yes hardcode_shlibpath_var=no if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then ! archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' hardcode_libdir_flag_spec='${wl}-rpath,$libdir' export_dynamic_flag_spec='${wl}-E' else --- 2789,2795 ---- hardcode_direct=yes hardcode_shlibpath_var=no if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then ! archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linker_flags' hardcode_libdir_flag_spec='${wl}-rpath,$libdir' export_dynamic_flag_spec='${wl}-E' else *************** *** 2128,2134 **** hardcode_libdir_flag_spec='-R$libdir' ;; *) ! archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' hardcode_libdir_flag_spec='${wl}-rpath,$libdir' ;; esac --- 2799,2805 ---- hardcode_libdir_flag_spec='-R$libdir' ;; *) ! archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linker_flags' hardcode_libdir_flag_spec='${wl}-rpath,$libdir' ;; esac *************** *** 2240,2262 **** ;; sysv4) ! case $host_vendor in ! sni) ! archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' ! hardcode_direct=yes # is this really true??? ! ;; ! siemens) ! ## LD is ld it makes a PLAMLIB ! ## CC just makes a GrossModule. ! archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags' ! reload_cmds='$CC -r -o $output$reload_objs' ! hardcode_direct=no ! ;; ! motorola) ! archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' ! hardcode_direct=no #Motorola manual says yes, but my tests say they lie ! ;; ! esac runpath_var='LD_RUN_PATH' hardcode_shlibpath_var=no ;; --- 2911,2923 ---- ;; sysv4) ! if test "x$host_vendor" = xsno; then ! archive_cmds='$LD -G -Bsymbolic -h $soname -o $lib $libobjs $deplibs $linker_flags' ! hardcode_direct=yes # is this really true??? ! else ! archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' ! hardcode_direct=no #Motorola manual says yes, but my tests say they lie ! fi runpath_var='LD_RUN_PATH' hardcode_shlibpath_var=no ;; *************** *** 2397,2405 **** aix4* | aix5*) version_type=linux - need_lib_prefix=no - need_version=no - hardcode_into_libs=yes if test "$host_cpu" = ia64; then # AIX 5 supports IA64 library_names_spec='${libname}${release}.so$major ${libname}${release}.so$versuffix $libname.so' --- 3058,3063 ---- *************** *** 2421,2444 **** fi ;; esac ! # AIX (on Power*) has no versioning support, so currently we can ! # not hardcode correct soname into executable. Probably we can ! # add versioning support to collect2, so additional links can ! # be useful in future. ! if test "$aix_use_runtimelinking" = yes; then ! # If using run time linking (on AIX 4.2 or later) use lib.so ! # instead of lib.a to let people know that these are not ! # typical AIX shared libraries. ! library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' ! else ! # We preserve .a as extension for shared libraries through AIX4.2 ! # and later when we are not doing run time linking. ! library_names_spec='${libname}${release}.a $libname.a' ! soname_spec='${libname}${release}.so$major' ! fi shlibpath_var=LIBPATH fi - hardcode_into_libs=yes ;; amigaos*) --- 3079,3090 ---- fi ;; esac ! # We preserve .a as extension for shared libraries through AIX4.2 ! library_names_spec='${libname}${release}.a $libname.a' ! soname_spec='${libname}${release}.so$major' shlibpath_var=LIBPATH + hardcode_into_libs=yes fi ;; amigaos*) *************** *** 2486,2492 **** ;; yes,mingw*) library_names_spec='${libname}`echo ${release} | sed -e 's/[[.]]/-/g'`${versuffix}.dll' ! sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | sed -e "s/^libraries://" -e "s/;/ /g" -e "s,=/,/,g"` ;; yes,pw32*) library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | sed -e 's/[.]/-/g'`${versuffix}.dll' --- 3132,3138 ---- ;; yes,mingw*) library_names_spec='${libname}`echo ${release} | sed -e 's/[[.]]/-/g'`${versuffix}.dll' ! sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | sed -e "s/^libraries://" -e "s/;/ /g"` ;; yes,pw32*) library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | sed -e 's/[.]/-/g'`${versuffix}.dll' *************** *** 2569,2585 **** postinstall_cmds='chmod 555 $lib' ;; ! irix5* | irix6* | nonstopux*) ! case $host_os in ! nonstopux*) version_type=nonstopux ;; ! *) version_type=irix ;; ! esac need_lib_prefix=no need_version=no soname_spec='${libname}${release}.so$major' library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so $libname.so' case $host_os in ! irix5* | nonstopux*) libsuff= shlibsuff= ;; *) --- 3215,3228 ---- postinstall_cmds='chmod 555 $lib' ;; ! irix5* | irix6*) ! version_type=irix need_lib_prefix=no need_version=no soname_spec='${libname}${release}.so$major' library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so $libname.so' case $host_os in ! irix5*) libsuff= shlibsuff= ;; *) *************** *** 2624,2649 **** # people can always --disable-shared, the test was removed, and we # assume the GNU/Linux dynamic linker is in use. dynamic_linker='GNU/Linux ld.so' - - # Find out which ABI we are using (multilib Linux x86_64 hack). - libsuff= - case "$host_cpu" in - x86_64*|s390x*) - echo '[#]line __oline__ "configure"' > conftest.$ac_ext - if AC_TRY_EVAL(ac_compile); then - case `/usr/bin/file conftest.$ac_objext` in - *64-bit*) - libsuff=64 - ;; - esac - fi - rm -rf conftest* - ;; - *) - ;; - esac - sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}" - sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" ;; netbsd*) --- 3267,3272 ---- *************** *** 2703,2714 **** osf3* | osf4* | osf5*) version_type=osf need_version=no ! soname_spec='${libname}${release}.so$major' ! library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' shlibpath_var=LD_LIBRARY_PATH sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" - hardcode_into_libs=yes ;; sco3.2v5*) --- 3326,3336 ---- osf3* | osf4* | osf5*) version_type=osf need_version=no ! soname_spec='${libname}${release}.so' ! library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so $libname.so' shlibpath_var=LD_LIBRARY_PATH sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" ;; sco3.2v5*) *************** *** 2751,2762 **** case $host_vendor in sni) shlibpath_overrides_runpath=no - need_lib_prefix=no - export_dynamic_flag_spec='${wl}-Blargedynsym' - runpath_var=LD_RUN_PATH - ;; - siemens) - need_lib_prefix=no ;; motorola) need_lib_prefix=no --- 3373,3378 ---- *************** *** 2818,2824 **** ;; aix4*) ! if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then test "$enable_shared" = yes && enable_static=no fi ;; --- 3434,3440 ---- ;; aix4*) ! if test "$host_cpu" != ia64 ; then test "$enable_shared" = yes && enable_static=no fi ;; *************** *** 2911,2920 **** # Now quote all the things that may contain metacharacters while being # careful not to overquote the AC_SUBSTed values. We take copies of the # variables and quote the copies for generation of the libtool script. ! for var in echo old_CC old_CFLAGS SED \ AR AR_FLAGS CC LD LN_S NM SHELL \ reload_flag reload_cmds wl \ pic_flag link_static_flag no_builtin_flag export_dynamic_flag_spec \ thread_safe_flag_spec whole_archive_flag_spec libname_spec \ library_names_spec soname_spec \ RANLIB old_archive_cmds old_archive_from_new_cmds old_postinstall_cmds \ --- 3527,3537 ---- # Now quote all the things that may contain metacharacters while being # careful not to overquote the AC_SUBSTed values. We take copies of the # variables and quote the copies for generation of the libtool script. ! for var in echo old_CC old_CFLAGS \ AR AR_FLAGS CC LD LN_S NM SHELL \ reload_flag reload_cmds wl \ pic_flag link_static_flag no_builtin_flag export_dynamic_flag_spec \ + use_runtimelinking \ thread_safe_flag_spec whole_archive_flag_spec libname_spec \ library_names_spec soname_spec \ RANLIB old_archive_cmds old_archive_from_new_cmds old_postinstall_cmds \ *************** *** 2973,2983 **** # configuration script generated by Autoconf, you may include it under # the same distribution terms that you use for the rest of that program. - # A sed that does not truncate output. - SED=$lt_SED - # Sed that helps us avoid accidentally triggering echo(1) options like -n. ! Xsed="${SED} -e s/^X//" # The HP-UX ksh and POSIX shell print the target directory to stdout # if CDPATH is set. --- 3590,3597 ---- # configuration script generated by Autoconf, you may include it under # the same distribution terms that you use for the rest of that program. # Sed that helps us avoid accidentally triggering echo(1) options like -n. ! Xsed="sed -e s/^X//" # The HP-UX ksh and POSIX shell print the target directory to stdout # if CDPATH is set. *************** *** 3099,3104 **** --- 3713,3721 ---- # Compiler flag to allow reflexive dlopens. export_dynamic_flag_spec=$lt_export_dynamic_flag_spec + # Compiler flag to allow runtime linking + use_runtimelinking=$lt_use_runtimelinking + # Compiler flag to generate shared objects directly from archives. whole_archive_flag_spec=$lt_whole_archive_flag_spec *************** *** 3738,3744 **** # AC_DEPLIBS_CHECK_METHOD - how to check for library dependencies # -- PORTME fill in with the dynamic library characteristics AC_DEFUN([AC_DEPLIBS_CHECK_METHOD], ! [AC_CACHE_CHECK([how to recognise dependent libraries], lt_cv_deplibs_check_method, [lt_cv_file_magic_cmd='$MAGIC_CMD' lt_cv_file_magic_test_file= --- 4355,4361 ---- # AC_DEPLIBS_CHECK_METHOD - how to check for library dependencies # -- PORTME fill in with the dynamic library characteristics AC_DEFUN([AC_DEPLIBS_CHECK_METHOD], ! [AC_CACHE_CHECK([how to recognise dependant libraries], lt_cv_deplibs_check_method, [lt_cv_file_magic_cmd='$MAGIC_CMD' lt_cv_file_magic_test_file= *************** *** 3813,3821 **** lt_cv_file_magic_test_file=/usr/lib/libc.sl ;; ! irix5* | irix6* | nonstopux*) case $host_os in ! irix5* | nonstopux*) # this will be overridden with pass_all, but let us keep it just in case lt_cv_deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1" ;; --- 4430,4438 ---- lt_cv_file_magic_test_file=/usr/lib/libc.sl ;; ! irix5* | irix6*) case $host_os in ! irix5*) # this will be overridden with pass_all, but let us keep it just in case lt_cv_deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1" ;; *************** *** 3837,3843 **** # This must be Linux ELF. linux-gnu*) case $host_cpu in ! alpha* | hppa* | i*86 | mips | mipsel | powerpc* | sparc* | ia64* | s390* | x86_64*) lt_cv_deplibs_check_method=pass_all ;; *) # glibc up to 2.1.1 does not perform some relocations on ARM --- 4454,4460 ---- # This must be Linux ELF. linux-gnu*) case $host_cpu in ! alpha* | hppa* | i*86 | powerpc* | sparc* | ia64* ) lt_cv_deplibs_check_method=pass_all ;; *) # glibc up to 2.1.1 does not perform some relocations on ARM *************** *** 3908,3916 **** lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib" lt_cv_file_magic_test_file=/lib/libc.so ;; - siemens) - lt_cv_deplibs_check_method=pass_all - ;; esac ;; esac --- 4525,4530 ---- *************** *** 3939,3945 **** # nm: unknown option "B" ignored # Tru64's nm complains that /dev/null is an invalid object file if ($tmp_nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep '(/dev/null|Invalid file or object type)' >/dev/null; then ! lt_cv_path_NM="$tmp_nm -B" break elif ($tmp_nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then lt_cv_path_NM="$tmp_nm -p" --- 4553,4575 ---- # nm: unknown option "B" ignored # Tru64's nm complains that /dev/null is an invalid object file if ($tmp_nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep '(/dev/null|Invalid file or object type)' >/dev/null; then ! # AIX needs to suppress demangling for C++ to work correctly ! # AIX nm : The default is to demangle all C++ symbol names ! # GNU nm : The default is to not demangle low-level symbol names. ! case $host_os in ! aix*) ! # check if we are using GNU nm on AIX ! if $tmp_nm -V 2> /dev/null | grep GNU 2>&1 > /dev/null ! then ! lt_cv_path_NM="$tmp_nm -B" ! else ! lt_cv_path_NM="$tmp_nm -BC" ! fi ! ;; ! *) ! lt_cv_path_NM="$tmp_nm -B" ! ;; ! esac break elif ($tmp_nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then lt_cv_path_NM="$tmp_nm -p" *************** *** 3976,3987 **** ]) # AC_LIBLTDL_CONVENIENCE[(dir)] - sets LIBLTDL to the link flags for ! # the libltdl convenience library and LTDLINCL to the include flags for # the libltdl header and adds --enable-ltdl-convenience to the ! # configure arguments. Note that LIBLTDL and LTDLINCL are not # AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called. If DIR is not # provided, it is assumed to be `libltdl'. LIBLTDL will be prefixed ! # with '${top_builddir}/' and LTDLINCL will be prefixed with # '${top_srcdir}/' (note the single quotes!). If your package is not # flat and you're not using automake, define top_builddir and # top_srcdir appropriately in the Makefiles. --- 4606,4617 ---- ]) # AC_LIBLTDL_CONVENIENCE[(dir)] - sets LIBLTDL to the link flags for ! # the libltdl convenience library and INCLTDL to the include flags for # the libltdl header and adds --enable-ltdl-convenience to the ! # configure arguments. Note that LIBLTDL and INCLTDL are not # AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called. If DIR is not # provided, it is assumed to be `libltdl'. LIBLTDL will be prefixed ! # with '${top_builddir}/' and INCLTDL will be prefixed with # '${top_srcdir}/' (note the single quotes!). If your package is not # flat and you're not using automake, define top_builddir and # top_srcdir appropriately in the Makefiles. *************** *** 3993,4010 **** ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;; esac LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdlc.la ! LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl']) ! # For backwards non-gettext consistent compatibility... ! INCLTDL="$LTDLINCL" ]) # AC_LIBLTDL_INSTALLABLE[(dir)] - sets LIBLTDL to the link flags for ! # the libltdl installable library and LTDLINCL to the include flags for # the libltdl header and adds --enable-ltdl-install to the configure ! # arguments. Note that LIBLTDL and LTDLINCL are not AC_SUBSTed, nor is # AC_CONFIG_SUBDIRS called. If DIR is not provided and an installed # libltdl is not found, it is assumed to be `libltdl'. LIBLTDL will ! # be prefixed with '${top_builddir}/' and LTDLINCL will be prefixed # with '${top_srcdir}/' (note the single quotes!). If your package is # not flat and you're not using automake, define top_builddir and # top_srcdir appropriately in the Makefiles. --- 4623,4638 ---- ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;; esac LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdlc.la ! INCLTDL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl']) ]) # AC_LIBLTDL_INSTALLABLE[(dir)] - sets LIBLTDL to the link flags for ! # the libltdl installable library and INCLTDL to the include flags for # the libltdl header and adds --enable-ltdl-install to the configure ! # arguments. Note that LIBLTDL and INCLTDL are not AC_SUBSTed, nor is # AC_CONFIG_SUBDIRS called. If DIR is not provided and an installed # libltdl is not found, it is assumed to be `libltdl'. LIBLTDL will ! # be prefixed with '${top_builddir}/' and INCLTDL will be prefixed # with '${top_srcdir}/' (note the single quotes!). If your package is # not flat and you're not using automake, define top_builddir and # top_srcdir appropriately in the Makefiles. *************** *** 4022,4035 **** if test x"$enable_ltdl_install" = x"yes"; then ac_configure_args="$ac_configure_args --enable-ltdl-install" LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdl.la ! LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl']) else ac_configure_args="$ac_configure_args --enable-ltdl-install=no" LIBLTDL="-lltdl" ! LTDLINCL= fi - # For backwards non-gettext consistent compatibility... - INCLTDL="$LTDLINCL" ]) # old names --- 4650,4661 ---- if test x"$enable_ltdl_install" = x"yes"; then ac_configure_args="$ac_configure_args --enable-ltdl-install" LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdl.la ! INCLTDL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl']) else ac_configure_args="$ac_configure_args --enable-ltdl-install=no" LIBLTDL="-lltdl" ! INCLTDL= fi ]) # old names *************** *** 4044,4164 **** # This is just to silence aclocal about the macro not being used ifelse([AC_DISABLE_FAST_INSTALL]) - # NOTE: This macro has been submitted for inclusion into # - # GNU Autoconf as AC_PROG_SED. When it is available in # - # a released version of Autoconf we should remove this # - # macro and use it instead. # - # LT_AC_PROG_SED - # -------------- - # Check for a fully-functional sed program, that truncates - # as few characters as possible. Prefer GNU sed if found. - AC_DEFUN([LT_AC_PROG_SED], - [AC_MSG_CHECKING([for a sed that does not truncate output]) - AC_CACHE_VAL(lt_cv_path_SED, - [# Loop through the user's path and test for sed and gsed. - # Then use that list of sed's as ones to test for truncation. - as_executable_p="test -f" - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR - for as_dir in $PATH - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_prog in sed gsed; do - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then - _sed_list="$_sed_list $as_dir/$ac_prog$ac_exec_ext" - fi - done - done - done - - # Create a temporary directory, and hook for its removal unless debugging. - $debug || - { - trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0 - trap '{ (exit 1); exit 1; }' 1 2 13 15 - } - - # Create a (secure) tmp directory for tmp files. - : ${TMPDIR=/tmp} - { - tmp=`(umask 077 && mktemp -d -q "$TMPDIR/sedXXXXXX") 2>/dev/null` && - test -n "$tmp" && test -d "$tmp" - } || - { - tmp=$TMPDIR/sed$$-$RANDOM - (umask 077 && mkdir $tmp) - } || - { - echo "$me: cannot create a temporary directory in $TMPDIR" >&2 - { (exit 1); exit 1; } - } - _max=0 - _count=0 - # Add /usr/xpg4/bin/sed as it is typically found on Solaris - # along with /bin/sed that truncates output. - for _sed in $_sed_list /usr/xpg4/bin/sed; do - test ! -f ${_sed} && break - cat /dev/null > "$tmp/sed.in" - _count=0 - echo ${ECHO_N-$ac_n} "0123456789${ECHO_C-$ac_c}" >"$tmp/sed.in" - # Check for GNU sed and select it if it is found. - if "${_sed}" --version 2>&1 < /dev/null | egrep '(GNU)' > /dev/null; then - lt_cv_path_SED=${_sed} - break - fi - while true; do - cat "$tmp/sed.in" "$tmp/sed.in" >"$tmp/sed.tmp" - mv "$tmp/sed.tmp" "$tmp/sed.in" - cp "$tmp/sed.in" "$tmp/sed.nl" - echo >>"$tmp/sed.nl" - ${_sed} -e 's/a$//' < "$tmp/sed.nl" >"$tmp/sed.out" || break - cmp -s "$tmp/sed.out" "$tmp/sed.nl" || break - # 40000 chars as input seems more than enough - test $_count -gt 10 && break - _count=`expr $_count + 1` - if test $_count -gt $_max; then - _max=$_count - lt_cv_path_SED=$_sed - fi - done - done - rm -rf "$tmp" - ]) - if test "X$SED" != "X"; then - lt_cv_path_SED=$SED - else - SED=$lt_cv_path_SED - fi - AC_MSG_RESULT([$SED]) - ]) - - # isc-posix.m4 serial 2 (gettext-0.11.2) - dnl Copyright (C) 1995-2002 Free Software Foundation, Inc. - dnl This file is free software, distributed under the terms of the GNU - dnl General Public License. As a special exception to the GNU General - dnl Public License, this file may be distributed as part of a program - dnl that contains a configuration script generated by Autoconf, under - dnl the same distribution terms as the rest of that program. - - # This file is not needed with autoconf-2.53 and newer. Remove it in 2005. - - # This test replaces the one in autoconf. - # Currently this macro should have the same name as the autoconf macro - # because gettext's gettext.m4 (distributed in the automake package) - # still uses it. Otherwise, the use in gettext.m4 makes autoheader - # give these diagnostics: - # configure.in:556: AC_TRY_COMPILE was called before AC_ISC_POSIX - # configure.in:556: AC_TRY_RUN was called before AC_ISC_POSIX - - undefine([AC_ISC_POSIX]) - - AC_DEFUN([AC_ISC_POSIX], - [ - dnl This test replaces the obsolescent AC_ISC_POSIX kludge. - AC_CHECK_LIB(cposix, strerror, [LIBS="$LIBS -lcposix"]) - ] - ) dnl AC_PROG_INTLTOOL([MINIMUM-VERSION]) --- 4670,4675 ---- *************** *** 4357,4369 **** dnl ****************************** if test -z "$1" ; then ! default_compile_warnings=yes else default_compile_warnings="$1" fi AC_ARG_ENABLE(compile-warnings, ! [ --enable-compile-warnings=[no/minimum/yes/maximum/error] Turn on compiler warnings.],, [enable_compile_warnings="$default_compile_warnings"]) warnCFLAGS= if test "x$GCC" != xyes; then --- 4868,4880 ---- dnl ****************************** if test -z "$1" ; then ! default_compile_warnings=no else default_compile_warnings="$1" fi AC_ARG_ENABLE(compile-warnings, ! [ --enable-compile-warnings=[no/minimum/yes/maximum/error] Turn on compiler warnings.], [enable_compile_warnings="$enableval"],[enable_compile_warnings="$default_compile_warnings"]) warnCFLAGS= if test "x$GCC" != xyes; then *************** *** 4378,4392 **** warning_flags= ;; minimum) ! warning_flags="-Wall" ;; yes) ! warning_flags="-Wall -Wmissing-prototypes" ;; maximum|error) ! warning_flags="-Wall -Wmissing-prototypes -Wnested-externs -Wpointer-arith" CFLAGS="$warning_flags $CFLAGS" ! for option in -Wno-sign-compare; do SAVE_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $option" AC_MSG_CHECKING([whether gcc understands $option]) --- 4889,4903 ---- warning_flags= ;; minimum) ! warning_flags="-Wall -Wunused" ;; yes) ! warning_flags="-Wall -Wunused -Wmissing-prototypes -Wmissing-declarations" ;; maximum|error) ! warning_flags="-Wall -Wunused -Wchar-subscripts -Wmissing-declarations -Wmissing-prototypes -Wnested-externs -Wpointer-arith" CFLAGS="$warning_flags $CFLAGS" ! for option in -Wsign-promo -Wno-sign-compare; do SAVE_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $option" AC_MSG_CHECKING([whether gcc understands $option]) *************** *** 4459,4465 **** ## -W is not all that useful. And it cannot be controlled ## with individual -Wno-xxx flags, unlike -Wall if test "x$enable_cxx_warnings" = "xyes"; then ! warnCXXFLAGS="$warnCXXFLAGS -Wshadow -Woverloaded-virtual" fi fi fi --- 4970,4976 ---- ## -W is not all that useful. And it cannot be controlled ## with individual -Wno-xxx flags, unlike -Wall if test "x$enable_cxx_warnings" = "xyes"; then ! warnCXXFLAGS="$warnCXXFLAGS -Wmissing-prototypes -Wmissing-declarations -Wshadow -Woverloaded-virtual" fi fi fi *************** *** 4485,4493 **** fi fi AC_MSG_RESULT($complCXXFLAGS) ! ! WARN_CXXFLAGS="$CXXFLAGS $warnCXXFLAGS $complCXXFLAGS" ! AC_SUBST(WARN_CXXFLAGS) ]) # Copyright (C) 1995-2002 Free Software Foundation, Inc. --- 4996,5006 ---- fi fi AC_MSG_RESULT($complCXXFLAGS) ! if test "x$cxxflags_set" != "xyes"; then ! CXXFLAGS="$CXXFLAGS $warnCXXFLAGS $complCXXFLAGS" ! cxxflags_set=yes ! AC_SUBST(cxxflags_set) ! fi ]) # Copyright (C) 1995-2002 Free Software Foundation, Inc. diff -crN ./gnome-vfs/config.guess /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/config.guess *** ./gnome-vfs/config.guess Sat Feb 8 15:47:44 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/config.guess Thu Dec 18 21:11:45 2003 *************** *** 1,9 **** #! /bin/sh # Attempt to guess a canonical system name. ! # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, ! # 2000, 2001, 2002, 2003 Free Software Foundation, Inc. ! timestamp='2003-01-10' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by --- 1,9 ---- #! /bin/sh # Attempt to guess a canonical system name. ! # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 ! # Free Software Foundation, Inc. ! timestamp='2001-09-04' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by *************** *** 24,32 **** # configuration script generated by Autoconf, you may include it under # the same distribution terms that you use for the rest of that program. ! # Originally written by Per Bothner . ! # Please send patches to . Submit a context ! # diff and a properly formatted ChangeLog entry. # # This script attempts to guess a canonical system name similar to # config.sub. If it succeeds, it prints the system name on stdout, and --- 24,31 ---- # configuration script generated by Autoconf, you may include it under # the same distribution terms that you use for the rest of that program. ! # Written by Per Bothner . ! # Please send patches to . # # This script attempts to guess a canonical system name similar to # config.sub. If it succeeds, it prints the system name on stdout, and *************** *** 88,128 **** exit 1 fi - trap 'exit 1' 1 2 15 ! # CC_FOR_BUILD -- compiler used by this script. Note that the use of a ! # compiler to aid in system detection is discouraged as it requires ! # temporary files to be created and, as you can see below, it is a ! # headache to deal with in a portable fashion. # Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still # use `HOST_CC' if defined, but it is deprecated. ! # Portable tmp directory creation inspired by the Autoconf team. ! ! set_cc_for_build=' ! trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; ! trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; ! : ${TMPDIR=/tmp} ; ! { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || ! { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || ! { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; ! dummy=$tmp/dummy ; ! tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ; ! case $CC_FOR_BUILD,$HOST_CC,$CC in ! ,,) echo "int x;" > $dummy.c ; ! for c in cc gcc c89 c99 ; do ! if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then CC_FOR_BUILD="$c"; break ; fi ; done ; if test x"$CC_FOR_BUILD" = x ; then CC_FOR_BUILD=no_compiler_found ; fi ;; ,,*) CC_FOR_BUILD=$CC ;; ,*,*) CC_FOR_BUILD=$HOST_CC ;; ! esac ;' # This is needed to find uname on a Pyramid OSx when run in the BSD universe. # (ghazi@noc.rutgers.edu 1994-08-24) --- 87,116 ---- exit 1 fi ! dummy=dummy-$$ ! trap 'rm -f $dummy.c $dummy.o $dummy.rel $dummy; exit 1' 1 2 15 + # CC_FOR_BUILD -- compiler used by this script. # Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still # use `HOST_CC' if defined, but it is deprecated. ! set_cc_for_build='case $CC_FOR_BUILD,$HOST_CC,$CC in ! ,,) echo "int dummy(){}" > $dummy.c ; ! for c in cc gcc c89 ; do ! ($c $dummy.c -c -o $dummy.o) >/dev/null 2>&1 ; ! if test $? = 0 ; then CC_FOR_BUILD="$c"; break ; fi ; done ; + rm -f $dummy.c $dummy.o $dummy.rel ; if test x"$CC_FOR_BUILD" = x ; then CC_FOR_BUILD=no_compiler_found ; fi ;; ,,*) CC_FOR_BUILD=$CC ;; ,*,*) CC_FOR_BUILD=$HOST_CC ;; ! esac' # This is needed to find uname on a Pyramid OSx when run in the BSD universe. # (ghazi@noc.rutgers.edu 1994-08-24) *************** *** 139,168 **** case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in *:NetBSD:*:*) ! # NetBSD (nbsd) targets should (where applicable) match one or # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*, # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently # switched to ELF, *-*-netbsd* would select the old # object file format. This provides both forward # compatibility and a consistent mechanism for selecting the # object file format. ! # ! # Note: NetBSD doesn't particularly care about the vendor ! # portion of the name. We always set it to "unknown". ! sysctl="sysctl -n hw.machine_arch" ! UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \ ! /usr/sbin/$sysctl 2>/dev/null || echo unknown)` ! case "${UNAME_MACHINE_ARCH}" in ! armeb) machine=armeb-unknown ;; ! arm*) machine=arm-unknown ;; ! sh3el) machine=shl-unknown ;; ! sh3eb) machine=sh-unknown ;; ! *) machine=${UNAME_MACHINE_ARCH}-unknown ;; esac # The Operating System including object format, if it has switched # to ELF recently, or will in the future. ! case "${UNAME_MACHINE_ARCH}" in ! arm*|i386|m68k|ns32k|sh3*|sparc|vax) eval $set_cc_for_build if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ | grep __ELF__ >/dev/null --- 127,155 ---- case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in *:NetBSD:*:*) ! # Netbsd (nbsd) targets should (where applicable) match one or # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*, # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently # switched to ELF, *-*-netbsd* would select the old # object file format. This provides both forward # compatibility and a consistent mechanism for selecting the # object file format. ! # Determine the machine/vendor (is the vendor relevant). ! case "${UNAME_MACHINE}" in ! amiga) machine=m68k-unknown ;; ! arm32) machine=arm-unknown ;; ! atari*) machine=m68k-atari ;; ! sun3*) machine=m68k-sun ;; ! mac68k) machine=m68k-apple ;; ! macppc) machine=powerpc-apple ;; ! hp3[0-9][05]) machine=m68k-hp ;; ! ibmrt|romp-ibm) machine=romp-ibm ;; ! *) machine=${UNAME_MACHINE}-unknown ;; esac # The Operating System including object format, if it has switched # to ELF recently, or will in the future. ! case "${UNAME_MACHINE}" in ! i386|sparc|amiga|arm*|hp300|mvme68k|vax|atari|luna68k|mac68k|news68k|next68k|pc532|sun3*|x68k) eval $set_cc_for_build if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ | grep __ELF__ >/dev/null *************** *** 179,243 **** ;; esac # The OS release ! # Debian GNU/NetBSD machines have a different userland, and ! # thus, need a distinct triplet. However, they do not need ! # kernel version information, so it can be replaced with a ! # suitable tag, in the style of linux-gnu. ! case "${UNAME_VERSION}" in ! Debian*) ! release='-gnu' ! ;; ! *) ! release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` ! ;; ! esac # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: # contains redundant information, the shorter form: # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. echo "${machine}-${os}${release}" exit 0 ;; - amiga:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - arc:OpenBSD:*:*) - echo mipsel-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - hp300:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - mac68k:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - macppc:OpenBSD:*:*) - echo powerpc-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - mvme68k:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - mvme88k:OpenBSD:*:*) - echo m88k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - mvmeppc:OpenBSD:*:*) - echo powerpc-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - pmax:OpenBSD:*:*) - echo mipsel-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - sgi:OpenBSD:*:*) - echo mipseb-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - sun3:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - wgrisc:OpenBSD:*:*) - echo mipsel-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - *:OpenBSD:*:*) - echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - *:MicroBSD:*:*) - echo ${UNAME_MACHINE}-unknown-microbsd${UNAME_RELEASE} - exit 0 ;; alpha:OSF1:*:*) if test $UNAME_RELEASE = "V4.0"; then UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` --- 166,177 ---- ;; esac # The OS release ! release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: # contains redundant information, the shorter form: # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. echo "${machine}-${os}${release}" exit 0 ;; alpha:OSF1:*:*) if test $UNAME_RELEASE = "V4.0"; then UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` *************** *** 246,252 **** # A Tn.n version is a released field test version. # A Xn.n version is an unreleased experimental baselevel. # 1.2 uses "1.2" for uname -r. - eval $set_cc_for_build cat <$dummy.s .data \$Lformat: --- 180,185 ---- *************** *** 272,280 **** jsr \$26,exit .end main EOF ! $CC_FOR_BUILD -o $dummy $dummy.s 2>/dev/null if test "$?" = 0 ; then ! case `$dummy` in 0-0) UNAME_MACHINE="alpha" ;; --- 205,214 ---- jsr \$26,exit .end main EOF ! eval $set_cc_for_build ! $CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null if test "$?" = 0 ; then ! case `./$dummy` in 0-0) UNAME_MACHINE="alpha" ;; *************** *** 296,306 **** 2-1307) UNAME_MACHINE="alphaev68" ;; - 3-1307) - UNAME_MACHINE="alphaev7" - ;; esac fi echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` exit 0 ;; Alpha\ *:Windows_NT*:*) --- 230,238 ---- 2-1307) UNAME_MACHINE="alphaev68" ;; esac fi + rm -f $dummy.s $dummy echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` exit 0 ;; Alpha\ *:Windows_NT*:*) *************** *** 315,325 **** Amiga*:UNIX_System_V:4.0:*) echo m68k-unknown-sysv4 exit 0;; *:[Aa]miga[Oo][Ss]:*:*) echo ${UNAME_MACHINE}-unknown-amigaos exit 0 ;; ! *:[Mm]orph[Oo][Ss]:*:*) ! echo ${UNAME_MACHINE}-unknown-morphos exit 0 ;; *:OS/390:*:*) echo i370-ibm-openedition --- 247,275 ---- Amiga*:UNIX_System_V:4.0:*) echo m68k-unknown-sysv4 exit 0;; + amiga:OpenBSD:*:*) + echo m68k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; *:[Aa]miga[Oo][Ss]:*:*) echo ${UNAME_MACHINE}-unknown-amigaos exit 0 ;; ! arc64:OpenBSD:*:*) ! echo mips64el-unknown-openbsd${UNAME_RELEASE} ! exit 0 ;; ! arc:OpenBSD:*:*) ! echo mipsel-unknown-openbsd${UNAME_RELEASE} ! exit 0 ;; ! hkmips:OpenBSD:*:*) ! echo mips-unknown-openbsd${UNAME_RELEASE} ! exit 0 ;; ! pmax:OpenBSD:*:*) ! echo mipsel-unknown-openbsd${UNAME_RELEASE} ! exit 0 ;; ! sgi:OpenBSD:*:*) ! echo mips-unknown-openbsd${UNAME_RELEASE} ! exit 0 ;; ! wgrisc:OpenBSD:*:*) ! echo mipsel-unknown-openbsd${UNAME_RELEASE} exit 0 ;; *:OS/390:*:*) echo i370-ibm-openedition *************** *** 341,350 **** NILE*:*:*:dcosx) echo pyramid-pyramid-svr4 exit 0 ;; - DRS?6000:UNIX_SV:4.2*:7*) - case `/usr/bin/uname -p` in - sparc) echo sparc-icl-nx7 && exit 0 ;; - esac ;; sun4H:SunOS:5.*:*) echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit 0 ;; --- 291,296 ---- *************** *** 373,379 **** echo m68k-sun-sunos${UNAME_RELEASE} exit 0 ;; sun*:*:4.2BSD:*) ! UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3 case "`/bin/arch`" in sun3) --- 319,325 ---- echo m68k-sun-sunos${UNAME_RELEASE} exit 0 ;; sun*:*:4.2BSD:*) ! UNAME_RELEASE=`(head -1 /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3 case "`/bin/arch`" in sun3) *************** *** 387,392 **** --- 333,344 ---- aushp:SunOS:*:*) echo sparc-auspex-sunos${UNAME_RELEASE} exit 0 ;; + sparc*:NetBSD:*) + echo `uname -p`-unknown-netbsd${UNAME_RELEASE} + exit 0 ;; + atari*:OpenBSD:*:*) + echo m68k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; # The situation for MiNT is a little confusing. The machine name # can be virtually everything (everything which is not # "atarist" or "atariste" at least should have a processor *************** *** 413,418 **** --- 365,382 ---- *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) echo m68k-unknown-mint${UNAME_RELEASE} exit 0 ;; + sun3*:OpenBSD:*:*) + echo m68k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + mac68k:OpenBSD:*:*) + echo m68k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + mvme68k:OpenBSD:*:*) + echo m68k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + mvme88k:OpenBSD:*:*) + echo m88k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; powerpc:machten:*:*) echo powerpc-apple-machten${UNAME_RELEASE} exit 0 ;; *************** *** 451,470 **** exit (-1); } EOF ! $CC_FOR_BUILD -o $dummy $dummy.c \ ! && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \ ! && exit 0 echo mips-mips-riscos${UNAME_RELEASE} exit 0 ;; Motorola:PowerMAX_OS:*:*) echo powerpc-motorola-powermax exit 0 ;; - Motorola:*:4.3:PL8-*) - echo powerpc-harris-powermax - exit 0 ;; - Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*) - echo powerpc-harris-powermax - exit 0 ;; Night_Hawk:Power_UNIX:*:*) echo powerpc-harris-powerunix exit 0 ;; --- 415,429 ---- exit (-1); } EOF ! $CC_FOR_BUILD $dummy.c -o $dummy \ ! && ./$dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \ ! && rm -f $dummy.c $dummy && exit 0 ! rm -f $dummy.c $dummy echo mips-mips-riscos${UNAME_RELEASE} exit 0 ;; Motorola:PowerMAX_OS:*:*) echo powerpc-motorola-powermax exit 0 ;; Night_Hawk:Power_UNIX:*:*) echo powerpc-harris-powerunix exit 0 ;; *************** *** 537,543 **** exit(0); } EOF ! $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0 echo rs6000-ibm-aix3.2.5 elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then echo rs6000-ibm-aix3.2.4 --- 496,503 ---- exit(0); } EOF ! $CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0 ! rm -f $dummy.c $dummy echo rs6000-ibm-aix3.2.5 elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then echo rs6000-ibm-aix3.2.4 *************** *** 546,552 **** fi exit 0 ;; *:AIX:*:[45]) ! IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then IBM_ARCH=rs6000 else --- 506,512 ---- fi exit 0 ;; *:AIX:*:[45]) ! IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | head -1 | awk '{ print $1 }'` if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then IBM_ARCH=rs6000 else *************** *** 586,593 **** 9000/31? ) HP_ARCH=m68000 ;; 9000/[34]?? ) HP_ARCH=m68k ;; 9000/[678][0-9][0-9]) ! if [ -x /usr/bin/getconf ]; then ! sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` case "${sc_cpu_version}" in 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 --- 546,555 ---- 9000/31? ) HP_ARCH=m68000 ;; 9000/[34]?? ) HP_ARCH=m68k ;; 9000/[678][0-9][0-9]) ! case "${HPUX_REV}" in ! 11.[0-9][0-9]) ! if [ -x /usr/bin/getconf ]; then ! sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` case "${sc_cpu_version}" in 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 *************** *** 596,608 **** case "${sc_kernel_bits}" in 32) HP_ARCH="hppa2.0n" ;; 64) HP_ARCH="hppa2.0w" ;; - '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 esac ;; esac ! fi ! if [ "${HP_ARCH}" = "" ]; then ! eval $set_cc_for_build ! sed 's/^ //' << EOF >$dummy.c #define _HPUX_SOURCE #include --- 558,570 ---- case "${sc_kernel_bits}" in 32) HP_ARCH="hppa2.0n" ;; 64) HP_ARCH="hppa2.0w" ;; esac ;; esac ! fi ;; ! esac ! if [ "${HP_ARCH}" = "" ]; then ! eval $set_cc_for_build ! sed 's/^ //' << EOF >$dummy.c #define _HPUX_SOURCE #include *************** *** 635,655 **** exit (0); } EOF ! (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` ! test -z "$HP_ARCH" && HP_ARCH=hppa ! fi ;; esac - if [ ${HP_ARCH} = "hppa2.0w" ] - then - # avoid double evaluation of $set_cc_for_build - test -n "$CC_FOR_BUILD" || eval $set_cc_for_build - if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null - then - HP_ARCH="hppa2.0w" - else - HP_ARCH="hppa64" - fi - fi echo ${HP_ARCH}-hp-hpux${HPUX_REV} exit 0 ;; ia64:HP-UX:*:*) --- 597,607 ---- exit (0); } EOF ! (CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null ) && HP_ARCH=`./$dummy` ! if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi ! rm -f $dummy.c $dummy ! fi ;; esac echo ${HP_ARCH}-hp-hpux${HPUX_REV} exit 0 ;; ia64:HP-UX:*:*) *************** *** 683,689 **** exit (0); } EOF ! $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0 echo unknown-hitachi-hiuxwe2 exit 0 ;; 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* ) --- 635,642 ---- exit (0); } EOF ! $CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0 ! rm -f $dummy.c $dummy echo unknown-hitachi-hiuxwe2 exit 0 ;; 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* ) *************** *** 711,716 **** --- 664,672 ---- parisc*:Lites*:*:*) echo hppa1.1-hp-lites exit 0 ;; + hppa*:OpenBSD:*:*) + echo hppa-unknown-openbsd + exit 0 ;; C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) echo c1-convex-bsd exit 0 ;; *************** *** 729,734 **** --- 685,693 ---- C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) echo c4-convex-bsd exit 0 ;; + CRAY*X-MP:*:*:*) + echo xmp-cray-unicos + exit 0 ;; CRAY*Y-MP:*:*:*) echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' exit 0 ;; *************** *** 741,761 **** CRAY*TS:*:*:*) echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' exit 0 ;; CRAY*T3E:*:*:*) echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' exit 0 ;; CRAY*SV1:*:*:*) echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' exit 0 ;; ! *:UNICOS/mp:*:*) ! echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' ! exit 0 ;; F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" exit 0 ;; i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} exit 0 ;; --- 700,726 ---- CRAY*TS:*:*:*) echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' exit 0 ;; + CRAY*T3D:*:*:*) + echo alpha-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + exit 0 ;; CRAY*T3E:*:*:*) echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' exit 0 ;; CRAY*SV1:*:*:*) echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' exit 0 ;; ! CRAY-2:*:*:*) ! echo cray2-cray-unicos ! exit 0 ;; F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" exit 0 ;; + hp300:OpenBSD:*:*) + echo m68k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} exit 0 ;; *************** *** 766,783 **** echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} exit 0 ;; *:FreeBSD:*:*) ! # Determine whether the default compiler uses glibc. ! eval $set_cc_for_build ! sed 's/^ //' << EOF >$dummy.c ! #include ! #if __GLIBC__ >= 2 ! LIBC=gnu ! #else ! LIBC= ! #endif ! EOF ! eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` ! echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC} exit 0 ;; i*:CYGWIN*:*) echo ${UNAME_MACHINE}-pc-cygwin --- 731,740 ---- echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} exit 0 ;; *:FreeBSD:*:*) ! echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ! exit 0 ;; ! *:OpenBSD:*:*) ! echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` exit 0 ;; i*:CYGWIN*:*) echo ${UNAME_MACHINE}-pc-cygwin *************** *** 788,804 **** i*:PW*:*) echo ${UNAME_MACHINE}-pc-pw32 exit 0 ;; - x86:Interix*:3*) - echo i586-pc-interix3 - exit 0 ;; - [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) - echo i${UNAME_MACHINE}-pc-mks - exit 0 ;; i*:Windows_NT*:* | Pentium*:Windows_NT*:*) # How do we know it's Interix rather than the generic POSIX subsystem? # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we # UNAME_MACHINE based on the output of uname instead of i386? ! echo i586-pc-interix exit 0 ;; i*:UWIN*:*) echo ${UNAME_MACHINE}-pc-uwin --- 745,755 ---- i*:PW*:*) echo ${UNAME_MACHINE}-pc-pw32 exit 0 ;; i*:Windows_NT*:* | Pentium*:Windows_NT*:*) # How do we know it's Interix rather than the generic POSIX subsystem? # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we # UNAME_MACHINE based on the output of uname instead of i386? ! echo i386-pc-interix exit 0 ;; i*:UWIN*:*) echo ${UNAME_MACHINE}-pc-uwin *************** *** 819,866 **** echo ${UNAME_MACHINE}-unknown-linux-gnu exit 0 ;; ia64:Linux:*:*) ! echo ${UNAME_MACHINE}-unknown-linux-gnu exit 0 ;; m68*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit 0 ;; mips:Linux:*:*) ! eval $set_cc_for_build ! sed 's/^ //' << EOF >$dummy.c ! #undef CPU ! #undef mips ! #undef mipsel ! #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) ! CPU=mipsel ! #else ! #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) ! CPU=mips ! #else ! CPU= ! #endif ! #endif ! EOF ! eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` ! test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0 ! ;; ! mips64:Linux:*:*) ! eval $set_cc_for_build ! sed 's/^ //' << EOF >$dummy.c ! #undef CPU ! #undef mips64 ! #undef mips64el ! #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) ! CPU=mips64el ! #else ! #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) ! CPU=mips64 ! #else ! CPU= ! #endif ! #endif ! EOF ! eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` ! test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0 ;; ppc:Linux:*:*) echo powerpc-unknown-linux-gnu --- 770,785 ---- echo ${UNAME_MACHINE}-unknown-linux-gnu exit 0 ;; ia64:Linux:*:*) ! echo ${UNAME_MACHINE}-unknown-linux exit 0 ;; m68*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit 0 ;; mips:Linux:*:*) ! case `sed -n '/^byte/s/^.*: \(.*\) endian/\1/p' < /proc/cpuinfo` in ! big) echo mips-unknown-linux-gnu && exit 0 ;; ! little) echo mipsel-unknown-linux-gnu && exit 0 ;; ! esac ;; ppc:Linux:*:*) echo powerpc-unknown-linux-gnu *************** *** 909,916 **** # The BFD linker knows what the default object file format is, so # first see if it will tell us. cd to the root directory to prevent # problems with other programs or directories called `ld' in the path. ! # Set LC_ALL=C to ensure ld outputs messages in English. ! ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \ | sed -ne '/supported targets:/!d s/[ ][ ]*/ /g s/.*supported targets: *// --- 828,834 ---- # The BFD linker knows what the default object file format is, so # first see if it will tell us. cd to the root directory to prevent # problems with other programs or directories called `ld' in the path. ! ld_supported_targets=`cd /; ld --help 2>&1 \ | sed -ne '/supported targets:/!d s/[ ][ ]*/ /g s/.*supported targets: *// *************** *** 922,928 **** ;; a.out-i386-linux) echo "${UNAME_MACHINE}-pc-linux-gnuaout" ! exit 0 ;; coff-i386) echo "${UNAME_MACHINE}-pc-linux-gnucoff" exit 0 ;; --- 840,846 ---- ;; a.out-i386-linux) echo "${UNAME_MACHINE}-pc-linux-gnuaout" ! exit 0 ;; coff-i386) echo "${UNAME_MACHINE}-pc-linux-gnucoff" exit 0 ;; *************** *** 934,961 **** esac # Determine whether the default compiler is a.out or elf eval $set_cc_for_build ! sed 's/^ //' << EOF >$dummy.c ! #include ! #ifdef __ELF__ ! # ifdef __GLIBC__ ! # if __GLIBC__ >= 2 ! LIBC=gnu ! # else ! LIBC=gnulibc1 ! # endif ! # else ! LIBC=gnulibc1 ! # endif ! #else ! #ifdef __INTEL_COMPILER ! LIBC=gnu ! #else ! LIBC=gnuaout ! #endif ! #endif EOF ! eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` ! test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0 test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0 ;; i*86:DYNIX/ptx:4*:*) --- 852,883 ---- esac # Determine whether the default compiler is a.out or elf eval $set_cc_for_build ! cat >$dummy.c < ! #ifdef __cplusplus ! #include /* for printf() prototype */ ! int main (int argc, char *argv[]) { ! #else ! int main (argc, argv) int argc; char *argv[]; { ! #endif ! #ifdef __ELF__ ! # ifdef __GLIBC__ ! # if __GLIBC__ >= 2 ! printf ("%s-pc-linux-gnu\n", argv[1]); ! # else ! printf ("%s-pc-linux-gnulibc1\n", argv[1]); ! # endif ! # else ! printf ("%s-pc-linux-gnulibc1\n", argv[1]); ! # endif ! #else ! printf ("%s-pc-linux-gnuaout\n", argv[1]); ! #endif ! return 0; ! } EOF ! $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm -f $dummy.c $dummy && exit 0 ! rm -f $dummy.c $dummy test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0 ;; i*86:DYNIX/ptx:4*:*) *************** *** 972,994 **** # Use sysv4.2uw... so that sysv4* matches it. echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} exit 0 ;; - i*86:OS/2:*:*) - # If we were able to find `uname', then EMX Unix compatibility - # is probably installed. - echo ${UNAME_MACHINE}-pc-os2-emx - exit 0 ;; - i*86:XTS-300:*:STOP) - echo ${UNAME_MACHINE}-unknown-stop - exit 0 ;; - i*86:atheos:*:*) - echo ${UNAME_MACHINE}-unknown-atheos - exit 0 ;; - i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) - echo i386-unknown-lynxos${UNAME_RELEASE} - exit 0 ;; - i*86:*DOS:*:*) - echo ${UNAME_MACHINE}-pc-msdosdjgpp - exit 0 ;; i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*) UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'` if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then --- 894,899 ---- *************** *** 1010,1028 **** UNAME_REL=`sed -n 's/.*Version //p' /dev/null >/dev/null ; then ! UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')` ! (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486 ! (/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \ && UNAME_MACHINE=i586 ! (/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \ && UNAME_MACHINE=i686 ! (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \ && UNAME_MACHINE=i686 echo ${UNAME_MACHINE}-pc-sco$UNAME_REL else echo ${UNAME_MACHINE}-pc-sysv32 fi exit 0 ;; pc:*:*:*) # Left here for compatibility: # uname -m prints for DJGPP always 'pc', but it prints nothing about --- 915,936 ---- UNAME_REL=`sed -n 's/.*Version //p' /dev/null >/dev/null ; then ! UNAME_REL=`(/bin/uname -X|egrep Release|sed -e 's/.*= //')` ! (/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486 ! (/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \ && UNAME_MACHINE=i586 ! (/bin/uname -X|egrep '^Machine.*Pent ?II' >/dev/null) \ && UNAME_MACHINE=i686 ! (/bin/uname -X|egrep '^Machine.*Pentium Pro' >/dev/null) \ && UNAME_MACHINE=i686 echo ${UNAME_MACHINE}-pc-sco$UNAME_REL else echo ${UNAME_MACHINE}-pc-sysv32 fi exit 0 ;; + i*86:*DOS:*:*) + echo ${UNAME_MACHINE}-pc-msdosdjgpp + exit 0 ;; pc:*:*:*) # Left here for compatibility: # uname -m prints for DJGPP always 'pc', but it prints nothing about *************** *** 1046,1060 **** # "miniframe" echo m68010-convergent-sysv exit 0 ;; - mc68k:UNIX:SYSTEM5:3.51m) - echo m68k-convergent-sysv - exit 0 ;; - M680?0:D-NIX:5.3:*) - echo m68k-diab-dnix - exit 0 ;; M68*:*:R3V[567]*:*) test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;; ! 3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0) OS_REL='' test -r /etc/.relid \ && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` --- 954,962 ---- # "miniframe" echo m68010-convergent-sysv exit 0 ;; M68*:*:R3V[567]*:*) test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;; ! 3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 4850:*:4.0:3.0) OS_REL='' test -r /etc/.relid \ && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` *************** *** 1071,1076 **** --- 973,981 ---- mc68030:UNIX_System_V:4.*:*) echo m68k-atari-sysv4 exit 0 ;; + i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) + echo i386-unknown-lynxos${UNAME_RELEASE} + exit 0 ;; TSUNAMI:LynxOS:2.*:*) echo sparc-unknown-lynxos${UNAME_RELEASE} exit 0 ;; *************** *** 1142,1150 **** SX-5:SUPER-UX:*:*) echo sx5-nec-superux${UNAME_RELEASE} exit 0 ;; - SX-6:SUPER-UX:*:*) - echo sx6-nec-superux${UNAME_RELEASE} - exit 0 ;; Power*:Rhapsody:*:*) echo powerpc-apple-rhapsody${UNAME_RELEASE} exit 0 ;; --- 1047,1052 ---- *************** *** 1152,1175 **** echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} exit 0 ;; *:Darwin:*:*) ! case `uname -p` in ! *86) UNAME_PROCESSOR=i686 ;; ! powerpc) UNAME_PROCESSOR=powerpc ;; ! esac ! echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} exit 0 ;; *:procnto*:*:* | *:QNX:[0123456789]*:*) ! UNAME_PROCESSOR=`uname -p` ! if test "$UNAME_PROCESSOR" = "x86"; then ! UNAME_PROCESSOR=i386 UNAME_MACHINE=pc fi ! echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE} exit 0 ;; *:QNX:*:4*) echo i386-pc-qnx exit 0 ;; ! NSR-[DGKLNPTVW]:NONSTOP_KERNEL:*:*) echo nsr-tandem-nsk${UNAME_RELEASE} exit 0 ;; *:NonStop-UX:*:*) --- 1054,1071 ---- echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} exit 0 ;; *:Darwin:*:*) ! echo `uname -p`-apple-darwin${UNAME_RELEASE} exit 0 ;; *:procnto*:*:* | *:QNX:[0123456789]*:*) ! if test "${UNAME_MACHINE}" = "x86pc"; then UNAME_MACHINE=pc fi ! echo `uname -p`-${UNAME_MACHINE}-nto-qnx exit 0 ;; *:QNX:*:4*) echo i386-pc-qnx exit 0 ;; ! NSR-[KW]:NONSTOP_KERNEL:*:*) echo nsr-tandem-nsk${UNAME_RELEASE} exit 0 ;; *:NonStop-UX:*:*) *************** *** 1192,1197 **** --- 1088,1098 ---- fi echo ${UNAME_MACHINE}-unknown-plan9 exit 0 ;; + i*86:OS/2:*:*) + # If we were able to find `uname', then EMX Unix compatibility + # is probably installed. + echo ${UNAME_MACHINE}-pc-os2-emx + exit 0 ;; *:TOPS-10:*:*) echo pdp10-unknown-tops10 exit 0 ;; *************** *** 1210,1215 **** --- 1111,1122 ---- *:ITS:*:*) echo pdp10-unknown-its exit 0 ;; + i*86:XTS-300:*:STOP) + echo ${UNAME_MACHINE}-unknown-stop + exit 0 ;; + i*86:atheos:*:*) + echo ${UNAME_MACHINE}-unknown-atheos + exit 0 ;; esac #echo '(No uname command or uname output not recognized.)' 1>&2 *************** *** 1330,1336 **** } EOF ! $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0 # Apollos put the system type in the environment. --- 1237,1244 ---- } EOF ! $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy && rm -f $dummy.c $dummy && exit 0 ! rm -f $dummy.c $dummy # Apollos put the system type in the environment. diff -crN ./gnome-vfs/config.sub /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/config.sub *** ./gnome-vfs/config.sub Sat Feb 8 15:47:44 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/config.sub Thu Dec 18 21:11:45 2003 *************** *** 1,9 **** #! /bin/sh # Configuration validation subroutine script. ! # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, ! # 2000, 2001, 2002, 2003 Free Software Foundation, Inc. ! timestamp='2003-01-03' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software --- 1,9 ---- #! /bin/sh # Configuration validation subroutine script. ! # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 ! # Free Software Foundation, Inc. ! timestamp='2001-09-07' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software *************** *** 29,36 **** # configuration script generated by Autoconf, you may include it under # the same distribution terms that you use for the rest of that program. ! # Please send patches to . Submit a context ! # diff and a properly formatted ChangeLog entry. # # Configuration subroutine to validate and canonicalize a configuration type. # Supply the specified configuration type as an argument. --- 29,35 ---- # configuration script generated by Autoconf, you may include it under # the same distribution terms that you use for the rest of that program. ! # Please send patches to . # # Configuration subroutine to validate and canonicalize a configuration type. # Supply the specified configuration type as an argument. *************** *** 118,124 **** # Here we must recognize all the valid KERNEL-OS combinations. maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` case $maybe_os in ! nto-qnx* | linux-gnu* | freebsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*) os=-$maybe_os basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` ;; --- 117,123 ---- # Here we must recognize all the valid KERNEL-OS combinations. maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` case $maybe_os in ! nto-qnx* | linux-gnu* | storm-chaos* | os2-emx* | windows32-*) os=-$maybe_os basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` ;; *************** *** 227,271 **** 1750a | 580 \ | a29k \ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ - | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \ ! | clipper \ ! | d10v | d30v | dlx | dsp16xx \ ! | fr30 | frv \ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | i370 | i860 | i960 | ia64 \ - | ip2k \ | m32r | m68000 | m68k | m88k | mcore \ ! | mips | mipsbe | mipseb | mipsel | mipsle \ ! | mips16 \ ! | mips64 | mips64el \ ! | mips64vr | mips64vrel \ ! | mips64orion | mips64orionel \ ! | mips64vr4100 | mips64vr4100el \ ! | mips64vr4300 | mips64vr4300el \ ! | mips64vr5000 | mips64vr5000el \ ! | mipsisa32 | mipsisa32el \ ! | mipsisa32r2 | mipsisa32r2el \ ! | mipsisa64 | mipsisa64el \ ! | mipsisa64sb1 | mipsisa64sb1el \ ! | mipsisa64sr71k | mipsisa64sr71kel \ ! | mipstx39 | mipstx39el \ | mn10200 | mn10300 \ - | msp430 \ | ns16k | ns32k \ ! | openrisc | or32 \ | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ | pyramid \ | s390 | s390x \ ! | sh | sh[1234] | sh3e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \ ! | sh64 | sh64le \ ! | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \ ! | strongarm \ | tahoe | thumb | tic80 | tron \ ! | v850 | v850e \ | we32k \ ! | x86 | xscale | xstormy16 | xtensa \ | z8k) basic_machine=$basic_machine-unknown ;; --- 226,257 ---- 1750a | 580 \ | a29k \ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \ ! | c4x | clipper \ ! | d10v | d30v | dsp16xx \ ! | fr30 \ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | i370 | i860 | i960 | ia64 \ | m32r | m68000 | m68k | m88k | mcore \ ! | mips16 | mips64 | mips64el | mips64orion | mips64orionel \ ! | mips64vr4100 | mips64vr4100el | mips64vr4300 \ ! | mips64vr4300el | mips64vr5000 | mips64vr5000el \ ! | mipsbe | mipseb | mipsel | mipsle | mipstx39 | mipstx39el \ ! | mipsisa32 \ | mn10200 | mn10300 \ | ns16k | ns32k \ ! | openrisc \ | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ | pyramid \ | s390 | s390x \ ! | sh | sh[34] | sh[34]eb | shbe | shle \ ! | sparc | sparc64 | sparclet | sparclite | sparcv9 | sparcv9b \ ! | stormy16 | strongarm \ | tahoe | thumb | tic80 | tron \ ! | v850 \ | we32k \ ! | x86 | xscale \ | z8k) basic_machine=$basic_machine-unknown ;; *************** *** 292,345 **** 580-* \ | a29k-* \ | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ ! | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ ! | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ ! | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ ! | avr-* \ | bs2000-* \ ! | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* \ ! | clipper-* | cydra-* \ ! | d10v-* | d30v-* | dlx-* \ | elxsi-* \ ! | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \ | h8300-* | h8500-* \ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ | i*86-* | i860-* | i960-* | ia64-* \ - | ip2k-* \ | m32r-* \ ! | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ | m88110-* | m88k-* | mcore-* \ ! | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ ! | mips16-* \ ! | mips64-* | mips64el-* \ ! | mips64vr-* | mips64vrel-* \ ! | mips64orion-* | mips64orionel-* \ ! | mips64vr4100-* | mips64vr4100el-* \ ! | mips64vr4300-* | mips64vr4300el-* \ ! | mips64vr5000-* | mips64vr5000el-* \ ! | mipsisa32-* | mipsisa32el-* \ ! | mipsisa32r2-* | mipsisa32r2el-* \ ! | mipsisa64-* | mipsisa64el-* \ ! | mipsisa64sb1-* | mipsisa64sb1el-* \ ! | mipsisa64sr71k-* | mipsisa64sr71kel-* \ ! | mipstx39-* | mipstx39el-* \ ! | msp430-* \ ! | none-* | np1-* | nv1-* | ns16k-* | ns32k-* \ | orion-* \ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ | pyramid-* \ | romp-* | rs6000-* \ | s390-* | s390x-* \ ! | sh-* | sh[1234]-* | sh3e-* | sh[34]eb-* | shbe-* \ ! | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ ! | sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \ ! | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \ ! | tahoe-* | thumb-* | tic30-* | tic4x-* | tic54x-* | tic80-* | tron-* \ ! | v850-* | v850e-* | vax-* \ | we32k-* \ ! | x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \ ! | xtensa-* \ | ymp-* \ | z8k-*) ;; --- 278,315 ---- 580-* \ | a29k-* \ | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ ! | alphapca5[67]-* | arc-* \ ! | arm-* | armbe-* | armle-* | armv*-* \ | bs2000-* \ ! | c[123]* | c30-* | [cjt]90-* | c54x-* \ ! | clipper-* | cray2-* | cydra-* \ ! | d10v-* | d30v-* \ | elxsi-* \ ! | f30[01]-* | f700-* | fr30-* | fx80-* \ | h8300-* | h8500-* \ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ | i*86-* | i860-* | i960-* | ia64-* \ | m32r-* \ ! | m68000-* | m680[01234]0-* | m68360-* | m683?2-* | m68k-* \ | m88110-* | m88k-* | mcore-* \ ! | mips-* | mips16-* | mips64-* | mips64el-* | mips64orion-* \ ! | mips64orionel-* | mips64vr4100-* | mips64vr4100el-* \ ! | mips64vr4300-* | mips64vr4300el-* | mipsbe-* | mipseb-* \ ! | mipsle-* | mipsel-* | mipstx39-* | mipstx39el-* \ ! | none-* | np1-* | ns16k-* | ns32k-* \ | orion-* \ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ | pyramid-* \ | romp-* | rs6000-* \ | s390-* | s390x-* \ ! | sh-* | sh[34]-* | sh[34]eb-* | shbe-* | shle-* \ ! | sparc-* | sparc64-* | sparc86x-* | sparclite-* \ ! | sparcv9-* | sparcv9b-* | stormy16-* | strongarm-* | sv1-* \ ! | t3e-* | tahoe-* | thumb-* | tic30-* | tic54x-* | tic80-* | tron-* \ ! | v850-* | vax-* \ | we32k-* \ ! | x86-* | x86_64-* | xmp-* | xps100-* | xscale-* \ | ymp-* \ | z8k-*) ;; *************** *** 404,413 **** basic_machine=ns32k-sequent os=-dynix ;; - c90) - basic_machine=c90-cray - os=-unicos - ;; convex-c1) basic_machine=c1-convex os=-bsd --- 374,379 ---- *************** *** 428,435 **** basic_machine=c38-convex os=-bsd ;; ! cray | j90) ! basic_machine=j90-cray os=-unicos ;; crds | unos) --- 394,409 ---- basic_machine=c38-convex os=-bsd ;; ! cray | ymp) ! basic_machine=ymp-cray ! os=-unicos ! ;; ! cray2) ! basic_machine=cray2-cray ! os=-unicos ! ;; ! [cjt]90) ! basic_machine=${basic_machine}-cray os=-unicos ;; crds | unos) *************** *** 444,457 **** decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn) basic_machine=mips-dec ;; - decsystem10* | dec10*) - basic_machine=pdp10-dec - os=-tops10 - ;; - decsystem20* | dec20*) - basic_machine=pdp10-dec - os=-tops20 - ;; delta | 3300 | motorola-3300 | motorola-delta \ | 3300-motorola | delta-motorola) basic_machine=m68k-motorola --- 418,423 ---- *************** *** 632,637 **** --- 598,611 ---- basic_machine=m68k-atari os=-mint ;; + mipsel*-linux*) + basic_machine=mipsel-unknown + os=-linux-gnu + ;; + mips*-linux*) + basic_machine=mips-unknown + os=-linux-gnu + ;; mips3*-*) basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'` ;; *************** *** 646,655 **** basic_machine=m68k-rom68k os=-coff ;; - morphos) - basic_machine=powerpc-unknown - os=-morphos - ;; msdos) basic_machine=i386-pc os=-msdos --- 620,625 ---- *************** *** 722,731 **** np1) basic_machine=np1-gould ;; - nv1) - basic_machine=nv1-cray - os=-unicosmp - ;; nsr-tandem) basic_machine=nsr-tandem ;; --- 692,697 ---- *************** *** 733,742 **** basic_machine=hppa1.1-oki os=-proelf ;; - or32 | or32-*) - basic_machine=or32-unknown - os=-coff - ;; OSE68000 | ose68000) basic_machine=m68000-ericsson os=-ose --- 699,704 ---- *************** *** 759,777 **** pbb) basic_machine=m68k-tti ;; ! pc532 | pc532-*) basic_machine=ns32k-pc532 ;; ! pentium | p5 | k5 | k6 | nexgen | viac3) basic_machine=i586-pc ;; ! pentiumpro | p6 | 6x86 | athlon | athlon_*) basic_machine=i686-pc ;; pentiumii | pentium2) basic_machine=i686-pc ;; ! pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*) basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'` ;; pentiumpro-* | p6-* | 6x86-* | athlon-*) --- 721,739 ---- pbb) basic_machine=m68k-tti ;; ! pc532 | pc532-*) basic_machine=ns32k-pc532 ;; ! pentium | p5 | k5 | k6 | nexgen) basic_machine=i586-pc ;; ! pentiumpro | p6 | 6x86 | athlon) basic_machine=i686-pc ;; pentiumii | pentium2) basic_machine=i686-pc ;; ! pentium-* | p5-* | k5-* | k6-* | nexgen-*) basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'` ;; pentiumpro-* | p6-* | 6x86-* | athlon-*) *************** *** 786,807 **** power) basic_machine=power-ibm ;; ppc) basic_machine=powerpc-unknown ! ;; ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` ;; ppcle | powerpclittle | ppc-le | powerpc-little) basic_machine=powerpcle-unknown ! ;; ppcle-* | powerpclittle-*) basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'` ;; ppc64) basic_machine=powerpc64-unknown ! ;; ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` ;; ppc64le | powerpc64little | ppc64-le | powerpc64-little) basic_machine=powerpc64le-unknown ! ;; ppc64le-* | powerpc64little-*) basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'` ;; --- 748,769 ---- power) basic_machine=power-ibm ;; ppc) basic_machine=powerpc-unknown ! ;; ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` ;; ppcle | powerpclittle | ppc-le | powerpc-little) basic_machine=powerpcle-unknown ! ;; ppcle-* | powerpclittle-*) basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'` ;; ppc64) basic_machine=powerpc64-unknown ! ;; ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` ;; ppc64le | powerpc64little | ppc64-le | powerpc64-little) basic_machine=powerpc64le-unknown ! ;; ppc64le-* | powerpc64little-*) basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'` ;; *************** *** 826,837 **** basic_machine=a29k-amd os=-udi ;; - sb1) - basic_machine=mipsisa64sb1-unknown - ;; - sb1el) - basic_machine=mipsisa64sb1el-unknown - ;; sequent) basic_machine=i386-sequent ;; --- 788,793 ---- *************** *** 839,845 **** basic_machine=sh-hitachi os=-hms ;; ! sparclite-wrs | simso-wrs) basic_machine=sparclite-wrs os=-vxworks ;; --- 795,801 ---- basic_machine=sh-hitachi os=-hms ;; ! sparclite-wrs) basic_machine=sparclite-wrs os=-vxworks ;; *************** *** 906,922 **** os=-dynix ;; t3e) ! basic_machine=alphaev5-cray os=-unicos ;; - t90) - basic_machine=t90-cray - os=-unicos - ;; - tic4x | c4x*) - basic_machine=tic4x-unknown - os=-coff - ;; tic54x | c54x*) basic_machine=tic54x-unknown os=-coff --- 862,870 ---- os=-dynix ;; t3e) ! basic_machine=t3e-cray os=-unicos ;; tic54x | c54x*) basic_machine=tic54x-unknown os=-coff *************** *** 927,936 **** tx39el) basic_machine=mipstx39el-unknown ;; - toad1) - basic_machine=pdp10-xkl - os=-tops20 - ;; tower | tower-32) basic_machine=m68k-ncr ;; --- 875,880 ---- *************** *** 955,962 **** os=-vms ;; vpp*|vx|vx-*) ! basic_machine=f301-fujitsu ! ;; vxworks960) basic_machine=i960-wrs os=-vxworks --- 899,906 ---- os=-vms ;; vpp*|vx|vx-*) ! basic_machine=f301-fujitsu ! ;; vxworks960) basic_machine=i960-wrs os=-vxworks *************** *** 977,989 **** basic_machine=hppa1.1-winbond os=-proelf ;; ! xps | xps100) ! basic_machine=xps100-honeywell ;; ! ymp) ! basic_machine=ymp-cray os=-unicos ;; z8k-*-coff) basic_machine=z8k-unknown os=-sim --- 921,937 ---- basic_machine=hppa1.1-winbond os=-proelf ;; ! windows32) ! basic_machine=i386-pc ! os=-windows32-msvcrt ;; ! xmp) ! basic_machine=xmp-cray os=-unicos ;; + xps | xps100) + basic_machine=xps100-honeywell + ;; z8k-*-coff) basic_machine=z8k-unknown os=-sim *************** *** 1004,1009 **** --- 952,964 ---- op60c) basic_machine=hppa1.1-oki ;; + mips) + if [ x$os = x-linux-gnu ]; then + basic_machine=mips-unknown + else + basic_machine=mips-mips + fi + ;; romp) basic_machine=romp-ibm ;; *************** *** 1023,1038 **** we32k) basic_machine=we32k-att ;; ! sh3 | sh4 | sh3eb | sh4eb | sh[1234]le | sh3ele) basic_machine=sh-unknown ;; - sh64) - basic_machine=sh64-unknown - ;; sparc | sparcv9 | sparcv9b) basic_machine=sparc-sun ;; ! cydra) basic_machine=cydra-cydrome ;; orion) --- 978,990 ---- we32k) basic_machine=we32k-att ;; ! sh3 | sh4 | sh3eb | sh4eb) basic_machine=sh-unknown ;; sparc | sparcv9 | sparcv9b) basic_machine=sparc-sun ;; ! cydra) basic_machine=cydra-cydrome ;; orion) *************** *** 1047,1052 **** --- 999,1008 ---- pmac | pmac-mpw) basic_machine=powerpc-apple ;; + c4x*) + basic_machine=c4x-none + os=-coff + ;; *-unknown) # Make sure to match an already-canonicalized machine name. ;; *************** *** 1109,1120 **** | -chorusos* | -chorusrdb* \ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \ ! | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ ! | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ ! | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ ! | -powermax* | -dnix* | -microbsd*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) --- 1065,1074 ---- | -chorusos* | -chorusrdb* \ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \ ! | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ ! | -os2* | -vos*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) *************** *** 1126,1135 **** ;; esac ;; - -nto-qnx*) - ;; -nto*) ! os=`echo $os | sed -e 's|nto|nto-qnx|'` ;; -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \ | -windows* | -osx | -abug | -netware* | -os9* | -beos* \ --- 1080,1087 ---- ;; esac ;; -nto*) ! os=-nto-qnx ;; -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \ | -windows* | -osx | -abug | -netware* | -os9* | -beos* \ *************** *** 1168,1187 **** -acis*) os=-aos ;; - -atheos*) - os=-atheos - ;; -386bsd) os=-bsd ;; -ctix* | -uts*) os=-sysv ;; - -nova*) - os=-rtmk-nova - ;; -ns2 ) ! os=-nextstep2 ;; -nsk*) os=-nsk --- 1120,1133 ---- -acis*) os=-aos ;; -386bsd) os=-bsd ;; -ctix* | -uts*) os=-sysv ;; -ns2 ) ! os=-nextstep2 ;; -nsk*) os=-nsk *************** *** 1220,1227 **** -xenix) os=-xenix ;; ! -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) ! os=-mint ;; -none) ;; --- 1166,1173 ---- -xenix) os=-xenix ;; ! -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) ! os=-mint ;; -none) ;; *************** *** 1254,1264 **** arm*-semi) os=-aout ;; - # This must come before the *-dec entry. pdp10-*) os=-tops20 ;; ! pdp11-*) os=-none ;; *-dec | vax-*) --- 1200,1209 ---- arm*-semi) os=-aout ;; pdp10-*) os=-tops20 ;; ! pdp11-*) os=-none ;; *-dec | vax-*) *************** *** 1285,1293 **** mips*-*) os=-elf ;; - or32-*) - os=-coff - ;; *-tti) # must be before sparc entry or we get the wrong os. os=-sysv3 ;; --- 1230,1235 ---- *************** *** 1351,1369 **** *-next) os=-nextstep3 ;; ! *-gould) os=-sysv ;; ! *-highlevel) os=-bsd ;; *-encore) os=-bsd ;; ! *-sgi) os=-irix ;; ! *-siemens) os=-sysv4 ;; *-masscomp) --- 1293,1311 ---- *-next) os=-nextstep3 ;; ! *-gould) os=-sysv ;; ! *-highlevel) os=-bsd ;; *-encore) os=-bsd ;; ! *-sgi) os=-irix ;; ! *-siemens) os=-sysv4 ;; *-masscomp) *************** *** 1435,1441 **** -ptx*) vendor=sequent ;; ! -vxsim* | -vxworks* | -windiss*) vendor=wrs ;; -aux*) --- 1377,1383 ---- -ptx*) vendor=sequent ;; ! -vxsim* | -vxworks*) vendor=wrs ;; -aux*) diff -crN ./gnome-vfs/configure /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/configure *** ./gnome-vfs/configure Mon Sep 8 14:04:09 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/configure Thu Dec 18 21:13:23 2003 *************** *** 1,6 **** #! /bin/sh # Guess values for system-dependent variables and create Makefiles. ! # Generated by GNU Autoconf 2.57. # # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 # Free Software Foundation, Inc. --- 1,6 ---- #! /bin/sh # Guess values for system-dependent variables and create Makefiles. ! # Generated by GNU Autoconf 2.54. # # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 # Free Software Foundation, Inc. *************** *** 36,45 **** PS4='+ ' # NLS nuisances. ! for as_var in \ ! LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ ! LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ ! LC_TELEPHONE LC_TIME do if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then eval $as_var=C; export $as_var --- 36,42 ---- PS4='+ ' # NLS nuisances. ! for as_var in LANG LANGUAGE LC_ALL LC_COLLATE LC_CTYPE LC_NUMERIC LC_MESSAGES LC_TIME do if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then eval $as_var=C; export $as_var *************** *** 85,99 **** # The user is always right. if test "${PATH_SEPARATOR+set}" != set; then ! echo "#! /bin/sh" >conf$$.sh ! echo "exit 0" >>conf$$.sh ! chmod +x conf$$.sh ! if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then PATH_SEPARATOR=';' else PATH_SEPARATOR=: fi ! rm -f conf$$.sh fi --- 82,96 ---- # The user is always right. if test "${PATH_SEPARATOR+set}" != set; then ! echo "#! /bin/sh" >conftest.sh ! echo "exit 0" >>conftest.sh ! chmod +x conftest.sh ! if (PATH="/nonexistent;."; conftest.sh) >/dev/null 2>&1; then PATH_SEPARATOR=';' else PATH_SEPARATOR=: fi ! rm -f conftest.sh fi *************** *** 467,473 **** # include #endif" ! ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS LIBGNOMEVFS_CURRENT LIBGNOMEVFS_REVISION LIBGNOMEVFS_AGE INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO SET_MAKE ACLOCAL_AMFLAGS MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT GNOME_ACLOCAL_DIR GNOME_ACLOCAL_FLAGS INSIDE_GNOME_DOCU_TRUE INSIDE_GNOME_DOCU_FALSE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP AWK build build_cpu build_vendor build_os host host_cpu host_vendor host_os LN_S ECHO RANLIB ac_ct_RANLIB STRIP ac_ct_STRIP EGREP LIBTOOL INTLTOOL_DESKTOP_RULE INTLTOOL_DIRECTORY_RULE INTLTOOL_KEYS_RULE INTLTOOL_PROP_RULE INTLTOOL_OAF_RULE INTLTOOL_PONG_RULE INTLTOOL_SERVER_RULE INTLTOOL_SHEET_RULE INTLTOOL_SOUNDLIST_RULE INTLTOOL_UI_RULE INTLTOOL_XAM_RULE INTLTOOL_XML_RULE INTLTOOL_CAVES_RULE INTLTOOL_SCHEMAS_RULE INTLTOOL_THEME_RULE INTLTOOL_EXTRACT INTLTOOL_MERGE INTLTOOL_UPDATE INTLTOOL_PERL BONOBO_ACTIVATION_REQUIRED BONOBO_REQUIRED GCONF_REQUIRED GLIB_REQUIRED LIBIDL_REQUIRED ORBIT_REQUIRED XML_REQUIRED PKG_CONFIG MODULES_XML_CFLAGS MODULES_XML_LIBS MODULES_CFLAGS MODULES_LIBS MODULES_FILE_CFLAGS MODULES_FILE_LIBS MODULES_GCONF_CFLAGS MODULES_GCONF_LIBS MODULES_XML_GCONF_CFLAGS MODULES_XML_GCONF_LIBS MONIKERS_CFLAGS MONIKERS_LIBS TEST_CFLAGS TEST_LIBS ORBIT_IDL BONOBO_IDLDIR WARN_CFLAGS GETTEXT_PACKAGE USE_NLS MSGFMT GMSGFMT XGETTEXT CATALOGS CATOBJEXT DATADIRNAME GMOFILES INSTOBJEXT INTLLIBS PO_IN_DATADIR_TRUE PO_IN_DATADIR_FALSE POFILES POSUB MKINSTALLDIRS ALLOCA GCONFTOOL GCONF_SCHEMA_CONFIG_SOURCE GCONF_SCHEMA_FILE_DIR GCONF_SCHEMAS_INSTALL_TRUE GCONF_SCHEMAS_INSTALL_FALSE VFS_SIZE VFS_OFFSET VFS_SIZE_IS VFS_OFFSET_IS VFS_SIZE_PRINTF VFS_OFFSET_PRINTF ENABLE_PROFILER ENABLE_PROFILER_TRUE ENABLE_PROFILER_FALSE VFS_CFLAGS GNOME_VFS_DIR VFS_LIBDIR VFS_INCLUDEDIR VFS_LIBS HAVE_LIBEFS_TRUE HAVE_LIBEFS_FALSE LIBEFS_LIBS LIBEFS_CFLAGS BZ2_LIBS HAVE_CDDA_TRUE HAVE_CDDA_FALSE BUILD_CDEMENU_MODULE_TRUE BUILD_CDEMENU_MODULE_FALSE HAVE_SSL_TRUE HAVE_SSL_FALSE OPENSSL_CFLAGS OPENSSL_LIBS LIBGNUTLS_CONFIG LIBGNUTLS_CFLAGS LIBGNUTLS_LIBS LIBGNOMEVFS_CFLAGS LIBGNOMEVFS_LIBS FAM_LIBS HTML_DIR GTKDOC DB2HTML HAVE_DOCBOOK_TRUE HAVE_DOCBOOK_FALSE HAVE_GTK_DOC_TRUE HAVE_GTK_DOC_FALSE HAVE_GTK_DOC ENABLE_GTK_DOC_TRUE ENABLE_GTK_DOC_FALSE POPT_LIBS TOP_BUILDDIR LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. --- 464,470 ---- # include #endif" ! ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS LIBGNOMEVFS_CURRENT LIBGNOMEVFS_REVISION LIBGNOMEVFS_AGE INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE ACLOCAL_AMFLAGS MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT GNOME_ACLOCAL_DIR GNOME_ACLOCAL_FLAGS INSIDE_GNOME_DOCU_TRUE INSIDE_GNOME_DOCU_FALSE PKG_CONFIG PLATFORM_GNOME_2_TRUE PLATFORM_GNOME_2_FALSE GNOME_INTERFACE_VERSION CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP build build_cpu build_vendor build_os host host_cpu host_vendor host_os LN_S ECHO RANLIB ac_ct_RANLIB EGREP LIBTOOL INTLTOOL_DESKTOP_RULE INTLTOOL_DIRECTORY_RULE INTLTOOL_KEYS_RULE INTLTOOL_PROP_RULE INTLTOOL_OAF_RULE INTLTOOL_PONG_RULE INTLTOOL_SERVER_RULE INTLTOOL_SHEET_RULE INTLTOOL_SOUNDLIST_RULE INTLTOOL_UI_RULE INTLTOOL_XAM_RULE INTLTOOL_XML_RULE INTLTOOL_CAVES_RULE INTLTOOL_SCHEMAS_RULE INTLTOOL_THEME_RULE INTLTOOL_EXTRACT INTLTOOL_MERGE INTLTOOL_UPDATE INTLTOOL_PERL BONOBO_ACTIVATION_REQUIRED BONOBO_REQUIRED GCONF_REQUIRED GLIB_REQUIRED LIBIDL_REQUIRED ORBIT_REQUIRED XML_REQUIRED MODULES_XML_CFLAGS MODULES_XML_LIBS MODULES_CFLAGS MODULES_LIBS MODULES_FILE_CFLAGS MODULES_FILE_LIBS MODULES_GCONF_CFLAGS MODULES_GCONF_LIBS MODULES_XML_GCONF_CFLAGS MODULES_XML_GCONF_LIBS MONIKERS_CFLAGS MONIKERS_LIBS TEST_CFLAGS TEST_LIBS ORBIT_IDL BONOBO_IDLDIR WARN_CFLAGS GETTEXT_PACKAGE USE_NLS MSGFMT GMSGFMT XGETTEXT CATALOGS CATOBJEXT DATADIRNAME GMOFILES INSTOBJEXT INTLLIBS PO_IN_DATADIR_TRUE PO_IN_DATADIR_FALSE POFILES POSUB MKINSTALLDIRS ALLOCA GCONFTOOL GCONF_SCHEMA_CONFIG_SOURCE GCONF_SCHEMA_FILE_DIR GCONF_SCHEMAS_INSTALL_TRUE GCONF_SCHEMAS_INSTALL_FALSE VFS_SIZE VFS_OFFSET VFS_SIZE_IS VFS_OFFSET_IS VFS_SIZE_PRINTF VFS_OFFSET_PRINTF ENABLE_PROFILER ENABLE_PROFILER_TRUE ENABLE_PROFILER_FALSE VFS_CFLAGS GNOME_VFS_DIR VFS_LIBDIR VFS_INCLUDEDIR VFS_LIBS HAVE_LIBEFS_TRUE HAVE_LIBEFS_FALSE LIBEFS_LIBS LIBEFS_CFLAGS BZ2_LIBS HAVE_CDDA_TRUE HAVE_CDDA_FALSE BUILD_CDEMENU_MODULE_TRUE BUILD_CDEMENU_MODULE_FALSE HAVE_SSL_TRUE HAVE_SSL_FALSE OPENSSL_CFLAGS OPENSSL_LIBS LIBGNUTLS_CONFIG LIBGNUTLS_CFLAGS LIBGNUTLS_LIBS LIBGNOMEVFS_CFLAGS LIBGNOMEVFS_LIBS LIBOBJS LIBOBJS="$LIBOBJS .$ac_objext" FAM_LIBS HTML_DIR GTKDOC DB2HTML HAVE_DOCBOOK_TRUE HAVE_DOCBOOK_FALSE HAVE_GTK_DOC_TRUE HAVE_GTK_DOC_FALSE HAVE_GTK_DOC ENABLE_GTK_DOC_TRUE ENABLE_GTK_DOC_FALSE POPT_LIBS TOP_BUILDDIR LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. *************** *** 1009,1014 **** --- 1006,1014 ---- --enable-FEATURE[=ARG] include FEATURE [ARG=yes] --enable-maintainer-mode enable make rules and dependencies not useful (and sometimes confusing) to the casual installer + --enable-platform-gnome-2 enable GNOME 2.x platform default=no + --disable-dependency-tracking Speeds up one-time builds + --enable-dependency-tracking Do not reject slow dependency extractors --enable-shared=PKGS build shared libraries default=yes --enable-static=PKGS build static libraries default=yes --enable-fast-install=PKGS optimize for fast installation default=yes *************** *** 1124,1130 **** running configure, to aid debugging if configure makes a mistake. It was created by $as_me, which was ! generated by GNU Autoconf 2.57. Invocation command line was $ $0 $@ --- 1124,1130 ---- running configure, to aid debugging if configure makes a mistake. It was created by $as_me, which was ! generated by GNU Autoconf 2.54. Invocation command line was $ $0 $@ *************** *** 1176,1229 **** # Keep a trace of the command line. # Strip out --no-create and --no-recursion so they do not pile up. - # Strip out --silent because we don't want to record it for future runs. # Also quote any args containing shell meta-characters. - # Make two passes to allow for proper duplicate-argument suppression. ac_configure_args= - ac_configure_args0= - ac_configure_args1= ac_sep= ! ac_must_keep_next=false ! for ac_pass in 1 2 do ! for ac_arg ! do ! case $ac_arg in ! -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;; ! -q | -quiet | --quiet | --quie | --qui | --qu | --q \ ! | -silent | --silent | --silen | --sile | --sil) ! continue ;; ! *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) ! ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; ! esac ! case $ac_pass in ! 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;; ! 2) ! ac_configure_args1="$ac_configure_args1 '$ac_arg'" ! if test $ac_must_keep_next = true; then ! ac_must_keep_next=false # Got value, back to normal. ! else ! case $ac_arg in ! *=* | --config-cache | -C | -disable-* | --disable-* \ ! | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \ ! | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \ ! | -with-* | --with-* | -without-* | --without-* | --x) ! case "$ac_configure_args0 " in ! "$ac_configure_args1"*" '$ac_arg' "* ) continue ;; ! esac ! ;; ! -* ) ac_must_keep_next=true ;; ! esac ! fi ! ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'" ! # Get rid of the leading space. ! ac_sep=" " ! ;; ! esac ! done done - $as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; } - $as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; } # When interrupted or exit'd, cleanup temporary files, and complete # config.log. We remove comments because anyway the quotes in there --- 1176,1199 ---- # Keep a trace of the command line. # Strip out --no-create and --no-recursion so they do not pile up. # Also quote any args containing shell meta-characters. ac_configure_args= ac_sep= ! for ac_arg do ! case $ac_arg in ! -no-create | --no-create | --no-creat | --no-crea | --no-cre \ ! | --no-cr | --no-c | -n ) continue ;; ! -no-recursion | --no-recursion | --no-recursio | --no-recursi \ ! | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ! continue ;; ! *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) ! ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; ! esac ! ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'" ! # Get rid of the leading space. ! ac_sep=" " done # When interrupted or exit'd, cleanup temporary files, and complete # config.log. We remove comments because anyway the quotes in there *************** *** 1479,1490 **** - ac_config_headers="$ac_config_headers config.h" ! ac_config_commands="$ac_config_commands default-1" ! ! am__api_version="1.4" ac_aux_dir= for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do if test -f $ac_dir/install-sh; then --- 1449,1457 ---- ac_config_headers="$ac_config_headers config.h" ! am__api_version="1.7" ac_aux_dir= for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do if test -f $ac_dir/install-sh; then *************** *** 1591,1610 **** echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6 # Just in case sleep 1 ! echo timestamp > conftestfile # Do `set' in a subshell so we don't clobber the current shell's # arguments. Must try -L first in case configure is actually a # symlink; some systems play weird games with the mod time of symlinks # (eg FreeBSD returns the mod time of the symlink's containing # directory). if ( ! set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null` if test "$*" = "X"; then # -L didn't work. ! set X `ls -t $srcdir/configure conftestfile` fi ! if test "$*" != "X $srcdir/configure conftestfile" \ ! && test "$*" != "X conftestfile $srcdir/configure"; then # If neither matched, then we have a broken ls. This can happen # if, for instance, CONFIG_SHELL is bash and it inherits a --- 1558,1578 ---- echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6 # Just in case sleep 1 ! echo timestamp > conftest.file # Do `set' in a subshell so we don't clobber the current shell's # arguments. Must try -L first in case configure is actually a # symlink; some systems play weird games with the mod time of symlinks # (eg FreeBSD returns the mod time of the symlink's containing # directory). if ( ! set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null` if test "$*" = "X"; then # -L didn't work. ! set X `ls -t $srcdir/configure conftest.file` fi ! rm -f conftest.file ! if test "$*" != "X $srcdir/configure conftest.file" \ ! && test "$*" != "X conftest.file $srcdir/configure"; then # If neither matched, then we have a broken ls. This can happen # if, for instance, CONFIG_SHELL is bash and it inherits a *************** *** 1617,1623 **** { (exit 1); exit 1; }; } fi ! test "$2" = conftestfile ) then # Ok. --- 1585,1591 ---- { (exit 1); exit 1; }; } fi ! test "$2" = conftest.file ) then # Ok. *************** *** 1629,1635 **** Check your system clock" >&2;} { (exit 1); exit 1; }; } fi - rm -f conftest* echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6 test "$program_prefix" != NONE && --- 1597,1602 ---- *************** *** 1645,1659 **** program_transform_name=`echo $program_transform_name | sed -f conftest.sed` rm conftest.sed ! echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 ! echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'` if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.make <<\_ACEOF all: ! @echo 'ac_maketemp="$(MAKE)"' _ACEOF # GNU make sometimes prints "make[1]: Entering...", which would confuse us. eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=` --- 1612,1680 ---- program_transform_name=`echo $program_transform_name | sed -f conftest.sed` rm conftest.sed ! ! # expand $ac_aux_dir to an absolute path ! am_aux_dir=`cd $ac_aux_dir && pwd` ! ! test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing" ! # Use eval to expand $SHELL ! if eval "$MISSING --run true"; then ! am_missing_run="$MISSING --run " ! else ! am_missing_run= ! { echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5 ! echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} ! fi ! ! for ac_prog in gawk mawk nawk awk ! do ! # Extract the first word of "$ac_prog", so it can be a program name with args. ! set dummy $ac_prog; ac_word=$2 ! echo "$as_me:$LINENO: checking for $ac_word" >&5 ! echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 ! if test "${ac_cv_prog_AWK+set}" = set; then ! echo $ECHO_N "(cached) $ECHO_C" >&6 ! else ! if test -n "$AWK"; then ! ac_cv_prog_AWK="$AWK" # Let the user override the test. ! else ! as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ! for as_dir in $PATH ! do ! IFS=$as_save_IFS ! test -z "$as_dir" && as_dir=. ! for ac_exec_ext in '' $ac_executable_extensions; do ! if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ! ac_cv_prog_AWK="$ac_prog" ! echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ! break 2 ! fi ! done ! done ! ! fi ! fi ! AWK=$ac_cv_prog_AWK ! if test -n "$AWK"; then ! echo "$as_me:$LINENO: result: $AWK" >&5 ! echo "${ECHO_T}$AWK" >&6 ! else ! echo "$as_me:$LINENO: result: no" >&5 ! echo "${ECHO_T}no" >&6 ! fi ! ! test -n "$AWK" && break ! done ! ! echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \${MAKE}" >&5 ! echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" >&6 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'` if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.make <<\_ACEOF all: ! @echo 'ac_maketemp="${MAKE}"' _ACEOF # GNU make sometimes prints "make[1]: Entering...", which would confuse us. eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=` *************** *** 1674,1690 **** SET_MAKE="MAKE=${MAKE-make}" fi ! ! PACKAGE=gnome-vfs ! ! VERSION=$LIBGNOMEVFS_VERSION ! ! if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5 echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;} { (exit 1); exit 1; }; } fi cat >>confdefs.h <<_ACEOF #define PACKAGE "$PACKAGE" _ACEOF --- 1695,1723 ---- SET_MAKE="MAKE=${MAKE-make}" fi ! # test to see if srcdir already configured ! if test "`cd $srcdir && pwd`" != "`pwd`" && ! test -f $srcdir/config.status; then { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5 echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;} { (exit 1); exit 1; }; } fi + # test whether we have cygpath + if test -z "$CYGPATH_W"; then + if (cygpath --version) >/dev/null 2>/dev/null; then + CYGPATH_W='cygpath -w' + else + CYGPATH_W=echo + fi + fi + + + # Define the identity of the package. + PACKAGE=gnome-vfs + VERSION=$LIBGNOMEVFS_VERSION + + cat >>confdefs.h <<_ACEOF #define PACKAGE "$PACKAGE" _ACEOF *************** *** 1694,1777 **** #define VERSION "$VERSION" _ACEOF ! missing_dir=`cd $ac_aux_dir && pwd` ! echo "$as_me:$LINENO: checking for working aclocal-${am__api_version}" >&5 ! echo $ECHO_N "checking for working aclocal-${am__api_version}... $ECHO_C" >&6 ! # Run test in a subshell; some versions of sh will print an error if ! # an executable is not found, even if stderr is redirected. ! # Redirect stdin to placate older versions of autoconf. Sigh. ! if (aclocal-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then ! ACLOCAL=aclocal-${am__api_version} ! echo "$as_me:$LINENO: result: found" >&5 ! echo "${ECHO_T}found" >&6 ! else ! ACLOCAL="$missing_dir/missing aclocal-${am__api_version}" ! echo "$as_me:$LINENO: result: missing" >&5 ! echo "${ECHO_T}missing" >&6 ! fi ! ! echo "$as_me:$LINENO: checking for working autoconf" >&5 ! echo $ECHO_N "checking for working autoconf... $ECHO_C" >&6 ! # Run test in a subshell; some versions of sh will print an error if ! # an executable is not found, even if stderr is redirected. ! # Redirect stdin to placate older versions of autoconf. Sigh. ! if (autoconf --version) < /dev/null > /dev/null 2>&1; then ! AUTOCONF=autoconf ! echo "$as_me:$LINENO: result: found" >&5 ! echo "${ECHO_T}found" >&6 ! else ! AUTOCONF="$missing_dir/missing autoconf" ! echo "$as_me:$LINENO: result: missing" >&5 ! echo "${ECHO_T}missing" >&6 ! fi ! ! echo "$as_me:$LINENO: checking for working automake-${am__api_version}" >&5 ! echo $ECHO_N "checking for working automake-${am__api_version}... $ECHO_C" >&6 ! # Run test in a subshell; some versions of sh will print an error if ! # an executable is not found, even if stderr is redirected. ! # Redirect stdin to placate older versions of autoconf. Sigh. ! if (automake-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then ! AUTOMAKE=automake-${am__api_version} ! echo "$as_me:$LINENO: result: found" >&5 ! echo "${ECHO_T}found" >&6 ! else ! AUTOMAKE="$missing_dir/missing automake-${am__api_version}" ! echo "$as_me:$LINENO: result: missing" >&5 ! echo "${ECHO_T}missing" >&6 ! fi ! ! echo "$as_me:$LINENO: checking for working autoheader" >&5 ! echo $ECHO_N "checking for working autoheader... $ECHO_C" >&6 ! # Run test in a subshell; some versions of sh will print an error if ! # an executable is not found, even if stderr is redirected. ! # Redirect stdin to placate older versions of autoconf. Sigh. ! if (autoheader --version) < /dev/null > /dev/null 2>&1; then ! AUTOHEADER=autoheader ! echo "$as_me:$LINENO: result: found" >&5 ! echo "${ECHO_T}found" >&6 ! else ! AUTOHEADER="$missing_dir/missing autoheader" ! echo "$as_me:$LINENO: result: missing" >&5 ! echo "${ECHO_T}missing" >&6 ! fi ! ! echo "$as_me:$LINENO: checking for working makeinfo" >&5 ! echo $ECHO_N "checking for working makeinfo... $ECHO_C" >&6 ! # Run test in a subshell; some versions of sh will print an error if ! # an executable is not found, even if stderr is redirected. ! # Redirect stdin to placate older versions of autoconf. Sigh. ! if (makeinfo --version) < /dev/null > /dev/null 2>&1; then ! MAKEINFO=makeinfo ! echo "$as_me:$LINENO: result: found" >&5 ! echo "${ECHO_T}found" >&6 ! else ! MAKEINFO="$missing_dir/missing makeinfo" ! echo "$as_me:$LINENO: result: missing" >&5 ! echo "${ECHO_T}missing" >&6 fi ACLOCAL_AMFLAGS="$ACLOCAL_FLAGS" --- 1727,1845 ---- #define VERSION "$VERSION" _ACEOF + # Some tools Automake needs. + + ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"} + + + AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"} + + + AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake-${am__api_version}"} + + AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"} ! ! MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} ! ! ! AMTAR=${AMTAR-"${am_missing_run}tar"} ! ! install_sh=${install_sh-"$am_aux_dir/install-sh"} ! ! # Installed binaries are usually stripped using `strip' when the user ! # run `make install-strip'. However `strip' might not be the right ! # tool to use in cross-compilation environments, therefore Automake ! # will honor the `STRIP' environment variable to overrule this program. ! if test "$cross_compiling" != no; then ! if test -n "$ac_tool_prefix"; then ! # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. ! set dummy ${ac_tool_prefix}strip; ac_word=$2 ! echo "$as_me:$LINENO: checking for $ac_word" >&5 ! echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 ! if test "${ac_cv_prog_STRIP+set}" = set; then ! echo $ECHO_N "(cached) $ECHO_C" >&6 ! else ! if test -n "$STRIP"; then ! ac_cv_prog_STRIP="$STRIP" # Let the user override the test. ! else ! as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ! for as_dir in $PATH ! do ! IFS=$as_save_IFS ! test -z "$as_dir" && as_dir=. ! for ac_exec_ext in '' $ac_executable_extensions; do ! if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ! ac_cv_prog_STRIP="${ac_tool_prefix}strip" ! echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ! break 2 ! fi ! done ! done ! ! fi ! fi ! STRIP=$ac_cv_prog_STRIP ! if test -n "$STRIP"; then ! echo "$as_me:$LINENO: result: $STRIP" >&5 ! echo "${ECHO_T}$STRIP" >&6 ! else ! echo "$as_me:$LINENO: result: no" >&5 ! echo "${ECHO_T}no" >&6 fi + fi + if test -z "$ac_cv_prog_STRIP"; then + ac_ct_STRIP=$STRIP + # Extract the first word of "strip", so it can be a program name with args. + set dummy strip; ac_word=$2 + echo "$as_me:$LINENO: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + if test -n "$ac_ct_STRIP"; then + ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. + else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_STRIP="strip" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done + done + + test -z "$ac_cv_prog_ac_ct_STRIP" && ac_cv_prog_ac_ct_STRIP=":" + fi + fi + ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP + if test -n "$ac_ct_STRIP"; then + echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 + echo "${ECHO_T}$ac_ct_STRIP" >&6 + else + echo "$as_me:$LINENO: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + + STRIP=$ac_ct_STRIP + else + STRIP="$ac_cv_prog_STRIP" + fi + + fi + INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s" + + # We need awk for the "check" target. The system "awk" is bad on + # some platforms. + + ACLOCAL_AMFLAGS="$ACLOCAL_FLAGS" *************** *** 1797,1802 **** --- 1865,1871 ---- MAINTAINER_MODE_TRUE='#' MAINTAINER_MODE_FALSE= fi + MAINT=$MAINTAINER_MODE_TRUE *************** *** 1834,1839 **** --- 1903,2187 ---- + # Extract the first word of "pkg-config", so it can be a program name with args. + set dummy pkg-config; ac_word=$2 + echo "$as_me:$LINENO: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_path_PKG_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + case $PKG_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done + done + + ;; + esac + fi + PKG_CONFIG=$ac_cv_path_PKG_CONFIG + + if test -n "$PKG_CONFIG"; then + echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 + echo "${ECHO_T}$PKG_CONFIG" >&6 + else + echo "$as_me:$LINENO: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + + have_pkgconfig=no + if test -x "$PKG_CONFIG" ; then + have_pkgconfig=yes + else + PKG_CONFIG= + fi + echo "$as_me:$LINENO: checking for pkg-config" >&5 + echo $ECHO_N "checking for pkg-config... $ECHO_C" >&6 + pkgconfig_required_version=0.8.0 + if test x$have_pkgconfig = xyes ; then + if ! $PKG_CONFIG --atleast-pkgconfig-version $pkgconfig_required_version; then + echo "*** Your version of pkg-config is too old. You need version $pkgconfig_required_version or newer." + echo "*** See http://www.freedesktop.org/software/pkgconfig" + have_pkgconfig=no + fi + fi + if test x$have_pkgconfig = xyes ; then + echo "$as_me:$LINENO: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + else + PKG_CONFIG= + echo "$as_me:$LINENO: result: not found" >&5 + echo "${ECHO_T}not found" >&6 + if test xfail = xfail; then + { { echo "$as_me:$LINENO: error: + *** You need the latest pkg-config (at least $pkgconfig_required_version). + *** Get the latest version of pkg-config from + *** http://www.freedesktop.org/software/pkgconfig." >&5 + echo "$as_me: error: + *** You need the latest pkg-config (at least $pkgconfig_required_version). + *** Get the latest version of pkg-config from + *** http://www.freedesktop.org/software/pkgconfig." >&2;} + { (exit 1); exit 1; }; } + fi + fi + + + + + + + + + if test xyes = xyes ; then + platform_gnome_2_default=yes + else + platform_gnome_2_default=no + fi + if test xforce = xforce ; then + platform_gnome_2="$platform_gnome_2_default"; + else + # Check whether --enable-platform-gnome-2 or --disable-platform-gnome-2 was given. + if test "${enable_platform_gnome_2+set}" = set; then + enableval="$enable_platform_gnome_2" + platform_gnome_2="$enableval" + else + platform_gnome_2="$platform_gnome_2_default" + fi; + fi + + + + if test $platform_gnome_2 = yes; then + PLATFORM_GNOME_2_TRUE= + PLATFORM_GNOME_2_FALSE='#' + else + PLATFORM_GNOME_2_TRUE='#' + PLATFORM_GNOME_2_FALSE= + fi + + + echo "$as_me:$LINENO: checking for GNOME Platform" >&5 + echo $ECHO_N "checking for GNOME Platform... $ECHO_C" >&6 + if test $platform_gnome_2 = yes; then + echo "$as_me:$LINENO: result: GNOME 2.x" >&5 + echo "${ECHO_T}GNOME 2.x" >&6 + GNOME_INTERFACE_VERSION=2 + + + # Extract the first word of "pkg-config", so it can be a program name with args. + set dummy pkg-config; ac_word=$2 + echo "$as_me:$LINENO: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_path_PKG_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + case $PKG_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done + done + + ;; + esac + fi + PKG_CONFIG=$ac_cv_path_PKG_CONFIG + + if test -n "$PKG_CONFIG"; then + echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 + echo "${ECHO_T}$PKG_CONFIG" >&6 + else + echo "$as_me:$LINENO: result: no" >&5 + echo "${ECHO_T}no" >&6 + fi + + have_pkgconfig=no + if test -x "$PKG_CONFIG" ; then + have_pkgconfig=yes + else + PKG_CONFIG= + fi + echo "$as_me:$LINENO: checking for pkg-config" >&5 + echo $ECHO_N "checking for pkg-config... $ECHO_C" >&6 + pkgconfig_required_version=0.8.0 + if test x$have_pkgconfig = xyes ; then + if ! $PKG_CONFIG --atleast-pkgconfig-version $pkgconfig_required_version; then + echo "*** Your version of pkg-config is too old. You need version $pkgconfig_required_version or newer." + echo "*** See http://www.freedesktop.org/software/pkgconfig" + have_pkgconfig=no + fi + fi + if test x$have_pkgconfig = xyes ; then + echo "$as_me:$LINENO: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + else + PKG_CONFIG= + echo "$as_me:$LINENO: result: not found" >&5 + echo "${ECHO_T}not found" >&6 + if test xfail = xfail; then + { { echo "$as_me:$LINENO: error: + *** You need the latest pkg-config (at least $pkgconfig_required_version). + *** Get the latest version of pkg-config from + *** http://www.freedesktop.org/software/pkgconfig." >&5 + echo "$as_me: error: + *** You need the latest pkg-config (at least $pkgconfig_required_version). + *** Get the latest version of pkg-config from + *** http://www.freedesktop.org/software/pkgconfig." >&2;} + { (exit 1); exit 1; }; } + fi + fi + + + + + + else + echo "$as_me:$LINENO: result: GNOME 1.x" >&5 + echo "${ECHO_T}GNOME 1.x" >&6 + GNOME_INTERFACE_VERSION=1 + fi + + + + + rm -f .deps 2>/dev/null + mkdir .deps 2>/dev/null + if test -d .deps; then + DEPDIR=.deps + else + # MS-DOS does not allow filenames that begin with a dot. + DEPDIR=_deps + fi + rmdir .deps 2>/dev/null + + + ac_config_commands="$ac_config_commands depfiles" + + + am_make=${MAKE-make} + cat > confinc << 'END' + doit: + @echo done + END + # If we don't find an include directive, just comment out the code. + echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5 + echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6 + am__include="#" + am__quote= + _am_result=none + # First try GNU make style include. + echo "include confinc" > confmf + # We grep out `Entering directory' and `Leaving directory' + # messages which can occur if `w' ends up in MAKEFLAGS. + # In particular we don't look at `^make:' because GNU make might + # be invoked under some other name (usually "gmake"), in which + # case it prints its new name instead of `make'. + if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then + am__include=include + am__quote= + _am_result=GNU + fi + # Now try BSD make style include. + if test "$am__include" = "#"; then + echo '.include "confinc"' > confmf + if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then + am__include=.include + am__quote="\"" + _am_result=BSD + fi + fi + + + echo "$as_me:$LINENO: result: $_am_result" >&5 + echo "${ECHO_T}$_am_result" >&6 + rm -f confinc confmf + + # Check whether --enable-dependency-tracking or --disable-dependency-tracking was given. + if test "${enable_dependency_tracking+set}" = set; then + enableval="$enable_dependency_tracking" + + fi; + if test "x$enable_dependency_tracking" != xno; then + am_depcomp="$ac_aux_dir/depcomp" + AMDEPBACKSLASH='\' + fi + + + if test "x$enable_dependency_tracking" != xno; then + AMDEP_TRUE= + AMDEP_FALSE='#' + else + AMDEP_TRUE='#' + AMDEP_FALSE= + fi + + + ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' *************** *** 2143,2152 **** fi ! test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH ! See \`config.log' for more details." >&5 ! echo "$as_me: error: no acceptable C compiler found in \$PATH ! See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } # Provide some information about the compiler. --- 2491,2498 ---- fi ! test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH" >&5 ! echo "$as_me: error: no acceptable C compiler found in \$PATH" >&2;} { (exit 1); exit 1; }; } # Provide some information about the compiler. *************** *** 2171,2181 **** cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ int main () --- 2517,2523 ---- cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" int main () *************** *** 2186,2192 **** } _ACEOF ac_clean_files_save=$ac_clean_files ! ac_clean_files="$ac_clean_files a.out a.exe b.out" # Try to create an executable without -o first, disregard a.out. # It will help us diagnose broken compilers, and finding out an intuition # of exeext. --- 2528,2534 ---- } _ACEOF ac_clean_files_save=$ac_clean_files ! ac_clean_files="$ac_clean_files a.out a.exe" # Try to create an executable without -o first, disregard a.out. # It will help us diagnose broken compilers, and finding out an intuition # of exeext. *************** *** 2205,2243 **** # Be careful to initialize this variable, since it used to be cached. # Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile. ac_cv_exeext= ! # b.out is created by i960 compilers. ! for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out ! do test -f "$ac_file" || continue case $ac_file in ! *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ! ;; ! conftest.$ac_ext ) ! # This is the source file. ! ;; ! [ab].out ) ! # We found the default executable, but exeext='' is most ! # certainly right. ! break;; ! *.* ) ! ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` ! # FIXME: I believe we export ac_cv_exeext for Libtool, ! # but it would be cool to find out if it's true. Does anybody ! # maintain Libtool? --akim. ! export ac_cv_exeext ! break;; ! * ) ! break;; esac done else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! { { echo "$as_me:$LINENO: error: C compiler cannot create executables ! See \`config.log' for more details." >&5 echo "$as_me: error: C compiler cannot create executables ! See \`config.log' for more details." >&2;} { (exit 77); exit 77; }; } fi --- 2547,2573 ---- # Be careful to initialize this variable, since it used to be cached. # Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile. ac_cv_exeext= ! for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.*; do test -f "$ac_file" || continue case $ac_file in ! *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;; ! a.out ) # We found the default executable, but exeext='' is most ! # certainly right. ! break;; ! *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` ! # FIXME: I believe we export ac_cv_exeext for Libtool --akim. ! export ac_cv_exeext ! break;; ! * ) break;; esac done else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 { { echo "$as_me:$LINENO: error: C compiler cannot create executables ! check \`config.log' for details." >&5 echo "$as_me: error: C compiler cannot create executables ! check \`config.log' for details." >&2;} { (exit 77); exit 77; }; } fi *************** *** 2264,2274 **** cross_compiling=yes else { { echo "$as_me:$LINENO: error: cannot run C compiled programs. ! If you meant to cross compile, use \`--host'. ! See \`config.log' for more details." >&5 echo "$as_me: error: cannot run C compiled programs. ! If you meant to cross compile, use \`--host'. ! See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } fi fi --- 2594,2602 ---- cross_compiling=yes else { { echo "$as_me:$LINENO: error: cannot run C compiled programs. ! If you meant to cross compile, use \`--host'." >&5 echo "$as_me: error: cannot run C compiled programs. ! If you meant to cross compile, use \`--host'." >&2;} { (exit 1); exit 1; }; } fi fi *************** *** 2276,2282 **** echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6 ! rm -f a.out a.exe conftest$ac_cv_exeext b.out ac_clean_files=$ac_clean_files_save # Check the compiler produces executables we can run. If not, either # the compiler is broken, or we cross compile. --- 2604,2610 ---- echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6 ! rm -f a.out a.exe conftest$ac_cv_exeext ac_clean_files=$ac_clean_files_save # Check the compiler produces executables we can run. If not, either # the compiler is broken, or we cross compile. *************** *** 2307,2316 **** esac done else ! { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link ! See \`config.log' for more details." >&5 ! echo "$as_me: error: cannot compute suffix of executables: cannot compile and link ! See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } fi --- 2635,2642 ---- esac done else ! { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link" >&5 ! echo "$as_me: error: cannot compute suffix of executables: cannot compile and link" >&2;} { (exit 1); exit 1; }; } fi *************** *** 2328,2338 **** else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ int main () --- 2654,2660 ---- else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" int main () *************** *** 2357,2368 **** done else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! ! { { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile ! See \`config.log' for more details." >&5 ! echo "$as_me: error: cannot compute suffix of object files: cannot compile ! See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } fi --- 2679,2687 ---- done else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ! { { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile" >&5 ! echo "$as_me: error: cannot compute suffix of object files: cannot compile" >&2;} { (exit 1); exit 1; }; } fi *************** *** 2379,2389 **** else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ int main () --- 2698,2704 ---- else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" int main () *************** *** 2411,2418 **** ac_compiler_gnu=yes else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! ac_compiler_gnu=no fi rm -f conftest.$ac_objext conftest.$ac_ext --- 2726,2732 ---- ac_compiler_gnu=yes else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ac_compiler_gnu=no fi rm -f conftest.$ac_objext conftest.$ac_ext *************** *** 2432,2442 **** else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ int main () --- 2746,2752 ---- else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" int main () *************** *** 2461,2468 **** ac_cv_prog_cc_g=yes else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! ac_cv_prog_cc_g=no fi rm -f conftest.$ac_objext conftest.$ac_ext --- 2771,2777 ---- ac_cv_prog_cc_g=yes else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ac_cv_prog_cc_g=no fi rm -f conftest.$ac_objext conftest.$ac_ext *************** *** 2493,2503 **** ac_save_CC=$CC cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ #include #include #include --- 2802,2808 ---- ac_save_CC=$CC cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" #include #include #include *************** *** 2560,2567 **** break else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! fi rm -f conftest.$ac_objext done --- 2865,2871 ---- break else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 fi rm -f conftest.$ac_objext done *************** *** 2612,2622 **** do cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ #include $ac_declaration int --- 2916,2922 ---- do cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" #include $ac_declaration int *************** *** 2642,2659 **** : else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! continue fi rm -f conftest.$ac_objext conftest.$ac_ext cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ $ac_declaration int main () --- 2942,2954 ---- : else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 continue fi rm -f conftest.$ac_objext conftest.$ac_ext cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" $ac_declaration int main () *************** *** 2678,2685 **** break else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! fi rm -f conftest.$ac_objext conftest.$ac_ext done --- 2973,2979 ---- break else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 fi rm -f conftest.$ac_objext conftest.$ac_ext done *************** *** 2692,2699 **** else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! fi rm -f conftest.$ac_objext conftest.$ac_ext ac_ext=c --- 2986,2992 ---- else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 fi rm -f conftest.$ac_objext conftest.$ac_ext ac_ext=c *************** *** 2702,2707 **** --- 2995,3081 ---- ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu + depcc="$CC" am_compiler_list= + + echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 + echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6 + if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then + # We make a subdir and do the tests there. Otherwise we can end up + # making bogus files that we don't know about and never remove. For + # instance it was reported that on HP-UX the gcc test will end up + # making a dummy file named `D' -- because `-MD' means `put the output + # in D'. + mkdir conftest.dir + # Copy depcomp to subdir because otherwise we won't find it if we're + # using a relative directory. + cp "$am_depcomp" conftest.dir + cd conftest.dir + + am_cv_CC_dependencies_compiler_type=none + if test "$am_compiler_list" = ""; then + am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` + fi + for depmode in $am_compiler_list; do + # We need to recreate these files for each test, as the compiler may + # overwrite some of them when testing with obscure command lines. + # This happens at least with the AIX C compiler. + echo '#include "conftest.h"' > conftest.c + echo 'int i;' > conftest.h + echo "${am__include} ${am__quote}conftest.Po${am__quote}" > confmf + + case $depmode in + nosideeffect) + # after this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested + if test "x$enable_dependency_tracking" = xyes; then + continue + else + break + fi + ;; + none) break ;; + esac + # We check with `-c' and `-o' for the sake of the "dashmstdout" + # mode. It turns out that the SunPro C++ compiler does not properly + # handle `-M -o', and we need to detect this. + if depmode=$depmode \ + source=conftest.c object=conftest.o \ + depfile=conftest.Po tmpdepfile=conftest.TPo \ + $SHELL ./depcomp $depcc -c -o conftest.o conftest.c >/dev/null 2>&1 && + grep conftest.h conftest.Po > /dev/null 2>&1 && + ${MAKE-make} -s -f confmf > /dev/null 2>&1; then + am_cv_CC_dependencies_compiler_type=$depmode + break + fi + done + + cd .. + rm -rf conftest.dir + else + am_cv_CC_dependencies_compiler_type=none + fi + + fi + echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5 + echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6 + CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type + + + + if + test "x$enable_dependency_tracking" != xno \ + && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then + am__fastdepCC_TRUE= + am__fastdepCC_FALSE='#' + else + am__fastdepCC_TRUE='#' + am__fastdepCC_FALSE= + fi + + echo "$as_me:$LINENO: checking for strerror in -lcposix" >&5 *************** *** 2713,2723 **** LIBS="-lcposix $LIBS" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus --- 3087,3093 ---- LIBS="-lcposix $LIBS" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus *************** *** 2749,2756 **** ac_cv_lib_cposix_strerror=yes else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! ac_cv_lib_cposix_strerror=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext --- 3119,3125 ---- ac_cv_lib_cposix_strerror=yes else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ac_cv_lib_cposix_strerror=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext *************** *** 3073,3082 **** fi ! test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH ! See \`config.log' for more details." >&5 ! echo "$as_me: error: no acceptable C compiler found in \$PATH ! See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } # Provide some information about the compiler. --- 3442,3449 ---- fi ! test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH" >&5 ! echo "$as_me: error: no acceptable C compiler found in \$PATH" >&2;} { (exit 1); exit 1; }; } # Provide some information about the compiler. *************** *** 3106,3116 **** else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ int main () --- 3473,3479 ---- else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" int main () *************** *** 3138,3145 **** ac_compiler_gnu=yes else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! ac_compiler_gnu=no fi rm -f conftest.$ac_objext conftest.$ac_ext --- 3501,3507 ---- ac_compiler_gnu=yes else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ac_compiler_gnu=no fi rm -f conftest.$ac_objext conftest.$ac_ext *************** *** 3159,3169 **** else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ int main () --- 3521,3527 ---- else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" int main () *************** *** 3188,3195 **** ac_cv_prog_cc_g=yes else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! ac_cv_prog_cc_g=no fi rm -f conftest.$ac_objext conftest.$ac_ext --- 3546,3552 ---- ac_cv_prog_cc_g=yes else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ac_cv_prog_cc_g=no fi rm -f conftest.$ac_objext conftest.$ac_ext *************** *** 3220,3230 **** ac_save_CC=$CC cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ #include #include #include --- 3577,3583 ---- ac_save_CC=$CC cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" #include #include #include *************** *** 3287,3294 **** break else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! fi rm -f conftest.$ac_objext done --- 3640,3646 ---- break else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 fi rm -f conftest.$ac_objext done *************** *** 3339,3349 **** do cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ #include $ac_declaration int --- 3691,3697 ---- do cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" #include $ac_declaration int *************** *** 3369,3386 **** : else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! continue fi rm -f conftest.$ac_objext conftest.$ac_ext cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ $ac_declaration int main () --- 3717,3729 ---- : else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 continue fi rm -f conftest.$ac_objext conftest.$ac_ext cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" $ac_declaration int main () *************** *** 3405,3412 **** break else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! fi rm -f conftest.$ac_objext conftest.$ac_ext done --- 3748,3754 ---- break else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 fi rm -f conftest.$ac_objext conftest.$ac_ext done *************** *** 3419,3426 **** else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! fi rm -f conftest.$ac_objext conftest.$ac_ext ac_ext=c --- 3761,3767 ---- else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 fi rm -f conftest.$ac_objext conftest.$ac_ext ac_ext=c *************** *** 3429,3434 **** --- 3770,3856 ---- ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu + depcc="$CC" am_compiler_list= + + echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 + echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6 + if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then + # We make a subdir and do the tests there. Otherwise we can end up + # making bogus files that we don't know about and never remove. For + # instance it was reported that on HP-UX the gcc test will end up + # making a dummy file named `D' -- because `-MD' means `put the output + # in D'. + mkdir conftest.dir + # Copy depcomp to subdir because otherwise we won't find it if we're + # using a relative directory. + cp "$am_depcomp" conftest.dir + cd conftest.dir + + am_cv_CC_dependencies_compiler_type=none + if test "$am_compiler_list" = ""; then + am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` + fi + for depmode in $am_compiler_list; do + # We need to recreate these files for each test, as the compiler may + # overwrite some of them when testing with obscure command lines. + # This happens at least with the AIX C compiler. + echo '#include "conftest.h"' > conftest.c + echo 'int i;' > conftest.h + echo "${am__include} ${am__quote}conftest.Po${am__quote}" > confmf + + case $depmode in + nosideeffect) + # after this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested + if test "x$enable_dependency_tracking" = xyes; then + continue + else + break + fi + ;; + none) break ;; + esac + # We check with `-c' and `-o' for the sake of the "dashmstdout" + # mode. It turns out that the SunPro C++ compiler does not properly + # handle `-M -o', and we need to detect this. + if depmode=$depmode \ + source=conftest.c object=conftest.o \ + depfile=conftest.Po tmpdepfile=conftest.TPo \ + $SHELL ./depcomp $depcc -c -o conftest.o conftest.c >/dev/null 2>&1 && + grep conftest.h conftest.Po > /dev/null 2>&1 && + ${MAKE-make} -s -f confmf > /dev/null 2>&1; then + am_cv_CC_dependencies_compiler_type=$depmode + break + fi + done + + cd .. + rm -rf conftest.dir + else + am_cv_CC_dependencies_compiler_type=none + fi + + fi + echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5 + echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6 + CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type + + + + if + test "x$enable_dependency_tracking" != xno \ + && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then + am__fastdepCC_TRUE= + am__fastdepCC_FALSE='#' + else + am__fastdepCC_TRUE='#' + am__fastdepCC_FALSE= + fi + + ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' *************** *** 3452,3473 **** do # Use a header file that comes with gcc, so configuring glibc # with a fresh cross-compiler works. - # Prefer to if __STDC__ is defined, since - # exists even on freestanding compilers. # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ ! #ifdef __STDC__ ! # include ! #else ! # include ! #endif Syntax error _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 --- 3874,3885 ---- do # Use a header file that comes with gcc, so configuring glibc # with a fresh cross-compiler works. # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" ! #include Syntax error _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 *************** *** 3490,3497 **** : else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! # Broken: fails on valid input. continue fi --- 3902,3908 ---- : else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 # Broken: fails on valid input. continue fi *************** *** 3501,3511 **** # can be detected and how. cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ #include _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 --- 3912,3918 ---- # can be detected and how. cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" #include _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 *************** *** 3529,3536 **** continue else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! # Passes both tests. ac_preproc_ok=: break --- 3936,3942 ---- continue else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 # Passes both tests. ac_preproc_ok=: break *************** *** 3559,3580 **** do # Use a header file that comes with gcc, so configuring glibc # with a fresh cross-compiler works. - # Prefer to if __STDC__ is defined, since - # exists even on freestanding compilers. # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ ! #ifdef __STDC__ ! # include ! #else ! # include ! #endif Syntax error _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 --- 3965,3976 ---- do # Use a header file that comes with gcc, so configuring glibc # with a fresh cross-compiler works. # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" ! #include Syntax error _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 *************** *** 3597,3604 **** : else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! # Broken: fails on valid input. continue fi --- 3993,3999 ---- : else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 # Broken: fails on valid input. continue fi *************** *** 3608,3618 **** # can be detected and how. cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ #include _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 --- 4003,4009 ---- # can be detected and how. cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" #include _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 *************** *** 3636,3643 **** continue else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! # Passes both tests. ac_preproc_ok=: break --- 4027,4033 ---- continue else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 # Passes both tests. ac_preproc_ok=: break *************** *** 3650,3659 **** if $ac_preproc_ok; then : else ! { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check ! See \`config.log' for more details." >&5 ! echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check ! See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } fi --- 4040,4047 ---- if $ac_preproc_ok; then : else ! { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check" >&5 ! echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;} { (exit 1); exit 1; }; } fi *************** *** 3966,3972 **** # nm: unknown option "B" ignored # Tru64's nm complains that /dev/null is an invalid object file if ($tmp_nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep '(/dev/null|Invalid file or object type)' >/dev/null; then ! lt_cv_path_NM="$tmp_nm -B" break elif ($tmp_nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then lt_cv_path_NM="$tmp_nm -p" --- 4354,4376 ---- # nm: unknown option "B" ignored # Tru64's nm complains that /dev/null is an invalid object file if ($tmp_nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep '(/dev/null|Invalid file or object type)' >/dev/null; then ! # AIX needs to suppress demangling for C++ to work correctly ! # AIX nm : The default is to demangle all C++ symbol names ! # GNU nm : The default is to not demangle low-level symbol names. ! case $host_os in ! aix*) ! # check if we are using GNU nm on AIX ! if $tmp_nm -V 2> /dev/null | grep GNU 2>&1 > /dev/null ! then ! lt_cv_path_NM="$tmp_nm -B" ! else ! lt_cv_path_NM="$tmp_nm -BC" ! fi ! ;; ! *) ! lt_cv_path_NM="$tmp_nm -B" ! ;; ! esac break elif ($tmp_nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then lt_cv_path_NM="$tmp_nm -p" *************** *** 3986,4076 **** echo "$as_me:$LINENO: result: $NM" >&5 echo "${ECHO_T}$NM" >&6 - echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5 - echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6 - if test "${lt_cv_path_SED+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - # Loop through the user's path and test for sed and gsed. - # Then use that list of sed's as ones to test for truncation. - as_executable_p="test -f" - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR - for as_dir in $PATH - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_prog in sed gsed; do - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then - _sed_list="$_sed_list $as_dir/$ac_prog$ac_exec_ext" - fi - done - done - done - - # Create a temporary directory, and hook for its removal unless debugging. - $debug || - { - trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0 - trap '{ (exit 1); exit 1; }' 1 2 13 15 - } - - # Create a (secure) tmp directory for tmp files. - : ${TMPDIR=/tmp} - { - tmp=`(umask 077 && mktemp -d -q "$TMPDIR/sedXXXXXX") 2>/dev/null` && - test -n "$tmp" && test -d "$tmp" - } || - { - tmp=$TMPDIR/sed$$-$RANDOM - (umask 077 && mkdir $tmp) - } || - { - echo "$me: cannot create a temporary directory in $TMPDIR" >&2 - { (exit 1); exit 1; } - } - _max=0 - _count=0 - # Add /usr/xpg4/bin/sed as it is typically found on Solaris - # along with /bin/sed that truncates output. - for _sed in $_sed_list /usr/xpg4/bin/sed; do - test ! -f ${_sed} && break - cat /dev/null > "$tmp/sed.in" - _count=0 - echo ${ECHO_N-$ac_n} "0123456789${ECHO_C-$ac_c}" >"$tmp/sed.in" - # Check for GNU sed and select it if it is found. - if "${_sed}" --version 2>&1 < /dev/null | egrep '(GNU)' > /dev/null; then - lt_cv_path_SED=${_sed} - break - fi - while true; do - cat "$tmp/sed.in" "$tmp/sed.in" >"$tmp/sed.tmp" - mv "$tmp/sed.tmp" "$tmp/sed.in" - cp "$tmp/sed.in" "$tmp/sed.nl" - echo >>"$tmp/sed.nl" - ${_sed} -e 's/a$//' < "$tmp/sed.nl" >"$tmp/sed.out" || break - cmp -s "$tmp/sed.out" "$tmp/sed.nl" || break - # 40000 chars as input seems more than enough - test $_count -gt 10 && break - _count=`expr $_count + 1` - if test $_count -gt $_max; then - _max=$_count - lt_cv_path_SED=$_sed - fi - done - done - rm -rf "$tmp" - - fi - - if test "X$SED" != "X"; then - lt_cv_path_SED=$SED - else - SED=$lt_cv_path_SED - fi - echo "$as_me:$LINENO: result: $SED" >&5 - echo "${ECHO_T}$SED" >&6 - echo "$as_me:$LINENO: checking whether ln -s works" >&5 echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6 LN_S=$as_ln_s --- 4390,4395 ---- *************** *** 4082,4089 **** echo "${ECHO_T}no, using $LN_S" >&6 fi ! echo "$as_me:$LINENO: checking how to recognise dependent libraries" >&5 ! echo $ECHO_N "checking how to recognise dependent libraries... $ECHO_C" >&6 if test "${lt_cv_deplibs_check_method+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else --- 4401,4408 ---- echo "${ECHO_T}no, using $LN_S" >&6 fi ! echo "$as_me:$LINENO: checking how to recognise dependant libraries" >&5 ! echo $ECHO_N "checking how to recognise dependant libraries... $ECHO_C" >&6 if test "${lt_cv_deplibs_check_method+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else *************** *** 4160,4168 **** lt_cv_file_magic_test_file=/usr/lib/libc.sl ;; ! irix5* | irix6* | nonstopux*) case $host_os in ! irix5* | nonstopux*) # this will be overridden with pass_all, but let us keep it just in case lt_cv_deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1" ;; --- 4479,4487 ---- lt_cv_file_magic_test_file=/usr/lib/libc.sl ;; ! irix5* | irix6*) case $host_os in ! irix5*) # this will be overridden with pass_all, but let us keep it just in case lt_cv_deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1" ;; *************** *** 4184,4190 **** # This must be Linux ELF. linux-gnu*) case $host_cpu in ! alpha* | hppa* | i*86 | mips | mipsel | powerpc* | sparc* | ia64* | s390* | x86_64*) lt_cv_deplibs_check_method=pass_all ;; *) # glibc up to 2.1.1 does not perform some relocations on ARM --- 4503,4509 ---- # This must be Linux ELF. linux-gnu*) case $host_cpu in ! alpha* | hppa* | i*86 | powerpc* | sparc* | ia64* ) lt_cv_deplibs_check_method=pass_all ;; *) # glibc up to 2.1.1 does not perform some relocations on ARM *************** *** 4255,4263 **** lt_cv_deplibs_check_method="file_magic ELF [0-9][0-9]*-bit [LM]SB dynamic lib" lt_cv_file_magic_test_file=/lib/libc.so ;; - siemens) - lt_cv_deplibs_check_method=pass_all - ;; esac ;; esac --- 4574,4579 ---- *************** *** 4311,4322 **** lt_cv_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern char \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" lt_cv_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" ;; ! irix* | nonstopux*) symcode='[BCDEGRST]' ;; - osf*) - symcode='[BCDEGQRST]' - ;; solaris* | sysv5*) symcode='[BDT]' ;; --- 4627,4635 ---- lt_cv_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern char \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" lt_cv_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" ;; ! irix*) symcode='[BCDEGRST]' ;; solaris* | sysv5*) symcode='[BDT]' ;; *************** *** 4425,4431 **** (eval $ac_link) 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 ! (exit $ac_status); } && test -s conftest$ac_exeext; then pipe_works=yes fi LIBS="$save_LIBS" --- 4738,4744 ---- (eval $ac_link) 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 ! (exit $ac_status); } && test -s conftest; then pipe_works=yes fi LIBS="$save_LIBS" *************** *** 4495,4548 **** else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ #include #include #include #include - int - main () - { - - ; - return 0; - } _ACEOF ! rm -f conftest.$ac_objext ! if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ! (eval $ac_compile) 2>&5 ! ac_status=$? ! echo "$as_me:$LINENO: \$? = $ac_status" >&5 ! (exit $ac_status); } && ! { ac_try='test -s conftest.$ac_objext' ! { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ! (eval $ac_try) 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 ! (exit $ac_status); }; }; then ac_cv_header_stdc=yes else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! ! ac_cv_header_stdc=no fi ! rm -f conftest.$ac_objext conftest.$ac_ext if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ #include _ACEOF --- 4808,4850 ---- else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" #include #include #include #include _ACEOF ! if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 ! (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 ! (exit $ac_status); } >/dev/null; then ! if test -s conftest.err; then ! ac_cpp_err=$ac_c_preproc_warn_flag ! else ! ac_cpp_err= ! fi ! else ! ac_cpp_err=yes ! fi ! if test -z "$ac_cpp_err"; then ac_cv_header_stdc=yes else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ! ac_cv_header_stdc=no fi ! rm -f conftest.err conftest.$ac_ext if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" #include _ACEOF *************** *** 4560,4570 **** # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ #include _ACEOF --- 4862,4868 ---- # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" #include _ACEOF *************** *** 4585,4602 **** else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ #include #if ((' ' & 0x0FF) == 0x020) # define ISLOWER(c) ('a' <= (c) && (c) <= 'z') # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) #else ! # define ISLOWER(c) \ ! (('a' <= (c) && (c) <= 'i') \ || ('j' <= (c) && (c) <= 'r') \ || ('s' <= (c) && (c) <= 'z')) # define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) --- 4883,4895 ---- else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" #include #if ((' ' & 0x0FF) == 0x020) # define ISLOWER(c) ('a' <= (c) && (c) <= 'z') # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) #else ! # define ISLOWER(c) (('a' <= (c) && (c) <= 'i') \ || ('j' <= (c) && (c) <= 'r') \ || ('s' <= (c) && (c) <= 'z')) # define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) *************** *** 4629,4636 **** else echo "$as_me: program exited with status $ac_status" >&5 echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! ( exit $ac_status ) ac_cv_header_stdc=no fi --- 4922,4928 ---- else echo "$as_me: program exited with status $ac_status" >&5 echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ( exit $ac_status ) ac_cv_header_stdc=no fi *************** *** 4669,4679 **** else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ $ac_includes_default #include <$ac_header> --- 4961,4967 ---- else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" $ac_includes_default #include <$ac_header> *************** *** 4693,4700 **** eval "$as_ac_Header=yes" else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! eval "$as_ac_Header=no" fi rm -f conftest.$ac_objext conftest.$ac_ext --- 4981,4987 ---- eval "$as_ac_Header=yes" else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 eval "$as_ac_Header=no" fi rm -f conftest.$ac_objext conftest.$ac_ext *************** *** 4729,4739 **** echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ $ac_includes_default #include <$ac_header> _ACEOF --- 5016,5022 ---- echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" $ac_includes_default #include <$ac_header> _ACEOF *************** *** 4752,4759 **** ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! ac_header_compiler=no fi rm -f conftest.$ac_objext conftest.$ac_ext --- 5035,5041 ---- ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ac_header_compiler=no fi rm -f conftest.$ac_objext conftest.$ac_ext *************** *** 4765,4775 **** echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ #include <$ac_header> _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 --- 5047,5053 ---- echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" #include <$ac_header> _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 *************** *** 4792,4799 **** ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! ac_header_preproc=no fi rm -f conftest.err conftest.$ac_ext --- 5070,5076 ---- ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ac_header_preproc=no fi rm -f conftest.err conftest.$ac_ext *************** *** 4806,4837 **** { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 ! echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} ! ( ! cat <<\_ASBOX ! ## ------------------------------------ ## ! ## Report this to bug-autoconf@gnu.org. ## ! ## ------------------------------------ ## ! _ASBOX ! ) | ! sed "s/^/$as_me: WARNING: /" >&2 ! ;; no:yes ) { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 ! echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} ! ( ! cat <<\_ASBOX ! ## ------------------------------------ ## ! ## Report this to bug-autoconf@gnu.org. ## ! ## ------------------------------------ ## ! _ASBOX ! ) | ! sed "s/^/$as_me: WARNING: /" >&2 ! ;; esac echo "$as_me:$LINENO: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 --- 5083,5096 ---- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 ! echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; no:yes ) { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 ! echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; esac echo "$as_me:$LINENO: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 *************** *** 4857,4863 **** - # Only perform the check for file, if the check method requires it case $deplibs_check_method in file_magic*) --- 5116,5121 ---- *************** *** 5173,5179 **** case $host in *-*-irix6*) # Find out which ABI we are using. ! echo '#line 5176 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? --- 5431,5437 ---- case $host in *-*-irix6*) # Find out which ABI we are using. ! echo '#line 5434 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? *************** *** 5213,5223 **** cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ int main () --- 5471,5477 ---- cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" int main () *************** *** 5242,5249 **** lt_cv_cc_needs_belf=yes else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! lt_cv_cc_needs_belf=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext --- 5496,5502 ---- lt_cv_cc_needs_belf=yes else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 lt_cv_cc_needs_belf=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext *************** *** 5415,5421 **** # like `-m68040'. lt_cv_prog_cc_pic='-m68020 -resident32 -malways-restore-a4' ;; ! beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) # PIC is the default for these OSes. ;; darwin* | rhapsody*) --- 5668,5674 ---- # like `-m68040'. lt_cv_prog_cc_pic='-m68020 -resident32 -malways-restore-a4' ;; ! beos* | irix5* | irix6* | osf3* | osf4* | osf5*) # PIC is the default for these OSes. ;; darwin* | rhapsody*) *************** *** 5458,5464 **** lt_cv_prog_cc_pic='+Z' ;; ! irix5* | irix6* | nonstopux*) lt_cv_prog_cc_wl='-Wl,' lt_cv_prog_cc_static='-non_shared' # PIC (with -KPIC) is the default. --- 5711,5717 ---- lt_cv_prog_cc_pic='+Z' ;; ! irix5* | irix6*) lt_cv_prog_cc_wl='-Wl,' lt_cv_prog_cc_static='-non_shared' # PIC (with -KPIC) is the default. *************** *** 5502,5508 **** sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) lt_cv_prog_cc_pic='-KPIC' lt_cv_prog_cc_static='-Bstatic' ! lt_cv_prog_cc_wl='-Wl,' ;; uts4*) --- 5755,5765 ---- sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) lt_cv_prog_cc_pic='-KPIC' lt_cv_prog_cc_static='-Bstatic' ! if test "x$host_vendor" = xsni; then ! lt_cv_prog_cc_wl='-LD' ! else ! lt_cv_prog_cc_wl='-Wl,' ! fi ;; uts4*) *************** *** 5542,5552 **** CFLAGS="$CFLAGS $lt_cv_prog_cc_pic -DPIC" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ int main () --- 5799,5805 ---- CFLAGS="$CFLAGS $lt_cv_prog_cc_pic -DPIC" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" int main () *************** *** 5586,5593 **** else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! lt_cv_prog_cc_pic_works=no fi --- 5839,5845 ---- else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 lt_cv_prog_cc_pic_works=no fi *************** *** 5630,5640 **** LDFLAGS="$LDFLAGS $lt_cv_prog_cc_static" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ int main () --- 5882,5888 ---- LDFLAGS="$LDFLAGS $lt_cv_prog_cc_static" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" int main () *************** *** 5659,5666 **** lt_cv_prog_cc_static_works=yes else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LDFLAGS="$save_LDFLAGS" --- 5907,5913 ---- lt_cv_prog_cc_static_works=yes else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LDFLAGS="$save_LDFLAGS" *************** *** 5702,5708 **** save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -o out/conftest2.$ac_objext" compiler_c_o=no ! if { (eval echo configure:5705: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings if test -s out/conftest.err; then --- 5949,5955 ---- save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -o out/conftest2.$ac_objext" compiler_c_o=no ! if { (eval echo configure:5952: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings if test -s out/conftest.err; then *************** *** 5744,5754 **** ac_objext=lo cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ int main () --- 5991,5997 ---- ac_objext=lo cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" int main () *************** *** 5780,5787 **** else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! fi rm -f conftest.$ac_objext conftest.$ac_ext ac_objext="$save_objext" --- 6023,6029 ---- else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 fi rm -f conftest.$ac_objext conftest.$ac_ext ac_objext="$save_objext" *************** *** 5829,5839 **** compiler_rtti_exceptions=no cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ int main () --- 6071,6077 ---- compiler_rtti_exceptions=no cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" int main () *************** *** 5865,5872 **** else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! fi rm -f conftest.$ac_objext conftest.$ac_ext CFLAGS="$save_CFLAGS" --- 6103,6109 ---- else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 fi rm -f conftest.$ac_objext conftest.$ac_ext CFLAGS="$save_CFLAGS" *************** *** 5895,5900 **** --- 6132,6138 ---- old_archive_from_new_cmds= old_archive_from_expsyms_cmds= export_dynamic_flag_spec= + use_runtimelinking= whole_archive_flag_spec= thread_safe_flag_spec= hardcode_into_libs=no *************** *** 6038,6044 **** # If the export-symbols file already is a .def file (1st line # is EXPORTS), use it as is. # If DATA tags from a recent dlltool are present, honour them! ! archive_expsym_cmds='if test "x`sed 1q $export_symbols`" = xEXPORTS; then cp $export_symbols $output_objdir/$soname-def; else echo EXPORTS > $output_objdir/$soname-def; --- 6276,6282 ---- # If the export-symbols file already is a .def file (1st line # is EXPORTS), use it as is. # If DATA tags from a recent dlltool are present, honour them! ! archive_expsym_cmds='if test "x`head -1 $export_symbols`" = xEXPORTS; then cp $export_symbols $output_objdir/$soname-def; else echo EXPORTS > $output_objdir/$soname-def; *************** *** 6047,6053 **** set dummy \$symbol; case \$# in 2) echo " \$2 @ \$_lt_hint ; " >> $output_objdir/$soname-def;; - 4) echo " \$2 \$3 \$4 ; " >> $output_objdir/$soname-def; _lt_hint=`expr \$_lt_hint - 1`;; *) echo " \$2 @ \$_lt_hint \$3 ; " >> $output_objdir/$soname-def;; esac; _lt_hint=`expr 1 + \$_lt_hint`; --- 6285,6290 ---- *************** *** 6152,6176 **** aix_use_runtimelinking=no exp_sym_flag='-Bexport' no_entry_flag="" else ! aix_use_runtimelinking=no ! ! # Test if we are trying to use run time linking or normal ! # AIX style linking. If -brtl is somewhere in LDFLAGS, we ! # need to do runtime linking. ! case $host_os in aix4.[23]|aix4.[23].*|aix5*) ! for ld_flag in $LDFLAGS; do ! case $ld_flag in ! *-brtl*) ! aix_use_runtimelinking=yes ! break ! ;; ! esac ! done ! esac ! exp_sym_flag='-bexport' no_entry_flag='-bnoentry' fi # When large executables or shared objects are built, AIX ld can --- 6389,6401 ---- aix_use_runtimelinking=no exp_sym_flag='-Bexport' no_entry_flag="" + use_runtimelinking="" else ! aix_use_runtimelinking=yes ! export_dynamic_flag_spec='-bexpall' exp_sym_flag='-bexport' no_entry_flag='-bnoentry' + use_runtimelinking='-brtl' fi # When large executables or shared objects are built, AIX ld can *************** *** 6205,6219 **** shared_flag='-shared' else # not using gcc ! if test "$host_cpu" = ia64; then ! shared_flag='${wl}-G' ! else ! if test "$aix_use_runtimelinking" = yes; then ! shared_flag='${wl}-G' ! else ! shared_flag='${wl}-bM:SRE' ! fi ! fi fi # It seems that -bexpall can do strange things, so it is better to --- 6430,6436 ---- shared_flag='-shared' else # not using gcc ! shared_flag='${wl}-G' fi # It seems that -bexpall can do strange things, so it is better to *************** *** 6223,6230 **** # Warning - without using the other runtime loading flags (-brtl), # -berok will link without error, but may produce a broken library. allow_undefined_flag='-berok' ! hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:/usr/lib:/lib' ! archive_expsym_cmds="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag" else if test "$host_cpu" = ia64; then hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib' --- 6440,6447 ---- # Warning - without using the other runtime loading flags (-brtl), # -berok will link without error, but may produce a broken library. allow_undefined_flag='-berok' ! hardcode_libdir_flag_spec='${wl}-bnolibpath ${wl}-blibpath:$libdir:/usr/lib:/lib' ! archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"' ~$AR -crlo $output_objdir/$libname$release.a $output_objdir/$soname' else if test "$host_cpu" = ia64; then hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib' *************** *** 6237,6243 **** allow_undefined_flag='${wl}-berok' # This is a bit strange, but is similar to how AIX traditionally builds # it's shared libraries. ! archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"' ~$AR -crlo $objdir/$libname$release.a $objdir/$soname' fi fi ;; --- 6454,6460 ---- allow_undefined_flag='${wl}-berok' # This is a bit strange, but is similar to how AIX traditionally builds # it's shared libraries. ! archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"' ~$AR -crlo $output_objdir/$libname$release.a $output_objdir/$soname' fi fi ;; *************** *** 6279,6287 **** esac # FIXME: Relying on posixy $() will cause problems for # cross-compilation, but unfortunately the echo tests do not ! # yet detect zsh echo's removal of \ escapes. Also zsh mangles ! # `"' quotes if we put them in here... so don't! ! archive_cmds='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs && $CC $(test .$module = .yes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib ${lib}-master.o $deplibs$linker_flags $(test .$module != .yes && echo -install_name $rpath/$soname $verstring)' # We need to add '_' to the symbols in $export_symbols first #archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols' hardcode_direct=yes --- 6496,6503 ---- esac # FIXME: Relying on posixy $() will cause problems for # cross-compilation, but unfortunately the echo tests do not ! # yet detect zsh echo's removal of \ escapes. ! archive_cmds='$nonopt $(test "x$module" = xyes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs$linker_flags -install_name $rpath/$soname $verstring' # We need to add '_' to the symbols in $export_symbols first #archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols' hardcode_direct=yes *************** *** 6333,6346 **** export_dynamic_flag_spec='${wl}-E' ;; ! irix5* | irix6* | nonstopux*) if test "$GCC" = yes; then archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' else archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' - hardcode_libdir_flag_spec='-rpath $libdir' fi hardcode_libdir_separator=: link_all_deplibs=yes ;; --- 6549,6561 ---- export_dynamic_flag_spec='${wl}-E' ;; ! irix5* | irix6*) if test "$GCC" = yes; then archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' else archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' fi + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' hardcode_libdir_separator=: link_all_deplibs=yes ;; *************** *** 6368,6374 **** hardcode_direct=yes hardcode_shlibpath_var=no if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then ! archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' hardcode_libdir_flag_spec='${wl}-rpath,$libdir' export_dynamic_flag_spec='${wl}-E' else --- 6583,6589 ---- hardcode_direct=yes hardcode_shlibpath_var=no if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then ! archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linker_flags' hardcode_libdir_flag_spec='${wl}-rpath,$libdir' export_dynamic_flag_spec='${wl}-E' else *************** *** 6378,6384 **** hardcode_libdir_flag_spec='-R$libdir' ;; *) ! archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' hardcode_libdir_flag_spec='${wl}-rpath,$libdir' ;; esac --- 6593,6599 ---- hardcode_libdir_flag_spec='-R$libdir' ;; *) ! archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linker_flags' hardcode_libdir_flag_spec='${wl}-rpath,$libdir' ;; esac *************** *** 6490,6512 **** ;; sysv4) ! case $host_vendor in ! sni) ! archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' ! hardcode_direct=yes # is this really true??? ! ;; ! siemens) ! ## LD is ld it makes a PLAMLIB ! ## CC just makes a GrossModule. ! archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags' ! reload_cmds='$CC -r -o $output$reload_objs' ! hardcode_direct=no ! ;; ! motorola) ! archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' ! hardcode_direct=no #Motorola manual says yes, but my tests say they lie ! ;; ! esac runpath_var='LD_RUN_PATH' hardcode_shlibpath_var=no ;; --- 6705,6717 ---- ;; sysv4) ! if test "x$host_vendor" = xsno; then ! archive_cmds='$LD -G -Bsymbolic -h $soname -o $lib $libobjs $deplibs $linker_flags' ! hardcode_direct=yes # is this really true??? ! else ! archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' ! hardcode_direct=no #Motorola manual says yes, but my tests say they lie ! fi runpath_var='LD_RUN_PATH' hardcode_shlibpath_var=no ;; *************** *** 6654,6662 **** aix4* | aix5*) version_type=linux - need_lib_prefix=no - need_version=no - hardcode_into_libs=yes if test "$host_cpu" = ia64; then # AIX 5 supports IA64 library_names_spec='${libname}${release}.so$major ${libname}${release}.so$versuffix $libname.so' --- 6859,6864 ---- *************** *** 6678,6701 **** fi ;; esac ! # AIX (on Power*) has no versioning support, so currently we can ! # not hardcode correct soname into executable. Probably we can ! # add versioning support to collect2, so additional links can ! # be useful in future. ! if test "$aix_use_runtimelinking" = yes; then ! # If using run time linking (on AIX 4.2 or later) use lib.so ! # instead of lib.a to let people know that these are not ! # typical AIX shared libraries. ! library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' ! else ! # We preserve .a as extension for shared libraries through AIX4.2 ! # and later when we are not doing run time linking. ! library_names_spec='${libname}${release}.a $libname.a' ! soname_spec='${libname}${release}.so$major' ! fi shlibpath_var=LIBPATH fi - hardcode_into_libs=yes ;; amigaos*) --- 6880,6891 ---- fi ;; esac ! # We preserve .a as extension for shared libraries through AIX4.2 ! library_names_spec='${libname}${release}.a $libname.a' ! soname_spec='${libname}${release}.so$major' shlibpath_var=LIBPATH + hardcode_into_libs=yes fi ;; amigaos*) *************** *** 6743,6749 **** ;; yes,mingw*) library_names_spec='${libname}`echo ${release} | sed -e 's/[.]/-/g'`${versuffix}.dll' ! sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | sed -e "s/^libraries://" -e "s/;/ /g" -e "s,=/,/,g"` ;; yes,pw32*) library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | sed -e 's/./-/g'`${versuffix}.dll' --- 6933,6939 ---- ;; yes,mingw*) library_names_spec='${libname}`echo ${release} | sed -e 's/[.]/-/g'`${versuffix}.dll' ! sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | sed -e "s/^libraries://" -e "s/;/ /g"` ;; yes,pw32*) library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | sed -e 's/./-/g'`${versuffix}.dll' *************** *** 6826,6842 **** postinstall_cmds='chmod 555 $lib' ;; ! irix5* | irix6* | nonstopux*) ! case $host_os in ! nonstopux*) version_type=nonstopux ;; ! *) version_type=irix ;; ! esac need_lib_prefix=no need_version=no soname_spec='${libname}${release}.so$major' library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so $libname.so' case $host_os in ! irix5* | nonstopux*) libsuff= shlibsuff= ;; *) --- 7016,7029 ---- postinstall_cmds='chmod 555 $lib' ;; ! irix5* | irix6*) ! version_type=irix need_lib_prefix=no need_version=no soname_spec='${libname}${release}.so$major' library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so $libname.so' case $host_os in ! irix5*) libsuff= shlibsuff= ;; *) *************** *** 6881,6910 **** # people can always --disable-shared, the test was removed, and we # assume the GNU/Linux dynamic linker is in use. dynamic_linker='GNU/Linux ld.so' - - # Find out which ABI we are using (multilib Linux x86_64 hack). - libsuff= - case "$host_cpu" in - x86_64*|s390x*) - echo '#line 6889 "configure"' > conftest.$ac_ext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - case `/usr/bin/file conftest.$ac_objext` in - *64-bit*) - libsuff=64 - ;; - esac - fi - rm -rf conftest* - ;; - *) - ;; - esac - sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}" - sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" ;; netbsd*) --- 7068,7073 ---- *************** *** 6964,6975 **** osf3* | osf4* | osf5*) version_type=osf need_version=no ! soname_spec='${libname}${release}.so$major' ! library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so' shlibpath_var=LD_LIBRARY_PATH sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" - hardcode_into_libs=yes ;; sco3.2v5*) --- 7127,7137 ---- osf3* | osf4* | osf5*) version_type=osf need_version=no ! soname_spec='${libname}${release}.so' ! library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so $libname.so' shlibpath_var=LD_LIBRARY_PATH sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" ;; sco3.2v5*) *************** *** 7012,7023 **** case $host_vendor in sni) shlibpath_overrides_runpath=no - need_lib_prefix=no - export_dynamic_flag_spec='${wl}-Blargedynsym' - runpath_var=LD_RUN_PATH - ;; - siemens) - need_lib_prefix=no ;; motorola) need_lib_prefix=no --- 7174,7179 ---- *************** *** 7083,7089 **** ;; aix4*) ! if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then test "$enable_shared" = yes && enable_static=no fi ;; --- 7239,7245 ---- ;; aix4*) ! if test "$host_cpu" != ia64 ; then test "$enable_shared" = yes && enable_static=no fi ;; *************** *** 7140,7183 **** else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ /* System header to define __stub macros and hopefully few prototypes, ! which can conflict with char shl_load (); below. ! Prefer to if __STDC__ is defined, since ! exists even on freestanding compilers. */ ! #ifdef __STDC__ ! # include ! #else ! # include ! #endif /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" - { #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char shl_load (); /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub_shl_load) || defined (__stub___shl_load) choke me #else ! char (*f) () = shl_load; ! #endif ! #ifdef __cplusplus ! } #endif - int - main () - { - return f != shl_load; ; return 0; } --- 7296,7326 ---- else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, ! which can conflict with char shl_load (); below. */ ! #include /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char shl_load (); + char (*f) (); + + int + main () + { /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub_shl_load) || defined (__stub___shl_load) choke me #else ! f = shl_load; #endif ; return 0; } *************** *** 7197,7204 **** ac_cv_func_shl_load=yes else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! ac_cv_func_shl_load=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext --- 7340,7346 ---- ac_cv_func_shl_load=yes else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ac_cv_func_shl_load=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext *************** *** 7217,7227 **** LIBS="-ldld $LIBS" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus --- 7359,7365 ---- LIBS="-ldld $LIBS" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus *************** *** 7253,7260 **** ac_cv_lib_dld_shl_load=yes else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! ac_cv_lib_dld_shl_load=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext --- 7391,7397 ---- ac_cv_lib_dld_shl_load=yes else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ac_cv_lib_dld_shl_load=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext *************** *** 7272,7315 **** else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ /* System header to define __stub macros and hopefully few prototypes, ! which can conflict with char dlopen (); below. ! Prefer to if __STDC__ is defined, since ! exists even on freestanding compilers. */ ! #ifdef __STDC__ ! # include ! #else ! # include ! #endif /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" - { #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char dlopen (); /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub_dlopen) || defined (__stub___dlopen) choke me #else ! char (*f) () = dlopen; ! #endif ! #ifdef __cplusplus ! } #endif - int - main () - { - return f != dlopen; ; return 0; } --- 7409,7439 ---- else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, ! which can conflict with char dlopen (); below. */ ! #include /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char dlopen (); + char (*f) (); + + int + main () + { /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub_dlopen) || defined (__stub___dlopen) choke me #else ! f = dlopen; #endif ; return 0; } *************** *** 7329,7336 **** ac_cv_func_dlopen=yes else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! ac_cv_func_dlopen=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext --- 7453,7459 ---- ac_cv_func_dlopen=yes else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ac_cv_func_dlopen=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext *************** *** 7349,7359 **** LIBS="-ldl $LIBS" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus --- 7472,7478 ---- LIBS="-ldl $LIBS" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus *************** *** 7385,7392 **** ac_cv_lib_dl_dlopen=yes else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! ac_cv_lib_dl_dlopen=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext --- 7504,7510 ---- ac_cv_lib_dl_dlopen=yes else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ac_cv_lib_dl_dlopen=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext *************** *** 7406,7416 **** LIBS="-lsvld $LIBS" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus --- 7524,7530 ---- LIBS="-lsvld $LIBS" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus *************** *** 7442,7449 **** ac_cv_lib_svld_dlopen=yes else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! ac_cv_lib_svld_dlopen=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext --- 7556,7562 ---- ac_cv_lib_svld_dlopen=yes else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ac_cv_lib_svld_dlopen=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext *************** *** 7463,7473 **** LIBS="-ldld $LIBS" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus --- 7576,7582 ---- LIBS="-ldld $LIBS" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus *************** *** 7499,7506 **** ac_cv_lib_dld_dld_link=yes else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! ac_cv_lib_dld_dld_link=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext --- 7608,7614 ---- ac_cv_lib_dld_dld_link=yes else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ac_cv_lib_dld_dld_link=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext *************** *** 7558,7564 **** lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext < conftest.$ac_ext < conftest.$ac_ext <&5 echo $ECHO_N "checking whether gcc understands $option... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ int main () --- 9379,9400 ---- warning_flags= ;; minimum) ! warning_flags="-Wall -Wunused" ;; yes) ! warning_flags="-Wall -Wunused -Wmissing-prototypes -Wmissing-declarations" ;; maximum|error) ! warning_flags="-Wall -Wunused -Wchar-subscripts -Wmissing-declarations -Wmissing-prototypes -Wnested-externs -Wpointer-arith" CFLAGS="$warning_flags $CFLAGS" ! for option in -Wsign-promo -Wno-sign-compare; do SAVE_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $option" echo "$as_me:$LINENO: checking whether gcc understands $option" >&5 echo $ECHO_N "checking whether gcc understands $option... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" int main () *************** *** 9314,9321 **** has_option=yes else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! has_option=no fi rm -f conftest.$ac_objext conftest.$ac_ext --- 9419,9425 ---- has_option=yes else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 has_option=no fi rm -f conftest.$ac_objext conftest.$ac_ext *************** *** 9376,9382 **** VFS_CFLAGS="$warnCFLAGS $complCFLAGS" ! echo "$as_me:$LINENO: checking for sem_wait in -lrt" >&5 echo $ECHO_N "checking for sem_wait in -lrt... $ECHO_C" >&6 --- 9480,9486 ---- VFS_CFLAGS="$warnCFLAGS $complCFLAGS" ! GNOME_PTHREAD_CHECK echo "$as_me:$LINENO: checking for sem_wait in -lrt" >&5 echo $ECHO_N "checking for sem_wait in -lrt... $ECHO_C" >&6 *************** *** 9387,9397 **** LIBS="-lrt $LIBS" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus --- 9491,9497 ---- LIBS="-lrt $LIBS" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus *************** *** 9423,9430 **** ac_cv_lib_rt_sem_wait=yes else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! ac_cv_lib_rt_sem_wait=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext --- 9523,9529 ---- ac_cv_lib_rt_sem_wait=yes else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ac_cv_lib_rt_sem_wait=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext *************** *** 9449,9459 **** else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ #include #if STDC_HEADERS --- 9548,9554 ---- else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" #include #if STDC_HEADERS *************** *** 9484,9491 **** ac_cv_type_size_t=yes else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! ac_cv_type_size_t=no fi rm -f conftest.$ac_objext conftest.$ac_ext --- 9579,9585 ---- ac_cv_type_size_t=yes else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ac_cv_type_size_t=no fi rm -f conftest.$ac_objext conftest.$ac_ext *************** *** 9509,9519 **** else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ #include #if STDC_HEADERS --- 9603,9609 ---- else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" #include #if STDC_HEADERS *************** *** 9544,9551 **** ac_cv_type_off_t=yes else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! ac_cv_type_off_t=no fi rm -f conftest.$ac_objext conftest.$ac_ext --- 9634,9640 ---- ac_cv_type_off_t=yes else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ac_cv_type_off_t=no fi rm -f conftest.$ac_objext conftest.$ac_ext *************** *** 9570,9580 **** else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ # define _LARGEFILE64_SOURCE # include --- 9659,9665 ---- else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" # define _LARGEFILE64_SOURCE # include *************** *** 9601,9608 **** ac_cv_have_off64_t=yes else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! ac_cv_have_off64_t=no fi rm -f conftest.$ac_objext conftest.$ac_ext --- 9686,9692 ---- ac_cv_have_off64_t=yes else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ac_cv_have_off64_t=no fi rm -f conftest.$ac_objext conftest.$ac_ext *************** *** 9643,9653 **** echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ $ac_includes_default #include <$ac_header> _ACEOF --- 9727,9733 ---- echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" $ac_includes_default #include <$ac_header> _ACEOF *************** *** 9666,9673 **** ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! ac_header_compiler=no fi rm -f conftest.$ac_objext conftest.$ac_ext --- 9746,9752 ---- ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ac_header_compiler=no fi rm -f conftest.$ac_objext conftest.$ac_ext *************** *** 9679,9689 **** echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ #include <$ac_header> _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 --- 9758,9764 ---- echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" #include <$ac_header> _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 *************** *** 9706,9713 **** ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! ac_header_preproc=no fi rm -f conftest.err conftest.$ac_ext --- 9781,9787 ---- ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ac_header_preproc=no fi rm -f conftest.err conftest.$ac_ext *************** *** 9720,9751 **** { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 ! echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} ! ( ! cat <<\_ASBOX ! ## ------------------------------------ ## ! ## Report this to bug-autoconf@gnu.org. ## ! ## ------------------------------------ ## ! _ASBOX ! ) | ! sed "s/^/$as_me: WARNING: /" >&2 ! ;; no:yes ) { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 ! echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} ! ( ! cat <<\_ASBOX ! ## ------------------------------------ ## ! ## Report this to bug-autoconf@gnu.org. ## ! ## ------------------------------------ ## ! _ASBOX ! ) | ! sed "s/^/$as_me: WARNING: /" >&2 ! ;; esac echo "$as_me:$LINENO: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 --- 9794,9807 ---- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 ! echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; no:yes ) { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 ! echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; esac echo "$as_me:$LINENO: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 *************** *** 9775,9785 **** else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ #include int main () --- 9831,9837 ---- else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" #include int main () *************** *** 9804,9811 **** am_cv_val_LC_MESSAGES=yes else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! am_cv_val_LC_MESSAGES=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext --- 9856,9862 ---- am_cv_val_LC_MESSAGES=yes else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 am_cv_val_LC_MESSAGES=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext *************** *** 9843,9853 **** echo $ECHO_N "checking libintl.h usability... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ $ac_includes_default #include _ACEOF --- 9894,9900 ---- echo $ECHO_N "checking libintl.h usability... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" $ac_includes_default #include _ACEOF *************** *** 9866,9873 **** ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! ac_header_compiler=no fi rm -f conftest.$ac_objext conftest.$ac_ext --- 9913,9919 ---- ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ac_header_compiler=no fi rm -f conftest.$ac_objext conftest.$ac_ext *************** *** 9879,9889 **** echo $ECHO_N "checking libintl.h presence... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ #include _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 --- 9925,9931 ---- echo $ECHO_N "checking libintl.h presence... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" #include _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 *************** *** 9906,9913 **** ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! ac_header_preproc=no fi rm -f conftest.err conftest.$ac_ext --- 9948,9954 ---- ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ac_header_preproc=no fi rm -f conftest.err conftest.$ac_ext *************** *** 9920,9951 **** { echo "$as_me:$LINENO: WARNING: libintl.h: accepted by the compiler, rejected by the preprocessor!" >&5 echo "$as_me: WARNING: libintl.h: accepted by the compiler, rejected by the preprocessor!" >&2;} { echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the preprocessor's result" >&5 ! echo "$as_me: WARNING: libintl.h: proceeding with the preprocessor's result" >&2;} ! ( ! cat <<\_ASBOX ! ## ------------------------------------ ## ! ## Report this to bug-autoconf@gnu.org. ## ! ## ------------------------------------ ## ! _ASBOX ! ) | ! sed "s/^/$as_me: WARNING: /" >&2 ! ;; no:yes ) { echo "$as_me:$LINENO: WARNING: libintl.h: present but cannot be compiled" >&5 echo "$as_me: WARNING: libintl.h: present but cannot be compiled" >&2;} { echo "$as_me:$LINENO: WARNING: libintl.h: check for missing prerequisite headers?" >&5 echo "$as_me: WARNING: libintl.h: check for missing prerequisite headers?" >&2;} { echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the preprocessor's result" >&5 ! echo "$as_me: WARNING: libintl.h: proceeding with the preprocessor's result" >&2;} ! ( ! cat <<\_ASBOX ! ## ------------------------------------ ## ! ## Report this to bug-autoconf@gnu.org. ## ! ## ------------------------------------ ## ! _ASBOX ! ) | ! sed "s/^/$as_me: WARNING: /" >&2 ! ;; esac echo "$as_me:$LINENO: checking for libintl.h" >&5 echo $ECHO_N "checking for libintl.h... $ECHO_C" >&6 --- 9961,9974 ---- { echo "$as_me:$LINENO: WARNING: libintl.h: accepted by the compiler, rejected by the preprocessor!" >&5 echo "$as_me: WARNING: libintl.h: accepted by the compiler, rejected by the preprocessor!" >&2;} { echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the preprocessor's result" >&5 ! echo "$as_me: WARNING: libintl.h: proceeding with the preprocessor's result" >&2;};; no:yes ) { echo "$as_me:$LINENO: WARNING: libintl.h: present but cannot be compiled" >&5 echo "$as_me: WARNING: libintl.h: present but cannot be compiled" >&2;} { echo "$as_me:$LINENO: WARNING: libintl.h: check for missing prerequisite headers?" >&5 echo "$as_me: WARNING: libintl.h: check for missing prerequisite headers?" >&2;} { echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the preprocessor's result" >&5 ! echo "$as_me: WARNING: libintl.h: proceeding with the preprocessor's result" >&2;};; esac echo "$as_me:$LINENO: checking for libintl.h" >&5 echo $ECHO_N "checking for libintl.h... $ECHO_C" >&6 *************** *** 9972,9982 **** else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ #include --- 9995,10001 ---- else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" #include *************** *** 10003,10010 **** gt_cv_func_dgettext_libc=yes else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! gt_cv_func_dgettext_libc=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext --- 10022,10028 ---- gt_cv_func_dgettext_libc=yes else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 gt_cv_func_dgettext_libc=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext *************** *** 10025,10068 **** else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ /* System header to define __stub macros and hopefully few prototypes, ! which can conflict with char $ac_func (); below. ! Prefer to if __STDC__ is defined, since ! exists even on freestanding compilers. */ ! #ifdef __STDC__ ! # include ! #else ! # include ! #endif /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" - { #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char $ac_func (); /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub_$ac_func) || defined (__stub___$ac_func) choke me #else ! char (*f) () = $ac_func; ! #endif ! #ifdef __cplusplus ! } #endif - int - main () - { - return f != $ac_func; ; return 0; } --- 10043,10073 ---- else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, ! which can conflict with char $ac_func (); below. */ ! #include /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char $ac_func (); + char (*f) (); + + int + main () + { /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub_$ac_func) || defined (__stub___$ac_func) choke me #else ! f = $ac_func; #endif ; return 0; } *************** *** 10082,10089 **** eval "$as_ac_var=yes" else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! eval "$as_ac_var=no" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext --- 10087,10093 ---- eval "$as_ac_var=yes" else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 eval "$as_ac_var=no" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext *************** *** 10115,10125 **** LIBS="-lintl $LIBS" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus --- 10119,10125 ---- LIBS="-lintl $LIBS" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus *************** *** 10151,10158 **** ac_cv_lib_intl_bindtextdomain=yes else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! ac_cv_lib_intl_bindtextdomain=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext --- 10151,10157 ---- ac_cv_lib_intl_bindtextdomain=yes else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ac_cv_lib_intl_bindtextdomain=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext *************** *** 10170,10180 **** LIBS="-lintl $LIBS" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus --- 10169,10175 ---- LIBS="-lintl $LIBS" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus *************** *** 10206,10213 **** ac_cv_lib_intl_dgettext=yes else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! ac_cv_lib_intl_dgettext=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext --- 10201,10207 ---- ac_cv_lib_intl_dgettext=yes else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ac_cv_lib_intl_dgettext=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext *************** *** 10236,10246 **** LIBS="-lintl -liconv $LIBS" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus --- 10230,10236 ---- LIBS="-lintl -liconv $LIBS" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus *************** *** 10272,10279 **** ac_cv_lib_intl_dcgettext=yes else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! ac_cv_lib_intl_dcgettext=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext --- 10262,10268 ---- ac_cv_lib_intl_dcgettext=yes else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ac_cv_lib_intl_dcgettext=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext *************** *** 10310,10353 **** else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ /* System header to define __stub macros and hopefully few prototypes, ! which can conflict with char $ac_func (); below. ! Prefer to if __STDC__ is defined, since ! exists even on freestanding compilers. */ ! #ifdef __STDC__ ! # include ! #else ! # include ! #endif /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" - { #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char $ac_func (); /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub_$ac_func) || defined (__stub___$ac_func) choke me #else ! char (*f) () = $ac_func; ! #endif ! #ifdef __cplusplus ! } #endif - int - main () - { - return f != $ac_func; ; return 0; } --- 10299,10329 ---- else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, ! which can conflict with char $ac_func (); below. */ ! #include /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char $ac_func (); + char (*f) (); + + int + main () + { /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub_$ac_func) || defined (__stub___$ac_func) choke me #else ! f = $ac_func; #endif ; return 0; } *************** *** 10367,10374 **** eval "$as_ac_var=yes" else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! eval "$as_ac_var=no" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext --- 10343,10349 ---- eval "$as_ac_var=yes" else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 eval "$as_ac_var=no" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext *************** *** 10459,10502 **** else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ /* System header to define __stub macros and hopefully few prototypes, ! which can conflict with char $ac_func (); below. ! Prefer to if __STDC__ is defined, since ! exists even on freestanding compilers. */ ! #ifdef __STDC__ ! # include ! #else ! # include ! #endif /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" - { #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char $ac_func (); /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub_$ac_func) || defined (__stub___$ac_func) choke me #else ! char (*f) () = $ac_func; ! #endif ! #ifdef __cplusplus ! } #endif - int - main () - { - return f != $ac_func; ; return 0; } --- 10434,10464 ---- else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, ! which can conflict with char $ac_func (); below. */ ! #include /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char $ac_func (); + char (*f) (); + + int + main () + { /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub_$ac_func) || defined (__stub___$ac_func) choke me #else ! f = $ac_func; #endif ; return 0; } *************** *** 10516,10523 **** eval "$as_ac_var=yes" else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! eval "$as_ac_var=no" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext --- 10478,10484 ---- eval "$as_ac_var=yes" else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 eval "$as_ac_var=no" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext *************** *** 10610,10620 **** cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ int main () --- 10571,10577 ---- cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" int main () *************** *** 10641,10648 **** DATADIRNAME=share else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! case $host in *-*-solaris*) echo "$as_me:$LINENO: checking for bind_textdomain_codeset" >&5 --- 10598,10604 ---- DATADIRNAME=share else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 case $host in *-*-solaris*) echo "$as_me:$LINENO: checking for bind_textdomain_codeset" >&5 *************** *** 10652,10695 **** else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ /* System header to define __stub macros and hopefully few prototypes, ! which can conflict with char bind_textdomain_codeset (); below. ! Prefer to if __STDC__ is defined, since ! exists even on freestanding compilers. */ ! #ifdef __STDC__ ! # include ! #else ! # include ! #endif /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" - { #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char bind_textdomain_codeset (); /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub_bind_textdomain_codeset) || defined (__stub___bind_textdomain_codeset) choke me #else ! char (*f) () = bind_textdomain_codeset; ! #endif ! #ifdef __cplusplus ! } #endif - int - main () - { - return f != bind_textdomain_codeset; ; return 0; } --- 10608,10638 ---- else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, ! which can conflict with char bind_textdomain_codeset (); below. */ ! #include /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char bind_textdomain_codeset (); + char (*f) (); + + int + main () + { /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub_bind_textdomain_codeset) || defined (__stub___bind_textdomain_codeset) choke me #else ! f = bind_textdomain_codeset; #endif ; return 0; } *************** *** 10709,10716 **** ac_cv_func_bind_textdomain_codeset=yes else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! ac_cv_func_bind_textdomain_codeset=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext --- 10652,10658 ---- ac_cv_func_bind_textdomain_codeset=yes else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ac_cv_func_bind_textdomain_codeset=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext *************** *** 10765,10771 **** # We need to process the po/ directory. POSUB=po ! ac_config_commands="$ac_config_commands default-3" for lang in $ALL_LINGUAS; do --- 10707,10713 ---- # We need to process the po/ directory. POSUB=po ! ac_config_commands="$ac_config_commands default-2" for lang in $ALL_LINGUAS; do *************** *** 10857,10867 **** LIBS="-lnsl $LIBS" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus --- 10799,10805 ---- LIBS="-lnsl $LIBS" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus *************** *** 10893,10900 **** ac_cv_lib_nsl_t_accept=yes else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! ac_cv_lib_nsl_t_accept=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext --- 10831,10837 ---- ac_cv_lib_nsl_t_accept=yes else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ac_cv_lib_nsl_t_accept=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext *************** *** 10921,10931 **** LIBS="-lsocket $LIBS" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus --- 10858,10864 ---- LIBS="-lsocket $LIBS" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus *************** *** 10957,10964 **** ac_cv_lib_socket_socket=yes else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! ac_cv_lib_socket_socket=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext --- 10890,10896 ---- ac_cv_lib_socket_socket=yes else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ac_cv_lib_socket_socket=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext *************** *** 10985,10995 **** else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ #include int main () --- 10917,10923 ---- else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" #include int main () *************** *** 11014,11021 **** ac_cv_working_alloca_h=yes else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! ac_cv_working_alloca_h=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext --- 10942,10948 ---- ac_cv_working_alloca_h=yes else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ac_cv_working_alloca_h=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext *************** *** 11037,11047 **** else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ #ifdef __GNUC__ # define alloca __builtin_alloca #else --- 10964,10970 ---- else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" #ifdef __GNUC__ # define alloca __builtin_alloca #else *************** *** 11086,11093 **** ac_cv_func_alloca_works=yes else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! ac_cv_func_alloca_works=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext --- 11009,11015 ---- ac_cv_func_alloca_works=yes else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ac_cv_func_alloca_works=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext *************** *** 11121,11131 **** else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ #if defined(CRAY) && ! defined(CRAY2) webecray #else --- 11043,11049 ---- else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" #if defined(CRAY) && ! defined(CRAY2) webecray #else *************** *** 11154,11197 **** else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ /* System header to define __stub macros and hopefully few prototypes, ! which can conflict with char $ac_func (); below. ! Prefer to if __STDC__ is defined, since ! exists even on freestanding compilers. */ ! #ifdef __STDC__ ! # include ! #else ! # include ! #endif /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" - { #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char $ac_func (); /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub_$ac_func) || defined (__stub___$ac_func) choke me #else ! char (*f) () = $ac_func; ! #endif ! #ifdef __cplusplus ! } #endif - int - main () - { - return f != $ac_func; ; return 0; } --- 11072,11102 ---- else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, ! which can conflict with char $ac_func (); below. */ ! #include /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char $ac_func (); + char (*f) (); + + int + main () + { /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub_$ac_func) || defined (__stub___$ac_func) choke me #else ! f = $ac_func; #endif ; return 0; } *************** *** 11211,11218 **** eval "$as_ac_var=yes" else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! eval "$as_ac_var=no" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext --- 11116,11122 ---- eval "$as_ac_var=yes" else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 eval "$as_ac_var=no" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext *************** *** 11241,11251 **** else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ int find_stack_direction () { --- 11145,11151 ---- else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" int find_stack_direction () { *************** *** 11281,11288 **** else echo "$as_me: program exited with status $ac_status" >&5 echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! ( exit $ac_status ) ac_cv_c_stack_direction=-1 fi --- 11181,11187 ---- else echo "$as_me: program exited with status $ac_status" >&5 echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ( exit $ac_status ) ac_cv_c_stack_direction=-1 fi *************** *** 11321,11364 **** else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ /* System header to define __stub macros and hopefully few prototypes, ! which can conflict with char $ac_func (); below. ! Prefer to if __STDC__ is defined, since ! exists even on freestanding compilers. */ ! #ifdef __STDC__ ! # include ! #else ! # include ! #endif /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" - { #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char $ac_func (); /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub_$ac_func) || defined (__stub___$ac_func) choke me #else ! char (*f) () = $ac_func; ! #endif ! #ifdef __cplusplus ! } #endif - int - main () - { - return f != $ac_func; ; return 0; } --- 11220,11250 ---- else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, ! which can conflict with char $ac_func (); below. */ ! #include /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char $ac_func (); + char (*f) (); + + int + main () + { /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub_$ac_func) || defined (__stub___$ac_func) choke me #else ! f = $ac_func; #endif ; return 0; } *************** *** 11378,11385 **** eval "$as_ac_var=yes" else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! eval "$as_ac_var=no" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext --- 11264,11270 ---- eval "$as_ac_var=yes" else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 eval "$as_ac_var=no" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext *************** *** 11502,11507 **** --- 11387,11393 ---- fi + echo "$as_me:$LINENO: checking for int" >&5 echo $ECHO_N "checking for int... $ECHO_C" >&6 if test "${ac_cv_type_int+set}" = set; then *************** *** 11509,11519 **** else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ $ac_includes_default int main () --- 11395,11401 ---- else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" $ac_includes_default int main () *************** *** 11541,11548 **** ac_cv_type_int=yes else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! ac_cv_type_int=no fi rm -f conftest.$ac_objext conftest.$ac_ext --- 11423,11429 ---- ac_cv_type_int=yes else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ac_cv_type_int=no fi rm -f conftest.$ac_objext conftest.$ac_ext *************** *** 11564,11574 **** # Depending upon the size, compute the lo and hi bounds. cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ $ac_includes_default int main () --- 11445,11451 ---- # Depending upon the size, compute the lo and hi bounds. cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" $ac_includes_default int main () *************** *** 11596,11606 **** while :; do cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ $ac_includes_default int main () --- 11473,11479 ---- while :; do cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" $ac_includes_default int main () *************** *** 11627,11634 **** ac_hi=$ac_mid; break else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! ac_lo=`expr $ac_mid + 1` if test $ac_lo -le $ac_mid; then ac_lo= ac_hi= --- 11500,11506 ---- ac_hi=$ac_mid; break else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ac_lo=`expr $ac_mid + 1` if test $ac_lo -le $ac_mid; then ac_lo= ac_hi= *************** *** 11640,11654 **** done else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ $ac_includes_default int main () --- 11512,11521 ---- done else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" $ac_includes_default int main () *************** *** 11676,11686 **** while :; do cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ $ac_includes_default int main () --- 11543,11549 ---- while :; do cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" $ac_includes_default int main () *************** *** 11707,11714 **** ac_lo=$ac_mid; break else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! ac_hi=`expr '(' $ac_mid ')' - 1` if test $ac_mid -le $ac_hi; then ac_lo= ac_hi= --- 11570,11576 ---- ac_lo=$ac_mid; break else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ac_hi=`expr '(' $ac_mid ')' - 1` if test $ac_mid -le $ac_hi; then ac_lo= ac_hi= *************** *** 11720,11727 **** done else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! ac_lo= ac_hi= fi rm -f conftest.$ac_objext conftest.$ac_ext --- 11582,11588 ---- done else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ac_lo= ac_hi= fi rm -f conftest.$ac_objext conftest.$ac_ext *************** *** 11732,11742 **** ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ $ac_includes_default int main () --- 11593,11599 ---- ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" $ac_includes_default int main () *************** *** 11763,11797 **** ac_hi=$ac_mid else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! ac_lo=`expr '(' $ac_mid ')' + 1` fi rm -f conftest.$ac_objext conftest.$ac_ext done case $ac_lo in ?*) ac_cv_sizeof_int=$ac_lo;; ! '') { { echo "$as_me:$LINENO: error: cannot compute sizeof (int), 77 ! See \`config.log' for more details." >&5 ! echo "$as_me: error: cannot compute sizeof (int), 77 ! See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } ;; esac else if test "$cross_compiling" = yes; then ! { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling ! See \`config.log' for more details." >&5 ! echo "$as_me: error: cannot run test program while cross compiling ! See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ $ac_includes_default long longval () { return (long) (sizeof (int)); } unsigned long ulongval () { return (long) (sizeof (int)); } --- 11620,11645 ---- ac_hi=$ac_mid else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ac_lo=`expr '(' $ac_mid ')' + 1` fi rm -f conftest.$ac_objext conftest.$ac_ext done case $ac_lo in ?*) ac_cv_sizeof_int=$ac_lo;; ! '') { { echo "$as_me:$LINENO: error: cannot compute sizeof (int), 77" >&5 ! echo "$as_me: error: cannot compute sizeof (int), 77" >&2;} { (exit 1); exit 1; }; } ;; esac else if test "$cross_compiling" = yes; then ! { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling" >&5 ! echo "$as_me: error: cannot run test program while cross compiling" >&2;} { (exit 1); exit 1; }; } else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" $ac_includes_default long longval () { return (long) (sizeof (int)); } unsigned long ulongval () { return (long) (sizeof (int)); } *************** *** 11839,11851 **** else echo "$as_me: program exited with status $ac_status" >&5 echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! ( exit $ac_status ) ! { { echo "$as_me:$LINENO: error: cannot compute sizeof (int), 77 ! See \`config.log' for more details." >&5 ! echo "$as_me: error: cannot compute sizeof (int), 77 ! See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } fi rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext --- 11687,11696 ---- else echo "$as_me: program exited with status $ac_status" >&5 echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ( exit $ac_status ) ! { { echo "$as_me:$LINENO: error: cannot compute sizeof (int), 77" >&5 ! echo "$as_me: error: cannot compute sizeof (int), 77" >&2;} { (exit 1); exit 1; }; } fi rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext *************** *** 11870,11880 **** else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ $ac_includes_default int main () --- 11715,11721 ---- else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" $ac_includes_default int main () *************** *** 11902,11909 **** ac_cv_type_long=yes else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! ac_cv_type_long=no fi rm -f conftest.$ac_objext conftest.$ac_ext --- 11743,11749 ---- ac_cv_type_long=yes else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ac_cv_type_long=no fi rm -f conftest.$ac_objext conftest.$ac_ext *************** *** 11925,11935 **** # Depending upon the size, compute the lo and hi bounds. cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ $ac_includes_default int main () --- 11765,11771 ---- # Depending upon the size, compute the lo and hi bounds. cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" $ac_includes_default int main () *************** *** 11957,11967 **** while :; do cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ $ac_includes_default int main () --- 11793,11799 ---- while :; do cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" $ac_includes_default int main () *************** *** 11988,11995 **** ac_hi=$ac_mid; break else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! ac_lo=`expr $ac_mid + 1` if test $ac_lo -le $ac_mid; then ac_lo= ac_hi= --- 11820,11826 ---- ac_hi=$ac_mid; break else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ac_lo=`expr $ac_mid + 1` if test $ac_lo -le $ac_mid; then ac_lo= ac_hi= *************** *** 12001,12015 **** done else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ $ac_includes_default int main () --- 11832,11841 ---- done else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" $ac_includes_default int main () *************** *** 12037,12047 **** while :; do cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ $ac_includes_default int main () --- 11863,11869 ---- while :; do cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" $ac_includes_default int main () *************** *** 12068,12075 **** ac_lo=$ac_mid; break else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! ac_hi=`expr '(' $ac_mid ')' - 1` if test $ac_mid -le $ac_hi; then ac_lo= ac_hi= --- 11890,11896 ---- ac_lo=$ac_mid; break else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ac_hi=`expr '(' $ac_mid ')' - 1` if test $ac_mid -le $ac_hi; then ac_lo= ac_hi= *************** *** 12081,12088 **** done else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! ac_lo= ac_hi= fi rm -f conftest.$ac_objext conftest.$ac_ext --- 11902,11908 ---- done else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ac_lo= ac_hi= fi rm -f conftest.$ac_objext conftest.$ac_ext *************** *** 12093,12103 **** ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ $ac_includes_default int main () --- 11913,11919 ---- ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" $ac_includes_default int main () *************** *** 12124,12158 **** ac_hi=$ac_mid else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! ac_lo=`expr '(' $ac_mid ')' + 1` fi rm -f conftest.$ac_objext conftest.$ac_ext done case $ac_lo in ?*) ac_cv_sizeof_long=$ac_lo;; ! '') { { echo "$as_me:$LINENO: error: cannot compute sizeof (long), 77 ! See \`config.log' for more details." >&5 ! echo "$as_me: error: cannot compute sizeof (long), 77 ! See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } ;; esac else if test "$cross_compiling" = yes; then ! { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling ! See \`config.log' for more details." >&5 ! echo "$as_me: error: cannot run test program while cross compiling ! See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ $ac_includes_default long longval () { return (long) (sizeof (long)); } unsigned long ulongval () { return (long) (sizeof (long)); } --- 11940,11965 ---- ac_hi=$ac_mid else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ac_lo=`expr '(' $ac_mid ')' + 1` fi rm -f conftest.$ac_objext conftest.$ac_ext done case $ac_lo in ?*) ac_cv_sizeof_long=$ac_lo;; ! '') { { echo "$as_me:$LINENO: error: cannot compute sizeof (long), 77" >&5 ! echo "$as_me: error: cannot compute sizeof (long), 77" >&2;} { (exit 1); exit 1; }; } ;; esac else if test "$cross_compiling" = yes; then ! { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling" >&5 ! echo "$as_me: error: cannot run test program while cross compiling" >&2;} { (exit 1); exit 1; }; } else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" $ac_includes_default long longval () { return (long) (sizeof (long)); } unsigned long ulongval () { return (long) (sizeof (long)); } *************** *** 12200,12212 **** else echo "$as_me: program exited with status $ac_status" >&5 echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! ( exit $ac_status ) ! { { echo "$as_me:$LINENO: error: cannot compute sizeof (long), 77 ! See \`config.log' for more details." >&5 ! echo "$as_me: error: cannot compute sizeof (long), 77 ! See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } fi rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext --- 12007,12016 ---- else echo "$as_me: program exited with status $ac_status" >&5 echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ( exit $ac_status ) ! { { echo "$as_me:$LINENO: error: cannot compute sizeof (long), 77" >&5 ! echo "$as_me: error: cannot compute sizeof (long), 77" >&2;} { (exit 1); exit 1; }; } fi rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext *************** *** 12231,12241 **** else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ $ac_includes_default int main () --- 12035,12041 ---- else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" $ac_includes_default int main () *************** *** 12263,12270 **** ac_cv_type_long_long=yes else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! ac_cv_type_long_long=no fi rm -f conftest.$ac_objext conftest.$ac_ext --- 12063,12069 ---- ac_cv_type_long_long=yes else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ac_cv_type_long_long=no fi rm -f conftest.$ac_objext conftest.$ac_ext *************** *** 12286,12296 **** # Depending upon the size, compute the lo and hi bounds. cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ $ac_includes_default int main () --- 12085,12091 ---- # Depending upon the size, compute the lo and hi bounds. cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" $ac_includes_default int main () *************** *** 12318,12328 **** while :; do cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ $ac_includes_default int main () --- 12113,12119 ---- while :; do cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" $ac_includes_default int main () *************** *** 12349,12356 **** ac_hi=$ac_mid; break else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! ac_lo=`expr $ac_mid + 1` if test $ac_lo -le $ac_mid; then ac_lo= ac_hi= --- 12140,12146 ---- ac_hi=$ac_mid; break else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ac_lo=`expr $ac_mid + 1` if test $ac_lo -le $ac_mid; then ac_lo= ac_hi= *************** *** 12362,12376 **** done else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ $ac_includes_default int main () --- 12152,12161 ---- done else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" $ac_includes_default int main () *************** *** 12398,12408 **** while :; do cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ $ac_includes_default int main () --- 12183,12189 ---- while :; do cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" $ac_includes_default int main () *************** *** 12429,12436 **** ac_lo=$ac_mid; break else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! ac_hi=`expr '(' $ac_mid ')' - 1` if test $ac_mid -le $ac_hi; then ac_lo= ac_hi= --- 12210,12216 ---- ac_lo=$ac_mid; break else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ac_hi=`expr '(' $ac_mid ')' - 1` if test $ac_mid -le $ac_hi; then ac_lo= ac_hi= *************** *** 12442,12449 **** done else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! ac_lo= ac_hi= fi rm -f conftest.$ac_objext conftest.$ac_ext --- 12222,12228 ---- done else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ac_lo= ac_hi= fi rm -f conftest.$ac_objext conftest.$ac_ext *************** *** 12454,12464 **** ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ $ac_includes_default int main () --- 12233,12239 ---- ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" $ac_includes_default int main () *************** *** 12485,12519 **** ac_hi=$ac_mid else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! ac_lo=`expr '(' $ac_mid ')' + 1` fi rm -f conftest.$ac_objext conftest.$ac_ext done case $ac_lo in ?*) ac_cv_sizeof_long_long=$ac_lo;; ! '') { { echo "$as_me:$LINENO: error: cannot compute sizeof (long long), 77 ! See \`config.log' for more details." >&5 ! echo "$as_me: error: cannot compute sizeof (long long), 77 ! See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } ;; esac else if test "$cross_compiling" = yes; then ! { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling ! See \`config.log' for more details." >&5 ! echo "$as_me: error: cannot run test program while cross compiling ! See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ $ac_includes_default long longval () { return (long) (sizeof (long long)); } unsigned long ulongval () { return (long) (sizeof (long long)); } --- 12260,12285 ---- ac_hi=$ac_mid else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ac_lo=`expr '(' $ac_mid ')' + 1` fi rm -f conftest.$ac_objext conftest.$ac_ext done case $ac_lo in ?*) ac_cv_sizeof_long_long=$ac_lo;; ! '') { { echo "$as_me:$LINENO: error: cannot compute sizeof (long long), 77" >&5 ! echo "$as_me: error: cannot compute sizeof (long long), 77" >&2;} { (exit 1); exit 1; }; } ;; esac else if test "$cross_compiling" = yes; then ! { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling" >&5 ! echo "$as_me: error: cannot run test program while cross compiling" >&2;} { (exit 1); exit 1; }; } else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" $ac_includes_default long longval () { return (long) (sizeof (long long)); } unsigned long ulongval () { return (long) (sizeof (long long)); } *************** *** 12561,12573 **** else echo "$as_me: program exited with status $ac_status" >&5 echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! ( exit $ac_status ) ! { { echo "$as_me:$LINENO: error: cannot compute sizeof (long long), 77 ! See \`config.log' for more details." >&5 ! echo "$as_me: error: cannot compute sizeof (long long), 77 ! See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } fi rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext --- 12327,12336 ---- else echo "$as_me: program exited with status $ac_status" >&5 echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ( exit $ac_status ) ! { { echo "$as_me:$LINENO: error: cannot compute sizeof (long long), 77" >&5 ! echo "$as_me: error: cannot compute sizeof (long long), 77" >&2;} { (exit 1); exit 1; }; } fi rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext *************** *** 12645,12655 **** echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ $ac_includes_default #include <$ac_header> _ACEOF --- 12408,12414 ---- echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" $ac_includes_default #include <$ac_header> _ACEOF *************** *** 12668,12675 **** ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! ac_header_compiler=no fi rm -f conftest.$ac_objext conftest.$ac_ext --- 12427,12433 ---- ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ac_header_compiler=no fi rm -f conftest.$ac_objext conftest.$ac_ext *************** *** 12681,12691 **** echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ #include <$ac_header> _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 --- 12439,12445 ---- echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" #include <$ac_header> _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 *************** *** 12708,12715 **** ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! ac_header_preproc=no fi rm -f conftest.err conftest.$ac_ext --- 12462,12468 ---- ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ac_header_preproc=no fi rm -f conftest.err conftest.$ac_ext *************** *** 12722,12753 **** { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 ! echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} ! ( ! cat <<\_ASBOX ! ## ------------------------------------ ## ! ## Report this to bug-autoconf@gnu.org. ## ! ## ------------------------------------ ## ! _ASBOX ! ) | ! sed "s/^/$as_me: WARNING: /" >&2 ! ;; no:yes ) { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 ! echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} ! ( ! cat <<\_ASBOX ! ## ------------------------------------ ## ! ## Report this to bug-autoconf@gnu.org. ## ! ## ------------------------------------ ## ! _ASBOX ! ) | ! sed "s/^/$as_me: WARNING: /" >&2 ! ;; esac echo "$as_me:$LINENO: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 --- 12475,12488 ---- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 ! echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; no:yes ) { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 ! echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; esac echo "$as_me:$LINENO: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 *************** *** 12799,12804 **** --- 12534,12540 ---- fi + # Check whether --enable-more-warnings or --disable-more-warnings was given. if test "${enable_more_warnings+set}" = set; then enableval="$enable_more_warnings" *************** *** 12826,12836 **** echo $ECHO_N "checking whether gcc understands $option... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ int main () --- 12562,12568 ---- echo $ECHO_N "checking whether gcc understands $option... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" int main () *************** *** 12855,12862 **** has_option=yes else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! has_option=no fi rm -f conftest.$ac_objext conftest.$ac_ext --- 12587,12593 ---- has_option=yes else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 has_option=no fi rm -f conftest.$ac_objext conftest.$ac_ext *************** *** 12894,12899 **** --- 12625,12631 ---- HAVE_LIBEFS_TRUE='#' HAVE_LIBEFS_FALSE= fi + LIBEFS_LIBS="" LIBEFS_CFLAGS="" *************** *** 12913,12956 **** else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ /* System header to define __stub macros and hopefully few prototypes, ! which can conflict with char $ac_func (); below. ! Prefer to if __STDC__ is defined, since ! exists even on freestanding compilers. */ ! #ifdef __STDC__ ! # include ! #else ! # include ! #endif /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" - { #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char $ac_func (); /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub_$ac_func) || defined (__stub___$ac_func) choke me #else ! char (*f) () = $ac_func; ! #endif ! #ifdef __cplusplus ! } #endif - int - main () - { - return f != $ac_func; ; return 0; } --- 12645,12675 ---- else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, ! which can conflict with char $ac_func (); below. */ ! #include /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char $ac_func (); + char (*f) (); + + int + main () + { /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub_$ac_func) || defined (__stub___$ac_func) choke me #else ! f = $ac_func; #endif ; return 0; } *************** *** 12970,12977 **** eval "$as_ac_var=yes" else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! eval "$as_ac_var=no" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext --- 12689,12695 ---- eval "$as_ac_var=yes" else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 eval "$as_ac_var=no" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext *************** *** 12999,13009 **** LIBS="-l$lib $LIBS" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus --- 12717,12723 ---- LIBS="-l$lib $LIBS" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus *************** *** 13035,13042 **** eval "$as_ac_Lib=yes" else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! eval "$as_ac_Lib=no" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext --- 12749,12755 ---- eval "$as_ac_Lib=yes" else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 eval "$as_ac_Lib=no" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext *************** *** 13066,13109 **** else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ /* System header to define __stub macros and hopefully few prototypes, ! which can conflict with char gethostbyname (); below. ! Prefer to if __STDC__ is defined, since ! exists even on freestanding compilers. */ ! #ifdef __STDC__ ! # include ! #else ! # include ! #endif /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" - { #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char gethostbyname (); /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub_gethostbyname) || defined (__stub___gethostbyname) choke me #else ! char (*f) () = gethostbyname; ! #endif ! #ifdef __cplusplus ! } #endif - int - main () - { - return f != gethostbyname; ; return 0; } --- 12779,12809 ---- else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, ! which can conflict with char gethostbyname (); below. */ ! #include /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char gethostbyname (); + char (*f) (); + + int + main () + { /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub_gethostbyname) || defined (__stub___gethostbyname) choke me #else ! f = gethostbyname; #endif ; return 0; } *************** *** 13123,13130 **** ac_cv_func_gethostbyname=yes else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! ac_cv_func_gethostbyname=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext --- 12823,12829 ---- ac_cv_func_gethostbyname=yes else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ac_cv_func_gethostbyname=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext *************** *** 13148,13158 **** LIBS="-l$lib $LIBS" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus --- 12847,12853 ---- LIBS="-l$lib $LIBS" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus *************** *** 13184,13191 **** eval "$as_ac_Lib=yes" else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! eval "$as_ac_Lib=no" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext --- 12879,12885 ---- eval "$as_ac_Lib=yes" else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 eval "$as_ac_Lib=no" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext *************** *** 13209,13219 **** LIBS="-lbz2 $LIBS" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus --- 12903,12909 ---- LIBS="-lbz2 $LIBS" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus *************** *** 13245,13252 **** ac_cv_lib_bz2_bzCompressInit=yes else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! ac_cv_lib_bz2_bzCompressInit=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext --- 12935,12941 ---- ac_cv_lib_bz2_bzCompressInit=yes else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ac_cv_lib_bz2_bzCompressInit=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext *************** *** 13279,13289 **** echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ $ac_includes_default #include <$ac_header> _ACEOF --- 12968,12974 ---- echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" $ac_includes_default #include <$ac_header> _ACEOF *************** *** 13302,13309 **** ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! ac_header_compiler=no fi rm -f conftest.$ac_objext conftest.$ac_ext --- 12987,12993 ---- ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ac_header_compiler=no fi rm -f conftest.$ac_objext conftest.$ac_ext *************** *** 13315,13325 **** echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ #include <$ac_header> _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 --- 12999,13005 ---- echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" #include <$ac_header> _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 *************** *** 13342,13349 **** ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! ac_header_preproc=no fi rm -f conftest.err conftest.$ac_ext --- 13022,13028 ---- ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ac_header_preproc=no fi rm -f conftest.err conftest.$ac_ext *************** *** 13356,13387 **** { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 ! echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} ! ( ! cat <<\_ASBOX ! ## ------------------------------------ ## ! ## Report this to bug-autoconf@gnu.org. ## ! ## ------------------------------------ ## ! _ASBOX ! ) | ! sed "s/^/$as_me: WARNING: /" >&2 ! ;; no:yes ) { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 ! echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} ! ( ! cat <<\_ASBOX ! ## ------------------------------------ ## ! ## Report this to bug-autoconf@gnu.org. ## ! ## ------------------------------------ ## ! _ASBOX ! ) | ! sed "s/^/$as_me: WARNING: /" >&2 ! ;; esac echo "$as_me:$LINENO: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 --- 13035,13048 ---- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 ! echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; no:yes ) { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 ! echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; esac echo "$as_me:$LINENO: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 *************** *** 13422,13432 **** else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ #include #include --- 13083,13089 ---- else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" #include #include *************** *** 13462,13469 **** else echo "$as_me: program exited with status $ac_status" >&5 echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! ( exit $ac_status ) av_struct_linger=no --- 13119,13125 ---- else echo "$as_me: program exited with status $ac_status" >&5 echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ( exit $ac_status ) av_struct_linger=no *************** *** 13488,13493 **** --- 13144,13150 ---- fi + for ac_header in cdda_interface.h cdda_paranoia.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` *************** *** 13505,13515 **** echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ $ac_includes_default #include <$ac_header> _ACEOF --- 13162,13168 ---- echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" $ac_includes_default #include <$ac_header> _ACEOF *************** *** 13528,13535 **** ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! ac_header_compiler=no fi rm -f conftest.$ac_objext conftest.$ac_ext --- 13181,13187 ---- ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ac_header_compiler=no fi rm -f conftest.$ac_objext conftest.$ac_ext *************** *** 13541,13551 **** echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ #include <$ac_header> _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 --- 13193,13199 ---- echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" #include <$ac_header> _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 *************** *** 13568,13575 **** ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! ac_header_preproc=no fi rm -f conftest.err conftest.$ac_ext --- 13216,13222 ---- ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ac_header_preproc=no fi rm -f conftest.err conftest.$ac_ext *************** *** 13582,13613 **** { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 ! echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} ! ( ! cat <<\_ASBOX ! ## ------------------------------------ ## ! ## Report this to bug-autoconf@gnu.org. ## ! ## ------------------------------------ ## ! _ASBOX ! ) | ! sed "s/^/$as_me: WARNING: /" >&2 ! ;; no:yes ) { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 ! echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} ! ( ! cat <<\_ASBOX ! ## ------------------------------------ ## ! ## Report this to bug-autoconf@gnu.org. ## ! ## ------------------------------------ ## ! _ASBOX ! ) | ! sed "s/^/$as_me: WARNING: /" >&2 ! ;; esac echo "$as_me:$LINENO: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 --- 13229,13242 ---- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 ! echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; no:yes ) { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 ! echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; esac echo "$as_me:$LINENO: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 *************** *** 13636,13651 **** HAVE_CDDA_FALSE= fi fi done ! echo "$as_me:$LINENO: checking for Solaris platform" >&5 ! echo $ECHO_N "checking for Solaris platform... $ECHO_C" >&6 case "$host" in *solaris*) build_cdemenu_module=yes ;; *) build_cdemenu_module=no ;; esac echo "$as_me:$LINENO: result: $build_cdemenu_module" >&5 --- 13265,13282 ---- HAVE_CDDA_FALSE= fi + fi done ! echo "$as_me:$LINENO: checking for CDE for Solaris/AIX" >&5 ! echo $ECHO_N "checking for CDE for Solaris/AIX... $ECHO_C" >&6 case "$host" in *solaris*) build_cdemenu_module=yes ;; + *aix*) build_cdemenu_module=yes ;; *) build_cdemenu_module=no ;; esac echo "$as_me:$LINENO: result: $build_cdemenu_module" >&5 *************** *** 13661,13666 **** --- 13292,13298 ---- fi + # Check whether --enable-openssl or --disable-openssl was given. if test "${enable_openssl+set}" = set; then enableval="$enable_openssl" *************** *** 13767,13772 **** --- 13399,13405 ---- HAVE_SSL_TRUE='#' HAVE_SSL_FALSE= fi + else *************** *** 13806,13816 **** echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ $ac_includes_default #include <$ac_header> _ACEOF --- 13439,13445 ---- echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" $ac_includes_default #include <$ac_header> _ACEOF *************** *** 13829,13836 **** ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! ac_header_compiler=no fi rm -f conftest.$ac_objext conftest.$ac_ext --- 13458,13464 ---- ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ac_header_compiler=no fi rm -f conftest.$ac_objext conftest.$ac_ext *************** *** 13842,13852 **** echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ #include <$ac_header> _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 --- 13470,13476 ---- echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" #include <$ac_header> _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 *************** *** 13869,13876 **** ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! ac_header_preproc=no fi rm -f conftest.err conftest.$ac_ext --- 13493,13499 ---- ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ac_header_preproc=no fi rm -f conftest.err conftest.$ac_ext *************** *** 13883,13914 **** { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 ! echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} ! ( ! cat <<\_ASBOX ! ## ------------------------------------ ## ! ## Report this to bug-autoconf@gnu.org. ## ! ## ------------------------------------ ## ! _ASBOX ! ) | ! sed "s/^/$as_me: WARNING: /" >&2 ! ;; no:yes ) { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 ! echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} ! ( ! cat <<\_ASBOX ! ## ------------------------------------ ## ! ## Report this to bug-autoconf@gnu.org. ## ! ## ------------------------------------ ## ! _ASBOX ! ) | ! sed "s/^/$as_me: WARNING: /" >&2 ! ;; esac echo "$as_me:$LINENO: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 --- 13506,13519 ---- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 ! echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; no:yes ) { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 ! echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; esac echo "$as_me:$LINENO: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 *************** *** 13970,13980 **** LDFLAGS="$LDFLAGS -L$with_openssl_libs -lssl -lcrypto -ldl" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus --- 13575,13581 ---- LDFLAGS="$LDFLAGS -L$with_openssl_libs -lssl -lcrypto -ldl" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus *************** *** 14006,14013 **** openssl_libs="yes" else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! openssl_libs="no" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext --- 13607,13613 ---- openssl_libs="yes" else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 openssl_libs="no" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext *************** *** 14036,14041 **** --- 13636,13642 ---- HAVE_SSL_TRUE='#' HAVE_SSL_FALSE= fi + else OPENSSL_CFLAGS="" OPENSSL_LIBS="" *************** *** 14048,14053 **** --- 13649,13655 ---- HAVE_SSL_TRUE='#' HAVE_SSL_FALSE= fi + fi else echo "$as_me:$LINENO: checking for OpenSSL libraries" >&5 *************** *** 14151,14161 **** else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ #include #include --- 13753,13759 ---- else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" #include #include *************** *** 14227,14234 **** else echo "$as_me: program exited with status $ac_status" >&5 echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! ( exit $ac_status ) no_libgnutls=yes fi --- 13825,13831 ---- else echo "$as_me: program exited with status $ac_status" >&5 echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ( exit $ac_status ) no_libgnutls=yes fi *************** *** 14266,14276 **** LIBS="$LIBS $LIBGNUTLS_LIBS" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ #include #include --- 13863,13869 ---- LIBS="$LIBS $LIBGNUTLS_LIBS" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" #include #include *************** *** 14309,14316 **** echo "***" else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! echo "*** The test program failed to compile or link. See the file config.log for the" echo "*** exact error that occured. This usually means LIBGNUTLS was incorrectly installed" echo "*** or that you have moved LIBGNUTLS since it was installed. In the latter case, you" --- 13902,13908 ---- echo "***" else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 echo "*** The test program failed to compile or link. See the file config.log for the" echo "*** exact error that occured. This usually means LIBGNUTLS was incorrectly installed" echo "*** or that you have moved LIBGNUTLS since it was installed. In the latter case, you" *************** *** 14439,14444 **** --- 14031,14037 ---- + FAM_MISSING_WARNING="Gnome-vfs depends on FAM to provide notification when files are altered (either through filesystem polling, or a kernel notification mechanism). If Gnome-vfs is built without FAM support, directories viewed with Nautilus or other applications will not remain in synch with the actual filesystem when they are altered by external processes. Particularly if you are a distributor please compile Nautilus with FAM support. FAM is available from http://oss.sgi.com/projects/fam/. A patch to add Linux Kernel 2.4 directory notify support to FAM (highly desirable) is available from http://people.redhat.com/alexl/files/" FAM_LIBS= echo "$as_me:$LINENO: checking for FAMOpen in -lfam" >&5 *************** *** 14450,14460 **** LIBS="-lfam $LIBS" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus --- 14043,14049 ---- LIBS="-lfam $LIBS" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus *************** *** 14486,14493 **** ac_cv_lib_fam_FAMOpen=yes else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! ac_cv_lib_fam_FAMOpen=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext --- 14075,14081 ---- ac_cv_lib_fam_FAMOpen=yes else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ac_cv_lib_fam_FAMOpen=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext *************** *** 14514,14524 **** echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ $ac_includes_default #include <$ac_header> _ACEOF --- 14102,14108 ---- echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" $ac_includes_default #include <$ac_header> _ACEOF *************** *** 14537,14544 **** ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! ac_header_compiler=no fi rm -f conftest.$ac_objext conftest.$ac_ext --- 14121,14127 ---- ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ac_header_compiler=no fi rm -f conftest.$ac_objext conftest.$ac_ext *************** *** 14550,14560 **** echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ #include <$ac_header> _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 --- 14133,14139 ---- echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" #include <$ac_header> _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 *************** *** 14577,14584 **** ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! ac_header_preproc=no fi rm -f conftest.err conftest.$ac_ext --- 14156,14162 ---- ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ac_header_preproc=no fi rm -f conftest.err conftest.$ac_ext *************** *** 14591,14622 **** { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 ! echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} ! ( ! cat <<\_ASBOX ! ## ------------------------------------ ## ! ## Report this to bug-autoconf@gnu.org. ## ! ## ------------------------------------ ## ! _ASBOX ! ) | ! sed "s/^/$as_me: WARNING: /" >&2 ! ;; no:yes ) { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 ! echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} ! ( ! cat <<\_ASBOX ! ## ------------------------------------ ## ! ## Report this to bug-autoconf@gnu.org. ## ! ## ------------------------------------ ## ! _ASBOX ! ) | ! sed "s/^/$as_me: WARNING: /" >&2 ! ;; esac echo "$as_me:$LINENO: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 --- 14169,14182 ---- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 ! echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; no:yes ) { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 ! echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; esac echo "$as_me:$LINENO: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 *************** *** 14782,14787 **** --- 14342,14348 ---- + if $GTKDOC; then HAVE_GTK_DOC_TRUE= HAVE_GTK_DOC_FALSE='#' *************** *** 14791,14796 **** --- 14352,14358 ---- fi + # Check whether --enable-gtk-doc or --disable-gtk-doc was given. if test "${enable_gtk_doc+set}" = set; then enableval="$enable_gtk_doc" *************** *** 14821,14826 **** --- 14383,14389 ---- + # Check whether --with-afs or --without-afs was given. if test "${with_afs+set}" = set; then withval="$with_afs" *************** *** 14838,14848 **** # The order of these tests is important. cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ #include #include _ACEOF --- 14401,14407 ---- # The order of these tests is important. cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" #include #include _ACEOF *************** *** 14869,14887 **** fstype=SVR4 else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! fi rm -f conftest.err conftest.$ac_ext if test $fstype = no; then cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ #include #include _ACEOF --- 14428,14441 ---- fstype=SVR4 else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 fi rm -f conftest.err conftest.$ac_ext if test $fstype = no; then cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" #include #include _ACEOF *************** *** 14908,14915 **** fstype=SVR3 else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! fi rm -f conftest.err conftest.$ac_ext --- 14462,14468 ---- fstype=SVR3 else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 fi rm -f conftest.err conftest.$ac_ext *************** *** 14917,14927 **** if test $fstype = no; then cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ #include #include _ACEOF --- 14470,14476 ---- if test $fstype = no; then cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" #include #include _ACEOF *************** *** 14948,14955 **** fstype=AIX else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! fi rm -f conftest.err conftest.$ac_ext --- 14497,14503 ---- fstype=AIX else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 fi rm -f conftest.err conftest.$ac_ext *************** *** 14957,14967 **** if test $fstype = no; then cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ #include _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 --- 14505,14511 ---- if test $fstype = no; then cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" #include _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 *************** *** 14987,14994 **** fstype=4.3BSD else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! fi rm -f conftest.err conftest.$ac_ext --- 14531,14537 ---- fstype=4.3BSD else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 fi rm -f conftest.err conftest.$ac_ext *************** *** 14996,15006 **** if test $fstype = no; then cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ #include _ACEOF --- 14539,14545 ---- if test $fstype = no; then cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" #include _ACEOF *************** *** 15017,15027 **** if test $fstype = no; then cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ #include #include _ACEOF --- 14556,14562 ---- if test $fstype = no; then cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" #include #include _ACEOF *************** *** 15048,15055 **** fstype=Ultrix else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! fi rm -f conftest.err conftest.$ac_ext --- 14583,14589 ---- fstype=Ultrix else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 fi rm -f conftest.err conftest.$ac_ext *************** *** 15067,15077 **** LIBS="-lpopt $LIBS" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus --- 14601,14607 ---- LIBS="-lpopt $LIBS" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus *************** *** 15103,15110 **** ac_cv_lib_popt_poptGetArg=yes else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! ac_cv_lib_popt_poptGetArg=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext --- 14633,14639 ---- ac_cv_lib_popt_poptGetArg=yes else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ac_cv_lib_popt_poptGetArg=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext *************** *** 15129,15139 **** echo $ECHO_N "checking popt.h usability... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ $ac_includes_default #include _ACEOF --- 14658,14664 ---- echo $ECHO_N "checking popt.h usability... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" $ac_includes_default #include _ACEOF *************** *** 15152,15159 **** ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! ac_header_compiler=no fi rm -f conftest.$ac_objext conftest.$ac_ext --- 14677,14683 ---- ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ac_header_compiler=no fi rm -f conftest.$ac_objext conftest.$ac_ext *************** *** 15165,15175 **** echo $ECHO_N "checking popt.h presence... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ #include _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 --- 14689,14695 ---- echo $ECHO_N "checking popt.h presence... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" #include _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 *************** *** 15192,15199 **** ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! ac_header_preproc=no fi rm -f conftest.err conftest.$ac_ext --- 14712,14718 ---- ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ac_header_preproc=no fi rm -f conftest.err conftest.$ac_ext *************** *** 15206,15237 **** { echo "$as_me:$LINENO: WARNING: popt.h: accepted by the compiler, rejected by the preprocessor!" >&5 echo "$as_me: WARNING: popt.h: accepted by the compiler, rejected by the preprocessor!" >&2;} { echo "$as_me:$LINENO: WARNING: popt.h: proceeding with the preprocessor's result" >&5 ! echo "$as_me: WARNING: popt.h: proceeding with the preprocessor's result" >&2;} ! ( ! cat <<\_ASBOX ! ## ------------------------------------ ## ! ## Report this to bug-autoconf@gnu.org. ## ! ## ------------------------------------ ## ! _ASBOX ! ) | ! sed "s/^/$as_me: WARNING: /" >&2 ! ;; no:yes ) { echo "$as_me:$LINENO: WARNING: popt.h: present but cannot be compiled" >&5 echo "$as_me: WARNING: popt.h: present but cannot be compiled" >&2;} { echo "$as_me:$LINENO: WARNING: popt.h: check for missing prerequisite headers?" >&5 echo "$as_me: WARNING: popt.h: check for missing prerequisite headers?" >&2;} { echo "$as_me:$LINENO: WARNING: popt.h: proceeding with the preprocessor's result" >&5 ! echo "$as_me: WARNING: popt.h: proceeding with the preprocessor's result" >&2;} ! ( ! cat <<\_ASBOX ! ## ------------------------------------ ## ! ## Report this to bug-autoconf@gnu.org. ## ! ## ------------------------------------ ## ! _ASBOX ! ) | ! sed "s/^/$as_me: WARNING: /" >&2 ! ;; esac echo "$as_me:$LINENO: checking for popt.h" >&5 echo $ECHO_N "checking for popt.h... $ECHO_C" >&6 --- 14725,14738 ---- { echo "$as_me:$LINENO: WARNING: popt.h: accepted by the compiler, rejected by the preprocessor!" >&5 echo "$as_me: WARNING: popt.h: accepted by the compiler, rejected by the preprocessor!" >&2;} { echo "$as_me:$LINENO: WARNING: popt.h: proceeding with the preprocessor's result" >&5 ! echo "$as_me: WARNING: popt.h: proceeding with the preprocessor's result" >&2;};; no:yes ) { echo "$as_me:$LINENO: WARNING: popt.h: present but cannot be compiled" >&5 echo "$as_me: WARNING: popt.h: present but cannot be compiled" >&2;} { echo "$as_me:$LINENO: WARNING: popt.h: check for missing prerequisite headers?" >&5 echo "$as_me: WARNING: popt.h: check for missing prerequisite headers?" >&2;} { echo "$as_me:$LINENO: WARNING: popt.h: proceeding with the preprocessor's result" >&5 ! echo "$as_me: WARNING: popt.h: proceeding with the preprocessor's result" >&2;};; esac echo "$as_me:$LINENO: checking for popt.h" >&5 echo $ECHO_N "checking for popt.h... $ECHO_C" >&6 *************** *** 15283,15293 **** cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ #include #include --- 14784,14790 ---- cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" #include #include *************** *** 15316,15323 **** have_ipv6=yes else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! have_ipv6=no fi --- 14813,14819 ---- have_ipv6=yes else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 have_ipv6=no fi *************** *** 15334,15377 **** else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ /* System header to define __stub macros and hopefully few prototypes, ! which can conflict with char getaddrinfo (); below. ! Prefer to if __STDC__ is defined, since ! exists even on freestanding compilers. */ ! #ifdef __STDC__ ! # include ! #else ! # include ! #endif /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" - { #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char getaddrinfo (); /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub_getaddrinfo) || defined (__stub___getaddrinfo) choke me #else ! char (*f) () = getaddrinfo; ! #endif ! #ifdef __cplusplus ! } #endif - int - main () - { - return f != getaddrinfo; ; return 0; } --- 14830,14860 ---- else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, ! which can conflict with char getaddrinfo (); below. */ ! #include /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char getaddrinfo (); + char (*f) (); + + int + main () + { /* The GNU C library defines this for functions which it implements to always fail with ENOSYS. Some functions are actually named something starting with __ and the normal name is an alias. */ #if defined (__stub_getaddrinfo) || defined (__stub___getaddrinfo) choke me #else ! f = getaddrinfo; #endif ; return 0; } *************** *** 15391,15398 **** ac_cv_func_getaddrinfo=yes else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! ac_cv_func_getaddrinfo=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext --- 14874,14880 ---- ac_cv_func_getaddrinfo=yes else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ac_cv_func_getaddrinfo=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext *************** *** 15416,15426 **** LIBS="-l$lib $LIBS" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus --- 14898,14904 ---- LIBS="-l$lib $LIBS" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus *************** *** 15452,15459 **** eval "$as_ac_Lib=yes" else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! eval "$as_ac_Lib=no" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext --- 14930,14936 ---- eval "$as_ac_Lib=yes" else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 eval "$as_ac_Lib=no" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext *************** *** 15522,15528 **** t end /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ : end' >>confcache ! if diff $cache_file confcache >/dev/null 2>&1; then :; else if test -w $cache_file; then test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file" cat confcache >$cache_file --- 14999,15005 ---- t end /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ : end' >>confcache ! if cmp -s $cache_file confcache; then :; else if test -w $cache_file; then test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file" cat confcache >$cache_file *************** *** 15568,15573 **** --- 15045,15092 ---- LTLIBOBJS=$ac_ltlibobjs + if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 + echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${INSIDE_GNOME_DOCU_TRUE}" && test -z "${INSIDE_GNOME_DOCU_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"INSIDE_GNOME_DOCU\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 + echo "$as_me: error: conditional \"INSIDE_GNOME_DOCU\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${PLATFORM_GNOME_2_TRUE}" && test -z "${PLATFORM_GNOME_2_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"PLATFORM_GNOME_2\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 + echo "$as_me: error: conditional \"PLATFORM_GNOME_2\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 + echo "$as_me: error: conditional \"AMDEP\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 + echo "$as_me: error: conditional \"am__fastdepCC\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 + echo "$as_me: error: conditional \"am__fastdepCC\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi mv -f po/POTFILES po/POTFILES.tmp *************** *** 15575,15580 **** --- 15094,15183 ---- rm -f po/POTFILES.tmp + if test -z "${GCONF_SCHEMAS_INSTALL_TRUE}" && test -z "${GCONF_SCHEMAS_INSTALL_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"GCONF_SCHEMAS_INSTALL\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 + echo "$as_me: error: conditional \"GCONF_SCHEMAS_INSTALL\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${ENABLE_PROFILER_TRUE}" && test -z "${ENABLE_PROFILER_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"ENABLE_PROFILER\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 + echo "$as_me: error: conditional \"ENABLE_PROFILER\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${HAVE_LIBEFS_TRUE}" && test -z "${HAVE_LIBEFS_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"HAVE_LIBEFS\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 + echo "$as_me: error: conditional \"HAVE_LIBEFS\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${HAVE_CDDA_TRUE}" && test -z "${HAVE_CDDA_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"HAVE_CDDA\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 + echo "$as_me: error: conditional \"HAVE_CDDA\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${HAVE_CDDA_TRUE}" && test -z "${HAVE_CDDA_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"HAVE_CDDA\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 + echo "$as_me: error: conditional \"HAVE_CDDA\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${BUILD_CDEMENU_MODULE_TRUE}" && test -z "${BUILD_CDEMENU_MODULE_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"BUILD_CDEMENU_MODULE\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 + echo "$as_me: error: conditional \"BUILD_CDEMENU_MODULE\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${HAVE_SSL_TRUE}" && test -z "${HAVE_SSL_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"HAVE_SSL\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 + echo "$as_me: error: conditional \"HAVE_SSL\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${HAVE_SSL_TRUE}" && test -z "${HAVE_SSL_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"HAVE_SSL\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 + echo "$as_me: error: conditional \"HAVE_SSL\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${HAVE_SSL_TRUE}" && test -z "${HAVE_SSL_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"HAVE_SSL\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 + echo "$as_me: error: conditional \"HAVE_SSL\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${HAVE_DOCBOOK_TRUE}" && test -z "${HAVE_DOCBOOK_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"HAVE_DOCBOOK\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 + echo "$as_me: error: conditional \"HAVE_DOCBOOK\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${HAVE_GTK_DOC_TRUE}" && test -z "${HAVE_GTK_DOC_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"HAVE_GTK_DOC\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 + echo "$as_me: error: conditional \"HAVE_GTK_DOC\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi + if test -z "${ENABLE_GTK_DOC_TRUE}" && test -z "${ENABLE_GTK_DOC_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"ENABLE_GTK_DOC\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 + echo "$as_me: error: conditional \"ENABLE_GTK_DOC\" was never defined. + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi : ${CONFIG_STATUS=./config.status} ac_clean_files_save=$ac_clean_files *************** *** 15589,15596 **** # configure, is in config.log if it exists. debug=false - ac_cs_recheck=false - ac_cs_silent=false SHELL=\${CONFIG_SHELL-$SHELL} _ACEOF --- 15192,15197 ---- *************** *** 15625,15634 **** PS4='+ ' # NLS nuisances. ! for as_var in \ ! LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ ! LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ ! LC_TELEPHONE LC_TIME do if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then eval $as_var=C; export $as_var --- 15226,15232 ---- PS4='+ ' # NLS nuisances. ! for as_var in LANG LANGUAGE LC_ALL LC_COLLATE LC_CTYPE LC_NUMERIC LC_MESSAGES LC_TIME do if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then eval $as_var=C; export $as_var *************** *** 15674,15688 **** # The user is always right. if test "${PATH_SEPARATOR+set}" != set; then ! echo "#! /bin/sh" >conf$$.sh ! echo "exit 0" >>conf$$.sh ! chmod +x conf$$.sh ! if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then PATH_SEPARATOR=';' else PATH_SEPARATOR=: fi ! rm -f conf$$.sh fi --- 15272,15286 ---- # The user is always right. if test "${PATH_SEPARATOR+set}" != set; then ! echo "#! /bin/sh" >conftest.sh ! echo "exit 0" >>conftest.sh ! chmod +x conftest.sh ! if (PATH="/nonexistent;."; conftest.sh) >/dev/null 2>&1; then PATH_SEPARATOR=';' else PATH_SEPARATOR=: fi ! rm -f conftest.sh fi *************** *** 15845,15851 **** cat >&5 <<_CSEOF This file was extended by $as_me, which was ! generated by GNU Autoconf 2.57. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS --- 15443,15449 ---- cat >&5 <<_CSEOF This file was extended by $as_me, which was ! generated by GNU Autoconf 2.54. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS *************** *** 15885,15891 **** -h, --help print this help, then exit -V, --version print version number, then exit - -q, --quiet do not print progress messages -d, --debug don't remove temporary files --recheck update $as_me by reconfiguring in the same conditions --file=FILE[:TEMPLATE] --- 15483,15488 ---- *************** *** 15908,15914 **** cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ config.status ! configured by $0, generated by GNU Autoconf 2.57, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 --- 15505,15511 ---- cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ config.status ! configured by $0, generated by GNU Autoconf 2.54, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 *************** *** 15945,15953 **** case $ac_option in # Handling of the options. _ACEOF ! cat >>$CONFIG_STATUS <<\_ACEOF -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) ! ac_cs_recheck=: ;; --version | --vers* | -V ) echo "$ac_cs_version"; exit 0 ;; --he | --h) --- 15542,15553 ---- case $ac_option in # Handling of the options. _ACEOF ! cat >>$CONFIG_STATUS <<_ACEOF -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) ! echo "running $SHELL $0 " $ac_configure_args " --no-create --no-recursion" ! exec $SHELL $0 $ac_configure_args --no-create --no-recursion ;; ! _ACEOF ! cat >>$CONFIG_STATUS <<\_ACEOF --version | --vers* | -V ) echo "$ac_cs_version"; exit 0 ;; --he | --h) *************** *** 15969,15977 **** $ac_shift CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg" ac_need_defaults=false;; - -q | -quiet | --quiet | --quie | --qui | --qu | --q \ - | -silent | --silent | --silen | --sile | --sil | --si | --s) - ac_cs_silent=: ;; # This is an error. -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1 --- 15569,15574 ---- *************** *** 15986,16005 **** shift done - ac_configure_extra_args= - - if $ac_cs_silent; then - exec 6>/dev/null - ac_configure_extra_args="$ac_configure_extra_args --silent" - fi - - _ACEOF - cat >>$CONFIG_STATUS <<_ACEOF - if \$ac_cs_recheck; then - echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6 - exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion - fi - _ACEOF cat >>$CONFIG_STATUS <<_ACEOF --- 15583,15588 ---- *************** *** 16007,16013 **** # INIT-COMMANDS section. # ! INTLTOOL_PERL=${INTLTOOL_PERL} --- 15590,15596 ---- # INIT-COMMANDS section. # ! AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir" INTLTOOL_PERL=${INTLTOOL_PERL} *************** *** 16045,16053 **** "doc/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;; "gnome-vfs-2.0.pc" ) CONFIG_FILES="$CONFIG_FILES gnome-vfs-2.0.pc" ;; "gnome-vfs-module-2.0.pc" ) CONFIG_FILES="$CONFIG_FILES gnome-vfs-module-2.0.pc" ;; "default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;; "default-2" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-2" ;; - "default-3" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-3" ;; "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 echo "$as_me: error: invalid argument: $ac_config_target" >&2;} --- 15628,15636 ---- "doc/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;; "gnome-vfs-2.0.pc" ) CONFIG_FILES="$CONFIG_FILES gnome-vfs-2.0.pc" ;; "gnome-vfs-module-2.0.pc" ) CONFIG_FILES="$CONFIG_FILES gnome-vfs-module-2.0.pc" ;; + "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; "default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;; "default-2" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-2" ;; "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 echo "$as_me: error: invalid argument: $ac_config_target" >&2;} *************** *** 16065,16073 **** test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands fi - # Have a temporary directory for convenience. Make it in the build tree - # simply because there is no reason to put it here, and in addition, - # creating and moving files from /tmp can sometimes cause problems. # Create a temporary directory, and hook for its removal unless debugging. $debug || { --- 15648,15653 ---- *************** *** 16076,16092 **** } # Create a (secure) tmp directory for tmp files. ! { ! tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" } || { ! tmp=./confstat$$-$RANDOM (umask 077 && mkdir $tmp) } || { ! echo "$me: cannot create a temporary directory in ." >&2 { (exit 1); exit 1; } } --- 15656,15672 ---- } # Create a (secure) tmp directory for tmp files. ! : ${TMPDIR=/tmp} { ! tmp=`(umask 077 && mktemp -d -q "$TMPDIR/csXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" } || { ! tmp=$TMPDIR/cs$$-$RANDOM (umask 077 && mkdir $tmp) } || { ! echo "$me: cannot create a temporary directory in $TMPDIR" >&2 { (exit 1); exit 1; } } *************** *** 16140,16145 **** --- 15720,15726 ---- s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t s,@INSTALL_DATA@,$INSTALL_DATA,;t t + s,@CYGPATH_W@,$CYGPATH_W,;t t s,@PACKAGE@,$PACKAGE,;t t s,@VERSION@,$VERSION,;t t s,@ACLOCAL@,$ACLOCAL,;t t *************** *** 16147,16152 **** --- 15728,15739 ---- s,@AUTOMAKE@,$AUTOMAKE,;t t s,@AUTOHEADER@,$AUTOHEADER,;t t s,@MAKEINFO@,$MAKEINFO,;t t + s,@AMTAR@,$AMTAR,;t t + s,@install_sh@,$install_sh,;t t + s,@STRIP@,$STRIP,;t t + s,@ac_ct_STRIP@,$ac_ct_STRIP,;t t + s,@INSTALL_STRIP_PROGRAM@,$INSTALL_STRIP_PROGRAM,;t t + s,@AWK@,$AWK,;t t s,@SET_MAKE@,$SET_MAKE,;t t s,@ACLOCAL_AMFLAGS@,$ACLOCAL_AMFLAGS,;t t s,@MAINTAINER_MODE_TRUE@,$MAINTAINER_MODE_TRUE,;t t *************** *** 16156,16161 **** --- 15743,15752 ---- s,@GNOME_ACLOCAL_FLAGS@,$GNOME_ACLOCAL_FLAGS,;t t s,@INSIDE_GNOME_DOCU_TRUE@,$INSIDE_GNOME_DOCU_TRUE,;t t s,@INSIDE_GNOME_DOCU_FALSE@,$INSIDE_GNOME_DOCU_FALSE,;t t + s,@PKG_CONFIG@,$PKG_CONFIG,;t t + s,@PLATFORM_GNOME_2_TRUE@,$PLATFORM_GNOME_2_TRUE,;t t + s,@PLATFORM_GNOME_2_FALSE@,$PLATFORM_GNOME_2_FALSE,;t t + s,@GNOME_INTERFACE_VERSION@,$GNOME_INTERFACE_VERSION,;t t s,@CC@,$CC,;t t s,@CFLAGS@,$CFLAGS,;t t s,@LDFLAGS@,$LDFLAGS,;t t *************** *** 16163,16170 **** s,@ac_ct_CC@,$ac_ct_CC,;t t s,@EXEEXT@,$EXEEXT,;t t s,@OBJEXT@,$OBJEXT,;t t s,@CPP@,$CPP,;t t - s,@AWK@,$AWK,;t t s,@build@,$build,;t t s,@build_cpu@,$build_cpu,;t t s,@build_vendor@,$build_vendor,;t t --- 15754,15769 ---- s,@ac_ct_CC@,$ac_ct_CC,;t t s,@EXEEXT@,$EXEEXT,;t t s,@OBJEXT@,$OBJEXT,;t t + s,@DEPDIR@,$DEPDIR,;t t + s,@am__include@,$am__include,;t t + s,@am__quote@,$am__quote,;t t + s,@AMDEP_TRUE@,$AMDEP_TRUE,;t t + s,@AMDEP_FALSE@,$AMDEP_FALSE,;t t + s,@AMDEPBACKSLASH@,$AMDEPBACKSLASH,;t t + s,@CCDEPMODE@,$CCDEPMODE,;t t + s,@am__fastdepCC_TRUE@,$am__fastdepCC_TRUE,;t t + s,@am__fastdepCC_FALSE@,$am__fastdepCC_FALSE,;t t s,@CPP@,$CPP,;t t s,@build@,$build,;t t s,@build_cpu@,$build_cpu,;t t s,@build_vendor@,$build_vendor,;t t *************** *** 16177,16184 **** s,@ECHO@,$ECHO,;t t s,@RANLIB@,$RANLIB,;t t s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t - s,@STRIP@,$STRIP,;t t - s,@ac_ct_STRIP@,$ac_ct_STRIP,;t t s,@EGREP@,$EGREP,;t t s,@LIBTOOL@,$LIBTOOL,;t t s,@INTLTOOL_DESKTOP_RULE@,$INTLTOOL_DESKTOP_RULE,;t t --- 15776,15781 ---- *************** *** 16207,16213 **** s,@LIBIDL_REQUIRED@,$LIBIDL_REQUIRED,;t t s,@ORBIT_REQUIRED@,$ORBIT_REQUIRED,;t t s,@XML_REQUIRED@,$XML_REQUIRED,;t t - s,@PKG_CONFIG@,$PKG_CONFIG,;t t s,@MODULES_XML_CFLAGS@,$MODULES_XML_CFLAGS,;t t s,@MODULES_XML_LIBS@,$MODULES_XML_LIBS,;t t s,@MODULES_CFLAGS@,$MODULES_CFLAGS,;t t --- 15804,15809 ---- *************** *** 16279,16284 **** --- 15875,15883 ---- s,@LIBGNUTLS_LIBS@,$LIBGNUTLS_LIBS,;t t s,@LIBGNOMEVFS_CFLAGS@,$LIBGNOMEVFS_CFLAGS,;t t s,@LIBGNOMEVFS_LIBS@,$LIBGNOMEVFS_LIBS,;t t + s,@LIBOBJS@,$LIBOBJS,;t t + s,@LIBOBJS="$LIBOBJS@,$LIBOBJS="$LIBOBJS,;t t + s,@.$ac_objext"@,$.$ac_objext",;t t s,@FAM_LIBS@,$FAM_LIBS,;t t s,@HTML_DIR@,$HTML_DIR,;t t s,@GTKDOC@,$GTKDOC,;t t *************** *** 16292,16298 **** s,@ENABLE_GTK_DOC_FALSE@,$ENABLE_GTK_DOC_FALSE,;t t s,@POPT_LIBS@,$POPT_LIBS,;t t s,@TOP_BUILDDIR@,$TOP_BUILDDIR,;t t - s,@LIBOBJS@,$LIBOBJS,;t t s,@LTLIBOBJS@,$LTLIBOBJS,;t t CEOF --- 15891,15896 ---- *************** *** 16671,16677 **** cat $tmp/in >>$tmp/config.h rm -f $tmp/in if test x"$ac_file" != x-; then ! if diff $ac_file $tmp/config.h >/dev/null 2>&1; then { echo "$as_me:$LINENO: $ac_file is unchanged" >&5 echo "$as_me: $ac_file is unchanged" >&6;} else --- 16269,16275 ---- cat $tmp/in >>$tmp/config.h rm -f $tmp/in if test x"$ac_file" != x-; then ! if cmp -s $ac_file $tmp/config.h 2>/dev/null; then { echo "$as_me:$LINENO: $ac_file is unchanged" >&5 echo "$as_me: $ac_file is unchanged" >&6;} else *************** *** 16719,16724 **** --- 16317,16335 ---- cat $tmp/config.h rm -f $tmp/config.h fi + _am_stamp_count=`expr ${_am_stamp_count-0} + 1` + echo "timestamp for $ac_file" >`(dirname $ac_file) 2>/dev/null || + $as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X$ac_file : 'X\(//\)[^/]' \| \ + X$ac_file : 'X\(//\)$' \| \ + X$ac_file : 'X\(/\)' \| \ + . : '\(.\)' 2>/dev/null || + echo X$ac_file | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } + /^X\(\/\/\)[^/].*/{ s//\1/; q; } + /^X\(\/\/\)$/{ s//\1/; q; } + /^X\(\/\).*/{ s//\1/; q; } + s/.*/./; q'`/stamp-h$_am_stamp_count done _ACEOF cat >>$CONFIG_STATUS <<\_ACEOF *************** *** 16777,16784 **** { echo "$as_me:$LINENO: executing $ac_dest commands" >&5 echo "$as_me: executing $ac_dest commands" >&6;} case $ac_dest in ! default-1 ) test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h ;; ! default-2 ) sed -e "s:@INTLTOOL_PERL@:${INTLTOOL_PERL}:;" < ${srcdir}/intltool-extract.in > intltool-extract.out if cmp -s intltool-extract intltool-extract.out 2>/dev/null; then --- 16388,16485 ---- { echo "$as_me:$LINENO: executing $ac_dest commands" >&5 echo "$as_me: executing $ac_dest commands" >&6;} case $ac_dest in ! depfiles ) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do ! # Strip MF so we end up with the name of the file. ! mf=`echo "$mf" | sed -e 's/:.*$//'` ! # Check whether this is an Automake generated Makefile or not. ! # We used to match only the files named `Makefile.in', but ! # some people rename them; so instead we look at the file content. ! # Grep'ing the first line is not enough: some people post-process ! # each Makefile.in and add a new line on top of each file to say so. ! # So let's grep whole file. ! if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then ! dirpart=`(dirname "$mf") 2>/dev/null || ! $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ ! X"$mf" : 'X\(//\)[^/]' \| \ ! X"$mf" : 'X\(//\)$' \| \ ! X"$mf" : 'X\(/\)' \| \ ! . : '\(.\)' 2>/dev/null || ! echo X"$mf" | ! sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } ! /^X\(\/\/\)[^/].*/{ s//\1/; q; } ! /^X\(\/\/\)$/{ s//\1/; q; } ! /^X\(\/\).*/{ s//\1/; q; } ! s/.*/./; q'` ! else ! continue ! fi ! grep '^DEP_FILES *= *[^ #]' < "$mf" > /dev/null || continue ! # Extract the definition of DEP_FILES from the Makefile without ! # running `make'. ! DEPDIR=`sed -n -e '/^DEPDIR = / s///p' < "$mf"` ! test -z "$DEPDIR" && continue ! # When using ansi2knr, U may be empty or an underscore; expand it ! U=`sed -n -e '/^U = / s///p' < "$mf"` ! test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR" ! # We invoke sed twice because it is the simplest approach to ! # changing $(DEPDIR) to its actual value in the expansion. ! for file in `sed -n -e ' ! /^DEP_FILES = .*\\\\$/ { ! s/^DEP_FILES = // ! :loop ! s/\\\\$// ! p ! n ! /\\\\$/ b loop ! p ! } ! /^DEP_FILES = / s/^DEP_FILES = //p' < "$mf" | \ ! sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do ! # Make sure the directory exists. ! test -f "$dirpart/$file" && continue ! fdir=`(dirname "$file") 2>/dev/null || ! $as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ ! X"$file" : 'X\(//\)[^/]' \| \ ! X"$file" : 'X\(//\)$' \| \ ! X"$file" : 'X\(/\)' \| \ ! . : '\(.\)' 2>/dev/null || ! echo X"$file" | ! sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } ! /^X\(\/\/\)[^/].*/{ s//\1/; q; } ! /^X\(\/\/\)$/{ s//\1/; q; } ! /^X\(\/\).*/{ s//\1/; q; } ! s/.*/./; q'` ! { if $as_mkdir_p; then ! mkdir -p $dirpart/$fdir ! else ! as_dir=$dirpart/$fdir ! as_dirs= ! while test ! -d "$as_dir"; do ! as_dirs="$as_dir $as_dirs" ! as_dir=`(dirname "$as_dir") 2>/dev/null || ! $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ ! X"$as_dir" : 'X\(//\)[^/]' \| \ ! X"$as_dir" : 'X\(//\)$' \| \ ! X"$as_dir" : 'X\(/\)' \| \ ! . : '\(.\)' 2>/dev/null || ! echo X"$as_dir" | ! sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } ! /^X\(\/\/\)[^/].*/{ s//\1/; q; } ! /^X\(\/\/\)$/{ s//\1/; q; } ! /^X\(\/\).*/{ s//\1/; q; } ! s/.*/./; q'` ! done ! test ! -n "$as_dirs" || mkdir $as_dirs ! fi || { { echo "$as_me:$LINENO: error: cannot create directory $dirpart/$fdir" >&5 ! echo "$as_me: error: cannot create directory $dirpart/$fdir" >&2;} ! { (exit 1); exit 1; }; }; } ! ! # echo "creating $dirpart/$file" ! echo '# dummy' > "$dirpart/$file" ! done ! done ! ;; ! default-1 ) sed -e "s:@INTLTOOL_PERL@:${INTLTOOL_PERL}:;" < ${srcdir}/intltool-extract.in > intltool-extract.out if cmp -s intltool-extract intltool-extract.out 2>/dev/null; then *************** *** 16808,16814 **** chmod u+w intltool-update ;; ! default-3 ) case "$CONFIG_FILES" in *po/Makefile.in*) sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile esac ;; esac --- 16509,16515 ---- chmod u+w intltool-update ;; ! default-2 ) case "$CONFIG_FILES" in *po/Makefile.in*) sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile esac ;; esac *************** *** 16833,16843 **** # need to make the FD available again. if test "$no_create" != yes; then ac_cs_success=: - ac_config_status_args= - test "$silent" = yes && - ac_config_status_args="$ac_config_status_args --quiet" exec 5>/dev/null ! $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false exec 5>>config.log # Use ||, not &&, to avoid exiting from the if with $? = 1, which # would make configure fail if this is the last instruction. --- 16534,16541 ---- # need to make the FD available again. if test "$no_create" != yes; then ac_cs_success=: exec 5>/dev/null ! $SHELL $CONFIG_STATUS || ac_cs_success=false exec 5>>config.log # Use ||, not &&, to avoid exiting from the if with $? = 1, which # would make configure fail if this is the last instruction. diff -crN ./gnome-vfs/devel-docs/Makefile.in /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/devel-docs/Makefile.in *** ./gnome-vfs/devel-docs/Makefile.in Mon Sep 8 14:19:45 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/devel-docs/Makefile.in Thu Dec 18 21:13:06 2003 *************** *** 1,6 **** ! # Makefile.in generated automatically by automake 1.4-p6 from Makefile.am ! # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. --- 1,8 ---- ! # Makefile.in generated by automake 1.7.1 from Makefile.am. ! # @configure_input@ ! # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 ! # Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. *************** *** 10,87 **** # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. ! ! SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ - prefix = @prefix@ - exec_prefix = @exec_prefix@ - - bindir = @bindir@ - sbindir = @sbindir@ - libexecdir = @libexecdir@ - datadir = @datadir@ - sysconfdir = @sysconfdir@ - sharedstatedir = @sharedstatedir@ - localstatedir = @localstatedir@ - libdir = @libdir@ - infodir = @infodir@ - mandir = @mandir@ - includedir = @includedir@ - oldincludedir = /usr/include - - DESTDIR = - pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ - top_builddir = .. ! ACLOCAL = @ACLOCAL@ ! AUTOCONF = @AUTOCONF@ ! AUTOMAKE = @AUTOMAKE@ ! AUTOHEADER = @AUTOHEADER@ ! INSTALL = @INSTALL@ ! INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) ! INSTALL_DATA = @INSTALL_DATA@ ! INSTALL_SCRIPT = @INSTALL_SCRIPT@ ! transform = @program_transform_name@ ! NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : - host_alias = @host_alias@ host_triplet = @host@ ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ ! AS = @AS@ AWK = @AWK@ BONOBO_ACTIVATION_REQUIRED = @BONOBO_ACTIVATION_REQUIRED@ BONOBO_IDLDIR = @BONOBO_IDLDIR@ BONOBO_REQUIRED = @BONOBO_REQUIRED@ BZ2_LIBS = @BZ2_LIBS@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ CFLAGS = @CFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ ! CXX = @CXX@ DATADIRNAME = @DATADIRNAME@ DB2HTML = @DB2HTML@ ! DLLTOOL = @DLLTOOL@ ECHO = @ECHO@ ENABLE_PROFILER = @ENABLE_PROFILER@ EXEEXT = @EXEEXT@ FAM_LIBS = @FAM_LIBS@ GCONFTOOL = @GCONFTOOL@ GCONF_REQUIRED = @GCONF_REQUIRED@ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ --- 12,85 ---- # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. ! @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = .. ! am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ ! install_sh_DATA = $(install_sh) -c -m 644 ! install_sh_PROGRAM = $(install_sh) -c ! install_sh_SCRIPT = $(install_sh) -c ! INSTALL_HEADER = $(INSTALL_DATA) ! transform = $(program_transform_name) NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : host_triplet = @host@ + ACLOCAL = @ACLOCAL@ ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ ! ALLOCA = @ALLOCA@ ! AMDEP_FALSE = @AMDEP_FALSE@ ! AMDEP_TRUE = @AMDEP_TRUE@ ! AMTAR = @AMTAR@ ! AUTOCONF = @AUTOCONF@ ! AUTOHEADER = @AUTOHEADER@ ! AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BONOBO_ACTIVATION_REQUIRED = @BONOBO_ACTIVATION_REQUIRED@ BONOBO_IDLDIR = @BONOBO_IDLDIR@ BONOBO_REQUIRED = @BONOBO_REQUIRED@ + BUILD_CDEMENU_MODULE_FALSE = @BUILD_CDEMENU_MODULE_FALSE@ + BUILD_CDEMENU_MODULE_TRUE = @BUILD_CDEMENU_MODULE_TRUE@ BZ2_LIBS = @BZ2_LIBS@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ + CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ ! CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ DB2HTML = @DB2HTML@ ! DEFS = @DEFS@ ! DEPDIR = @DEPDIR@ ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ + ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ + ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ENABLE_PROFILER = @ENABLE_PROFILER@ + ENABLE_PROFILER_FALSE = @ENABLE_PROFILER_FALSE@ + ENABLE_PROFILER_TRUE = @ENABLE_PROFILER_TRUE@ EXEEXT = @EXEEXT@ FAM_LIBS = @FAM_LIBS@ GCONFTOOL = @GCONFTOOL@ GCONF_REQUIRED = @GCONF_REQUIRED@ + GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ + GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ *************** *** 90,99 **** --- 88,114 ---- GMSGFMT = @GMSGFMT@ GNOME_ACLOCAL_DIR = @GNOME_ACLOCAL_DIR@ GNOME_ACLOCAL_FLAGS = @GNOME_ACLOCAL_FLAGS@ + GNOME_INTERFACE_VERSION = @GNOME_INTERFACE_VERSION@ GNOME_VFS_DIR = @GNOME_VFS_DIR@ GTKDOC = @GTKDOC@ + HAVE_CDDA_FALSE = @HAVE_CDDA_FALSE@ + HAVE_CDDA_TRUE = @HAVE_CDDA_TRUE@ + HAVE_DOCBOOK_FALSE = @HAVE_DOCBOOK_FALSE@ + HAVE_DOCBOOK_TRUE = @HAVE_DOCBOOK_TRUE@ HAVE_GTK_DOC = @HAVE_GTK_DOC@ + HAVE_GTK_DOC_FALSE = @HAVE_GTK_DOC_FALSE@ + HAVE_GTK_DOC_TRUE = @HAVE_GTK_DOC_TRUE@ + HAVE_LIBEFS_FALSE = @HAVE_LIBEFS_FALSE@ + HAVE_LIBEFS_TRUE = @HAVE_LIBEFS_TRUE@ + HAVE_SSL_FALSE = @HAVE_SSL_FALSE@ + HAVE_SSL_TRUE = @HAVE_SSL_TRUE@ HTML_DIR = @HTML_DIR@ + INSIDE_GNOME_DOCU_FALSE = @INSIDE_GNOME_DOCU_FALSE@ + INSIDE_GNOME_DOCU_TRUE = @INSIDE_GNOME_DOCU_TRUE@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ + INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLLIBS = @INTLLIBS@ INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@ *************** *** 127,135 **** --- 142,154 ---- LIBGNUTLS_CONFIG = @LIBGNUTLS_CONFIG@ LIBGNUTLS_LIBS = @LIBGNUTLS_LIBS@ LIBIDL_REQUIRED = @LIBIDL_REQUIRED@ + LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ + MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ + MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MKINSTALLDIRS = @MKINSTALLDIRS@ MODULES_CFLAGS = @MODULES_CFLAGS@ *************** *** 144,161 **** MODULES_XML_LIBS = @MODULES_XML_LIBS@ MONIKERS_CFLAGS = @MONIKERS_CFLAGS@ MONIKERS_LIBS = @MONIKERS_LIBS@ ! OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ ORBIT_IDL = @ORBIT_IDL@ ORBIT_REQUIRED = @ORBIT_REQUIRED@ PACKAGE = @PACKAGE@ PKG_CONFIG = @PKG_CONFIG@ POFILES = @POFILES@ POPT_LIBS = @POPT_LIBS@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ RANLIB = @RANLIB@ STRIP = @STRIP@ TEST_CFLAGS = @TEST_CFLAGS@ TEST_LIBS = @TEST_LIBS@ --- 163,192 ---- MODULES_XML_LIBS = @MODULES_XML_LIBS@ MONIKERS_CFLAGS = @MONIKERS_CFLAGS@ MONIKERS_LIBS = @MONIKERS_LIBS@ ! MSGFMT = @MSGFMT@ OBJEXT = @OBJEXT@ + OPENSSL_CFLAGS = @OPENSSL_CFLAGS@ + OPENSSL_LIBS = @OPENSSL_LIBS@ ORBIT_IDL = @ORBIT_IDL@ ORBIT_REQUIRED = @ORBIT_REQUIRED@ PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ + PLATFORM_GNOME_2_FALSE = @PLATFORM_GNOME_2_FALSE@ + PLATFORM_GNOME_2_TRUE = @PLATFORM_GNOME_2_TRUE@ POFILES = @POFILES@ POPT_LIBS = @POPT_LIBS@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ RANLIB = @RANLIB@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ STRIP = @STRIP@ TEST_CFLAGS = @TEST_CFLAGS@ TEST_LIBS = @TEST_LIBS@ *************** *** 173,181 **** VFS_SIZE_IS = @VFS_SIZE_IS@ VFS_SIZE_PRINTF = @VFS_SIZE_PRINTF@ WARN_CFLAGS = @WARN_CFLAGS@ ! WARN_CXXFLAGS = @WARN_CXXFLAGS@ XML_REQUIRED = @XML_REQUIRED@ ! SUBDIRS = gnome-vfs-tutorial TEXT_FILES = \ --- 204,245 ---- VFS_SIZE_IS = @VFS_SIZE_IS@ VFS_SIZE_PRINTF = @VFS_SIZE_PRINTF@ WARN_CFLAGS = @WARN_CFLAGS@ ! XGETTEXT = @XGETTEXT@ XML_REQUIRED = @XML_REQUIRED@ ! ac_ct_CC = @ac_ct_CC@ ! ac_ct_RANLIB = @ac_ct_RANLIB@ ! ac_ct_STRIP = @ac_ct_STRIP@ ! am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ ! am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ ! am__include = @am__include@ ! am__quote = @am__quote@ ! bindir = @bindir@ ! build = @build@ ! build_alias = @build_alias@ ! build_cpu = @build_cpu@ ! build_os = @build_os@ ! build_vendor = @build_vendor@ ! datadir = @datadir@ ! exec_prefix = @exec_prefix@ ! host = @host@ ! host_alias = @host_alias@ ! host_cpu = @host_cpu@ ! host_os = @host_os@ ! host_vendor = @host_vendor@ ! includedir = @includedir@ ! infodir = @infodir@ ! install_sh = @install_sh@ ! libdir = @libdir@ ! libexecdir = @libexecdir@ ! localstatedir = @localstatedir@ ! mandir = @mandir@ ! oldincludedir = @oldincludedir@ ! prefix = @prefix@ ! program_transform_name = @program_transform_name@ ! sbindir = @sbindir@ ! sharedstatedir = @sharedstatedir@ ! sysconfdir = @sysconfdir@ ! target_alias = @target_alias@ SUBDIRS = gnome-vfs-tutorial TEXT_FILES = \ *************** *** 184,228 **** docdir = $(prefix)/doc doc_DATA = mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ! CONFIG_HEADER = ../config.h ! CONFIG_CLEAN_FILES = ! DATA = $(doc_DATA) ! ! DIST_COMMON = Makefile.am Makefile.in ! ! ! DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) - TAR = gtar - GZIP_ENV = --best - all: all-redirect .SUFFIXES: ! $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) ! cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps devel-docs/Makefile ! Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ! cd $(top_builddir) \ ! && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status install-docDATA: $(doc_DATA) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(docdir) @list='$(doc_DATA)'; for p in $$list; do \ ! if test -f $(srcdir)/$$p; then \ ! echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(docdir)/$$p"; \ ! $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(docdir)/$$p; \ ! else if test -f $$p; then \ ! echo " $(INSTALL_DATA) $$p $(DESTDIR)$(docdir)/$$p"; \ ! $(INSTALL_DATA) $$p $(DESTDIR)$(docdir)/$$p; \ ! fi; fi; \ done uninstall-docDATA: @$(NORMAL_UNINSTALL) ! list='$(doc_DATA)'; for p in $$list; do \ ! rm -f $(DESTDIR)$(docdir)/$$p; \ done # This directory's subdirectories are mostly independent; you can cd --- 248,305 ---- docdir = $(prefix)/doc doc_DATA = + subdir = devel-docs mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ! CONFIG_HEADER = $(top_builddir)/config.h ! CONFIG_CLEAN_FILES = ! depcomp = ! am__depfiles_maybe = ! DIST_SOURCES = ! DATA = $(doc_DATA) ! ! ! RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \ ! ps-recursive install-info-recursive uninstall-info-recursive \ ! all-recursive install-data-recursive install-exec-recursive \ ! installdirs-recursive install-recursive uninstall-recursive \ ! check-recursive installcheck-recursive ! DIST_COMMON = Makefile.am Makefile.in ! DIST_SUBDIRS = $(SUBDIRS) ! all: all-recursive .SUFFIXES: ! $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) ! cd $(top_srcdir) && \ ! $(AUTOMAKE) --gnu --ignore-deps devel-docs/Makefile ! Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status ! cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) ! mostlyclean-libtool: ! -rm -f *.lo + clean-libtool: + -rm -rf .libs _libs + distclean-libtool: + -rm -f libtool + uninstall-info-am: + docDATA_INSTALL = $(INSTALL_DATA) install-docDATA: $(doc_DATA) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(docdir) @list='$(doc_DATA)'; for p in $$list; do \ ! if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ ! f="`echo $$p | sed -e 's|^.*/||'`"; \ ! echo " $(docDATA_INSTALL) $$d$$p $(DESTDIR)$(docdir)/$$f"; \ ! $(docDATA_INSTALL) $$d$$p $(DESTDIR)$(docdir)/$$f; \ done uninstall-docDATA: @$(NORMAL_UNINSTALL) ! @list='$(doc_DATA)'; for p in $$list; do \ ! f="`echo $$p | sed -e 's|^.*/||'`"; \ ! echo " rm -f $(DESTDIR)$(docdir)/$$f"; \ ! rm -f $(DESTDIR)$(docdir)/$$f; \ done # This directory's subdirectories are mostly independent; you can cd *************** *** 231,243 **** # (1) if the variable is set in `config.status', edit `config.status' # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. ! ! @SET_MAKE@ ! ! all-recursive install-data-recursive install-exec-recursive \ ! installdirs-recursive install-recursive uninstall-recursive \ ! check-recursive installcheck-recursive info-recursive dvi-recursive: ! @set fnord $(MAKEFLAGS); amf=$$2; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ list='$(SUBDIRS)'; for subdir in $$list; do \ --- 308,315 ---- # (1) if the variable is set in `config.status', edit `config.status' # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. ! $(RECURSIVE_TARGETS): ! @set fnord $$MAKEFLAGS; amf=$$2; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ list='$(SUBDIRS)'; for subdir in $$list; do \ *************** *** 257,269 **** mostlyclean-recursive clean-recursive distclean-recursive \ maintainer-clean-recursive: ! @set fnord $(MAKEFLAGS); amf=$$2; \ dot_seen=no; \ ! rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \ ! rev="$$subdir $$rev"; \ ! test "$$subdir" != "." || dot_seen=yes; \ done; \ ! test "$$dot_seen" = "no" && rev=". $$rev"; \ target=`echo $@ | sed s/-recursive//`; \ for subdir in $$rev; do \ echo "Making $$target in $$subdir"; \ --- 329,346 ---- mostlyclean-recursive clean-recursive distclean-recursive \ maintainer-clean-recursive: ! @set fnord $$MAKEFLAGS; amf=$$2; \ dot_seen=no; \ ! case "$@" in \ ! distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ ! *) list='$(SUBDIRS)' ;; \ ! esac; \ ! rev=''; for subdir in $$list; do \ ! if test "$$subdir" = "."; then :; else \ ! rev="$$subdir $$rev"; \ ! fi; \ done; \ ! rev="$$rev ."; \ target=`echo $@ | sed s/-recursive//`; \ for subdir in $$rev; do \ echo "Making $$target in $$subdir"; \ *************** *** 279,417 **** list='$(SUBDIRS)'; for subdir in $$list; do \ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ done tags: TAGS ! ID: $(HEADERS) $(SOURCES) $(LISP) ! list='$(SOURCES) $(HEADERS)'; \ ! unique=`for i in $$list; do echo $$i; done | \ ! awk ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ ! here=`pwd` && cd $(srcdir) \ ! && mkid -f$$here/ID $$unique $(LISP) ! TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) tags=; \ here=`pwd`; \ list='$(SUBDIRS)'; for subdir in $$list; do \ ! if test "$$subdir" = .; then :; else \ test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \ ! fi; \ done; \ ! list='$(SOURCES) $(HEADERS)'; \ ! unique=`for i in $$list; do echo $$i; done | \ ! awk ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ ! test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ ! || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS) ! ! mostlyclean-tags: ! ! clean-tags: distclean-tags: ! -rm -f TAGS ID ! maintainer-clean-tags: ! ! distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) ! ! subdir = devel-docs distdir: $(DISTFILES) ! @for file in $(DISTFILES); do \ ! d=$(srcdir); \ if test -d $$d/$$file; then \ ! cp -pr $$d/$$file $(distdir)/$$file; \ else \ test -f $(distdir)/$$file \ ! || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ ! || cp -p $$d/$$file $(distdir)/$$file || :; \ fi; \ done ! for subdir in $(SUBDIRS); do \ if test "$$subdir" = .; then :; else \ test -d $(distdir)/$$subdir \ || mkdir $(distdir)/$$subdir \ || exit 1; \ ! chmod 777 $(distdir)/$$subdir; \ ! (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(top_distdir) distdir=../$(distdir)/$$subdir distdir) \ || exit 1; \ fi; \ done - info-am: - info: info-recursive - dvi-am: - dvi: dvi-recursive check-am: all-am check: check-recursive ! installcheck-am: ! installcheck: installcheck-recursive ! install-exec-am: ! install-exec: install-exec-recursive ! install-data-am: install-docDATA install-data: install-data-recursive install-am: all-am @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - install: install-recursive - uninstall-am: uninstall-docDATA - uninstall: uninstall-recursive - all-am: Makefile $(DATA) - all-redirect: all-recursive - install-strip: - $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install - installdirs: installdirs-recursive - installdirs-am: - $(mkinstalldirs) $(DESTDIR)$(docdir) - mostlyclean-generic: clean-generic: distclean-generic: -rm -f Makefile $(CONFIG_CLEAN_FILES) - -rm -f config.cache config.log stamp-h stamp-h[0-9]* maintainer-clean-generic: ! mostlyclean-am: mostlyclean-tags mostlyclean-generic ! mostlyclean: mostlyclean-recursive ! clean-am: clean-tags clean-generic mostlyclean-am ! clean: clean-recursive ! distclean-am: distclean-tags distclean-generic clean-am ! -rm -f libtool ! distclean: distclean-recursive ! maintainer-clean-am: maintainer-clean-tags maintainer-clean-generic \ ! distclean-am ! @echo "This command is intended for maintainers to use;" ! @echo "it deletes files that may require special tools to rebuild." maintainer-clean: maintainer-clean-recursive ! .PHONY: uninstall-docDATA install-docDATA install-data-recursive \ ! uninstall-data-recursive install-exec-recursive \ ! uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \ ! all-recursive check-recursive installcheck-recursive info-recursive \ ! dvi-recursive mostlyclean-recursive distclean-recursive clean-recursive \ ! maintainer-clean-recursive tags tags-recursive mostlyclean-tags \ ! distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ ! dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ ! install-exec install-data-am install-data install-am install \ ! uninstall-am uninstall all-redirect all-am all installdirs-am \ ! installdirs mostlyclean-generic distclean-generic clean-generic \ ! maintainer-clean-generic clean mostlyclean distclean maintainer-clean ! # devel-docs/Makefile.am ends here # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: --- 356,566 ---- list='$(SUBDIRS)'; for subdir in $$list; do \ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ done + ctags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ + test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ + done + + ETAGS = etags + ETAGSFLAGS = + + CTAGS = ctags + CTAGSFLAGS = tags: TAGS ! ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) ! list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ ! unique=`for i in $$list; do \ ! if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ ! done | \ ! $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ ! mkid -fID $$unique ! TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ ! $(TAGS_FILES) $(LISP) tags=; \ here=`pwd`; \ list='$(SUBDIRS)'; for subdir in $$list; do \ ! if test "$$subdir" = .; then :; else \ test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \ ! fi; \ done; \ ! list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ ! unique=`for i in $$list; do \ ! if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ ! done | \ ! $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ ! test -z "$(ETAGS_ARGS)$$tags$$unique" \ ! || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ! $$tags $$unique ! ! ctags: CTAGS ! CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ ! $(TAGS_FILES) $(LISP) ! tags=; \ ! here=`pwd`; \ ! list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ ! unique=`for i in $$list; do \ ! if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ ! done | \ ! $(AWK) ' { files[$$0] = 1; } \ ! END { for (i in files) print i; }'`; \ ! test -z "$(CTAGS_ARGS)$$tags$$unique" \ ! || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ ! $$tags $$unique ! ! GTAGS: ! here=`$(am__cd) $(top_builddir) && pwd` \ ! && cd $(top_srcdir) \ ! && gtags -i $(GTAGS_ARGS) $$here distclean-tags: ! -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags ! DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ! top_distdir = .. ! distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) ! @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ ! topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ ! list='$(DISTFILES)'; for file in $$list; do \ ! case $$file in \ ! $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ ! $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ ! esac; \ ! if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ ! dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ ! if test "$$dir" != "$$file" && test "$$dir" != "."; then \ ! dir="/$$dir"; \ ! $(mkinstalldirs) "$(distdir)$$dir"; \ ! else \ ! dir=''; \ ! fi; \ if test -d $$d/$$file; then \ ! if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ ! cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ ! fi; \ ! cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ else \ test -f $(distdir)/$$file \ ! || cp -p $$d/$$file $(distdir)/$$file \ ! || exit 1; \ fi; \ done ! list='$(SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ test -d $(distdir)/$$subdir \ || mkdir $(distdir)/$$subdir \ || exit 1; \ ! (cd $$subdir && \ ! $(MAKE) $(AM_MAKEFLAGS) \ ! top_distdir="$(top_distdir)" \ ! distdir=../$(distdir)/$$subdir \ ! distdir) \ || exit 1; \ fi; \ done check-am: all-am check: check-recursive ! all-am: Makefile $(DATA) ! installdirs: installdirs-recursive ! installdirs-am: ! $(mkinstalldirs) $(DESTDIR)$(docdir) ! install: install-recursive ! install-exec: install-exec-recursive install-data: install-data-recursive + uninstall: uninstall-recursive install-am: all-am @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + installcheck: installcheck-recursive + install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: clean-generic: distclean-generic: -rm -f Makefile $(CONFIG_CLEAN_FILES) maintainer-clean-generic: ! @echo "This command is intended for maintainers to use" ! @echo "it deletes files that may require special tools to rebuild." ! clean: clean-recursive ! clean-am: clean-generic clean-libtool mostlyclean-am ! distclean: distclean-recursive ! distclean-am: clean-am distclean-generic distclean-libtool \ ! distclean-tags ! dvi: dvi-recursive ! dvi-am: ! info: info-recursive ! ! info-am: ! ! install-data-am: install-docDATA ! ! install-exec-am: ! ! install-info: install-info-recursive ! ! install-man: ! ! installcheck-am: maintainer-clean: maintainer-clean-recursive ! maintainer-clean-am: distclean-am maintainer-clean-generic + mostlyclean: mostlyclean-recursive ! mostlyclean-am: mostlyclean-generic mostlyclean-libtool ! ! pdf: pdf-recursive ! ! pdf-am: + ps: ps-recursive + + ps-am: + + uninstall-am: uninstall-docDATA uninstall-info-am + + uninstall-info: uninstall-info-recursive + + .PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \ + clean-generic clean-libtool clean-recursive ctags \ + ctags-recursive distclean distclean-generic distclean-libtool \ + distclean-recursive distclean-tags distdir dvi dvi-am \ + dvi-recursive info info-am info-recursive install install-am \ + install-data install-data-am install-data-recursive \ + install-docDATA install-exec install-exec-am \ + install-exec-recursive install-info install-info-am \ + install-info-recursive install-man install-recursive \ + install-strip installcheck installcheck-am installdirs \ + installdirs-am installdirs-recursive maintainer-clean \ + maintainer-clean-generic maintainer-clean-recursive mostlyclean \ + mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \ + pdf pdf-am pdf-recursive ps ps-am ps-recursive tags \ + tags-recursive uninstall uninstall-am uninstall-docDATA \ + uninstall-info-am uninstall-info-recursive uninstall-recursive + + + # devel-docs/Makefile.am ends here # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff -crN ./gnome-vfs/devel-docs/gnome-vfs-tutorial/Makefile.in /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/devel-docs/gnome-vfs-tutorial/Makefile.in *** ./gnome-vfs/devel-docs/gnome-vfs-tutorial/Makefile.in Mon Sep 8 14:19:46 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/devel-docs/gnome-vfs-tutorial/Makefile.in Thu Dec 18 21:13:07 2003 *************** *** 1,6 **** ! # Makefile.in generated automatically by automake 1.4-p6 from Makefile.am ! # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. --- 1,8 ---- ! # Makefile.in generated by automake 1.7.1 from Makefile.am. ! # @configure_input@ ! # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 ! # Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. *************** *** 10,87 **** # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. ! ! SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ - prefix = @prefix@ - exec_prefix = @exec_prefix@ - - bindir = @bindir@ - sbindir = @sbindir@ - libexecdir = @libexecdir@ - datadir = @datadir@ - sysconfdir = @sysconfdir@ - sharedstatedir = @sharedstatedir@ - localstatedir = @localstatedir@ - libdir = @libdir@ - infodir = @infodir@ - mandir = @mandir@ - includedir = @includedir@ - oldincludedir = /usr/include - - DESTDIR = - pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ - top_builddir = ../.. ! ACLOCAL = @ACLOCAL@ ! AUTOCONF = @AUTOCONF@ ! AUTOMAKE = @AUTOMAKE@ ! AUTOHEADER = @AUTOHEADER@ ! INSTALL = @INSTALL@ ! INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) ! INSTALL_DATA = @INSTALL_DATA@ ! INSTALL_SCRIPT = @INSTALL_SCRIPT@ ! transform = @program_transform_name@ ! NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : - host_alias = @host_alias@ host_triplet = @host@ ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ ! AS = @AS@ AWK = @AWK@ BONOBO_ACTIVATION_REQUIRED = @BONOBO_ACTIVATION_REQUIRED@ BONOBO_IDLDIR = @BONOBO_IDLDIR@ BONOBO_REQUIRED = @BONOBO_REQUIRED@ BZ2_LIBS = @BZ2_LIBS@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ CFLAGS = @CFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ ! CXX = @CXX@ DATADIRNAME = @DATADIRNAME@ DB2HTML = @DB2HTML@ ! DLLTOOL = @DLLTOOL@ ECHO = @ECHO@ ENABLE_PROFILER = @ENABLE_PROFILER@ EXEEXT = @EXEEXT@ FAM_LIBS = @FAM_LIBS@ GCONFTOOL = @GCONFTOOL@ GCONF_REQUIRED = @GCONF_REQUIRED@ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ --- 12,85 ---- # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. ! @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = ../.. ! am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ ! install_sh_DATA = $(install_sh) -c -m 644 ! install_sh_PROGRAM = $(install_sh) -c ! install_sh_SCRIPT = $(install_sh) -c ! INSTALL_HEADER = $(INSTALL_DATA) ! transform = $(program_transform_name) NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : host_triplet = @host@ + ACLOCAL = @ACLOCAL@ ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ ! ALLOCA = @ALLOCA@ ! AMDEP_FALSE = @AMDEP_FALSE@ ! AMDEP_TRUE = @AMDEP_TRUE@ ! AMTAR = @AMTAR@ ! AUTOCONF = @AUTOCONF@ ! AUTOHEADER = @AUTOHEADER@ ! AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BONOBO_ACTIVATION_REQUIRED = @BONOBO_ACTIVATION_REQUIRED@ BONOBO_IDLDIR = @BONOBO_IDLDIR@ BONOBO_REQUIRED = @BONOBO_REQUIRED@ + BUILD_CDEMENU_MODULE_FALSE = @BUILD_CDEMENU_MODULE_FALSE@ + BUILD_CDEMENU_MODULE_TRUE = @BUILD_CDEMENU_MODULE_TRUE@ BZ2_LIBS = @BZ2_LIBS@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ + CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ ! CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ DB2HTML = @DB2HTML@ ! DEFS = @DEFS@ ! DEPDIR = @DEPDIR@ ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ + ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ + ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ENABLE_PROFILER = @ENABLE_PROFILER@ + ENABLE_PROFILER_FALSE = @ENABLE_PROFILER_FALSE@ + ENABLE_PROFILER_TRUE = @ENABLE_PROFILER_TRUE@ EXEEXT = @EXEEXT@ FAM_LIBS = @FAM_LIBS@ GCONFTOOL = @GCONFTOOL@ GCONF_REQUIRED = @GCONF_REQUIRED@ + GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ + GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ *************** *** 90,99 **** --- 88,114 ---- GMSGFMT = @GMSGFMT@ GNOME_ACLOCAL_DIR = @GNOME_ACLOCAL_DIR@ GNOME_ACLOCAL_FLAGS = @GNOME_ACLOCAL_FLAGS@ + GNOME_INTERFACE_VERSION = @GNOME_INTERFACE_VERSION@ GNOME_VFS_DIR = @GNOME_VFS_DIR@ GTKDOC = @GTKDOC@ + HAVE_CDDA_FALSE = @HAVE_CDDA_FALSE@ + HAVE_CDDA_TRUE = @HAVE_CDDA_TRUE@ + HAVE_DOCBOOK_FALSE = @HAVE_DOCBOOK_FALSE@ + HAVE_DOCBOOK_TRUE = @HAVE_DOCBOOK_TRUE@ HAVE_GTK_DOC = @HAVE_GTK_DOC@ + HAVE_GTK_DOC_FALSE = @HAVE_GTK_DOC_FALSE@ + HAVE_GTK_DOC_TRUE = @HAVE_GTK_DOC_TRUE@ + HAVE_LIBEFS_FALSE = @HAVE_LIBEFS_FALSE@ + HAVE_LIBEFS_TRUE = @HAVE_LIBEFS_TRUE@ + HAVE_SSL_FALSE = @HAVE_SSL_FALSE@ + HAVE_SSL_TRUE = @HAVE_SSL_TRUE@ HTML_DIR = @HTML_DIR@ + INSIDE_GNOME_DOCU_FALSE = @INSIDE_GNOME_DOCU_FALSE@ + INSIDE_GNOME_DOCU_TRUE = @INSIDE_GNOME_DOCU_TRUE@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ + INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLLIBS = @INTLLIBS@ INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@ *************** *** 127,135 **** --- 142,154 ---- LIBGNUTLS_CONFIG = @LIBGNUTLS_CONFIG@ LIBGNUTLS_LIBS = @LIBGNUTLS_LIBS@ LIBIDL_REQUIRED = @LIBIDL_REQUIRED@ + LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ + MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ + MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MKINSTALLDIRS = @MKINSTALLDIRS@ MODULES_CFLAGS = @MODULES_CFLAGS@ *************** *** 144,161 **** MODULES_XML_LIBS = @MODULES_XML_LIBS@ MONIKERS_CFLAGS = @MONIKERS_CFLAGS@ MONIKERS_LIBS = @MONIKERS_LIBS@ ! OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ ORBIT_IDL = @ORBIT_IDL@ ORBIT_REQUIRED = @ORBIT_REQUIRED@ PACKAGE = @PACKAGE@ PKG_CONFIG = @PKG_CONFIG@ POFILES = @POFILES@ POPT_LIBS = @POPT_LIBS@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ RANLIB = @RANLIB@ STRIP = @STRIP@ TEST_CFLAGS = @TEST_CFLAGS@ TEST_LIBS = @TEST_LIBS@ --- 163,192 ---- MODULES_XML_LIBS = @MODULES_XML_LIBS@ MONIKERS_CFLAGS = @MONIKERS_CFLAGS@ MONIKERS_LIBS = @MONIKERS_LIBS@ ! MSGFMT = @MSGFMT@ OBJEXT = @OBJEXT@ + OPENSSL_CFLAGS = @OPENSSL_CFLAGS@ + OPENSSL_LIBS = @OPENSSL_LIBS@ ORBIT_IDL = @ORBIT_IDL@ ORBIT_REQUIRED = @ORBIT_REQUIRED@ PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ + PLATFORM_GNOME_2_FALSE = @PLATFORM_GNOME_2_FALSE@ + PLATFORM_GNOME_2_TRUE = @PLATFORM_GNOME_2_TRUE@ POFILES = @POFILES@ POPT_LIBS = @POPT_LIBS@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ RANLIB = @RANLIB@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ STRIP = @STRIP@ TEST_CFLAGS = @TEST_CFLAGS@ TEST_LIBS = @TEST_LIBS@ *************** *** 173,283 **** VFS_SIZE_IS = @VFS_SIZE_IS@ VFS_SIZE_PRINTF = @VFS_SIZE_PRINTF@ WARN_CFLAGS = @WARN_CFLAGS@ ! WARN_CXXFLAGS = @WARN_CXXFLAGS@ XML_REQUIRED = @XML_REQUIRED@ ! EXTRA_DIST = \ gnome-vfs-tutorial.sgml mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ! CONFIG_HEADER = ../../config.h ! CONFIG_CLEAN_FILES = ! DIST_COMMON = Makefile.am Makefile.in ! - DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) - - TAR = gtar - GZIP_ENV = --best - all: all-redirect .SUFFIXES: ! $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) ! cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps devel-docs/gnome-vfs-tutorial/Makefile ! Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ! cd $(top_builddir) \ ! && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status tags: TAGS TAGS: ! distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) ! subdir = devel-docs/gnome-vfs-tutorial distdir: $(DISTFILES) ! @for file in $(DISTFILES); do \ ! d=$(srcdir); \ if test -d $$d/$$file; then \ ! cp -pr $$d/$$file $(distdir)/$$file; \ else \ test -f $(distdir)/$$file \ ! || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ ! || cp -p $$d/$$file $(distdir)/$$file || :; \ fi; \ done - info-am: - info: info-am - dvi-am: - dvi: dvi-am check-am: all-am check: check-am ! installcheck-am: ! installcheck: installcheck-am ! install-exec-am: ! install-exec: install-exec-am ! install-data-am: ! install-data: install-data-am - install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am install: install-am ! uninstall-am: uninstall: uninstall-am - all-am: Makefile - all-redirect: all-am - install-strip: - $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install - installdirs: mostlyclean-generic: clean-generic: distclean-generic: -rm -f Makefile $(CONFIG_CLEAN_FILES) - -rm -f config.cache config.log stamp-h stamp-h[0-9]* maintainer-clean-generic: ! mostlyclean-am: mostlyclean-generic ! mostlyclean: mostlyclean-am ! clean-am: clean-generic mostlyclean-am ! clean: clean-am ! distclean-am: distclean-generic clean-am ! -rm -f libtool ! distclean: distclean-am ! maintainer-clean-am: maintainer-clean-generic distclean-am ! @echo "This command is intended for maintainers to use;" ! @echo "it deletes files that may require special tools to rebuild." maintainer-clean: maintainer-clean-am ! .PHONY: tags distdir info-am info dvi-am dvi check check-am \ ! installcheck-am installcheck install-exec-am install-exec \ ! install-data-am install-data install-am install uninstall-am uninstall \ ! all-redirect all-am all installdirs mostlyclean-generic \ ! distclean-generic clean-generic maintainer-clean-generic clean \ ! mostlyclean distclean maintainer-clean # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. --- 204,395 ---- VFS_SIZE_IS = @VFS_SIZE_IS@ VFS_SIZE_PRINTF = @VFS_SIZE_PRINTF@ WARN_CFLAGS = @WARN_CFLAGS@ ! XGETTEXT = @XGETTEXT@ XML_REQUIRED = @XML_REQUIRED@ ! ac_ct_CC = @ac_ct_CC@ ! ac_ct_RANLIB = @ac_ct_RANLIB@ ! ac_ct_STRIP = @ac_ct_STRIP@ ! am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ ! am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ ! am__include = @am__include@ ! am__quote = @am__quote@ ! bindir = @bindir@ ! build = @build@ ! build_alias = @build_alias@ ! build_cpu = @build_cpu@ ! build_os = @build_os@ ! build_vendor = @build_vendor@ ! datadir = @datadir@ ! exec_prefix = @exec_prefix@ ! host = @host@ ! host_alias = @host_alias@ ! host_cpu = @host_cpu@ ! host_os = @host_os@ ! host_vendor = @host_vendor@ ! includedir = @includedir@ ! infodir = @infodir@ ! install_sh = @install_sh@ ! libdir = @libdir@ ! libexecdir = @libexecdir@ ! localstatedir = @localstatedir@ ! mandir = @mandir@ ! oldincludedir = @oldincludedir@ ! prefix = @prefix@ ! program_transform_name = @program_transform_name@ ! sbindir = @sbindir@ ! sharedstatedir = @sharedstatedir@ ! sysconfdir = @sysconfdir@ ! target_alias = @target_alias@ EXTRA_DIST = \ gnome-vfs-tutorial.sgml + subdir = devel-docs/gnome-vfs-tutorial mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ! CONFIG_HEADER = $(top_builddir)/config.h ! CONFIG_CLEAN_FILES = ! depcomp = ! am__depfiles_maybe = ! DIST_SOURCES = ! DIST_COMMON = Makefile.am Makefile.in ! all: all-am .SUFFIXES: ! $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) ! cd $(top_srcdir) && \ ! $(AUTOMAKE) --gnu --ignore-deps devel-docs/gnome-vfs-tutorial/Makefile ! Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status ! cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) ! ! mostlyclean-libtool: ! -rm -f *.lo ! clean-libtool: ! -rm -rf .libs _libs + distclean-libtool: + -rm -f libtool + uninstall-info-am: tags: TAGS TAGS: + ctags: CTAGS + CTAGS: ! DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ! top_distdir = ../.. ! distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) ! @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ ! topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ ! list='$(DISTFILES)'; for file in $$list; do \ ! case $$file in \ ! $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ ! $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ ! esac; \ ! if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ ! dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ ! if test "$$dir" != "$$file" && test "$$dir" != "."; then \ ! dir="/$$dir"; \ ! $(mkinstalldirs) "$(distdir)$$dir"; \ ! else \ ! dir=''; \ ! fi; \ if test -d $$d/$$file; then \ ! if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ ! cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ ! fi; \ ! cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ else \ test -f $(distdir)/$$file \ ! || cp -p $$d/$$file $(distdir)/$$file \ ! || exit 1; \ fi; \ done check-am: all-am check: check-am ! all-am: Makefile ! installdirs: install: install-am ! install-exec: install-exec-am ! install-data: install-data-am uninstall: uninstall-am + install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + installcheck: installcheck-am + install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: clean-generic: distclean-generic: -rm -f Makefile $(CONFIG_CLEAN_FILES) maintainer-clean-generic: ! @echo "This command is intended for maintainers to use" ! @echo "it deletes files that may require special tools to rebuild." ! clean: clean-am ! clean-am: clean-generic clean-libtool mostlyclean-am ! distclean: distclean-am ! distclean-am: clean-am distclean-generic distclean-libtool ! dvi: dvi-am ! dvi-am: ! info: info-am ! ! info-am: ! ! install-data-am: ! ! install-exec-am: ! ! install-info: install-info-am ! ! install-man: ! ! installcheck-am: maintainer-clean: maintainer-clean-am ! maintainer-clean-am: distclean-am maintainer-clean-generic ! ! mostlyclean: mostlyclean-am ! ! mostlyclean-am: mostlyclean-generic mostlyclean-libtool ! ! pdf: pdf-am ! ! pdf-am: ! ! ps: ps-am ! ! ps-am: ! ! uninstall-am: uninstall-info-am + .PHONY: all all-am check check-am clean clean-generic clean-libtool \ + distclean distclean-generic distclean-libtool distdir dvi \ + dvi-am info info-am install install-am install-data \ + install-data-am install-exec install-exec-am install-info \ + install-info-am install-man install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ + uninstall-info-am # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff -crN ./gnome-vfs/doc/Makefile.in /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/doc/Makefile.in *** ./gnome-vfs/doc/Makefile.in Mon Sep 8 14:19:46 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/doc/Makefile.in Thu Dec 18 21:13:08 2003 *************** *** 1,6 **** ! # Makefile.in generated automatically by automake 1.4-p6 from Makefile.am ! # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. --- 1,8 ---- ! # Makefile.in generated by automake 1.7.1 from Makefile.am. ! # @configure_input@ ! # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 ! # Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. *************** *** 10,87 **** # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. ! ! SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ - prefix = @prefix@ - exec_prefix = @exec_prefix@ - - bindir = @bindir@ - sbindir = @sbindir@ - libexecdir = @libexecdir@ - datadir = @datadir@ - sysconfdir = @sysconfdir@ - sharedstatedir = @sharedstatedir@ - localstatedir = @localstatedir@ - libdir = @libdir@ - infodir = @infodir@ - mandir = @mandir@ - includedir = @includedir@ - oldincludedir = /usr/include - - DESTDIR = - pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ - top_builddir = .. ! ACLOCAL = @ACLOCAL@ ! AUTOCONF = @AUTOCONF@ ! AUTOMAKE = @AUTOMAKE@ ! AUTOHEADER = @AUTOHEADER@ ! INSTALL = @INSTALL@ ! INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) ! INSTALL_DATA = @INSTALL_DATA@ ! INSTALL_SCRIPT = @INSTALL_SCRIPT@ ! transform = @program_transform_name@ ! NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : - host_alias = @host_alias@ host_triplet = @host@ ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ ! AS = @AS@ AWK = @AWK@ BONOBO_ACTIVATION_REQUIRED = @BONOBO_ACTIVATION_REQUIRED@ BONOBO_IDLDIR = @BONOBO_IDLDIR@ BONOBO_REQUIRED = @BONOBO_REQUIRED@ BZ2_LIBS = @BZ2_LIBS@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ CFLAGS = @CFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ ! CXX = @CXX@ DATADIRNAME = @DATADIRNAME@ DB2HTML = @DB2HTML@ ! DLLTOOL = @DLLTOOL@ ECHO = @ECHO@ ENABLE_PROFILER = @ENABLE_PROFILER@ EXEEXT = @EXEEXT@ FAM_LIBS = @FAM_LIBS@ GCONFTOOL = @GCONFTOOL@ GCONF_REQUIRED = @GCONF_REQUIRED@ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ --- 12,85 ---- # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. ! @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = .. ! am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ ! install_sh_DATA = $(install_sh) -c -m 644 ! install_sh_PROGRAM = $(install_sh) -c ! install_sh_SCRIPT = $(install_sh) -c ! INSTALL_HEADER = $(INSTALL_DATA) ! transform = $(program_transform_name) NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : host_triplet = @host@ + ACLOCAL = @ACLOCAL@ ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ ! ALLOCA = @ALLOCA@ ! AMDEP_FALSE = @AMDEP_FALSE@ ! AMDEP_TRUE = @AMDEP_TRUE@ ! AMTAR = @AMTAR@ ! AUTOCONF = @AUTOCONF@ ! AUTOHEADER = @AUTOHEADER@ ! AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BONOBO_ACTIVATION_REQUIRED = @BONOBO_ACTIVATION_REQUIRED@ BONOBO_IDLDIR = @BONOBO_IDLDIR@ BONOBO_REQUIRED = @BONOBO_REQUIRED@ + BUILD_CDEMENU_MODULE_FALSE = @BUILD_CDEMENU_MODULE_FALSE@ + BUILD_CDEMENU_MODULE_TRUE = @BUILD_CDEMENU_MODULE_TRUE@ BZ2_LIBS = @BZ2_LIBS@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ + CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ ! CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ DB2HTML = @DB2HTML@ ! DEFS = @DEFS@ ! DEPDIR = @DEPDIR@ ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ + ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ + ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ENABLE_PROFILER = @ENABLE_PROFILER@ + ENABLE_PROFILER_FALSE = @ENABLE_PROFILER_FALSE@ + ENABLE_PROFILER_TRUE = @ENABLE_PROFILER_TRUE@ EXEEXT = @EXEEXT@ FAM_LIBS = @FAM_LIBS@ GCONFTOOL = @GCONFTOOL@ GCONF_REQUIRED = @GCONF_REQUIRED@ + GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ + GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ *************** *** 90,99 **** --- 88,114 ---- GMSGFMT = @GMSGFMT@ GNOME_ACLOCAL_DIR = @GNOME_ACLOCAL_DIR@ GNOME_ACLOCAL_FLAGS = @GNOME_ACLOCAL_FLAGS@ + GNOME_INTERFACE_VERSION = @GNOME_INTERFACE_VERSION@ GNOME_VFS_DIR = @GNOME_VFS_DIR@ GTKDOC = @GTKDOC@ + HAVE_CDDA_FALSE = @HAVE_CDDA_FALSE@ + HAVE_CDDA_TRUE = @HAVE_CDDA_TRUE@ + HAVE_DOCBOOK_FALSE = @HAVE_DOCBOOK_FALSE@ + HAVE_DOCBOOK_TRUE = @HAVE_DOCBOOK_TRUE@ HAVE_GTK_DOC = @HAVE_GTK_DOC@ + HAVE_GTK_DOC_FALSE = @HAVE_GTK_DOC_FALSE@ + HAVE_GTK_DOC_TRUE = @HAVE_GTK_DOC_TRUE@ + HAVE_LIBEFS_FALSE = @HAVE_LIBEFS_FALSE@ + HAVE_LIBEFS_TRUE = @HAVE_LIBEFS_TRUE@ + HAVE_SSL_FALSE = @HAVE_SSL_FALSE@ + HAVE_SSL_TRUE = @HAVE_SSL_TRUE@ HTML_DIR = @HTML_DIR@ + INSIDE_GNOME_DOCU_FALSE = @INSIDE_GNOME_DOCU_FALSE@ + INSIDE_GNOME_DOCU_TRUE = @INSIDE_GNOME_DOCU_TRUE@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ + INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLLIBS = @INTLLIBS@ INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@ *************** *** 127,135 **** --- 142,154 ---- LIBGNUTLS_CONFIG = @LIBGNUTLS_CONFIG@ LIBGNUTLS_LIBS = @LIBGNUTLS_LIBS@ LIBIDL_REQUIRED = @LIBIDL_REQUIRED@ + LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ + MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ + MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MKINSTALLDIRS = @MKINSTALLDIRS@ MODULES_CFLAGS = @MODULES_CFLAGS@ *************** *** 144,161 **** MODULES_XML_LIBS = @MODULES_XML_LIBS@ MONIKERS_CFLAGS = @MONIKERS_CFLAGS@ MONIKERS_LIBS = @MONIKERS_LIBS@ ! OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ ORBIT_IDL = @ORBIT_IDL@ ORBIT_REQUIRED = @ORBIT_REQUIRED@ PACKAGE = @PACKAGE@ PKG_CONFIG = @PKG_CONFIG@ POFILES = @POFILES@ POPT_LIBS = @POPT_LIBS@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ RANLIB = @RANLIB@ STRIP = @STRIP@ TEST_CFLAGS = @TEST_CFLAGS@ TEST_LIBS = @TEST_LIBS@ --- 163,192 ---- MODULES_XML_LIBS = @MODULES_XML_LIBS@ MONIKERS_CFLAGS = @MONIKERS_CFLAGS@ MONIKERS_LIBS = @MONIKERS_LIBS@ ! MSGFMT = @MSGFMT@ OBJEXT = @OBJEXT@ + OPENSSL_CFLAGS = @OPENSSL_CFLAGS@ + OPENSSL_LIBS = @OPENSSL_LIBS@ ORBIT_IDL = @ORBIT_IDL@ ORBIT_REQUIRED = @ORBIT_REQUIRED@ PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ + PLATFORM_GNOME_2_FALSE = @PLATFORM_GNOME_2_FALSE@ + PLATFORM_GNOME_2_TRUE = @PLATFORM_GNOME_2_TRUE@ POFILES = @POFILES@ POPT_LIBS = @POPT_LIBS@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ RANLIB = @RANLIB@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ STRIP = @STRIP@ TEST_CFLAGS = @TEST_CFLAGS@ TEST_LIBS = @TEST_LIBS@ *************** *** 173,181 **** VFS_SIZE_IS = @VFS_SIZE_IS@ VFS_SIZE_PRINTF = @VFS_SIZE_PRINTF@ WARN_CFLAGS = @WARN_CFLAGS@ ! WARN_CXXFLAGS = @WARN_CXXFLAGS@ XML_REQUIRED = @XML_REQUIRED@ ! NULL = # The name of the module. --- 204,245 ---- VFS_SIZE_IS = @VFS_SIZE_IS@ VFS_SIZE_PRINTF = @VFS_SIZE_PRINTF@ WARN_CFLAGS = @WARN_CFLAGS@ ! XGETTEXT = @XGETTEXT@ XML_REQUIRED = @XML_REQUIRED@ ! ac_ct_CC = @ac_ct_CC@ ! ac_ct_RANLIB = @ac_ct_RANLIB@ ! ac_ct_STRIP = @ac_ct_STRIP@ ! am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ ! am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ ! am__include = @am__include@ ! am__quote = @am__quote@ ! bindir = @bindir@ ! build = @build@ ! build_alias = @build_alias@ ! build_cpu = @build_cpu@ ! build_os = @build_os@ ! build_vendor = @build_vendor@ ! datadir = @datadir@ ! exec_prefix = @exec_prefix@ ! host = @host@ ! host_alias = @host_alias@ ! host_cpu = @host_cpu@ ! host_os = @host_os@ ! host_vendor = @host_vendor@ ! includedir = @includedir@ ! infodir = @infodir@ ! install_sh = @install_sh@ ! libdir = @libdir@ ! libexecdir = @libexecdir@ ! localstatedir = @localstatedir@ ! mandir = @mandir@ ! oldincludedir = @oldincludedir@ ! prefix = @prefix@ ! program_transform_name = @program_transform_name@ ! sbindir = @sbindir@ ! sharedstatedir = @sharedstatedir@ ! sysconfdir = @sysconfdir@ ! target_alias = @target_alias@ NULL = # The name of the module. *************** *** 248,253 **** --- 312,318 ---- # Commands for compiling and linking GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) + # mkdir $(distdir)/TEXT; \ # for f in $(srcdir)/TEXT/* ; do \ # test -f $$f && cp -p $$f $(distdir)/TEXT; \ *************** *** 258,264 **** #################################### # ... except for TARGET_DIR, which we override - TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE) EXTRA_DIST = \ --- 323,328 ---- *************** *** 280,385 **** $(DOC_MODULE).hierarchy \ $(DOC_MODULE).signals mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ! CONFIG_HEADER = ../config.h ! CONFIG_CLEAN_FILES = ! DIST_COMMON = Makefile.am Makefile.in ! - DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) - - TAR = gtar - GZIP_ENV = --best - all: all-redirect .SUFFIXES: ! $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) ! cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps doc/Makefile ! Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ! cd $(top_builddir) \ ! && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status tags: TAGS TAGS: ! distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) ! subdir = doc distdir: $(DISTFILES) ! @for file in $(DISTFILES); do \ ! d=$(srcdir); \ if test -d $$d/$$file; then \ ! cp -pr $$d/$$file $(distdir)/$$file; \ else \ test -f $(distdir)/$$file \ ! || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ ! || cp -p $$d/$$file $(distdir)/$$file || :; \ fi; \ done ! $(MAKE) $(AM_MAKEFLAGS) top_distdir="$(top_distdir)" distdir="$(distdir)" dist-hook ! info-am: ! info: info-am ! dvi-am: ! dvi: dvi-am check-am: all-am check: check-am ! installcheck-am: ! installcheck: installcheck-am ! install-exec-am: ! install-exec: install-exec-am ! install-data-am: install-data-local ! install-data: install-data-am - install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am install: install-am ! uninstall-am: uninstall: uninstall-am - all-am: Makefile all-local - all-redirect: all-am - install-strip: - $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install - installdirs: mostlyclean-generic: clean-generic: distclean-generic: -rm -f Makefile $(CONFIG_CLEAN_FILES) - -rm -f config.cache config.log stamp-h stamp-h[0-9]* maintainer-clean-generic: ! mostlyclean-am: mostlyclean-generic ! mostlyclean: mostlyclean-am ! clean-am: clean-generic mostlyclean-am clean-local ! clean: clean-am ! distclean-am: distclean-generic clean-am ! -rm -f libtool ! distclean: distclean-am ! maintainer-clean-am: maintainer-clean-generic distclean-am \ ! maintainer-clean-local ! @echo "This command is intended for maintainers to use;" ! @echo "it deletes files that may require special tools to rebuild." maintainer-clean: maintainer-clean-am ! .PHONY: tags distdir info-am info dvi-am dvi check check-am \ ! installcheck-am installcheck install-exec-am install-exec \ ! install-data-local install-data-am install-data install-am install \ ! uninstall-am uninstall all-local all-redirect all-am all installdirs \ ! mostlyclean-generic distclean-generic clean-generic \ ! maintainer-clean-generic clean mostlyclean distclean maintainer-clean $(NULL) --- 344,501 ---- $(DOC_MODULE).hierarchy \ $(DOC_MODULE).signals + subdir = doc mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ! CONFIG_HEADER = $(top_builddir)/config.h ! CONFIG_CLEAN_FILES = ! depcomp = ! am__depfiles_maybe = ! DIST_SOURCES = ! DIST_COMMON = Makefile.am Makefile.in ! all: all-am .SUFFIXES: ! $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) ! cd $(top_srcdir) && \ ! $(AUTOMAKE) --gnu --ignore-deps doc/Makefile ! Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status ! cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) ! ! mostlyclean-libtool: ! -rm -f *.lo ! clean-libtool: ! -rm -rf .libs _libs + distclean-libtool: + -rm -f libtool + uninstall-info-am: tags: TAGS TAGS: + ctags: CTAGS + CTAGS: ! DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ! top_distdir = .. ! distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) ! @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ ! topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ ! list='$(DISTFILES)'; for file in $$list; do \ ! case $$file in \ ! $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ ! $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ ! esac; \ ! if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ ! dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ ! if test "$$dir" != "$$file" && test "$$dir" != "."; then \ ! dir="/$$dir"; \ ! $(mkinstalldirs) "$(distdir)$$dir"; \ ! else \ ! dir=''; \ ! fi; \ if test -d $$d/$$file; then \ ! if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ ! cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ ! fi; \ ! cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ else \ test -f $(distdir)/$$file \ ! || cp -p $$d/$$file $(distdir)/$$file \ ! || exit 1; \ fi; \ done ! $(MAKE) $(AM_MAKEFLAGS) \ ! top_distdir="$(top_distdir)" distdir="$(distdir)" \ ! dist-hook check-am: all-am check: check-am ! all-am: Makefile all-local ! installdirs: install: install-am ! install-exec: install-exec-am ! install-data: install-data-am uninstall: uninstall-am + install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + installcheck: installcheck-am + install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: clean-generic: distclean-generic: -rm -f Makefile $(CONFIG_CLEAN_FILES) maintainer-clean-generic: ! @echo "This command is intended for maintainers to use" ! @echo "it deletes files that may require special tools to rebuild." ! clean: clean-am ! clean-am: clean-generic clean-libtool clean-local mostlyclean-am ! distclean: distclean-am ! distclean-am: clean-am distclean-generic distclean-libtool ! dvi: dvi-am ! dvi-am: ! info: info-am ! ! info-am: ! ! install-data-am: install-data-local ! ! install-exec-am: ! ! install-info: install-info-am ! ! install-man: ! ! installcheck-am: maintainer-clean: maintainer-clean-am ! maintainer-clean-am: distclean-am maintainer-clean-generic \ ! maintainer-clean-local ! ! mostlyclean: mostlyclean-am ! ! mostlyclean-am: mostlyclean-generic mostlyclean-libtool ! ! pdf: pdf-am ! ! pdf-am: ! ! ps: ps-am ! ! ps-am: ! ! uninstall-am: uninstall-info-am ! ! .PHONY: all all-am all-local check check-am clean clean-generic \ ! clean-libtool clean-local distclean distclean-generic \ ! distclean-libtool distdir dvi dvi-am info info-am install \ ! install-am install-data install-data-am install-data-local \ ! install-exec install-exec-am install-info install-info-am \ ! install-man install-strip installcheck installcheck-am \ ! installdirs maintainer-clean maintainer-clean-generic \ ! maintainer-clean-local mostlyclean mostlyclean-generic \ ! mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ ! uninstall-info-am $(NULL) *************** *** 483,489 **** done .PHONY : dist-hook-local - # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: --- 599,604 ---- diff -crN ./gnome-vfs/doc/xml/gnome-vfs-application-registry.xml /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/doc/xml/gnome-vfs-application-registry.xml *** ./gnome-vfs/doc/xml/gnome-vfs-application-registry.xml Mon Sep 8 14:19:48 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/doc/xml/gnome-vfs-application-registry.xml Thu Dec 18 21:22:57 2003 *************** *** 21,78 **** #define GNOME_VFS_APPLICATION_REGISTRY_CAN_OPEN_MULTIPLE_FILES #define GNOME_VFS_APPLICATION_REGISTRY_REQUIRES_TERMINAL gboolean gnome_vfs_application_registry_exists ! (const char *app_id); GList* gnome_vfs_application_registry_get_keys ! (const char *app_id); ! const char* gnome_vfs_application_registry_peek_value ! (const char *app_id, ! const char *key); gboolean gnome_vfs_application_registry_get_bool_value ! (const char *app_id, ! const char *key, gboolean *got_key); ! void gnome_vfs_application_registry_remove_application ! (const char *app_id); ! void gnome_vfs_application_registry_set_value ! (const char *app_id, ! const char *key, ! const char *value); ! void gnome_vfs_application_registry_set_bool_value ! (const char *app_id, ! const char *key, gboolean value); ! void gnome_vfs_application_registry_unset_key ! (const char *app_id, ! const char *key); GList* gnome_vfs_application_registry_get_applications ! (const char *mime_type); GList* gnome_vfs_application_registry_get_mime_types ! (const char *app_id); gboolean gnome_vfs_application_registry_supports_mime_type ! (const char *app_id, ! const char *mime_type); gboolean gnome_vfs_application_registry_supports_uri_scheme ! (const char *app_id, ! const char *uri_scheme); gboolean gnome_vfs_application_is_user_owned_application (const GnomeVFSMimeApplication *application); ! void gnome_vfs_application_registry_clear_mime_types ! (const char *app_id); ! void gnome_vfs_application_registry_add_mime_type ! (const char *app_id, ! const char *mime_type); ! void gnome_vfs_application_registry_remove_mime_type ! (const char *app_id, ! const char *mime_type); GnomeVFSResult gnome_vfs_application_registry_sync (void); ! void gnome_vfs_application_registry_shutdown (void); ! void gnome_vfs_application_registry_reload (void); GnomeVFSMimeApplication* gnome_vfs_application_registry_get_mime_application ! (const char *app_id); ! void gnome_vfs_application_registry_save_mime_application (const GnomeVFSMimeApplication *application); --- 21,78 ---- #define GNOME_VFS_APPLICATION_REGISTRY_CAN_OPEN_MULTIPLE_FILES #define GNOME_VFS_APPLICATION_REGISTRY_REQUIRES_TERMINAL gboolean gnome_vfs_application_registry_exists ! (const char *app_id); GList* gnome_vfs_application_registry_get_keys ! (const char *app_id); ! const char* gnome_vfs_application_registry_peek_value ! (const char *app_id, ! const char *key); gboolean gnome_vfs_application_registry_get_bool_value ! (const char *app_id, ! const char *key, gboolean *got_key); ! void gnome_vfs_application_registry_remove_application ! (const char *app_id); ! void gnome_vfs_application_registry_set_value ! (const char *app_id, ! const char *key, ! const char *value); ! void gnome_vfs_application_registry_set_bool_value ! (const char *app_id, ! const char *key, gboolean value); ! void gnome_vfs_application_registry_unset_key ! (const char *app_id, ! const char *key); GList* gnome_vfs_application_registry_get_applications ! (const char *mime_type); GList* gnome_vfs_application_registry_get_mime_types ! (const char *app_id); gboolean gnome_vfs_application_registry_supports_mime_type ! (const char *app_id, ! const char *mime_type); gboolean gnome_vfs_application_registry_supports_uri_scheme ! (const char *app_id, ! const char *uri_scheme); gboolean gnome_vfs_application_is_user_owned_application (const GnomeVFSMimeApplication *application); ! void gnome_vfs_application_registry_clear_mime_types ! (const char *app_id); ! void gnome_vfs_application_registry_add_mime_type ! (const char *app_id, ! const char *mime_type); ! void gnome_vfs_application_registry_remove_mime_type ! (const char *app_id, ! const char *mime_type); GnomeVFSResult gnome_vfs_application_registry_sync (void); ! void gnome_vfs_application_registry_shutdown (void); ! void gnome_vfs_application_registry_reload (void); GnomeVFSMimeApplication* gnome_vfs_application_registry_get_mime_application ! (const char *app_id); ! void gnome_vfs_application_registry_save_mime_application (const GnomeVFSMimeApplication *application); *************** *** 83,90 **** - - Description --- 83,88 ---- *************** *** 96,102 **** Details <anchor id="GNOME-VFS-APPLICATION-REGISTRY-COMMAND-CAPS"/>GNOME_VFS_APPLICATION_REGISTRY_COMMAND ! GNOME_VFS_APPLICATION_REGISTRY_COMMAND#define GNOME_VFS_APPLICATION_REGISTRY_COMMAND "command" Application registry key for fetching the command to execute --- 94,100 ---- Details <anchor id="GNOME-VFS-APPLICATION-REGISTRY-COMMAND-CAPS"/>GNOME_VFS_APPLICATION_REGISTRY_COMMAND ! #define GNOME_VFS_APPLICATION_REGISTRY_COMMAND "command" Application registry key for fetching the command to execute *************** *** 106,112 **** <anchor id="GNOME-VFS-APPLICATION-REGISTRY-NAME-CAPS"/>GNOME_VFS_APPLICATION_REGISTRY_NAME ! GNOME_VFS_APPLICATION_REGISTRY_NAME#define GNOME_VFS_APPLICATION_REGISTRY_NAME "name" Application registry key for fetching the name of an application. --- 104,110 ---- <anchor id="GNOME-VFS-APPLICATION-REGISTRY-NAME-CAPS"/>GNOME_VFS_APPLICATION_REGISTRY_NAME ! #define GNOME_VFS_APPLICATION_REGISTRY_NAME "name" Application registry key for fetching the name of an application. *************** *** 115,121 **** <anchor id="GNOME-VFS-APPLICATION-REGISTRY-CAN-OPEN-MULTIPLE-FILES-CAPS"/>GNOME_VFS_APPLICATION_REGISTRY_CAN_OPEN_MULTIPLE_FILES ! GNOME_VFS_APPLICATION_REGISTRY_CAN_OPEN_MULTIPLE_FILES#define GNOME_VFS_APPLICATION_REGISTRY_CAN_OPEN_MULTIPLE_FILES "can_open_multiple_files" Application registry key for determining if an application --- 113,119 ---- <anchor id="GNOME-VFS-APPLICATION-REGISTRY-CAN-OPEN-MULTIPLE-FILES-CAPS"/>GNOME_VFS_APPLICATION_REGISTRY_CAN_OPEN_MULTIPLE_FILES ! #define GNOME_VFS_APPLICATION_REGISTRY_CAN_OPEN_MULTIPLE_FILES "can_open_multiple_files" Application registry key for determining if an application *************** *** 125,131 **** <anchor id="GNOME-VFS-APPLICATION-REGISTRY-REQUIRES-TERMINAL-CAPS"/>GNOME_VFS_APPLICATION_REGISTRY_REQUIRES_TERMINAL ! GNOME_VFS_APPLICATION_REGISTRY_REQUIRES_TERMINAL#define GNOME_VFS_APPLICATION_REGISTRY_REQUIRES_TERMINAL "requires_terminal" Application registry key for determining if an application --- 123,129 ---- <anchor id="GNOME-VFS-APPLICATION-REGISTRY-REQUIRES-TERMINAL-CAPS"/>GNOME_VFS_APPLICATION_REGISTRY_REQUIRES_TERMINAL ! #define GNOME_VFS_APPLICATION_REGISTRY_REQUIRES_TERMINAL "requires_terminal" Application registry key for determining if an application *************** *** 135,142 **** <anchor id="gnome-vfs-application-registry-exists"/>gnome_vfs_application_registry_exists () ! gnome_vfs_application_registry_existsgboolean gnome_vfs_application_registry_exists ! (const char *app_id); This function will return TRUE if there is an entry for app_id in the registry, otherwise FALSE. --- 133,140 ---- <anchor id="gnome-vfs-application-registry-exists"/>gnome_vfs_application_registry_exists () ! gboolean gnome_vfs_application_registry_exists ! (const char *app_id); This function will return TRUE if there is an entry for app_id in the registry, otherwise FALSE. *************** *** 152,159 **** <anchor id="gnome-vfs-application-registry-get-keys"/>gnome_vfs_application_registry_get_keys () ! gnome_vfs_application_registry_get_keysGList* gnome_vfs_application_registry_get_keys ! (const char *app_id); This function wil return a list of strings which is the list of keys set for app_id in the application registry. --- 150,157 ---- <anchor id="gnome-vfs-application-registry-get-keys"/>gnome_vfs_application_registry_get_keys () ! GList* gnome_vfs_application_registry_get_keys ! (const char *app_id); This function wil return a list of strings which is the list of keys set for app_id in the application registry. *************** *** 169,177 **** <anchor id="gnome-vfs-application-registry-peek-value"/>gnome_vfs_application_registry_peek_value () ! gnome_vfs_application_registry_peek_valueconst char* gnome_vfs_application_registry_peek_value ! (const char *app_id, ! const char *key); This will return the value associated with key for app_id in the application registry. There is no need to free the return value. --- 167,175 ---- <anchor id="gnome-vfs-application-registry-peek-value"/>gnome_vfs_application_registry_peek_value () ! const char* gnome_vfs_application_registry_peek_value ! (const char *app_id, ! const char *key); This will return the value associated with key for app_id in the application registry. There is no need to free the return value. *************** *** 191,199 **** <anchor id="gnome-vfs-application-registry-get-bool-value"/>gnome_vfs_application_registry_get_bool_value () ! gnome_vfs_application_registry_get_bool_valuegboolean gnome_vfs_application_registry_get_bool_value ! (const char *app_id, ! const char *key, gboolean *got_key); This will look up a key in the structure pointed to by app_id and return the --- 189,197 ---- <anchor id="gnome-vfs-application-registry-get-bool-value"/>gnome_vfs_application_registry_get_bool_value () ! gboolean gnome_vfs_application_registry_get_bool_value ! (const char *app_id, ! const char *key, gboolean *got_key); This will look up a key in the structure pointed to by app_id and return the *************** *** 217,224 **** <anchor id="gnome-vfs-application-registry-remove-application"/>gnome_vfs_application_registry_remove_application () ! gnome_vfs_application_registry_remove_applicationvoid gnome_vfs_application_registry_remove_application ! (const char *app_id); Given the registry id this function will remove all applications that has been set by the user. You will need to call --- 215,222 ---- <anchor id="gnome-vfs-application-registry-remove-application"/>gnome_vfs_application_registry_remove_application () ! void gnome_vfs_application_registry_remove_application ! (const char *app_id); Given the registry id this function will remove all applications that has been set by the user. You will need to call *************** *** 232,241 **** <anchor id="gnome-vfs-application-registry-set-value"/>gnome_vfs_application_registry_set_value () ! gnome_vfs_application_registry_set_valuevoid gnome_vfs_application_registry_set_value ! (const char *app_id, ! const char *key, ! const char *value); This function will set values pertaining to registry entry pointed to by app_id. You will need to call gnome_vfs_application_registry_sync to --- 230,239 ---- <anchor id="gnome-vfs-application-registry-set-value"/>gnome_vfs_application_registry_set_value () ! void gnome_vfs_application_registry_set_value ! (const char *app_id, ! const char *key, ! const char *value); This function will set values pertaining to registry entry pointed to by app_id. You will need to call gnome_vfs_application_registry_sync to *************** *** 255,263 **** <anchor id="gnome-vfs-application-registry-set-bool-value"/>gnome_vfs_application_registry_set_bool_value () ! gnome_vfs_application_registry_set_bool_valuevoid gnome_vfs_application_registry_set_bool_value ! (const char *app_id, ! const char *key, gboolean value); This function will modify those registry values that are of type boolean to --- 253,261 ---- <anchor id="gnome-vfs-application-registry-set-bool-value"/>gnome_vfs_application_registry_set_bool_value () ! void gnome_vfs_application_registry_set_bool_value ! (const char *app_id, ! const char *key, gboolean value); This function will modify those registry values that are of type boolean to *************** *** 278,286 **** <anchor id="gnome-vfs-application-registry-unset-key"/>gnome_vfs_application_registry_unset_key () ! gnome_vfs_application_registry_unset_keyvoid gnome_vfs_application_registry_unset_key ! (const char *app_id, ! const char *key); This function given the application and the target will wipe the current value that the key contains. --- 276,284 ---- <anchor id="gnome-vfs-application-registry-unset-key"/>gnome_vfs_application_registry_unset_key () ! void gnome_vfs_application_registry_unset_key ! (const char *app_id, ! const char *key); This function given the application and the target will wipe the current value that the key contains. *************** *** 296,303 **** <anchor id="gnome-vfs-application-registry-get-applications"/>gnome_vfs_application_registry_get_applications () ! gnome_vfs_application_registry_get_applicationsGList* gnome_vfs_application_registry_get_applications ! (const char *mime_type); This will return all applications from the registry that are associated with the given mime type string, if NULL it returns all applications. --- 294,301 ---- <anchor id="gnome-vfs-application-registry-get-applications"/>gnome_vfs_application_registry_get_applications () ! GList* gnome_vfs_application_registry_get_applications ! (const char *mime_type); This will return all applications from the registry that are associated with the given mime type string, if NULL it returns all applications. *************** *** 314,321 **** <anchor id="gnome-vfs-application-registry-get-mime-types"/>gnome_vfs_application_registry_get_mime_types () ! gnome_vfs_application_registry_get_mime_typesGList* gnome_vfs_application_registry_get_mime_types ! (const char *app_id); This function returns a list of strings that represent the mime types that can be handled by an application. --- 312,319 ---- <anchor id="gnome-vfs-application-registry-get-mime-types"/>gnome_vfs_application_registry_get_mime_types () ! GList* gnome_vfs_application_registry_get_mime_types ! (const char *app_id); This function returns a list of strings that represent the mime types that can be handled by an application. *************** *** 331,339 **** <anchor id="gnome-vfs-application-registry-supports-mime-type"/>gnome_vfs_application_registry_supports_mime_type () ! gnome_vfs_application_registry_supports_mime_typegboolean gnome_vfs_application_registry_supports_mime_type ! (const char *app_id, ! const char *mime_type); Use this function to see if there is an application associated with a given mime type. The function will return true or false. --- 329,337 ---- <anchor id="gnome-vfs-application-registry-supports-mime-type"/>gnome_vfs_application_registry_supports_mime_type () ! gboolean gnome_vfs_application_registry_supports_mime_type ! (const char *app_id, ! const char *mime_type); Use this function to see if there is an application associated with a given mime type. The function will return true or false. *************** *** 352,360 **** <anchor id="gnome-vfs-application-registry-supports-uri-scheme"/>gnome_vfs_application_registry_supports_uri_scheme () ! gnome_vfs_application_registry_supports_uri_schemegboolean gnome_vfs_application_registry_supports_uri_scheme ! (const char *app_id, ! const char *uri_scheme); Given the id of the application this function will determine if the uri scheme will given is supported. --- 350,358 ---- <anchor id="gnome-vfs-application-registry-supports-uri-scheme"/>gnome_vfs_application_registry_supports_uri_scheme () ! gboolean gnome_vfs_application_registry_supports_uri_scheme ! (const char *app_id, ! const char *uri_scheme); Given the id of the application this function will determine if the uri scheme will given is supported. *************** *** 373,379 **** <anchor id="gnome-vfs-application-is-user-owned-application"/>gnome_vfs_application_is_user_owned_application () ! gnome_vfs_application_is_user_owned_applicationgboolean gnome_vfs_application_is_user_owned_application (const GnomeVFSMimeApplication *application); This function will determine if a mime application is user owned or not. By --- 371,377 ---- <anchor id="gnome-vfs-application-is-user-owned-application"/>gnome_vfs_application_is_user_owned_application () ! gboolean gnome_vfs_application_is_user_owned_application (const GnomeVFSMimeApplication *application); This function will determine if a mime application is user owned or not. By *************** *** 390,397 **** <anchor id="gnome-vfs-application-registry-clear-mime-types"/>gnome_vfs_application_registry_clear_mime_types () ! gnome_vfs_application_registry_clear_mime_typesvoid gnome_vfs_application_registry_clear_mime_types ! (const char *app_id); This function will remove the mime types associated with the application. Changes are not realized until the gnome_vfs_application_registry_sync --- 388,395 ---- <anchor id="gnome-vfs-application-registry-clear-mime-types"/>gnome_vfs_application_registry_clear_mime_types () ! void gnome_vfs_application_registry_clear_mime_types ! (const char *app_id); This function will remove the mime types associated with the application. Changes are not realized until the gnome_vfs_application_registry_sync *************** *** 405,413 **** <anchor id="gnome-vfs-application-registry-add-mime-type"/>gnome_vfs_application_registry_add_mime_type () ! gnome_vfs_application_registry_add_mime_typevoid gnome_vfs_application_registry_add_mime_type ! (const char *app_id, ! const char *mime_type); This function will associate a mime type with an application given the application registry id and the mime type. Changes are not realized until --- 403,411 ---- <anchor id="gnome-vfs-application-registry-add-mime-type"/>gnome_vfs_application_registry_add_mime_type () ! void gnome_vfs_application_registry_add_mime_type ! (const char *app_id, ! const char *mime_type); This function will associate a mime type with an application given the application registry id and the mime type. Changes are not realized until *************** *** 425,433 **** <anchor id="gnome-vfs-application-registry-remove-mime-type"/>gnome_vfs_application_registry_remove_mime_type () ! gnome_vfs_application_registry_remove_mime_typevoid gnome_vfs_application_registry_remove_mime_type ! (const char *app_id, ! const char *mime_type); This function will de-associate a mime type from an application registry. Given the application registry id and the mime type. Changes are not --- 423,431 ---- <anchor id="gnome-vfs-application-registry-remove-mime-type"/>gnome_vfs_application_registry_remove_mime_type () ! void gnome_vfs_application_registry_remove_mime_type ! (const char *app_id, ! const char *mime_type); This function will de-associate a mime type from an application registry. Given the application registry id and the mime type. Changes are not *************** *** 445,451 **** <anchor id="gnome-vfs-application-registry-sync"/>gnome_vfs_application_registry_sync () ! gnome_vfs_application_registry_syncGnomeVFSResult gnome_vfs_application_registry_sync (void); This function will sync the registry. Typically you would use this function --- 443,449 ---- <anchor id="gnome-vfs-application-registry-sync"/>gnome_vfs_application_registry_sync () ! GnomeVFSResult gnome_vfs_application_registry_sync (void); This function will sync the registry. Typically you would use this function *************** *** 464,470 **** <anchor id="gnome-vfs-application-registry-shutdown"/>gnome_vfs_application_registry_shutdown () ! gnome_vfs_application_registry_shutdownvoid gnome_vfs_application_registry_shutdown (void); Synchronize gnome-vfs application registry data to disk, and free --- 462,468 ---- <anchor id="gnome-vfs-application-registry-shutdown"/>gnome_vfs_application_registry_shutdown () ! void gnome_vfs_application_registry_shutdown (void); Synchronize gnome-vfs application registry data to disk, and free *************** *** 474,480 **** <anchor id="gnome-vfs-application-registry-reload"/>gnome_vfs_application_registry_reload () ! gnome_vfs_application_registry_reloadvoid gnome_vfs_application_registry_reload (void); If this function is called for the first time it will initialize the --- 472,478 ---- <anchor id="gnome-vfs-application-registry-reload"/>gnome_vfs_application_registry_reload () ! void gnome_vfs_application_registry_reload (void); If this function is called for the first time it will initialize the *************** *** 487,494 **** <anchor id="gnome-vfs-application-registry-get-mime-application"/>gnome_vfs_application_registry_get_mime_application () ! gnome_vfs_application_registry_get_mime_applicationGnomeVFSMimeApplication* gnome_vfs_application_registry_get_mime_application ! (const char *app_id); Returns a structure that contains the application that handles the mime type associated by the application referred by app_id. --- 485,492 ---- <anchor id="gnome-vfs-application-registry-get-mime-application"/>gnome_vfs_application_registry_get_mime_application () ! GnomeVFSMimeApplication* gnome_vfs_application_registry_get_mime_application ! (const char *app_id); Returns a structure that contains the application that handles the mime type associated by the application referred by app_id. *************** *** 504,510 **** <anchor id="gnome-vfs-application-registry-save-mime-application"/>gnome_vfs_application_registry_save_mime_application () ! gnome_vfs_application_registry_save_mime_applicationvoid gnome_vfs_application_registry_save_mime_application (const GnomeVFSMimeApplication *application); This will save to the registry the application that will be associated with --- 502,508 ---- <anchor id="gnome-vfs-application-registry-save-mime-application"/>gnome_vfs_application_registry_save_mime_application () ! void gnome_vfs_application_registry_save_mime_application (const GnomeVFSMimeApplication *application); This will save to the registry the application that will be associated with diff -crN ./gnome-vfs/doc/xml/gnome-vfs-async-ops.xml /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/doc/xml/gnome-vfs-async-ops.xml *** ./gnome-vfs/doc/xml/gnome-vfs-async-ops.xml Mon Sep 8 14:19:48 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/doc/xml/gnome-vfs-async-ops.xml Thu Dec 18 21:22:58 2003 *************** *** 19,155 **** #define GNOME_VFS_PRIORITY_MIN #define GNOME_VFS_PRIORITY_MAX #define GNOME_VFS_PRIORITY_DEFAULT ! void (*GnomeVFSAsyncCallback) (GnomeVFSAsyncHandle *handle, GnomeVFSResult result, gpointer callback_data); typedef GnomeVFSAsyncOpenCallback; typedef GnomeVFSAsyncCreateCallback; typedef GnomeVFSAsyncCreateAsChannelCallback; typedef GnomeVFSAsyncCloseCallback; ! void (*GnomeVFSAsyncReadCallback) (GnomeVFSAsyncHandle *handle, GnomeVFSResult result, gpointer buffer, GnomeVFSFileSize bytes_requested, GnomeVFSFileSize bytes_read, gpointer callback_data); ! void (*GnomeVFSAsyncWriteCallback) (GnomeVFSAsyncHandle *handle, GnomeVFSResult result, gconstpointer buffer, GnomeVFSFileSize bytes_requested, GnomeVFSFileSize bytes_written, gpointer callback_data); typedef GnomeVFSFindDirectoryResult; ! void gnome_vfs_async_set_job_limit (int limit); ! int gnome_vfs_async_get_job_limit (void); ! void gnome_vfs_async_cancel (GnomeVFSAsyncHandle *handle); ! void gnome_vfs_async_open (GnomeVFSAsyncHandle **handle_return, const gchar *text_uri, GnomeVFSOpenMode open_mode, ! int priority, GnomeVFSAsyncOpenCallback callback, gpointer callback_data); ! void gnome_vfs_async_open_uri (GnomeVFSAsyncHandle **handle_return, GnomeVFSURI *uri, GnomeVFSOpenMode open_mode, ! int priority, GnomeVFSAsyncOpenCallback callback, gpointer callback_data); ! void gnome_vfs_async_open_as_channel (GnomeVFSAsyncHandle **handle_return, const gchar *text_uri, GnomeVFSOpenMode open_mode, guint advised_block_size, ! int priority, GnomeVFSAsyncOpenAsChannelCallback callback, gpointer callback_data); ! void gnome_vfs_async_open_uri_as_channel (GnomeVFSAsyncHandle **handle_return, GnomeVFSURI *uri, GnomeVFSOpenMode open_mode, guint advised_block_size, ! int priority, GnomeVFSAsyncOpenAsChannelCallback callback, gpointer callback_data); ! void gnome_vfs_async_create (GnomeVFSAsyncHandle **handle_return, const gchar *text_uri, GnomeVFSOpenMode open_mode, gboolean exclusive, guint perm, ! int priority, GnomeVFSAsyncOpenCallback callback, gpointer callback_data); ! void gnome_vfs_async_create_uri (GnomeVFSAsyncHandle **handle_return, GnomeVFSURI *uri, GnomeVFSOpenMode open_mode, gboolean exclusive, guint perm, ! int priority, GnomeVFSAsyncOpenCallback callback, gpointer callback_data); ! void gnome_vfs_async_create_symbolic_link (GnomeVFSAsyncHandle **handle_return, GnomeVFSURI *uri, const gchar *uri_reference, ! int priority, GnomeVFSAsyncOpenCallback callback, gpointer callback_data); ! void gnome_vfs_async_create_as_channel (GnomeVFSAsyncHandle **handle_return, const gchar *text_uri, GnomeVFSOpenMode open_mode, gboolean exclusive, guint perm, ! int priority, GnomeVFSAsyncCreateAsChannelCallback callback, gpointer callback_data); ! void gnome_vfs_async_create_uri_as_channel (GnomeVFSAsyncHandle **handle_return, GnomeVFSURI *uri, GnomeVFSOpenMode open_mode, gboolean exclusive, guint perm, ! int priority, GnomeVFSAsyncCreateAsChannelCallback callback, gpointer callback_data); ! void gnome_vfs_async_close (GnomeVFSAsyncHandle *handle, GnomeVFSAsyncCloseCallback callback, gpointer callback_data); ! void gnome_vfs_async_read (GnomeVFSAsyncHandle *handle, gpointer buffer, guint bytes, GnomeVFSAsyncReadCallback callback, gpointer callback_data); ! void gnome_vfs_async_write (GnomeVFSAsyncHandle *handle, gconstpointer buffer, guint bytes, GnomeVFSAsyncWriteCallback callback, gpointer callback_data); ! void gnome_vfs_async_get_file_info (GnomeVFSAsyncHandle **handle_return, GList *uri_list, GnomeVFSFileInfoOptions options, ! int priority, GnomeVFSAsyncGetFileInfoCallback callback, gpointer callback_data); ! void gnome_vfs_async_set_file_info (GnomeVFSAsyncHandle **handle_return, GnomeVFSURI *uri, GnomeVFSFileInfo *info, GnomeVFSSetFileInfoMask mask, GnomeVFSFileInfoOptions options, ! int priority, GnomeVFSAsyncSetFileInfoCallback callback, gpointer callback_data); ! void gnome_vfs_async_load_directory (GnomeVFSAsyncHandle **handle_return, const gchar *text_uri, GnomeVFSFileInfoOptions options, guint items_per_notification, ! int priority, GnomeVFSAsyncDirectoryLoadCallback callback, gpointer callback_data); ! void gnome_vfs_async_load_directory_uri (GnomeVFSAsyncHandle **handle_return, GnomeVFSURI *uri, GnomeVFSFileInfoOptions options, guint items_per_notification, ! int priority, GnomeVFSAsyncDirectoryLoadCallback callback, gpointer callback_data); GnomeVFSResult gnome_vfs_async_xfer (GnomeVFSAsyncHandle **handle_return, --- 19,155 ---- #define GNOME_VFS_PRIORITY_MIN #define GNOME_VFS_PRIORITY_MAX #define GNOME_VFS_PRIORITY_DEFAULT ! void (*GnomeVFSAsyncCallback) (GnomeVFSAsyncHandle *handle, GnomeVFSResult result, gpointer callback_data); typedef GnomeVFSAsyncOpenCallback; typedef GnomeVFSAsyncCreateCallback; typedef GnomeVFSAsyncCreateAsChannelCallback; typedef GnomeVFSAsyncCloseCallback; ! void (*GnomeVFSAsyncReadCallback) (GnomeVFSAsyncHandle *handle, GnomeVFSResult result, gpointer buffer, GnomeVFSFileSize bytes_requested, GnomeVFSFileSize bytes_read, gpointer callback_data); ! void (*GnomeVFSAsyncWriteCallback) (GnomeVFSAsyncHandle *handle, GnomeVFSResult result, gconstpointer buffer, GnomeVFSFileSize bytes_requested, GnomeVFSFileSize bytes_written, gpointer callback_data); typedef GnomeVFSFindDirectoryResult; ! void gnome_vfs_async_set_job_limit (int limit); ! int gnome_vfs_async_get_job_limit (void); ! void gnome_vfs_async_cancel (GnomeVFSAsyncHandle *handle); ! void gnome_vfs_async_open (GnomeVFSAsyncHandle **handle_return, const gchar *text_uri, GnomeVFSOpenMode open_mode, ! int priority, GnomeVFSAsyncOpenCallback callback, gpointer callback_data); ! void gnome_vfs_async_open_uri (GnomeVFSAsyncHandle **handle_return, GnomeVFSURI *uri, GnomeVFSOpenMode open_mode, ! int priority, GnomeVFSAsyncOpenCallback callback, gpointer callback_data); ! void gnome_vfs_async_open_as_channel (GnomeVFSAsyncHandle **handle_return, const gchar *text_uri, GnomeVFSOpenMode open_mode, guint advised_block_size, ! int priority, GnomeVFSAsyncOpenAsChannelCallback callback, gpointer callback_data); ! void gnome_vfs_async_open_uri_as_channel (GnomeVFSAsyncHandle **handle_return, GnomeVFSURI *uri, GnomeVFSOpenMode open_mode, guint advised_block_size, ! int priority, GnomeVFSAsyncOpenAsChannelCallback callback, gpointer callback_data); ! void gnome_vfs_async_create (GnomeVFSAsyncHandle **handle_return, const gchar *text_uri, GnomeVFSOpenMode open_mode, gboolean exclusive, guint perm, ! int priority, GnomeVFSAsyncOpenCallback callback, gpointer callback_data); ! void gnome_vfs_async_create_uri (GnomeVFSAsyncHandle **handle_return, GnomeVFSURI *uri, GnomeVFSOpenMode open_mode, gboolean exclusive, guint perm, ! int priority, GnomeVFSAsyncOpenCallback callback, gpointer callback_data); ! void gnome_vfs_async_create_symbolic_link (GnomeVFSAsyncHandle **handle_return, GnomeVFSURI *uri, const gchar *uri_reference, ! int priority, GnomeVFSAsyncOpenCallback callback, gpointer callback_data); ! void gnome_vfs_async_create_as_channel (GnomeVFSAsyncHandle **handle_return, const gchar *text_uri, GnomeVFSOpenMode open_mode, gboolean exclusive, guint perm, ! int priority, GnomeVFSAsyncCreateAsChannelCallback callback, gpointer callback_data); ! void gnome_vfs_async_create_uri_as_channel (GnomeVFSAsyncHandle **handle_return, GnomeVFSURI *uri, GnomeVFSOpenMode open_mode, gboolean exclusive, guint perm, ! int priority, GnomeVFSAsyncCreateAsChannelCallback callback, gpointer callback_data); ! void gnome_vfs_async_close (GnomeVFSAsyncHandle *handle, GnomeVFSAsyncCloseCallback callback, gpointer callback_data); ! void gnome_vfs_async_read (GnomeVFSAsyncHandle *handle, gpointer buffer, guint bytes, GnomeVFSAsyncReadCallback callback, gpointer callback_data); ! void gnome_vfs_async_write (GnomeVFSAsyncHandle *handle, gconstpointer buffer, guint bytes, GnomeVFSAsyncWriteCallback callback, gpointer callback_data); ! void gnome_vfs_async_get_file_info (GnomeVFSAsyncHandle **handle_return, GList *uri_list, GnomeVFSFileInfoOptions options, ! int priority, GnomeVFSAsyncGetFileInfoCallback callback, gpointer callback_data); ! void gnome_vfs_async_set_file_info (GnomeVFSAsyncHandle **handle_return, GnomeVFSURI *uri, GnomeVFSFileInfo *info, GnomeVFSSetFileInfoMask mask, GnomeVFSFileInfoOptions options, ! int priority, GnomeVFSAsyncSetFileInfoCallback callback, gpointer callback_data); ! void gnome_vfs_async_load_directory (GnomeVFSAsyncHandle **handle_return, const gchar *text_uri, GnomeVFSFileInfoOptions options, guint items_per_notification, ! int priority, GnomeVFSAsyncDirectoryLoadCallback callback, gpointer callback_data); ! void gnome_vfs_async_load_directory_uri (GnomeVFSAsyncHandle **handle_return, GnomeVFSURI *uri, GnomeVFSFileInfoOptions options, guint items_per_notification, ! int priority, GnomeVFSAsyncDirectoryLoadCallback callback, gpointer callback_data); GnomeVFSResult gnome_vfs_async_xfer (GnomeVFSAsyncHandle **handle_return, *************** *** 158,179 **** GnomeVFSXferOptions xfer_options, GnomeVFSXferErrorMode error_mode, GnomeVFSXferOverwriteMode overwrite_mode, ! int priority, GnomeVFSAsyncXferProgressCallback progress_update_callback, gpointer update_callback_data, GnomeVFSXferProgressCallback progress_sync_callback, gpointer sync_callback_data); ! void gnome_vfs_async_find_directory (GnomeVFSAsyncHandle **handle_return, GList *near_uri_list, GnomeVFSFindDirectoryKind kind, gboolean create_if_needed, gboolean find_if_needed, guint permissions, ! int priority, GnomeVFSAsyncFindDirectoryCallback callback, gpointer user_data); ! void gnome_vfs_async_file_control (GnomeVFSAsyncHandle *handle, ! const char *operation, gpointer operation_data, GDestroyNotify operation_data_destroy_func, GnomeVFSAsyncFileControlCallback callback, --- 158,179 ---- GnomeVFSXferOptions xfer_options, GnomeVFSXferErrorMode error_mode, GnomeVFSXferOverwriteMode overwrite_mode, ! int priority, GnomeVFSAsyncXferProgressCallback progress_update_callback, gpointer update_callback_data, GnomeVFSXferProgressCallback progress_sync_callback, gpointer sync_callback_data); ! void gnome_vfs_async_find_directory (GnomeVFSAsyncHandle **handle_return, GList *near_uri_list, GnomeVFSFindDirectoryKind kind, gboolean create_if_needed, gboolean find_if_needed, guint permissions, ! int priority, GnomeVFSAsyncFindDirectoryCallback callback, gpointer user_data); ! void gnome_vfs_async_file_control (GnomeVFSAsyncHandle *handle, ! const char *operation, gpointer operation_data, GDestroyNotify operation_data_destroy_func, GnomeVFSAsyncFileControlCallback callback, *************** *** 187,194 **** - - Description --- 187,192 ---- *************** *** 218,224 **** Details <anchor id="GNOME-VFS-PRIORITY-MIN-CAPS"/>GNOME_VFS_PRIORITY_MIN ! GNOME_VFS_PRIORITY_MIN#define GNOME_VFS_PRIORITY_MIN -10 The minimuum priority a job can have. --- 216,222 ---- Details <anchor id="GNOME-VFS-PRIORITY-MIN-CAPS"/>GNOME_VFS_PRIORITY_MIN ! #define GNOME_VFS_PRIORITY_MIN -10 The minimuum priority a job can have. *************** *** 227,233 **** <anchor id="GNOME-VFS-PRIORITY-MAX-CAPS"/>GNOME_VFS_PRIORITY_MAX ! GNOME_VFS_PRIORITY_MAX#define GNOME_VFS_PRIORITY_MAX 10 The maximuum priority a job can have. --- 225,231 ---- <anchor id="GNOME-VFS-PRIORITY-MAX-CAPS"/>GNOME_VFS_PRIORITY_MAX ! #define GNOME_VFS_PRIORITY_MAX 10 The maximuum priority a job can have. *************** *** 236,242 **** <anchor id="GNOME-VFS-PRIORITY-DEFAULT-CAPS"/>GNOME_VFS_PRIORITY_DEFAULT ! GNOME_VFS_PRIORITY_DEFAULT#define GNOME_VFS_PRIORITY_DEFAULT 0 The default job priority. Its best to use this --- 234,240 ---- <anchor id="GNOME-VFS-PRIORITY-DEFAULT-CAPS"/>GNOME_VFS_PRIORITY_DEFAULT ! #define GNOME_VFS_PRIORITY_DEFAULT 0 The default job priority. Its best to use this *************** *** 246,252 **** <anchor id="GnomeVFSAsyncCallback"/>GnomeVFSAsyncCallback () ! GnomeVFSAsyncCallbackvoid (*GnomeVFSAsyncCallback) (GnomeVFSAsyncHandle *handle, GnomeVFSResult result, gpointer callback_data); --- 244,250 ---- <anchor id="GnomeVFSAsyncCallback"/>GnomeVFSAsyncCallback () ! void (*GnomeVFSAsyncCallback) (GnomeVFSAsyncHandle *handle, GnomeVFSResult result, gpointer callback_data); *************** *** 268,274 **** <anchor id="GnomeVFSAsyncOpenCallback"/>GnomeVFSAsyncOpenCallback ! GnomeVFSAsyncOpenCallbacktypedef GnomeVFSAsyncCallback GnomeVFSAsyncOpenCallback; Basic callback from an async operation that passes no data back, --- 266,272 ---- <anchor id="GnomeVFSAsyncOpenCallback"/>GnomeVFSAsyncOpenCallback ! typedef GnomeVFSAsyncCallback GnomeVFSAsyncOpenCallback; Basic callback from an async operation that passes no data back, *************** *** 278,284 **** <anchor id="GnomeVFSAsyncCreateCallback"/>GnomeVFSAsyncCreateCallback ! GnomeVFSAsyncCreateCallbacktypedef GnomeVFSAsyncCallback GnomeVFSAsyncCreateCallback; Basic callback from an async operation that passes no data back, --- 276,282 ---- <anchor id="GnomeVFSAsyncCreateCallback"/>GnomeVFSAsyncCreateCallback ! typedef GnomeVFSAsyncCallback GnomeVFSAsyncCreateCallback; Basic callback from an async operation that passes no data back, *************** *** 288,303 **** <anchor id="GnomeVFSAsyncCreateAsChannelCallback"/>GnomeVFSAsyncCreateAsChannelCallback ! GnomeVFSAsyncCreateAsChannelCallbacktypedef GnomeVFSAsyncOpenAsChannelCallback GnomeVFSAsyncCreateAsChannelCallback; ! Callback for the gnome_vfs_async_create_as_channel() function. <anchor id="GnomeVFSAsyncCloseCallback"/>GnomeVFSAsyncCloseCallback ! GnomeVFSAsyncCloseCallbacktypedef GnomeVFSAsyncCallback GnomeVFSAsyncCloseCallback; Basic callback from an async operation that passes no data back, --- 286,301 ---- <anchor id="GnomeVFSAsyncCreateAsChannelCallback"/>GnomeVFSAsyncCreateAsChannelCallback ! typedef GnomeVFSAsyncOpenAsChannelCallback GnomeVFSAsyncCreateAsChannelCallback; ! Callback for the gnome_vfs_async_create_as_channel() function. <anchor id="GnomeVFSAsyncCloseCallback"/>GnomeVFSAsyncCloseCallback ! typedef GnomeVFSAsyncCallback GnomeVFSAsyncCloseCallback; Basic callback from an async operation that passes no data back, *************** *** 307,320 **** <anchor id="GnomeVFSAsyncReadCallback"/>GnomeVFSAsyncReadCallback () ! GnomeVFSAsyncReadCallbackvoid (*GnomeVFSAsyncReadCallback) (GnomeVFSAsyncHandle *handle, GnomeVFSResult result, gpointer buffer, GnomeVFSFileSize bytes_requested, GnomeVFSFileSize bytes_read, gpointer callback_data); ! Callback for the gnome_vfs_async_read() function. --- 305,318 ---- <anchor id="GnomeVFSAsyncReadCallback"/>GnomeVFSAsyncReadCallback () ! void (*GnomeVFSAsyncReadCallback) (GnomeVFSAsyncHandle *handle, GnomeVFSResult result, gpointer buffer, GnomeVFSFileSize bytes_requested, GnomeVFSFileSize bytes_read, gpointer callback_data); ! Callback for the gnome_vfs_async_read() function. *************** *** 330,336 **** bytes_requested : the number of bytes asked for in the call to ! gnome_vfs_async_read(). bytes_read : the number of bytes actually read from handle into buffer. --- 328,334 ---- bytes_requested : the number of bytes asked for in the call to ! gnome_vfs_async_read(). bytes_read : the number of bytes actually read from handle into buffer. *************** *** 341,354 **** <anchor id="GnomeVFSAsyncWriteCallback"/>GnomeVFSAsyncWriteCallback () ! GnomeVFSAsyncWriteCallbackvoid (*GnomeVFSAsyncWriteCallback) (GnomeVFSAsyncHandle *handle, GnomeVFSResult result, gconstpointer buffer, GnomeVFSFileSize bytes_requested, GnomeVFSFileSize bytes_written, gpointer callback_data); ! Callback for the gnome_vfs_async_write() function. --- 339,352 ---- <anchor id="GnomeVFSAsyncWriteCallback"/>GnomeVFSAsyncWriteCallback () ! void (*GnomeVFSAsyncWriteCallback) (GnomeVFSAsyncHandle *handle, GnomeVFSResult result, gconstpointer buffer, GnomeVFSFileSize bytes_requested, GnomeVFSFileSize bytes_written, gpointer callback_data); ! Callback for the gnome_vfs_async_write() function. *************** *** 364,370 **** bytes_requested : the number of bytes asked to write in the call to ! gnome_vfs_async_write(). bytes_written : the number of bytes actually written to handle from buffer. --- 362,368 ---- bytes_requested : the number of bytes asked to write in the call to ! gnome_vfs_async_write(). bytes_written : the number of bytes actually written to handle from buffer. *************** *** 375,381 **** <anchor id="GnomeVFSFindDirectoryResult"/>GnomeVFSFindDirectoryResult ! GnomeVFSFindDirectoryResulttypedef struct { GnomeVFSURI *uri; GnomeVFSResult result; --- 373,379 ---- <anchor id="GnomeVFSFindDirectoryResult"/>GnomeVFSFindDirectoryResult ! typedef struct { GnomeVFSURI *uri; GnomeVFSResult result; *************** *** 389,395 **** <anchor id="gnome-vfs-async-set-job-limit"/>gnome_vfs_async_set_job_limit () ! gnome_vfs_async_set_job_limitvoid gnome_vfs_async_set_job_limit (int limit); Restrict the number of worker threads used by Async operations to limit. --- 387,393 ---- <anchor id="gnome-vfs-async-set-job-limit"/>gnome_vfs_async_set_job_limit () ! void gnome_vfs_async_set_job_limit (int limit); Restrict the number of worker threads used by Async operations to limit. *************** *** 402,408 **** <anchor id="gnome-vfs-async-get-job-limit"/>gnome_vfs_async_get_job_limit () ! gnome_vfs_async_get_job_limitint gnome_vfs_async_get_job_limit (void); Get the current maximuum allowable number of worker threads for Asynch operations. --- 400,406 ---- <anchor id="gnome-vfs-async-get-job-limit"/>gnome_vfs_async_get_job_limit () ! int gnome_vfs_async_get_job_limit (void); Get the current maximuum allowable number of worker threads for Asynch operations. *************** *** 414,420 **** <anchor id="gnome-vfs-async-cancel"/>gnome_vfs_async_cancel () ! gnome_vfs_async_cancelvoid gnome_vfs_async_cancel (GnomeVFSAsyncHandle *handle); Cancel an asynchronous operation and close all its callbacks. Its possible to still receive another call or two on the callback. --- 412,418 ---- <anchor id="gnome-vfs-async-cancel"/>gnome_vfs_async_cancel () ! void gnome_vfs_async_cancel (GnomeVFSAsyncHandle *handle); Cancel an asynchronous operation and close all its callbacks. Its possible to still receive another call or two on the callback. *************** *** 427,436 **** <anchor id="gnome-vfs-async-open"/>gnome_vfs_async_open () ! gnome_vfs_async_openvoid gnome_vfs_async_open (GnomeVFSAsyncHandle **handle_return, const gchar *text_uri, GnomeVFSOpenMode open_mode, ! int priority, GnomeVFSAsyncOpenCallback callback, gpointer callback_data); --- 425,434 ---- <anchor id="gnome-vfs-async-open"/>gnome_vfs_async_open () ! void gnome_vfs_async_open (GnomeVFSAsyncHandle **handle_return, const gchar *text_uri, GnomeVFSOpenMode open_mode, ! int priority, GnomeVFSAsyncOpenCallback callback, gpointer callback_data); *************** *** 463,472 **** <anchor id="gnome-vfs-async-open-uri"/>gnome_vfs_async_open_uri () ! gnome_vfs_async_open_urivoid gnome_vfs_async_open_uri (GnomeVFSAsyncHandle **handle_return, GnomeVFSURI *uri, GnomeVFSOpenMode open_mode, ! int priority, GnomeVFSAsyncOpenCallback callback, gpointer callback_data); --- 461,470 ---- <anchor id="gnome-vfs-async-open-uri"/>gnome_vfs_async_open_uri () ! void gnome_vfs_async_open_uri (GnomeVFSAsyncHandle **handle_return, GnomeVFSURI *uri, GnomeVFSOpenMode open_mode, ! int priority, GnomeVFSAsyncOpenCallback callback, gpointer callback_data); *************** *** 499,515 **** <anchor id="gnome-vfs-async-open-as-channel"/>gnome_vfs_async_open_as_channel () ! gnome_vfs_async_open_as_channelvoid gnome_vfs_async_open_as_channel (GnomeVFSAsyncHandle **handle_return, const gchar *text_uri, GnomeVFSOpenMode open_mode, guint advised_block_size, ! int priority, GnomeVFSAsyncOpenAsChannelCallback callback, gpointer callback_data); ! Open text_uri as a GIOChannel. Once the channel has been established callback will be called with callback_data, the result of the operation, ! and if the result was GNOME_VFS_OK, a reference to a GIOChannel pointing at text_uri in open_mode. --- 497,513 ---- <anchor id="gnome-vfs-async-open-as-channel"/>gnome_vfs_async_open_as_channel () ! void gnome_vfs_async_open_as_channel (GnomeVFSAsyncHandle **handle_return, const gchar *text_uri, GnomeVFSOpenMode open_mode, guint advised_block_size, ! int priority, GnomeVFSAsyncOpenAsChannelCallback callback, gpointer callback_data); ! Open text_uri as a GIOChannel. Once the channel has been established callback will be called with callback_data, the result of the operation, ! and if the result was GNOME_VFS_OK, a reference to a GIOChannel pointing at text_uri in open_mode. *************** *** 518,530 **** A pointer to a pointer to a GnomeVFSHandle object text_uri : ! string of the URI to open as a GIOChannel open_mode : open for reading, writing, random, etc advised_block_size : ! the preferred block size for GIOChannel to read priority : a value from GNOME_VFS_PRIORITY_MIN to GNOME_VFS_PRIORITY_MAX (normally --- 516,528 ---- A pointer to a pointer to a GnomeVFSHandle object text_uri : ! string of the URI to open as a GIOChannel open_mode : open for reading, writing, random, etc advised_block_size : ! the preferred block size for GIOChannel to read priority : a value from GNOME_VFS_PRIORITY_MIN to GNOME_VFS_PRIORITY_MAX (normally *************** *** 540,557 **** <anchor id="gnome-vfs-async-open-uri-as-channel"/>gnome_vfs_async_open_uri_as_channel () ! gnome_vfs_async_open_uri_as_channelvoid gnome_vfs_async_open_uri_as_channel (GnomeVFSAsyncHandle **handle_return, GnomeVFSURI *uri, GnomeVFSOpenMode open_mode, guint advised_block_size, ! int priority, GnomeVFSAsyncOpenAsChannelCallback callback, gpointer callback_data); ! Open uri as a GIOChannel. Once the channel has been established callback will be called with callback_data, the result of the operation, ! and if the result was GNOME_VFS_OK, a reference to a GIOChannel pointing at uri in open_mode. --- 538,555 ---- <anchor id="gnome-vfs-async-open-uri-as-channel"/>gnome_vfs_async_open_uri_as_channel () ! void gnome_vfs_async_open_uri_as_channel (GnomeVFSAsyncHandle **handle_return, GnomeVFSURI *uri, GnomeVFSOpenMode open_mode, guint advised_block_size, ! int priority, GnomeVFSAsyncOpenAsChannelCallback callback, gpointer callback_data); ! Open uri as a GIOChannel. Once the channel has been established callback will be called with callback_data, the result of the operation, ! and if the result was GNOME_VFS_OK, a reference to a GIOChannel pointing at uri in open_mode. *************** *** 560,572 **** A pointer to a pointer to a GnomeVFSHandle object uri : ! URI to open as a GIOChannel open_mode : open for reading, writing, random, etc advised_block_size : ! the preferred block size for GIOChannel to read priority : a value from GNOME_VFS_PRIORITY_MIN to GNOME_VFS_PRIORITY_MAX (normally --- 558,570 ---- A pointer to a pointer to a GnomeVFSHandle object uri : ! URI to open as a GIOChannel open_mode : open for reading, writing, random, etc advised_block_size : ! the preferred block size for GIOChannel to read priority : a value from GNOME_VFS_PRIORITY_MIN to GNOME_VFS_PRIORITY_MAX (normally *************** *** 582,593 **** <anchor id="gnome-vfs-async-create"/>gnome_vfs_async_create () ! gnome_vfs_async_createvoid gnome_vfs_async_create (GnomeVFSAsyncHandle **handle_return, const gchar *text_uri, GnomeVFSOpenMode open_mode, gboolean exclusive, guint perm, ! int priority, GnomeVFSAsyncOpenCallback callback, gpointer callback_data); --- 580,591 ---- <anchor id="gnome-vfs-async-create"/>gnome_vfs_async_create () ! void gnome_vfs_async_create (GnomeVFSAsyncHandle **handle_return, const gchar *text_uri, GnomeVFSOpenMode open_mode, gboolean exclusive, guint perm, ! int priority, GnomeVFSAsyncOpenCallback callback, gpointer callback_data); *************** *** 630,641 **** <anchor id="gnome-vfs-async-create-uri"/>gnome_vfs_async_create_uri () ! gnome_vfs_async_create_urivoid gnome_vfs_async_create_uri (GnomeVFSAsyncHandle **handle_return, GnomeVFSURI *uri, GnomeVFSOpenMode open_mode, gboolean exclusive, guint perm, ! int priority, GnomeVFSAsyncOpenCallback callback, gpointer callback_data); --- 628,639 ---- <anchor id="gnome-vfs-async-create-uri"/>gnome_vfs_async_create_uri () ! void gnome_vfs_async_create_uri (GnomeVFSAsyncHandle **handle_return, GnomeVFSURI *uri, GnomeVFSOpenMode open_mode, gboolean exclusive, guint perm, ! int priority, GnomeVFSAsyncOpenCallback callback, gpointer callback_data); *************** *** 678,688 **** <anchor id="gnome-vfs-async-create-symbolic-link"/>gnome_vfs_async_create_symbolic_link () ! gnome_vfs_async_create_symbolic_linkvoid gnome_vfs_async_create_symbolic_link (GnomeVFSAsyncHandle **handle_return, GnomeVFSURI *uri, const gchar *uri_reference, ! int priority, GnomeVFSAsyncOpenCallback callback, gpointer callback_data); --- 676,686 ---- <anchor id="gnome-vfs-async-create-symbolic-link"/>gnome_vfs_async_create_symbolic_link () ! void gnome_vfs_async_create_symbolic_link (GnomeVFSAsyncHandle **handle_return, GnomeVFSURI *uri, const gchar *uri_reference, ! int priority, GnomeVFSAsyncOpenCallback callback, gpointer callback_data); *************** *** 716,734 **** <anchor id="gnome-vfs-async-create-as-channel"/>gnome_vfs_async_create_as_channel () ! gnome_vfs_async_create_as_channelvoid gnome_vfs_async_create_as_channel (GnomeVFSAsyncHandle **handle_return, const gchar *text_uri, GnomeVFSOpenMode open_mode, gboolean exclusive, guint perm, ! int priority, GnomeVFSAsyncCreateAsChannelCallback callback, gpointer callback_data); ! Open text_uri as a GIOChannel, creating it as necessary. Once the channel has been established callback will be called with callback_data, the result of the ! operation, and if the result was GNOME_VFS_OK, a reference to a GIOChannel pointing at text_uri in open_mode. --- 714,732 ---- <anchor id="gnome-vfs-async-create-as-channel"/>gnome_vfs_async_create_as_channel () ! void gnome_vfs_async_create_as_channel (GnomeVFSAsyncHandle **handle_return, const gchar *text_uri, GnomeVFSOpenMode open_mode, gboolean exclusive, guint perm, ! int priority, GnomeVFSAsyncCreateAsChannelCallback callback, gpointer callback_data); ! Open text_uri as a GIOChannel, creating it as necessary. Once the channel has been established callback will be called with callback_data, the result of the ! operation, and if the result was GNOME_VFS_OK, a reference to a GIOChannel pointing at text_uri in open_mode. *************** *** 737,743 **** A pointer to a pointer to a GnomeVFSHandle object text_uri : ! string of the URI to open as a GIOChannel, creating it as necessary open_mode : open for reading, writing, random, etc --- 735,741 ---- A pointer to a pointer to a GnomeVFSHandle object text_uri : ! string of the URI to open as a GIOChannel, creating it as necessary open_mode : open for reading, writing, random, etc *************** *** 762,774 **** <anchor id="gnome-vfs-async-create-uri-as-channel"/>gnome_vfs_async_create_uri_as_channel () ! gnome_vfs_async_create_uri_as_channelvoid gnome_vfs_async_create_uri_as_channel (GnomeVFSAsyncHandle **handle_return, GnomeVFSURI *uri, GnomeVFSOpenMode open_mode, gboolean exclusive, guint perm, ! int priority, GnomeVFSAsyncCreateAsChannelCallback callback, gpointer callback_data); --- 760,772 ---- <anchor id="gnome-vfs-async-create-uri-as-channel"/>gnome_vfs_async_create_uri_as_channel () ! void gnome_vfs_async_create_uri_as_channel (GnomeVFSAsyncHandle **handle_return, GnomeVFSURI *uri, GnomeVFSOpenMode open_mode, gboolean exclusive, guint perm, ! int priority, GnomeVFSAsyncCreateAsChannelCallback callback, gpointer callback_data); *************** *** 803,813 **** <anchor id="gnome-vfs-async-close"/>gnome_vfs_async_close () ! gnome_vfs_async_closevoid gnome_vfs_async_close (GnomeVFSAsyncHandle *handle, GnomeVFSAsyncCloseCallback callback, gpointer callback_data); ! Close a handle opened with gnome_vfs_async_open(). When the close has completed, callback will be called with callback_data and the result of the operation. --- 801,811 ---- <anchor id="gnome-vfs-async-close"/>gnome_vfs_async_close () ! void gnome_vfs_async_close (GnomeVFSAsyncHandle *handle, GnomeVFSAsyncCloseCallback callback, gpointer callback_data); ! Close a handle opened with gnome_vfs_async_open(). When the close has completed, callback will be called with callback_data and the result of the operation. *************** *** 825,831 **** <anchor id="gnome-vfs-async-read"/>gnome_vfs_async_read () ! gnome_vfs_async_readvoid gnome_vfs_async_read (GnomeVFSAsyncHandle *handle, gpointer buffer, guint bytes, GnomeVFSAsyncReadCallback callback, --- 823,829 ---- <anchor id="gnome-vfs-async-read"/>gnome_vfs_async_read () ! void gnome_vfs_async_read (GnomeVFSAsyncHandle *handle, gpointer buffer, guint bytes, GnomeVFSAsyncReadCallback callback, *************** *** 855,861 **** <anchor id="gnome-vfs-async-write"/>gnome_vfs_async_write () ! gnome_vfs_async_writevoid gnome_vfs_async_write (GnomeVFSAsyncHandle *handle, gconstpointer buffer, guint bytes, GnomeVFSAsyncWriteCallback callback, --- 853,859 ---- <anchor id="gnome-vfs-async-write"/>gnome_vfs_async_write () ! void gnome_vfs_async_write (GnomeVFSAsyncHandle *handle, gconstpointer buffer, guint bytes, GnomeVFSAsyncWriteCallback callback, *************** *** 885,894 **** <anchor id="gnome-vfs-async-get-file-info"/>gnome_vfs_async_get_file_info () ! gnome_vfs_async_get_file_infovoid gnome_vfs_async_get_file_info (GnomeVFSAsyncHandle **handle_return, GList *uri_list, GnomeVFSFileInfoOptions options, ! int priority, GnomeVFSAsyncGetFileInfoCallback callback, gpointer callback_data); --- 883,892 ---- <anchor id="gnome-vfs-async-get-file-info"/>gnome_vfs_async_get_file_info () ! void gnome_vfs_async_get_file_info (GnomeVFSAsyncHandle **handle_return, GList *uri_list, GnomeVFSFileInfoOptions options, ! int priority, GnomeVFSAsyncGetFileInfoCallback callback, gpointer callback_data); *************** *** 922,933 **** <anchor id="gnome-vfs-async-set-file-info"/>gnome_vfs_async_set_file_info () ! gnome_vfs_async_set_file_infovoid gnome_vfs_async_set_file_info (GnomeVFSAsyncHandle **handle_return, GnomeVFSURI *uri, GnomeVFSFileInfo *info, GnomeVFSSetFileInfoMask mask, GnomeVFSFileInfoOptions options, ! int priority, GnomeVFSAsyncSetFileInfoCallback callback, gpointer callback_data); --- 920,931 ---- <anchor id="gnome-vfs-async-set-file-info"/>gnome_vfs_async_set_file_info () ! void gnome_vfs_async_set_file_info (GnomeVFSAsyncHandle **handle_return, GnomeVFSURI *uri, GnomeVFSFileInfo *info, GnomeVFSSetFileInfoMask mask, GnomeVFSFileInfoOptions options, ! int priority, GnomeVFSAsyncSetFileInfoCallback callback, gpointer callback_data); *************** *** 967,977 **** <anchor id="gnome-vfs-async-load-directory"/>gnome_vfs_async_load_directory () ! gnome_vfs_async_load_directoryvoid gnome_vfs_async_load_directory (GnomeVFSAsyncHandle **handle_return, const gchar *text_uri, GnomeVFSFileInfoOptions options, guint items_per_notification, ! int priority, GnomeVFSAsyncDirectoryLoadCallback callback, gpointer callback_data); --- 965,975 ---- <anchor id="gnome-vfs-async-load-directory"/>gnome_vfs_async_load_directory () ! void gnome_vfs_async_load_directory (GnomeVFSAsyncHandle **handle_return, const gchar *text_uri, GnomeVFSFileInfoOptions options, guint items_per_notification, ! int priority, GnomeVFSAsyncDirectoryLoadCallback callback, gpointer callback_data); *************** *** 1009,1020 **** <anchor id="gnome-vfs-async-load-directory-uri"/>gnome_vfs_async_load_directory_uri () ! gnome_vfs_async_load_directory_urivoid gnome_vfs_async_load_directory_uri (GnomeVFSAsyncHandle **handle_return, GnomeVFSURI *uri, GnomeVFSFileInfoOptions options, guint items_per_notification, ! int priority, GnomeVFSAsyncDirectoryLoadCallback callback, gpointer callback_data); --- 1007,1018 ---- <anchor id="gnome-vfs-async-load-directory-uri"/>gnome_vfs_async_load_directory_uri () ! void gnome_vfs_async_load_directory_uri (GnomeVFSAsyncHandle **handle_return, GnomeVFSURI *uri, GnomeVFSFileInfoOptions options, guint items_per_notification, ! int priority, GnomeVFSAsyncDirectoryLoadCallback callback, gpointer callback_data); *************** *** 1052,1064 **** <anchor id="gnome-vfs-async-xfer"/>gnome_vfs_async_xfer () ! gnome_vfs_async_xferGnomeVFSResult gnome_vfs_async_xfer (GnomeVFSAsyncHandle **handle_return, GList *source_uri_list, GList *target_uri_list, GnomeVFSXferOptions xfer_options, GnomeVFSXferErrorMode error_mode, GnomeVFSXferOverwriteMode overwrite_mode, ! int priority, GnomeVFSAsyncXferProgressCallback progress_update_callback, gpointer update_callback_data, GnomeVFSXferProgressCallback progress_sync_callback, --- 1050,1062 ---- <anchor id="gnome-vfs-async-xfer"/>gnome_vfs_async_xfer () ! GnomeVFSResult gnome_vfs_async_xfer (GnomeVFSAsyncHandle **handle_return, GList *source_uri_list, GList *target_uri_list, GnomeVFSXferOptions xfer_options, GnomeVFSXferErrorMode error_mode, GnomeVFSXferOverwriteMode overwrite_mode, ! int priority, GnomeVFSAsyncXferProgressCallback progress_update_callback, gpointer update_callback_data, GnomeVFSXferProgressCallback progress_sync_callback, *************** *** 1075,1084 **** when the function returns will point to a handle for source_uri_list : ! GList of GnomeVFSURI representing the files to be transferred target_uri_list : ! GList of GnomeVFSURI, the target locations for the elements in source_uri_list xfer_options : --- 1073,1082 ---- when the function returns will point to a handle for source_uri_list : ! GList of GnomeVFSURI representing the files to be transferred target_uri_list : ! GList of GnomeVFSURI, the target locations for the elements in source_uri_list xfer_options : *************** *** 1117,1129 **** <anchor id="gnome-vfs-async-find-directory"/>gnome_vfs_async_find_directory () ! gnome_vfs_async_find_directoryvoid gnome_vfs_async_find_directory (GnomeVFSAsyncHandle **handle_return, GList *near_uri_list, GnomeVFSFindDirectoryKind kind, gboolean create_if_needed, gboolean find_if_needed, guint permissions, ! int priority, GnomeVFSAsyncFindDirectoryCallback callback, gpointer user_data); --- 1115,1127 ---- <anchor id="gnome-vfs-async-find-directory"/>gnome_vfs_async_find_directory () ! void gnome_vfs_async_find_directory (GnomeVFSAsyncHandle **handle_return, GList *near_uri_list, GnomeVFSFindDirectoryKind kind, gboolean create_if_needed, gboolean find_if_needed, guint permissions, ! int priority, GnomeVFSAsyncFindDirectoryCallback callback, gpointer user_data); *************** *** 1179,1186 **** <anchor id="gnome-vfs-async-file-control"/>gnome_vfs_async_file_control () ! gnome_vfs_async_file_controlvoid gnome_vfs_async_file_control (GnomeVFSAsyncHandle *handle, ! const char *operation, gpointer operation_data, GDestroyNotify operation_data_destroy_func, GnomeVFSAsyncFileControlCallback callback, --- 1177,1184 ---- <anchor id="gnome-vfs-async-file-control"/>gnome_vfs_async_file_control () ! void gnome_vfs_async_file_control (GnomeVFSAsyncHandle *handle, ! const char *operation, gpointer operation_data, GDestroyNotify operation_data_destroy_func, GnomeVFSAsyncFileControlCallback callback, *************** *** 1188,1194 **** Execute a backend dependent operation specified by the string operation. This is typically used for specialized vfs backends that need additional ! operations that gnome-vfs doesn't have. Compare it to the unix call ioctl(). The format of operation_data depends on the operation. Operation that are backend specific are normally namespaced by their module name. --- 1186,1192 ---- Execute a backend dependent operation specified by the string operation. This is typically used for specialized vfs backends that need additional ! operations that gnome-vfs doesn't have. Compare it to the unix call ioctl(). The format of operation_data depends on the operation. Operation that are backend specific are normally namespaced by their module name. diff -crN ./gnome-vfs/doc/xml/gnome-vfs-cancellation.xml /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/doc/xml/gnome-vfs-cancellation.xml *** ./gnome-vfs/doc/xml/gnome-vfs-cancellation.xml Mon Sep 8 14:19:48 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/doc/xml/gnome-vfs-cancellation.xml Thu Dec 18 21:23:00 2003 *************** *** 18,27 **** GnomeVFSCancellation* gnome_vfs_cancellation_new (void); ! void gnome_vfs_cancellation_destroy (GnomeVFSCancellation *cancellation); ! void gnome_vfs_cancellation_cancel (GnomeVFSCancellation *cancellation); gboolean gnome_vfs_cancellation_check (GnomeVFSCancellation *cancellation); ! void gnome_vfs_cancellation_ack (GnomeVFSCancellation *cancellation); gint gnome_vfs_cancellation_get_fd (GnomeVFSCancellation *cancellation); --- 18,27 ---- GnomeVFSCancellation* gnome_vfs_cancellation_new (void); ! void gnome_vfs_cancellation_destroy (GnomeVFSCancellation *cancellation); ! void gnome_vfs_cancellation_cancel (GnomeVFSCancellation *cancellation); gboolean gnome_vfs_cancellation_check (GnomeVFSCancellation *cancellation); ! void gnome_vfs_cancellation_ack (GnomeVFSCancellation *cancellation); gint gnome_vfs_cancellation_get_fd (GnomeVFSCancellation *cancellation); *************** *** 32,39 **** - - Description --- 32,37 ---- *************** *** 45,51 **** Details <anchor id="gnome-vfs-cancellation-new"/>gnome_vfs_cancellation_new () ! gnome_vfs_cancellation_newGnomeVFSCancellation* gnome_vfs_cancellation_new (void); Create a new GnomeVFSCancellation object for reporting cancellation to a --- 43,49 ---- Details <anchor id="gnome-vfs-cancellation-new"/>gnome_vfs_cancellation_new () ! GnomeVFSCancellation* gnome_vfs_cancellation_new (void); Create a new GnomeVFSCancellation object for reporting cancellation to a *************** *** 58,64 **** <anchor id="gnome-vfs-cancellation-destroy"/>gnome_vfs_cancellation_destroy () ! gnome_vfs_cancellation_destroyvoid gnome_vfs_cancellation_destroy (GnomeVFSCancellation *cancellation); Destroy cancellation. --- 56,62 ---- <anchor id="gnome-vfs-cancellation-destroy"/>gnome_vfs_cancellation_destroy () ! void gnome_vfs_cancellation_destroy (GnomeVFSCancellation *cancellation); Destroy cancellation. *************** *** 70,76 **** <anchor id="gnome-vfs-cancellation-cancel"/>gnome_vfs_cancellation_cancel () ! gnome_vfs_cancellation_cancelvoid gnome_vfs_cancellation_cancel (GnomeVFSCancellation *cancellation); Send a cancellation request through cancellation. --- 68,74 ---- <anchor id="gnome-vfs-cancellation-cancel"/>gnome_vfs_cancellation_cancel () ! void gnome_vfs_cancellation_cancel (GnomeVFSCancellation *cancellation); Send a cancellation request through cancellation. *************** *** 82,88 **** <anchor id="gnome-vfs-cancellation-check"/>gnome_vfs_cancellation_check () ! gnome_vfs_cancellation_checkgboolean gnome_vfs_cancellation_check (GnomeVFSCancellation *cancellation); Check for pending cancellation. --- 80,86 ---- <anchor id="gnome-vfs-cancellation-check"/>gnome_vfs_cancellation_check () ! gboolean gnome_vfs_cancellation_check (GnomeVFSCancellation *cancellation); Check for pending cancellation. *************** *** 96,107 **** <anchor id="gnome-vfs-cancellation-ack"/>gnome_vfs_cancellation_ack () ! gnome_vfs_cancellation_ackvoid gnome_vfs_cancellation_ack (GnomeVFSCancellation *cancellation); Acknowledge a cancellation. This should be called if ! `gnome_vfs_cancellation_check()' returns TRUE or if `select()' reports that input is available on the file descriptor returned by ! `gnome_vfs_cancellation_get_fd()'. --- 94,105 ---- <anchor id="gnome-vfs-cancellation-ack"/>gnome_vfs_cancellation_ack () ! void gnome_vfs_cancellation_ack (GnomeVFSCancellation *cancellation); Acknowledge a cancellation. This should be called if ! `gnome_vfs_cancellation_check()' returns TRUE or if `select()' reports that input is available on the file descriptor returned by ! `gnome_vfs_cancellation_get_fd()'. *************** *** 111,117 **** <anchor id="gnome-vfs-cancellation-get-fd"/>gnome_vfs_cancellation_get_fd () ! gnome_vfs_cancellation_get_fdgint gnome_vfs_cancellation_get_fd (GnomeVFSCancellation *cancellation); Get a file descriptor -based notificator for cancellation. When cancellation receives a cancellation request, a character will be made --- 109,115 ---- <anchor id="gnome-vfs-cancellation-get-fd"/>gnome_vfs_cancellation_get_fd () ! gint gnome_vfs_cancellation_get_fd (GnomeVFSCancellation *cancellation); Get a file descriptor -based notificator for cancellation. When cancellation receives a cancellation request, a character will be made *************** *** 119,125 **** This is very useful for detecting cancellation during I/O operations: you ! can use the `select()' call to check for available input/output on the file you are reading/writing, and on the notificator's file descriptor at the same time. If a data is available on the notificator's file descriptor, you know you have to cancel the read/write operation. --- 117,123 ---- This is very useful for detecting cancellation during I/O operations: you ! can use the `select()' call to check for available input/output on the file you are reading/writing, and on the notificator's file descriptor at the same time. If a data is available on the notificator's file descriptor, you know you have to cancel the read/write operation. diff -crN ./gnome-vfs/doc/xml/gnome-vfs-context.xml /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/doc/xml/gnome-vfs-context.xml *** ./gnome-vfs/doc/xml/gnome-vfs-context.xml Mon Sep 8 14:19:48 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/doc/xml/gnome-vfs-context.xml Thu Dec 18 21:22:59 2003 *************** *** 17,23 **** GnomeVFSContext* gnome_vfs_context_new (void); ! void gnome_vfs_context_free (GnomeVFSContext *ctx); GnomeVFSCancellation* gnome_vfs_context_get_cancellation (const GnomeVFSContext *ctx); #define gnome_vfs_context_check_cancellation(x) --- 17,23 ---- GnomeVFSContext* gnome_vfs_context_new (void); ! void gnome_vfs_context_free (GnomeVFSContext *ctx); GnomeVFSCancellation* gnome_vfs_context_get_cancellation (const GnomeVFSContext *ctx); #define gnome_vfs_context_check_cancellation(x) *************** *** 34,41 **** - - Description --- 34,39 ---- *************** *** 47,67 **** Details <anchor id="gnome-vfs-context-new"/>gnome_vfs_context_new () ! gnome_vfs_context_newGnomeVFSContext* gnome_vfs_context_new (void); Creates a new context and cancellation object. Must be called from the main glib event loop. ! Returns : a newly allocated GnomeVFSContext <anchor id="gnome-vfs-context-free"/>gnome_vfs_context_free () ! gnome_vfs_context_freevoid gnome_vfs_context_free (GnomeVFSContext *ctx); ! Free ctx and destroy the associated GnomeVFSCancellation. --- 45,65 ---- Details <anchor id="gnome-vfs-context-new"/>gnome_vfs_context_new () ! GnomeVFSContext* gnome_vfs_context_new (void); Creates a new context and cancellation object. Must be called from the main glib event loop. ! Returns : a newly allocated GnomeVFSContext <anchor id="gnome-vfs-context-free"/>gnome_vfs_context_free () ! void gnome_vfs_context_free (GnomeVFSContext *ctx); ! Free ctx and destroy the associated GnomeVFSCancellation. *************** *** 71,92 **** <anchor id="gnome-vfs-context-get-cancellation"/>gnome_vfs_context_get_cancellation () ! gnome_vfs_context_get_cancellationGnomeVFSCancellation* gnome_vfs_context_get_cancellation (const GnomeVFSContext *ctx); ! Retrieve the GnomeVFSCancellation associated with ctx. ctx : ! context to get the GnomeVFSCancellation from ! Returns : ctx 's GnomeVFSCancellation <anchor id="gnome-vfs-context-check-cancellation"/>gnome_vfs_context_check_cancellation() ! gnome_vfs_context_check_cancellation#define gnome_vfs_context_check_cancellation(x) --- 69,90 ---- <anchor id="gnome-vfs-context-get-cancellation"/>gnome_vfs_context_get_cancellation () ! GnomeVFSCancellation* gnome_vfs_context_get_cancellation (const GnomeVFSContext *ctx); ! Retrieve the GnomeVFSCancellation associated with ctx. ctx : ! context to get the GnomeVFSCancellation from ! Returns : ctx 's GnomeVFSCancellation <anchor id="gnome-vfs-context-check-cancellation"/>gnome_vfs_context_check_cancellation() ! #define gnome_vfs_context_check_cancellation(x) *************** *** 98,104 **** <anchor id="gnome-vfs-context-peek-current"/>gnome_vfs_context_peek_current () ! gnome_vfs_context_peek_currentconst GnomeVFSContext* gnome_vfs_context_peek_current (void); Get the currently active context. It shouldn't be --- 96,102 ---- <anchor id="gnome-vfs-context-peek-current"/>gnome_vfs_context_peek_current () ! const GnomeVFSContext* gnome_vfs_context_peek_current (void); Get the currently active context. It shouldn't be *************** *** 107,118 **** ! Returns : the currently active GnomeVFSContext <anchor id="gnome-vfs-context-check-cancellation-current"/>gnome_vfs_context_check_cancellation_current () ! gnome_vfs_context_check_cancellation_currentgboolean gnome_vfs_context_check_cancellation_current (void); Check to see if the currently active context has been cancelled. --- 105,116 ---- ! Returns : the currently active GnomeVFSContext <anchor id="gnome-vfs-context-check-cancellation-current"/>gnome_vfs_context_check_cancellation_current () ! gboolean gnome_vfs_context_check_cancellation_current (void); Check to see if the currently active context has been cancelled. diff -crN ./gnome-vfs/doc/xml/gnome-vfs-directory-basic-ops.xml /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/doc/xml/gnome-vfs-directory-basic-ops.xml *** ./gnome-vfs/doc/xml/gnome-vfs-directory-basic-ops.xml Mon Sep 8 14:19:48 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/doc/xml/gnome-vfs-directory-basic-ops.xml Thu Dec 18 21:22:57 2003 *************** *** 33,40 **** - - Description --- 33,38 ---- *************** *** 46,52 **** Details <anchor id="gnome-vfs-make-directory"/>gnome_vfs_make_directory () ! gnome_vfs_make_directoryGnomeVFSResult gnome_vfs_make_directory (const gchar *text_uri, guint perm); Create text_uri as a directory. --- 44,50 ---- Details <anchor id="gnome-vfs-make-directory"/>gnome_vfs_make_directory () ! GnomeVFSResult gnome_vfs_make_directory (const gchar *text_uri, guint perm); Create text_uri as a directory. *************** *** 64,70 **** <anchor id="gnome-vfs-make-directory-for-uri"/>gnome_vfs_make_directory_for_uri () ! gnome_vfs_make_directory_for_uriGnomeVFSResult gnome_vfs_make_directory_for_uri (GnomeVFSURI *uri, guint perm); --- 62,68 ---- <anchor id="gnome-vfs-make-directory-for-uri"/>gnome_vfs_make_directory_for_uri () ! GnomeVFSResult gnome_vfs_make_directory_for_uri (GnomeVFSURI *uri, guint perm); *************** *** 84,90 **** <anchor id="gnome-vfs-remove-directory"/>gnome_vfs_remove_directory () ! gnome_vfs_remove_directoryGnomeVFSResult gnome_vfs_remove_directory (const gchar *text_uri); Remove text_uri. text_uri must be an empty directory. --- 82,88 ---- <anchor id="gnome-vfs-remove-directory"/>gnome_vfs_remove_directory () ! GnomeVFSResult gnome_vfs_remove_directory (const gchar *text_uri); Remove text_uri. text_uri must be an empty directory. *************** *** 98,104 **** <anchor id="gnome-vfs-remove-directory-from-uri"/>gnome_vfs_remove_directory_from_uri () ! gnome_vfs_remove_directory_from_uriGnomeVFSResult gnome_vfs_remove_directory_from_uri (GnomeVFSURI *uri); Remove uri. uri must be an empty directory. --- 96,102 ---- <anchor id="gnome-vfs-remove-directory-from-uri"/>gnome_vfs_remove_directory_from_uri () ! GnomeVFSResult gnome_vfs_remove_directory_from_uri (GnomeVFSURI *uri); Remove uri. uri must be an empty directory. diff -crN ./gnome-vfs/doc/xml/gnome-vfs-directory-find-ops.xml /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/doc/xml/gnome-vfs-directory-find-ops.xml *** ./gnome-vfs/doc/xml/gnome-vfs-directory-find-ops.xml Mon Sep 8 14:19:48 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/doc/xml/gnome-vfs-directory-find-ops.xml Thu Dec 18 21:22:58 2003 *************** *** 32,39 **** - - Description --- 32,37 ---- *************** *** 45,51 **** Details <anchor id="GnomeVFSFindDirectoryKind"/>enum GnomeVFSFindDirectoryKind ! GnomeVFSFindDirectoryKindtypedef enum { GNOME_VFS_DIRECTORY_KIND_DESKTOP = 1000, GNOME_VFS_DIRECTORY_KIND_TRASH = 1001 } GnomeVFSFindDirectoryKind; --- 43,49 ---- Details <anchor id="GnomeVFSFindDirectoryKind"/>enum GnomeVFSFindDirectoryKind ! typedef enum { GNOME_VFS_DIRECTORY_KIND_DESKTOP = 1000, GNOME_VFS_DIRECTORY_KIND_TRASH = 1001 } GnomeVFSFindDirectoryKind; *************** *** 55,61 **** <anchor id="gnome-vfs-find-directory"/>gnome_vfs_find_directory () ! gnome_vfs_find_directoryGnomeVFSResult gnome_vfs_find_directory (GnomeVFSURI *near_uri, GnomeVFSFindDirectoryKind kind, GnomeVFSURI **result, gboolean create_if_needed, --- 53,59 ---- <anchor id="gnome-vfs-find-directory"/>gnome_vfs_find_directory () ! GnomeVFSResult gnome_vfs_find_directory (GnomeVFSURI *near_uri, GnomeVFSFindDirectoryKind kind, GnomeVFSURI **result, gboolean create_if_needed, diff -crN ./gnome-vfs/doc/xml/gnome-vfs-directory-list-ops.xml /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/doc/xml/gnome-vfs-directory-list-ops.xml *** ./gnome-vfs/doc/xml/gnome-vfs-directory-list-ops.xml Mon Sep 8 14:19:48 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/doc/xml/gnome-vfs-directory-list-ops.xml Thu Dec 18 21:22:57 2003 *************** *** 71,78 **** - - Description --- 71,76 ---- *************** *** 84,90 **** Details <anchor id="GnomeVFSDirectoryVisitOptions"/>enum GnomeVFSDirectoryVisitOptions ! GnomeVFSDirectoryVisitOptionstypedef enum { GNOME_VFS_DIRECTORY_VISIT_DEFAULT = 0, GNOME_VFS_DIRECTORY_VISIT_SAMEFS = 1 << 0, GNOME_VFS_DIRECTORY_VISIT_LOOPCHECK = 1 << 1 --- 82,88 ---- Details <anchor id="GnomeVFSDirectoryVisitOptions"/>enum GnomeVFSDirectoryVisitOptions ! typedef enum { GNOME_VFS_DIRECTORY_VISIT_DEFAULT = 0, GNOME_VFS_DIRECTORY_VISIT_SAMEFS = 1 << 0, GNOME_VFS_DIRECTORY_VISIT_LOOPCHECK = 1 << 1 *************** *** 114,120 **** <anchor id="GnomeVFSDirectoryVisitFunc"/>GnomeVFSDirectoryVisitFunc () ! GnomeVFSDirectoryVisitFuncgboolean (*GnomeVFSDirectoryVisitFunc) (const gchar *rel_path, GnomeVFSFileInfo *info, gboolean recursing_will_loop, gpointer data, --- 112,118 ---- <anchor id="GnomeVFSDirectoryVisitFunc"/>GnomeVFSDirectoryVisitFunc () ! gboolean (*GnomeVFSDirectoryVisitFunc) (const gchar *rel_path, GnomeVFSFileInfo *info, gboolean recursing_will_loop, gpointer data, *************** *** 144,150 **** <anchor id="gnome-vfs-directory-open"/>gnome_vfs_directory_open () ! gnome_vfs_directory_openGnomeVFSResult gnome_vfs_directory_open (GnomeVFSDirectoryHandle **handle, const gchar *text_uri, GnomeVFSFileInfoOptions options); --- 142,148 ---- <anchor id="gnome-vfs-directory-open"/>gnome_vfs_directory_open () ! GnomeVFSResult gnome_vfs_directory_open (GnomeVFSDirectoryHandle **handle, const gchar *text_uri, GnomeVFSFileInfoOptions options); *************** *** 168,174 **** <anchor id="gnome-vfs-directory-open-from-uri"/>gnome_vfs_directory_open_from_uri () ! gnome_vfs_directory_open_from_uriGnomeVFSResult gnome_vfs_directory_open_from_uri (GnomeVFSDirectoryHandle **handle, GnomeVFSURI *uri, GnomeVFSFileInfoOptions options); --- 166,172 ---- <anchor id="gnome-vfs-directory-open-from-uri"/>gnome_vfs_directory_open_from_uri () ! GnomeVFSResult gnome_vfs_directory_open_from_uri (GnomeVFSDirectoryHandle **handle, GnomeVFSURI *uri, GnomeVFSFileInfoOptions options); *************** *** 193,199 **** <anchor id="gnome-vfs-directory-read-next"/>gnome_vfs_directory_read_next () ! gnome_vfs_directory_read_nextGnomeVFSResult gnome_vfs_directory_read_next (GnomeVFSDirectoryHandle *handle, GnomeVFSFileInfo *file_info); --- 191,197 ---- <anchor id="gnome-vfs-directory-read-next"/>gnome_vfs_directory_read_next () ! GnomeVFSResult gnome_vfs_directory_read_next (GnomeVFSDirectoryHandle *handle, GnomeVFSFileInfo *file_info); *************** *** 213,219 **** <anchor id="gnome-vfs-directory-close"/>gnome_vfs_directory_close () ! gnome_vfs_directory_closeGnomeVFSResult gnome_vfs_directory_close (GnomeVFSDirectoryHandle *handle); Close handle. --- 211,217 ---- <anchor id="gnome-vfs-directory-close"/>gnome_vfs_directory_close () ! GnomeVFSResult gnome_vfs_directory_close (GnomeVFSDirectoryHandle *handle); Close handle. *************** *** 227,233 **** <anchor id="gnome-vfs-directory-visit"/>gnome_vfs_directory_visit () ! gnome_vfs_directory_visitGnomeVFSResult gnome_vfs_directory_visit (const gchar *uri, GnomeVFSFileInfoOptions info_options, GnomeVFSDirectoryVisitOptions visit_options, GnomeVFSDirectoryVisitFunc callback, --- 225,231 ---- <anchor id="gnome-vfs-directory-visit"/>gnome_vfs_directory_visit () ! GnomeVFSResult gnome_vfs_directory_visit (const gchar *uri, GnomeVFSFileInfoOptions info_options, GnomeVFSDirectoryVisitOptions visit_options, GnomeVFSDirectoryVisitFunc callback, *************** *** 258,264 **** <anchor id="gnome-vfs-directory-visit-uri"/>gnome_vfs_directory_visit_uri () ! gnome_vfs_directory_visit_uriGnomeVFSResult gnome_vfs_directory_visit_uri (GnomeVFSURI *uri, GnomeVFSFileInfoOptions info_options, GnomeVFSDirectoryVisitOptions visit_options, --- 256,262 ---- <anchor id="gnome-vfs-directory-visit-uri"/>gnome_vfs_directory_visit_uri () ! GnomeVFSResult gnome_vfs_directory_visit_uri (GnomeVFSURI *uri, GnomeVFSFileInfoOptions info_options, GnomeVFSDirectoryVisitOptions visit_options, *************** *** 291,297 **** <anchor id="gnome-vfs-directory-visit-files"/>gnome_vfs_directory_visit_files () ! gnome_vfs_directory_visit_filesGnomeVFSResult gnome_vfs_directory_visit_files (const gchar *text_uri, GList *file_list, GnomeVFSFileInfoOptions info_options, --- 289,295 ---- <anchor id="gnome-vfs-directory-visit-files"/>gnome_vfs_directory_visit_files () ! GnomeVFSResult gnome_vfs_directory_visit_files (const gchar *text_uri, GList *file_list, GnomeVFSFileInfoOptions info_options, *************** *** 327,333 **** <anchor id="gnome-vfs-directory-visit-files-at-uri"/>gnome_vfs_directory_visit_files_at_uri () ! gnome_vfs_directory_visit_files_at_uriGnomeVFSResult gnome_vfs_directory_visit_files_at_uri (GnomeVFSURI *uri, GList *file_list, GnomeVFSFileInfoOptions info_options, --- 325,331 ---- <anchor id="gnome-vfs-directory-visit-files-at-uri"/>gnome_vfs_directory_visit_files_at_uri () ! GnomeVFSResult gnome_vfs_directory_visit_files_at_uri (GnomeVFSURI *uri, GList *file_list, GnomeVFSFileInfoOptions info_options, *************** *** 363,369 **** <anchor id="gnome-vfs-directory-list-load"/>gnome_vfs_directory_list_load () ! gnome_vfs_directory_list_loadGnomeVFSResult gnome_vfs_directory_list_load (GList **list, const gchar *text_uri, GnomeVFSFileInfoOptions options); --- 361,367 ---- <anchor id="gnome-vfs-directory-list-load"/>gnome_vfs_directory_list_load () ! GnomeVFSResult gnome_vfs_directory_list_load (GList **list, const gchar *text_uri, GnomeVFSFileInfoOptions options); diff -crN ./gnome-vfs/doc/xml/gnome-vfs-file-advanced-ops.xml /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/doc/xml/gnome-vfs-file-advanced-ops.xml *** ./gnome-vfs/doc/xml/gnome-vfs-file-advanced-ops.xml Mon Sep 8 14:19:48 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/doc/xml/gnome-vfs-file-advanced-ops.xml Thu Dec 18 21:22:58 2003 *************** *** 16,22 **** GnomeVFSResult gnome_vfs_file_control (GnomeVFSHandle *handle, ! const char *operation, gpointer operation_data); --- 16,22 ---- GnomeVFSResult gnome_vfs_file_control (GnomeVFSHandle *handle, ! const char *operation, gpointer operation_data); *************** *** 27,34 **** - - Description --- 27,32 ---- *************** *** 40,52 **** Details <anchor id="gnome-vfs-file-control"/>gnome_vfs_file_control () ! gnome_vfs_file_controlGnomeVFSResult gnome_vfs_file_control (GnomeVFSHandle *handle, ! const char *operation, gpointer operation_data); Execute a backend dependent operation specified by the string operation. This is typically used for specialized vfs backends that need additional ! operations that gnome-vfs doesn't have. Compare it to the unix call ioctl(). The format of operation_data depends on the operation. Operation that are backend specific are normally namespaced by their module name. --- 38,50 ---- Details <anchor id="gnome-vfs-file-control"/>gnome_vfs_file_control () ! GnomeVFSResult gnome_vfs_file_control (GnomeVFSHandle *handle, ! const char *operation, gpointer operation_data); Execute a backend dependent operation specified by the string operation. This is typically used for specialized vfs backends that need additional ! operations that gnome-vfs doesn't have. Compare it to the unix call ioctl(). The format of operation_data depends on the operation. Operation that are backend specific are normally namespaced by their module name. diff -crN ./gnome-vfs/doc/xml/gnome-vfs-file-basic-ops.xml /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/doc/xml/gnome-vfs-file-basic-ops.xml *** ./gnome-vfs/doc/xml/gnome-vfs-file-basic-ops.xml Mon Sep 8 14:19:48 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/doc/xml/gnome-vfs-file-basic-ops.xml Thu Dec 18 21:22:58 2003 *************** *** 60,67 **** - - Description --- 60,65 ---- *************** *** 73,79 **** Details <anchor id="GnomeVFSOpenMode"/>enum GnomeVFSOpenMode ! GnomeVFSOpenModetypedef enum { GNOME_VFS_OPEN_NONE = 0, GNOME_VFS_OPEN_READ = 1 << 0, GNOME_VFS_OPEN_WRITE = 1 << 1, --- 71,77 ---- Details <anchor id="GnomeVFSOpenMode"/>enum GnomeVFSOpenMode ! typedef enum { GNOME_VFS_OPEN_NONE = 0, GNOME_VFS_OPEN_READ = 1 << 0, GNOME_VFS_OPEN_WRITE = 1 << 1, *************** *** 88,94 **** <anchor id="gnome-vfs-create"/>gnome_vfs_create () ! gnome_vfs_createGnomeVFSResult gnome_vfs_create (GnomeVFSHandle **handle, const gchar *text_uri, GnomeVFSOpenMode open_mode, gboolean exclusive, --- 86,92 ---- <anchor id="gnome-vfs-create"/>gnome_vfs_create () ! GnomeVFSResult gnome_vfs_create (GnomeVFSHandle **handle, const gchar *text_uri, GnomeVFSOpenMode open_mode, gboolean exclusive, *************** *** 123,129 **** <anchor id="gnome-vfs-create-uri"/>gnome_vfs_create_uri () ! gnome_vfs_create_uriGnomeVFSResult gnome_vfs_create_uri (GnomeVFSHandle **handle, GnomeVFSURI *uri, GnomeVFSOpenMode open_mode, gboolean exclusive, --- 121,127 ---- <anchor id="gnome-vfs-create-uri"/>gnome_vfs_create_uri () ! GnomeVFSResult gnome_vfs_create_uri (GnomeVFSHandle **handle, GnomeVFSURI *uri, GnomeVFSOpenMode open_mode, gboolean exclusive, *************** *** 157,163 **** <anchor id="gnome-vfs-open"/>gnome_vfs_open () ! gnome_vfs_openGnomeVFSResult gnome_vfs_open (GnomeVFSHandle **handle, const gchar *text_uri, GnomeVFSOpenMode open_mode); --- 155,161 ---- <anchor id="gnome-vfs-open"/>gnome_vfs_open () ! GnomeVFSResult gnome_vfs_open (GnomeVFSHandle **handle, const gchar *text_uri, GnomeVFSOpenMode open_mode); *************** *** 180,186 **** <anchor id="gnome-vfs-open-uri"/>gnome_vfs_open_uri () ! gnome_vfs_open_uriGnomeVFSResult gnome_vfs_open_uri (GnomeVFSHandle **handle, GnomeVFSURI *uri, GnomeVFSOpenMode open_mode); --- 178,184 ---- <anchor id="gnome-vfs-open-uri"/>gnome_vfs_open_uri () ! GnomeVFSResult gnome_vfs_open_uri (GnomeVFSHandle **handle, GnomeVFSURI *uri, GnomeVFSOpenMode open_mode); *************** *** 203,209 **** <anchor id="gnome-vfs-close"/>gnome_vfs_close () ! gnome_vfs_closeGnomeVFSResult gnome_vfs_close (GnomeVFSHandle *handle); Close file associated with handle. --- 201,207 ---- <anchor id="gnome-vfs-close"/>gnome_vfs_close () ! GnomeVFSResult gnome_vfs_close (GnomeVFSHandle *handle); Close file associated with handle. *************** *** 217,223 **** <anchor id="gnome-vfs-unlink"/>gnome_vfs_unlink () ! gnome_vfs_unlinkGnomeVFSResult gnome_vfs_unlink (const gchar *text_uri); Unlink text_uri (i.e. delete the file). --- 215,221 ---- <anchor id="gnome-vfs-unlink"/>gnome_vfs_unlink () ! GnomeVFSResult gnome_vfs_unlink (const gchar *text_uri); Unlink text_uri (i.e. delete the file). *************** *** 231,237 **** <anchor id="gnome-vfs-unlink-from-uri"/>gnome_vfs_unlink_from_uri () ! gnome_vfs_unlink_from_uriGnomeVFSResult gnome_vfs_unlink_from_uri (GnomeVFSURI *uri); Unlink uri (i.e. delete the file). --- 229,235 ---- <anchor id="gnome-vfs-unlink-from-uri"/>gnome_vfs_unlink_from_uri () ! GnomeVFSResult gnome_vfs_unlink_from_uri (GnomeVFSURI *uri); Unlink uri (i.e. delete the file). *************** *** 245,257 **** <anchor id="gnome-vfs-move-uri"/>gnome_vfs_move_uri () ! gnome_vfs_move_uriGnomeVFSResult gnome_vfs_move_uri (GnomeVFSURI *old_uri, GnomeVFSURI *new_uri, gboolean force_replace); Move a file from URI old_uri to new_uri. This will only work if old_uri and new_uri are on the same file system. Otherwise, it is necessary ! to use the more general %gnome_vfs_xfer_uri() function. --- 243,255 ---- <anchor id="gnome-vfs-move-uri"/>gnome_vfs_move_uri () ! GnomeVFSResult gnome_vfs_move_uri (GnomeVFSURI *old_uri, GnomeVFSURI *new_uri, gboolean force_replace); Move a file from URI old_uri to new_uri. This will only work if old_uri and new_uri are on the same file system. Otherwise, it is necessary ! to use the more general %gnome_vfs_xfer_uri() function. *************** *** 270,282 **** <anchor id="gnome-vfs-move"/>gnome_vfs_move () ! gnome_vfs_moveGnomeVFSResult gnome_vfs_move (const gchar *old_text_uri, const gchar *new_text_uri, gboolean force_replace); Move a file from URI old_text_uri to new_text_uri. This will only work if old_text_uri and new_text_uri are on the same file system. Otherwise, ! it is necessary to use the more general %gnome_vfs_xfer_uri() function. --- 268,280 ---- <anchor id="gnome-vfs-move"/>gnome_vfs_move () ! GnomeVFSResult gnome_vfs_move (const gchar *old_text_uri, const gchar *new_text_uri, gboolean force_replace); Move a file from URI old_text_uri to new_text_uri. This will only work if old_text_uri and new_text_uri are on the same file system. Otherwise, ! it is necessary to use the more general %gnome_vfs_xfer_uri() function. *************** *** 295,301 **** <anchor id="gnome-vfs-check-same-fs-uris"/>gnome_vfs_check_same_fs_uris () ! gnome_vfs_check_same_fs_urisGnomeVFSResult gnome_vfs_check_same_fs_uris (GnomeVFSURI *source_uri, GnomeVFSURI *target_uri, gboolean *same_fs_return); --- 293,299 ---- <anchor id="gnome-vfs-check-same-fs-uris"/>gnome_vfs_check_same_fs_uris () ! GnomeVFSResult gnome_vfs_check_same_fs_uris (GnomeVFSURI *source_uri, GnomeVFSURI *target_uri, gboolean *same_fs_return); *************** *** 318,324 **** <anchor id="gnome-vfs-check-same-fs"/>gnome_vfs_check_same_fs () ! gnome_vfs_check_same_fsGnomeVFSResult gnome_vfs_check_same_fs (const gchar *source, const gchar *target, gboolean *same_fs_return); --- 316,322 ---- <anchor id="gnome-vfs-check-same-fs"/>gnome_vfs_check_same_fs () ! GnomeVFSResult gnome_vfs_check_same_fs (const gchar *source, const gchar *target, gboolean *same_fs_return); *************** *** 340,346 **** <anchor id="gnome-vfs-uri-exists"/>gnome_vfs_uri_exists () ! gnome_vfs_uri_existsgboolean gnome_vfs_uri_exists (GnomeVFSURI *uri); Check if the URI points to an existing entity. --- 338,344 ---- <anchor id="gnome-vfs-uri-exists"/>gnome_vfs_uri_exists () ! gboolean gnome_vfs_uri_exists (GnomeVFSURI *uri); Check if the URI points to an existing entity. *************** *** 354,360 **** <anchor id="gnome-vfs-create-symbolic-link"/>gnome_vfs_create_symbolic_link () ! gnome_vfs_create_symbolic_linkGnomeVFSResult gnome_vfs_create_symbolic_link (GnomeVFSURI *uri, const gchar *target_reference); --- 352,358 ---- <anchor id="gnome-vfs-create-symbolic-link"/>gnome_vfs_create_symbolic_link () ! GnomeVFSResult gnome_vfs_create_symbolic_link (GnomeVFSURI *uri, const gchar *target_reference); diff -crN ./gnome-vfs/doc/xml/gnome-vfs-file-info-ops.xml /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/doc/xml/gnome-vfs-file-info-ops.xml *** ./gnome-vfs/doc/xml/gnome-vfs-file-info-ops.xml Mon Sep 8 14:19:48 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/doc/xml/gnome-vfs-file-info-ops.xml Thu Dec 18 21:22:58 2003 *************** *** 40,60 **** - - Description ! Applications can use the gnome_vfs_get_file_info family of operations to retrieve file information, as this operation can be quite costly in terms of time (specilly when sniffing the MIME type) applications can specify which information need at any time, reducing the performance impact. ! All of these operations use a GnomeVFSFileInfo data structure that holds the file information, there are several methods that can be used to ! manipulate this information. See GnomeVFSFileInfo for more information. --- 40,58 ---- Description ! Applications can use the gnome_vfs_get_file_info family of operations to retrieve file information, as this operation can be quite costly in terms of time (specilly when sniffing the MIME type) applications can specify which information need at any time, reducing the performance impact. ! All of these operations use a GnomeVFSFileInfo data structure that holds the file information, there are several methods that can be used to ! manipulate this information. See GnomeVFSFileInfo for more information. *************** *** 62,68 **** Details <anchor id="gnome-vfs-get-file-info"/>gnome_vfs_get_file_info () ! gnome_vfs_get_file_infoGnomeVFSResult gnome_vfs_get_file_info (const gchar *text_uri, GnomeVFSFileInfo *info, GnomeVFSFileInfoOptions options); --- 60,66 ---- Details <anchor id="gnome-vfs-get-file-info"/>gnome_vfs_get_file_info () ! GnomeVFSResult gnome_vfs_get_file_info (const gchar *text_uri, GnomeVFSFileInfo *info, GnomeVFSFileInfoOptions options); *************** *** 87,93 **** <anchor id="gnome-vfs-get-file-info-uri"/>gnome_vfs_get_file_info_uri () ! gnome_vfs_get_file_info_uriGnomeVFSResult gnome_vfs_get_file_info_uri (GnomeVFSURI *uri, GnomeVFSFileInfo *info, GnomeVFSFileInfoOptions options); --- 85,91 ---- <anchor id="gnome-vfs-get-file-info-uri"/>gnome_vfs_get_file_info_uri () ! GnomeVFSResult gnome_vfs_get_file_info_uri (GnomeVFSURI *uri, GnomeVFSFileInfo *info, GnomeVFSFileInfoOptions options); *************** *** 112,118 **** <anchor id="gnome-vfs-get-file-info-from-handle"/>gnome_vfs_get_file_info_from_handle () ! gnome_vfs_get_file_info_from_handleGnomeVFSResult gnome_vfs_get_file_info_from_handle (GnomeVFSHandle *handle, GnomeVFSFileInfo *info, GnomeVFSFileInfoOptions options); --- 110,116 ---- <anchor id="gnome-vfs-get-file-info-from-handle"/>gnome_vfs_get_file_info_from_handle () ! GnomeVFSResult gnome_vfs_get_file_info_from_handle (GnomeVFSHandle *handle, GnomeVFSFileInfo *info, GnomeVFSFileInfoOptions options); *************** *** 138,144 **** <anchor id="gnome-vfs-set-file-info-uri"/>gnome_vfs_set_file_info_uri () ! gnome_vfs_set_file_info_uriGnomeVFSResult gnome_vfs_set_file_info_uri (GnomeVFSURI *uri, GnomeVFSFileInfo *info, GnomeVFSSetFileInfoMask mask); --- 136,142 ---- <anchor id="gnome-vfs-set-file-info-uri"/>gnome_vfs_set_file_info_uri () ! GnomeVFSResult gnome_vfs_set_file_info_uri (GnomeVFSURI *uri, GnomeVFSFileInfo *info, GnomeVFSSetFileInfoMask mask); *************** *** 161,167 **** <anchor id="gnome-vfs-set-file-info"/>gnome_vfs_set_file_info () ! gnome_vfs_set_file_infoGnomeVFSResult gnome_vfs_set_file_info (const gchar *text_uri, GnomeVFSFileInfo *info, GnomeVFSSetFileInfoMask mask); --- 159,165 ---- <anchor id="gnome-vfs-set-file-info"/>gnome_vfs_set_file_info () ! GnomeVFSResult gnome_vfs_set_file_info (const gchar *text_uri, GnomeVFSFileInfo *info, GnomeVFSSetFileInfoMask mask); *************** *** 193,199 **** ! GnomeVFSFileInfo --- 191,197 ---- ! GnomeVFSFileInfo diff -crN ./gnome-vfs/doc/xml/gnome-vfs-file-info.xml /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/doc/xml/gnome-vfs-file-info.xml *** ./gnome-vfs/doc/xml/gnome-vfs-file-info.xml Mon Sep 8 14:19:49 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/doc/xml/gnome-vfs-file-info.xml Thu Dec 18 21:22:59 2003 *************** *** 36,47 **** #define GNOME_VFS_FILE_INFO_SET_SGID (info, value) #define GNOME_VFS_FILE_INFO_SET_STICKY (info, value) GnomeVFSFileInfo* gnome_vfs_file_info_new (void); ! void gnome_vfs_file_info_unref (GnomeVFSFileInfo *info); ! void gnome_vfs_file_info_ref (GnomeVFSFileInfo *info); ! void gnome_vfs_file_info_clear (GnomeVFSFileInfo *info); ! const char* gnome_vfs_file_info_get_mime_type (GnomeVFSFileInfo *info); ! void gnome_vfs_file_info_copy (GnomeVFSFileInfo *dest, const GnomeVFSFileInfo *src); GnomeVFSFileInfo* gnome_vfs_file_info_dup (const GnomeVFSFileInfo *orig); gboolean gnome_vfs_file_info_matches (const GnomeVFSFileInfo *a, --- 36,47 ---- #define GNOME_VFS_FILE_INFO_SET_SGID (info, value) #define GNOME_VFS_FILE_INFO_SET_STICKY (info, value) GnomeVFSFileInfo* gnome_vfs_file_info_new (void); ! void gnome_vfs_file_info_unref (GnomeVFSFileInfo *info); ! void gnome_vfs_file_info_ref (GnomeVFSFileInfo *info); ! void gnome_vfs_file_info_clear (GnomeVFSFileInfo *info); ! const char* gnome_vfs_file_info_get_mime_type (GnomeVFSFileInfo *info); ! void gnome_vfs_file_info_copy (GnomeVFSFileInfo *dest, const GnomeVFSFileInfo *src); GnomeVFSFileInfo* gnome_vfs_file_info_dup (const GnomeVFSFileInfo *orig); gboolean gnome_vfs_file_info_matches (const GnomeVFSFileInfo *a, *************** *** 49,55 **** GList* gnome_vfs_file_info_list_ref (GList *list); GList* gnome_vfs_file_info_list_unref (GList *list); GList* gnome_vfs_file_info_list_copy (GList *list); ! void gnome_vfs_file_info_list_free (GList *list); --- 49,55 ---- GList* gnome_vfs_file_info_list_ref (GList *list); GList* gnome_vfs_file_info_list_unref (GList *list); GList* gnome_vfs_file_info_list_copy (GList *list); ! void gnome_vfs_file_info_list_free (GList *list); *************** *** 59,66 **** - - Description --- 59,64 ---- *************** *** 72,78 **** Details <anchor id="GnomeVFSFileFlags"/>enum GnomeVFSFileFlags ! GnomeVFSFileFlagstypedef enum { GNOME_VFS_FILE_FLAGS_NONE = 0, GNOME_VFS_FILE_FLAGS_SYMLINK = 1 << 0, GNOME_VFS_FILE_FLAGS_LOCAL = 1 << 1 --- 70,76 ---- Details <anchor id="GnomeVFSFileFlags"/>enum GnomeVFSFileFlags ! typedef enum { GNOME_VFS_FILE_FLAGS_NONE = 0, GNOME_VFS_FILE_FLAGS_SYMLINK = 1 << 0, GNOME_VFS_FILE_FLAGS_LOCAL = 1 << 1 *************** *** 80,86 **** Packed boolean bitfield representing special ! flags a GnomeVFSFileInfo struct can have. --- 78,84 ---- Packed boolean bitfield representing special ! flags a GnomeVFSFileInfo struct can have. *************** *** 102,108 **** <anchor id="GnomeVFSFileType"/>enum GnomeVFSFileType ! GnomeVFSFileTypetypedef enum { GNOME_VFS_FILE_TYPE_UNKNOWN, GNOME_VFS_FILE_TYPE_REGULAR, GNOME_VFS_FILE_TYPE_DIRECTORY, --- 100,106 ---- <anchor id="GnomeVFSFileType"/>enum GnomeVFSFileType ! typedef enum { GNOME_VFS_FILE_TYPE_UNKNOWN, GNOME_VFS_FILE_TYPE_REGULAR, GNOME_VFS_FILE_TYPE_DIRECTORY, *************** *** 114,127 **** } GnomeVFSFileType; ! Identifies the kind of file represented by a GnomeVFSFileInfo struct. (note, use of MIME types is preferred as this field may eventually disappear) <anchor id="GnomeVFSFileInfoFields"/>enum GnomeVFSFileInfoFields ! GnomeVFSFileInfoFieldstypedef enum { GNOME_VFS_FILE_INFO_FIELDS_NONE = 0, GNOME_VFS_FILE_INFO_FIELDS_TYPE = 1 << 0, GNOME_VFS_FILE_INFO_FIELDS_PERMISSIONS = 1 << 1, --- 112,125 ---- } GnomeVFSFileType; ! Identifies the kind of file represented by a GnomeVFSFileInfo struct. (note, use of MIME types is preferred as this field may eventually disappear) <anchor id="GnomeVFSFileInfoFields"/>enum GnomeVFSFileInfoFields ! typedef enum { GNOME_VFS_FILE_INFO_FIELDS_NONE = 0, GNOME_VFS_FILE_INFO_FIELDS_TYPE = 1 << 0, GNOME_VFS_FILE_INFO_FIELDS_PERMISSIONS = 1 << 1, *************** *** 231,237 **** <anchor id="GnomeVFSFilePermissions"/>enum GnomeVFSFilePermissions ! GnomeVFSFilePermissionstypedef enum { GNOME_VFS_PERM_SUID = S_ISUID, GNOME_VFS_PERM_SGID = S_ISGID, GNOME_VFS_PERM_STICKY = 01000, /* S_ISVTX not defined on all systems */ --- 229,235 ---- <anchor id="GnomeVFSFilePermissions"/>enum GnomeVFSFilePermissions ! typedef enum { GNOME_VFS_PERM_SUID = S_ISUID, GNOME_VFS_PERM_SGID = S_ISGID, GNOME_VFS_PERM_STICKY = 01000, /* S_ISVTX not defined on all systems */ *************** *** 351,357 **** <anchor id="GnomeVFSFileInfoOptions"/>enum GnomeVFSFileInfoOptions ! GnomeVFSFileInfoOptionstypedef enum { GNOME_VFS_FILE_INFO_DEFAULT = 0, GNOME_VFS_FILE_INFO_GET_MIME_TYPE = 1 << 0, GNOME_VFS_FILE_INFO_FORCE_FAST_MIME_TYPE = 1 << 1, --- 349,355 ---- <anchor id="GnomeVFSFileInfoOptions"/>enum GnomeVFSFileInfoOptions ! typedef enum { GNOME_VFS_FILE_INFO_DEFAULT = 0, GNOME_VFS_FILE_INFO_GET_MIME_TYPE = 1 << 0, GNOME_VFS_FILE_INFO_FORCE_FAST_MIME_TYPE = 1 << 1, *************** *** 362,368 **** Packed boolean bitfield representing options that can ! be passed into a gnome_vfs_get_file_info() call (or other related calls that return file info) and affect the operation of get_file_info. --- 360,366 ---- Packed boolean bitfield representing options that can ! be passed into a gnome_vfs_get_file_info() call (or other related calls that return file info) and affect the operation of get_file_info. *************** *** 407,413 **** <anchor id="GnomeVFSSetFileInfoMask"/>enum GnomeVFSSetFileInfoMask ! GnomeVFSSetFileInfoMasktypedef enum { GNOME_VFS_SET_FILE_INFO_NONE = 0, GNOME_VFS_SET_FILE_INFO_NAME = 1 << 0, GNOME_VFS_SET_FILE_INFO_PERMISSIONS = 1 << 1, --- 405,411 ---- <anchor id="GnomeVFSSetFileInfoMask"/>enum GnomeVFSSetFileInfoMask ! typedef enum { GNOME_VFS_SET_FILE_INFO_NONE = 0, GNOME_VFS_SET_FILE_INFO_NAME = 1 << 0, GNOME_VFS_SET_FILE_INFO_PERMISSIONS = 1 << 1, *************** *** 417,423 **** Packed boolean bitfield representing the aspects of the file ! to be changed in a gnome_vfs_set_file_info() call. --- 415,421 ---- Packed boolean bitfield representing the aspects of the file ! to be changed in a gnome_vfs_set_file_info() call. *************** *** 449,455 **** <anchor id="GnomeVFSGetFileInfoResult"/>GnomeVFSGetFileInfoResult ! GnomeVFSGetFileInfoResulttypedef struct { GnomeVFSURI *uri; GnomeVFSResult result; GnomeVFSFileInfo *file_info; --- 447,453 ---- <anchor id="GnomeVFSGetFileInfoResult"/>GnomeVFSGetFileInfoResult ! typedef struct { GnomeVFSURI *uri; GnomeVFSResult result; GnomeVFSFileInfo *file_info; *************** *** 460,466 **** <anchor id="GnomeVFSInodeNumber"/>GnomeVFSInodeNumber ! GnomeVFSInodeNumbertypedef GnomeVFSFileSize GnomeVFSInodeNumber; Represents the i-node of a file, this is a low level data structure --- 458,464 ---- <anchor id="GnomeVFSInodeNumber"/>GnomeVFSInodeNumber ! typedef GnomeVFSFileSize GnomeVFSInodeNumber; Represents the i-node of a file, this is a low level data structure *************** *** 470,476 **** <anchor id="GnomeVFSFileInfo"/>GnomeVFSFileInfo ! GnomeVFSFileInfotypedef struct { /* Base name of the file (no path). */ char *name; --- 468,474 ---- <anchor id="GnomeVFSFileInfo"/>GnomeVFSFileInfo ! typedef struct { /* Base name of the file (no path). */ char *name; *************** *** 536,542 **** <anchor id="GNOME-VFS-FILE-INFO-SYMLINK-CAPS"/>GNOME_VFS_FILE_INFO_SYMLINK() ! GNOME_VFS_FILE_INFO_SYMLINK#define GNOME_VFS_FILE_INFO_SYMLINK(info) Determines whether a file is a symbolic link given info. --- 534,540 ---- <anchor id="GNOME-VFS-FILE-INFO-SYMLINK-CAPS"/>GNOME_VFS_FILE_INFO_SYMLINK() ! #define GNOME_VFS_FILE_INFO_SYMLINK(info) Determines whether a file is a symbolic link given info. *************** *** 548,554 **** <anchor id="GNOME-VFS-FILE-INFO-SET-SYMLINK-CAPS"/>GNOME_VFS_FILE_INFO_SET_SYMLINK() ! GNOME_VFS_FILE_INFO_SET_SYMLINK#define GNOME_VFS_FILE_INFO_SET_SYMLINK(info, value) Set the symbolic link field in info to value. --- 546,552 ---- <anchor id="GNOME-VFS-FILE-INFO-SET-SYMLINK-CAPS"/>GNOME_VFS_FILE_INFO_SET_SYMLINK() ! #define GNOME_VFS_FILE_INFO_SET_SYMLINK(info, value) Set the symbolic link field in info to value. *************** *** 563,569 **** <anchor id="GNOME-VFS-FILE-INFO-LOCAL-CAPS"/>GNOME_VFS_FILE_INFO_LOCAL() ! GNOME_VFS_FILE_INFO_LOCAL#define GNOME_VFS_FILE_INFO_LOCAL(info) Determines whether a file is local given info. --- 561,567 ---- <anchor id="GNOME-VFS-FILE-INFO-LOCAL-CAPS"/>GNOME_VFS_FILE_INFO_LOCAL() ! #define GNOME_VFS_FILE_INFO_LOCAL(info) Determines whether a file is local given info. *************** *** 575,581 **** <anchor id="GNOME-VFS-FILE-INFO-SET-LOCAL-CAPS"/>GNOME_VFS_FILE_INFO_SET_LOCAL() ! GNOME_VFS_FILE_INFO_SET_LOCAL#define GNOME_VFS_FILE_INFO_SET_LOCAL(info, value) Set the "local file" field in info to value. --- 573,579 ---- <anchor id="GNOME-VFS-FILE-INFO-SET-LOCAL-CAPS"/>GNOME_VFS_FILE_INFO_SET_LOCAL() ! #define GNOME_VFS_FILE_INFO_SET_LOCAL(info, value) Set the "local file" field in info to value. *************** *** 590,596 **** <anchor id="GNOME-VFS-FILE-INFO-SUID-CAPS"/>GNOME_VFS_FILE_INFO_SUID() ! GNOME_VFS_FILE_INFO_SUID#define GNOME_VFS_FILE_INFO_SUID(info) Determines whether a file belongs to the super user. --- 588,594 ---- <anchor id="GNOME-VFS-FILE-INFO-SUID-CAPS"/>GNOME_VFS_FILE_INFO_SUID() ! #define GNOME_VFS_FILE_INFO_SUID(info) Determines whether a file belongs to the super user. *************** *** 602,608 **** <anchor id="GNOME-VFS-FILE-INFO-SGID-CAPS"/>GNOME_VFS_FILE_INFO_SGID() ! GNOME_VFS_FILE_INFO_SGID#define GNOME_VFS_FILE_INFO_SGID(info) Determines whether a file belongs to the super user's group. --- 600,606 ---- <anchor id="GNOME-VFS-FILE-INFO-SGID-CAPS"/>GNOME_VFS_FILE_INFO_SGID() ! #define GNOME_VFS_FILE_INFO_SGID(info) Determines whether a file belongs to the super user's group. *************** *** 614,620 **** <anchor id="GNOME-VFS-FILE-INFO-STICKY-CAPS"/>GNOME_VFS_FILE_INFO_STICKY() ! GNOME_VFS_FILE_INFO_STICKY#define GNOME_VFS_FILE_INFO_STICKY(info) Determines whether a file has the sticky bit set, given info --- 612,618 ---- <anchor id="GNOME-VFS-FILE-INFO-STICKY-CAPS"/>GNOME_VFS_FILE_INFO_STICKY() ! #define GNOME_VFS_FILE_INFO_STICKY(info) Determines whether a file has the sticky bit set, given info *************** *** 626,632 **** <anchor id="GNOME-VFS-FILE-INFO-SET-SUID-CAPS"/>GNOME_VFS_FILE_INFO_SET_SUID() ! GNOME_VFS_FILE_INFO_SET_SUID#define GNOME_VFS_FILE_INFO_SET_SUID(info, value) Set the SUID field in info to value. --- 624,630 ---- <anchor id="GNOME-VFS-FILE-INFO-SET-SUID-CAPS"/>GNOME_VFS_FILE_INFO_SET_SUID() ! #define GNOME_VFS_FILE_INFO_SET_SUID(info, value) Set the SUID field in info to value. *************** *** 641,647 **** <anchor id="GNOME-VFS-FILE-INFO-SET-SGID-CAPS"/>GNOME_VFS_FILE_INFO_SET_SGID() ! GNOME_VFS_FILE_INFO_SET_SGID#define GNOME_VFS_FILE_INFO_SET_SGID(info, value) Set the SGID field in info to value. --- 639,645 ---- <anchor id="GNOME-VFS-FILE-INFO-SET-SGID-CAPS"/>GNOME_VFS_FILE_INFO_SET_SGID() ! #define GNOME_VFS_FILE_INFO_SET_SGID(info, value) Set the SGID field in info to value. *************** *** 656,662 **** <anchor id="GNOME-VFS-FILE-INFO-SET-STICKY-CAPS"/>GNOME_VFS_FILE_INFO_SET_STICKY() ! GNOME_VFS_FILE_INFO_SET_STICKY#define GNOME_VFS_FILE_INFO_SET_STICKY(info, value) Set the sticky bit in info to value. --- 654,660 ---- <anchor id="GNOME-VFS-FILE-INFO-SET-STICKY-CAPS"/>GNOME_VFS_FILE_INFO_SET_STICKY() ! #define GNOME_VFS_FILE_INFO_SET_STICKY(info, value) Set the sticky bit in info to value. *************** *** 671,677 **** <anchor id="gnome-vfs-file-info-new"/>gnome_vfs_file_info_new () ! gnome_vfs_file_info_newGnomeVFSFileInfo* gnome_vfs_file_info_new (void); Allocate and initialize a new file information struct. --- 669,675 ---- <anchor id="gnome-vfs-file-info-new"/>gnome_vfs_file_info_new () ! GnomeVFSFileInfo* gnome_vfs_file_info_new (void); Allocate and initialize a new file information struct. *************** *** 682,688 **** <anchor id="gnome-vfs-file-info-unref"/>gnome_vfs_file_info_unref () ! gnome_vfs_file_info_unrefvoid gnome_vfs_file_info_unref (GnomeVFSFileInfo *info); Destroy info --- 680,686 ---- <anchor id="gnome-vfs-file-info-unref"/>gnome_vfs_file_info_unref () ! void gnome_vfs_file_info_unref (GnomeVFSFileInfo *info); Destroy info *************** *** 694,700 **** <anchor id="gnome-vfs-file-info-ref"/>gnome_vfs_file_info_ref () ! gnome_vfs_file_info_refvoid gnome_vfs_file_info_ref (GnomeVFSFileInfo *info); Increment reference count --- 692,698 ---- <anchor id="gnome-vfs-file-info-ref"/>gnome_vfs_file_info_ref () ! void gnome_vfs_file_info_ref (GnomeVFSFileInfo *info); Increment reference count *************** *** 706,712 **** <anchor id="gnome-vfs-file-info-clear"/>gnome_vfs_file_info_clear () ! gnome_vfs_file_info_clearvoid gnome_vfs_file_info_clear (GnomeVFSFileInfo *info); Clear info so that it's ready to accept new data. This is supposed to be used when info already contains meaningful information which --- 704,710 ---- <anchor id="gnome-vfs-file-info-clear"/>gnome_vfs_file_info_clear () ! void gnome_vfs_file_info_clear (GnomeVFSFileInfo *info); Clear info so that it's ready to accept new data. This is supposed to be used when info already contains meaningful information which *************** *** 720,726 **** <anchor id="gnome-vfs-file-info-get-mime-type"/>gnome_vfs_file_info_get_mime_type () ! gnome_vfs_file_info_get_mime_typeconst char* gnome_vfs_file_info_get_mime_type (GnomeVFSFileInfo *info); Retrieve MIME type from info. There is no need to free the return --- 718,724 ---- <anchor id="gnome-vfs-file-info-get-mime-type"/>gnome_vfs_file_info_get_mime_type () ! const char* gnome_vfs_file_info_get_mime_type (GnomeVFSFileInfo *info); Retrieve MIME type from info. There is no need to free the return *************** *** 736,742 **** <anchor id="gnome-vfs-file-info-copy"/>gnome_vfs_file_info_copy () ! gnome_vfs_file_info_copyvoid gnome_vfs_file_info_copy (GnomeVFSFileInfo *dest, const GnomeVFSFileInfo *src); Copy information from src into dest. --- 734,740 ---- <anchor id="gnome-vfs-file-info-copy"/>gnome_vfs_file_info_copy () ! void gnome_vfs_file_info_copy (GnomeVFSFileInfo *dest, const GnomeVFSFileInfo *src); Copy information from src into dest. *************** *** 752,758 **** <anchor id="gnome-vfs-file-info-dup"/>gnome_vfs_file_info_dup () ! gnome_vfs_file_info_dupGnomeVFSFileInfo* gnome_vfs_file_info_dup (const GnomeVFSFileInfo *orig); Duplicates orig and returns it. --- 750,756 ---- <anchor id="gnome-vfs-file-info-dup"/>gnome_vfs_file_info_dup () ! GnomeVFSFileInfo* gnome_vfs_file_info_dup (const GnomeVFSFileInfo *orig); Duplicates orig and returns it. *************** *** 766,772 **** <anchor id="gnome-vfs-file-info-matches"/>gnome_vfs_file_info_matches () ! gnome_vfs_file_info_matchesgboolean gnome_vfs_file_info_matches (const GnomeVFSFileInfo *a, const GnomeVFSFileInfo *b); Compare the two file info structs, return TRUE if they match. --- 764,770 ---- <anchor id="gnome-vfs-file-info-matches"/>gnome_vfs_file_info_matches () ! gboolean gnome_vfs_file_info_matches (const GnomeVFSFileInfo *a, const GnomeVFSFileInfo *b); Compare the two file info structs, return TRUE if they match. *************** *** 784,790 **** <anchor id="gnome-vfs-file-info-list-ref"/>gnome_vfs_file_info_list_ref () ! gnome_vfs_file_info_list_refGList* gnome_vfs_file_info_list_ref (GList *list); Increments the reference count of the items in list by one. --- 782,788 ---- <anchor id="gnome-vfs-file-info-list-ref"/>gnome_vfs_file_info_list_ref () ! GList* gnome_vfs_file_info_list_ref (GList *list); Increments the reference count of the items in list by one. *************** *** 798,804 **** <anchor id="gnome-vfs-file-info-list-unref"/>gnome_vfs_file_info_list_unref () ! gnome_vfs_file_info_list_unrefGList* gnome_vfs_file_info_list_unref (GList *list); Decrements the reference count of the items in list by one. Note that the list is *not freed* even if each member of the list --- 796,802 ---- <anchor id="gnome-vfs-file-info-list-unref"/>gnome_vfs_file_info_list_unref () ! GList* gnome_vfs_file_info_list_unref (GList *list); Decrements the reference count of the items in list by one. Note that the list is *not freed* even if each member of the list *************** *** 814,820 **** <anchor id="gnome-vfs-file-info-list-copy"/>gnome_vfs_file_info_list_copy () ! gnome_vfs_file_info_list_copyGList* gnome_vfs_file_info_list_copy (GList *list); Creates a duplicate of list, and references each member of that list. --- 812,818 ---- <anchor id="gnome-vfs-file-info-list-copy"/>gnome_vfs_file_info_list_copy () ! GList* gnome_vfs_file_info_list_copy (GList *list); Creates a duplicate of list, and references each member of that list. *************** *** 829,835 **** <anchor id="gnome-vfs-file-info-list-free"/>gnome_vfs_file_info_list_free () ! gnome_vfs_file_info_list_freevoid gnome_vfs_file_info_list_free (GList *list); Decrements the reference count of each member of list by one, and frees the list itself. --- 827,833 ---- <anchor id="gnome-vfs-file-info-list-free"/>gnome_vfs_file_info_list_free () ! void gnome_vfs_file_info_list_free (GList *list); Decrements the reference count of each member of list by one, and frees the list itself. diff -crN ./gnome-vfs/doc/xml/gnome-vfs-file-rw-ops.xml /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/doc/xml/gnome-vfs-file-rw-ops.xml *** ./gnome-vfs/doc/xml/gnome-vfs-file-rw-ops.xml Mon Sep 8 14:19:49 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/doc/xml/gnome-vfs-file-rw-ops.xml Thu Dec 18 21:22:58 2003 *************** *** 38,45 **** - - Description --- 38,43 ---- *************** *** 52,58 **** Details <anchor id="GnomeVFSSeekPosition"/>enum GnomeVFSSeekPosition ! GnomeVFSSeekPositiontypedef enum { GNOME_VFS_SEEK_START, GNOME_VFS_SEEK_CURRENT, GNOME_VFS_SEEK_END --- 50,56 ---- Details <anchor id="GnomeVFSSeekPosition"/>enum GnomeVFSSeekPosition ! typedef enum { GNOME_VFS_SEEK_START, GNOME_VFS_SEEK_CURRENT, GNOME_VFS_SEEK_END *************** *** 81,87 **** <anchor id="gnome-vfs-read"/>gnome_vfs_read () ! gnome_vfs_readGnomeVFSResult gnome_vfs_read (GnomeVFSHandle *handle, gpointer buffer, GnomeVFSFileSize bytes, GnomeVFSFileSize *bytes_read); --- 79,85 ---- <anchor id="gnome-vfs-read"/>gnome_vfs_read () ! GnomeVFSResult gnome_vfs_read (GnomeVFSHandle *handle, gpointer buffer, GnomeVFSFileSize bytes, GnomeVFSFileSize *bytes_read); *************** *** 110,116 **** <anchor id="gnome-vfs-write"/>gnome_vfs_write () ! gnome_vfs_writeGnomeVFSResult gnome_vfs_write (GnomeVFSHandle *handle, gconstpointer buffer, GnomeVFSFileSize bytes, GnomeVFSFileSize *bytes_written); --- 108,114 ---- <anchor id="gnome-vfs-write"/>gnome_vfs_write () ! GnomeVFSResult gnome_vfs_write (GnomeVFSHandle *handle, gconstpointer buffer, GnomeVFSFileSize bytes, GnomeVFSFileSize *bytes_written); *************** *** 139,145 **** <anchor id="gnome-vfs-seek"/>gnome_vfs_seek () ! gnome_vfs_seekGnomeVFSResult gnome_vfs_seek (GnomeVFSHandle *handle, GnomeVFSSeekPosition whence, GnomeVFSFileOffset offset); --- 137,143 ---- <anchor id="gnome-vfs-seek"/>gnome_vfs_seek () ! GnomeVFSResult gnome_vfs_seek (GnomeVFSHandle *handle, GnomeVFSSeekPosition whence, GnomeVFSFileOffset offset); *************** *** 162,168 **** <anchor id="gnome-vfs-tell"/>gnome_vfs_tell () ! gnome_vfs_tellGnomeVFSResult gnome_vfs_tell (GnomeVFSHandle *handle, GnomeVFSFileSize *offset_return); Return the current position on handle. This is the point in the file --- 160,166 ---- <anchor id="gnome-vfs-tell"/>gnome_vfs_tell () ! GnomeVFSResult gnome_vfs_tell (GnomeVFSHandle *handle, GnomeVFSFileSize *offset_return); Return the current position on handle. This is the point in the file diff -crN ./gnome-vfs/doc/xml/gnome-vfs-file-size.xml /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/doc/xml/gnome-vfs-file-size.xml *** ./gnome-vfs/doc/xml/gnome-vfs-file-size.xml Mon Sep 8 14:19:49 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/doc/xml/gnome-vfs-file-size.xml Thu Dec 18 21:22:57 2003 *************** *** 30,37 **** - - Description --- 30,35 ---- *************** *** 43,77 **** Details <anchor id="GNOME-VFS-OFFSET-IS-LONG-LONG-CAPS"/>GNOME_VFS_OFFSET_IS_LONG_LONG ! GNOME_VFS_OFFSET_IS_LONG_LONG#define GNOME_VFS_OFFSET_IS_LONG_LONG <anchor id="GNOME-VFS-SIZE-FORMAT-STR-CAPS"/>GNOME_VFS_SIZE_FORMAT_STR ! GNOME_VFS_SIZE_FORMAT_STR#define GNOME_VFS_SIZE_FORMAT_STR "Lu" <anchor id="GNOME-VFS-OFFSET-FORMAT-STR-CAPS"/>GNOME_VFS_OFFSET_FORMAT_STR ! GNOME_VFS_OFFSET_FORMAT_STR#define GNOME_VFS_OFFSET_FORMAT_STR "Ld" <anchor id="GnomeVFSFileSize"/>GnomeVFSFileSize ! GnomeVFSFileSizeG_GNUC_EXTENSION typedef unsigned long long GnomeVFSFileSize; <anchor id="GnomeVFSFileOffset"/>GnomeVFSFileOffset ! GnomeVFSFileOffsetG_GNUC_EXTENSION typedef long long GnomeVFSFileOffset; --- 41,75 ---- Details <anchor id="GNOME-VFS-OFFSET-IS-LONG-LONG-CAPS"/>GNOME_VFS_OFFSET_IS_LONG_LONG ! #define GNOME_VFS_OFFSET_IS_LONG_LONG <anchor id="GNOME-VFS-SIZE-FORMAT-STR-CAPS"/>GNOME_VFS_SIZE_FORMAT_STR ! #define GNOME_VFS_SIZE_FORMAT_STR "Lu" <anchor id="GNOME-VFS-OFFSET-FORMAT-STR-CAPS"/>GNOME_VFS_OFFSET_FORMAT_STR ! #define GNOME_VFS_OFFSET_FORMAT_STR "Ld" <anchor id="GnomeVFSFileSize"/>GnomeVFSFileSize ! G_GNUC_EXTENSION typedef unsigned long long GnomeVFSFileSize; <anchor id="GnomeVFSFileOffset"/>GnomeVFSFileOffset ! G_GNUC_EXTENSION typedef long long GnomeVFSFileOffset; diff -crN ./gnome-vfs/doc/xml/gnome-vfs-file-trunc-ops.xml /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/doc/xml/gnome-vfs-file-trunc-ops.xml *** ./gnome-vfs/doc/xml/gnome-vfs-file-trunc-ops.xml Mon Sep 8 14:19:49 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/doc/xml/gnome-vfs-file-trunc-ops.xml Thu Dec 18 21:22:58 2003 *************** *** 30,37 **** - - Description --- 30,35 ---- *************** *** 43,49 **** Details <anchor id="gnome-vfs-truncate"/>gnome_vfs_truncate () ! gnome_vfs_truncateGnomeVFSResult gnome_vfs_truncate (const gchar *text_uri, GnomeVFSFileSize length); Truncate the file at text_uri to length bytes. --- 41,47 ---- Details <anchor id="gnome-vfs-truncate"/>gnome_vfs_truncate () ! GnomeVFSResult gnome_vfs_truncate (const gchar *text_uri, GnomeVFSFileSize length); Truncate the file at text_uri to length bytes. *************** *** 61,67 **** <anchor id="gnome-vfs-truncate-uri"/>gnome_vfs_truncate_uri () ! gnome_vfs_truncate_uriGnomeVFSResult gnome_vfs_truncate_uri (GnomeVFSURI *uri, GnomeVFSFileSize length); Truncate the file at uri to be only length bytes. Data past length --- 59,65 ---- <anchor id="gnome-vfs-truncate-uri"/>gnome_vfs_truncate_uri () ! GnomeVFSResult gnome_vfs_truncate_uri (GnomeVFSURI *uri, GnomeVFSFileSize length); Truncate the file at uri to be only length bytes. Data past length *************** *** 80,86 **** <anchor id="gnome-vfs-truncate-handle"/>gnome_vfs_truncate_handle () ! gnome_vfs_truncate_handleGnomeVFSResult gnome_vfs_truncate_handle (GnomeVFSHandle *handle, GnomeVFSFileSize length); Truncate the file pointed to be handle to be only length bytes. --- 78,84 ---- <anchor id="gnome-vfs-truncate-handle"/>gnome_vfs_truncate_handle () ! GnomeVFSResult gnome_vfs_truncate_handle (GnomeVFSHandle *handle, GnomeVFSFileSize length); Truncate the file pointed to be handle to be only length bytes. diff -crN ./gnome-vfs/doc/xml/gnome-vfs-inet-connection.xml /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/doc/xml/gnome-vfs-inet-connection.xml *** ./gnome-vfs/doc/xml/gnome-vfs-inet-connection.xml Mon Sep 8 14:19:49 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/doc/xml/gnome-vfs-inet-connection.xml Thu Dec 18 21:22:59 2003 *************** *** 20,35 **** const gchar *host_name, guint host_port, GnomeVFSCancellation *cancellation); ! void gnome_vfs_inet_connection_destroy (GnomeVFSInetConnection *connection, GnomeVFSCancellation *cancellation); ! void gnome_vfs_inet_connection_free (GnomeVFSInetConnection *connection, GnomeVFSCancellation *cancellation); GnomeVFSSocket* gnome_vfs_inet_connection_to_socket (GnomeVFSInetConnection *connection); GnomeVFSSocketBuffer* gnome_vfs_inet_connection_to_socket_buffer (GnomeVFSInetConnection *connection); ! int gnome_vfs_inet_connection_get_fd (GnomeVFSInetConnection *connection); --- 20,35 ---- const gchar *host_name, guint host_port, GnomeVFSCancellation *cancellation); ! void gnome_vfs_inet_connection_destroy (GnomeVFSInetConnection *connection, GnomeVFSCancellation *cancellation); ! void gnome_vfs_inet_connection_free (GnomeVFSInetConnection *connection, GnomeVFSCancellation *cancellation); GnomeVFSSocket* gnome_vfs_inet_connection_to_socket (GnomeVFSInetConnection *connection); GnomeVFSSocketBuffer* gnome_vfs_inet_connection_to_socket_buffer (GnomeVFSInetConnection *connection); ! int gnome_vfs_inet_connection_get_fd (GnomeVFSInetConnection *connection); *************** *** 40,47 **** - - Description --- 40,45 ---- *************** *** 53,59 **** Details <anchor id="gnome-vfs-inet-connection-create"/>gnome_vfs_inet_connection_create () ! gnome_vfs_inet_connection_createGnomeVFSResult gnome_vfs_inet_connection_create (GnomeVFSInetConnection **connection_return, const gchar *host_name, guint host_port, --- 51,57 ---- Details <anchor id="gnome-vfs-inet-connection-create"/>gnome_vfs_inet_connection_create () ! GnomeVFSResult gnome_vfs_inet_connection_create (GnomeVFSInetConnection **connection_return, const gchar *host_name, guint host_port, *************** *** 82,88 **** <anchor id="gnome-vfs-inet-connection-destroy"/>gnome_vfs_inet_connection_destroy () ! gnome_vfs_inet_connection_destroyvoid gnome_vfs_inet_connection_destroy (GnomeVFSInetConnection *connection, GnomeVFSCancellation *cancellation); --- 80,86 ---- <anchor id="gnome-vfs-inet-connection-destroy"/>gnome_vfs_inet_connection_destroy () ! void gnome_vfs_inet_connection_destroy (GnomeVFSInetConnection *connection, GnomeVFSCancellation *cancellation); *************** *** 99,105 **** <anchor id="gnome-vfs-inet-connection-free"/>gnome_vfs_inet_connection_free () ! gnome_vfs_inet_connection_freevoid gnome_vfs_inet_connection_free (GnomeVFSInetConnection *connection, GnomeVFSCancellation *cancellation); --- 97,103 ---- <anchor id="gnome-vfs-inet-connection-free"/>gnome_vfs_inet_connection_free () ! void gnome_vfs_inet_connection_free (GnomeVFSInetConnection *connection, GnomeVFSCancellation *cancellation); *************** *** 115,121 **** <anchor id="gnome-vfs-inet-connection-to-socket"/>gnome_vfs_inet_connection_to_socket () ! gnome_vfs_inet_connection_to_socketGnomeVFSSocket* gnome_vfs_inet_connection_to_socket (GnomeVFSInetConnection *connection); Wrapper connection inside a standard GnomeVFSSocket for convenience. --- 113,119 ---- <anchor id="gnome-vfs-inet-connection-to-socket"/>gnome_vfs_inet_connection_to_socket () ! GnomeVFSSocket* gnome_vfs_inet_connection_to_socket (GnomeVFSInetConnection *connection); Wrapper connection inside a standard GnomeVFSSocket for convenience. *************** *** 130,136 **** <anchor id="gnome-vfs-inet-connection-to-socket-buffer"/>gnome_vfs_inet_connection_to_socket_buffer () ! gnome_vfs_inet_connection_to_socket_bufferGnomeVFSSocketBuffer* gnome_vfs_inet_connection_to_socket_buffer (GnomeVFSInetConnection *connection); Wrapper connection inside a standard GnomeVFSSocketBuffer for convenience. --- 128,134 ---- <anchor id="gnome-vfs-inet-connection-to-socket-buffer"/>gnome_vfs_inet_connection_to_socket_buffer () ! GnomeVFSSocketBuffer* gnome_vfs_inet_connection_to_socket_buffer (GnomeVFSInetConnection *connection); Wrapper connection inside a standard GnomeVFSSocketBuffer for convenience. *************** *** 145,151 **** <anchor id="gnome-vfs-inet-connection-get-fd"/>gnome_vfs_inet_connection_get_fd () ! gnome_vfs_inet_connection_get_fdint gnome_vfs_inet_connection_get_fd (GnomeVFSInetConnection *connection); Retrieve the UNIX file descriptor corresponding to connection. --- 143,149 ---- <anchor id="gnome-vfs-inet-connection-get-fd"/>gnome_vfs_inet_connection_get_fd () ! int gnome_vfs_inet_connection_get_fd (GnomeVFSInetConnection *connection); Retrieve the UNIX file descriptor corresponding to connection. diff -crN ./gnome-vfs/doc/xml/gnome-vfs-init.xml /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/doc/xml/gnome-vfs-init.xml *** ./gnome-vfs/doc/xml/gnome-vfs-init.xml Mon Sep 8 14:19:50 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/doc/xml/gnome-vfs-init.xml Thu Dec 18 21:22:57 2003 *************** *** 17,28 **** gboolean gnome_vfs_init (void); gboolean gnome_vfs_initialized (void); ! void gnome_vfs_shutdown (void); ! void gnome_vfs_loadinit (gpointer app, gpointer modinfo); ! void gnome_vfs_preinit (gpointer app, gpointer modinfo); ! void gnome_vfs_postinit (gpointer app, gpointer modinfo); --- 17,28 ---- gboolean gnome_vfs_init (void); gboolean gnome_vfs_initialized (void); ! void gnome_vfs_shutdown (void); ! void gnome_vfs_loadinit (gpointer app, gpointer modinfo); ! void gnome_vfs_preinit (gpointer app, gpointer modinfo); ! void gnome_vfs_postinit (gpointer app, gpointer modinfo); *************** *** 33,40 **** - - Description --- 33,38 ---- *************** *** 48,54 **** Details <anchor id="gnome-vfs-init"/>gnome_vfs_init () ! gnome_vfs_initgboolean gnome_vfs_init (void); If GnomeVFS is not already initialized, initialize it. This must be called prior to performing any other GnomeVFS operations, and may --- 46,52 ---- Details <anchor id="gnome-vfs-init"/>gnome_vfs_init () ! gboolean gnome_vfs_init (void); If GnomeVFS is not already initialized, initialize it. This must be called prior to performing any other GnomeVFS operations, and may *************** *** 62,68 **** <anchor id="gnome-vfs-initialized"/>gnome_vfs_initialized () ! gnome_vfs_initializedgboolean gnome_vfs_initialized (void); Detects if GnomeVFS has already been initialized (GnomeVFS must be initialized prior to using any methods or operations). --- 60,66 ---- <anchor id="gnome-vfs-initialized"/>gnome_vfs_initialized () ! gboolean gnome_vfs_initialized (void); Detects if GnomeVFS has already been initialized (GnomeVFS must be initialized prior to using any methods or operations). *************** *** 74,80 **** <anchor id="gnome-vfs-shutdown"/>gnome_vfs_shutdown () ! gnome_vfs_shutdownvoid gnome_vfs_shutdown (void); Cease all active GnomeVFS operations and unload the MIME database from memory. --- 72,78 ---- <anchor id="gnome-vfs-shutdown"/>gnome_vfs_shutdown () ! void gnome_vfs_shutdown (void); Cease all active GnomeVFS operations and unload the MIME database from memory. *************** *** 83,89 **** <anchor id="gnome-vfs-loadinit"/>gnome_vfs_loadinit () ! gnome_vfs_loadinitvoid gnome_vfs_loadinit (gpointer app, gpointer modinfo); --- 81,87 ---- <anchor id="gnome-vfs-loadinit"/>gnome_vfs_loadinit () ! void gnome_vfs_loadinit (gpointer app, gpointer modinfo); *************** *** 99,105 **** <anchor id="gnome-vfs-preinit"/>gnome_vfs_preinit () ! gnome_vfs_preinitvoid gnome_vfs_preinit (gpointer app, gpointer modinfo); --- 97,103 ---- <anchor id="gnome-vfs-preinit"/>gnome_vfs_preinit () ! void gnome_vfs_preinit (gpointer app, gpointer modinfo); *************** *** 115,121 **** <anchor id="gnome-vfs-postinit"/>gnome_vfs_postinit () ! gnome_vfs_postinitvoid gnome_vfs_postinit (gpointer app, gpointer modinfo); --- 113,119 ---- <anchor id="gnome-vfs-postinit"/>gnome_vfs_postinit () ! void gnome_vfs_postinit (gpointer app, gpointer modinfo); diff -crN ./gnome-vfs/doc/xml/gnome-vfs-method.xml /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/doc/xml/gnome-vfs-method.xml *** ./gnome-vfs/doc/xml/gnome-vfs-method.xml Mon Sep 8 14:19:50 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/doc/xml/gnome-vfs-method.xml Thu Dec 18 21:22:59 2003 *************** *** 15,23 **** ! GnomeVFSMethod* (*GnomeVFSMethodInitFunc) (const char *method_name, ! const char *config_args); ! void (*GnomeVFSMethodShutdownFunc) (GnomeVFSMethod *method); GnomeVFSResult (*GnomeVFSMethodTruncateFunc) (GnomeVFSMethod *method, GnomeVFSURI *uri, --- 15,23 ---- ! GnomeVFSMethod* (*GnomeVFSMethodInitFunc) (const char *method_name, ! const char *config_args); ! void (*GnomeVFSMethodShutdownFunc) (GnomeVFSMethod *method); GnomeVFSResult (*GnomeVFSMethodTruncateFunc) (GnomeVFSMethod *method, GnomeVFSURI *uri, *************** *** 41,48 **** - - Description --- 41,46 ---- *************** *** 54,61 **** Details <anchor id="GnomeVFSMethodInitFunc"/>GnomeVFSMethodInitFunc () ! GnomeVFSMethodInitFuncGnomeVFSMethod* (*GnomeVFSMethodInitFunc) (const char *method_name, ! const char *config_args); --- 52,59 ---- Details <anchor id="GnomeVFSMethodInitFunc"/>GnomeVFSMethodInitFunc () ! GnomeVFSMethod* (*GnomeVFSMethodInitFunc) (const char *method_name, ! const char *config_args); *************** *** 72,78 **** <anchor id="GnomeVFSMethodShutdownFunc"/>GnomeVFSMethodShutdownFunc () ! GnomeVFSMethodShutdownFuncvoid (*GnomeVFSMethodShutdownFunc) (GnomeVFSMethod *method); --- 70,76 ---- <anchor id="GnomeVFSMethodShutdownFunc"/>GnomeVFSMethodShutdownFunc () ! void (*GnomeVFSMethodShutdownFunc) (GnomeVFSMethod *method); *************** *** 84,90 **** <anchor id="GnomeVFSMethodTruncateFunc"/>GnomeVFSMethodTruncateFunc () ! GnomeVFSMethodTruncateFuncGnomeVFSResult (*GnomeVFSMethodTruncateFunc) (GnomeVFSMethod *method, GnomeVFSURI *uri, GnomeVFSFileSize length, --- 82,88 ---- <anchor id="GnomeVFSMethodTruncateFunc"/>GnomeVFSMethodTruncateFunc () ! GnomeVFSResult (*GnomeVFSMethodTruncateFunc) (GnomeVFSMethod *method, GnomeVFSURI *uri, GnomeVFSFileSize length, *************** *** 111,117 **** <anchor id="GnomeVFSMethodTruncateHandleFunc"/>GnomeVFSMethodTruncateHandleFunc () ! GnomeVFSMethodTruncateHandleFuncGnomeVFSResult (*GnomeVFSMethodTruncateHandleFunc) (GnomeVFSMethod *method, GnomeVFSMethodHandle *handle, GnomeVFSFileSize length, --- 109,115 ---- <anchor id="GnomeVFSMethodTruncateHandleFunc"/>GnomeVFSMethodTruncateHandleFunc () ! GnomeVFSResult (*GnomeVFSMethodTruncateHandleFunc) (GnomeVFSMethod *method, GnomeVFSMethodHandle *handle, GnomeVFSFileSize length, *************** *** 138,144 **** <anchor id="VFS-METHOD-HAS-FUNC-CAPS"/>VFS_METHOD_HAS_FUNC() ! VFS_METHOD_HAS_FUNC#define VFS_METHOD_HAS_FUNC(method,func) ((((char *)&((method)->func)) - ((char *)(method)) < (method)->method_table_size) && method->func != NULL) --- 136,142 ---- <anchor id="VFS-METHOD-HAS-FUNC-CAPS"/>VFS_METHOD_HAS_FUNC() ! #define VFS_METHOD_HAS_FUNC(method,func) ((((char *)&((method)->func)) - ((char *)(method)) < (method)->method_table_size) && method->func != NULL) *************** *** 154,160 **** <anchor id="gnome-vfs-method-init"/>gnome_vfs_method_init () ! gnome_vfs_method_initgboolean gnome_vfs_method_init (void); --- 152,158 ---- <anchor id="gnome-vfs-method-init"/>gnome_vfs_method_init () ! gboolean gnome_vfs_method_init (void); *************** *** 165,171 **** <anchor id="gnome-vfs-method-get"/>gnome_vfs_method_get () ! gnome_vfs_method_getGnomeVFSMethod* gnome_vfs_method_get (const gchar *name); --- 163,169 ---- <anchor id="gnome-vfs-method-get"/>gnome_vfs_method_get () ! GnomeVFSMethod* gnome_vfs_method_get (const gchar *name); *************** *** 179,185 **** <anchor id="gnome-vfs-transform-get"/>gnome_vfs_transform_get () ! gnome_vfs_transform_getGnomeVFSTransform* gnome_vfs_transform_get (const gchar *name); --- 177,183 ---- <anchor id="gnome-vfs-transform-get"/>gnome_vfs_transform_get () ! GnomeVFSTransform* gnome_vfs_transform_get (const gchar *name); diff -crN ./gnome-vfs/doc/xml/gnome-vfs-mime-database.xml /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/doc/xml/gnome-vfs-mime-database.xml *** ./gnome-vfs/doc/xml/gnome-vfs-mime-database.xml Mon Sep 8 14:19:50 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/doc/xml/gnome-vfs-mime-database.xml Thu Dec 18 21:23:00 2003 *************** *** 17,156 **** #define GNOME_VFS_MIME_TYPE_UNKNOWN ! const char* gnome_vfs_get_mime_type_for_data (gconstpointer data, ! int data_size); ! char* gnome_vfs_get_mime_type (const char *text_uri); enum GnomeVFSMimeActionType; enum GnomeVFSMimeApplicationArgumentType; typedef GnomeVFSMimeApplication; GnomeVFSMimeApplication* gnome_vfs_mime_application_copy (GnomeVFSMimeApplication *application); GnomeVFSMimeActionType gnome_vfs_mime_get_default_action_type ! (const char *mime_type); GnomeVFSMimeAction* gnome_vfs_mime_get_default_action ! (const char *mime_type); GnomeVFSMimeApplication* gnome_vfs_mime_get_default_application ! (const char *mime_type); Bonobo_ServerInfo* gnome_vfs_mime_get_default_component ! (const char *mime_type); GList* gnome_vfs_mime_get_short_list_applications ! (const char *mime_type); GList* gnome_vfs_mime_get_short_list_components ! (const char *mime_type); GList* gnome_vfs_mime_get_all_applications ! (const char *mime_type); GList* gnome_vfs_mime_get_all_components ! (const char *mime_type); GnomeVFSResult gnome_vfs_mime_set_default_action_type ! (const char *mime_type, GnomeVFSMimeActionType action_type); GnomeVFSResult gnome_vfs_mime_set_default_application ! (const char *mime_type, ! const char *application_id); GnomeVFSResult gnome_vfs_mime_set_default_component ! (const char *mime_type, ! const char *component_iid); ! const char* gnome_vfs_mime_get_icon (const char *mime_type); ! GnomeVFSResult gnome_vfs_mime_set_icon (const char *mime_type, ! const char *filename); ! const char* gnome_vfs_mime_get_description (const char *mime_type); GnomeVFSResult gnome_vfs_mime_set_description ! (const char *mime_type, ! const char *description); gboolean gnome_vfs_mime_can_be_executable ! (const char *mime_type); GnomeVFSResult gnome_vfs_mime_set_can_be_executable ! (const char *mime_type, gboolean new_value); GnomeVFSResult gnome_vfs_mime_set_short_list_applications ! (const char *mime_type, GList *application_ids); GnomeVFSResult gnome_vfs_mime_set_short_list_components ! (const char *mime_type, GList *component_iids); GnomeVFSResult gnome_vfs_mime_add_application_to_short_list ! (const char *mime_type, ! const char *application_id); GnomeVFSResult gnome_vfs_mime_remove_application_from_short_list ! (const char *mime_type, ! const char *application_id); GnomeVFSResult gnome_vfs_mime_add_component_to_short_list ! (const char *mime_type, ! const char *iid); GnomeVFSResult gnome_vfs_mime_remove_component_from_short_list ! (const char *mime_type, ! const char *iid); ! GnomeVFSResult gnome_vfs_mime_add_extension (const char *mime_type, ! const char *extension); GnomeVFSResult gnome_vfs_mime_remove_extension ! (const char *mime_type, ! const char *extension); GnomeVFSResult gnome_vfs_mime_extend_all_applications ! (const char *mime_type, GList *application_ids); GnomeVFSResult gnome_vfs_mime_remove_from_all_applications ! (const char *mime_type, GList *application_ids); GnomeVFSMimeApplication* gnome_vfs_mime_application_new_from_id ! (const char *id); ! void gnome_vfs_mime_application_free (GnomeVFSMimeApplication *application); ! void gnome_vfs_mime_action_free (GnomeVFSMimeAction *action); ! void gnome_vfs_mime_application_list_free (GList *list); ! void gnome_vfs_mime_component_list_free (GList *list); gboolean gnome_vfs_mime_id_in_application_list ! (const char *id, GList *applications); gboolean gnome_vfs_mime_id_in_component_list ! (const char *iid, GList *components); GList* gnome_vfs_mime_remove_application_from_list (GList *applications, ! const char *application_id, gboolean *did_remove); GList* gnome_vfs_mime_remove_component_from_list (GList *components, ! const char *iid, gboolean *did_remove); GList* gnome_vfs_mime_id_list_from_component_list (GList *components); GList* gnome_vfs_mime_id_list_from_application_list (GList *applications); ! void gnome_vfs_mime_freeze (void); ! void gnome_vfs_mime_thaw (void); ! void gnome_vfs_mime_info_reload (void); ! gboolean gnome_vfs_mime_type_is_known (const char *mime_type); ! const char* gnome_vfs_mime_get_value (const char *mime_type, ! const char *key); ! GnomeVFSResult gnome_vfs_mime_set_value (const char *mime_type, ! const char *key, ! const char *value); ! GList* gnome_vfs_mime_get_key_list (const char *mime_type); ! void gnome_vfs_mime_keys_list_free (GList *mime_type_list); GList* gnome_vfs_mime_get_extensions_list ! (const char *mime_type); ! void gnome_vfs_mime_extensions_list_free (GList *list); ! char* gnome_vfs_mime_get_extensions_string ! (const char *mime_type); ! char* gnome_vfs_mime_get_extensions_pretty_string ! (const char *mime_type); GList* gnome_vfs_get_registered_mime_types (void); ! void gnome_vfs_mime_registered_mime_type_list_free (GList *list); GnomeVFSResult gnome_vfs_mime_set_registered_type_key ! (const char *mime_type, ! const char *key, ! const char *data); GnomeVFSResult gnome_vfs_mime_set_extensions_list ! (const char *mime_type, ! const char *extensions_list); ! void gnome_vfs_mime_registered_mime_type_delete ! (const char *mime_type); ! void gnome_vfs_mime_reset (void); --- 17,156 ---- #define GNOME_VFS_MIME_TYPE_UNKNOWN ! const char* gnome_vfs_get_mime_type_for_data (gconstpointer data, ! int data_size); ! char* gnome_vfs_get_mime_type (const char *text_uri); enum GnomeVFSMimeActionType; enum GnomeVFSMimeApplicationArgumentType; typedef GnomeVFSMimeApplication; GnomeVFSMimeApplication* gnome_vfs_mime_application_copy (GnomeVFSMimeApplication *application); GnomeVFSMimeActionType gnome_vfs_mime_get_default_action_type ! (const char *mime_type); GnomeVFSMimeAction* gnome_vfs_mime_get_default_action ! (const char *mime_type); GnomeVFSMimeApplication* gnome_vfs_mime_get_default_application ! (const char *mime_type); Bonobo_ServerInfo* gnome_vfs_mime_get_default_component ! (const char *mime_type); GList* gnome_vfs_mime_get_short_list_applications ! (const char *mime_type); GList* gnome_vfs_mime_get_short_list_components ! (const char *mime_type); GList* gnome_vfs_mime_get_all_applications ! (const char *mime_type); GList* gnome_vfs_mime_get_all_components ! (const char *mime_type); GnomeVFSResult gnome_vfs_mime_set_default_action_type ! (const char *mime_type, GnomeVFSMimeActionType action_type); GnomeVFSResult gnome_vfs_mime_set_default_application ! (const char *mime_type, ! const char *application_id); GnomeVFSResult gnome_vfs_mime_set_default_component ! (const char *mime_type, ! const char *component_iid); ! const char* gnome_vfs_mime_get_icon (const char *mime_type); ! GnomeVFSResult gnome_vfs_mime_set_icon (const char *mime_type, ! const char *filename); ! const char* gnome_vfs_mime_get_description (const char *mime_type); GnomeVFSResult gnome_vfs_mime_set_description ! (const char *mime_type, ! const char *description); gboolean gnome_vfs_mime_can_be_executable ! (const char *mime_type); GnomeVFSResult gnome_vfs_mime_set_can_be_executable ! (const char *mime_type, gboolean new_value); GnomeVFSResult gnome_vfs_mime_set_short_list_applications ! (const char *mime_type, GList *application_ids); GnomeVFSResult gnome_vfs_mime_set_short_list_components ! (const char *mime_type, GList *component_iids); GnomeVFSResult gnome_vfs_mime_add_application_to_short_list ! (const char *mime_type, ! const char *application_id); GnomeVFSResult gnome_vfs_mime_remove_application_from_short_list ! (const char *mime_type, ! const char *application_id); GnomeVFSResult gnome_vfs_mime_add_component_to_short_list ! (const char *mime_type, ! const char *iid); GnomeVFSResult gnome_vfs_mime_remove_component_from_short_list ! (const char *mime_type, ! const char *iid); ! GnomeVFSResult gnome_vfs_mime_add_extension (const char *mime_type, ! const char *extension); GnomeVFSResult gnome_vfs_mime_remove_extension ! (const char *mime_type, ! const char *extension); GnomeVFSResult gnome_vfs_mime_extend_all_applications ! (const char *mime_type, GList *application_ids); GnomeVFSResult gnome_vfs_mime_remove_from_all_applications ! (const char *mime_type, GList *application_ids); GnomeVFSMimeApplication* gnome_vfs_mime_application_new_from_id ! (const char *id); ! void gnome_vfs_mime_application_free (GnomeVFSMimeApplication *application); ! void gnome_vfs_mime_action_free (GnomeVFSMimeAction *action); ! void gnome_vfs_mime_application_list_free (GList *list); ! void gnome_vfs_mime_component_list_free (GList *list); gboolean gnome_vfs_mime_id_in_application_list ! (const char *id, GList *applications); gboolean gnome_vfs_mime_id_in_component_list ! (const char *iid, GList *components); GList* gnome_vfs_mime_remove_application_from_list (GList *applications, ! const char *application_id, gboolean *did_remove); GList* gnome_vfs_mime_remove_component_from_list (GList *components, ! const char *iid, gboolean *did_remove); GList* gnome_vfs_mime_id_list_from_component_list (GList *components); GList* gnome_vfs_mime_id_list_from_application_list (GList *applications); ! void gnome_vfs_mime_freeze (void); ! void gnome_vfs_mime_thaw (void); ! void gnome_vfs_mime_info_reload (void); ! gboolean gnome_vfs_mime_type_is_known (const char *mime_type); ! const char* gnome_vfs_mime_get_value (const char *mime_type, ! const char *key); ! GnomeVFSResult gnome_vfs_mime_set_value (const char *mime_type, ! const char *key, ! const char *value); ! GList* gnome_vfs_mime_get_key_list (const char *mime_type); ! void gnome_vfs_mime_keys_list_free (GList *mime_type_list); GList* gnome_vfs_mime_get_extensions_list ! (const char *mime_type); ! void gnome_vfs_mime_extensions_list_free (GList *list); ! char* gnome_vfs_mime_get_extensions_string ! (const char *mime_type); ! char* gnome_vfs_mime_get_extensions_pretty_string ! (const char *mime_type); GList* gnome_vfs_get_registered_mime_types (void); ! void gnome_vfs_mime_registered_mime_type_list_free (GList *list); GnomeVFSResult gnome_vfs_mime_set_registered_type_key ! (const char *mime_type, ! const char *key, ! const char *data); GnomeVFSResult gnome_vfs_mime_set_extensions_list ! (const char *mime_type, ! const char *extensions_list); ! void gnome_vfs_mime_registered_mime_type_delete ! (const char *mime_type); ! void gnome_vfs_mime_reset (void); *************** *** 160,167 **** - - Description --- 160,165 ---- *************** *** 173,179 **** Details <anchor id="GNOME-VFS-MIME-TYPE-UNKNOWN-CAPS"/>GNOME_VFS_MIME_TYPE_UNKNOWN ! GNOME_VFS_MIME_TYPE_UNKNOWN#define GNOME_VFS_MIME_TYPE_UNKNOWN "application/octet-stream" The value returned for the MIME type when a file did --- 171,177 ---- Details <anchor id="GNOME-VFS-MIME-TYPE-UNKNOWN-CAPS"/>GNOME_VFS_MIME_TYPE_UNKNOWN ! #define GNOME_VFS_MIME_TYPE_UNKNOWN "application/octet-stream" The value returned for the MIME type when a file did *************** *** 184,192 **** <anchor id="gnome-vfs-get-mime-type-for-data"/>gnome_vfs_get_mime_type_for_data () ! gnome_vfs_get_mime_type_for_dataconst char* gnome_vfs_get_mime_type_for_data (gconstpointer data, ! int data_size); Tries to guess the mime type of the data in data using the magic patterns. --- 182,190 ---- <anchor id="gnome-vfs-get-mime-type-for-data"/>gnome_vfs_get_mime_type_for_data () ! const char* gnome_vfs_get_mime_type_for_data (gconstpointer data, ! int data_size); Tries to guess the mime type of the data in data using the magic patterns. *************** *** 204,213 **** <anchor id="gnome-vfs-get-mime-type"/>gnome_vfs_get_mime_type () ! gnome_vfs_get_mime_typechar* gnome_vfs_get_mime_type (const char *text_uri); Determine the mime type of text_uri. The mime type is determined ! in the same way as by gnome_vfs_get_file_info(). This is meant as a convenience function for times when you only want the mime type. --- 202,211 ---- <anchor id="gnome-vfs-get-mime-type"/>gnome_vfs_get_mime_type () ! char* gnome_vfs_get_mime_type (const char *text_uri); Determine the mime type of text_uri. The mime type is determined ! in the same way as by gnome_vfs_get_file_info(). This is meant as a convenience function for times when you only want the mime type. *************** *** 221,227 **** <anchor id="GnomeVFSMimeActionType"/>enum GnomeVFSMimeActionType ! GnomeVFSMimeActionTypetypedef enum { GNOME_VFS_MIME_ACTION_TYPE_NONE, GNOME_VFS_MIME_ACTION_TYPE_APPLICATION, GNOME_VFS_MIME_ACTION_TYPE_COMPONENT --- 219,225 ---- <anchor id="GnomeVFSMimeActionType"/>enum GnomeVFSMimeActionType ! typedef enum { GNOME_VFS_MIME_ACTION_TYPE_NONE, GNOME_VFS_MIME_ACTION_TYPE_APPLICATION, GNOME_VFS_MIME_ACTION_TYPE_COMPONENT *************** *** 232,238 **** <anchor id="GnomeVFSMimeApplicationArgumentType"/>enum GnomeVFSMimeApplicationArgumentType ! GnomeVFSMimeApplicationArgumentTypetypedef enum { GNOME_VFS_MIME_APPLICATION_ARGUMENT_TYPE_URIS, GNOME_VFS_MIME_APPLICATION_ARGUMENT_TYPE_PATHS, GNOME_VFS_MIME_APPLICATION_ARGUMENT_TYPE_URIS_FOR_NON_FILES --- 230,236 ---- <anchor id="GnomeVFSMimeApplicationArgumentType"/>enum GnomeVFSMimeApplicationArgumentType ! typedef enum { GNOME_VFS_MIME_APPLICATION_ARGUMENT_TYPE_URIS, GNOME_VFS_MIME_APPLICATION_ARGUMENT_TYPE_PATHS, GNOME_VFS_MIME_APPLICATION_ARGUMENT_TYPE_URIS_FOR_NON_FILES *************** *** 243,249 **** <anchor id="GnomeVFSMimeApplication"/>GnomeVFSMimeApplication ! GnomeVFSMimeApplicationtypedef struct { char *id; char *name; char *command; --- 241,247 ---- <anchor id="GnomeVFSMimeApplication"/>GnomeVFSMimeApplication ! typedef struct { char *id; char *name; char *command; *************** *** 263,269 **** <anchor id="gnome-vfs-mime-application-copy"/>gnome_vfs_mime_application_copy () ! gnome_vfs_mime_application_copyGnomeVFSMimeApplication* gnome_vfs_mime_application_copy (GnomeVFSMimeApplication *application); Creates a newly referenced copy of a GnomeVFSMimeApplication object. --- 261,267 ---- <anchor id="gnome-vfs-mime-application-copy"/>gnome_vfs_mime_application_copy () ! GnomeVFSMimeApplication* gnome_vfs_mime_application_copy (GnomeVFSMimeApplication *application); Creates a newly referenced copy of a GnomeVFSMimeApplication object. *************** *** 278,285 **** <anchor id="gnome-vfs-mime-get-default-action-type"/>gnome_vfs_mime_get_default_action_type () ! gnome_vfs_mime_get_default_action_typeGnomeVFSMimeActionType gnome_vfs_mime_get_default_action_type ! (const char *mime_type); Query the MIME database for the type of action to be performed on a particular MIME type by default. --- 276,283 ---- <anchor id="gnome-vfs-mime-get-default-action-type"/>gnome_vfs_mime_get_default_action_type () ! GnomeVFSMimeActionType gnome_vfs_mime_get_default_action_type ! (const char *mime_type); Query the MIME database for the type of action to be performed on a particular MIME type by default. *************** *** 294,301 **** <anchor id="gnome-vfs-mime-get-default-action"/>gnome_vfs_mime_get_default_action () ! gnome_vfs_mime_get_default_actionGnomeVFSMimeAction* gnome_vfs_mime_get_default_action ! (const char *mime_type); Query the MIME database for default action associated with a particular MIME type mime_type. --- 292,299 ---- <anchor id="gnome-vfs-mime-get-default-action"/>gnome_vfs_mime_get_default_action () ! GnomeVFSMimeAction* gnome_vfs_mime_get_default_action ! (const char *mime_type); Query the MIME database for default action associated with a particular MIME type mime_type. *************** *** 310,317 **** <anchor id="gnome-vfs-mime-get-default-application"/>gnome_vfs_mime_get_default_application () ! gnome_vfs_mime_get_default_applicationGnomeVFSMimeApplication* gnome_vfs_mime_get_default_application ! (const char *mime_type); Query the MIME database for the application to be executed on files of MIME type mime_type by default. --- 308,315 ---- <anchor id="gnome-vfs-mime-get-default-application"/>gnome_vfs_mime_get_default_application () ! GnomeVFSMimeApplication* gnome_vfs_mime_get_default_application ! (const char *mime_type); Query the MIME database for the application to be executed on files of MIME type mime_type by default. *************** *** 326,333 **** <anchor id="gnome-vfs-mime-get-default-component"/>gnome_vfs_mime_get_default_component () ! gnome_vfs_mime_get_default_componentBonobo_ServerInfo* gnome_vfs_mime_get_default_component ! (const char *mime_type); Query the MIME database for the default Bonobo component to be activated to view files of MIME type mime_type. --- 324,331 ---- <anchor id="gnome-vfs-mime-get-default-component"/>gnome_vfs_mime_get_default_component () ! Bonobo_ServerInfo* gnome_vfs_mime_get_default_component ! (const char *mime_type); Query the MIME database for the default Bonobo component to be activated to view files of MIME type mime_type. *************** *** 343,350 **** <anchor id="gnome-vfs-mime-get-short-list-applications"/>gnome_vfs_mime_get_short_list_applications () ! gnome_vfs_mime_get_short_list_applicationsGList* gnome_vfs_mime_get_short_list_applications ! (const char *mime_type); Return an alphabetically sorted list of GnomeVFSMimeApplication data structures for the requested mime type. The short list contains --- 341,348 ---- <anchor id="gnome-vfs-mime-get-short-list-applications"/>gnome_vfs_mime_get_short_list_applications () ! GList* gnome_vfs_mime_get_short_list_applications ! (const char *mime_type); Return an alphabetically sorted list of GnomeVFSMimeApplication data structures for the requested mime type. The short list contains *************** *** 362,369 **** <anchor id="gnome-vfs-mime-get-short-list-components"/>gnome_vfs_mime_get_short_list_components () ! gnome_vfs_mime_get_short_list_componentsGList* gnome_vfs_mime_get_short_list_components ! (const char *mime_type); Return an unsorted sorted list of Bonobo_ServerInfo * data structures for the requested mime type. The short list contains --- 360,367 ---- <anchor id="gnome-vfs-mime-get-short-list-components"/>gnome_vfs_mime_get_short_list_components () ! GList* gnome_vfs_mime_get_short_list_components ! (const char *mime_type); Return an unsorted sorted list of Bonobo_ServerInfo * data structures for the requested mime type. The short list contains *************** *** 381,388 **** <anchor id="gnome-vfs-mime-get-all-applications"/>gnome_vfs_mime_get_all_applications () ! gnome_vfs_mime_get_all_applicationsGList* gnome_vfs_mime_get_all_applications ! (const char *mime_type); Return an alphabetically sorted list of GnomeVFSMimeApplication data structures representing all applications in the MIME database registered --- 379,386 ---- <anchor id="gnome-vfs-mime-get-all-applications"/>gnome_vfs_mime_get_all_applications () ! GList* gnome_vfs_mime_get_all_applications ! (const char *mime_type); Return an alphabetically sorted list of GnomeVFSMimeApplication data structures representing all applications in the MIME database registered *************** *** 399,406 **** <anchor id="gnome-vfs-mime-get-all-components"/>gnome_vfs_mime_get_all_components () ! gnome_vfs_mime_get_all_componentsGList* gnome_vfs_mime_get_all_components ! (const char *mime_type); Return an alphabetically sorted list of Bonobo_ServerInfo data structures representing all Bonobo components registered --- 397,404 ---- <anchor id="gnome-vfs-mime-get-all-components"/>gnome_vfs_mime_get_all_components () ! GList* gnome_vfs_mime_get_all_components ! (const char *mime_type); Return an alphabetically sorted list of Bonobo_ServerInfo data structures representing all Bonobo components registered *************** *** 417,424 **** <anchor id="gnome-vfs-mime-set-default-action-type"/>gnome_vfs_mime_set_default_action_type () ! gnome_vfs_mime_set_default_action_typeGnomeVFSResult gnome_vfs_mime_set_default_action_type ! (const char *mime_type, GnomeVFSMimeActionType action_type); Sets the default action type to be performed on files of MIME type mime_type. --- 415,422 ---- <anchor id="gnome-vfs-mime-set-default-action-type"/>gnome_vfs_mime_set_default_action_type () ! GnomeVFSResult gnome_vfs_mime_set_default_action_type ! (const char *mime_type, GnomeVFSMimeActionType action_type); Sets the default action type to be performed on files of MIME type mime_type. *************** *** 437,445 **** <anchor id="gnome-vfs-mime-set-default-application"/>gnome_vfs_mime_set_default_application () ! gnome_vfs_mime_set_default_applicationGnomeVFSResult gnome_vfs_mime_set_default_application ! (const char *mime_type, ! const char *application_id); Sets the default application to be run on files of MIME type mime_type. --- 435,443 ---- <anchor id="gnome-vfs-mime-set-default-application"/>gnome_vfs_mime_set_default_application () ! GnomeVFSResult gnome_vfs_mime_set_default_application ! (const char *mime_type, ! const char *application_id); Sets the default application to be run on files of MIME type mime_type. *************** *** 458,466 **** <anchor id="gnome-vfs-mime-set-default-component"/>gnome_vfs_mime_set_default_component () ! gnome_vfs_mime_set_default_componentGnomeVFSResult gnome_vfs_mime_set_default_component ! (const char *mime_type, ! const char *component_iid); Sets the default component to be activated for files of MIME type mime_type. --- 456,464 ---- <anchor id="gnome-vfs-mime-set-default-component"/>gnome_vfs_mime_set_default_component () ! GnomeVFSResult gnome_vfs_mime_set_default_component ! (const char *mime_type, ! const char *component_iid); Sets the default component to be activated for files of MIME type mime_type. *************** *** 478,484 **** <anchor id="gnome-vfs-mime-get-icon"/>gnome_vfs_mime_get_icon () ! gnome_vfs_mime_get_iconconst char* gnome_vfs_mime_get_icon (const char *mime_type); Query the MIME database for an icon representing the specified MIME type. --- 476,482 ---- <anchor id="gnome-vfs-mime-get-icon"/>gnome_vfs_mime_get_icon () ! const char* gnome_vfs_mime_get_icon (const char *mime_type); Query the MIME database for an icon representing the specified MIME type. *************** *** 496,503 **** <anchor id="gnome-vfs-mime-set-icon"/>gnome_vfs_mime_set_icon () ! gnome_vfs_mime_set_iconGnomeVFSResult gnome_vfs_mime_set_icon (const char *mime_type, ! const char *filename); Set the icon entry for a particular MIME type in the MIME database. Note that icon entries need not necessarily contain the full path, and do not necessarily need to --- 494,501 ---- <anchor id="gnome-vfs-mime-set-icon"/>gnome_vfs_mime_set_icon () ! GnomeVFSResult gnome_vfs_mime_set_icon (const char *mime_type, ! const char *filename); Set the icon entry for a particular MIME type in the MIME database. Note that icon entries need not necessarily contain the full path, and do not necessarily need to *************** *** 518,524 **** <anchor id="gnome-vfs-mime-get-description"/>gnome_vfs_mime_get_description () ! gnome_vfs_mime_get_descriptionconst char* gnome_vfs_mime_get_description (const char *mime_type); Query the MIME database for a description of the specified MIME type. --- 516,522 ---- <anchor id="gnome-vfs-mime-get-description"/>gnome_vfs_mime_get_description () ! const char* gnome_vfs_mime_get_description (const char *mime_type); Query the MIME database for a description of the specified MIME type. *************** *** 532,540 **** <anchor id="gnome-vfs-mime-set-description"/>gnome_vfs_mime_set_description () ! gnome_vfs_mime_set_descriptionGnomeVFSResult gnome_vfs_mime_set_description ! (const char *mime_type, ! const char *description); Set the description of this MIME type in the MIME database. The description should be something like "Gnumeric spreadsheet". --- 530,538 ---- <anchor id="gnome-vfs-mime-set-description"/>gnome_vfs_mime_set_description () ! GnomeVFSResult gnome_vfs_mime_set_description ! (const char *mime_type, ! const char *description); Set the description of this MIME type in the MIME database. The description should be something like "Gnumeric spreadsheet". *************** *** 553,560 **** <anchor id="gnome-vfs-mime-can-be-executable"/>gnome_vfs_mime_can_be_executable () ! gnome_vfs_mime_can_be_executablegboolean gnome_vfs_mime_can_be_executable ! (const char *mime_type); Check whether files of this MIME type might conceivably be executable. Default for known types if FALSE. Default for unknown types is TRUE. --- 551,558 ---- <anchor id="gnome-vfs-mime-can-be-executable"/>gnome_vfs_mime_can_be_executable () ! gboolean gnome_vfs_mime_can_be_executable ! (const char *mime_type); Check whether files of this MIME type might conceivably be executable. Default for known types if FALSE. Default for unknown types is TRUE. *************** *** 570,577 **** <anchor id="gnome-vfs-mime-set-can-be-executable"/>gnome_vfs_mime_set_can_be_executable () ! gnome_vfs_mime_set_can_be_executableGnomeVFSResult gnome_vfs_mime_set_can_be_executable ! (const char *mime_type, gboolean new_value); Set whether files of this MIME type might conceivably be executable. --- 568,575 ---- <anchor id="gnome-vfs-mime-set-can-be-executable"/>gnome_vfs_mime_set_can_be_executable () ! GnomeVFSResult gnome_vfs_mime_set_can_be_executable ! (const char *mime_type, gboolean new_value); Set whether files of this MIME type might conceivably be executable. *************** *** 590,597 **** <anchor id="gnome-vfs-mime-set-short-list-applications"/>gnome_vfs_mime_set_short_list_applications () ! gnome_vfs_mime_set_short_list_applicationsGnomeVFSResult gnome_vfs_mime_set_short_list_applications ! (const char *mime_type, GList *application_ids); Set the short list of applications for the specified MIME type. The short list --- 588,595 ---- <anchor id="gnome-vfs-mime-set-short-list-applications"/>gnome_vfs_mime_set_short_list_applications () ! GnomeVFSResult gnome_vfs_mime_set_short_list_applications ! (const char *mime_type, GList *application_ids); Set the short list of applications for the specified MIME type. The short list *************** *** 611,618 **** <anchor id="gnome-vfs-mime-set-short-list-components"/>gnome_vfs_mime_set_short_list_components () ! gnome_vfs_mime_set_short_list_componentsGnomeVFSResult gnome_vfs_mime_set_short_list_components ! (const char *mime_type, GList *component_iids); Set the short list of components for the specified MIME type. The short list --- 609,616 ---- <anchor id="gnome-vfs-mime-set-short-list-components"/>gnome_vfs_mime_set_short_list_components () ! GnomeVFSResult gnome_vfs_mime_set_short_list_components ! (const char *mime_type, GList *component_iids); Set the short list of components for the specified MIME type. The short list *************** *** 632,640 **** <anchor id="gnome-vfs-mime-add-application-to-short-list"/>gnome_vfs_mime_add_application_to_short_list () ! gnome_vfs_mime_add_application_to_short_listGnomeVFSResult gnome_vfs_mime_add_application_to_short_list ! (const char *mime_type, ! const char *application_id); Add an application to the short list for MIME type mime_type. The short list contains applications recommended for display as choices to the user for a particular MIME type. --- 630,638 ---- <anchor id="gnome-vfs-mime-add-application-to-short-list"/>gnome_vfs_mime_add_application_to_short_list () ! GnomeVFSResult gnome_vfs_mime_add_application_to_short_list ! (const char *mime_type, ! const char *application_id); Add an application to the short list for MIME type mime_type. The short list contains applications recommended for display as choices to the user for a particular MIME type. *************** *** 653,661 **** <anchor id="gnome-vfs-mime-remove-application-from-short-list"/>gnome_vfs_mime_remove_application_from_short_list () ! gnome_vfs_mime_remove_application_from_short_listGnomeVFSResult gnome_vfs_mime_remove_application_from_short_list ! (const char *mime_type, ! const char *application_id); Remove an application from the short list for MIME type mime_type. The short list contains applications recommended for display as choices to the user for a particular MIME type. --- 651,659 ---- <anchor id="gnome-vfs-mime-remove-application-from-short-list"/>gnome_vfs_mime_remove_application_from_short_list () ! GnomeVFSResult gnome_vfs_mime_remove_application_from_short_list ! (const char *mime_type, ! const char *application_id); Remove an application from the short list for MIME type mime_type. The short list contains applications recommended for display as choices to the user for a particular MIME type. *************** *** 674,682 **** <anchor id="gnome-vfs-mime-add-component-to-short-list"/>gnome_vfs_mime_add_component_to_short_list () ! gnome_vfs_mime_add_component_to_short_listGnomeVFSResult gnome_vfs_mime_add_component_to_short_list ! (const char *mime_type, ! const char *iid); Add a component to the short list for MIME type mime_type. The short list contains components recommended for display as choices to the user for a particular MIME type. --- 672,680 ---- <anchor id="gnome-vfs-mime-add-component-to-short-list"/>gnome_vfs_mime_add_component_to_short_list () ! GnomeVFSResult gnome_vfs_mime_add_component_to_short_list ! (const char *mime_type, ! const char *iid); Add a component to the short list for MIME type mime_type. The short list contains components recommended for display as choices to the user for a particular MIME type. *************** *** 695,703 **** <anchor id="gnome-vfs-mime-remove-component-from-short-list"/>gnome_vfs_mime_remove_component_from_short_list () ! gnome_vfs_mime_remove_component_from_short_listGnomeVFSResult gnome_vfs_mime_remove_component_from_short_list ! (const char *mime_type, ! const char *iid); Remove a component from the short list for MIME type mime_type. The short list contains components recommended for display as choices to the user for a particular MIME type. --- 693,701 ---- <anchor id="gnome-vfs-mime-remove-component-from-short-list"/>gnome_vfs_mime_remove_component_from_short_list () ! GnomeVFSResult gnome_vfs_mime_remove_component_from_short_list ! (const char *mime_type, ! const char *iid); Remove a component from the short list for MIME type mime_type. The short list contains components recommended for display as choices to the user for a particular MIME type. *************** *** 716,723 **** <anchor id="gnome-vfs-mime-add-extension"/>gnome_vfs_mime_add_extension () ! gnome_vfs_mime_add_extensionGnomeVFSResult gnome_vfs_mime_add_extension (const char *mime_type, ! const char *extension); Add a file extension to the specificed MIME type in the MIME database. --- 714,721 ---- <anchor id="gnome-vfs-mime-add-extension"/>gnome_vfs_mime_add_extension () ! GnomeVFSResult gnome_vfs_mime_add_extension (const char *mime_type, ! const char *extension); Add a file extension to the specificed MIME type in the MIME database. *************** *** 735,743 **** <anchor id="gnome-vfs-mime-remove-extension"/>gnome_vfs_mime_remove_extension () ! gnome_vfs_mime_remove_extensionGnomeVFSResult gnome_vfs_mime_remove_extension ! (const char *mime_type, ! const char *extension); Removes a file extension from the specificed MIME type in the MIME database. --- 733,741 ---- <anchor id="gnome-vfs-mime-remove-extension"/>gnome_vfs_mime_remove_extension () ! GnomeVFSResult gnome_vfs_mime_remove_extension ! (const char *mime_type, ! const char *extension); Removes a file extension from the specificed MIME type in the MIME database. *************** *** 755,762 **** <anchor id="gnome-vfs-mime-extend-all-applications"/>gnome_vfs_mime_extend_all_applications () ! gnome_vfs_mime_extend_all_applicationsGnomeVFSResult gnome_vfs_mime_extend_all_applications ! (const char *mime_type, GList *application_ids); Register mime_type as being handled by all applications list in application_ids. --- 753,760 ---- <anchor id="gnome-vfs-mime-extend-all-applications"/>gnome_vfs_mime_extend_all_applications () ! GnomeVFSResult gnome_vfs_mime_extend_all_applications ! (const char *mime_type, GList *application_ids); Register mime_type as being handled by all applications list in application_ids. *************** *** 775,782 **** <anchor id="gnome-vfs-mime-remove-from-all-applications"/>gnome_vfs_mime_remove_from_all_applications () ! gnome_vfs_mime_remove_from_all_applicationsGnomeVFSResult gnome_vfs_mime_remove_from_all_applications ! (const char *mime_type, GList *application_ids); Remove mime_type as a handled type from every application in application_ids --- 773,780 ---- <anchor id="gnome-vfs-mime-remove-from-all-applications"/>gnome_vfs_mime_remove_from_all_applications () ! GnomeVFSResult gnome_vfs_mime_remove_from_all_applications ! (const char *mime_type, GList *application_ids); Remove mime_type as a handled type from every application in application_ids *************** *** 795,802 **** <anchor id="gnome-vfs-mime-application-new-from-id"/>gnome_vfs_mime_application_new_from_id () ! gnome_vfs_mime_application_new_from_idGnomeVFSMimeApplication* gnome_vfs_mime_application_new_from_id ! (const char *id); Fetches the GnomeVFSMimeApplication associated with the specified application ID from the MIME database. --- 793,800 ---- <anchor id="gnome-vfs-mime-application-new-from-id"/>gnome_vfs_mime_application_new_from_id () ! GnomeVFSMimeApplication* gnome_vfs_mime_application_new_from_id ! (const char *id); Fetches the GnomeVFSMimeApplication associated with the specified application ID from the MIME database. *************** *** 811,817 **** <anchor id="gnome-vfs-mime-application-free"/>gnome_vfs_mime_application_free () ! gnome_vfs_mime_application_freevoid gnome_vfs_mime_application_free (GnomeVFSMimeApplication *application); Frees a GnomeVFSMimeApplication *. --- 809,815 ---- <anchor id="gnome-vfs-mime-application-free"/>gnome_vfs_mime_application_free () ! void gnome_vfs_mime_application_free (GnomeVFSMimeApplication *application); Frees a GnomeVFSMimeApplication *. *************** *** 823,829 **** <anchor id="gnome-vfs-mime-action-free"/>gnome_vfs_mime_action_free () ! gnome_vfs_mime_action_freevoid gnome_vfs_mime_action_free (GnomeVFSMimeAction *action); Frees a GnomeVFSMimeAction *. --- 821,827 ---- <anchor id="gnome-vfs-mime-action-free"/>gnome_vfs_mime_action_free () ! void gnome_vfs_mime_action_free (GnomeVFSMimeAction *action); Frees a GnomeVFSMimeAction *. *************** *** 835,845 **** <anchor id="gnome-vfs-mime-application-list-free"/>gnome_vfs_mime_application_list_free () ! gnome_vfs_mime_application_list_freevoid gnome_vfs_mime_application_list_free (GList *list); Frees lists of GnomeVFSApplications, as returned from functions such ! as gnome_vfs_get_all_applications(). --- 833,843 ---- <anchor id="gnome-vfs-mime-application-list-free"/>gnome_vfs_mime_application_list_free () ! void gnome_vfs_mime_application_list_free (GList *list); Frees lists of GnomeVFSApplications, as returned from functions such ! as gnome_vfs_get_all_applications(). *************** *** 849,855 **** <anchor id="gnome-vfs-mime-component-list-free"/>gnome_vfs_mime_component_list_free () ! gnome_vfs_mime_component_list_freevoid gnome_vfs_mime_component_list_free (GList *list); Frees lists of Bonobo_ServerInfo * (as returned from functions such --- 847,853 ---- <anchor id="gnome-vfs-mime-component-list-free"/>gnome_vfs_mime_component_list_free () ! void gnome_vfs_mime_component_list_free (GList *list); Frees lists of Bonobo_ServerInfo * (as returned from functions such *************** *** 863,870 **** <anchor id="gnome-vfs-mime-id-in-application-list"/>gnome_vfs_mime_id_in_application_list () ! gnome_vfs_mime_id_in_application_listgboolean gnome_vfs_mime_id_in_application_list ! (const char *id, GList *applications); Check whether an application id is in a list of GnomeVFSMimeApplications. --- 861,868 ---- <anchor id="gnome-vfs-mime-id-in-application-list"/>gnome_vfs_mime_id_in_application_list () ! gboolean gnome_vfs_mime_id_in_application_list ! (const char *id, GList *applications); Check whether an application id is in a list of GnomeVFSMimeApplications. *************** *** 876,890 **** applications : A GList * whose nodes are GnomeVFSMimeApplications, such as the ! result of gnome_vfs_mime_get_short_list_applications(). Returns : TRUE if an application whose id matches id is in applications. <anchor id="gnome-vfs-mime-id-in-component-list"/>gnome_vfs_mime_id_in_component_list () ! gnome_vfs_mime_id_in_component_listgboolean gnome_vfs_mime_id_in_component_list ! (const char *iid, GList *components); Check whether a component iid is in a list of Bonobo_ServerInfos. --- 874,888 ---- applications : A GList * whose nodes are GnomeVFSMimeApplications, such as the ! result of gnome_vfs_mime_get_short_list_applications(). Returns : TRUE if an application whose id matches id is in applications. <anchor id="gnome-vfs-mime-id-in-component-list"/>gnome_vfs_mime_id_in_component_list () ! gboolean gnome_vfs_mime_id_in_component_list ! (const char *iid, GList *components); Check whether a component iid is in a list of Bonobo_ServerInfos. *************** *** 896,911 **** components : A GList * whose nodes are Bonobo_ServerInfos, such as the ! result of gnome_vfs_mime_get_short_list_components(). Returns : TRUE if a component whose iid matches iid is in components. <anchor id="gnome-vfs-mime-remove-application-from-list"/>gnome_vfs_mime_remove_application_from_list () ! gnome_vfs_mime_remove_application_from_listGList* gnome_vfs_mime_remove_application_from_list (GList *applications, ! const char *application_id, gboolean *did_remove); Remove an application specified by id from a list of GnomeVFSMimeApplications. --- 894,909 ---- components : A GList * whose nodes are Bonobo_ServerInfos, such as the ! result of gnome_vfs_mime_get_short_list_components(). Returns : TRUE if a component whose iid matches iid is in components. <anchor id="gnome-vfs-mime-remove-application-from-list"/>gnome_vfs_mime_remove_application_from_list () ! GList* gnome_vfs_mime_remove_application_from_list (GList *applications, ! const char *application_id, gboolean *did_remove); Remove an application specified by id from a list of GnomeVFSMimeApplications. *************** *** 914,920 **** applications : A GList * whose nodes are GnomeVFSMimeApplications, such as the ! result of gnome_vfs_mime_get_short_list_applications(). application_id : The id of an application to remove from applications. --- 912,918 ---- applications : A GList * whose nodes are GnomeVFSMimeApplications, such as the ! result of gnome_vfs_mime_get_short_list_applications(). application_id : The id of an application to remove from applications. *************** *** 929,937 **** <anchor id="gnome-vfs-mime-remove-component-from-list"/>gnome_vfs_mime_remove_component_from_list () ! gnome_vfs_mime_remove_component_from_listGList* gnome_vfs_mime_remove_component_from_list (GList *components, ! const char *iid, gboolean *did_remove); Remove a component specified by iid from a list of Bonobo_ServerInfos. --- 927,935 ---- <anchor id="gnome-vfs-mime-remove-component-from-list"/>gnome_vfs_mime_remove_component_from_list () ! GList* gnome_vfs_mime_remove_component_from_list (GList *components, ! const char *iid, gboolean *did_remove); Remove a component specified by iid from a list of Bonobo_ServerInfos. *************** *** 940,946 **** components : A GList * whose nodes are Bonobo_ServerInfos, such as the ! result of gnome_vfs_mime_get_short_list_components(). iid : The iid of a component to remove from components. --- 938,944 ---- components : A GList * whose nodes are Bonobo_ServerInfos, such as the ! result of gnome_vfs_mime_get_short_list_components(). iid : The iid of a component to remove from components. *************** *** 955,961 **** <anchor id="gnome-vfs-mime-id-list-from-component-list"/>gnome_vfs_mime_id_list_from_component_list () ! gnome_vfs_mime_id_list_from_component_listGList* gnome_vfs_mime_id_list_from_component_list (GList *components); Create a list of component iids from a list of Bonobo_ServerInfos. --- 953,959 ---- <anchor id="gnome-vfs-mime-id-list-from-component-list"/>gnome_vfs_mime_id_list_from_component_list () ! GList* gnome_vfs_mime_id_list_from_component_list (GList *components); Create a list of component iids from a list of Bonobo_ServerInfos. *************** *** 964,970 **** components : A GList * whose nodes are Bonobo_ServerInfos, such as the ! result of gnome_vfs_mime_get_short_list_components(). Returns : A new list where each Bonobo_ServerInfo in the original list is replaced by a char * with the component's iid. The original list is --- 962,968 ---- components : A GList * whose nodes are Bonobo_ServerInfos, such as the ! result of gnome_vfs_mime_get_short_list_components(). Returns : A new list where each Bonobo_ServerInfo in the original list is replaced by a char * with the component's iid. The original list is *************** *** 973,979 **** <anchor id="gnome-vfs-mime-id-list-from-application-list"/>gnome_vfs_mime_id_list_from_application_list () ! gnome_vfs_mime_id_list_from_application_listGList* gnome_vfs_mime_id_list_from_application_list (GList *applications); Create a list of application ids from a list of GnomeVFSMimeApplications. --- 971,977 ---- <anchor id="gnome-vfs-mime-id-list-from-application-list"/>gnome_vfs_mime_id_list_from_application_list () ! GList* gnome_vfs_mime_id_list_from_application_list (GList *applications); Create a list of application ids from a list of GnomeVFSMimeApplications. *************** *** 982,988 **** applications : A GList * whose nodes are GnomeVFSMimeApplications, such as the ! result of gnome_vfs_mime_get_short_list_applications(). Returns : A new list where each GnomeVFSMimeApplication in the original list is replaced by a char * with the application's id. The original list is --- 980,986 ---- applications : A GList * whose nodes are GnomeVFSMimeApplications, such as the ! result of gnome_vfs_mime_get_short_list_applications(). Returns : A new list where each GnomeVFSMimeApplication in the original list is replaced by a char * with the application's id. The original list is *************** *** 991,997 **** <anchor id="gnome-vfs-mime-freeze"/>gnome_vfs_mime_freeze () ! gnome_vfs_mime_freezevoid gnome_vfs_mime_freeze (void); Freezes the mime data so that you can do multiple updates to the dat in one batch without needing --- 989,995 ---- <anchor id="gnome-vfs-mime-freeze"/>gnome_vfs_mime_freeze () ! void gnome_vfs_mime_freeze (void); Freezes the mime data so that you can do multiple updates to the dat in one batch without needing *************** *** 1001,1007 **** <anchor id="gnome-vfs-mime-thaw"/>gnome_vfs_mime_thaw () ! gnome_vfs_mime_thawvoid gnome_vfs_mime_thaw (void); UnFreezes the mime data so that you can do multiple updates to the dat in one batch without needing --- 999,1005 ---- <anchor id="gnome-vfs-mime-thaw"/>gnome_vfs_mime_thaw () ! void gnome_vfs_mime_thaw (void); UnFreezes the mime data so that you can do multiple updates to the dat in one batch without needing *************** *** 1011,1026 **** <anchor id="gnome-vfs-mime-info-reload"/>gnome_vfs_mime_info_reload () ! gnome_vfs_mime_info_reloadvoid gnome_vfs_mime_info_reload (void); Reload the MIME database from disk and notify any listeners ! holding active GnomeVFSMIMEMonitor objects. <anchor id="gnome-vfs-mime-type-is-known"/>gnome_vfs_mime_type_is_known () ! gnome_vfs_mime_type_is_knowngboolean gnome_vfs_mime_type_is_known (const char *mime_type); This function returns TRUE if mime_type is in the MIME database at all. --- 1009,1024 ---- <anchor id="gnome-vfs-mime-info-reload"/>gnome_vfs_mime_info_reload () ! void gnome_vfs_mime_info_reload (void); Reload the MIME database from disk and notify any listeners ! holding active GnomeVFSMIMEMonitor objects. <anchor id="gnome-vfs-mime-type-is-known"/>gnome_vfs_mime_type_is_known () ! gboolean gnome_vfs_mime_type_is_known (const char *mime_type); This function returns TRUE if mime_type is in the MIME database at all. *************** *** 1034,1041 **** <anchor id="gnome-vfs-mime-get-value"/>gnome_vfs_mime_get_value () ! gnome_vfs_mime_get_valueconst char* gnome_vfs_mime_get_value (const char *mime_type, ! const char *key); This function retrieves the value associated with key in the given GnomeMimeContext. The string is private, you --- 1032,1039 ---- <anchor id="gnome-vfs-mime-get-value"/>gnome_vfs_mime_get_value () ! const char* gnome_vfs_mime_get_value (const char *mime_type, ! const char *key); This function retrieves the value associated with key in the given GnomeMimeContext. The string is private, you *************** *** 1054,1062 **** <anchor id="gnome-vfs-mime-set-value"/>gnome_vfs_mime_set_value () ! gnome_vfs_mime_set_valueGnomeVFSResult gnome_vfs_mime_set_value (const char *mime_type, ! const char *key, ! const char *value); This function is going to set the value associated to the key and it will save it --- 1052,1060 ---- <anchor id="gnome-vfs-mime-set-value"/>gnome_vfs_mime_set_value () ! GnomeVFSResult gnome_vfs_mime_set_value (const char *mime_type, ! const char *key, ! const char *value); This function is going to set the value associated to the key and it will save it *************** *** 1081,1087 **** <anchor id="gnome-vfs-mime-get-key-list"/>gnome_vfs_mime_get_key_list () ! gnome_vfs_mime_get_key_listGList* gnome_vfs_mime_get_key_list (const char *mime_type); Gets a list of all keys associated with mime_type. --- 1079,1085 ---- <anchor id="gnome-vfs-mime-get-key-list"/>gnome_vfs_mime_get_key_list () ! GList* gnome_vfs_mime_get_key_list (const char *mime_type); Gets a list of all keys associated with mime_type. *************** *** 1096,1102 **** <anchor id="gnome-vfs-mime-keys-list-free"/>gnome_vfs_mime_keys_list_free () ! gnome_vfs_mime_keys_list_freevoid gnome_vfs_mime_keys_list_free (GList *mime_type_list); Frees the mime type list. --- 1094,1100 ---- <anchor id="gnome-vfs-mime-keys-list-free"/>gnome_vfs_mime_keys_list_free () ! void gnome_vfs_mime_keys_list_free (GList *mime_type_list); Frees the mime type list. *************** *** 1108,1115 **** <anchor id="gnome-vfs-mime-get-extensions-list"/>gnome_vfs_mime_get_extensions_list () ! gnome_vfs_mime_get_extensions_listGList* gnome_vfs_mime_get_extensions_list ! (const char *mime_type); Get the file extensions associated with mime type mime_type. --- 1106,1113 ---- <anchor id="gnome-vfs-mime-get-extensions-list"/>gnome_vfs_mime_get_extensions_list () ! GList* gnome_vfs_mime_get_extensions_list ! (const char *mime_type); Get the file extensions associated with mime type mime_type. *************** *** 1123,1129 **** <anchor id="gnome-vfs-mime-extensions-list-free"/>gnome_vfs_mime_extensions_list_free () ! gnome_vfs_mime_extensions_list_freevoid gnome_vfs_mime_extensions_list_free (GList *list); Call this function on the list returned by gnome_vfs_mime_extensions --- 1121,1127 ---- <anchor id="gnome-vfs-mime-extensions-list-free"/>gnome_vfs_mime_extensions_list_free () ! void gnome_vfs_mime_extensions_list_free (GList *list); Call this function on the list returned by gnome_vfs_mime_extensions *************** *** 1137,1144 **** <anchor id="gnome-vfs-mime-get-extensions-string"/>gnome_vfs_mime_get_extensions_string () ! gnome_vfs_mime_get_extensions_stringchar* gnome_vfs_mime_get_extensions_string ! (const char *mime_type); Retrieves the extensions associated with mime_type as a single space seperated string. --- 1135,1142 ---- <anchor id="gnome-vfs-mime-get-extensions-string"/>gnome_vfs_mime_get_extensions_string () ! char* gnome_vfs_mime_get_extensions_string ! (const char *mime_type); Retrieves the extensions associated with mime_type as a single space seperated string. *************** *** 1153,1160 **** <anchor id="gnome-vfs-mime-get-extensions-pretty-string"/>gnome_vfs_mime_get_extensions_pretty_string () ! gnome_vfs_mime_get_extensions_pretty_stringchar* gnome_vfs_mime_get_extensions_pretty_string ! (const char *mime_type); Returns the supported extensions for mime_type as a comma-seperated list. --- 1151,1158 ---- <anchor id="gnome-vfs-mime-get-extensions-pretty-string"/>gnome_vfs_mime_get_extensions_pretty_string () ! char* gnome_vfs_mime_get_extensions_pretty_string ! (const char *mime_type); Returns the supported extensions for mime_type as a comma-seperated list. *************** *** 1168,1174 **** <anchor id="gnome-vfs-get-registered-mime-types"/>gnome_vfs_get_registered_mime_types () ! gnome_vfs_get_registered_mime_typesGList* gnome_vfs_get_registered_mime_types (void); --- 1166,1172 ---- <anchor id="gnome-vfs-get-registered-mime-types"/>gnome_vfs_get_registered_mime_types () ! GList* gnome_vfs_get_registered_mime_types (void); *************** *** 1180,1186 **** <anchor id="gnome-vfs-mime-registered-mime-type-list-free"/>gnome_vfs_mime_registered_mime_type_list_free () ! gnome_vfs_mime_registered_mime_type_list_freevoid gnome_vfs_mime_registered_mime_type_list_free (GList *list); Call this function on the list returned by gnome_vfs_get_registered_mime_types --- 1178,1184 ---- <anchor id="gnome-vfs-mime-registered-mime-type-list-free"/>gnome_vfs_mime_registered_mime_type_list_free () ! void gnome_vfs_mime_registered_mime_type_list_free (GList *list); Call this function on the list returned by gnome_vfs_get_registered_mime_types *************** *** 1194,1203 **** <anchor id="gnome-vfs-mime-set-registered-type-key"/>gnome_vfs_mime_set_registered_type_key () ! gnome_vfs_mime_set_registered_type_keyGnomeVFSResult gnome_vfs_mime_set_registered_type_key ! (const char *mime_type, ! const char *key, ! const char *data); This function sets the key data for the registered mime type's hash table. --- 1192,1201 ---- <anchor id="gnome-vfs-mime-set-registered-type-key"/>gnome_vfs_mime_set_registered_type_key () ! GnomeVFSResult gnome_vfs_mime_set_registered_type_key ! (const char *mime_type, ! const char *key, ! const char *data); This function sets the key data for the registered mime type's hash table. *************** *** 1218,1226 **** <anchor id="gnome-vfs-mime-set-extensions-list"/>gnome_vfs_mime_set_extensions_list () ! gnome_vfs_mime_set_extensions_listGnomeVFSResult gnome_vfs_mime_set_extensions_list ! (const char *mime_type, ! const char *extensions_list); Sets the extensions for a given mime type. Overrides the previously set extensions. --- 1216,1224 ---- <anchor id="gnome-vfs-mime-set-extensions-list"/>gnome_vfs_mime_set_extensions_list () ! GnomeVFSResult gnome_vfs_mime_set_extensions_list ! (const char *mime_type, ! const char *extensions_list); Sets the extensions for a given mime type. Overrides the previously set extensions. *************** *** 1239,1246 **** <anchor id="gnome-vfs-mime-registered-mime-type-delete"/>gnome_vfs_mime_registered_mime_type_delete () ! gnome_vfs_mime_registered_mime_type_deletevoid gnome_vfs_mime_registered_mime_type_delete ! (const char *mime_type); Delete a mime type for the user which runs this command. You can undo this only by calling gnome_vfs_mime_reset --- 1237,1244 ---- <anchor id="gnome-vfs-mime-registered-mime-type-delete"/>gnome_vfs_mime_registered_mime_type_delete () ! void gnome_vfs_mime_registered_mime_type_delete ! (const char *mime_type); Delete a mime type for the user which runs this command. You can undo this only by calling gnome_vfs_mime_reset *************** *** 1253,1259 **** <anchor id="gnome-vfs-mime-reset"/>gnome_vfs_mime_reset () ! gnome_vfs_mime_resetvoid gnome_vfs_mime_reset (void); resets the user's mime database to the system defaults. --- 1251,1257 ---- <anchor id="gnome-vfs-mime-reset"/>gnome_vfs_mime_reset () ! void gnome_vfs_mime_reset (void); resets the user's mime database to the system defaults. diff -crN ./gnome-vfs/doc/xml/gnome-vfs-mime-monitor.xml /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/doc/xml/gnome-vfs-mime-monitor.xml *** ./gnome-vfs/doc/xml/gnome-vfs-mime-monitor.xml Mon Sep 8 14:19:50 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/doc/xml/gnome-vfs-mime-monitor.xml Thu Dec 18 21:22:57 2003 *************** *** 30,37 **** - - Description --- 30,35 ---- *************** *** 43,69 **** Details <anchor id="GNOME-VFS-MIME-MONITOR-TYPE-CAPS"/>GNOME_VFS_MIME_MONITOR_TYPE ! GNOME_VFS_MIME_MONITOR_TYPE#define GNOME_VFS_MIME_MONITOR_TYPE (gnome_vfs_mime_monitor_get_type ()) <anchor id="GnomeVFSMIMEMonitorPrivate"/>struct GnomeVFSMIMEMonitorPrivate ! GnomeVFSMIMEMonitorPrivatestruct GnomeVFSMIMEMonitorPrivate; <anchor id="gnome-vfs-mime-monitor-get"/>gnome_vfs_mime_monitor_get () ! gnome_vfs_mime_monitor_getGnomeVFSMIMEMonitor* gnome_vfs_mime_monitor_get (void); Get access to the single global monitor. ! Returns : the global GnomeVFSMIMEMonitor --- 41,67 ---- Details <anchor id="GNOME-VFS-MIME-MONITOR-TYPE-CAPS"/>GNOME_VFS_MIME_MONITOR_TYPE ! #define GNOME_VFS_MIME_MONITOR_TYPE (gnome_vfs_mime_monitor_get_type ()) <anchor id="GnomeVFSMIMEMonitorPrivate"/>struct GnomeVFSMIMEMonitorPrivate ! struct GnomeVFSMIMEMonitorPrivate; <anchor id="gnome-vfs-mime-monitor-get"/>gnome_vfs_mime_monitor_get () ! GnomeVFSMIMEMonitor* gnome_vfs_mime_monitor_get (void); Get access to the single global monitor. ! Returns : the global GnomeVFSMIMEMonitor diff -crN ./gnome-vfs/doc/xml/gnome-vfs-mime.xml /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/doc/xml/gnome-vfs-mime.xml *** ./gnome-vfs/doc/xml/gnome-vfs-mime.xml Mon Sep 8 14:19:50 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/doc/xml/gnome-vfs-mime.xml Thu Dec 18 21:23:00 2003 *************** *** 15,37 **** ! void gnome_vfs_mime_shutdown (void); ! const char* gnome_vfs_mime_type_from_name (const char *filename); ! const char* gnome_vfs_mime_type_from_name_or_default ! (const char *filename, ! const char *defaultv); ! const char* gnome_vfs_get_mime_type_common (GnomeVFSURI *uri); ! const char* gnome_vfs_get_mime_type_from_uri (GnomeVFSURI *uri); ! const char* gnome_vfs_get_mime_type_from_file_data (GnomeVFSURI *uri); ! const char* gnome_vfs_get_file_mime_type (const char *path, const struct stat *optional_stat_info, gboolean suffix_only); gboolean gnome_vfs_mime_type_is_supertype ! (const char *mime_type); ! char* gnome_vfs_get_supertype_from_mime_type ! (const char *mime_type); --- 15,37 ---- ! void gnome_vfs_mime_shutdown (void); ! const char* gnome_vfs_mime_type_from_name (const char *filename); ! const char* gnome_vfs_mime_type_from_name_or_default ! (const char *filename, ! const char *defaultv); ! const char* gnome_vfs_get_mime_type_common (GnomeVFSURI *uri); ! const char* gnome_vfs_get_mime_type_from_uri (GnomeVFSURI *uri); ! const char* gnome_vfs_get_mime_type_from_file_data (GnomeVFSURI *uri); ! const char* gnome_vfs_get_file_mime_type (const char *path, const struct stat *optional_stat_info, gboolean suffix_only); gboolean gnome_vfs_mime_type_is_supertype ! (const char *mime_type); ! char* gnome_vfs_get_supertype_from_mime_type ! (const char *mime_type); *************** *** 41,48 **** - - Description --- 41,46 ---- *************** *** 54,60 **** Details <anchor id="gnome-vfs-mime-shutdown"/>gnome_vfs_mime_shutdown () ! gnome_vfs_mime_shutdownvoid gnome_vfs_mime_shutdown (void); Unload the MIME database from memory. --- 52,58 ---- Details <anchor id="gnome-vfs-mime-shutdown"/>gnome_vfs_mime_shutdown () ! void gnome_vfs_mime_shutdown (void); Unload the MIME database from memory. *************** *** 62,68 **** <anchor id="gnome-vfs-mime-type-from-name"/>gnome_vfs_mime_type_from_name () ! gnome_vfs_mime_type_from_nameconst char* gnome_vfs_mime_type_from_name (const char *filename); Determined the mime type for filename. --- 60,66 ---- <anchor id="gnome-vfs-mime-type-from-name"/>gnome_vfs_mime_type_from_name () ! const char* gnome_vfs_mime_type_from_name (const char *filename); Determined the mime type for filename. *************** *** 76,84 **** <anchor id="gnome-vfs-mime-type-from-name-or-default"/>gnome_vfs_mime_type_from_name_or_default () ! gnome_vfs_mime_type_from_name_or_defaultconst char* gnome_vfs_mime_type_from_name_or_default ! (const char *filename, ! const char *defaultv); This routine tries to determine the mime-type of the filename only by looking at the filename from the GNOME database of mime-types. --- 74,82 ---- <anchor id="gnome-vfs-mime-type-from-name-or-default"/>gnome_vfs_mime_type_from_name_or_default () ! const char* gnome_vfs_mime_type_from_name_or_default ! (const char *filename, ! const char *defaultv); This routine tries to determine the mime-type of the filename only by looking at the filename from the GNOME database of mime-types. *************** *** 97,103 **** <anchor id="gnome-vfs-get-mime-type-common"/>gnome_vfs_get_mime_type_common () ! gnome_vfs_get_mime_type_commonconst char* gnome_vfs_get_mime_type_common (GnomeVFSURI *uri); Tries to guess the mime type of the file represented by uir. Favors using the file data to the uri extension. --- 95,101 ---- <anchor id="gnome-vfs-get-mime-type-common"/>gnome_vfs_get_mime_type_common () ! const char* gnome_vfs_get_mime_type_common (GnomeVFSURI *uri); Tries to guess the mime type of the file represented by uir. Favors using the file data to the uri extension. *************** *** 119,125 **** <anchor id="gnome-vfs-get-mime-type-from-uri"/>gnome_vfs_get_mime_type_from_uri () ! gnome_vfs_get_mime_type_from_uriconst char* gnome_vfs_get_mime_type_from_uri (GnomeVFSURI *uri); Tries to guess the mime type of the file uri by --- 117,123 ---- <anchor id="gnome-vfs-get-mime-type-from-uri"/>gnome_vfs_get_mime_type_from_uri () ! const char* gnome_vfs_get_mime_type_from_uri (GnomeVFSURI *uri); Tries to guess the mime type of the file uri by *************** *** 136,142 **** <anchor id="gnome-vfs-get-mime-type-from-file-data"/>gnome_vfs_get_mime_type_from_file_data () ! gnome_vfs_get_mime_type_from_file_dataconst char* gnome_vfs_get_mime_type_from_file_data (GnomeVFSURI *uri); Tries to guess the mime type of the file uri by --- 134,140 ---- <anchor id="gnome-vfs-get-mime-type-from-file-data"/>gnome_vfs_get_mime_type_from_file_data () ! const char* gnome_vfs_get_mime_type_from_file_data (GnomeVFSURI *uri); Tries to guess the mime type of the file uri by *************** *** 152,158 **** <anchor id="gnome-vfs-get-file-mime-type"/>gnome_vfs_get_file_mime_type () ! gnome_vfs_get_file_mime_typeconst char* gnome_vfs_get_file_mime_type (const char *path, const struct stat *optional_stat_info, gboolean suffix_only); --- 150,156 ---- <anchor id="gnome-vfs-get-file-mime-type"/>gnome_vfs_get_file_mime_type () ! const char* gnome_vfs_get_file_mime_type (const char *path, const struct stat *optional_stat_info, gboolean suffix_only); *************** *** 177,184 **** <anchor id="gnome-vfs-mime-type-is-supertype"/>gnome_vfs_mime_type_is_supertype () ! gnome_vfs_mime_type_is_supertypegboolean gnome_vfs_mime_type_is_supertype ! (const char *mime_type); --- 175,182 ---- <anchor id="gnome-vfs-mime-type-is-supertype"/>gnome_vfs_mime_type_is_supertype () ! gboolean gnome_vfs_mime_type_is_supertype ! (const char *mime_type); *************** *** 192,199 **** <anchor id="gnome-vfs-get-supertype-from-mime-type"/>gnome_vfs_get_supertype_from_mime_type () ! gnome_vfs_get_supertype_from_mime_typechar* gnome_vfs_get_supertype_from_mime_type ! (const char *mime_type); --- 190,197 ---- <anchor id="gnome-vfs-get-supertype-from-mime-type"/>gnome_vfs_get_supertype_from_mime_type () ! char* gnome_vfs_get_supertype_from_mime_type ! (const char *mime_type); diff -crN ./gnome-vfs/doc/xml/gnome-vfs-module-callback-module-api.xml /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/doc/xml/gnome-vfs-module-callback-module-api.xml *** ./gnome-vfs/doc/xml/gnome-vfs-module-callback-module-api.xml Mon Sep 8 14:19:50 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/doc/xml/gnome-vfs-module-callback-module-api.xml Thu Dec 18 21:23:00 2003 *************** *** 16,22 **** gboolean gnome_vfs_module_callback_invoke ! (const char *callback_name, gconstpointer in, gsize in_size, gpointer out, --- 16,22 ---- gboolean gnome_vfs_module_callback_invoke ! (const char *callback_name, gconstpointer in, gsize in_size, gpointer out, *************** *** 30,37 **** - - Description --- 30,35 ---- *************** *** 43,50 **** Details <anchor id="gnome-vfs-module-callback-invoke"/>gnome_vfs_module_callback_invoke () ! gnome_vfs_module_callback_invokegboolean gnome_vfs_module_callback_invoke ! (const char *callback_name, gconstpointer in, gsize in_size, gpointer out, --- 41,48 ---- Details <anchor id="gnome-vfs-module-callback-invoke"/>gnome_vfs_module_callback_invoke () ! gboolean gnome_vfs_module_callback_invoke ! (const char *callback_name, gconstpointer in, gsize in_size, gpointer out, diff -crN ./gnome-vfs/doc/xml/gnome-vfs-module-callback.xml /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/doc/xml/gnome-vfs-module-callback.xml *** ./gnome-vfs/doc/xml/gnome-vfs-module-callback.xml Mon Sep 8 14:19:50 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/doc/xml/gnome-vfs-module-callback.xml Thu Dec 18 21:22:59 2003 *************** *** 15,56 **** ! void (*GnomeVFSModuleCallback) (gconstpointer in, gsize in_size, gpointer out, gsize out_size, gpointer callback_data); ! void (*GnomeVFSModuleCallbackResponse) (gpointer response_data); ! void (*GnomeVFSAsyncModuleCallback) (gconstpointer in, gsize in_size, gpointer out, gsize out_size, gpointer callback_data, GnomeVFSModuleCallbackResponse response, gpointer response_data); ! void gnome_vfs_module_callback_set_default ! (const char *callback_name, GnomeVFSModuleCallback callback, gpointer callback_data, GDestroyNotify destroy_notify); ! void gnome_vfs_module_callback_push (const char *callback_name, GnomeVFSModuleCallback callback, gpointer callback_data, GDestroyNotify destroy_notify); ! void gnome_vfs_module_callback_pop (const char *callback_name); ! void gnome_vfs_async_module_callback_set_default ! (const char *callback_name, GnomeVFSAsyncModuleCallback callback, gpointer callback_data, GDestroyNotify destroy_notify); ! void gnome_vfs_async_module_callback_push ! (const char *callback_name, GnomeVFSAsyncModuleCallback callback, gpointer callback_data, GDestroyNotify destroy_notify); ! void gnome_vfs_async_module_callback_pop ! (const char *callback_name); --- 15,56 ---- ! void (*GnomeVFSModuleCallback) (gconstpointer in, gsize in_size, gpointer out, gsize out_size, gpointer callback_data); ! void (*GnomeVFSModuleCallbackResponse) (gpointer response_data); ! void (*GnomeVFSAsyncModuleCallback) (gconstpointer in, gsize in_size, gpointer out, gsize out_size, gpointer callback_data, GnomeVFSModuleCallbackResponse response, gpointer response_data); ! void gnome_vfs_module_callback_set_default ! (const char *callback_name, GnomeVFSModuleCallback callback, gpointer callback_data, GDestroyNotify destroy_notify); ! void gnome_vfs_module_callback_push (const char *callback_name, GnomeVFSModuleCallback callback, gpointer callback_data, GDestroyNotify destroy_notify); ! void gnome_vfs_module_callback_pop (const char *callback_name); ! void gnome_vfs_async_module_callback_set_default ! (const char *callback_name, GnomeVFSAsyncModuleCallback callback, gpointer callback_data, GDestroyNotify destroy_notify); ! void gnome_vfs_async_module_callback_push ! (const char *callback_name, GnomeVFSAsyncModuleCallback callback, gpointer callback_data, GDestroyNotify destroy_notify); ! void gnome_vfs_async_module_callback_pop ! (const char *callback_name); *************** *** 60,67 **** - - Description --- 60,65 ---- *************** *** 73,79 **** Details <anchor id="GnomeVFSModuleCallback"/>GnomeVFSModuleCallback () ! GnomeVFSModuleCallbackvoid (*GnomeVFSModuleCallback) (gconstpointer in, gsize in_size, gpointer out, gsize out_size, --- 71,77 ---- Details <anchor id="GnomeVFSModuleCallback"/>GnomeVFSModuleCallback () ! void (*GnomeVFSModuleCallback) (gconstpointer in, gsize in_size, gpointer out, gsize out_size, *************** *** 115,125 **** <anchor id="GnomeVFSModuleCallbackResponse"/>GnomeVFSModuleCallbackResponse () ! GnomeVFSModuleCallbackResponsevoid (*GnomeVFSModuleCallbackResponse) (gpointer response_data); This is the type of the response function passed to a ! GnomeVFSAsyncModuleCallback(). It should be called when the async callback has completed. --- 113,123 ---- <anchor id="GnomeVFSModuleCallbackResponse"/>GnomeVFSModuleCallbackResponse () ! void (*GnomeVFSModuleCallbackResponse) (gpointer response_data); This is the type of the response function passed to a ! GnomeVFSAsyncModuleCallback(). It should be called when the async callback has completed. *************** *** 130,136 **** <anchor id="GnomeVFSAsyncModuleCallback"/>GnomeVFSAsyncModuleCallback () ! GnomeVFSAsyncModuleCallbackvoid (*GnomeVFSAsyncModuleCallback) (gconstpointer in, gsize in_size, gpointer out, gsize out_size, --- 128,134 ---- <anchor id="GnomeVFSAsyncModuleCallback"/>GnomeVFSAsyncModuleCallback () ! void (*GnomeVFSAsyncModuleCallback) (gconstpointer in, gsize in_size, gpointer out, gsize out_size, *************** *** 147,153 **** need to put up a dialog. ! Like a GnomeVFSModuleCallback(), an async callback has in and out arguments for passing data into and out of the callback. However, an async callback does not need to fill in the out argument before returning. Instead, it can arrange to have the work done from a --- 145,151 ---- need to put up a dialog. ! Like a GnomeVFSModuleCallback(), an async callback has in and out arguments for passing data into and out of the callback. However, an async callback does not need to fill in the out argument before returning. Instead, it can arrange to have the work done from a *************** *** 186,193 **** <anchor id="gnome-vfs-module-callback-set-default"/>gnome_vfs_module_callback_set_default () ! gnome_vfs_module_callback_set_defaultvoid gnome_vfs_module_callback_set_default ! (const char *callback_name, GnomeVFSModuleCallback callback, gpointer callback_data, GDestroyNotify destroy_notify); --- 184,191 ---- <anchor id="gnome-vfs-module-callback-set-default"/>gnome_vfs_module_callback_set_default () ! void gnome_vfs_module_callback_set_default ! (const char *callback_name, GnomeVFSModuleCallback callback, gpointer callback_data, GDestroyNotify destroy_notify); *************** *** 199,208 **** Use this function if you want to set a handler to be used by your ! whole application. You can use gnome_vfs_module_callback_push() to set a callback function that will temporarily override the default on the current thread instead. Or you can also use ! gnome_vfs_async_module_callback_set_default() to set an async callback function. --- 197,206 ---- Use this function if you want to set a handler to be used by your ! whole application. You can use gnome_vfs_module_callback_push() to set a callback function that will temporarily override the default on the current thread instead. Or you can also use ! gnome_vfs_async_module_callback_set_default() to set an async callback function. *************** *** 226,232 **** <anchor id="gnome-vfs-module-callback-push"/>gnome_vfs_module_callback_push () ! gnome_vfs_module_callback_pushvoid gnome_vfs_module_callback_push (const char *callback_name, GnomeVFSModuleCallback callback, gpointer callback_data, GDestroyNotify destroy_notify); --- 224,230 ---- <anchor id="gnome-vfs-module-callback-push"/>gnome_vfs_module_callback_push () ! void gnome_vfs_module_callback_push (const char *callback_name, GnomeVFSModuleCallback callback, gpointer callback_data, GDestroyNotify destroy_notify); *************** *** 237,250 **** per-thread. ! gnome_vfs_module_callback_pop() removes the most recently set temporary handler. The temporary handlers are treated as a first-in first-out stack. Use this function to set a temporary callback handler for a single call or a few calls. You can use ! gnome_vfs_module_callback_set_default() to set a callback function that will establish a permanent global setting for all threads instead. --- 235,248 ---- per-thread. ! gnome_vfs_module_callback_pop() removes the most recently set temporary handler. The temporary handlers are treated as a first-in first-out stack. Use this function to set a temporary callback handler for a single call or a few calls. You can use ! gnome_vfs_module_callback_set_default() to set a callback function that will establish a permanent global setting for all threads instead. *************** *** 269,278 **** <anchor id="gnome-vfs-module-callback-pop"/>gnome_vfs_module_callback_pop () ! gnome_vfs_module_callback_popvoid gnome_vfs_module_callback_pop (const char *callback_name); Remove the temporary handler for callback_name most recently set ! with gnome_vfs_module_callback_push(). If another temporary handler was previously set on the same thread, it becomes the current handler. Otherwise, the default handler, if any, becomes current. --- 267,276 ---- <anchor id="gnome-vfs-module-callback-pop"/>gnome_vfs_module_callback_pop () ! void gnome_vfs_module_callback_pop (const char *callback_name); Remove the temporary handler for callback_name most recently set ! with gnome_vfs_module_callback_push(). If another temporary handler was previously set on the same thread, it becomes the current handler. Otherwise, the default handler, if any, becomes current. *************** *** 289,296 **** <anchor id="gnome-vfs-async-module-callback-set-default"/>gnome_vfs_async_module_callback_set_default () ! gnome_vfs_async_module_callback_set_defaultvoid gnome_vfs_async_module_callback_set_default ! (const char *callback_name, GnomeVFSAsyncModuleCallback callback, gpointer callback_data, GDestroyNotify destroy_notify); --- 287,294 ---- <anchor id="gnome-vfs-async-module-callback-set-default"/>gnome_vfs_async_module_callback_set_default () ! void gnome_vfs_async_module_callback_set_default ! (const char *callback_name, GnomeVFSAsyncModuleCallback callback, gpointer callback_data, GDestroyNotify destroy_notify); *************** *** 310,319 **** for use with async operations. ! You can use gnome_vfs_async_module_callback_push() to set an async callback function that will temporarily override the default on the current thread instead. Or you can also use ! gnome_vfs_module_callback_set_default() to set a regular callback function. --- 308,317 ---- for use with async operations. ! You can use gnome_vfs_async_module_callback_push() to set an async callback function that will temporarily override the default on the current thread instead. Or you can also use ! gnome_vfs_module_callback_set_default() to set a regular callback function. *************** *** 337,344 **** <anchor id="gnome-vfs-async-module-callback-push"/>gnome_vfs_async_module_callback_push () ! gnome_vfs_async_module_callback_pushvoid gnome_vfs_async_module_callback_push ! (const char *callback_name, GnomeVFSAsyncModuleCallback callback, gpointer callback_data, GDestroyNotify destroy_notify); --- 335,342 ---- <anchor id="gnome-vfs-async-module-callback-push"/>gnome_vfs_async_module_callback_push () ! void gnome_vfs_async_module_callback_push ! (const char *callback_name, GnomeVFSAsyncModuleCallback callback, gpointer callback_data, GDestroyNotify destroy_notify); *************** *** 353,366 **** The temporary async handler is set per-thread. ! gnome_vfs_async_module_callback_pop() removes the most recently set temporary temporary handler. The temporary async handlers are treated as a first-in first-out stack. Use this function to set a temporary async callback handler for a single call or a few calls. You can use ! gnome_vfs_async_module_callback_set_default() to set an async callback function that will establish a permanent global setting for all threads instead. --- 351,364 ---- The temporary async handler is set per-thread. ! gnome_vfs_async_module_callback_pop() removes the most recently set temporary temporary handler. The temporary async handlers are treated as a first-in first-out stack. Use this function to set a temporary async callback handler for a single call or a few calls. You can use ! gnome_vfs_async_module_callback_set_default() to set an async callback function that will establish a permanent global setting for all threads instead. *************** *** 385,395 **** <anchor id="gnome-vfs-async-module-callback-pop"/>gnome_vfs_async_module_callback_pop () ! gnome_vfs_async_module_callback_popvoid gnome_vfs_async_module_callback_pop ! (const char *callback_name); Remove the temporary async handler for callback_name most recently ! set with gnome_vfs_async_module_callback_push(). If another temporary async handler was previously set on the same thread, it becomes the current handler. Otherwise, the default async handler, if any, becomes current. --- 383,393 ---- <anchor id="gnome-vfs-async-module-callback-pop"/>gnome_vfs_async_module_callback_pop () ! void gnome_vfs_async_module_callback_pop ! (const char *callback_name); Remove the temporary async handler for callback_name most recently ! set with gnome_vfs_async_module_callback_push(). If another temporary async handler was previously set on the same thread, it becomes the current handler. Otherwise, the default async handler, if any, becomes current. diff -crN ./gnome-vfs/doc/xml/gnome-vfs-module-shared.xml /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/doc/xml/gnome-vfs-module-shared.xml *** ./gnome-vfs/doc/xml/gnome-vfs-module-shared.xml Mon Sep 8 14:19:50 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/doc/xml/gnome-vfs-module-shared.xml Thu Dec 18 21:23:00 2003 *************** *** 16,30 **** const gchar* gnome_vfs_mime_type_from_mode (mode_t mode); ! void gnome_vfs_stat_to_file_info (GnomeVFSFileInfo *file_info, const struct stat *statptr); GnomeVFSResult gnome_vfs_set_meta (GnomeVFSFileInfo *info, ! const char *file_name, ! const char *meta_key); GnomeVFSResult gnome_vfs_set_meta_for_list (GnomeVFSFileInfo *info, ! const char *file_name, const GList *meta_keys); ! const char* gnome_vfs_get_special_mime_type (GnomeVFSURI *uri); --- 16,30 ---- const gchar* gnome_vfs_mime_type_from_mode (mode_t mode); ! void gnome_vfs_stat_to_file_info (GnomeVFSFileInfo *file_info, const struct stat *statptr); GnomeVFSResult gnome_vfs_set_meta (GnomeVFSFileInfo *info, ! const char *file_name, ! const char *meta_key); GnomeVFSResult gnome_vfs_set_meta_for_list (GnomeVFSFileInfo *info, ! const char *file_name, const GList *meta_keys); ! const char* gnome_vfs_get_special_mime_type (GnomeVFSURI *uri); *************** *** 34,41 **** - - Description --- 34,39 ---- *************** *** 47,53 **** Details <anchor id="gnome-vfs-mime-type-from-mode"/>gnome_vfs_mime_type_from_mode () ! gnome_vfs_mime_type_from_modeconst gchar* gnome_vfs_mime_type_from_mode (mode_t mode); Returns a MIME type based on the mode passed. It only works when mode references a special file (directory, device, fifo, socket or symlink) --- 45,51 ---- Details <anchor id="gnome-vfs-mime-type-from-mode"/>gnome_vfs_mime_type_from_mode () ! const gchar* gnome_vfs_mime_type_from_mode (mode_t mode); Returns a MIME type based on the mode passed. It only works when mode references a special file (directory, device, fifo, socket or symlink) *************** *** 65,71 **** <anchor id="gnome-vfs-stat-to-file-info"/>gnome_vfs_stat_to_file_info () ! gnome_vfs_stat_to_file_infovoid gnome_vfs_stat_to_file_info (GnomeVFSFileInfo *file_info, const struct stat *statptr); --- 63,69 ---- <anchor id="gnome-vfs-stat-to-file-info"/>gnome_vfs_stat_to_file_info () ! void gnome_vfs_stat_to_file_info (GnomeVFSFileInfo *file_info, const struct stat *statptr); *************** *** 81,89 **** <anchor id="gnome-vfs-set-meta"/>gnome_vfs_set_meta () ! gnome_vfs_set_metaGnomeVFSResult gnome_vfs_set_meta (GnomeVFSFileInfo *info, ! const char *file_name, ! const char *meta_key); --- 79,87 ---- <anchor id="gnome-vfs-set-meta"/>gnome_vfs_set_meta () ! GnomeVFSResult gnome_vfs_set_meta (GnomeVFSFileInfo *info, ! const char *file_name, ! const char *meta_key); *************** *** 103,110 **** <anchor id="gnome-vfs-set-meta-for-list"/>gnome_vfs_set_meta_for_list () ! gnome_vfs_set_meta_for_listGnomeVFSResult gnome_vfs_set_meta_for_list (GnomeVFSFileInfo *info, ! const char *file_name, const GList *meta_keys); --- 101,108 ---- <anchor id="gnome-vfs-set-meta-for-list"/>gnome_vfs_set_meta_for_list () ! GnomeVFSResult gnome_vfs_set_meta_for_list (GnomeVFSFileInfo *info, ! const char *file_name, const GList *meta_keys); *************** *** 125,131 **** <anchor id="gnome-vfs-get-special-mime-type"/>gnome_vfs_get_special_mime_type () ! gnome_vfs_get_special_mime_typeconst char* gnome_vfs_get_special_mime_type (GnomeVFSURI *uri); Gets the MIME type for uri, this function only returns the type when the URI points to a file that can't be sniffed (sockets, --- 123,129 ---- <anchor id="gnome-vfs-get-special-mime-type"/>gnome_vfs_get_special_mime_type () ! const char* gnome_vfs_get_special_mime_type (GnomeVFSURI *uri); Gets the MIME type for uri, this function only returns the type when the URI points to a file that can't be sniffed (sockets, diff -crN ./gnome-vfs/doc/xml/gnome-vfs-module.xml /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/doc/xml/gnome-vfs-module.xml *** ./gnome-vfs/doc/xml/gnome-vfs-module.xml Mon Sep 8 14:19:50 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/doc/xml/gnome-vfs-module.xml Thu Dec 18 21:23:00 2003 *************** *** 15,25 **** ! GnomeVFSMethod* vfs_module_init (const char *method_name, ! const char *args); ! GnomeVFSTransform* vfs_module_transform (const char *method_name, ! const char *args); ! void vfs_module_shutdown (GnomeVFSMethod *method); --- 15,25 ---- ! GnomeVFSMethod* vfs_module_init (const char *method_name, ! const char *args); ! GnomeVFSTransform* vfs_module_transform (const char *method_name, ! const char *args); ! void vfs_module_shutdown (GnomeVFSMethod *method); *************** *** 29,36 **** - - Description --- 29,34 ---- *************** *** 42,49 **** Details <anchor id="vfs-module-init"/>vfs_module_init () ! vfs_module_initGnomeVFSMethod* vfs_module_init (const char *method_name, ! const char *args); Standard extern call implemented by each filesystem module. This is called to initialize the module and setup any basic structures / connections the --- 40,47 ---- Details <anchor id="vfs-module-init"/>vfs_module_init () ! GnomeVFSMethod* vfs_module_init (const char *method_name, ! const char *args); Standard extern call implemented by each filesystem module. This is called to initialize the module and setup any basic structures / connections the *************** *** 65,72 **** <anchor id="vfs-module-transform"/>vfs_module_transform () ! vfs_module_transformGnomeVFSTransform* vfs_module_transform (const char *method_name, ! const char *args); Shift an already instanced module to a new method name. This call is not implemented by most modules and is optional. --- 63,70 ---- <anchor id="vfs-module-transform"/>vfs_module_transform () ! GnomeVFSTransform* vfs_module_transform (const char *method_name, ! const char *args); Shift an already instanced module to a new method name. This call is not implemented by most modules and is optional. *************** *** 86,92 **** <anchor id="vfs-module-shutdown"/>vfs_module_shutdown () ! vfs_module_shutdownvoid vfs_module_shutdown (GnomeVFSMethod *method); Called to tell a module to end any active operations, free all used memory, and close any connections (as appropriate) or resources. --- 84,90 ---- <anchor id="vfs-module-shutdown"/>vfs_module_shutdown () ! void vfs_module_shutdown (GnomeVFSMethod *method); Called to tell a module to end any active operations, free all used memory, and close any connections (as appropriate) or resources. diff -crN ./gnome-vfs/doc/xml/gnome-vfs-monitor.xml /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/doc/xml/gnome-vfs-monitor.xml *** ./gnome-vfs/doc/xml/gnome-vfs-monitor.xml Mon Sep 8 14:19:50 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/doc/xml/gnome-vfs-monitor.xml Thu Dec 18 21:23:00 2003 *************** *** 24,30 **** GnomeVFSResult gnome_vfs_monitor_cancel (GnomeVFSMonitorHandle *handle); enum GnomeVFSMonitorType; enum GnomeVFSMonitorEventType; ! void (*GnomeVFSMonitorCallback) (GnomeVFSMonitorHandle *handle, const gchar *monitor_uri, const gchar *info_uri, GnomeVFSMonitorEventType event_type, --- 24,30 ---- GnomeVFSResult gnome_vfs_monitor_cancel (GnomeVFSMonitorHandle *handle); enum GnomeVFSMonitorType; enum GnomeVFSMonitorEventType; ! void (*GnomeVFSMonitorCallback) (GnomeVFSMonitorHandle *handle, const gchar *monitor_uri, const gchar *info_uri, GnomeVFSMonitorEventType event_type, *************** *** 38,45 **** - - Description --- 38,43 ---- *************** *** 51,57 **** Details <anchor id="gnome-vfs-monitor-add"/>gnome_vfs_monitor_add () ! gnome_vfs_monitor_addGnomeVFSResult gnome_vfs_monitor_add (GnomeVFSMonitorHandle **handle, const gchar *text_uri, GnomeVFSMonitorType monitor_type, GnomeVFSMonitorCallback callback, --- 49,55 ---- Details <anchor id="gnome-vfs-monitor-add"/>gnome_vfs_monitor_add () ! GnomeVFSResult gnome_vfs_monitor_add (GnomeVFSMonitorHandle **handle, const gchar *text_uri, GnomeVFSMonitorType monitor_type, GnomeVFSMonitorCallback callback, *************** *** 83,89 **** <anchor id="gnome-vfs-monitor-cancel"/>gnome_vfs_monitor_cancel () ! gnome_vfs_monitor_cancelGnomeVFSResult gnome_vfs_monitor_cancel (GnomeVFSMonitorHandle *handle); Cancel the monitor pointed to be handle. --- 81,87 ---- <anchor id="gnome-vfs-monitor-cancel"/>gnome_vfs_monitor_cancel () ! GnomeVFSResult gnome_vfs_monitor_cancel (GnomeVFSMonitorHandle *handle); Cancel the monitor pointed to be handle. *************** *** 97,103 **** <anchor id="GnomeVFSMonitorType"/>enum GnomeVFSMonitorType ! GnomeVFSMonitorTypetypedef enum { GNOME_VFS_MONITOR_FILE, GNOME_VFS_MONITOR_DIRECTORY } GnomeVFSMonitorType; --- 95,101 ---- <anchor id="GnomeVFSMonitorType"/>enum GnomeVFSMonitorType ! typedef enum { GNOME_VFS_MONITOR_FILE, GNOME_VFS_MONITOR_DIRECTORY } GnomeVFSMonitorType; *************** *** 109,115 **** <anchor id="GnomeVFSMonitorEventType"/>enum GnomeVFSMonitorEventType ! GnomeVFSMonitorEventTypetypedef enum { GNOME_VFS_MONITOR_EVENT_CHANGED, GNOME_VFS_MONITOR_EVENT_DELETED, GNOME_VFS_MONITOR_EVENT_STARTEXECUTING, --- 107,113 ---- <anchor id="GnomeVFSMonitorEventType"/>enum GnomeVFSMonitorEventType ! typedef enum { GNOME_VFS_MONITOR_EVENT_CHANGED, GNOME_VFS_MONITOR_EVENT_DELETED, GNOME_VFS_MONITOR_EVENT_STARTEXECUTING, *************** *** 156,162 **** <anchor id="GnomeVFSMonitorCallback"/>GnomeVFSMonitorCallback () ! GnomeVFSMonitorCallbackvoid (*GnomeVFSMonitorCallback) (GnomeVFSMonitorHandle *handle, const gchar *monitor_uri, const gchar *info_uri, GnomeVFSMonitorEventType event_type, --- 154,160 ---- <anchor id="GnomeVFSMonitorCallback"/>GnomeVFSMonitorCallback () ! void (*GnomeVFSMonitorCallback) (GnomeVFSMonitorHandle *handle, const gchar *monitor_uri, const gchar *info_uri, GnomeVFSMonitorEventType event_type, *************** *** 180,186 **** what happened to info_uri user_data : ! user data passed to gnome_vfs_monitor_add() when the monitor was created --- 178,184 ---- what happened to info_uri user_data : ! user data passed to gnome_vfs_monitor_add() when the monitor was created diff -crN ./gnome-vfs/doc/xml/gnome-vfs-ops.xml /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/doc/xml/gnome-vfs-ops.xml *** ./gnome-vfs/doc/xml/gnome-vfs-ops.xml Mon Sep 8 14:19:50 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/doc/xml/gnome-vfs-ops.xml Thu Dec 18 21:22:58 2003 *************** *** 26,33 **** - - Description --- 26,31 ---- *************** *** 39,45 **** Details <anchor id="GnomeVFSMethodHandle"/>GnomeVFSMethodHandle ! GnomeVFSMethodHandletypedef gpointer GnomeVFSMethodHandle; --- 37,43 ---- Details <anchor id="GnomeVFSMethodHandle"/>GnomeVFSMethodHandle ! typedef gpointer GnomeVFSMethodHandle; diff -crN ./gnome-vfs/doc/xml/gnome-vfs-parse-ls.xml /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/doc/xml/gnome-vfs-parse-ls.xml *** ./gnome-vfs/doc/xml/gnome-vfs-parse-ls.xml Mon Sep 8 14:19:50 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/doc/xml/gnome-vfs-parse-ls.xml Thu Dec 18 21:22:59 2003 *************** *** 15,24 **** ! int gnome_vfs_parse_ls_lga (const char *p, struct stat *s, ! char **filename, ! char **linkname); --- 15,24 ---- ! int gnome_vfs_parse_ls_lga (const char *p, struct stat *s, ! char **filename, ! char **linkname); *************** *** 28,35 **** - - Description --- 28,33 ---- *************** *** 41,50 **** Details <anchor id="gnome-vfs-parse-ls-lga"/>gnome_vfs_parse_ls_lga () ! gnome_vfs_parse_ls_lgaint gnome_vfs_parse_ls_lga (const char *p, struct stat *s, ! char **filename, ! char **linkname); --- 39,48 ---- Details <anchor id="gnome-vfs-parse-ls-lga"/>gnome_vfs_parse_ls_lga () ! int gnome_vfs_parse_ls_lga (const char *p, struct stat *s, ! char **filename, ! char **linkname); diff -crN ./gnome-vfs/doc/xml/gnome-vfs-result.xml /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/doc/xml/gnome-vfs-result.xml *** ./gnome-vfs/doc/xml/gnome-vfs-result.xml Mon Sep 8 14:19:50 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/doc/xml/gnome-vfs-result.xml Thu Dec 18 21:23:00 2003 *************** *** 17,25 **** enum GnomeVFSResult; ! const char* gnome_vfs_result_to_string (GnomeVFSResult result); GnomeVFSResult gnome_vfs_result_from_errno_code ! (int errno_code); GnomeVFSResult gnome_vfs_result_from_errno (void); GnomeVFSResult gnome_vfs_result_from_h_errno (void); --- 17,25 ---- enum GnomeVFSResult; ! const char* gnome_vfs_result_to_string (GnomeVFSResult result); GnomeVFSResult gnome_vfs_result_from_errno_code ! (int errno_code); GnomeVFSResult gnome_vfs_result_from_errno (void); GnomeVFSResult gnome_vfs_result_from_h_errno (void); *************** *** 32,39 **** - - Description --- 32,37 ---- *************** *** 45,51 **** Details <anchor id="GnomeVFSResult"/>enum GnomeVFSResult ! GnomeVFSResulttypedef enum { GNOME_VFS_OK, GNOME_VFS_ERROR_NOT_FOUND, GNOME_VFS_ERROR_GENERIC, --- 43,49 ---- Details <anchor id="GnomeVFSResult"/>enum GnomeVFSResult ! typedef enum { GNOME_VFS_OK, GNOME_VFS_ERROR_NOT_FOUND, GNOME_VFS_ERROR_GENERIC, *************** *** 100,106 **** <anchor id="gnome-vfs-result-to-string"/>gnome_vfs_result_to_string () ! gnome_vfs_result_to_stringconst char* gnome_vfs_result_to_string (GnomeVFSResult result); Returns a string representation of result, useful for debugging purposes, but probably not appropriate for passing to the user. --- 98,104 ---- <anchor id="gnome-vfs-result-to-string"/>gnome_vfs_result_to_string () ! const char* gnome_vfs_result_to_string (GnomeVFSResult result); Returns a string representation of result, useful for debugging purposes, but probably not appropriate for passing to the user. *************** *** 115,122 **** <anchor id="gnome-vfs-result-from-errno-code"/>gnome_vfs_result_from_errno_code () ! gnome_vfs_result_from_errno_codeGnomeVFSResult gnome_vfs_result_from_errno_code ! (int errno_code); Converts a system errno value to a GnomeVFSResult. --- 113,120 ---- <anchor id="gnome-vfs-result-from-errno-code"/>gnome_vfs_result_from_errno_code () ! GnomeVFSResult gnome_vfs_result_from_errno_code ! (int errno_code); Converts a system errno value to a GnomeVFSResult. *************** *** 130,136 **** <anchor id="gnome-vfs-result-from-errno"/>gnome_vfs_result_from_errno () ! gnome_vfs_result_from_errnoGnomeVFSResult gnome_vfs_result_from_errno (void); Converts the system errno to a GnomeVFSResult. --- 128,134 ---- <anchor id="gnome-vfs-result-from-errno"/>gnome_vfs_result_from_errno () ! GnomeVFSResult gnome_vfs_result_from_errno (void); Converts the system errno to a GnomeVFSResult. *************** *** 141,147 **** <anchor id="gnome-vfs-result-from-h-errno"/>gnome_vfs_result_from_h_errno () ! gnome_vfs_result_from_h_errnoGnomeVFSResult gnome_vfs_result_from_h_errno (void); Converts the system "h_errno" to a GnomeVFSResult (h_errno represents errors --- 139,145 ---- <anchor id="gnome-vfs-result-from-h-errno"/>gnome_vfs_result_from_h_errno () ! GnomeVFSResult gnome_vfs_result_from_h_errno (void); Converts the system "h_errno" to a GnomeVFSResult (h_errno represents errors diff -crN ./gnome-vfs/doc/xml/gnome-vfs-socket-buffer.xml /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/doc/xml/gnome-vfs-socket-buffer.xml *** ./gnome-vfs/doc/xml/gnome-vfs-socket-buffer.xml Mon Sep 8 14:19:50 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/doc/xml/gnome-vfs-socket-buffer.xml Thu Dec 18 21:23:00 2003 *************** *** 26,32 **** GnomeVFSFileSize *bytes_read); GnomeVFSResult gnome_vfs_socket_buffer_peekc (GnomeVFSSocketBuffer *socket_buffer, ! char *character); GnomeVFSResult gnome_vfs_socket_buffer_write (GnomeVFSSocketBuffer *socket_buffer, gconstpointer buffer, --- 26,32 ---- GnomeVFSFileSize *bytes_read); GnomeVFSResult gnome_vfs_socket_buffer_peekc (GnomeVFSSocketBuffer *socket_buffer, ! char *character); GnomeVFSResult gnome_vfs_socket_buffer_write (GnomeVFSSocketBuffer *socket_buffer, gconstpointer buffer, *************** *** 43,50 **** - - Description --- 43,48 ---- *************** *** 56,62 **** Details <anchor id="gnome-vfs-socket-buffer-new"/>gnome_vfs_socket_buffer_new () ! gnome_vfs_socket_buffer_newGnomeVFSSocketBuffer* gnome_vfs_socket_buffer_new (GnomeVFSSocket *socket); Create a socket buffer around socket. A buffered --- 54,60 ---- Details <anchor id="gnome-vfs-socket-buffer-new"/>gnome_vfs_socket_buffer_new () ! GnomeVFSSocketBuffer* gnome_vfs_socket_buffer_new (GnomeVFSSocket *socket); Create a socket buffer around socket. A buffered *************** *** 74,80 **** <anchor id="gnome-vfs-socket-buffer-destroy"/>gnome_vfs_socket_buffer_destroy () ! gnome_vfs_socket_buffer_destroyGnomeVFSResult gnome_vfs_socket_buffer_destroy (GnomeVFSSocketBuffer *socket_buffer, gboolean close_socket); --- 72,78 ---- <anchor id="gnome-vfs-socket-buffer-destroy"/>gnome_vfs_socket_buffer_destroy () ! GnomeVFSResult gnome_vfs_socket_buffer_destroy (GnomeVFSSocketBuffer *socket_buffer, gboolean close_socket); *************** *** 93,99 **** <anchor id="gnome-vfs-socket-buffer-read"/>gnome_vfs_socket_buffer_read () ! gnome_vfs_socket_buffer_readGnomeVFSResult gnome_vfs_socket_buffer_read (GnomeVFSSocketBuffer *socket_buffer, gpointer buffer, GnomeVFSFileSize bytes, GnomeVFSFileSize *bytes_read); --- 91,97 ---- <anchor id="gnome-vfs-socket-buffer-read"/>gnome_vfs_socket_buffer_read () ! GnomeVFSResult gnome_vfs_socket_buffer_read (GnomeVFSSocketBuffer *socket_buffer, gpointer buffer, GnomeVFSFileSize bytes, GnomeVFSFileSize *bytes_read); *************** *** 120,128 **** <anchor id="gnome-vfs-socket-buffer-peekc"/>gnome_vfs_socket_buffer_peekc () ! gnome_vfs_socket_buffer_peekcGnomeVFSResult gnome_vfs_socket_buffer_peekc (GnomeVFSSocketBuffer *socket_buffer, ! char *character); Peek at the next character in socket_buffer without actually reading the character in. The next read will retrieve c (as well as any following --- 118,126 ---- <anchor id="gnome-vfs-socket-buffer-peekc"/>gnome_vfs_socket_buffer_peekc () ! GnomeVFSResult gnome_vfs_socket_buffer_peekc (GnomeVFSSocketBuffer *socket_buffer, ! char *character); Peek at the next character in socket_buffer without actually reading the character in. The next read will retrieve c (as well as any following *************** *** 142,148 **** <anchor id="gnome-vfs-socket-buffer-write"/>gnome_vfs_socket_buffer_write () ! gnome_vfs_socket_buffer_writeGnomeVFSResult gnome_vfs_socket_buffer_write (GnomeVFSSocketBuffer *socket_buffer, gconstpointer buffer, GnomeVFSFileSize bytes, --- 140,146 ---- <anchor id="gnome-vfs-socket-buffer-write"/>gnome_vfs_socket_buffer_write () ! GnomeVFSResult gnome_vfs_socket_buffer_write (GnomeVFSSocketBuffer *socket_buffer, gconstpointer buffer, GnomeVFSFileSize bytes, *************** *** 170,176 **** <anchor id="gnome-vfs-socket-buffer-flush"/>gnome_vfs_socket_buffer_flush () ! gnome_vfs_socket_buffer_flushGnomeVFSResult gnome_vfs_socket_buffer_flush (GnomeVFSSocketBuffer *socket_buffer); Write all outstanding data to socket_buffer. --- 168,174 ---- <anchor id="gnome-vfs-socket-buffer-flush"/>gnome_vfs_socket_buffer_flush () ! GnomeVFSResult gnome_vfs_socket_buffer_flush (GnomeVFSSocketBuffer *socket_buffer); Write all outstanding data to socket_buffer. diff -crN ./gnome-vfs/doc/xml/gnome-vfs-socket.xml /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/doc/xml/gnome-vfs-socket.xml *** ./gnome-vfs/doc/xml/gnome-vfs-socket.xml Mon Sep 8 14:19:50 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/doc/xml/gnome-vfs-socket.xml Thu Dec 18 21:22:59 2003 *************** *** 23,35 **** gconstpointer buffer, GnomeVFSFileSize bytes, GnomeVFSFileSize *bytes_written); ! void (*GnomeVFSSocketCloseFunc) (gpointer connection); typedef GnomeVFSSocketImpl; GnomeVFSSocket* gnome_vfs_socket_new (GnomeVFSSocketImpl *impl, ! void *connection); GnomeVFSResult gnome_vfs_socket_write (GnomeVFSSocket *socket, gconstpointer buffer, ! int bytes, GnomeVFSFileSize *bytes_written); GnomeVFSResult gnome_vfs_socket_close (GnomeVFSSocket *socket); GnomeVFSResult gnome_vfs_socket_read (GnomeVFSSocket *socket, --- 23,35 ---- gconstpointer buffer, GnomeVFSFileSize bytes, GnomeVFSFileSize *bytes_written); ! void (*GnomeVFSSocketCloseFunc) (gpointer connection); typedef GnomeVFSSocketImpl; GnomeVFSSocket* gnome_vfs_socket_new (GnomeVFSSocketImpl *impl, ! void *connection); GnomeVFSResult gnome_vfs_socket_write (GnomeVFSSocket *socket, gconstpointer buffer, ! int bytes, GnomeVFSFileSize *bytes_written); GnomeVFSResult gnome_vfs_socket_close (GnomeVFSSocket *socket); GnomeVFSResult gnome_vfs_socket_read (GnomeVFSSocket *socket, *************** *** 45,52 **** - - Description --- 45,50 ---- *************** *** 58,64 **** Details <anchor id="GnomeVFSSocketReadFunc"/>GnomeVFSSocketReadFunc () ! GnomeVFSSocketReadFuncGnomeVFSResult (*GnomeVFSSocketReadFunc) (gpointer connection, gpointer buffer, GnomeVFSFileSize bytes, GnomeVFSFileSize *bytes_read); --- 56,62 ---- Details <anchor id="GnomeVFSSocketReadFunc"/>GnomeVFSSocketReadFunc () ! GnomeVFSResult (*GnomeVFSSocketReadFunc) (gpointer connection, gpointer buffer, GnomeVFSFileSize bytes, GnomeVFSFileSize *bytes_read); *************** *** 84,90 **** <anchor id="GnomeVFSSocketWriteFunc"/>GnomeVFSSocketWriteFunc () ! GnomeVFSSocketWriteFuncGnomeVFSResult (*GnomeVFSSocketWriteFunc) (gpointer connection, gconstpointer buffer, GnomeVFSFileSize bytes, GnomeVFSFileSize *bytes_written); --- 82,88 ---- <anchor id="GnomeVFSSocketWriteFunc"/>GnomeVFSSocketWriteFunc () ! GnomeVFSResult (*GnomeVFSSocketWriteFunc) (gpointer connection, gconstpointer buffer, GnomeVFSFileSize bytes, GnomeVFSFileSize *bytes_written); *************** *** 110,116 **** <anchor id="GnomeVFSSocketCloseFunc"/>GnomeVFSSocketCloseFunc () ! GnomeVFSSocketCloseFuncvoid (*GnomeVFSSocketCloseFunc) (gpointer connection); --- 108,114 ---- <anchor id="GnomeVFSSocketCloseFunc"/>GnomeVFSSocketCloseFunc () ! void (*GnomeVFSSocketCloseFunc) (gpointer connection); *************** *** 122,128 **** <anchor id="GnomeVFSSocketImpl"/>GnomeVFSSocketImpl ! GnomeVFSSocketImpltypedef struct { GnomeVFSSocketReadFunc read; GnomeVFSSocketWriteFunc write; GnomeVFSSocketCloseFunc close; --- 120,126 ---- <anchor id="GnomeVFSSocketImpl"/>GnomeVFSSocketImpl ! typedef struct { GnomeVFSSocketReadFunc read; GnomeVFSSocketWriteFunc write; GnomeVFSSocketCloseFunc close; *************** *** 133,140 **** <anchor id="gnome-vfs-socket-new"/>gnome_vfs_socket_new () ! gnome_vfs_socket_newGnomeVFSSocket* gnome_vfs_socket_new (GnomeVFSSocketImpl *impl, ! void *connection); Creates a new GnomeVFS Socket using the specific implementation impl. --- 131,138 ---- <anchor id="gnome-vfs-socket-new"/>gnome_vfs_socket_new () ! GnomeVFSSocket* gnome_vfs_socket_new (GnomeVFSSocketImpl *impl, ! void *connection); Creates a new GnomeVFS Socket using the specific implementation impl. *************** *** 154,162 **** <anchor id="gnome-vfs-socket-write"/>gnome_vfs_socket_write () ! gnome_vfs_socket_writeGnomeVFSResult gnome_vfs_socket_write (GnomeVFSSocket *socket, gconstpointer buffer, ! int bytes, GnomeVFSFileSize *bytes_written); Write bytes bytes of data from buffer to socket. --- 152,160 ---- <anchor id="gnome-vfs-socket-write"/>gnome_vfs_socket_write () ! GnomeVFSResult gnome_vfs_socket_write (GnomeVFSSocket *socket, gconstpointer buffer, ! int bytes, GnomeVFSFileSize *bytes_written); Write bytes bytes of data from buffer to socket. *************** *** 181,187 **** <anchor id="gnome-vfs-socket-close"/>gnome_vfs_socket_close () ! gnome_vfs_socket_closeGnomeVFSResult gnome_vfs_socket_close (GnomeVFSSocket *socket); Close socket, freeing any resources it may be using. --- 179,185 ---- <anchor id="gnome-vfs-socket-close"/>gnome_vfs_socket_close () ! GnomeVFSResult gnome_vfs_socket_close (GnomeVFSSocket *socket); Close socket, freeing any resources it may be using. *************** *** 195,201 **** <anchor id="gnome-vfs-socket-read"/>gnome_vfs_socket_read () ! gnome_vfs_socket_readGnomeVFSResult gnome_vfs_socket_read (GnomeVFSSocket *socket, gpointer buffer, GnomeVFSFileSize bytes, GnomeVFSFileSize *bytes_read); --- 193,199 ---- <anchor id="gnome-vfs-socket-read"/>gnome_vfs_socket_read () ! GnomeVFSResult gnome_vfs_socket_read (GnomeVFSSocket *socket, gpointer buffer, GnomeVFSFileSize bytes, GnomeVFSFileSize *bytes_read); diff -crN ./gnome-vfs/doc/xml/gnome-vfs-ssl.xml /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/doc/xml/gnome-vfs-ssl.xml *** ./gnome-vfs/doc/xml/gnome-vfs-ssl.xml Mon Sep 8 14:19:50 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/doc/xml/gnome-vfs-ssl.xml Thu Dec 18 21:22:59 2003 *************** *** 17,24 **** gboolean gnome_vfs_ssl_enabled (void); GnomeVFSResult gnome_vfs_ssl_create (GnomeVFSSSL **handle_return, ! const char *host, ! unsigned int port); GnomeVFSResult gnome_vfs_ssl_create_from_fd (GnomeVFSSSL **handle_return, gint fd); GnomeVFSResult gnome_vfs_ssl_read (GnomeVFSSSL *ssl, --- 17,24 ---- gboolean gnome_vfs_ssl_enabled (void); GnomeVFSResult gnome_vfs_ssl_create (GnomeVFSSSL **handle_return, ! const char *host, ! unsigned int port); GnomeVFSResult gnome_vfs_ssl_create_from_fd (GnomeVFSSSL **handle_return, gint fd); GnomeVFSResult gnome_vfs_ssl_read (GnomeVFSSSL *ssl, *************** *** 29,35 **** gconstpointer buffer, GnomeVFSFileSize bytes, GnomeVFSFileSize *bytes_written); ! void gnome_vfs_ssl_destroy (GnomeVFSSSL *ssl); GnomeVFSSocket* gnome_vfs_ssl_to_socket (GnomeVFSSSL *ssl); --- 29,35 ---- gconstpointer buffer, GnomeVFSFileSize bytes, GnomeVFSFileSize *bytes_written); ! void gnome_vfs_ssl_destroy (GnomeVFSSSL *ssl); GnomeVFSSocket* gnome_vfs_ssl_to_socket (GnomeVFSSSL *ssl); *************** *** 40,47 **** - - Description --- 40,45 ---- *************** *** 53,59 **** Details <anchor id="gnome-vfs-ssl-enabled"/>gnome_vfs_ssl_enabled () ! gnome_vfs_ssl_enabledgboolean gnome_vfs_ssl_enabled (void); Checks whether GnomeVFS was compiled with SSL support. --- 51,57 ---- Details <anchor id="gnome-vfs-ssl-enabled"/>gnome_vfs_ssl_enabled () ! gboolean gnome_vfs_ssl_enabled (void); Checks whether GnomeVFS was compiled with SSL support. *************** *** 65,73 **** <anchor id="gnome-vfs-ssl-create"/>gnome_vfs_ssl_create () ! gnome_vfs_ssl_createGnomeVFSResult gnome_vfs_ssl_create (GnomeVFSSSL **handle_return, ! const char *host, ! unsigned int port); Creates an SSL socket connection at handle_return to host using port port. --- 63,71 ---- <anchor id="gnome-vfs-ssl-create"/>gnome_vfs_ssl_create () ! GnomeVFSResult gnome_vfs_ssl_create (GnomeVFSSSL **handle_return, ! const char *host, ! unsigned int port); Creates an SSL socket connection at handle_return to host using port port. *************** *** 89,95 **** <anchor id="gnome-vfs-ssl-create-from-fd"/>gnome_vfs_ssl_create_from_fd () ! gnome_vfs_ssl_create_from_fdGnomeVFSResult gnome_vfs_ssl_create_from_fd (GnomeVFSSSL **handle_return, gint fd); Try to establish an SSL connection over the file descriptor fd. --- 87,93 ---- <anchor id="gnome-vfs-ssl-create-from-fd"/>gnome_vfs_ssl_create_from_fd () ! GnomeVFSResult gnome_vfs_ssl_create_from_fd (GnomeVFSSSL **handle_return, gint fd); Try to establish an SSL connection over the file descriptor fd. *************** *** 108,114 **** <anchor id="gnome-vfs-ssl-read"/>gnome_vfs_ssl_read () ! gnome_vfs_ssl_readGnomeVFSResult gnome_vfs_ssl_read (GnomeVFSSSL *ssl, gpointer buffer, GnomeVFSFileSize bytes, GnomeVFSFileSize *bytes_read); --- 106,112 ---- <anchor id="gnome-vfs-ssl-read"/>gnome_vfs_ssl_read () ! GnomeVFSResult gnome_vfs_ssl_read (GnomeVFSSSL *ssl, gpointer buffer, GnomeVFSFileSize bytes, GnomeVFSFileSize *bytes_read); *************** *** 135,141 **** <anchor id="gnome-vfs-ssl-write"/>gnome_vfs_ssl_write () ! gnome_vfs_ssl_writeGnomeVFSResult gnome_vfs_ssl_write (GnomeVFSSSL *ssl, gconstpointer buffer, GnomeVFSFileSize bytes, GnomeVFSFileSize *bytes_written); --- 133,139 ---- <anchor id="gnome-vfs-ssl-write"/>gnome_vfs_ssl_write () ! GnomeVFSResult gnome_vfs_ssl_write (GnomeVFSSSL *ssl, gconstpointer buffer, GnomeVFSFileSize bytes, GnomeVFSFileSize *bytes_written); *************** *** 162,168 **** <anchor id="gnome-vfs-ssl-destroy"/>gnome_vfs_ssl_destroy () ! gnome_vfs_ssl_destroyvoid gnome_vfs_ssl_destroy (GnomeVFSSSL *ssl); Free resources used by ssl and close the connection. --- 160,166 ---- <anchor id="gnome-vfs-ssl-destroy"/>gnome_vfs_ssl_destroy () ! void gnome_vfs_ssl_destroy (GnomeVFSSSL *ssl); Free resources used by ssl and close the connection. *************** *** 174,180 **** <anchor id="gnome-vfs-ssl-to-socket"/>gnome_vfs_ssl_to_socket () ! gnome_vfs_ssl_to_socketGnomeVFSSocket* gnome_vfs_ssl_to_socket (GnomeVFSSSL *ssl); Wrapper an SSL socket inside a standard GnomeVFSSocket. --- 172,178 ---- <anchor id="gnome-vfs-ssl-to-socket"/>gnome_vfs_ssl_to_socket () ! GnomeVFSSocket* gnome_vfs_ssl_to_socket (GnomeVFSSSL *ssl); Wrapper an SSL socket inside a standard GnomeVFSSocket. diff -crN ./gnome-vfs/doc/xml/gnome-vfs-standard-callbacks.xml /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/doc/xml/gnome-vfs-standard-callbacks.xml *** ./gnome-vfs/doc/xml/gnome-vfs-standard-callbacks.xml Mon Sep 8 14:19:50 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/doc/xml/gnome-vfs-standard-callbacks.xml Thu Dec 18 21:22:59 2003 *************** *** 36,43 **** - - Description --- 36,41 ---- *************** *** 49,69 **** Details <anchor id="GNOME-VFS-MODULE-CALLBACK-AUTHENTICATION-CAPS"/>GNOME_VFS_MODULE_CALLBACK_AUTHENTICATION ! GNOME_VFS_MODULE_CALLBACK_AUTHENTICATION#define GNOME_VFS_MODULE_CALLBACK_AUTHENTICATION "simple-authentication" <anchor id="GNOME-VFS-MODULE-CALLBACK-HTTP-PROXY-AUTHENTICATION-CAPS"/>GNOME_VFS_MODULE_CALLBACK_HTTP_PROXY_AUTHENTICATION ! GNOME_VFS_MODULE_CALLBACK_HTTP_PROXY_AUTHENTICATION#define GNOME_VFS_MODULE_CALLBACK_HTTP_PROXY_AUTHENTICATION "http:proxy-authentication" <anchor id="GnomeVFSModuleCallbackAuthenticationOut"/>GnomeVFSModuleCallbackAuthenticationOut ! GnomeVFSModuleCallbackAuthenticationOuttypedef struct { char *username; /* will be freed by g_free, * NULL indicates no auth should be provided; * if the request requires authn, the operation --- 47,67 ---- Details <anchor id="GNOME-VFS-MODULE-CALLBACK-AUTHENTICATION-CAPS"/>GNOME_VFS_MODULE_CALLBACK_AUTHENTICATION ! #define GNOME_VFS_MODULE_CALLBACK_AUTHENTICATION "simple-authentication" <anchor id="GNOME-VFS-MODULE-CALLBACK-HTTP-PROXY-AUTHENTICATION-CAPS"/>GNOME_VFS_MODULE_CALLBACK_HTTP_PROXY_AUTHENTICATION ! #define GNOME_VFS_MODULE_CALLBACK_HTTP_PROXY_AUTHENTICATION "http:proxy-authentication" <anchor id="GnomeVFSModuleCallbackAuthenticationOut"/>GnomeVFSModuleCallbackAuthenticationOut ! typedef struct { char *username; /* will be freed by g_free, * NULL indicates no auth should be provided; * if the request requires authn, the operation *************** *** 83,96 **** <anchor id="GNOME-VFS-MODULE-CALLBACK-HTTP-SEND-ADDITIONAL-HEADERS-CAPS"/>GNOME_VFS_MODULE_CALLBACK_HTTP_SEND_ADDITIONAL_HEADERS ! GNOME_VFS_MODULE_CALLBACK_HTTP_SEND_ADDITIONAL_HEADERS#define GNOME_VFS_MODULE_CALLBACK_HTTP_SEND_ADDITIONAL_HEADERS "http:send-additional-headers" <anchor id="GnomeVFSModuleCallbackAdditionalHeadersIn"/>GnomeVFSModuleCallbackAdditionalHeadersIn ! GnomeVFSModuleCallbackAdditionalHeadersIntypedef struct { GnomeVFSURI *uri; /* URI of operation */ /* Reserved "padding" to avoid future breaks in ABI compatibility */ --- 81,94 ---- <anchor id="GNOME-VFS-MODULE-CALLBACK-HTTP-SEND-ADDITIONAL-HEADERS-CAPS"/>GNOME_VFS_MODULE_CALLBACK_HTTP_SEND_ADDITIONAL_HEADERS ! #define GNOME_VFS_MODULE_CALLBACK_HTTP_SEND_ADDITIONAL_HEADERS "http:send-additional-headers" <anchor id="GnomeVFSModuleCallbackAdditionalHeadersIn"/>GnomeVFSModuleCallbackAdditionalHeadersIn ! typedef struct { GnomeVFSURI *uri; /* URI of operation */ /* Reserved "padding" to avoid future breaks in ABI compatibility */ *************** *** 103,109 **** <anchor id="GnomeVFSModuleCallbackAdditionalHeadersOut"/>GnomeVFSModuleCallbackAdditionalHeadersOut ! GnomeVFSModuleCallbackAdditionalHeadersOuttypedef struct { GList *headers; /* list of headers, will be freeed */ /* Reserved "padding" to avoid future breaks in ABI compatibility */ --- 101,107 ---- <anchor id="GnomeVFSModuleCallbackAdditionalHeadersOut"/>GnomeVFSModuleCallbackAdditionalHeadersOut ! typedef struct { GList *headers; /* list of headers, will be freeed */ /* Reserved "padding" to avoid future breaks in ABI compatibility */ *************** *** 116,129 **** <anchor id="GNOME-VFS-MODULE-CALLBACK-HTTP-RECEIVED-HEADERS-CAPS"/>GNOME_VFS_MODULE_CALLBACK_HTTP_RECEIVED_HEADERS ! GNOME_VFS_MODULE_CALLBACK_HTTP_RECEIVED_HEADERS#define GNOME_VFS_MODULE_CALLBACK_HTTP_RECEIVED_HEADERS "http:received-headers" <anchor id="GnomeVFSModuleCallbackReceivedHeadersIn"/>GnomeVFSModuleCallbackReceivedHeadersIn ! GnomeVFSModuleCallbackReceivedHeadersIntypedef struct { GnomeVFSURI *uri; /* URI of operation */ GList *headers; /* list of headers */ --- 114,127 ---- <anchor id="GNOME-VFS-MODULE-CALLBACK-HTTP-RECEIVED-HEADERS-CAPS"/>GNOME_VFS_MODULE_CALLBACK_HTTP_RECEIVED_HEADERS ! #define GNOME_VFS_MODULE_CALLBACK_HTTP_RECEIVED_HEADERS "http:received-headers" <anchor id="GnomeVFSModuleCallbackReceivedHeadersIn"/>GnomeVFSModuleCallbackReceivedHeadersIn ! typedef struct { GnomeVFSURI *uri; /* URI of operation */ GList *headers; /* list of headers */ *************** *** 137,143 **** <anchor id="GnomeVFSModuleCallbackReceivedHeadersOut"/>GnomeVFSModuleCallbackReceivedHeadersOut ! GnomeVFSModuleCallbackReceivedHeadersOuttypedef struct { int dummy; /* Reserved "padding" to avoid future breaks in ABI compatibility */ --- 135,141 ---- <anchor id="GnomeVFSModuleCallbackReceivedHeadersOut"/>GnomeVFSModuleCallbackReceivedHeadersOut ! typedef struct { int dummy; /* Reserved "padding" to avoid future breaks in ABI compatibility */ *************** *** 150,163 **** <anchor id="GNOME-VFS-MODULE-CALLBACK-STATUS-MESSAGE-CAPS"/>GNOME_VFS_MODULE_CALLBACK_STATUS_MESSAGE ! GNOME_VFS_MODULE_CALLBACK_STATUS_MESSAGE#define GNOME_VFS_MODULE_CALLBACK_STATUS_MESSAGE "status-message" <anchor id="GnomeVFSModuleCallbackStatusMessageIn"/>GnomeVFSModuleCallbackStatusMessageIn ! GnomeVFSModuleCallbackStatusMessageIntypedef struct { char *uri; /* Full URI of operation */ char *message; /* A message indicating the current state or * NULL if there is no message */ --- 148,161 ---- <anchor id="GNOME-VFS-MODULE-CALLBACK-STATUS-MESSAGE-CAPS"/>GNOME_VFS_MODULE_CALLBACK_STATUS_MESSAGE ! #define GNOME_VFS_MODULE_CALLBACK_STATUS_MESSAGE "status-message" <anchor id="GnomeVFSModuleCallbackStatusMessageIn"/>GnomeVFSModuleCallbackStatusMessageIn ! typedef struct { char *uri; /* Full URI of operation */ char *message; /* A message indicating the current state or * NULL if there is no message */ *************** *** 175,181 **** <anchor id="GnomeVFSModuleCallbackStatusMessageOut"/>GnomeVFSModuleCallbackStatusMessageOut ! GnomeVFSModuleCallbackStatusMessageOuttypedef struct { int dummy; /* empty structs not allowed */ /* Reserved "padding" to avoid future breaks in ABI compatibility */ --- 173,179 ---- <anchor id="GnomeVFSModuleCallbackStatusMessageOut"/>GnomeVFSModuleCallbackStatusMessageOut ! typedef struct { int dummy; /* empty structs not allowed */ /* Reserved "padding" to avoid future breaks in ABI compatibility */ diff -crN ./gnome-vfs/doc/xml/gnome-vfs-transform.xml /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/doc/xml/gnome-vfs-transform.xml *** ./gnome-vfs/doc/xml/gnome-vfs-transform.xml Mon Sep 8 14:19:50 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/doc/xml/gnome-vfs-transform.xml Thu Dec 18 21:22:58 2003 *************** *** 16,26 **** GnomeVFSTransform* (*GnomeVFSTransformInitFunc) ! (const char *method_name, ! const char *config_args); GnomeVFSResult (*GnomeVFSTransformFunc) (GnomeVFSTransform *transform, ! const char *old_uri, ! char **new_uri, GnomeVFSContext *context); --- 16,26 ---- GnomeVFSTransform* (*GnomeVFSTransformInitFunc) ! (const char *method_name, ! const char *config_args); GnomeVFSResult (*GnomeVFSTransformFunc) (GnomeVFSTransform *transform, ! const char *old_uri, ! char **new_uri, GnomeVFSContext *context); *************** *** 31,38 **** - - Description --- 31,36 ---- *************** *** 44,52 **** Details <anchor id="GnomeVFSTransformInitFunc"/>GnomeVFSTransformInitFunc () ! GnomeVFSTransformInitFuncGnomeVFSTransform* (*GnomeVFSTransformInitFunc) ! (const char *method_name, ! const char *config_args); --- 42,50 ---- Details <anchor id="GnomeVFSTransformInitFunc"/>GnomeVFSTransformInitFunc () ! GnomeVFSTransform* (*GnomeVFSTransformInitFunc) ! (const char *method_name, ! const char *config_args); *************** *** 63,71 **** <anchor id="GnomeVFSTransformFunc"/>GnomeVFSTransformFunc () ! GnomeVFSTransformFuncGnomeVFSResult (*GnomeVFSTransformFunc) (GnomeVFSTransform *transform, ! const char *old_uri, ! char **new_uri, GnomeVFSContext *context); --- 61,69 ---- <anchor id="GnomeVFSTransformFunc"/>GnomeVFSTransformFunc () ! GnomeVFSResult (*GnomeVFSTransformFunc) (GnomeVFSTransform *transform, ! const char *old_uri, ! char **new_uri, GnomeVFSContext *context); diff -crN ./gnome-vfs/doc/xml/gnome-vfs-uri.xml /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/doc/xml/gnome-vfs-uri.xml *** ./gnome-vfs/doc/xml/gnome-vfs-uri.xml Mon Sep 8 14:19:50 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/doc/xml/gnome-vfs-uri.xml Thu Dec 18 21:22:59 2003 *************** *** 26,36 **** GnomeVFSURI* gnome_vfs_uri_resolve_relative (const GnomeVFSURI *base, const gchar *relative_reference); GnomeVFSURI* gnome_vfs_uri_ref (GnomeVFSURI *uri); ! void gnome_vfs_uri_unref (GnomeVFSURI *uri); GnomeVFSURI* gnome_vfs_uri_append_string (const GnomeVFSURI *uri, ! const char *uri_fragment); GnomeVFSURI* gnome_vfs_uri_append_path (const GnomeVFSURI *uri, ! const char *path); GnomeVFSURI* gnome_vfs_uri_append_file_name (const GnomeVFSURI *uri, const gchar *filename); gchar* gnome_vfs_uri_to_string (const GnomeVFSURI *uri, --- 26,36 ---- GnomeVFSURI* gnome_vfs_uri_resolve_relative (const GnomeVFSURI *base, const gchar *relative_reference); GnomeVFSURI* gnome_vfs_uri_ref (GnomeVFSURI *uri); ! void gnome_vfs_uri_unref (GnomeVFSURI *uri); GnomeVFSURI* gnome_vfs_uri_append_string (const GnomeVFSURI *uri, ! const char *uri_fragment); GnomeVFSURI* gnome_vfs_uri_append_path (const GnomeVFSURI *uri, ! const char *path); GnomeVFSURI* gnome_vfs_uri_append_file_name (const GnomeVFSURI *uri, const gchar *filename); gchar* gnome_vfs_uri_to_string (const GnomeVFSURI *uri, *************** *** 46,58 **** guint gnome_vfs_uri_get_host_port (const GnomeVFSURI *uri); const gchar* gnome_vfs_uri_get_user_name (const GnomeVFSURI *uri); const gchar* gnome_vfs_uri_get_password (const GnomeVFSURI *uri); ! void gnome_vfs_uri_set_host_name (GnomeVFSURI *uri, const gchar *host_name); ! void gnome_vfs_uri_set_host_port (GnomeVFSURI *uri, guint host_port); ! void gnome_vfs_uri_set_user_name (GnomeVFSURI *uri, const gchar *user_name); ! void gnome_vfs_uri_set_password (GnomeVFSURI *uri, const gchar *password); gboolean gnome_vfs_uri_equal (const GnomeVFSURI *a, const GnomeVFSURI *b); --- 46,58 ---- guint gnome_vfs_uri_get_host_port (const GnomeVFSURI *uri); const gchar* gnome_vfs_uri_get_user_name (const GnomeVFSURI *uri); const gchar* gnome_vfs_uri_get_password (const GnomeVFSURI *uri); ! void gnome_vfs_uri_set_host_name (GnomeVFSURI *uri, const gchar *host_name); ! void gnome_vfs_uri_set_host_port (GnomeVFSURI *uri, guint host_port); ! void gnome_vfs_uri_set_user_name (GnomeVFSURI *uri, const gchar *user_name); ! void gnome_vfs_uri_set_password (GnomeVFSURI *uri, const gchar *password); gboolean gnome_vfs_uri_equal (const GnomeVFSURI *a, const GnomeVFSURI *b); *************** *** 74,83 **** GList* gnome_vfs_uri_list_ref (GList *list); GList* gnome_vfs_uri_list_unref (GList *list); GList* gnome_vfs_uri_list_copy (GList *list); ! void gnome_vfs_uri_list_free (GList *list); ! char* gnome_vfs_uri_make_full_from_relative ! (const char *base_uri, ! const char *relative_uri); --- 74,83 ---- GList* gnome_vfs_uri_list_ref (GList *list); GList* gnome_vfs_uri_list_unref (GList *list); GList* gnome_vfs_uri_list_copy (GList *list); ! void gnome_vfs_uri_list_free (GList *list); ! char* gnome_vfs_uri_make_full_from_relative ! (const char *base_uri, ! const char *relative_uri); *************** *** 87,94 **** - - Description --- 87,92 ---- *************** *** 100,106 **** Details <anchor id="GnomeVFSToplevelURI"/>GnomeVFSToplevelURI ! GnomeVFSToplevelURItypedef struct { /* Base object. */ GnomeVFSURI uri; --- 98,104 ---- Details <anchor id="GnomeVFSToplevelURI"/>GnomeVFSToplevelURI ! typedef struct { /* Base object. */ GnomeVFSURI uri; *************** *** 126,132 **** <anchor id="GnomeVFSURIHideOptions"/>enum GnomeVFSURIHideOptions ! GnomeVFSURIHideOptionstypedef enum { GNOME_VFS_URI_HIDE_NONE = 0, GNOME_VFS_URI_HIDE_USER_NAME = 1 << 0, GNOME_VFS_URI_HIDE_PASSWORD = 1 << 1, --- 124,130 ---- <anchor id="GnomeVFSURIHideOptions"/>enum GnomeVFSURIHideOptions ! typedef enum { GNOME_VFS_URI_HIDE_NONE = 0, GNOME_VFS_URI_HIDE_USER_NAME = 1 << 0, GNOME_VFS_URI_HIDE_PASSWORD = 1 << 1, *************** *** 180,186 **** <anchor id="GNOME-VFS-URI-MAGIC-CHR-CAPS"/>GNOME_VFS_URI_MAGIC_CHR ! GNOME_VFS_URI_MAGIC_CHR#define GNOME_VFS_URI_MAGIC_CHR '#' The character used to divide location from --- 178,184 ---- <anchor id="GNOME-VFS-URI-MAGIC-CHR-CAPS"/>GNOME_VFS_URI_MAGIC_CHR ! #define GNOME_VFS_URI_MAGIC_CHR '#' The character used to divide location from *************** *** 190,196 **** <anchor id="GNOME-VFS-URI-MAGIC-STR-CAPS"/>GNOME_VFS_URI_MAGIC_STR ! GNOME_VFS_URI_MAGIC_STR#define GNOME_VFS_URI_MAGIC_STR "#" The character used to divide location from --- 188,194 ---- <anchor id="GNOME-VFS-URI-MAGIC-STR-CAPS"/>GNOME_VFS_URI_MAGIC_STR ! #define GNOME_VFS_URI_MAGIC_STR "#" The character used to divide location from *************** *** 200,206 **** <anchor id="GNOME-VFS-URI-PATH-CHR-CAPS"/>GNOME_VFS_URI_PATH_CHR ! GNOME_VFS_URI_PATH_CHR#define GNOME_VFS_URI_PATH_CHR '/' Defines the path seperator character. --- 198,204 ---- <anchor id="GNOME-VFS-URI-PATH-CHR-CAPS"/>GNOME_VFS_URI_PATH_CHR ! #define GNOME_VFS_URI_PATH_CHR '/' Defines the path seperator character. *************** *** 209,215 **** <anchor id="GNOME-VFS-URI-PATH-STR-CAPS"/>GNOME_VFS_URI_PATH_STR ! GNOME_VFS_URI_PATH_STR#define GNOME_VFS_URI_PATH_STR "/" Defines the path seperator string. --- 207,213 ---- <anchor id="GNOME-VFS-URI-PATH-STR-CAPS"/>GNOME_VFS_URI_PATH_STR ! #define GNOME_VFS_URI_PATH_STR "/" Defines the path seperator string. *************** *** 218,224 **** <anchor id="gnome-vfs-uri-new"/>gnome_vfs_uri_new () ! gnome_vfs_uri_newGnomeVFSURI* gnome_vfs_uri_new (const gchar *text_uri); Create a new URI from text_uri. Unsupported and unsafe methods are not allowed and will result in null% being returned. URL --- 216,222 ---- <anchor id="gnome-vfs-uri-new"/>gnome_vfs_uri_new () ! GnomeVFSURI* gnome_vfs_uri_new (const gchar *text_uri); Create a new URI from text_uri. Unsupported and unsafe methods are not allowed and will result in null% being returned. URL *************** *** 234,240 **** <anchor id="gnome-vfs-uri-resolve-relative"/>gnome_vfs_uri_resolve_relative () ! gnome_vfs_uri_resolve_relativeGnomeVFSURI* gnome_vfs_uri_resolve_relative (const GnomeVFSURI *base, const gchar *relative_reference); Create a new URI from relative_reference, relative to base. --- 232,238 ---- <anchor id="gnome-vfs-uri-resolve-relative"/>gnome_vfs_uri_resolve_relative () ! GnomeVFSURI* gnome_vfs_uri_resolve_relative (const GnomeVFSURI *base, const gchar *relative_reference); Create a new URI from relative_reference, relative to base. *************** *** 252,258 **** <anchor id="gnome-vfs-uri-ref"/>gnome_vfs_uri_ref () ! gnome_vfs_uri_refGnomeVFSURI* gnome_vfs_uri_ref (GnomeVFSURI *uri); Increment uri's reference count. --- 250,256 ---- <anchor id="gnome-vfs-uri-ref"/>gnome_vfs_uri_ref () ! GnomeVFSURI* gnome_vfs_uri_ref (GnomeVFSURI *uri); Increment uri's reference count. *************** *** 266,272 **** <anchor id="gnome-vfs-uri-unref"/>gnome_vfs_uri_unref () ! gnome_vfs_uri_unrefvoid gnome_vfs_uri_unref (GnomeVFSURI *uri); Decrement uri's reference count. If the reference count reaches zero, uri is destroyed. --- 264,270 ---- <anchor id="gnome-vfs-uri-unref"/>gnome_vfs_uri_unref () ! void gnome_vfs_uri_unref (GnomeVFSURI *uri); Decrement uri's reference count. If the reference count reaches zero, uri is destroyed. *************** *** 279,286 **** <anchor id="gnome-vfs-uri-append-string"/>gnome_vfs_uri_append_string () ! gnome_vfs_uri_append_stringGnomeVFSURI* gnome_vfs_uri_append_string (const GnomeVFSURI *uri, ! const char *uri_fragment); Create a new URI obtained by appending path to uri. This will take care of adding an appropriate directory separator between the end of uri and --- 277,284 ---- <anchor id="gnome-vfs-uri-append-string"/>gnome_vfs_uri_append_string () ! GnomeVFSURI* gnome_vfs_uri_append_string (const GnomeVFSURI *uri, ! const char *uri_fragment); Create a new URI obtained by appending path to uri. This will take care of adding an appropriate directory separator between the end of uri and *************** *** 299,306 **** <anchor id="gnome-vfs-uri-append-path"/>gnome_vfs_uri_append_path () ! gnome_vfs_uri_append_pathGnomeVFSURI* gnome_vfs_uri_append_path (const GnomeVFSURI *uri, ! const char *path); Create a new URI obtained by appending path to uri. This will take care of adding an appropriate directory separator between the end of uri and --- 297,304 ---- <anchor id="gnome-vfs-uri-append-path"/>gnome_vfs_uri_append_path () ! GnomeVFSURI* gnome_vfs_uri_append_path (const GnomeVFSURI *uri, ! const char *path); Create a new URI obtained by appending path to uri. This will take care of adding an appropriate directory separator between the end of uri and *************** *** 319,325 **** <anchor id="gnome-vfs-uri-append-file-name"/>gnome_vfs_uri_append_file_name () ! gnome_vfs_uri_append_file_nameGnomeVFSURI* gnome_vfs_uri_append_file_name (const GnomeVFSURI *uri, const gchar *filename); Create a new URI obtained by appending file_name to uri. This will take care --- 317,323 ---- <anchor id="gnome-vfs-uri-append-file-name"/>gnome_vfs_uri_append_file_name () ! GnomeVFSURI* gnome_vfs_uri_append_file_name (const GnomeVFSURI *uri, const gchar *filename); Create a new URI obtained by appending file_name to uri. This will take care *************** *** 339,345 **** <anchor id="gnome-vfs-uri-to-string"/>gnome_vfs_uri_to_string () ! gnome_vfs_uri_to_stringgchar* gnome_vfs_uri_to_string (const GnomeVFSURI *uri, GnomeVFSURIHideOptions hide_options); Translate uri into a printable string. The string will not contain the --- 337,343 ---- <anchor id="gnome-vfs-uri-to-string"/>gnome_vfs_uri_to_string () ! gchar* gnome_vfs_uri_to_string (const GnomeVFSURI *uri, GnomeVFSURIHideOptions hide_options); Translate uri into a printable string. The string will not contain the *************** *** 359,365 **** <anchor id="gnome-vfs-uri-dup"/>gnome_vfs_uri_dup () ! gnome_vfs_uri_dupGnomeVFSURI* gnome_vfs_uri_dup (const GnomeVFSURI *uri); Duplicate uri. --- 357,363 ---- <anchor id="gnome-vfs-uri-dup"/>gnome_vfs_uri_dup () ! GnomeVFSURI* gnome_vfs_uri_dup (const GnomeVFSURI *uri); Duplicate uri. *************** *** 373,379 **** <anchor id="gnome-vfs-uri-is-local"/>gnome_vfs_uri_is_local () ! gnome_vfs_uri_is_localgboolean gnome_vfs_uri_is_local (const GnomeVFSURI *uri); Check if uri is a local (native) file system. --- 371,377 ---- <anchor id="gnome-vfs-uri-is-local"/>gnome_vfs_uri_is_local () ! gboolean gnome_vfs_uri_is_local (const GnomeVFSURI *uri); Check if uri is a local (native) file system. *************** *** 387,393 **** <anchor id="gnome-vfs-uri-has-parent"/>gnome_vfs_uri_has_parent () ! gnome_vfs_uri_has_parentgboolean gnome_vfs_uri_has_parent (const GnomeVFSURI *uri); Check if URI has a parent or not. --- 385,391 ---- <anchor id="gnome-vfs-uri-has-parent"/>gnome_vfs_uri_has_parent () ! gboolean gnome_vfs_uri_has_parent (const GnomeVFSURI *uri); Check if URI has a parent or not. *************** *** 401,407 **** <anchor id="gnome-vfs-uri-get-parent"/>gnome_vfs_uri_get_parent () ! gnome_vfs_uri_get_parentGnomeVFSURI* gnome_vfs_uri_get_parent (const GnomeVFSURI *uri); Retrieve uri's parent URI. --- 399,405 ---- <anchor id="gnome-vfs-uri-get-parent"/>gnome_vfs_uri_get_parent () ! GnomeVFSURI* gnome_vfs_uri_get_parent (const GnomeVFSURI *uri); Retrieve uri's parent URI. *************** *** 415,421 **** <anchor id="gnome-vfs-uri-get-toplevel"/>gnome_vfs_uri_get_toplevel () ! gnome_vfs_uri_get_toplevelGnomeVFSToplevelURI* gnome_vfs_uri_get_toplevel (const GnomeVFSURI *uri); Retrieve the toplevel URI in uri. --- 413,419 ---- <anchor id="gnome-vfs-uri-get-toplevel"/>gnome_vfs_uri_get_toplevel () ! GnomeVFSToplevelURI* gnome_vfs_uri_get_toplevel (const GnomeVFSURI *uri); Retrieve the toplevel URI in uri. *************** *** 430,436 **** <anchor id="gnome-vfs-uri-get-host-name"/>gnome_vfs_uri_get_host_name () ! gnome_vfs_uri_get_host_nameconst gchar* gnome_vfs_uri_get_host_name (const GnomeVFSURI *uri); Retrieve the host name for uri. --- 428,434 ---- <anchor id="gnome-vfs-uri-get-host-name"/>gnome_vfs_uri_get_host_name () ! const gchar* gnome_vfs_uri_get_host_name (const GnomeVFSURI *uri); Retrieve the host name for uri. *************** *** 444,450 **** <anchor id="gnome-vfs-uri-get-scheme"/>gnome_vfs_uri_get_scheme () ! gnome_vfs_uri_get_schemeconst gchar* gnome_vfs_uri_get_scheme (const GnomeVFSURI *uri); Retrieve the scheme used for uri --- 442,448 ---- <anchor id="gnome-vfs-uri-get-scheme"/>gnome_vfs_uri_get_scheme () ! const gchar* gnome_vfs_uri_get_scheme (const GnomeVFSURI *uri); Retrieve the scheme used for uri *************** *** 458,464 **** <anchor id="gnome-vfs-uri-get-host-port"/>gnome_vfs_uri_get_host_port () ! gnome_vfs_uri_get_host_portguint gnome_vfs_uri_get_host_port (const GnomeVFSURI *uri); Retrieve the host port number in uri. --- 456,462 ---- <anchor id="gnome-vfs-uri-get-host-port"/>gnome_vfs_uri_get_host_port () ! guint gnome_vfs_uri_get_host_port (const GnomeVFSURI *uri); Retrieve the host port number in uri. *************** *** 473,479 **** <anchor id="gnome-vfs-uri-get-user-name"/>gnome_vfs_uri_get_user_name () ! gnome_vfs_uri_get_user_nameconst gchar* gnome_vfs_uri_get_user_name (const GnomeVFSURI *uri); Retrieve the user name in uri. --- 471,477 ---- <anchor id="gnome-vfs-uri-get-user-name"/>gnome_vfs_uri_get_user_name () ! const gchar* gnome_vfs_uri_get_user_name (const GnomeVFSURI *uri); Retrieve the user name in uri. *************** *** 487,493 **** <anchor id="gnome-vfs-uri-get-password"/>gnome_vfs_uri_get_password () ! gnome_vfs_uri_get_passwordconst gchar* gnome_vfs_uri_get_password (const GnomeVFSURI *uri); Retrieve the password for uri. --- 485,491 ---- <anchor id="gnome-vfs-uri-get-password"/>gnome_vfs_uri_get_password () ! const gchar* gnome_vfs_uri_get_password (const GnomeVFSURI *uri); Retrieve the password for uri. *************** *** 501,507 **** <anchor id="gnome-vfs-uri-set-host-name"/>gnome_vfs_uri_set_host_name () ! gnome_vfs_uri_set_host_namevoid gnome_vfs_uri_set_host_name (GnomeVFSURI *uri, const gchar *host_name); Set host_name as the host name accessed by uri. --- 499,505 ---- <anchor id="gnome-vfs-uri-set-host-name"/>gnome_vfs_uri_set_host_name () ! void gnome_vfs_uri_set_host_name (GnomeVFSURI *uri, const gchar *host_name); Set host_name as the host name accessed by uri. *************** *** 517,523 **** <anchor id="gnome-vfs-uri-set-host-port"/>gnome_vfs_uri_set_host_port () ! gnome_vfs_uri_set_host_portvoid gnome_vfs_uri_set_host_port (GnomeVFSURI *uri, guint host_port); Set the host port number in uri. If host_port is zero, the default port --- 515,521 ---- <anchor id="gnome-vfs-uri-set-host-port"/>gnome_vfs_uri_set_host_port () ! void gnome_vfs_uri_set_host_port (GnomeVFSURI *uri, guint host_port); Set the host port number in uri. If host_port is zero, the default port *************** *** 534,540 **** <anchor id="gnome-vfs-uri-set-user-name"/>gnome_vfs_uri_set_user_name () ! gnome_vfs_uri_set_user_namevoid gnome_vfs_uri_set_user_name (GnomeVFSURI *uri, const gchar *user_name); Set user_name as the user name for uri. --- 532,538 ---- <anchor id="gnome-vfs-uri-set-user-name"/>gnome_vfs_uri_set_user_name () ! void gnome_vfs_uri_set_user_name (GnomeVFSURI *uri, const gchar *user_name); Set user_name as the user name for uri. *************** *** 550,556 **** <anchor id="gnome-vfs-uri-set-password"/>gnome_vfs_uri_set_password () ! gnome_vfs_uri_set_passwordvoid gnome_vfs_uri_set_password (GnomeVFSURI *uri, const gchar *password); Set password as the password for uri. --- 548,554 ---- <anchor id="gnome-vfs-uri-set-password"/>gnome_vfs_uri_set_password () ! void gnome_vfs_uri_set_password (GnomeVFSURI *uri, const gchar *password); Set password as the password for uri. *************** *** 566,572 **** <anchor id="gnome-vfs-uri-equal"/>gnome_vfs_uri_equal () ! gnome_vfs_uri_equalgboolean gnome_vfs_uri_equal (const GnomeVFSURI *a, const GnomeVFSURI *b); Compare a and b. --- 564,570 ---- <anchor id="gnome-vfs-uri-equal"/>gnome_vfs_uri_equal () ! gboolean gnome_vfs_uri_equal (const GnomeVFSURI *a, const GnomeVFSURI *b); Compare a and b. *************** *** 588,594 **** <anchor id="gnome-vfs-uri-is-parent"/>gnome_vfs_uri_is_parent () ! gnome_vfs_uri_is_parentgboolean gnome_vfs_uri_is_parent (const GnomeVFSURI *possible_parent, const GnomeVFSURI *possible_child, gboolean recursive); --- 586,592 ---- <anchor id="gnome-vfs-uri-is-parent"/>gnome_vfs_uri_is_parent () ! gboolean gnome_vfs_uri_is_parent (const GnomeVFSURI *possible_parent, const GnomeVFSURI *possible_child, gboolean recursive); *************** *** 612,618 **** <anchor id="gnome-vfs-uri-get-path"/>gnome_vfs_uri_get_path () ! gnome_vfs_uri_get_pathconst gchar* gnome_vfs_uri_get_path (const GnomeVFSURI *uri); Retrieve full path name for uri. --- 610,616 ---- <anchor id="gnome-vfs-uri-get-path"/>gnome_vfs_uri_get_path () ! const gchar* gnome_vfs_uri_get_path (const GnomeVFSURI *uri); Retrieve full path name for uri. *************** *** 628,634 **** <anchor id="gnome-vfs-uri-get-fragment-identifier"/>gnome_vfs_uri_get_fragment_identifier () ! gnome_vfs_uri_get_fragment_identifierconst gchar* gnome_vfs_uri_get_fragment_identifier (const GnomeVFSURI *uri); --- 626,632 ---- <anchor id="gnome-vfs-uri-get-fragment-identifier"/>gnome_vfs_uri_get_fragment_identifier () ! const gchar* gnome_vfs_uri_get_fragment_identifier (const GnomeVFSURI *uri); *************** *** 643,649 **** <anchor id="gnome-vfs-uri-extract-dirname"/>gnome_vfs_uri_extract_dirname () ! gnome_vfs_uri_extract_dirnamegchar* gnome_vfs_uri_extract_dirname (const GnomeVFSURI *uri); Extract the name of the directory in which the file pointed to by uri is stored as a newly allocated string. The string will end with a --- 641,647 ---- <anchor id="gnome-vfs-uri-extract-dirname"/>gnome_vfs_uri_extract_dirname () ! gchar* gnome_vfs_uri_extract_dirname (const GnomeVFSURI *uri); Extract the name of the directory in which the file pointed to by uri is stored as a newly allocated string. The string will end with a *************** *** 660,666 **** <anchor id="gnome-vfs-uri-extract-short-name"/>gnome_vfs_uri_extract_short_name () ! gnome_vfs_uri_extract_short_namegchar* gnome_vfs_uri_extract_short_name (const GnomeVFSURI *uri); Retrieve base file name for uri, ignoring any trailing path separators. --- 658,664 ---- <anchor id="gnome-vfs-uri-extract-short-name"/>gnome_vfs_uri_extract_short_name () ! gchar* gnome_vfs_uri_extract_short_name (const GnomeVFSURI *uri); Retrieve base file name for uri, ignoring any trailing path separators. *************** *** 684,690 **** <anchor id="gnome-vfs-uri-extract-short-path-name"/>gnome_vfs_uri_extract_short_path_name () ! gnome_vfs_uri_extract_short_path_namegchar* gnome_vfs_uri_extract_short_path_name (const GnomeVFSURI *uri); Retrieve base file name for uri, ignoring any trailing path separators. --- 682,688 ---- <anchor id="gnome-vfs-uri-extract-short-path-name"/>gnome_vfs_uri_extract_short_path_name () ! gchar* gnome_vfs_uri_extract_short_path_name (const GnomeVFSURI *uri); Retrieve base file name for uri, ignoring any trailing path separators. *************** *** 708,714 **** <anchor id="gnome-vfs-uri-hequal"/>gnome_vfs_uri_hequal () ! gnome_vfs_uri_hequalgint gnome_vfs_uri_hequal (gconstpointer a, gconstpointer b); Function intended for use as a hash table "are these two items --- 706,712 ---- <anchor id="gnome-vfs-uri-hequal"/>gnome_vfs_uri_hequal () ! gint gnome_vfs_uri_hequal (gconstpointer a, gconstpointer b); Function intended for use as a hash table "are these two items *************** *** 727,733 **** <anchor id="gnome-vfs-uri-hash"/>gnome_vfs_uri_hash () ! gnome_vfs_uri_hashguint gnome_vfs_uri_hash (gconstpointer p); Creates an integer value from a GnomeVFSURI, appropriate for using as the key to a hash table entry. --- 725,731 ---- <anchor id="gnome-vfs-uri-hash"/>gnome_vfs_uri_hash () ! guint gnome_vfs_uri_hash (gconstpointer p); Creates an integer value from a GnomeVFSURI, appropriate for using as the key to a hash table entry. *************** *** 742,752 **** <anchor id="gnome-vfs-uri-list-parse"/>gnome_vfs_uri_list_parse () ! gnome_vfs_uri_list_parseGList* gnome_vfs_uri_list_parse (const gchar *uri_list); ! Extracts a list of GnomeVFSURI objects from a standard text/uri-list, such as one you would get on a drop operation. Use ! gnome_vfs_uri_list_free when you are done with the list. --- 740,750 ---- <anchor id="gnome-vfs-uri-list-parse"/>gnome_vfs_uri_list_parse () ! GList* gnome_vfs_uri_list_parse (const gchar *uri_list); ! Extracts a list of GnomeVFSURI objects from a standard text/uri-list, such as one you would get on a drop operation. Use ! gnome_vfs_uri_list_free when you are done with the list. *************** *** 758,764 **** <anchor id="gnome-vfs-uri-list-ref"/>gnome_vfs_uri_list_ref () ! gnome_vfs_uri_list_refGList* gnome_vfs_uri_list_ref (GList *list); Increments the reference count of the items in list by one. --- 756,762 ---- <anchor id="gnome-vfs-uri-list-ref"/>gnome_vfs_uri_list_ref () ! GList* gnome_vfs_uri_list_ref (GList *list); Increments the reference count of the items in list by one. *************** *** 772,778 **** <anchor id="gnome-vfs-uri-list-unref"/>gnome_vfs_uri_list_unref () ! gnome_vfs_uri_list_unrefGList* gnome_vfs_uri_list_unref (GList *list); Decrements the reference count of the items in list by one. Note that the list is *not freed* even if each member of the list --- 770,776 ---- <anchor id="gnome-vfs-uri-list-unref"/>gnome_vfs_uri_list_unref () ! GList* gnome_vfs_uri_list_unref (GList *list); Decrements the reference count of the items in list by one. Note that the list is *not freed* even if each member of the list *************** *** 788,794 **** <anchor id="gnome-vfs-uri-list-copy"/>gnome_vfs_uri_list_copy () ! gnome_vfs_uri_list_copyGList* gnome_vfs_uri_list_copy (GList *list); Creates a duplicate of list, and references each member of that list. --- 786,792 ---- <anchor id="gnome-vfs-uri-list-copy"/>gnome_vfs_uri_list_copy () ! GList* gnome_vfs_uri_list_copy (GList *list); Creates a duplicate of list, and references each member of that list. *************** *** 803,809 **** <anchor id="gnome-vfs-uri-list-free"/>gnome_vfs_uri_list_free () ! gnome_vfs_uri_list_freevoid gnome_vfs_uri_list_free (GList *list); Decrements the reference count of each member of list by one, and frees the list itself. --- 801,807 ---- <anchor id="gnome-vfs-uri-list-free"/>gnome_vfs_uri_list_free () ! void gnome_vfs_uri_list_free (GList *list); Decrements the reference count of each member of list by one, and frees the list itself. *************** *** 816,824 **** <anchor id="gnome-vfs-uri-make-full-from-relative"/>gnome_vfs_uri_make_full_from_relative () ! gnome_vfs_uri_make_full_from_relativechar* gnome_vfs_uri_make_full_from_relative ! (const char *base_uri, ! const char *relative_uri); Returns a full URI given a full base URI, and a secondary URI which may be relative. --- 814,822 ---- <anchor id="gnome-vfs-uri-make-full-from-relative"/>gnome_vfs_uri_make_full_from_relative () ! char* gnome_vfs_uri_make_full_from_relative ! (const char *base_uri, ! const char *relative_uri); Returns a full URI given a full base URI, and a secondary URI which may be relative. diff -crN ./gnome-vfs/doc/xml/gnome-vfs-utils.xml /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/doc/xml/gnome-vfs-utils.xml *** ./gnome-vfs/doc/xml/gnome-vfs-utils.xml Mon Sep 8 14:19:50 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/doc/xml/gnome-vfs-utils.xml Thu Dec 18 21:22:57 2003 *************** *** 15,58 **** ! char* gnome_vfs_format_file_size_for_display (GnomeVFSFileSize size); ! char* gnome_vfs_escape_string (const char *string); ! char* gnome_vfs_escape_path_string (const char *path); ! char* gnome_vfs_escape_host_and_path_string ! (const char *path); ! char* gnome_vfs_escape_slashes (const char *string); ! char* gnome_vfs_escape_set (const char *string, ! const char *match_set); ! char* gnome_vfs_unescape_string (const char *escaped_string, ! const char *illegal_characters); ! char* gnome_vfs_make_uri_canonical (const char *uri); ! char* gnome_vfs_make_path_name_canonical ! (const char *path); ! char* gnome_vfs_expand_initial_tilde (const char *path); ! char* gnome_vfs_unescape_string_for_display ! (const char *escaped); ! char* gnome_vfs_get_local_path_from_uri ! (const char *uri); ! char* gnome_vfs_get_uri_from_local_path ! (const char *local_full_path); gboolean gnome_vfs_is_executable_command_string ! (const char *command_string); ! void gnome_vfs_list_deep_free (GList *list); GnomeVFSResult gnome_vfs_get_volume_free_space (const GnomeVFSURI *vfs_uri, GnomeVFSFileSize *size); ! char* gnome_vfs_icon_path_from_filename ! (const char *filename); gboolean gnome_vfs_is_primary_thread (void); ! char* gnome_vfs_get_uri_scheme (const char *uri); ! gboolean gnome_vfs_uris_match (const char *uri_1, ! const char *uri_2); #define GNOME_VFS_ASSERT_PRIMARY_THREAD #define GNOME_VFS_ASSERT_SECONDARY_THREAD ! GnomeVFSResult gnome_vfs_read_entire_file (const char *uri, ! int *file_size, ! char **file_contents); --- 15,58 ---- ! char* gnome_vfs_format_file_size_for_display (GnomeVFSFileSize size); ! char* gnome_vfs_escape_string (const char *string); ! char* gnome_vfs_escape_path_string (const char *path); ! char* gnome_vfs_escape_host_and_path_string ! (const char *path); ! char* gnome_vfs_escape_slashes (const char *string); ! char* gnome_vfs_escape_set (const char *string, ! const char *match_set); ! char* gnome_vfs_unescape_string (const char *escaped_string, ! const char *illegal_characters); ! char* gnome_vfs_make_uri_canonical (const char *uri); ! char* gnome_vfs_make_path_name_canonical ! (const char *path); ! char* gnome_vfs_expand_initial_tilde (const char *path); ! char* gnome_vfs_unescape_string_for_display ! (const char *escaped); ! char* gnome_vfs_get_local_path_from_uri ! (const char *uri); ! char* gnome_vfs_get_uri_from_local_path ! (const char *local_full_path); gboolean gnome_vfs_is_executable_command_string ! (const char *command_string); ! void gnome_vfs_list_deep_free (GList *list); GnomeVFSResult gnome_vfs_get_volume_free_space (const GnomeVFSURI *vfs_uri, GnomeVFSFileSize *size); ! char* gnome_vfs_icon_path_from_filename ! (const char *filename); gboolean gnome_vfs_is_primary_thread (void); ! char* gnome_vfs_get_uri_scheme (const char *uri); ! gboolean gnome_vfs_uris_match (const char *uri_1, ! const char *uri_2); #define GNOME_VFS_ASSERT_PRIMARY_THREAD #define GNOME_VFS_ASSERT_SECONDARY_THREAD ! GnomeVFSResult gnome_vfs_read_entire_file (const char *uri, ! int *file_size, ! char **file_contents); *************** *** 62,69 **** - - Description --- 62,67 ---- *************** *** 75,81 **** Details <anchor id="gnome-vfs-format-file-size-for-display"/>gnome_vfs_format_file_size_for_display () ! gnome_vfs_format_file_size_for_displaychar* gnome_vfs_format_file_size_for_display (GnomeVFSFileSize size); Formats the file size passed in bytes in a way that is easy for --- 73,79 ---- Details <anchor id="gnome-vfs-format-file-size-for-display"/>gnome_vfs_format_file_size_for_display () ! char* gnome_vfs_format_file_size_for_display (GnomeVFSFileSize size); Formats the file size passed in bytes in a way that is easy for *************** *** 92,98 **** <anchor id="gnome-vfs-escape-string"/>gnome_vfs_escape_string () ! gnome_vfs_escape_stringchar* gnome_vfs_escape_string (const char *string); Escapes string, replacing any and all special characters with equivalent escape sequences. --- 90,96 ---- <anchor id="gnome-vfs-escape-string"/>gnome_vfs_escape_string () ! char* gnome_vfs_escape_string (const char *string); Escapes string, replacing any and all special characters with equivalent escape sequences. *************** *** 108,114 **** <anchor id="gnome-vfs-escape-path-string"/>gnome_vfs_escape_path_string () ! gnome_vfs_escape_path_stringchar* gnome_vfs_escape_path_string (const char *path); Escapes path, replacing only special characters that would not be found in paths (so '/', '&', '=', and '?' will not be escaped by --- 106,112 ---- <anchor id="gnome-vfs-escape-path-string"/>gnome_vfs_escape_path_string () ! char* gnome_vfs_escape_path_string (const char *path); Escapes path, replacing only special characters that would not be found in paths (so '/', '&', '=', and '?' will not be escaped by *************** *** 125,132 **** <anchor id="gnome-vfs-escape-host-and-path-string"/>gnome_vfs_escape_host_and_path_string () ! gnome_vfs_escape_host_and_path_stringchar* gnome_vfs_escape_host_and_path_string ! (const char *path); Escapes path, replacing only special characters that would not be found in paths or host name (so '/', '&', '=', ':', '@' --- 123,130 ---- <anchor id="gnome-vfs-escape-host-and-path-string"/>gnome_vfs_escape_host_and_path_string () ! char* gnome_vfs_escape_host_and_path_string ! (const char *path); Escapes path, replacing only special characters that would not be found in paths or host name (so '/', '&', '=', ':', '@' *************** *** 143,149 **** <anchor id="gnome-vfs-escape-slashes"/>gnome_vfs_escape_slashes () ! gnome_vfs_escape_slasheschar* gnome_vfs_escape_slashes (const char *string); Escapes only '/' and '%' characters in string, replacing them with their escape sequence equivalents. --- 141,147 ---- <anchor id="gnome-vfs-escape-slashes"/>gnome_vfs_escape_slashes () ! char* gnome_vfs_escape_slashes (const char *string); Escapes only '/' and '%' characters in string, replacing them with their escape sequence equivalents. *************** *** 159,166 **** <anchor id="gnome-vfs-escape-set"/>gnome_vfs_escape_set () ! gnome_vfs_escape_setchar* gnome_vfs_escape_set (const char *string, ! const char *match_set); --- 157,164 ---- <anchor id="gnome-vfs-escape-set"/>gnome_vfs_escape_set () ! char* gnome_vfs_escape_set (const char *string, ! const char *match_set); *************** *** 177,184 **** <anchor id="gnome-vfs-unescape-string"/>gnome_vfs_unescape_string () ! gnome_vfs_unescape_stringchar* gnome_vfs_unescape_string (const char *escaped_string, ! const char *illegal_characters); Decodes escaped characters (i.e. PERCENTxx sequences) in escaped_string. Characters are encoded in PERCENTxy form, where xy is the ASCII hex code --- 175,182 ---- <anchor id="gnome-vfs-unescape-string"/>gnome_vfs_unescape_string () ! char* gnome_vfs_unescape_string (const char *escaped_string, ! const char *illegal_characters); Decodes escaped characters (i.e. PERCENTxx sequences) in escaped_string. Characters are encoded in PERCENTxy form, where xy is the ASCII hex code *************** *** 200,206 **** <anchor id="gnome-vfs-make-uri-canonical"/>gnome_vfs_make_uri_canonical () ! gnome_vfs_make_uri_canonicalchar* gnome_vfs_make_uri_canonical (const char *uri); Standarizes the format of the uri being passed, so that it can be used later in other functions that expect a canonical URI. --- 198,204 ---- <anchor id="gnome-vfs-make-uri-canonical"/>gnome_vfs_make_uri_canonical () ! char* gnome_vfs_make_uri_canonical (const char *uri); Standarizes the format of the uri being passed, so that it can be used later in other functions that expect a canonical URI. *************** *** 218,225 **** <anchor id="gnome-vfs-make-path-name-canonical"/>gnome_vfs_make_path_name_canonical () ! gnome_vfs_make_path_name_canonicalchar* gnome_vfs_make_path_name_canonical ! (const char *path); Calls _gnome_vfs_canonicalize_pathname, allocating storage for the result and providing for a cleaner memory management. --- 216,223 ---- <anchor id="gnome-vfs-make-path-name-canonical"/>gnome_vfs_make_path_name_canonical () ! char* gnome_vfs_make_path_name_canonical ! (const char *path); Calls _gnome_vfs_canonicalize_pathname, allocating storage for the result and providing for a cleaner memory management. *************** *** 234,240 **** <anchor id="gnome-vfs-expand-initial-tilde"/>gnome_vfs_expand_initial_tilde () ! gnome_vfs_expand_initial_tildechar* gnome_vfs_expand_initial_tilde (const char *path); If path starts with a ~, representing the user's home directory, expand it to the actual path location. --- 232,238 ---- <anchor id="gnome-vfs-expand-initial-tilde"/>gnome_vfs_expand_initial_tilde () ! char* gnome_vfs_expand_initial_tilde (const char *path); If path starts with a ~, representing the user's home directory, expand it to the actual path location. *************** *** 250,257 **** <anchor id="gnome-vfs-unescape-string-for-display"/>gnome_vfs_unescape_string_for_display () ! gnome_vfs_unescape_string_for_displaychar* gnome_vfs_unescape_string_for_display ! (const char *escaped); --- 248,255 ---- <anchor id="gnome-vfs-unescape-string-for-display"/>gnome_vfs_unescape_string_for_display () ! char* gnome_vfs_unescape_string_for_display ! (const char *escaped); *************** *** 265,272 **** <anchor id="gnome-vfs-get-local-path-from-uri"/>gnome_vfs_get_local_path_from_uri () ! gnome_vfs_get_local_path_from_urichar* gnome_vfs_get_local_path_from_uri ! (const char *uri); Create a local path for a file:/// URI. Do not use with URIs of other methods. --- 263,270 ---- <anchor id="gnome-vfs-get-local-path-from-uri"/>gnome_vfs_get_local_path_from_uri () ! char* gnome_vfs_get_local_path_from_uri ! (const char *uri); Create a local path for a file:/// URI. Do not use with URIs of other methods. *************** *** 283,290 **** <anchor id="gnome-vfs-get-uri-from-local-path"/>gnome_vfs_get_uri_from_local_path () ! gnome_vfs_get_uri_from_local_pathchar* gnome_vfs_get_uri_from_local_path ! (const char *local_full_path); Returns a file:/// URI for the local path local_full_path. --- 281,288 ---- <anchor id="gnome-vfs-get-uri-from-local-path"/>gnome_vfs_get_uri_from_local_path () ! char* gnome_vfs_get_uri_from_local_path ! (const char *local_full_path); Returns a file:/// URI for the local path local_full_path. *************** *** 299,306 **** <anchor id="gnome-vfs-is-executable-command-string"/>gnome_vfs_is_executable_command_string () ! gnome_vfs_is_executable_command_stringgboolean gnome_vfs_is_executable_command_string ! (const char *command_string); Checks if command_string starts with the full path of an executable file or an executable in $PATH. --- 297,304 ---- <anchor id="gnome-vfs-is-executable-command-string"/>gnome_vfs_is_executable_command_string () ! gboolean gnome_vfs_is_executable_command_string ! (const char *command_string); Checks if command_string starts with the full path of an executable file or an executable in $PATH. *************** *** 316,324 **** <anchor id="gnome-vfs-list-deep-free"/>gnome_vfs_list_deep_free () ! gnome_vfs_list_deep_freevoid gnome_vfs_list_deep_free (GList *list); ! Free list, and call g_free() on all data members. --- 314,322 ---- <anchor id="gnome-vfs-list-deep-free"/>gnome_vfs_list_deep_free () ! void gnome_vfs_list_deep_free (GList *list); ! Free list, and call g_free() on all data members. *************** *** 328,334 **** <anchor id="gnome-vfs-get-volume-free-space"/>gnome_vfs_get_volume_free_space () ! gnome_vfs_get_volume_free_spaceGnomeVFSResult gnome_vfs_get_volume_free_space (const GnomeVFSURI *vfs_uri, GnomeVFSFileSize *size); --- 326,332 ---- <anchor id="gnome-vfs-get-volume-free-space"/>gnome_vfs_get_volume_free_space () ! GnomeVFSResult gnome_vfs_get_volume_free_space (const GnomeVFSURI *vfs_uri, GnomeVFSFileSize *size); *************** *** 348,355 **** <anchor id="gnome-vfs-icon-path-from-filename"/>gnome_vfs_icon_path_from_filename () ! gnome_vfs_icon_path_from_filenamechar* gnome_vfs_icon_path_from_filename ! (const char *filename); --- 346,353 ---- <anchor id="gnome-vfs-icon-path-from-filename"/>gnome_vfs_icon_path_from_filename () ! char* gnome_vfs_icon_path_from_filename ! (const char *filename); *************** *** 363,369 **** <anchor id="gnome-vfs-is-primary-thread"/>gnome_vfs_is_primary_thread () ! gnome_vfs_is_primary_threadgboolean gnome_vfs_is_primary_thread (void); Check if the current thread is the thread with the main glib event loop. --- 361,367 ---- <anchor id="gnome-vfs-is-primary-thread"/>gnome_vfs_is_primary_thread () ! gboolean gnome_vfs_is_primary_thread (void); Check if the current thread is the thread with the main glib event loop. *************** *** 375,381 **** <anchor id="gnome-vfs-get-uri-scheme"/>gnome_vfs_get_uri_scheme () ! gnome_vfs_get_uri_schemechar* gnome_vfs_get_uri_scheme (const char *uri); Retrieve the scheme used in uri --- 373,379 ---- <anchor id="gnome-vfs-get-uri-scheme"/>gnome_vfs_get_uri_scheme () ! char* gnome_vfs_get_uri_scheme (const char *uri); Retrieve the scheme used in uri *************** *** 392,399 **** <anchor id="gnome-vfs-uris-match"/>gnome_vfs_uris_match () ! gnome_vfs_uris_matchgboolean gnome_vfs_uris_match (const char *uri_1, ! const char *uri_2); Compare two URIs. --- 390,397 ---- <anchor id="gnome-vfs-uris-match"/>gnome_vfs_uris_match () ! gboolean gnome_vfs_uris_match (const char *uri_1, ! const char *uri_2); Compare two URIs. *************** *** 412,418 **** <anchor id="GNOME-VFS-ASSERT-PRIMARY-THREAD-CAPS"/>GNOME_VFS_ASSERT_PRIMARY_THREAD ! GNOME_VFS_ASSERT_PRIMARY_THREAD#define GNOME_VFS_ASSERT_PRIMARY_THREAD g_assert (gnome_vfs_is_primary_thread()) Asserts that the current thread is the thread with --- 410,416 ---- <anchor id="GNOME-VFS-ASSERT-PRIMARY-THREAD-CAPS"/>GNOME_VFS_ASSERT_PRIMARY_THREAD ! #define GNOME_VFS_ASSERT_PRIMARY_THREAD g_assert (gnome_vfs_is_primary_thread()) Asserts that the current thread is the thread with *************** *** 422,428 **** <anchor id="GNOME-VFS-ASSERT-SECONDARY-THREAD-CAPS"/>GNOME_VFS_ASSERT_SECONDARY_THREAD ! GNOME_VFS_ASSERT_SECONDARY_THREAD#define GNOME_VFS_ASSERT_SECONDARY_THREAD g_assert (!gnome_vfs_is_primary_thread()) Asserts that the current thread is NOT the thread with --- 420,426 ---- <anchor id="GNOME-VFS-ASSERT-SECONDARY-THREAD-CAPS"/>GNOME_VFS_ASSERT_SECONDARY_THREAD ! #define GNOME_VFS_ASSERT_SECONDARY_THREAD g_assert (!gnome_vfs_is_primary_thread()) Asserts that the current thread is NOT the thread with *************** *** 432,440 **** <anchor id="gnome-vfs-read-entire-file"/>gnome_vfs_read_entire_file () ! gnome_vfs_read_entire_fileGnomeVFSResult gnome_vfs_read_entire_file (const char *uri, ! int *file_size, ! char **file_contents); Reads an entire file into memory for convenience. Beware accidentally loading large files into memory with this function. --- 430,438 ---- <anchor id="gnome-vfs-read-entire-file"/>gnome_vfs_read_entire_file () ! GnomeVFSResult gnome_vfs_read_entire_file (const char *uri, ! int *file_size, ! char **file_contents); Reads an entire file into memory for convenience. Beware accidentally loading large files into memory with this function. diff -crN ./gnome-vfs/doc/xml/gnome-vfs-xfer.xml /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/doc/xml/gnome-vfs-xfer.xml *** ./gnome-vfs/doc/xml/gnome-vfs-xfer.xml Mon Sep 8 14:19:51 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/doc/xml/gnome-vfs-xfer.xml Thu Dec 18 21:23:00 2003 *************** *** 53,60 **** - - Description --- 53,58 ---- *************** *** 66,72 **** Details <anchor id="GnomeVFSXferOptions"/>enum GnomeVFSXferOptions ! GnomeVFSXferOptionstypedef enum { GNOME_VFS_XFER_DEFAULT = 0, GNOME_VFS_XFER_UNUSED_1 = 1 << 0, GNOME_VFS_XFER_FOLLOW_LINKS = 1 << 1, --- 64,70 ---- Details <anchor id="GnomeVFSXferOptions"/>enum GnomeVFSXferOptions ! typedef enum { GNOME_VFS_XFER_DEFAULT = 0, GNOME_VFS_XFER_UNUSED_1 = 1 << 0, GNOME_VFS_XFER_FOLLOW_LINKS = 1 << 1, *************** *** 87,93 **** <anchor id="GnomeVFSXferProgressStatus"/>enum GnomeVFSXferProgressStatus ! GnomeVFSXferProgressStatustypedef enum { GNOME_VFS_XFER_PROGRESS_STATUS_OK = 0, GNOME_VFS_XFER_PROGRESS_STATUS_VFSERROR = 1, GNOME_VFS_XFER_PROGRESS_STATUS_OVERWRITE = 2, --- 85,91 ---- <anchor id="GnomeVFSXferProgressStatus"/>enum GnomeVFSXferProgressStatus ! typedef enum { GNOME_VFS_XFER_PROGRESS_STATUS_OK = 0, GNOME_VFS_XFER_PROGRESS_STATUS_VFSERROR = 1, GNOME_VFS_XFER_PROGRESS_STATUS_OVERWRITE = 2, *************** *** 101,107 **** <anchor id="GnomeVFSXferOverwriteMode"/>enum GnomeVFSXferOverwriteMode ! GnomeVFSXferOverwriteModetypedef enum { /* Interrupt transferring with an error (GNOME_VFS_ERROR_FILEEXISTS). */ GNOME_VFS_XFER_OVERWRITE_MODE_ABORT = 0, /* Invoke the progress callback with a --- 99,105 ---- <anchor id="GnomeVFSXferOverwriteMode"/>enum GnomeVFSXferOverwriteMode ! typedef enum { /* Interrupt transferring with an error (GNOME_VFS_ERROR_FILEEXISTS). */ GNOME_VFS_XFER_OVERWRITE_MODE_ABORT = 0, /* Invoke the progress callback with a *************** *** 118,124 **** <anchor id="GnomeVFSXferOverwriteAction"/>enum GnomeVFSXferOverwriteAction ! GnomeVFSXferOverwriteActiontypedef enum { GNOME_VFS_XFER_OVERWRITE_ACTION_ABORT = 0, GNOME_VFS_XFER_OVERWRITE_ACTION_REPLACE = 1, GNOME_VFS_XFER_OVERWRITE_ACTION_REPLACE_ALL = 2, --- 116,122 ---- <anchor id="GnomeVFSXferOverwriteAction"/>enum GnomeVFSXferOverwriteAction ! typedef enum { GNOME_VFS_XFER_OVERWRITE_ACTION_ABORT = 0, GNOME_VFS_XFER_OVERWRITE_ACTION_REPLACE = 1, GNOME_VFS_XFER_OVERWRITE_ACTION_REPLACE_ALL = 2, *************** *** 162,168 **** <anchor id="GnomeVFSXferErrorMode"/>enum GnomeVFSXferErrorMode ! GnomeVFSXferErrorModetypedef enum { /* Interrupt transferring with an error (code returned is code of the operation that has caused the error). */ GNOME_VFS_XFER_ERROR_MODE_ABORT = 0, --- 160,166 ---- <anchor id="GnomeVFSXferErrorMode"/>enum GnomeVFSXferErrorMode ! typedef enum { /* Interrupt transferring with an error (code returned is code of the operation that has caused the error). */ GNOME_VFS_XFER_ERROR_MODE_ABORT = 0, *************** *** 176,182 **** <anchor id="GnomeVFSXferErrorAction"/>enum GnomeVFSXferErrorAction ! GnomeVFSXferErrorActiontypedef enum { /* Interrupt operation and return `GNOME_VFS_ERROR_INTERRUPTED'. */ GNOME_VFS_XFER_ERROR_ACTION_ABORT = 0, /* Try the same operation again. */ --- 174,180 ---- <anchor id="GnomeVFSXferErrorAction"/>enum GnomeVFSXferErrorAction ! typedef enum { /* Interrupt operation and return `GNOME_VFS_ERROR_INTERRUPTED'. */ GNOME_VFS_XFER_ERROR_ACTION_ABORT = 0, /* Try the same operation again. */ *************** *** 190,196 **** <anchor id="GnomeVFSXferPhase"/>enum GnomeVFSXferPhase ! GnomeVFSXferPhasetypedef enum { /* Initial phase */ GNOME_VFS_XFER_PHASE_INITIAL, /* Checking if destination can handle move/copy */ --- 188,194 ---- <anchor id="GnomeVFSXferPhase"/>enum GnomeVFSXferPhase ! typedef enum { /* Initial phase */ GNOME_VFS_XFER_PHASE_INITIAL, /* Checking if destination can handle move/copy */ *************** *** 233,239 **** <anchor id="GnomeVFSXferProgressInfo"/>GnomeVFSXferProgressInfo ! GnomeVFSXferProgressInfotypedef struct { /* Progress status (see above for a description). */ GnomeVFSXferProgressStatus status; --- 231,237 ---- <anchor id="GnomeVFSXferProgressInfo"/>GnomeVFSXferProgressInfo ! typedef struct { /* Progress status (see above for a description). */ GnomeVFSXferProgressStatus status; *************** *** 293,299 **** <anchor id="GnomeVFSXferProgressCallback"/>GnomeVFSXferProgressCallback () ! GnomeVFSXferProgressCallbackgint (*GnomeVFSXferProgressCallback) (GnomeVFSXferProgressInfo *info, gpointer data); --- 291,297 ---- <anchor id="GnomeVFSXferProgressCallback"/>GnomeVFSXferProgressCallback () ! gint (*GnomeVFSXferProgressCallback) (GnomeVFSXferProgressInfo *info, gpointer data); *************** *** 311,317 **** <anchor id="gnome-vfs-xfer-uri-list"/>gnome_vfs_xfer_uri_list () ! gnome_vfs_xfer_uri_listGnomeVFSResult gnome_vfs_xfer_uri_list (const GList *source_uri_list, const GList *target_uri_list, GnomeVFSXferOptions xfer_options, GnomeVFSXferErrorMode error_mode, --- 309,315 ---- <anchor id="gnome-vfs-xfer-uri-list"/>gnome_vfs_xfer_uri_list () ! GnomeVFSResult gnome_vfs_xfer_uri_list (const GList *source_uri_list, const GList *target_uri_list, GnomeVFSXferOptions xfer_options, GnomeVFSXferErrorMode error_mode, *************** *** 358,364 **** <anchor id="gnome-vfs-xfer-uri"/>gnome_vfs_xfer_uri () ! gnome_vfs_xfer_uriGnomeVFSResult gnome_vfs_xfer_uri (const GnomeVFSURI *source_uri, const GnomeVFSURI *target_uri, GnomeVFSXferOptions xfer_options, GnomeVFSXferErrorMode error_mode, --- 356,362 ---- <anchor id="gnome-vfs-xfer-uri"/>gnome_vfs_xfer_uri () ! GnomeVFSResult gnome_vfs_xfer_uri (const GnomeVFSURI *source_uri, const GnomeVFSURI *target_uri, GnomeVFSXferOptions xfer_options, GnomeVFSXferErrorMode error_mode, *************** *** 435,441 **** <anchor id="gnome-vfs-xfer-delete-list"/>gnome_vfs_xfer_delete_list () ! gnome_vfs_xfer_delete_listGnomeVFSResult gnome_vfs_xfer_delete_list (const GList *source_uri_list, GnomeVFSXferErrorMode error_mode, GnomeVFSXferOptions xfer_options, GnomeVFSXferProgressCallback progress_callback, --- 433,439 ---- <anchor id="gnome-vfs-xfer-delete-list"/>gnome_vfs_xfer_delete_list () ! GnomeVFSResult gnome_vfs_xfer_delete_list (const GList *source_uri_list, GnomeVFSXferErrorMode error_mode, GnomeVFSXferOptions xfer_options, GnomeVFSXferProgressCallback progress_callback, diff -crN ./gnome-vfs/install-sh /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/install-sh *** ./gnome-vfs/install-sh Fri Jan 24 22:45:28 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/install-sh Thu Dec 18 21:13:04 2003 *************** *** 196,202 **** if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else true ; fi && if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else true ; fi && ! if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else true ; fi && if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else true ; fi else --- 196,202 ---- if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else true ; fi && if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else true ; fi && ! if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst || true; else true ; fi && if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else true ; fi else *************** *** 237,243 **** if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else true;fi && if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else true;fi && ! if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else true;fi && if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else true;fi && # Now rename the file to the real destination. --- 237,243 ---- if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else true;fi && if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else true;fi && ! if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp || true; else true;fi && if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else true;fi && # Now rename the file to the real destination. diff -crN ./gnome-vfs/intltool-merge.in /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/intltool-merge.in *** ./gnome-vfs/intltool-merge.in Mon Sep 8 11:16:56 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/intltool-merge.in Thu Dec 18 21:11:46 2003 *************** *** 239,245 **** sub get_local_charset { my ($encoding) = @_; ! my $alias_file = $ENV{"G_CHARSET_ALIAS"} || "/gnome/head/INSTALL/lib/charset.alias"; # seek character encoding aliases in charset.alias (glib) --- 239,245 ---- sub get_local_charset { my ($encoding) = @_; ! my $alias_file = $ENV{"G_CHARSET_ALIAS"} || "/opt/freeware/lib/charset.alias"; # seek character encoding aliases in charset.alias (glib) diff -crN ./gnome-vfs/intltool-update.in /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/intltool-update.in *** ./gnome-vfs/intltool-update.in Mon Sep 8 11:16:56 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/intltool-update.in Thu Dec 18 21:11:46 2003 *************** *** 578,585 **** my $gettext_support_nonascii = 0; # checks for GNU gettext >= 0.12 ! my $dummy = `$XGETTEXT --version --from-code=UTF-8 >/dev/null 2>/dev/null`; ! if ($? == 0) { $gettext_support_nonascii = 1; } --- 578,585 ---- my $gettext_support_nonascii = 0; # checks for GNU gettext >= 0.12 ! # don't use argument list, since shell interpretation is desired here ! if (system("$XGETTEXT --version --from-code=UTF-8 >&/dev/null") == 0) { $gettext_support_nonascii = 1; } *************** *** 589,595 **** print STDERR "WARNING: This version of gettext does not support extracting non-ASCII\n". " strings. That means you should install a version of gettext\n". " that supports non-ASCII strings (such as GNU gettext >= 0.12),\n". ! " or have to let non-ASCII strings untranslated. (If there is any)\n"; } my $encoding = "ASCII"; --- 589,595 ---- print STDERR "WARNING: This version of gettext does not support extracting non-ASCII\n". " strings. That means you should install a version of gettext\n". " that supports non-ASCII strings (such as GNU gettext >= 0.12),\n". ! " or have to let non-ASCII strings untranslated.\n"; } my $encoding = "ASCII"; diff -crN ./gnome-vfs/libgnomevfs/Makefile.in /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/libgnomevfs/Makefile.in *** ./gnome-vfs/libgnomevfs/Makefile.in Mon Sep 8 14:19:43 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/libgnomevfs/Makefile.in Thu Dec 18 21:13:09 2003 *************** *** 1,6 **** ! # Makefile.in generated automatically by automake 1.4-p6 from Makefile.am ! # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. --- 1,8 ---- ! # Makefile.in generated by automake 1.7.1 from Makefile.am. ! # @configure_input@ ! # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 ! # Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. *************** *** 10,87 **** # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. ! ! SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ - prefix = @prefix@ - exec_prefix = @exec_prefix@ - - bindir = @bindir@ - sbindir = @sbindir@ - libexecdir = @libexecdir@ - datadir = @datadir@ - sysconfdir = @sysconfdir@ - sharedstatedir = @sharedstatedir@ - localstatedir = @localstatedir@ - libdir = @libdir@ - infodir = @infodir@ - mandir = @mandir@ - includedir = @includedir@ - oldincludedir = /usr/include - - DESTDIR = - pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ - top_builddir = .. ! ACLOCAL = @ACLOCAL@ ! AUTOCONF = @AUTOCONF@ ! AUTOMAKE = @AUTOMAKE@ ! AUTOHEADER = @AUTOHEADER@ ! INSTALL = @INSTALL@ ! INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) ! INSTALL_DATA = @INSTALL_DATA@ ! INSTALL_SCRIPT = @INSTALL_SCRIPT@ ! transform = @program_transform_name@ ! NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : - host_alias = @host_alias@ host_triplet = @host@ ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ ! AS = @AS@ AWK = @AWK@ BONOBO_ACTIVATION_REQUIRED = @BONOBO_ACTIVATION_REQUIRED@ BONOBO_IDLDIR = @BONOBO_IDLDIR@ BONOBO_REQUIRED = @BONOBO_REQUIRED@ BZ2_LIBS = @BZ2_LIBS@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ CFLAGS = @CFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ ! CXX = @CXX@ DATADIRNAME = @DATADIRNAME@ DB2HTML = @DB2HTML@ ! DLLTOOL = @DLLTOOL@ ECHO = @ECHO@ ENABLE_PROFILER = @ENABLE_PROFILER@ EXEEXT = @EXEEXT@ FAM_LIBS = @FAM_LIBS@ GCONFTOOL = @GCONFTOOL@ GCONF_REQUIRED = @GCONF_REQUIRED@ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ --- 12,85 ---- # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. ! @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = .. ! am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ ! install_sh_DATA = $(install_sh) -c -m 644 ! install_sh_PROGRAM = $(install_sh) -c ! install_sh_SCRIPT = $(install_sh) -c ! INSTALL_HEADER = $(INSTALL_DATA) ! transform = $(program_transform_name) NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : host_triplet = @host@ + ACLOCAL = @ACLOCAL@ ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ ! ALLOCA = @ALLOCA@ ! AMDEP_FALSE = @AMDEP_FALSE@ ! AMDEP_TRUE = @AMDEP_TRUE@ ! AMTAR = @AMTAR@ ! AUTOCONF = @AUTOCONF@ ! AUTOHEADER = @AUTOHEADER@ ! AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BONOBO_ACTIVATION_REQUIRED = @BONOBO_ACTIVATION_REQUIRED@ BONOBO_IDLDIR = @BONOBO_IDLDIR@ BONOBO_REQUIRED = @BONOBO_REQUIRED@ + BUILD_CDEMENU_MODULE_FALSE = @BUILD_CDEMENU_MODULE_FALSE@ + BUILD_CDEMENU_MODULE_TRUE = @BUILD_CDEMENU_MODULE_TRUE@ BZ2_LIBS = @BZ2_LIBS@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ + CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ ! CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ DB2HTML = @DB2HTML@ ! DEFS = @DEFS@ ! DEPDIR = @DEPDIR@ ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ + ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ + ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ENABLE_PROFILER = @ENABLE_PROFILER@ + ENABLE_PROFILER_FALSE = @ENABLE_PROFILER_FALSE@ + ENABLE_PROFILER_TRUE = @ENABLE_PROFILER_TRUE@ EXEEXT = @EXEEXT@ FAM_LIBS = @FAM_LIBS@ GCONFTOOL = @GCONFTOOL@ GCONF_REQUIRED = @GCONF_REQUIRED@ + GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ + GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ *************** *** 90,99 **** --- 88,114 ---- GMSGFMT = @GMSGFMT@ GNOME_ACLOCAL_DIR = @GNOME_ACLOCAL_DIR@ GNOME_ACLOCAL_FLAGS = @GNOME_ACLOCAL_FLAGS@ + GNOME_INTERFACE_VERSION = @GNOME_INTERFACE_VERSION@ GNOME_VFS_DIR = @GNOME_VFS_DIR@ GTKDOC = @GTKDOC@ + HAVE_CDDA_FALSE = @HAVE_CDDA_FALSE@ + HAVE_CDDA_TRUE = @HAVE_CDDA_TRUE@ + HAVE_DOCBOOK_FALSE = @HAVE_DOCBOOK_FALSE@ + HAVE_DOCBOOK_TRUE = @HAVE_DOCBOOK_TRUE@ HAVE_GTK_DOC = @HAVE_GTK_DOC@ + HAVE_GTK_DOC_FALSE = @HAVE_GTK_DOC_FALSE@ + HAVE_GTK_DOC_TRUE = @HAVE_GTK_DOC_TRUE@ + HAVE_LIBEFS_FALSE = @HAVE_LIBEFS_FALSE@ + HAVE_LIBEFS_TRUE = @HAVE_LIBEFS_TRUE@ + HAVE_SSL_FALSE = @HAVE_SSL_FALSE@ + HAVE_SSL_TRUE = @HAVE_SSL_TRUE@ HTML_DIR = @HTML_DIR@ + INSIDE_GNOME_DOCU_FALSE = @INSIDE_GNOME_DOCU_FALSE@ + INSIDE_GNOME_DOCU_TRUE = @INSIDE_GNOME_DOCU_TRUE@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ + INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLLIBS = @INTLLIBS@ INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@ *************** *** 127,135 **** --- 142,154 ---- LIBGNUTLS_CONFIG = @LIBGNUTLS_CONFIG@ LIBGNUTLS_LIBS = @LIBGNUTLS_LIBS@ LIBIDL_REQUIRED = @LIBIDL_REQUIRED@ + LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ + MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ + MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MKINSTALLDIRS = @MKINSTALLDIRS@ MODULES_CFLAGS = @MODULES_CFLAGS@ *************** *** 144,161 **** MODULES_XML_LIBS = @MODULES_XML_LIBS@ MONIKERS_CFLAGS = @MONIKERS_CFLAGS@ MONIKERS_LIBS = @MONIKERS_LIBS@ ! OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ ORBIT_IDL = @ORBIT_IDL@ ORBIT_REQUIRED = @ORBIT_REQUIRED@ PACKAGE = @PACKAGE@ PKG_CONFIG = @PKG_CONFIG@ POFILES = @POFILES@ POPT_LIBS = @POPT_LIBS@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ RANLIB = @RANLIB@ STRIP = @STRIP@ TEST_CFLAGS = @TEST_CFLAGS@ TEST_LIBS = @TEST_LIBS@ --- 163,192 ---- MODULES_XML_LIBS = @MODULES_XML_LIBS@ MONIKERS_CFLAGS = @MONIKERS_CFLAGS@ MONIKERS_LIBS = @MONIKERS_LIBS@ ! MSGFMT = @MSGFMT@ OBJEXT = @OBJEXT@ + OPENSSL_CFLAGS = @OPENSSL_CFLAGS@ + OPENSSL_LIBS = @OPENSSL_LIBS@ ORBIT_IDL = @ORBIT_IDL@ ORBIT_REQUIRED = @ORBIT_REQUIRED@ PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ + PLATFORM_GNOME_2_FALSE = @PLATFORM_GNOME_2_FALSE@ + PLATFORM_GNOME_2_TRUE = @PLATFORM_GNOME_2_TRUE@ POFILES = @POFILES@ POPT_LIBS = @POPT_LIBS@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ RANLIB = @RANLIB@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ STRIP = @STRIP@ TEST_CFLAGS = @TEST_CFLAGS@ TEST_LIBS = @TEST_LIBS@ *************** *** 173,181 **** VFS_SIZE_IS = @VFS_SIZE_IS@ VFS_SIZE_PRINTF = @VFS_SIZE_PRINTF@ WARN_CFLAGS = @WARN_CFLAGS@ ! WARN_CXXFLAGS = @WARN_CXXFLAGS@ XML_REQUIRED = @XML_REQUIRED@ ! NULL = INCLUDES = \ --- 204,245 ---- VFS_SIZE_IS = @VFS_SIZE_IS@ VFS_SIZE_PRINTF = @VFS_SIZE_PRINTF@ WARN_CFLAGS = @WARN_CFLAGS@ ! XGETTEXT = @XGETTEXT@ XML_REQUIRED = @XML_REQUIRED@ ! ac_ct_CC = @ac_ct_CC@ ! ac_ct_RANLIB = @ac_ct_RANLIB@ ! ac_ct_STRIP = @ac_ct_STRIP@ ! am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ ! am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ ! am__include = @am__include@ ! am__quote = @am__quote@ ! bindir = @bindir@ ! build = @build@ ! build_alias = @build_alias@ ! build_cpu = @build_cpu@ ! build_os = @build_os@ ! build_vendor = @build_vendor@ ! datadir = @datadir@ ! exec_prefix = @exec_prefix@ ! host = @host@ ! host_alias = @host_alias@ ! host_cpu = @host_cpu@ ! host_os = @host_os@ ! host_vendor = @host_vendor@ ! includedir = @includedir@ ! infodir = @infodir@ ! install_sh = @install_sh@ ! libdir = @libdir@ ! libexecdir = @libexecdir@ ! localstatedir = @localstatedir@ ! mandir = @mandir@ ! oldincludedir = @oldincludedir@ ! prefix = @prefix@ ! program_transform_name = @program_transform_name@ ! sbindir = @sbindir@ ! sharedstatedir = @sharedstatedir@ ! sysconfdir = @sysconfdir@ ! target_alias = @target_alias@ NULL = INCLUDES = \ *************** *** 199,204 **** --- 263,269 ---- $(NULL) + # %.c %.h: %.gob # $(top_srcdir)/gob/src/gob2 $< # *************** *** 210,220 **** # GOB_FILES = \ # gnome-vfs-metadata.gob \ # $(NULL) - lib_LTLIBRARIES = libgnomevfs-2.la libgnomevfs_2_la_LIBADD = \ $(LIBGNOMEVFS_LIBS) \ $(NULL) --- 275,285 ---- # GOB_FILES = \ # gnome-vfs-metadata.gob \ # $(NULL) lib_LTLIBRARIES = libgnomevfs-2.la libgnomevfs_2_la_LIBADD = \ $(LIBGNOMEVFS_LIBS) \ + $(LIBOBJS) \ $(NULL) *************** *** 361,482 **** # TESTS = check-headers.pl EXTRA_DIST = check-headers.pl mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ! CONFIG_HEADER = ../config.h ! CONFIG_CLEAN_FILES = gnome-vfs-file-size.h ! LTLIBRARIES = $(lib_LTLIBRARIES) ! ! ! DEFS = @DEFS@ -I. -I$(srcdir) -I.. ! LIBS = @LIBS@ ! libgnomevfs_2_la_DEPENDENCIES = ! libgnomevfs_2_la_OBJECTS = gnome-vfs-application-registry.lo \ ! gnome-vfs-async-job-map.lo gnome-vfs-async-ops.lo \ ! gnome-vfs-cancellable-ops.lo gnome-vfs-cancellation.lo \ ! gnome-vfs-configuration.lo gnome-vfs-context.lo gnome-vfs-directory.lo \ ! gnome-vfs-open-fd.lo gnome-vfs-file-info.lo gnome-vfs-find-directory.lo \ ! gnome-vfs-handle.lo gnome-vfs-i18n.lo gnome-vfs-inet-connection.lo \ ! gnome-vfs-init.lo gnome-vfs-job-queue.lo gnome-vfs-job-slave.lo \ ! gnome-vfs-job.lo gnome-vfs-method.lo gnome-vfs-mime-handlers.lo \ ! gnome-vfs-mime-info.lo gnome-vfs-mime-magic.lo \ ! gnome-vfs-mime-monitor.lo gnome-vfs-mime-sniff-buffer.lo \ ! gnome-vfs-mime.lo gnome-vfs-module-callback-module-api.lo \ ! gnome-vfs-module-callback-private.lo gnome-vfs-module-callback.lo \ ! gnome-vfs-module-shared.lo gnome-vfs-module.lo gnome-vfs-monitor.lo \ ! gnome-vfs-ops.lo gnome-vfs-parse-ls.lo gnome-vfs-private-utils.lo \ ! gnome-vfs-private.lo gnome-vfs-process.lo gnome-vfs-result.lo \ ! gnome-vfs-socket-buffer.lo gnome-vfs-socket.lo gnome-vfs-ssl.lo \ ! gnome-vfs-thread-pool.lo gnome-vfs-transform.lo gnome-vfs-uri.lo \ ! gnome-vfs-utils.lo gnome-vfs-xfer.lo ! COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ! LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) ! LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ ! HEADERS = $(libgnomevfsinclude_HEADERS) \ ! $(libgnomevfsmoduleinclude_HEADERS) \ ! $(libgnomevfsplatforminclude_HEADERS) $(noinst_HEADERS) ! ! DIST_COMMON = Makefile.am Makefile.in gnome-vfs-file-size.h.in ! ! ! DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) ! ! TAR = gtar ! GZIP_ENV = --best SOURCES = $(libgnomevfs_2_la_SOURCES) - OBJECTS = $(libgnomevfs_2_la_OBJECTS) ! all: all-redirect ! .SUFFIXES: ! .SUFFIXES: .S .c .lo .o .obj .s ! $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) ! cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps libgnomevfs/Makefile ! ! Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ! cd $(top_builddir) \ ! && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status gnome-vfs-file-size.h: $(top_builddir)/config.status gnome-vfs-file-size.h.in ! cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status ! ! mostlyclean-libLTLIBRARIES: ! ! clean-libLTLIBRARIES: ! -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) ! ! distclean-libLTLIBRARIES: ! ! maintainer-clean-libLTLIBRARIES: ! install-libLTLIBRARIES: $(lib_LTLIBRARIES) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(libdir) @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ ! echo "$(LIBTOOL) --mode=install $(INSTALL) $$p $(DESTDIR)$(libdir)/$$p"; \ ! $(LIBTOOL) --mode=install $(INSTALL) $$p $(DESTDIR)$(libdir)/$$p; \ else :; fi; \ done uninstall-libLTLIBRARIES: @$(NORMAL_UNINSTALL) ! list='$(lib_LTLIBRARIES)'; for p in $$list; do \ ! $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \ done ! .c.o: ! $(COMPILE) -c $< ! ! # FIXME: We should only use cygpath when building on Windows, ! # and only if it is available. ! .c.obj: ! $(COMPILE) -c `cygpath -w $<` ! ! .s.o: ! $(COMPILE) -c $< ! ! .S.o: ! $(COMPILE) -c $< mostlyclean-compile: ! -rm -f *.o core *.core ! -rm -f *.$(OBJEXT) ! ! clean-compile: distclean-compile: -rm -f *.tab.c ! maintainer-clean-compile: ! ! .c.lo: ! $(LIBTOOL) --mode=compile $(COMPILE) -c $< ! .s.lo: ! $(LIBTOOL) --mode=compile $(COMPILE) -c $< ! .S.lo: ! $(LIBTOOL) --mode=compile $(COMPILE) -c $< mostlyclean-libtool: -rm -f *.lo --- 426,540 ---- # TESTS = check-headers.pl EXTRA_DIST = check-headers.pl + subdir = libgnomevfs mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ! CONFIG_HEADER = $(top_builddir)/config.h ! CONFIG_CLEAN_FILES = gnome-vfs-file-size.h ! LTLIBRARIES = $(lib_LTLIBRARIES) ! ! libgnomevfs_2_la_DEPENDENCIES = ! am__objects_1 = ! am_libgnomevfs_2_la_OBJECTS = gnome-vfs-application-registry.lo \ ! gnome-vfs-async-job-map.lo gnome-vfs-async-ops.lo \ ! gnome-vfs-cancellable-ops.lo gnome-vfs-cancellation.lo \ ! gnome-vfs-configuration.lo gnome-vfs-context.lo \ ! gnome-vfs-directory.lo gnome-vfs-open-fd.lo \ ! gnome-vfs-file-info.lo gnome-vfs-find-directory.lo \ ! gnome-vfs-handle.lo gnome-vfs-i18n.lo \ ! gnome-vfs-inet-connection.lo gnome-vfs-init.lo \ ! gnome-vfs-job-queue.lo gnome-vfs-job-slave.lo gnome-vfs-job.lo \ ! gnome-vfs-method.lo gnome-vfs-mime-handlers.lo \ ! gnome-vfs-mime-info.lo gnome-vfs-mime-magic.lo \ ! gnome-vfs-mime-monitor.lo gnome-vfs-mime-sniff-buffer.lo \ ! gnome-vfs-mime.lo gnome-vfs-module-callback-module-api.lo \ ! gnome-vfs-module-callback-private.lo \ ! gnome-vfs-module-callback.lo gnome-vfs-module-shared.lo \ ! gnome-vfs-module.lo gnome-vfs-monitor.lo gnome-vfs-ops.lo \ ! gnome-vfs-parse-ls.lo gnome-vfs-private-utils.lo \ ! gnome-vfs-private.lo gnome-vfs-process.lo gnome-vfs-result.lo \ ! gnome-vfs-socket-buffer.lo gnome-vfs-socket.lo gnome-vfs-ssl.lo \ ! gnome-vfs-thread-pool.lo gnome-vfs-transform.lo \ ! gnome-vfs-uri.lo gnome-vfs-utils.lo gnome-vfs-xfer.lo \ ! $(am__objects_1) ! libgnomevfs_2_la_OBJECTS = $(am_libgnomevfs_2_la_OBJECTS) ! ! DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ! depcomp = ! am__depfiles_maybe = ! COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ ! $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ! LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ ! $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) ! LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ! $(AM_LDFLAGS) $(LDFLAGS) -o $@ ! DIST_SOURCES = $(libgnomevfs_2_la_SOURCES) ! HEADERS = $(libgnomevfsinclude_HEADERS) \ ! $(libgnomevfsmoduleinclude_HEADERS) \ ! $(libgnomevfsplatforminclude_HEADERS) $(noinst_HEADERS) ! ! DIST_COMMON = $(libgnomevfsinclude_HEADERS) \ ! $(libgnomevfsmoduleinclude_HEADERS) \ ! $(libgnomevfsplatforminclude_HEADERS) $(noinst_HEADERS) \ ! Makefile.am Makefile.in gnome-vfs-file-size.h.in SOURCES = $(libgnomevfs_2_la_SOURCES) ! all: all-am + .SUFFIXES: + .SUFFIXES: .c .lo .o .obj + $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu --ignore-deps libgnomevfs/Makefile + Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) gnome-vfs-file-size.h: $(top_builddir)/config.status gnome-vfs-file-size.h.in ! cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ ! libLTLIBRARIES_INSTALL = $(INSTALL) install-libLTLIBRARIES: $(lib_LTLIBRARIES) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(libdir) @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ ! f="`echo $$p | sed -e 's|^.*/||'`"; \ ! echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f"; \ ! $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f; \ else :; fi; \ done uninstall-libLTLIBRARIES: @$(NORMAL_UNINSTALL) ! @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ ! p="`echo $$p | sed -e 's|^.*/||'`"; \ ! echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p"; \ ! $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \ done ! clean-libLTLIBRARIES: ! -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) ! @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ ! dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ ! test "$$dir" = "$$p" && dir=.; \ ! echo "rm -f \"$${dir}/so_locations\""; \ ! rm -f "$${dir}/so_locations"; \ ! done ! libgnomevfs-2.la: $(libgnomevfs_2_la_OBJECTS) $(libgnomevfs_2_la_DEPENDENCIES) ! $(LINK) -rpath $(libdir) $(libgnomevfs_2_la_LDFLAGS) $(libgnomevfs_2_la_OBJECTS) $(libgnomevfs_2_la_LIBADD) $(LIBS) mostlyclean-compile: ! -rm -f *.$(OBJEXT) core *.core distclean-compile: -rm -f *.tab.c ! .c.o: ! $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< ! .c.obj: ! $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'` ! .c.lo: ! $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< mostlyclean-libtool: -rm -f *.lo *************** *** 485,978 **** -rm -rf .libs _libs distclean-libtool: ! ! maintainer-clean-libtool: ! ! libgnomevfs-2.la: $(libgnomevfs_2_la_OBJECTS) $(libgnomevfs_2_la_DEPENDENCIES) ! $(LINK) -rpath $(libdir) $(libgnomevfs_2_la_LDFLAGS) $(libgnomevfs_2_la_OBJECTS) $(libgnomevfs_2_la_LIBADD) $(LIBS) ! install-libgnomevfsincludeHEADERS: $(libgnomevfsinclude_HEADERS) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(libgnomevfsincludedir) @list='$(libgnomevfsinclude_HEADERS)'; for p in $$list; do \ ! if test -f "$$p"; then d= ; else d="$(srcdir)/"; fi; \ ! echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(libgnomevfsincludedir)/$$p"; \ ! $(INSTALL_DATA) $$d$$p $(DESTDIR)$(libgnomevfsincludedir)/$$p; \ done uninstall-libgnomevfsincludeHEADERS: @$(NORMAL_UNINSTALL) ! list='$(libgnomevfsinclude_HEADERS)'; for p in $$list; do \ ! rm -f $(DESTDIR)$(libgnomevfsincludedir)/$$p; \ done ! install-libgnomevfsmoduleincludeHEADERS: $(libgnomevfsmoduleinclude_HEADERS) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(libgnomevfsmoduleincludedir) @list='$(libgnomevfsmoduleinclude_HEADERS)'; for p in $$list; do \ ! if test -f "$$p"; then d= ; else d="$(srcdir)/"; fi; \ ! echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(libgnomevfsmoduleincludedir)/$$p"; \ ! $(INSTALL_DATA) $$d$$p $(DESTDIR)$(libgnomevfsmoduleincludedir)/$$p; \ done uninstall-libgnomevfsmoduleincludeHEADERS: @$(NORMAL_UNINSTALL) ! list='$(libgnomevfsmoduleinclude_HEADERS)'; for p in $$list; do \ ! rm -f $(DESTDIR)$(libgnomevfsmoduleincludedir)/$$p; \ done ! install-libgnomevfsplatformincludeHEADERS: $(libgnomevfsplatforminclude_HEADERS) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(libgnomevfsplatformincludedir) @list='$(libgnomevfsplatforminclude_HEADERS)'; for p in $$list; do \ ! if test -f "$$p"; then d= ; else d="$(srcdir)/"; fi; \ ! echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(libgnomevfsplatformincludedir)/$$p"; \ ! $(INSTALL_DATA) $$d$$p $(DESTDIR)$(libgnomevfsplatformincludedir)/$$p; \ done uninstall-libgnomevfsplatformincludeHEADERS: @$(NORMAL_UNINSTALL) ! list='$(libgnomevfsplatforminclude_HEADERS)'; for p in $$list; do \ ! rm -f $(DESTDIR)$(libgnomevfsplatformincludedir)/$$p; \ done tags: TAGS ! ID: $(HEADERS) $(SOURCES) $(LISP) ! list='$(SOURCES) $(HEADERS)'; \ ! unique=`for i in $$list; do echo $$i; done | \ ! awk ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ ! here=`pwd` && cd $(srcdir) \ ! && mkid -f$$here/ID $$unique $(LISP) ! TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) tags=; \ here=`pwd`; \ ! list='$(SOURCES) $(HEADERS)'; \ ! unique=`for i in $$list; do echo $$i; done | \ ! awk ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ ! test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ ! || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS) ! ! mostlyclean-tags: ! ! clean-tags: distclean-tags: ! -rm -f TAGS ID ! ! maintainer-clean-tags: ! distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) ! ! subdir = libgnomevfs distdir: $(DISTFILES) ! @for file in $(DISTFILES); do \ ! d=$(srcdir); \ if test -d $$d/$$file; then \ ! cp -pr $$d/$$file $(distdir)/$$file; \ else \ test -f $(distdir)/$$file \ ! || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ ! || cp -p $$d/$$file $(distdir)/$$file || :; \ fi; \ done - gnome-vfs-application-registry.lo gnome-vfs-application-registry.o : \ - gnome-vfs-application-registry.c ../config.h \ - gnome-vfs-application-registry.h gnome-vfs-mime-handlers.h \ - gnome-vfs-mime-utils.h gnome-vfs-result.h gnome-vfs-uri.h \ - gnome-vfs-configuration.h gnome-vfs-mime-handlers.h \ - gnome-vfs-mime-private.h gnome-vfs-mime-monitor.h \ - gnome-vfs-mime.h gnome-vfs-private-utils.h \ - gnome-vfs-cancellation.h gnome-vfs-handle.h gnome-vfs-context.h \ - gnome-vfs-file-size.h gnome-vfs-file-info.h gnome-vfs-process.h \ - gnome-vfs-result.h - gnome-vfs-async-job-map.lo gnome-vfs-async-job-map.o : \ - gnome-vfs-async-job-map.c ../config.h gnome-vfs-async-job-map.h \ - gnome-vfs-job.h gnome-vfs-async-ops.h gnome-vfs-file-info.h \ - gnome-vfs-file-size.h gnome-vfs-result.h gnome-vfs-uri.h \ - gnome-vfs-find-directory.h gnome-vfs-handle.h \ - gnome-vfs-context.h gnome-vfs-cancellation.h gnome-vfs-xfer.h \ - gnome-vfs-module-callback.h gnome-vfs-module-callback-private.h - gnome-vfs-async-ops.lo gnome-vfs-async-ops.o : gnome-vfs-async-ops.c \ - ../config.h gnome-vfs-async-ops.h gnome-vfs-file-info.h \ - gnome-vfs-file-size.h gnome-vfs-result.h gnome-vfs-uri.h \ - gnome-vfs-find-directory.h gnome-vfs-handle.h \ - gnome-vfs-context.h gnome-vfs-cancellation.h gnome-vfs-xfer.h \ - gnome-vfs-async-job-map.h gnome-vfs-job.h gnome-vfs-async-ops.h \ - gnome-vfs-module-callback.h gnome-vfs-module-callback-private.h \ - gnome-vfs-job-queue.h gnome-vfs-job-limit.h - gnome-vfs-cancellable-ops.lo gnome-vfs-cancellable-ops.o : \ - gnome-vfs-cancellable-ops.c ../config.h \ - gnome-vfs-cancellable-ops.h gnome-vfs-directory.h \ - gnome-vfs-file-info.h gnome-vfs-file-size.h gnome-vfs-result.h \ - gnome-vfs-uri.h gnome-vfs-find-directory.h gnome-vfs-handle.h \ - gnome-vfs-context.h gnome-vfs-cancellation.h gnome-vfs-xfer.h \ - gnome-vfs-method.h gnome-vfs-transform.h gnome-vfs-monitor.h \ - gnome-vfs-handle-private.h - gnome-vfs-cancellation.lo gnome-vfs-cancellation.o : \ - gnome-vfs-cancellation.c ../config.h gnome-vfs-cancellation.h \ - gnome-vfs-utils.h gnome-vfs-file-size.h gnome-vfs-result.h \ - gnome-vfs-uri.h gnome-vfs-handle.h gnome-vfs-context.h \ - gnome-vfs-cancellation.h gnome-vfs-file-info.h - gnome-vfs-configuration.lo gnome-vfs-configuration.o : \ - gnome-vfs-configuration.c ../config.h gnome-vfs-configuration.h \ - gnome-vfs-i18n.h gnome-vfs-private.h - gnome-vfs-context.lo gnome-vfs-context.o : gnome-vfs-context.c \ - ../config.h gnome-vfs-context.h gnome-vfs-cancellation.h \ - gnome-vfs-backend.h gnome-vfs-context.h \ - gnome-vfs-module-callback.h gnome-vfs-cancellation.h \ - gnome-vfs-private-utils.h gnome-vfs-handle.h \ - gnome-vfs-file-size.h gnome-vfs-file-info.h gnome-vfs-result.h \ - gnome-vfs-uri.h gnome-vfs-process.h gnome-vfs-utils.h - gnome-vfs-directory.lo gnome-vfs-directory.o : gnome-vfs-directory.c \ - ../config.h gnome-vfs-directory.h gnome-vfs-file-info.h \ - gnome-vfs-file-size.h gnome-vfs-result.h gnome-vfs-uri.h \ - gnome-vfs-cancellable-ops.h gnome-vfs-directory.h \ - gnome-vfs-find-directory.h gnome-vfs-handle.h \ - gnome-vfs-context.h gnome-vfs-cancellation.h gnome-vfs-xfer.h \ - gnome-vfs-method.h gnome-vfs-transform.h gnome-vfs-monitor.h \ - gnome-vfs-ops.h - gnome-vfs-file-info.lo gnome-vfs-file-info.o : gnome-vfs-file-info.c \ - ../config.h gnome-vfs-file-info.h gnome-vfs-file-size.h \ - gnome-vfs-result.h gnome-vfs-uri.h - gnome-vfs-find-directory.lo gnome-vfs-find-directory.o : \ - gnome-vfs-find-directory.c ../config.h \ - gnome-vfs-find-directory.h gnome-vfs-result.h gnome-vfs-uri.h \ - gnome-vfs-cancellable-ops.h gnome-vfs-directory.h \ - gnome-vfs-file-info.h gnome-vfs-file-size.h \ - gnome-vfs-find-directory.h gnome-vfs-handle.h \ - gnome-vfs-context.h gnome-vfs-cancellation.h gnome-vfs-xfer.h - gnome-vfs-handle.lo gnome-vfs-handle.o : gnome-vfs-handle.c ../config.h \ - gnome-vfs-handle.h gnome-vfs-context.h gnome-vfs-cancellation.h \ - gnome-vfs-file-size.h gnome-vfs-file-info.h gnome-vfs-result.h \ - gnome-vfs-uri.h gnome-vfs-handle-private.h gnome-vfs-method.h \ - gnome-vfs-find-directory.h gnome-vfs-handle.h \ - gnome-vfs-transform.h gnome-vfs-monitor.h - gnome-vfs-i18n.lo gnome-vfs-i18n.o : gnome-vfs-i18n.c ../config.h \ - gnome-vfs-i18n.h gnome-vfs-private-utils.h \ - gnome-vfs-cancellation.h gnome-vfs-handle.h gnome-vfs-context.h \ - gnome-vfs-file-size.h gnome-vfs-file-info.h gnome-vfs-result.h \ - gnome-vfs-uri.h gnome-vfs-process.h - gnome-vfs-inet-connection.lo gnome-vfs-inet-connection.o : \ - gnome-vfs-inet-connection.c ../config.h \ - gnome-vfs-inet-connection.h gnome-vfs-cancellation.h \ - gnome-vfs-socket.h gnome-vfs-file-size.h gnome-vfs-result.h \ - gnome-vfs-socket-buffer.h gnome-vfs-private-utils.h \ - gnome-vfs-handle.h gnome-vfs-context.h gnome-vfs-file-info.h \ - gnome-vfs-uri.h gnome-vfs-process.h - gnome-vfs-init.lo gnome-vfs-init.o : gnome-vfs-init.c ../config.h \ - gnome-vfs-init.h gnome-vfs-ssl-private.h gnome-vfs-mime.h \ - gnome-vfs-uri.h gnome-vfs-configuration.h gnome-vfs-i18n.h \ - gnome-vfs-method.h gnome-vfs-context.h gnome-vfs-cancellation.h \ - gnome-vfs-file-info.h gnome-vfs-file-size.h gnome-vfs-result.h \ - gnome-vfs-find-directory.h gnome-vfs-handle.h \ - gnome-vfs-transform.h gnome-vfs-monitor.h gnome-vfs-process.h \ - gnome-vfs-utils.h gnome-vfs-async-job-map.h gnome-vfs-job.h \ - gnome-vfs-async-ops.h gnome-vfs-xfer.h \ - gnome-vfs-module-callback.h gnome-vfs-module-callback-private.h \ - gnome-vfs-thread-pool.h gnome-vfs-job-queue.h \ - gnome-vfs-job-slave.h gnome-vfs-job.h - gnome-vfs-iobuf.lo gnome-vfs-iobuf.o : gnome-vfs-iobuf.c ../config.h \ - gnome-vfs-iobuf.h gnome-vfs-file-size.h gnome-vfs-result.h - gnome-vfs-job-queue.lo gnome-vfs-job-queue.o : gnome-vfs-job-queue.c \ - ../config.h gnome-vfs-job-queue.h gnome-vfs-job.h \ - gnome-vfs-async-ops.h gnome-vfs-file-info.h \ - gnome-vfs-file-size.h gnome-vfs-result.h gnome-vfs-uri.h \ - gnome-vfs-find-directory.h gnome-vfs-handle.h \ - gnome-vfs-context.h gnome-vfs-cancellation.h gnome-vfs-xfer.h \ - gnome-vfs-module-callback.h gnome-vfs-module-callback-private.h \ - gnome-vfs-job-slave.h gnome-vfs-job-limit.h - gnome-vfs-job-slave.lo gnome-vfs-job-slave.o : gnome-vfs-job-slave.c \ - ../config.h gnome-vfs-job-slave.h gnome-vfs-job.h \ - gnome-vfs-async-ops.h gnome-vfs-file-info.h \ - gnome-vfs-file-size.h gnome-vfs-result.h gnome-vfs-uri.h \ - gnome-vfs-find-directory.h gnome-vfs-handle.h \ - gnome-vfs-context.h gnome-vfs-cancellation.h gnome-vfs-xfer.h \ - gnome-vfs-module-callback.h gnome-vfs-module-callback-private.h \ - gnome-vfs-async-job-map.h gnome-vfs-thread-pool.h \ - gnome-vfs-job-queue.h - gnome-vfs-job.lo gnome-vfs-job.o : gnome-vfs-job.c ../config.h \ - gnome-vfs-job.h gnome-vfs-async-ops.h gnome-vfs-file-info.h \ - gnome-vfs-file-size.h gnome-vfs-result.h gnome-vfs-uri.h \ - gnome-vfs-find-directory.h gnome-vfs-handle.h \ - gnome-vfs-context.h gnome-vfs-cancellation.h gnome-vfs-xfer.h \ - gnome-vfs-module-callback.h gnome-vfs-module-callback-private.h \ - gnome-vfs-async-job-map.h gnome-vfs-job-slave.h \ - gnome-vfs-job-queue.h gnome-vfs-cancellable-ops.h \ - gnome-vfs-directory.h gnome-vfs-i18n.h gnome-vfs-backend.h - gnome-vfs-metadata.lo gnome-vfs-metadata.o : gnome-vfs-metadata.c \ - gnome-vfs-utils.h gnome-vfs-file-size.h gnome-vfs-result.h \ - gnome-vfs-uri.h gnome-vfs-uri.h gnome-vfs-metadata.h \ - gnome-vfs-metadata-private.h - gnome-vfs-method.lo gnome-vfs-method.o : gnome-vfs-method.c ../config.h \ - gnome-vfs-method.h gnome-vfs-context.h gnome-vfs-cancellation.h \ - gnome-vfs-file-info.h gnome-vfs-file-size.h gnome-vfs-result.h \ - gnome-vfs-uri.h gnome-vfs-find-directory.h gnome-vfs-handle.h \ - gnome-vfs-transform.h gnome-vfs-monitor.h \ - gnome-vfs-configuration.h gnome-vfs-private.h \ - gnome-vfs-module.h gnome-vfs-method.h - gnome-vfs-mime-handlers.lo gnome-vfs-mime-handlers.o : \ - gnome-vfs-mime-handlers.c ../config.h gnome-vfs-mime-handlers.h \ - gnome-vfs-mime-utils.h gnome-vfs-result.h gnome-vfs-uri.h \ - gnome-vfs-application-registry.h gnome-vfs-mime-handlers.h \ - gnome-vfs-mime-info.h gnome-vfs-mime.h gnome-vfs-result.h \ - gnome-vfs-private-utils.h gnome-vfs-cancellation.h \ - gnome-vfs-handle.h gnome-vfs-context.h gnome-vfs-file-size.h \ - gnome-vfs-file-info.h gnome-vfs-process.h gnome-vfs-utils.h - gnome-vfs-mime-info.lo gnome-vfs-mime-info.o : gnome-vfs-mime-info.c \ - ../config.h gnome-vfs-mime-info.h gnome-vfs-result.h \ - gnome-vfs-mime-monitor.h gnome-vfs-mime-private.h \ - gnome-vfs-mime-monitor.h gnome-vfs-mime.h gnome-vfs-uri.h \ - gnome-vfs-private-utils.h gnome-vfs-cancellation.h \ - gnome-vfs-handle.h gnome-vfs-context.h gnome-vfs-file-size.h \ - gnome-vfs-file-info.h gnome-vfs-process.h - gnome-vfs-mime-magic.lo gnome-vfs-mime-magic.o : gnome-vfs-mime-magic.c \ - ../config.h gnome-vfs-mime-magic.h \ - gnome-vfs-mime-sniff-buffer-private.h \ - gnome-vfs-mime-sniff-buffer.h gnome-vfs-handle.h \ - gnome-vfs-context.h gnome-vfs-cancellation.h \ - gnome-vfs-file-size.h gnome-vfs-file-info.h gnome-vfs-result.h \ - gnome-vfs-uri.h gnome-vfs-mime.h gnome-vfs-private-utils.h \ - gnome-vfs-process.h - gnome-vfs-mime-monitor.lo gnome-vfs-mime-monitor.o : \ - gnome-vfs-mime-monitor.c ../config.h gnome-vfs-mime-monitor.h \ - gnome-vfs-mime-private.h gnome-vfs-mime-monitor.h \ - gnome-vfs-ops.h gnome-vfs-file-info.h gnome-vfs-file-size.h \ - gnome-vfs-result.h gnome-vfs-uri.h gnome-vfs-handle.h \ - gnome-vfs-context.h gnome-vfs-cancellation.h \ - gnome-vfs-monitor.h - gnome-vfs-mime-sniff-buffer.lo gnome-vfs-mime-sniff-buffer.o : \ - gnome-vfs-mime-sniff-buffer.c ../config.h \ - gnome-vfs-mime-sniff-buffer.h gnome-vfs-handle.h \ - gnome-vfs-context.h gnome-vfs-cancellation.h \ - gnome-vfs-file-size.h gnome-vfs-file-info.h gnome-vfs-result.h \ - gnome-vfs-uri.h gnome-vfs-handle.h \ - gnome-vfs-mime-sniff-buffer-private.h \ - gnome-vfs-mime-sniff-buffer.h gnome-vfs-ops.h \ - gnome-vfs-monitor.h - gnome-vfs-mime.lo gnome-vfs-mime.o : gnome-vfs-mime.c ../config.h \ - gnome-vfs-mime.h gnome-vfs-uri.h gnome-vfs-mime-private.h \ - gnome-vfs-mime-monitor.h gnome-vfs-mime-sniff-buffer-private.h \ - gnome-vfs-mime-sniff-buffer.h gnome-vfs-handle.h \ - gnome-vfs-context.h gnome-vfs-cancellation.h \ - gnome-vfs-file-size.h gnome-vfs-file-info.h gnome-vfs-result.h \ - gnome-vfs-mime-utils.h gnome-vfs-module-shared.h \ - gnome-vfs-ops.h gnome-vfs-monitor.h gnome-vfs-result.h \ - gnome-vfs-uri.h - gnome-vfs-module-callback-module-api.lo gnome-vfs-module-callback-module-api.o : \ - gnome-vfs-module-callback-module-api.c ../config.h \ - gnome-vfs-module-callback-module-api.h - gnome-vfs-module-callback-private.lo gnome-vfs-module-callback-private.o : \ - gnome-vfs-module-callback-private.c ../config.h \ - gnome-vfs-module-callback-private.h - gnome-vfs-module-callback.lo gnome-vfs-module-callback.o : \ - gnome-vfs-module-callback.c ../config.h \ - gnome-vfs-module-callback.h \ - gnome-vfs-module-callback-module-api.h \ - gnome-vfs-module-callback-private.h gnome-vfs-backend.h \ - gnome-vfs-context.h gnome-vfs-cancellation.h \ - gnome-vfs-module-callback.h - gnome-vfs-module-shared.lo gnome-vfs-module-shared.o : \ - gnome-vfs-module-shared.c ../config.h gnome-vfs-module-shared.h \ - gnome-vfs-file-info.h gnome-vfs-file-size.h gnome-vfs-result.h \ - gnome-vfs-uri.h gnome-vfs-module.h gnome-vfs-method.h \ - gnome-vfs-context.h gnome-vfs-cancellation.h \ - gnome-vfs-find-directory.h gnome-vfs-handle.h \ - gnome-vfs-transform.h gnome-vfs-monitor.h gnome-vfs-ops.h - gnome-vfs-module.lo gnome-vfs-module.o : gnome-vfs-module.c ../config.h \ - gnome-vfs-module.h gnome-vfs-method.h gnome-vfs-context.h \ - gnome-vfs-cancellation.h gnome-vfs-file-info.h \ - gnome-vfs-file-size.h gnome-vfs-result.h gnome-vfs-uri.h \ - gnome-vfs-find-directory.h gnome-vfs-handle.h \ - gnome-vfs-transform.h gnome-vfs-monitor.h - gnome-vfs-monitor.lo gnome-vfs-monitor.o : gnome-vfs-monitor.c \ - gnome-vfs-monitor.h gnome-vfs-monitor-private.h \ - gnome-vfs-method.h gnome-vfs-context.h gnome-vfs-cancellation.h \ - gnome-vfs-file-info.h gnome-vfs-file-size.h gnome-vfs-result.h \ - gnome-vfs-uri.h gnome-vfs-find-directory.h gnome-vfs-handle.h \ - gnome-vfs-transform.h - gnome-vfs-open-fd.lo gnome-vfs-open-fd.o : gnome-vfs-open-fd.c \ - ../config.h gnome-vfs-uri.h gnome-vfs-method.h \ - gnome-vfs-context.h gnome-vfs-cancellation.h \ - gnome-vfs-file-info.h gnome-vfs-file-size.h gnome-vfs-result.h \ - gnome-vfs-uri.h gnome-vfs-find-directory.h gnome-vfs-handle.h \ - gnome-vfs-transform.h gnome-vfs-monitor.h gnome-vfs-handle.h \ - gnome-vfs-module-shared.h gnome-vfs-mime.h \ - gnome-vfs-handle-private.h gnome-vfs-utils.h - gnome-vfs-ops.lo gnome-vfs-ops.o : gnome-vfs-ops.c ../config.h \ - gnome-vfs-ops.h gnome-vfs-file-info.h gnome-vfs-file-size.h \ - gnome-vfs-result.h gnome-vfs-uri.h gnome-vfs-handle.h \ - gnome-vfs-context.h gnome-vfs-cancellation.h \ - gnome-vfs-monitor.h gnome-vfs-monitor-private.h \ - gnome-vfs-method.h gnome-vfs-find-directory.h \ - gnome-vfs-transform.h gnome-vfs-cancellable-ops.h \ - gnome-vfs-directory.h gnome-vfs-xfer.h \ - gnome-vfs-handle-private.h - gnome-vfs-parse-ls.lo gnome-vfs-parse-ls.o : gnome-vfs-parse-ls.c \ - ../config.h gnome-vfs-parse-ls.h gnome-vfs-i18n.h - gnome-vfs-private-utils.lo gnome-vfs-private-utils.o : \ - gnome-vfs-private-utils.c ../config.h gnome-vfs-private-utils.h \ - gnome-vfs-cancellation.h gnome-vfs-handle.h gnome-vfs-context.h \ - gnome-vfs-file-size.h gnome-vfs-file-info.h gnome-vfs-result.h \ - gnome-vfs-uri.h gnome-vfs-process.h gnome-vfs-utils.h \ - gnome-vfs-cancellation.h gnome-vfs-ops.h gnome-vfs-monitor.h \ - gnome-vfs-uri.h - gnome-vfs-private.lo gnome-vfs-private.o : gnome-vfs-private.c \ - ../config.h gnome-vfs-private.h - gnome-vfs-process.lo gnome-vfs-process.o : gnome-vfs-process.c \ - ../config.h gnome-vfs-process.h gnome-vfs-private-utils.h \ - gnome-vfs-cancellation.h gnome-vfs-handle.h gnome-vfs-context.h \ - gnome-vfs-file-size.h gnome-vfs-file-info.h gnome-vfs-result.h \ - gnome-vfs-uri.h gnome-vfs-process.h - gnome-vfs-pthread.lo gnome-vfs-pthread.o : gnome-vfs-pthread.c \ - gnome-vfs-pthread.h gnome-vfs-async-job-map.h gnome-vfs-job.h \ - gnome-vfs-async-ops.h gnome-vfs-file-info.h \ - gnome-vfs-file-size.h gnome-vfs-result.h gnome-vfs-uri.h \ - gnome-vfs-find-directory.h gnome-vfs-handle.h \ - gnome-vfs-context.h gnome-vfs-cancellation.h gnome-vfs-xfer.h \ - gnome-vfs-module-callback.h gnome-vfs-module-callback-private.h \ - gnome-vfs-thread-pool.h gnome-vfs-job-queue.h - gnome-vfs-result.lo gnome-vfs-result.o : gnome-vfs-result.c ../config.h \ - gnome-vfs-result.h gnome-vfs-i18n.h - gnome-vfs-socket-buffer.lo gnome-vfs-socket-buffer.o : \ - gnome-vfs-socket-buffer.c ../config.h gnome-vfs-socket-buffer.h \ - gnome-vfs-socket.h gnome-vfs-file-size.h gnome-vfs-result.h - gnome-vfs-socket.lo gnome-vfs-socket.o : gnome-vfs-socket.c ../config.h \ - gnome-vfs-socket.h gnome-vfs-file-size.h gnome-vfs-result.h - gnome-vfs-ssl.lo gnome-vfs-ssl.o : gnome-vfs-ssl.c ../config.h \ - gnome-vfs-ssl.h gnome-vfs-socket.h gnome-vfs-file-size.h \ - gnome-vfs-result.h gnome-vfs-ssl-private.h \ - gnome-vfs-private-utils.h gnome-vfs-cancellation.h \ - gnome-vfs-handle.h gnome-vfs-context.h gnome-vfs-file-info.h \ - gnome-vfs-uri.h gnome-vfs-process.h - gnome-vfs-thread-pool.lo gnome-vfs-thread-pool.o : \ - gnome-vfs-thread-pool.c ../config.h gnome-vfs-thread-pool.h \ - gnome-vfs-job-queue.h gnome-vfs-job.h gnome-vfs-async-ops.h \ - gnome-vfs-file-info.h gnome-vfs-file-size.h gnome-vfs-result.h \ - gnome-vfs-uri.h gnome-vfs-find-directory.h gnome-vfs-handle.h \ - gnome-vfs-context.h gnome-vfs-cancellation.h gnome-vfs-xfer.h \ - gnome-vfs-module-callback.h gnome-vfs-module-callback-private.h \ - gnome-vfs-job-limit.h - gnome-vfs-transform.lo gnome-vfs-transform.o : gnome-vfs-transform.c \ - ../config.h gnome-vfs-transform.h gnome-vfs-result.h \ - gnome-vfs-context.h gnome-vfs-cancellation.h - gnome-vfs-uri.lo gnome-vfs-uri.o : gnome-vfs-uri.c ../config.h \ - gnome-vfs-uri.h gnome-vfs-module.h gnome-vfs-method.h \ - gnome-vfs-context.h gnome-vfs-cancellation.h \ - gnome-vfs-file-info.h gnome-vfs-file-size.h gnome-vfs-result.h \ - gnome-vfs-uri.h gnome-vfs-find-directory.h gnome-vfs-handle.h \ - gnome-vfs-transform.h gnome-vfs-monitor.h \ - gnome-vfs-private-utils.h gnome-vfs-process.h \ - gnome-vfs-transform.h gnome-vfs-utils.h - gnome-vfs-utils.lo gnome-vfs-utils.o : gnome-vfs-utils.c ../config.h \ - gnome-vfs-utils.h gnome-vfs-file-size.h gnome-vfs-result.h \ - gnome-vfs-uri.h gnome-vfs-handle.h gnome-vfs-context.h \ - gnome-vfs-cancellation.h gnome-vfs-file-info.h gnome-vfs-i18n.h \ - gnome-vfs-private-utils.h gnome-vfs-process.h gnome-vfs-ops.h \ - gnome-vfs-monitor.h gnome-vfs-mime-handlers.h \ - gnome-vfs-mime-utils.h - gnome-vfs-xfer.lo gnome-vfs-xfer.o : gnome-vfs-xfer.c ../config.h \ - gnome-vfs-xfer.h gnome-vfs-file-info.h gnome-vfs-file-size.h \ - gnome-vfs-result.h gnome-vfs-uri.h gnome-vfs-cancellable-ops.h \ - gnome-vfs-directory.h gnome-vfs-find-directory.h \ - gnome-vfs-handle.h gnome-vfs-context.h gnome-vfs-cancellation.h \ - gnome-vfs-xfer.h gnome-vfs-directory.h gnome-vfs-ops.h \ - gnome-vfs-monitor.h gnome-vfs-utils.h gnome-vfs-private-utils.h \ - gnome-vfs-process.h - - info-am: - info: info-am - dvi-am: - dvi: dvi-am check-am: all-am check: check-am ! installcheck-am: ! installcheck: installcheck-am ! install-exec-am: install-libLTLIBRARIES ! install-exec: install-exec-am ! install-data-am: install-libgnomevfsincludeHEADERS \ ! install-libgnomevfsmoduleincludeHEADERS \ ! install-libgnomevfsplatformincludeHEADERS ! install-data: install-data-am - install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am install: install-am ! uninstall-am: uninstall-libLTLIBRARIES \ ! uninstall-libgnomevfsincludeHEADERS \ ! uninstall-libgnomevfsmoduleincludeHEADERS \ ! uninstall-libgnomevfsplatformincludeHEADERS uninstall: uninstall-am - all-am: Makefile $(LTLIBRARIES) $(HEADERS) - all-redirect: all-am - install-strip: - $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install - installdirs: - $(mkinstalldirs) $(DESTDIR)$(libdir) \ - $(DESTDIR)$(libgnomevfsincludedir) \ - $(DESTDIR)$(libgnomevfsmoduleincludedir) \ - $(DESTDIR)$(libgnomevfsplatformincludedir) mostlyclean-generic: clean-generic: distclean-generic: -rm -f Makefile $(CONFIG_CLEAN_FILES) - -rm -f config.cache config.log stamp-h stamp-h[0-9]* maintainer-clean-generic: ! mostlyclean-am: mostlyclean-libLTLIBRARIES mostlyclean-compile \ ! mostlyclean-libtool mostlyclean-tags \ ! mostlyclean-generic ! mostlyclean: mostlyclean-am ! clean-am: clean-libLTLIBRARIES clean-compile clean-libtool clean-tags \ ! clean-generic mostlyclean-am ! clean: clean-am ! distclean-am: distclean-libLTLIBRARIES distclean-compile \ ! distclean-libtool distclean-tags distclean-generic \ ! clean-am ! -rm -f libtool ! distclean: distclean-am ! maintainer-clean-am: maintainer-clean-libLTLIBRARIES \ ! maintainer-clean-compile maintainer-clean-libtool \ ! maintainer-clean-tags maintainer-clean-generic \ ! distclean-am ! @echo "This command is intended for maintainers to use;" ! @echo "it deletes files that may require special tools to rebuild." maintainer-clean: maintainer-clean-am ! .PHONY: mostlyclean-libLTLIBRARIES distclean-libLTLIBRARIES \ ! clean-libLTLIBRARIES maintainer-clean-libLTLIBRARIES \ ! uninstall-libLTLIBRARIES install-libLTLIBRARIES mostlyclean-compile \ ! distclean-compile clean-compile maintainer-clean-compile \ ! mostlyclean-libtool distclean-libtool clean-libtool \ ! maintainer-clean-libtool uninstall-libgnomevfsincludeHEADERS \ ! install-libgnomevfsincludeHEADERS \ ! uninstall-libgnomevfsmoduleincludeHEADERS \ ! install-libgnomevfsmoduleincludeHEADERS \ ! uninstall-libgnomevfsplatformincludeHEADERS \ ! install-libgnomevfsplatformincludeHEADERS tags mostlyclean-tags \ ! distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ ! dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ ! install-exec install-data-am install-data install-am install \ ! uninstall-am uninstall all-redirect all-am all installdirs \ ! mostlyclean-generic distclean-generic clean-generic \ ! maintainer-clean-generic clean mostlyclean distclean maintainer-clean # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. --- 543,789 ---- -rm -rf .libs _libs distclean-libtool: ! -rm -f libtool ! uninstall-info-am: ! libgnomevfsincludeHEADERS_INSTALL = $(INSTALL_HEADER) install-libgnomevfsincludeHEADERS: $(libgnomevfsinclude_HEADERS) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(libgnomevfsincludedir) @list='$(libgnomevfsinclude_HEADERS)'; for p in $$list; do \ ! if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ ! f="`echo $$p | sed -e 's|^.*/||'`"; \ ! echo " $(libgnomevfsincludeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(libgnomevfsincludedir)/$$f"; \ ! $(libgnomevfsincludeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(libgnomevfsincludedir)/$$f; \ done uninstall-libgnomevfsincludeHEADERS: @$(NORMAL_UNINSTALL) ! @list='$(libgnomevfsinclude_HEADERS)'; for p in $$list; do \ ! f="`echo $$p | sed -e 's|^.*/||'`"; \ ! echo " rm -f $(DESTDIR)$(libgnomevfsincludedir)/$$f"; \ ! rm -f $(DESTDIR)$(libgnomevfsincludedir)/$$f; \ done ! libgnomevfsmoduleincludeHEADERS_INSTALL = $(INSTALL_HEADER) install-libgnomevfsmoduleincludeHEADERS: $(libgnomevfsmoduleinclude_HEADERS) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(libgnomevfsmoduleincludedir) @list='$(libgnomevfsmoduleinclude_HEADERS)'; for p in $$list; do \ ! if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ ! f="`echo $$p | sed -e 's|^.*/||'`"; \ ! echo " $(libgnomevfsmoduleincludeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(libgnomevfsmoduleincludedir)/$$f"; \ ! $(libgnomevfsmoduleincludeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(libgnomevfsmoduleincludedir)/$$f; \ done uninstall-libgnomevfsmoduleincludeHEADERS: @$(NORMAL_UNINSTALL) ! @list='$(libgnomevfsmoduleinclude_HEADERS)'; for p in $$list; do \ ! f="`echo $$p | sed -e 's|^.*/||'`"; \ ! echo " rm -f $(DESTDIR)$(libgnomevfsmoduleincludedir)/$$f"; \ ! rm -f $(DESTDIR)$(libgnomevfsmoduleincludedir)/$$f; \ done ! libgnomevfsplatformincludeHEADERS_INSTALL = $(INSTALL_HEADER) install-libgnomevfsplatformincludeHEADERS: $(libgnomevfsplatforminclude_HEADERS) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(libgnomevfsplatformincludedir) @list='$(libgnomevfsplatforminclude_HEADERS)'; for p in $$list; do \ ! if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ ! f="`echo $$p | sed -e 's|^.*/||'`"; \ ! echo " $(libgnomevfsplatformincludeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(libgnomevfsplatformincludedir)/$$f"; \ ! $(libgnomevfsplatformincludeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(libgnomevfsplatformincludedir)/$$f; \ done uninstall-libgnomevfsplatformincludeHEADERS: @$(NORMAL_UNINSTALL) ! @list='$(libgnomevfsplatforminclude_HEADERS)'; for p in $$list; do \ ! f="`echo $$p | sed -e 's|^.*/||'`"; \ ! echo " rm -f $(DESTDIR)$(libgnomevfsplatformincludedir)/$$f"; \ ! rm -f $(DESTDIR)$(libgnomevfsplatformincludedir)/$$f; \ done + ETAGS = etags + ETAGSFLAGS = + + CTAGS = ctags + CTAGSFLAGS = + tags: TAGS ! ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) ! list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ ! unique=`for i in $$list; do \ ! if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ ! done | \ ! $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ ! mkid -fID $$unique ! TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ ! $(TAGS_FILES) $(LISP) tags=; \ here=`pwd`; \ ! list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ ! unique=`for i in $$list; do \ ! if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ ! done | \ ! $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ ! test -z "$(ETAGS_ARGS)$$tags$$unique" \ ! || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ! $$tags $$unique ! ! ctags: CTAGS ! CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ ! $(TAGS_FILES) $(LISP) ! tags=; \ ! here=`pwd`; \ ! list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ ! unique=`for i in $$list; do \ ! if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ ! done | \ ! $(AWK) ' { files[$$0] = 1; } \ ! END { for (i in files) print i; }'`; \ ! test -z "$(CTAGS_ARGS)$$tags$$unique" \ ! || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ ! $$tags $$unique ! ! GTAGS: ! here=`$(am__cd) $(top_builddir) && pwd` \ ! && cd $(top_srcdir) \ ! && gtags -i $(GTAGS_ARGS) $$here distclean-tags: ! -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags ! DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ! top_distdir = .. ! distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) ! @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ ! topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ ! list='$(DISTFILES)'; for file in $$list; do \ ! case $$file in \ ! $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ ! $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ ! esac; \ ! if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ ! dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ ! if test "$$dir" != "$$file" && test "$$dir" != "."; then \ ! dir="/$$dir"; \ ! $(mkinstalldirs) "$(distdir)$$dir"; \ ! else \ ! dir=''; \ ! fi; \ if test -d $$d/$$file; then \ ! if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ ! cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ ! fi; \ ! cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ else \ test -f $(distdir)/$$file \ ! || cp -p $$d/$$file $(distdir)/$$file \ ! || exit 1; \ fi; \ done check-am: all-am check: check-am ! all-am: Makefile $(LTLIBRARIES) $(HEADERS) ! installdirs: ! $(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(libgnomevfsincludedir) $(DESTDIR)$(libgnomevfsmoduleincludedir) $(DESTDIR)$(libgnomevfsplatformincludedir) install: install-am ! install-exec: install-exec-am ! install-data: install-data-am uninstall: uninstall-am + install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + installcheck: installcheck-am + install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: clean-generic: distclean-generic: -rm -f Makefile $(CONFIG_CLEAN_FILES) maintainer-clean-generic: ! @echo "This command is intended for maintainers to use" ! @echo "it deletes files that may require special tools to rebuild." ! clean: clean-am ! clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \ ! mostlyclean-am ! distclean: distclean-am ! distclean-am: clean-am distclean-compile distclean-generic \ ! distclean-libtool distclean-tags ! dvi: dvi-am ! dvi-am: ! info: info-am ! ! info-am: ! ! install-data-am: install-libgnomevfsincludeHEADERS \ ! install-libgnomevfsmoduleincludeHEADERS \ ! install-libgnomevfsplatformincludeHEADERS ! ! install-exec-am: install-libLTLIBRARIES ! ! install-info: install-info-am ! ! install-man: ! ! installcheck-am: maintainer-clean: maintainer-clean-am ! maintainer-clean-am: distclean-am maintainer-clean-generic ! ! mostlyclean: mostlyclean-am ! ! mostlyclean-am: mostlyclean-compile mostlyclean-generic \ ! mostlyclean-libtool ! ! pdf: pdf-am ! ! pdf-am: ! ! ps: ps-am + ps-am: + + uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES \ + uninstall-libgnomevfsincludeHEADERS \ + uninstall-libgnomevfsmoduleincludeHEADERS \ + uninstall-libgnomevfsplatformincludeHEADERS + + .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ + clean-libLTLIBRARIES clean-libtool ctags distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am info info-am install \ + install-am install-data install-data-am install-exec \ + install-exec-am install-info install-info-am \ + install-libLTLIBRARIES install-libgnomevfsincludeHEADERS \ + install-libgnomevfsmoduleincludeHEADERS \ + install-libgnomevfsplatformincludeHEADERS install-man \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic mostlyclean-libtool pdf \ + pdf-am ps ps-am tags uninstall uninstall-am uninstall-info-am \ + uninstall-libLTLIBRARIES uninstall-libgnomevfsincludeHEADERS \ + uninstall-libgnomevfsmoduleincludeHEADERS \ + uninstall-libgnomevfsplatformincludeHEADERS # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff -crN ./gnome-vfs/ltmain.sh /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/ltmain.sh *** ./gnome-vfs/ltmain.sh Sat Feb 8 15:47:44 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/ltmain.sh Thu Dec 18 21:11:45 2003 *************** *** 48,65 **** exit 0 fi - # define SED for historic ltconfig's generated by Libtool 1.3 - test -z "$SED" && SED=sed - # The name of this program. ! progname=`$echo "$0" | ${SED} 's%^.*/%%'` modename="$progname" # Constants. PROGRAM=ltmain.sh PACKAGE=libtool ! VERSION=1.4.3 ! TIMESTAMP=" (1.922.2.111 2002/10/23 02:54:36)" default_mode= help="Try \`$progname --help' for more information." --- 48,62 ---- exit 0 fi # The name of this program. ! progname=`$echo "$0" | sed 's%^.*/%%'` modename="$progname" # Constants. PROGRAM=ltmain.sh PACKAGE=libtool ! VERSION=1.4.2 ! TIMESTAMP=" (1.922.2.54 2001/09/11 03:33:37)" default_mode= help="Try \`$progname --help' for more information." *************** *** 70,88 **** # Sed substitution that helps us do robust quoting. It backslashifies # metacharacters that are still active within double-quoted strings. ! Xsed="${SED}"' -e 1s/^X//' sed_quote_subst='s/\([\\`\\"$\\\\]\)/\\\1/g' ! # test EBCDIC or ASCII ! case `echo A|od -x` in ! *[Cc]1*) # EBCDIC based system ! SP2NL="tr '\100' '\n'" ! NL2SP="tr '\r\n' '\100\100'" ! ;; ! *) # Assume ASCII based system ! SP2NL="tr '\040' '\012'" ! NL2SP="tr '\015\012' '\040\040'" ! ;; ! esac # NLS nuisances. # Only set LANG and LC_ALL to C if already set. --- 67,76 ---- # Sed substitution that helps us do robust quoting. It backslashifies # metacharacters that are still active within double-quoted strings. ! Xsed='sed -e 1s/^X//' sed_quote_subst='s/\([\\`\\"$\\\\]\)/\\\1/g' ! SP2NL='tr \040 \012' ! NL2SP='tr \015\012 \040\040' # NLS nuisances. # Only set LANG and LC_ALL to C if already set. *************** *** 156,162 **** ;; --config) ! ${SED} -e '1,/^# ### BEGIN LIBTOOL CONFIG/d' -e '/^# ### END LIBTOOL CONFIG/,$d' $0 exit 0 ;; --- 144,150 ---- ;; --config) ! sed -e '1,/^# ### BEGIN LIBTOOL CONFIG/d' -e '/^# ### END LIBTOOL CONFIG/,$d' $0 exit 0 ;; *************** *** 189,196 **** --mode) prevopt="--mode" prev=mode ;; --mode=*) mode="$optarg" ;; - --preserve-dup-deps) duplicate_deps="yes" ;; - --quiet | --silent) show=: ;; --- 177,182 ---- *************** *** 229,235 **** # Infer the operation mode. if test -z "$mode"; then case $nonopt in ! *cc | *++ | gcc* | *-gcc* | xlc*) mode=link for arg do --- 215,221 ---- # Infer the operation mode. if test -z "$mode"; then case $nonopt in ! *cc | *++ | gcc* | *-gcc*) mode=link for arg do *************** *** 481,487 **** pic_mode=default ;; esac ! if test "$pic_mode" = no && test "$deplibs_check_method" != pass_all; then # non-PIC code in shared libraries is not supported pic_mode=default fi --- 467,473 ---- pic_mode=default ;; esac ! if test $pic_mode = no && test "$deplibs_check_method" != pass_all; then # non-PIC code in shared libraries is not supported pic_mode=default fi *************** *** 771,777 **** linker_flags= dllsearchpath= lib_search_path=`pwd` - inst_prefix_dir= avoid_version=no dlfiles= --- 757,762 ---- *************** *** 902,912 **** prev= continue ;; - inst_prefix) - inst_prefix_dir="$arg" - prev= - continue - ;; release) release="-$arg" prev= --- 887,892 ---- *************** *** 1008,1023 **** continue ;; - -inst-prefix-dir) - prev=inst_prefix - continue - ;; - # The native IRIX linker understands -LANG:*, -LIST:* and -LNO:* # so, if we see these flags be careful not to treat them like -L -L[A-Z][A-Z]*:*) case $with_gcc/$host in ! no/*-*-irix* | no/*-*-nonstopux*) compile_command="$compile_command $arg" finalize_command="$finalize_command $arg" ;; --- 988,998 ---- continue ;; # The native IRIX linker understands -LANG:*, -LIST:* and -LNO:* # so, if we see these flags be careful not to treat them like -L -L[A-Z][A-Z]*:*) case $with_gcc/$host in ! no/*-*-irix*) compile_command="$compile_command $arg" finalize_command="$finalize_command $arg" ;; *************** *** 1068,1081 **** # These systems don't actually have a C library (as such) test "X$arg" = "X-lc" && continue ;; ! *-*-openbsd* | *-*-freebsd*) # Do not include libc due to us having libc/libc_r. test "X$arg" = "X-lc" && continue ;; esac elif test "X$arg" = "X-lc_r"; then case $host in ! *-*-openbsd* | *-*-freebsd*) # Do not include libc_r directly, use -pthread flag. continue ;; --- 1043,1056 ---- # These systems don't actually have a C library (as such) test "X$arg" = "X-lc" && continue ;; ! *-*-openbsd*) # Do not include libc due to us having libc/libc_r. test "X$arg" = "X-lc" && continue ;; esac elif test "X$arg" = "X-lc_r"; then case $host in ! *-*-openbsd*) # Do not include libc_r directly, use -pthread flag. continue ;; *************** *** 1355,1365 **** # Find all interdependent deplibs by searching for libraries # that are linked more than once (e.g. -la -lb -la) for deplib in $deplibs; do ! if test "X$duplicate_deps" = "Xyes" ; then ! case "$libs " in ! *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; ! esac ! fi libs="$libs $deplib" done deplibs= --- 1330,1338 ---- # Find all interdependent deplibs by searching for libraries # that are linked more than once (e.g. -la -lb -la) for deplib in $deplibs; do ! case "$libs " in ! *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; ! esac libs="$libs $deplib" done deplibs= *************** *** 1488,1499 **** lib) if test "$deplibs_check_method" != pass_all; then echo ! echo "*** Warning: Trying to link with static lib archive $deplib." echo "*** I have the capability to make that library automatically link in when" echo "*** you link to this library. But I can only do this if you have a" ! echo "*** shared version of the library, which you do not appear to have" ! echo "*** because the file extensions .$libext of this argument makes me believe" ! echo "*** that it is just a static archive that I should not used here." else echo echo "*** Warning: Linking the shared library $output against the" --- 1461,1470 ---- lib) if test "$deplibs_check_method" != pass_all; then echo ! echo "*** Warning: This library needs some functionality provided by $deplib." echo "*** I have the capability to make that library automatically link in when" echo "*** you link to this library. But I can only do this if you have a" ! echo "*** shared version of the library, which you do not appear to have." else echo echo "*** Warning: Linking the shared library $output against the" *************** *** 1537,1543 **** fi # Check to see that this really is a libtool archive. ! if (${SED} -e '2q' $lib | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then : else $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2 exit 1 --- 1508,1514 ---- fi # Check to see that this really is a libtool archive. ! if (sed -e '2q' $lib | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then : else $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2 exit 1 *************** *** 1584,1594 **** tmp_libs= for deplib in $dependency_libs; do deplibs="$deplib $deplibs" ! if test "X$duplicate_deps" = "Xyes" ; then ! case "$tmp_libs " in ! *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; ! esac ! fi tmp_libs="$tmp_libs $deplib" done elif test $linkmode != prog && test $linkmode != lib; then --- 1555,1563 ---- tmp_libs= for deplib in $dependency_libs; do deplibs="$deplib $deplibs" ! case "$tmp_libs " in ! *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; ! esac tmp_libs="$tmp_libs $deplib" done elif test $linkmode != prog && test $linkmode != lib; then *************** *** 1711,1721 **** # or/and link against static libraries newdependency_libs="$deplib $newdependency_libs" fi ! if test "X$duplicate_deps" = "Xyes" ; then ! case "$tmp_libs " in ! *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; ! esac ! fi tmp_libs="$tmp_libs $deplib" done # for deplib continue --- 1680,1688 ---- # or/and link against static libraries newdependency_libs="$deplib $newdependency_libs" fi ! case "$tmp_libs " in ! *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; ! esac tmp_libs="$tmp_libs $deplib" done # for deplib continue *************** *** 1799,1806 **** # Make a new name for the extract_expsyms_cmds to use soroot="$soname" ! soname=`echo $soroot | ${SED} -e 's/^.*\///'` ! newlib="libimp-`echo $soname | ${SED} 's/^lib//;s/\.dll$//'`.a" # If the library has no export list, then create one now if test -f "$output_objdir/$soname-def"; then : --- 1766,1773 ---- # Make a new name for the extract_expsyms_cmds to use soroot="$soname" ! soname=`echo $soroot | sed -e 's/^.*\///'` ! newlib="libimp-`echo $soname | sed 's/^lib//;s/\.dll$//'`.a" # If the library has no export list, then create one now if test -f "$output_objdir/$soname-def"; then : *************** *** 1907,1922 **** if test "$hardcode_direct" = yes; then add="$libdir/$linklib" elif test "$hardcode_minus_L" = yes; then ! # Try looking first in the location we're being installed to. ! add_dir= ! if test -n "$inst_prefix_dir"; then ! case "$libdir" in ! [\\/]*) ! add_dir="-L$inst_prefix_dir$libdir" ! ;; ! esac ! fi ! add_dir="$add_dir -L$libdir" add="-l$name" elif test "$hardcode_shlibpath_var" = yes; then case :$finalize_shlibpath: in --- 1874,1880 ---- if test "$hardcode_direct" = yes; then add="$libdir/$linklib" elif test "$hardcode_minus_L" = yes; then ! add_dir="-L$libdir" add="-l$name" elif test "$hardcode_shlibpath_var" = yes; then case :$finalize_shlibpath: in *************** *** 1926,1941 **** add="-l$name" else # We cannot seem to hardcode it, guess we'll fake it. ! # Try looking first in the location we're being installed to. ! add_dir= ! if test -n "$inst_prefix_dir"; then ! case "$libdir" in ! [\\/]*) ! add_dir="-L$inst_prefix_dir$libdir" ! ;; ! esac ! fi ! add_dir="$add_dir -L$libdir" add="-l$name" fi --- 1884,1890 ---- add="-l$name" else # We cannot seem to hardcode it, guess we'll fake it. ! add_dir="-L$libdir" add="-l$name" fi *************** *** 1977,1990 **** # Just print a warning and add the library to dependency_libs so # that the program can be linked against the static library. echo ! echo "*** Warning: This system can not link to static lib archive $lib." echo "*** I have the capability to make that library automatically link in when" echo "*** you link to this library. But I can only do this if you have a" echo "*** shared version of the library, which you do not appear to have." if test "$module" = yes; then ! echo "*** But as you try to build a module library, libtool will still create " ! echo "*** a static module, that should work as long as the dlopening application" ! echo "*** is linked with the -dlopen flag to resolve symbols at runtime." if test -z "$global_symbol_pipe"; then echo echo "*** However, this would only work if libtool was able to extract symbol" --- 1926,1938 ---- # Just print a warning and add the library to dependency_libs so # that the program can be linked against the static library. echo ! echo "*** Warning: This library needs some functionality provided by $lib." echo "*** I have the capability to make that library automatically link in when" echo "*** you link to this library. But I can only do this if you have a" echo "*** shared version of the library, which you do not appear to have." if test "$module" = yes; then ! echo "*** Therefore, libtool will create a static module, that should work " ! echo "*** as long as the dlopening application is linked with the -dlopen flag." if test -z "$global_symbol_pipe"; then echo echo "*** However, this would only work if libtool was able to extract symbol" *************** *** 2033,2043 **** tmp_libs= for deplib in $dependency_libs; do newdependency_libs="$deplib $newdependency_libs" ! if test "X$duplicate_deps" = "Xyes" ; then ! case "$tmp_libs " in ! *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; ! esac ! fi tmp_libs="$tmp_libs $deplib" done --- 1981,1989 ---- tmp_libs= for deplib in $dependency_libs; do newdependency_libs="$deplib $newdependency_libs" ! case "$tmp_libs " in ! *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; ! esac tmp_libs="$tmp_libs $deplib" done *************** *** 2063,2069 **** if grep "^installed=no" $deplib > /dev/null; then path="-L$absdir/$objdir" else ! eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` if test -z "$libdir"; then $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2 exit 1 --- 2009,2015 ---- if grep "^installed=no" $deplib > /dev/null; then path="-L$absdir/$objdir" else ! eval libdir=`sed -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` if test -z "$libdir"; then $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2 exit 1 *************** *** 2268,2274 **** # Check that each of the things are valid numbers. case $current in ! [0-9]*) ;; *) $echo "$modename: CURRENT \`$current' is not a nonnegative integer" 1>&2 $echo "$modename: \`$vinfo' is not valid version information" 1>&2 --- 2214,2220 ---- # Check that each of the things are valid numbers. case $current in ! 0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;; *) $echo "$modename: CURRENT \`$current' is not a nonnegative integer" 1>&2 $echo "$modename: \`$vinfo' is not valid version information" 1>&2 *************** *** 2277,2283 **** esac case $revision in ! [0-9]*) ;; *) $echo "$modename: REVISION \`$revision' is not a nonnegative integer" 1>&2 $echo "$modename: \`$vinfo' is not valid version information" 1>&2 --- 2223,2229 ---- esac case $revision in ! 0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;; *) $echo "$modename: REVISION \`$revision' is not a nonnegative integer" 1>&2 $echo "$modename: \`$vinfo' is not valid version information" 1>&2 *************** *** 2286,2292 **** esac case $age in ! [0-9]*) ;; *) $echo "$modename: AGE \`$age' is not a nonnegative integer" 1>&2 $echo "$modename: \`$vinfo' is not valid version information" 1>&2 --- 2232,2238 ---- esac case $age in ! 0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;; *) $echo "$modename: AGE \`$age' is not a nonnegative integer" 1>&2 $echo "$modename: \`$vinfo' is not valid version information" 1>&2 *************** *** 2327,2347 **** versuffix=".$current"; ;; ! irix | nonstopux) major=`expr $current - $age + 1` ! ! case $version_type in ! nonstopux) verstring_prefix=nonstopux ;; ! *) verstring_prefix=sgi ;; ! esac ! verstring="$verstring_prefix$major.$revision" # Add in all the interfaces that we are compatible with. loop=$revision while test $loop != 0; do iface=`expr $revision - $loop` loop=`expr $loop - 1` ! verstring="$verstring_prefix$major.$iface:$verstring" done # Before this point, $major must not contain `.'. --- 2273,2288 ---- versuffix=".$current"; ;; ! irix) major=`expr $current - $age + 1` ! verstring="sgi$major.$revision" # Add in all the interfaces that we are compatible with. loop=$revision while test $loop != 0; do iface=`expr $revision - $loop` loop=`expr $loop - 1` ! verstring="sgi$major.$iface:$verstring" done # Before this point, $major must not contain `.'. *************** *** 2355,2361 **** ;; osf) ! major=.`expr $current - $age` versuffix=".$current.$age.$revision" verstring="$current.$age.$revision" --- 2296,2302 ---- ;; osf) ! major=`expr $current - $age` versuffix=".$current.$age.$revision" verstring="$current.$age.$revision" *************** *** 2447,2455 **** # Eliminate all temporary directories. for path in $notinst_path; do ! lib_search_path=`echo "$lib_search_path " | ${SED} -e 's% $path % %g'` ! deplibs=`echo "$deplibs " | ${SED} -e 's% -L$path % %g'` ! dependency_libs=`echo "$dependency_libs " | ${SED} -e 's% -L$path % %g'` done if test -n "$xrpath"; then --- 2388,2396 ---- # Eliminate all temporary directories. for path in $notinst_path; do ! lib_search_path=`echo "$lib_search_path " | sed -e 's% $path % %g'` ! deplibs=`echo "$deplibs " | sed -e 's% -L$path % %g'` ! dependency_libs=`echo "$dependency_libs " | sed -e 's% -L$path % %g'` done if test -n "$xrpath"; then *************** *** 2500,2506 **** *-*-netbsd*) # Don't link with libc until the a.out ld.so is fixed. ;; ! *-*-openbsd* | *-*-freebsd*) # Do not include libc due to us having libc/libc_r. ;; *) --- 2441,2447 ---- *-*-netbsd*) # Don't link with libc until the a.out ld.so is fixed. ;; ! *-*-openbsd*) # Do not include libc due to us having libc/libc_r. ;; *) *************** *** 2561,2580 **** else droppeddeps=yes echo ! echo "*** Warning: dynamic linker does not accept needed library $i." echo "*** I have the capability to make that library automatically link in when" echo "*** you link to this library. But I can only do this if you have a" ! echo "*** shared version of the library, which I believe you do not have" ! echo "*** because a test_compile did reveal that the linker did not use it for" ! echo "*** its dynamic dependency list that programs get resolved with at runtime." fi else newdeplibs="$newdeplibs $i" fi done else ! # Error occured in the first compile. Let's try to salvage ! # the situation: Compile a separate program for each library. for i in $deplibs; do name="`expr $i : '-l\(.*\)'`" # If $name is empty we are operating on a -L argument. --- 2502,2519 ---- else droppeddeps=yes echo ! echo "*** Warning: This library needs some functionality provided by $i." echo "*** I have the capability to make that library automatically link in when" echo "*** you link to this library. But I can only do this if you have a" ! echo "*** shared version of the library, which you do not appear to have." fi else newdeplibs="$newdeplibs $i" fi done else ! # Error occured in the first compile. Let's try to salvage the situation: ! # Compile a seperate program for each library. for i in $deplibs; do name="`expr $i : '-l\(.*\)'`" # If $name is empty we are operating on a -L argument. *************** *** 2593,2604 **** else droppeddeps=yes echo ! echo "*** Warning: dynamic linker does not accept needed library $i." echo "*** I have the capability to make that library automatically link in when" echo "*** you link to this library. But I can only do this if you have a" ! echo "*** shared version of the library, which you do not appear to have" ! echo "*** because a test_compile did reveal that the linker did not use this one" ! echo "*** as a dynamic dependency that programs can get resolved with at runtime." fi else droppeddeps=yes --- 2532,2541 ---- else droppeddeps=yes echo ! echo "*** Warning: This library needs some functionality provided by $i." echo "*** I have the capability to make that library automatically link in when" echo "*** you link to this library. But I can only do this if you have a" ! echo "*** shared version of the library, which you do not appear to have." fi else droppeddeps=yes *************** *** 2637,2650 **** # but so what? potlib="$potent_lib" while test -h "$potlib" 2>/dev/null; do ! potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'` case $potliblink in [\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";; *) potlib=`$echo "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";; esac done if eval $file_magic_cmd \"\$potlib\" 2>/dev/null \ ! | ${SED} 10q \ | egrep "$file_magic_regex" > /dev/null; then newdeplibs="$newdeplibs $a_deplib" a_deplib="" --- 2574,2587 ---- # but so what? potlib="$potent_lib" while test -h "$potlib" 2>/dev/null; do ! potliblink=`ls -ld $potlib | sed 's/.* -> //'` case $potliblink in [\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";; *) potlib=`$echo "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";; esac done if eval $file_magic_cmd \"\$potlib\" 2>/dev/null \ ! | sed 10q \ | egrep "$file_magic_regex" > /dev/null; then newdeplibs="$newdeplibs $a_deplib" a_deplib="" *************** *** 2655,2671 **** if test -n "$a_deplib" ; then droppeddeps=yes echo ! echo "*** Warning: linker path does not have real file for library $a_deplib." echo "*** I have the capability to make that library automatically link in when" echo "*** you link to this library. But I can only do this if you have a" ! echo "*** shared version of the library, which you do not appear to have" ! echo "*** because I did check the linker path looking for a file starting" ! if test -z "$potlib" ; then ! echo "*** with $libname but no candidates were found. (...for file magic test)" ! else ! echo "*** with $libname and none of the candidates passed a file format test" ! echo "*** using a file magic. Last file checked: $potlib" ! fi fi else # Add a -L argument. --- 2592,2601 ---- if test -n "$a_deplib" ; then droppeddeps=yes echo ! echo "*** Warning: This library needs some functionality provided by $a_deplib." echo "*** I have the capability to make that library automatically link in when" echo "*** you link to this library. But I can only do this if you have a" ! echo "*** shared version of the library, which you do not appear to have." fi else # Add a -L argument. *************** *** 2684,2692 **** for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do potential_libs=`ls $i/$libname[.-]* 2>/dev/null` for potent_lib in $potential_libs; do - potlib="$potent_lib" # see symlink-check below in file_magic test if eval echo \"$potent_lib\" 2>/dev/null \ ! | ${SED} 10q \ | egrep "$match_pattern_regex" > /dev/null; then newdeplibs="$newdeplibs $a_deplib" a_deplib="" --- 2614,2621 ---- for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do potential_libs=`ls $i/$libname[.-]* 2>/dev/null` for potent_lib in $potential_libs; do if eval echo \"$potent_lib\" 2>/dev/null \ ! | sed 10q \ | egrep "$match_pattern_regex" > /dev/null; then newdeplibs="$newdeplibs $a_deplib" a_deplib="" *************** *** 2697,2713 **** if test -n "$a_deplib" ; then droppeddeps=yes echo ! echo "*** Warning: linker path does not have real file for library $a_deplib." echo "*** I have the capability to make that library automatically link in when" echo "*** you link to this library. But I can only do this if you have a" ! echo "*** shared version of the library, which you do not appear to have" ! echo "*** because I did check the linker path looking for a file starting" ! if test -z "$potlib" ; then ! echo "*** with $libname but no candidates were found. (...for regex pattern test)" ! else ! echo "*** with $libname and none of the candidates passed a file format test" ! echo "*** using a regex pattern. Last file checked: $potlib" ! fi fi else # Add a -L argument. --- 2626,2635 ---- if test -n "$a_deplib" ; then droppeddeps=yes echo ! echo "*** Warning: This library needs some functionality provided by $a_deplib." echo "*** I have the capability to make that library automatically link in when" echo "*** you link to this library. But I can only do this if you have a" ! echo "*** shared version of the library, which you do not appear to have." fi else # Add a -L argument. *************** *** 2972,2989 **** if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then eval cmds=\"$archive_expsym_cmds\" else - save_deplibs="$deplibs" - for conv in $convenience; do - tmp_deplibs= - for test_deplib in $deplibs; do - if test "$test_deplib" != "$conv"; then - tmp_deplibs="$tmp_deplibs $test_deplib" - fi - done - deplibs="$tmp_deplibs" - done eval cmds=\"$archive_cmds\" - deplibs="$save_deplibs" fi save_ifs="$IFS"; IFS='~' for cmd in $cmds; do --- 2894,2900 ---- *************** *** 3182,3188 **** prog) case $host in ! *cygwin*) output=`echo $output | ${SED} -e 's,.exe$,,;s,$,.exe,'` ;; esac if test -n "$vinfo"; then $echo "$modename: warning: \`-version-info' is ignored for programs" 1>&2 --- 3093,3099 ---- prog) case $host in ! *cygwin*) output=`echo $output | sed -e 's,.exe$,,;s,$,.exe,'` ;; esac if test -n "$vinfo"; then $echo "$modename: warning: \`-version-info' is ignored for programs" 1>&2 *************** *** 3204,3219 **** # On Rhapsody replace the C library is the System framework compile_deplibs=`$echo "X $compile_deplibs" | $Xsed -e 's/ -lc / -framework System /'` finalize_deplibs=`$echo "X $finalize_deplibs" | $Xsed -e 's/ -lc / -framework System /'` - case $host in - *darwin*) - # Don't allow lazy linking, it breaks C++ global constructors - compile_command="$compile_command ${wl}-bind_at_load" - finalize_command="$finalize_command ${wl}-bind_at_load" - ;; - esac ;; esac compile_command="$compile_command $compile_deplibs" finalize_command="$finalize_command $finalize_deplibs" --- 3115,3128 ---- # On Rhapsody replace the C library is the System framework compile_deplibs=`$echo "X $compile_deplibs" | $Xsed -e 's/ -lc / -framework System /'` finalize_deplibs=`$echo "X $finalize_deplibs" | $Xsed -e 's/ -lc / -framework System /'` ;; esac + # AIX needs explicit runtime linking option + + compile_command="$compile_command $use_runtimelinking" + finalize_command="$finalize_command $use_runtimelinking" + compile_command="$compile_command $compile_deplibs" finalize_command="$finalize_command $finalize_deplibs" *************** *** 3377,3385 **** if test -z "$export_symbols"; then export_symbols="$output_objdir/$output.exp" $run $rm $export_symbols ! $run eval "${SED} -n -e '/^: @PROGRAM@$/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"' else ! $run eval "${SED} -e 's/\([][.*^$]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$output.exp"' $run eval 'grep -f "$output_objdir/$output.exp" < "$nlist" > "$nlist"T' $run eval 'mv "$nlist"T "$nlist"' fi --- 3286,3294 ---- if test -z "$export_symbols"; then export_symbols="$output_objdir/$output.exp" $run $rm $export_symbols ! $run eval "sed -n -e '/^: @PROGRAM@$/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"' else ! $run eval "sed -e 's/\([][.*^$]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$output.exp"' $run eval 'grep -f "$output_objdir/$output.exp" < "$nlist" > "$nlist"T' $run eval 'mv "$nlist"T "$nlist"' fi *************** *** 3387,3393 **** for arg in $dlprefiles; do $show "extracting global C symbols from \`$arg'" ! name=`echo "$arg" | ${SED} -e 's%^.*/%%'` $run eval 'echo ": $name " >> "$nlist"' $run eval "$NM $arg | $global_symbol_pipe >> '$nlist'" done --- 3296,3302 ---- for arg in $dlprefiles; do $show "extracting global C symbols from \`$arg'" ! name=`echo "$arg" | sed -e 's%^.*/%%'` $run eval 'echo ": $name " >> "$nlist"' $run eval "$NM $arg | $global_symbol_pipe >> '$nlist'" done *************** *** 3402,3414 **** fi # Try sorting and uniquifying the output. ! if grep -v "^: " < "$nlist" | ! if sort -k 3 /dev/null 2>&1; then ! sort -k 3 ! else ! sort +2 ! fi | ! uniq > "$nlist"S; then : else grep -v "^: " < "$nlist" > "$nlist"S --- 3311,3317 ---- fi # Try sorting and uniquifying the output. ! if grep -v "^: " < "$nlist" | sort +2 | uniq > "$nlist"S; then : else grep -v "^: " < "$nlist" > "$nlist"S *************** *** 3630,3636 **** relink_command="$var=\"$var_value\"; export $var; $relink_command" fi done ! relink_command="(cd `pwd`; $relink_command)" relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"` fi --- 3533,3539 ---- relink_command="$var=\"$var_value\"; export $var; $relink_command" fi done ! relink_command="cd `pwd`; $relink_command" relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"` fi *************** *** 3650,3656 **** # win32 will think the script is a binary if it has # a .exe suffix, so we strip it off here. case $output in ! *.exe) output=`echo $output|${SED} 's,.exe$,,'` ;; esac # test for cygwin because mv fails w/o .exe extensions case $host in --- 3553,3559 ---- # win32 will think the script is a binary if it has # a .exe suffix, so we strip it off here. case $output in ! *.exe) output=`echo $output|sed 's,.exe$,,'` ;; esac # test for cygwin because mv fails w/o .exe extensions case $host in *************** *** 3674,3680 **** # Sed substitution that helps us do robust quoting. It backslashifies # metacharacters that are still active within double-quoted strings. ! Xsed="${SED}"' -e 1s/^X//' sed_quote_subst='$sed_quote_subst' # The HP-UX ksh and POSIX shell print the target directory to stdout --- 3577,3583 ---- # Sed substitution that helps us do robust quoting. It backslashifies # metacharacters that are still active within double-quoted strings. ! Xsed='sed -e 1s/^X//' sed_quote_subst='$sed_quote_subst' # The HP-UX ksh and POSIX shell print the target directory to stdout *************** *** 3712,3718 **** test \"x\$thisdir\" = \"x\$file\" && thisdir=. # Follow symbolic links until we get to the real thisdir. ! file=\`ls -ld \"\$file\" | ${SED} -n 's/.*-> //p'\` while test -n \"\$file\"; do destdir=\`\$echo \"X\$file\" | \$Xsed -e 's%/[^/]*\$%%'\` --- 3615,3621 ---- test \"x\$thisdir\" = \"x\$file\" && thisdir=. # Follow symbolic links until we get to the real thisdir. ! file=\`ls -ld \"\$file\" | sed -n 's/.*-> //p'\` while test -n \"\$file\"; do destdir=\`\$echo \"X\$file\" | \$Xsed -e 's%/[^/]*\$%%'\` *************** *** 3725,3731 **** fi file=\`\$echo \"X\$file\" | \$Xsed -e 's%^.*/%%'\` ! file=\`ls -ld \"\$thisdir/\$file\" | ${SED} -n 's/.*-> //p'\` done # Try to get the absolute directory name. --- 3628,3634 ---- fi file=\`\$echo \"X\$file\" | \$Xsed -e 's%^.*/%%'\` ! file=\`ls -ld \"\$thisdir/\$file\" | sed -n 's/.*-> //p'\` done # Try to get the absolute directory name. *************** *** 3739,3745 **** progdir=\"\$thisdir/$objdir\" if test ! -f \"\$progdir/\$program\" || \\ ! { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | ${SED} 1q\`; \\ test \"X\$file\" != \"X\$progdir/\$program\"; }; then file=\"\$\$-\$program\" --- 3642,3648 ---- progdir=\"\$thisdir/$objdir\" if test ! -f \"\$progdir/\$program\" || \\ ! { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | sed 1q\`; \\ test \"X\$file\" != \"X\$progdir/\$program\"; }; then file=\"\$\$-\$program\" *************** *** 3785,3791 **** $shlibpath_var=\"$temp_rpath\$$shlibpath_var\" # Some systems cannot cope with colon-terminated $shlibpath_var ! # The second colon is a workaround for a bug in BeOS R4 ${SED} $shlibpath_var=\`\$echo \"X\$$shlibpath_var\" | \$Xsed -e 's/::*\$//'\` export $shlibpath_var --- 3688,3694 ---- $shlibpath_var=\"$temp_rpath\$$shlibpath_var\" # Some systems cannot cope with colon-terminated $shlibpath_var ! # The second colon is a workaround for a bug in BeOS R4 sed $shlibpath_var=\`\$echo \"X\$$shlibpath_var\" | \$Xsed -e 's/::*\$//'\` export $shlibpath_var *************** *** 3960,3966 **** fi done # Quote the link command for shipping. ! relink_command="(cd `pwd`; $SHELL $0 --mode=relink $libtool_args @inst_prefix_dir@)" relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"` # Only create the output if not a dry run. --- 3863,3869 ---- fi done # Quote the link command for shipping. ! relink_command="cd `pwd`; $SHELL $0 --mode=relink $libtool_args" relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"` # Only create the output if not a dry run. *************** *** 3977,3983 **** case $deplib in *.la) name=`$echo "X$deplib" | $Xsed -e 's%^.*/%%'` ! eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` if test -z "$libdir"; then $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2 exit 1 --- 3880,3886 ---- case $deplib in *.la) name=`$echo "X$deplib" | $Xsed -e 's%^.*/%%'` ! eval libdir=`sed -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` if test -z "$libdir"; then $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2 exit 1 *************** *** 3991,3997 **** newdlfiles= for lib in $dlfiles; do name=`$echo "X$lib" | $Xsed -e 's%^.*/%%'` ! eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` if test -z "$libdir"; then $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2 exit 1 --- 3894,3900 ---- newdlfiles= for lib in $dlfiles; do name=`$echo "X$lib" | $Xsed -e 's%^.*/%%'` ! eval libdir=`sed -n -e 's/^libdir=\(.*\)$/\1/p' $lib` if test -z "$libdir"; then $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2 exit 1 *************** *** 4002,4008 **** newdlprefiles= for lib in $dlprefiles; do name=`$echo "X$lib" | $Xsed -e 's%^.*/%%'` ! eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` if test -z "$libdir"; then $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2 exit 1 --- 3905,3911 ---- newdlprefiles= for lib in $dlprefiles; do name=`$echo "X$lib" | $Xsed -e 's%^.*/%%'` ! eval libdir=`sed -n -e 's/^libdir=\(.*\)$/\1/p' $lib` if test -z "$libdir"; then $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2 exit 1 *************** *** 4016,4021 **** --- 3919,3925 ---- tdlname=$dlname case $host,$output,$installed,$module,$dlname in *cygwin*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;; + *aix*,*,*,*,*) tdlname=$realname\($dlname\) ;; esac $echo > $output "\ # $outputname - a libtool library file *************** *** 4226,4232 **** *.la) # Check to see that this really is a libtool archive. ! if (${SED} -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then : else $echo "$modename: \`$file' is not a valid libtool archive" 1>&2 $echo "$help" 1>&2 --- 4130,4136 ---- *.la) # Check to see that this really is a libtool archive. ! if (sed -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then : else $echo "$modename: \`$file' is not a valid libtool archive" 1>&2 $echo "$help" 1>&2 *************** *** 4260,4292 **** test "X$dir" = "X$file/" && dir= dir="$dir$objdir" ! if test -n "$relink_command"; then ! # Determine the prefix the user has applied to our future dir. ! inst_prefix_dir=`$echo "$destdir" | sed "s%$libdir\$%%"` ! ! # Don't allow the user to place us outside of our expected ! # location b/c this prevents finding dependent libraries that ! # are installed to the same prefix. ! if test "$inst_prefix_dir" = "$destdir"; then ! $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2 ! exit 1 ! fi ! ! if test -n "$inst_prefix_dir"; then ! # Stick the inst_prefix_dir data into the link command. ! relink_command=`$echo "$relink_command" | sed "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"` ! else ! relink_command=`$echo "$relink_command" | sed "s%@inst_prefix_dir@%%"` ! fi ! ! $echo "$modename: warning: relinking \`$file'" 1>&2 ! $show "$relink_command" ! if $run eval "$relink_command"; then : ! else ! $echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2 ! exit 1 ! fi ! fi # See the names of the shared library. set dummy $library_names --- 4164,4180 ---- test "X$dir" = "X$file/" && dir= dir="$dir$objdir" ! # BEGIN WORKAROUND DESTDIR ! # if test -n "$relink_command"; then ! # $echo "$modename: warning: relinking \`$file'" 1>&2 ! # $show "$relink_command" ! # if $run eval "$relink_command"; then : ! # else ! # $echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2 ! # continue ! # fi ! # fi ! # END WORKAROUND DESTDIR # See the names of the shared library. set dummy $library_names *************** *** 4296,4302 **** shift srcname="$realname" ! test -n "$relink_command" && srcname="$realname"T # Install the shared library and build the symlinks. $show "$install_prog $dir/$srcname $destdir/$realname" --- 4184,4192 ---- shift srcname="$realname" ! # BEGIN WORKAROUND DESTDIR ! # test -n "$relink_command" && srcname="$realname"T ! # END WORKAROUND DESTDIR # Install the shared library and build the symlinks. $show "$install_prog $dir/$srcname $destdir/$realname" *************** *** 4393,4419 **** fi # Do a test to see if this is really a libtool program. ! case $host in ! *cygwin*|*mingw*) ! wrapper=`echo $file | ${SED} -e 's,.exe$,,'` ! ;; ! *) ! wrapper=$file ! ;; ! esac ! if (${SED} -e '4q' $wrapper | egrep "^# Generated by .*$PACKAGE")>/dev/null 2>&1; then notinst_deplibs= relink_command= # If there is no directory component, then add one. case $file in ! */* | *\\*) . $wrapper ;; ! *) . ./$wrapper ;; esac # Check the variables that should have been set. if test -z "$notinst_deplibs"; then ! $echo "$modename: invalid libtool wrapper script \`$wrapper'" 1>&2 exit 1 fi --- 4283,4301 ---- fi # Do a test to see if this is really a libtool program. ! if (sed -e '4q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then notinst_deplibs= relink_command= # If there is no directory component, then add one. case $file in ! */* | *\\*) . $file ;; ! *) . ./$file ;; esac # Check the variables that should have been set. if test -z "$notinst_deplibs"; then ! $echo "$modename: invalid libtool wrapper script \`$file'" 1>&2 exit 1 fi *************** *** 4438,4445 **** relink_command= # If there is no directory component, then add one. case $file in ! */* | *\\*) . $wrapper ;; ! *) . ./$wrapper ;; esac outputname= --- 4320,4327 ---- relink_command= # If there is no directory component, then add one. case $file in ! */* | *\\*) . $file ;; ! *) . ./$file ;; esac outputname= *************** *** 4447,4459 **** if test "$finalize" = yes && test -z "$run"; then tmpdir="/tmp" test -n "$TMPDIR" && tmpdir="$TMPDIR" ! tmpdir_mktemp=`mktemp -d $tmpdir/libtool-XXXXXX 2> /dev/null` ! if test $? = 0 ; then ! tmpdir="$tmpdir_mktemp" ! unset tmpdir_mktemp ! else ! tmpdir="$tmpdir/libtool-$$" ! fi if $mkdir -p "$tmpdir" && chmod 700 "$tmpdir"; then : else $echo "$modename: error: cannot create temporary directory \`$tmpdir'" 1>&2 --- 4329,4335 ---- if test "$finalize" = yes && test -z "$run"; then tmpdir="/tmp" test -n "$TMPDIR" && tmpdir="$TMPDIR" ! tmpdir="$tmpdir/libtool-$$" if $mkdir -p "$tmpdir" && chmod 700 "$tmpdir"; then : else $echo "$modename: error: cannot create temporary directory \`$tmpdir'" 1>&2 *************** *** 4493,4499 **** destfile=$destfile.exe ;; *:*.exe) ! destfile=`echo $destfile | ${SED} -e 's,.exe$,,'` ;; esac ;; --- 4369,4375 ---- destfile=$destfile.exe ;; *:*.exe) ! destfile=`echo $destfile | sed -e 's,.exe$,,'` ;; esac ;; *************** *** 4641,4647 **** case $file in *.la) # Check to see that this really is a libtool archive. ! if (${SED} -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then : else $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2 $echo "$help" 1>&2 --- 4517,4523 ---- case $file in *.la) # Check to see that this really is a libtool archive. ! if (sed -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then : else $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2 $echo "$help" 1>&2 *************** *** 4712,4718 **** -*) ;; *) # Do a test to see if this is really a libtool program. ! if (${SED} -e '4q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then # If there is no directory component, then add one. case $file in */* | *\\*) . $file ;; --- 4588,4594 ---- -*) ;; *) # Do a test to see if this is really a libtool program. ! if (sed -e '4q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then # If there is no directory component, then add one. case $file in */* | *\\*) . $file ;; *************** *** 4744,4750 **** fi # Now prepare to actually exec the command. ! exec_cmd="\$cmd$args" else # Display what would be done. if test -n "$shlibpath_var"; then --- 4620,4626 ---- fi # Now prepare to actually exec the command. ! exec_cmd='"$cmd"$args' else # Display what would be done. if test -n "$shlibpath_var"; then *************** *** 4821,4827 **** case $name in *.la) # Possibly a libtool archive, so verify it. ! if (${SED} -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then . $dir/$name # Delete the libtool libraries and symlinks. --- 4697,4703 ---- case $name in *.la) # Possibly a libtool archive, so verify it. ! if (sed -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then . $dir/$name # Delete the libtool libraries and symlinks. *************** *** 4876,4882 **** *) # Do a test to see if this is a libtool program. if test $mode = clean && ! (${SED} -e '4q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then relink_command= . $dir/$file --- 4752,4758 ---- *) # Do a test to see if this is a libtool program. if test $mode = clean && ! (sed -e '4q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then relink_command= . $dir/$file diff -crN ./gnome-vfs/missing /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/missing *** ./gnome-vfs/missing Fri Jan 24 22:45:28 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/missing Thu Dec 18 21:13:04 2003 *************** *** 1,7 **** #! /bin/sh # Common stub for a few missing GNU programs while installing. ! # Copyright (C) 1996, 1997, 2001, 2002 Free Software Foundation, Inc. ! # Franc,ois Pinard , 1996. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by --- 1,7 ---- #! /bin/sh # Common stub for a few missing GNU programs while installing. ! # Copyright (C) 1996, 1997, 1999, 2000, 2002 Free Software Foundation, Inc. ! # Originally by Fran,cois Pinard , 1996. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by *************** *** 18,37 **** # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA # 02111-1307, USA. if test $# -eq 0; then echo 1>&2 "Try \`$0 --help' for more information" exit 1 fi # In the cases where this matters, `missing' is being run in the # srcdir already. ! if test -f configure.in; then configure_ac=configure.ac else configure_ac=configure.in fi case "$1" in -h|--h|--he|--hel|--help) echo "\ --- 18,55 ---- # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA # 02111-1307, USA. + # As a special exception to the GNU General Public License, if you + # distribute this file as part of a program that contains a + # configuration script generated by Autoconf, you may include it under + # the same distribution terms that you use for the rest of that program. + if test $# -eq 0; then echo 1>&2 "Try \`$0 --help' for more information" exit 1 fi + run=: + # In the cases where this matters, `missing' is being run in the # srcdir already. ! if test -f configure.ac; then configure_ac=configure.ac else configure_ac=configure.in fi case "$1" in + --run) + # Try to run requested program, and just exit if it succeeds. + run= + shift + "$@" && exit 0 + ;; + esac + + # If it does not exist, or fails to run (possibly an outdated version), + # try to emulate it. + case "$1" in -h|--h|--he|--hel|--help) echo "\ *************** *** 43,48 **** --- 61,67 ---- Options: -h, --help display this help and exit -v, --version output version information and exit + --run try to run the given command, and emulate it if it fails Supported PROGRAM values: aclocal touch file \`aclocal.m4' *************** *** 51,63 **** automake touch all \`Makefile.in' files bison create \`y.tab.[ch]', if possible, from existing .[ch] flex create \`lex.yy.c', if possible, from existing .c lex create \`lex.yy.c', if possible, from existing .c makeinfo touch the output file yacc create \`y.tab.[ch]', if possible, from existing .[ch]" ;; -v|--v|--ve|--ver|--vers|--versi|--versio|--version) ! echo "missing - GNU libit 0.0" ;; -*) --- 70,84 ---- automake touch all \`Makefile.in' files bison create \`y.tab.[ch]', if possible, from existing .[ch] flex create \`lex.yy.c', if possible, from existing .c + help2man touch the output file lex create \`lex.yy.c', if possible, from existing .c makeinfo touch the output file + tar try tar, gnutar, gtar, then tar without non-portable flags yacc create \`y.tab.[ch]', if possible, from existing .[ch]" ;; -v|--v|--ve|--ver|--vers|--versi|--versio|--version) ! echo "missing 0.4 - GNU automake" ;; -*) *************** *** 67,96 **** ;; aclocal*) echo 1>&2 "\ WARNING: \`$1' is missing on your system. You should only need it if ! you modified \`acinclude.m4' or \`$configure_ac'. You might want to install the \`Automake' and \`Perl' packages. Grab them from any GNU archive site." touch aclocal.m4 ;; autoconf) echo 1>&2 "\ WARNING: \`$1' is missing on your system. You should only need it if ! you modified \`$configure_ac'. You might want to install the \`Autoconf' and \`GNU m4' packages. Grab them from any GNU archive site." touch configure ;; autoheader) echo 1>&2 "\ WARNING: \`$1' is missing on your system. You should only need it if ! you modified \`acconfig.h' or \`$configure_ac'. You might want to install the \`Autoconf' and \`GNU m4' packages. Grab them from any GNU archive site." ! files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' $configure_ac` test -z "$files" && files="config.h" touch_files= for f in $files; do --- 88,132 ---- ;; aclocal*) + if test -z "$run" && ($1 --version) > /dev/null 2>&1; then + # We have it, but it failed. + exit 1 + fi + echo 1>&2 "\ WARNING: \`$1' is missing on your system. You should only need it if ! you modified \`acinclude.m4' or \`${configure_ac}'. You might want to install the \`Automake' and \`Perl' packages. Grab them from any GNU archive site." touch aclocal.m4 ;; autoconf) + if test -z "$run" && ($1 --version) > /dev/null 2>&1; then + # We have it, but it failed. + exit 1 + fi + echo 1>&2 "\ WARNING: \`$1' is missing on your system. You should only need it if ! you modified \`${configure_ac}'. You might want to install the \`Autoconf' and \`GNU m4' packages. Grab them from any GNU archive site." touch configure ;; autoheader) + if test -z "$run" && ($1 --version) > /dev/null 2>&1; then + # We have it, but it failed. + exit 1 + fi + echo 1>&2 "\ WARNING: \`$1' is missing on your system. You should only need it if ! you modified \`acconfig.h' or \`${configure_ac}'. You might want to install the \`Autoconf' and \`GNU m4' packages. Grab them from any GNU archive site." ! files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}` test -z "$files" && files="config.h" touch_files= for f in $files; do *************** *** 104,112 **** ;; automake*) echo 1>&2 "\ WARNING: \`$1' is missing on your system. You should only need it if ! you modified \`Makefile.am', \`acinclude.m4' or \`$configure_ac'. You might want to install the \`Automake' and \`Perl' packages. Grab them from any GNU archive site." find . -type f -name Makefile.am -print | --- 140,153 ---- ;; automake*) + if test -z "$run" && ($1 --version) > /dev/null 2>&1; then + # We have it, but it failed. + exit 1 + fi + echo 1>&2 "\ WARNING: \`$1' is missing on your system. You should only need it if ! you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'. You might want to install the \`Automake' and \`Perl' packages. Grab them from any GNU archive site." find . -type f -name Makefile.am -print | *************** *** 114,119 **** --- 155,188 ---- while read f; do touch "$f"; done ;; + autom4te) + if test -z "$run" && ($1 --version) > /dev/null 2>&1; then + # We have it, but it failed. + exit 1 + fi + + echo 1>&2 "\ + WARNING: \`$1' is needed, and you do not seem to have it handy on your + system. You might have modified some files without having the + proper tools for further handling them. + You can get \`$1Help2man' as part of \`Autoconf' from any GNU + archive site." + + file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'` + test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'` + if test -f "$file"; then + touch $file + else + test -z "$file" || exec >$file + echo "#! /bin/sh" + echo "# Created by GNU Automake missing as a replacement of" + echo "# $ $@" + echo "exit 0" + chmod +x $file + exit 1 + fi + ;; + bison|yacc) echo 1>&2 "\ WARNING: \`$1' is missing on your system. You should only need it if *************** *** 167,173 **** --- 236,272 ---- fi ;; + help2man) + if test -z "$run" && ($1 --version) > /dev/null 2>&1; then + # We have it, but it failed. + exit 1 + fi + + echo 1>&2 "\ + WARNING: \`$1' is missing on your system. You should only need it if + you modified a dependency of a manual page. You may need the + \`Help2man' package in order for those modifications to take + effect. You can get \`Help2man' from any GNU archive site." + + file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'` + if test -z "$file"; then + file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'` + fi + if [ -f "$file" ]; then + touch $file + else + test -z "$file" || exec >$file + echo ".ab help2man is required to generate this page" + exit 1 + fi + ;; + makeinfo) + if test -z "$run" && (makeinfo --version) > /dev/null 2>&1; then + # We have makeinfo, but it failed. + exit 1 + fi + echo 1>&2 "\ WARNING: \`$1' is missing on your system. You should only need it if you modified a \`.texi' or \`.texinfo' file, or any other file *************** *** 183,188 **** --- 282,326 ---- touch $file ;; + tar) + shift + if test -n "$run"; then + echo 1>&2 "ERROR: \`tar' requires --run" + exit 1 + fi + + # We have already tried tar in the generic part. + # Look for gnutar/gtar before invocation to avoid ugly error + # messages. + if (gnutar --version > /dev/null 2>&1); then + gnutar "$@" && exit 0 + fi + if (gtar --version > /dev/null 2>&1); then + gtar "$@" && exit 0 + fi + firstarg="$1" + if shift; then + case "$firstarg" in + *o*) + firstarg=`echo "$firstarg" | sed s/o//` + tar "$firstarg" "$@" && exit 0 + ;; + esac + case "$firstarg" in + *h*) + firstarg=`echo "$firstarg" | sed s/h//` + tar "$firstarg" "$@" && exit 0 + ;; + esac + fi + + echo 1>&2 "\ + WARNING: I can't seem to be able to run \`tar' with the given arguments. + You may want to install GNU tar or Free paxutils, or check the + command line arguments." + exit 1 + ;; + *) echo 1>&2 "\ WARNING: \`$1' is needed, and you do not seem to have it handy on your diff -crN ./gnome-vfs/mkinstalldirs /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/mkinstalldirs *** ./gnome-vfs/mkinstalldirs Fri Jan 24 22:45:28 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/mkinstalldirs Thu Dec 18 21:13:04 2003 *************** *** 4,40 **** # Created: 1993-05-16 # Public domain - # $Id: mkinstalldirs,v 1.13 1999/01/05 03:18:55 bje Exp $ - errstatus=0 for file do ! set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'` ! shift ! pathcomp= ! for d ! do ! pathcomp="$pathcomp$d" ! case "$pathcomp" in ! -* ) pathcomp=./$pathcomp ;; ! esac ! ! if test ! -d "$pathcomp"; then ! echo "mkdir $pathcomp" ! ! mkdir "$pathcomp" || lasterr=$? ! ! if test ! -d "$pathcomp"; then ! errstatus=$lasterr ! fi ! fi ! pathcomp="$pathcomp/" ! done done exit $errstatus # mkinstalldirs ends here --- 4,111 ---- # Created: 1993-05-16 # Public domain errstatus=0 + dirmode="" + + usage="\ + Usage: mkinstalldirs [-h] [--help] [-m mode] dir ..." + + # process command line arguments + while test $# -gt 0 ; do + case $1 in + -h | --help | --h*) # -h for help + echo "$usage" 1>&2 + exit 0 + ;; + -m) # -m PERM arg + shift + test $# -eq 0 && { echo "$usage" 1>&2; exit 1; } + dirmode=$1 + shift + ;; + --) # stop option processing + shift + break + ;; + -*) # unknown option + echo "$usage" 1>&2 + exit 1 + ;; + *) # first non-opt arg + break + ;; + esac + done + + for file + do + if test -d "$file"; then + shift + else + break + fi + done + + case $# in + 0) exit 0 ;; + esac + + case $dirmode in + '') + if mkdir -p -- . 2>/dev/null; then + echo "mkdir -p -- $*" + exec mkdir -p -- "$@" + fi + ;; + *) + if mkdir -m "$dirmode" -p -- . 2>/dev/null; then + echo "mkdir -m $dirmode -p -- $*" + exec mkdir -m "$dirmode" -p -- "$@" + fi + ;; + esac for file do ! set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'` ! shift ! pathcomp= ! for d ! do ! pathcomp="$pathcomp$d" ! case $pathcomp in ! -*) pathcomp=./$pathcomp ;; ! esac ! ! if test ! -d "$pathcomp"; then ! echo "mkdir $pathcomp" ! ! mkdir "$pathcomp" || lasterr=$? ! ! if test ! -d "$pathcomp"; then ! errstatus=$lasterr ! else ! if test ! -z "$dirmode"; then ! echo "chmod $dirmode $pathcomp" ! lasterr="" ! chmod "$dirmode" "$pathcomp" || lasterr=$? ! ! if test ! -z "$lasterr"; then ! errstatus=$lasterr ! fi ! fi ! fi ! fi ! pathcomp="$pathcomp/" ! done done exit $errstatus + # Local Variables: + # mode: shell-script + # sh-indentation: 2 + # End: # mkinstalldirs ends here diff -crN ./gnome-vfs/modules/Makefile.in /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/modules/Makefile.in *** ./gnome-vfs/modules/Makefile.in Mon Sep 8 14:19:44 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/modules/Makefile.in Thu Dec 18 21:13:10 2003 *************** *** 1,6 **** ! # Makefile.in generated automatically by automake 1.4-p6 from Makefile.am ! # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. --- 1,8 ---- ! # Makefile.in generated by automake 1.7.1 from Makefile.am. ! # @configure_input@ ! # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 ! # Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. *************** *** 10,87 **** # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. ! ! SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ - prefix = @prefix@ - exec_prefix = @exec_prefix@ - - bindir = @bindir@ - sbindir = @sbindir@ - libexecdir = @libexecdir@ - datadir = @datadir@ - sysconfdir = @sysconfdir@ - sharedstatedir = @sharedstatedir@ - localstatedir = @localstatedir@ - libdir = @libdir@ - infodir = @infodir@ - mandir = @mandir@ - includedir = @includedir@ - oldincludedir = /usr/include - - DESTDIR = - pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ - top_builddir = .. ! ACLOCAL = @ACLOCAL@ ! AUTOCONF = @AUTOCONF@ ! AUTOMAKE = @AUTOMAKE@ ! AUTOHEADER = @AUTOHEADER@ ! INSTALL = @INSTALL@ ! INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) ! INSTALL_DATA = @INSTALL_DATA@ ! INSTALL_SCRIPT = @INSTALL_SCRIPT@ ! transform = @program_transform_name@ ! NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : - host_alias = @host_alias@ host_triplet = @host@ ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ ! AS = @AS@ AWK = @AWK@ BONOBO_ACTIVATION_REQUIRED = @BONOBO_ACTIVATION_REQUIRED@ BONOBO_IDLDIR = @BONOBO_IDLDIR@ BONOBO_REQUIRED = @BONOBO_REQUIRED@ BZ2_LIBS = @BZ2_LIBS@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ CFLAGS = @CFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ ! CXX = @CXX@ DATADIRNAME = @DATADIRNAME@ DB2HTML = @DB2HTML@ ! DLLTOOL = @DLLTOOL@ ECHO = @ECHO@ ENABLE_PROFILER = @ENABLE_PROFILER@ EXEEXT = @EXEEXT@ FAM_LIBS = @FAM_LIBS@ GCONFTOOL = @GCONFTOOL@ GCONF_REQUIRED = @GCONF_REQUIRED@ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ --- 12,85 ---- # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. ! @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = .. ! am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ ! install_sh_DATA = $(install_sh) -c -m 644 ! install_sh_PROGRAM = $(install_sh) -c ! install_sh_SCRIPT = $(install_sh) -c ! INSTALL_HEADER = $(INSTALL_DATA) ! transform = $(program_transform_name) NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : host_triplet = @host@ + ACLOCAL = @ACLOCAL@ ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ ! ALLOCA = @ALLOCA@ ! AMDEP_FALSE = @AMDEP_FALSE@ ! AMDEP_TRUE = @AMDEP_TRUE@ ! AMTAR = @AMTAR@ ! AUTOCONF = @AUTOCONF@ ! AUTOHEADER = @AUTOHEADER@ ! AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BONOBO_ACTIVATION_REQUIRED = @BONOBO_ACTIVATION_REQUIRED@ BONOBO_IDLDIR = @BONOBO_IDLDIR@ BONOBO_REQUIRED = @BONOBO_REQUIRED@ + BUILD_CDEMENU_MODULE_FALSE = @BUILD_CDEMENU_MODULE_FALSE@ + BUILD_CDEMENU_MODULE_TRUE = @BUILD_CDEMENU_MODULE_TRUE@ BZ2_LIBS = @BZ2_LIBS@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ + CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ ! CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ DB2HTML = @DB2HTML@ ! DEFS = @DEFS@ ! DEPDIR = @DEPDIR@ ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ + ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ + ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ENABLE_PROFILER = @ENABLE_PROFILER@ + ENABLE_PROFILER_FALSE = @ENABLE_PROFILER_FALSE@ + ENABLE_PROFILER_TRUE = @ENABLE_PROFILER_TRUE@ EXEEXT = @EXEEXT@ FAM_LIBS = @FAM_LIBS@ GCONFTOOL = @GCONFTOOL@ GCONF_REQUIRED = @GCONF_REQUIRED@ + GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ + GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ *************** *** 90,99 **** --- 88,114 ---- GMSGFMT = @GMSGFMT@ GNOME_ACLOCAL_DIR = @GNOME_ACLOCAL_DIR@ GNOME_ACLOCAL_FLAGS = @GNOME_ACLOCAL_FLAGS@ + GNOME_INTERFACE_VERSION = @GNOME_INTERFACE_VERSION@ GNOME_VFS_DIR = @GNOME_VFS_DIR@ GTKDOC = @GTKDOC@ + HAVE_CDDA_FALSE = @HAVE_CDDA_FALSE@ + HAVE_CDDA_TRUE = @HAVE_CDDA_TRUE@ + HAVE_DOCBOOK_FALSE = @HAVE_DOCBOOK_FALSE@ + HAVE_DOCBOOK_TRUE = @HAVE_DOCBOOK_TRUE@ HAVE_GTK_DOC = @HAVE_GTK_DOC@ + HAVE_GTK_DOC_FALSE = @HAVE_GTK_DOC_FALSE@ + HAVE_GTK_DOC_TRUE = @HAVE_GTK_DOC_TRUE@ + HAVE_LIBEFS_FALSE = @HAVE_LIBEFS_FALSE@ + HAVE_LIBEFS_TRUE = @HAVE_LIBEFS_TRUE@ + HAVE_SSL_FALSE = @HAVE_SSL_FALSE@ + HAVE_SSL_TRUE = @HAVE_SSL_TRUE@ HTML_DIR = @HTML_DIR@ + INSIDE_GNOME_DOCU_FALSE = @INSIDE_GNOME_DOCU_FALSE@ + INSIDE_GNOME_DOCU_TRUE = @INSIDE_GNOME_DOCU_TRUE@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ + INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLLIBS = @INTLLIBS@ INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@ *************** *** 127,135 **** --- 142,154 ---- LIBGNUTLS_CONFIG = @LIBGNUTLS_CONFIG@ LIBGNUTLS_LIBS = @LIBGNUTLS_LIBS@ LIBIDL_REQUIRED = @LIBIDL_REQUIRED@ + LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ + MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ + MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MKINSTALLDIRS = @MKINSTALLDIRS@ MODULES_CFLAGS = @MODULES_CFLAGS@ *************** *** 144,161 **** MODULES_XML_LIBS = @MODULES_XML_LIBS@ MONIKERS_CFLAGS = @MONIKERS_CFLAGS@ MONIKERS_LIBS = @MONIKERS_LIBS@ ! OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ ORBIT_IDL = @ORBIT_IDL@ ORBIT_REQUIRED = @ORBIT_REQUIRED@ PACKAGE = @PACKAGE@ PKG_CONFIG = @PKG_CONFIG@ POFILES = @POFILES@ POPT_LIBS = @POPT_LIBS@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ RANLIB = @RANLIB@ STRIP = @STRIP@ TEST_CFLAGS = @TEST_CFLAGS@ TEST_LIBS = @TEST_LIBS@ --- 163,192 ---- MODULES_XML_LIBS = @MODULES_XML_LIBS@ MONIKERS_CFLAGS = @MONIKERS_CFLAGS@ MONIKERS_LIBS = @MONIKERS_LIBS@ ! MSGFMT = @MSGFMT@ OBJEXT = @OBJEXT@ + OPENSSL_CFLAGS = @OPENSSL_CFLAGS@ + OPENSSL_LIBS = @OPENSSL_LIBS@ ORBIT_IDL = @ORBIT_IDL@ ORBIT_REQUIRED = @ORBIT_REQUIRED@ PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ + PLATFORM_GNOME_2_FALSE = @PLATFORM_GNOME_2_FALSE@ + PLATFORM_GNOME_2_TRUE = @PLATFORM_GNOME_2_TRUE@ POFILES = @POFILES@ POPT_LIBS = @POPT_LIBS@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ RANLIB = @RANLIB@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ STRIP = @STRIP@ TEST_CFLAGS = @TEST_CFLAGS@ TEST_LIBS = @TEST_LIBS@ *************** *** 173,182 **** VFS_SIZE_IS = @VFS_SIZE_IS@ VFS_SIZE_PRINTF = @VFS_SIZE_PRINTF@ WARN_CFLAGS = @WARN_CFLAGS@ ! WARN_CXXFLAGS = @WARN_CXXFLAGS@ XML_REQUIRED = @XML_REQUIRED@ ! ! NULL = SUBDIRS = extfs vfolder INCLUDES = \ --- 204,245 ---- VFS_SIZE_IS = @VFS_SIZE_IS@ VFS_SIZE_PRINTF = @VFS_SIZE_PRINTF@ WARN_CFLAGS = @WARN_CFLAGS@ ! XGETTEXT = @XGETTEXT@ XML_REQUIRED = @XML_REQUIRED@ ! ac_ct_CC = @ac_ct_CC@ ! ac_ct_RANLIB = @ac_ct_RANLIB@ ! ac_ct_STRIP = @ac_ct_STRIP@ ! am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ ! am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ ! am__include = @am__include@ ! am__quote = @am__quote@ ! bindir = @bindir@ ! build = @build@ ! build_alias = @build_alias@ ! build_cpu = @build_cpu@ ! build_os = @build_os@ ! build_vendor = @build_vendor@ ! datadir = @datadir@ ! exec_prefix = @exec_prefix@ ! host = @host@ ! host_alias = @host_alias@ ! host_cpu = @host_cpu@ ! host_os = @host_os@ ! host_vendor = @host_vendor@ ! includedir = @includedir@ ! infodir = @infodir@ ! install_sh = @install_sh@ ! libdir = @libdir@ ! libexecdir = @libexecdir@ ! localstatedir = @localstatedir@ ! mandir = @mandir@ ! oldincludedir = @oldincludedir@ ! prefix = @prefix@ ! program_transform_name = @program_transform_name@ ! sbindir = @sbindir@ ! sharedstatedir = @sharedstatedir@ ! sysconfdir = @sysconfdir@ ! target_alias = @target_alias@ SUBDIRS = extfs vfolder INCLUDES = \ *************** *** 207,215 **** cdemenu-module.conf \ ssl-modules.conf ! @HAVE_CDDA_TRUE@CDDA_LTLIBS = @HAVE_CDDA_TRUE@libcdda.la @HAVE_CDDA_FALSE@CDDA_LTLIBS = ! @BUILD_CDEMENU_MODULE_TRUE@CDEMENU_LTLIBS = @BUILD_CDEMENU_MODULE_TRUE@libcdemenu-desktop.la @BUILD_CDEMENU_MODULE_FALSE@CDEMENU_LTLIBS = module_flags = -export_dynamic -avoid-version -module -no-undefined --- 270,282 ---- cdemenu-module.conf \ ssl-modules.conf ! ! ! ### Module setup ! @HAVE_CDDA_TRUE@CDDA_LTLIBS = libcdda.la @HAVE_CDDA_FALSE@CDDA_LTLIBS = ! ! @BUILD_CDEMENU_MODULE_TRUE@CDEMENU_LTLIBS = libcdemenu-desktop.la @BUILD_CDEMENU_MODULE_FALSE@CDEMENU_LTLIBS = module_flags = -export_dynamic -avoid-version -module -no-undefined *************** *** 233,249 **** $(NULL) # Not currently supported # libnfs.la - modulesconfdir = $(sysconfdir)/gnome-vfs-2.0/modules ! @HAVE_CDDA_TRUE@CDDA_CONF = @HAVE_CDDA_TRUE@cdda-module.conf ! @HAVE_SSL_TRUE@SSL_CONF = @HAVE_SSL_TRUE@ssl-modules.conf ! @BUILD_CDEMENU_MODULE_TRUE@CDE_CONF = @BUILD_CDEMENU_MODULE_TRUE@cdemenu-module.conf modulesconf_DATA = default-modules.conf $(CDDA_CONF) $(SSL_CONF) $(CDE_CONF) - ### `cdda' method libcdda_la_SOURCES = \ cdda-method.c \ cdda-cddb.c \ --- 300,316 ---- $(NULL) + # Not currently supported # libnfs.la modulesconfdir = $(sysconfdir)/gnome-vfs-2.0/modules ! @HAVE_CDDA_TRUE@CDDA_CONF = cdda-module.conf ! @HAVE_SSL_TRUE@SSL_CONF = ssl-modules.conf ! @BUILD_CDEMENU_MODULE_TRUE@CDE_CONF = cdemenu-module.conf modulesconf_DATA = default-modules.conf $(CDDA_CONF) $(SSL_CONF) $(CDE_CONF) + ### `cdda' method libcdda_la_SOURCES = \ cdda-method.c \ cdda-cddb.c \ *************** *** 254,313 **** libcdda_la_LDFLAGS = $(module_flags) libcdda_la_LIBADD = -lcdda_paranoia -lcdda_interface ../libgnomevfs/libgnomevfs-2.la - ### `extfs' method libextfs_la_SOURCES = extfs-method.c libextfs_la_LDFLAGS = $(module_flags) libextfs_la_LIBADD = $(MODULES_FILE_LIBS) ../libgnomevfs/libgnomevfs-2.la - ### `file' method libfile_la_SOURCES = file-method.c fstype.c libfile_la_LDFLAGS = $(module_flags) libfile_la_LIBADD = $(FAM_LIBS) $(MODULES_FILE_LIBS) ../libgnomevfs/libgnomevfs-2.la - ### `nntp' method libnntp_la_SOURCES = nntp-method.c nntp-method.h libnntp_la_LDFLAGS = $(module_flags) libnntp_la_LIBADD = $(MODULES_LIBS) ../libgnomevfs/libgnomevfs-2.la - ### `cdemenu-desktop' method libcdemenu_desktop_la_SOURCES = cdemenu-desktop-method.c libcdemenu_desktop_la_LDFLAGS = $(module_flags) libcdemenu_desktop_la_LIBADD = $(MODULES_LIBS) ../libgnomevfs/libgnomevfs-2.la - ### `ssh' method libssh_la_SOURCES = ssh-method.c libssh_la_LDFLAGS = $(module_flags) libssh_la_LIBADD = $(MODULES_LIBS) ../libgnomevfs/libgnomevfs-2.la - ### `test' method libvfs_test_la_SOURCES = test-method.c libvfs_test_la_LDFLAGS = $(module_flags) libvfs_test_la_LIBADD = $(MODULES_XML_LIBS) ../libgnomevfs/libgnomevfs-2.la - ### `gzip' method libgzip_la_SOURCES = gzip-method.c libgzip_la_LDFLAGS = $(module_flags) libgzip_la_LIBADD = $(MODULES_LIBS) -lz ../libgnomevfs/libgnomevfs-2.la - ### `bzip2' method libbzip2_la_SOURCES = bzip2-method.c libbzip2_la_LDFLAGS = $(module_flags) libbzip2_la_LIBADD = $(MODULES_LIBS) $(BZ2_LIBS) ../libgnomevfs/libgnomevfs-2.la - ### `ftp' method libftp_la_SOURCES = ftp-method.c libftp_la_LDFLAGS = $(module_flags) libftp_la_LIBADD = $(MODULES_LIBS) ../libgnomevfs/libgnomevfs-2.la ### `nfs' method #libnfs_la_SOURCES = \ --- 321,381 ---- libcdda_la_LDFLAGS = $(module_flags) libcdda_la_LIBADD = -lcdda_paranoia -lcdda_interface ../libgnomevfs/libgnomevfs-2.la + ### `extfs' method libextfs_la_SOURCES = extfs-method.c libextfs_la_LDFLAGS = $(module_flags) libextfs_la_LIBADD = $(MODULES_FILE_LIBS) ../libgnomevfs/libgnomevfs-2.la + ### `file' method libfile_la_SOURCES = file-method.c fstype.c libfile_la_LDFLAGS = $(module_flags) libfile_la_LIBADD = $(FAM_LIBS) $(MODULES_FILE_LIBS) ../libgnomevfs/libgnomevfs-2.la + ### `nntp' method libnntp_la_SOURCES = nntp-method.c nntp-method.h libnntp_la_LDFLAGS = $(module_flags) libnntp_la_LIBADD = $(MODULES_LIBS) ../libgnomevfs/libgnomevfs-2.la + ### `cdemenu-desktop' method libcdemenu_desktop_la_SOURCES = cdemenu-desktop-method.c libcdemenu_desktop_la_LDFLAGS = $(module_flags) libcdemenu_desktop_la_LIBADD = $(MODULES_LIBS) ../libgnomevfs/libgnomevfs-2.la + ### `ssh' method libssh_la_SOURCES = ssh-method.c libssh_la_LDFLAGS = $(module_flags) libssh_la_LIBADD = $(MODULES_LIBS) ../libgnomevfs/libgnomevfs-2.la + ### `test' method libvfs_test_la_SOURCES = test-method.c libvfs_test_la_LDFLAGS = $(module_flags) libvfs_test_la_LIBADD = $(MODULES_XML_LIBS) ../libgnomevfs/libgnomevfs-2.la + ### `gzip' method libgzip_la_SOURCES = gzip-method.c libgzip_la_LDFLAGS = $(module_flags) libgzip_la_LIBADD = $(MODULES_LIBS) -lz ../libgnomevfs/libgnomevfs-2.la + ### `bzip2' method libbzip2_la_SOURCES = bzip2-method.c libbzip2_la_LDFLAGS = $(module_flags) libbzip2_la_LIBADD = $(MODULES_LIBS) $(BZ2_LIBS) ../libgnomevfs/libgnomevfs-2.la + ### `ftp' method libftp_la_SOURCES = ftp-method.c libftp_la_LDFLAGS = $(module_flags) libftp_la_LIBADD = $(MODULES_LIBS) ../libgnomevfs/libgnomevfs-2.la + ### `nfs' method #libnfs_la_SOURCES = \ *************** *** 320,326 **** #libnfs_la_LDFLAGS = $(module_flags) ### `http' method - HTTP_LTLIBS = libhttp.la libhttp_la_SOURCES = \ --- 388,393 ---- *************** *** 346,472 **** libtar_la_SOURCES = tar-method.c tarpet.h libtar_la_LDFLAGS = $(module_flags) libtar_la_LIBADD = $(MODULES_LIBS) ../libgnomevfs/libgnomevfs-2.la mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ! CONFIG_HEADER = ../config.h ! CONFIG_CLEAN_FILES = ! LTLIBRARIES = $(modules_LTLIBRARIES) ! ! ! DEFS = @DEFS@ -I. -I$(srcdir) -I.. ! LIBS = @LIBS@ ! libcdda_la_DEPENDENCIES = ../libgnomevfs/libgnomevfs-2.la ! libcdda_la_OBJECTS = cdda-method.lo cdda-cddb.lo ! libextfs_la_DEPENDENCIES = ../libgnomevfs/libgnomevfs-2.la ! libextfs_la_OBJECTS = extfs-method.lo ! libfile_la_DEPENDENCIES = ../libgnomevfs/libgnomevfs-2.la ! libfile_la_OBJECTS = file-method.lo fstype.lo ! libnntp_la_DEPENDENCIES = ../libgnomevfs/libgnomevfs-2.la ! libnntp_la_OBJECTS = nntp-method.lo ! libvfs_test_la_DEPENDENCIES = ../libgnomevfs/libgnomevfs-2.la ! libvfs_test_la_OBJECTS = test-method.lo ! libhttp_la_DEPENDENCIES = ../libgnomevfs/libgnomevfs-2.la ! libhttp_la_OBJECTS = http-method.lo http-authn.lo http-cache.lo ! libbzip2_la_DEPENDENCIES = ../libgnomevfs/libgnomevfs-2.la ! libbzip2_la_OBJECTS = bzip2-method.lo ! libgzip_la_DEPENDENCIES = ../libgnomevfs/libgnomevfs-2.la ! libgzip_la_OBJECTS = gzip-method.lo ! libftp_la_DEPENDENCIES = ../libgnomevfs/libgnomevfs-2.la ! libftp_la_OBJECTS = ftp-method.lo ! libvfs_pipe_la_DEPENDENCIES = ../libgnomevfs/libgnomevfs-2.la ! libvfs_pipe_la_OBJECTS = pipe-method.lo ! libvfs_translate_la_DEPENDENCIES = ../libgnomevfs/libgnomevfs-2.la ! libvfs_translate_la_OBJECTS = translate-method.lo ! libcdemenu_desktop_la_DEPENDENCIES = ../libgnomevfs/libgnomevfs-2.la ! libcdemenu_desktop_la_OBJECTS = cdemenu-desktop-method.lo ! libssh_la_DEPENDENCIES = ../libgnomevfs/libgnomevfs-2.la ! libssh_la_OBJECTS = ssh-method.lo ! libtar_la_DEPENDENCIES = ../libgnomevfs/libgnomevfs-2.la ! libtar_la_OBJECTS = tar-method.lo ! COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ! LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) ! LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ ! DATA = $(modulesconf_DATA) ! ! DIST_COMMON = Makefile.am Makefile.in ! ! DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) - TAR = gtar - GZIP_ENV = --best - SOURCES = $(libcdda_la_SOURCES) $(libextfs_la_SOURCES) $(libfile_la_SOURCES) $(libnntp_la_SOURCES) $(libvfs_test_la_SOURCES) $(libhttp_la_SOURCES) $(libbzip2_la_SOURCES) $(libgzip_la_SOURCES) $(libftp_la_SOURCES) $(libvfs_pipe_la_SOURCES) $(libvfs_translate_la_SOURCES) $(libcdemenu_desktop_la_SOURCES) $(libssh_la_SOURCES) $(libtar_la_SOURCES) - OBJECTS = $(libcdda_la_OBJECTS) $(libextfs_la_OBJECTS) $(libfile_la_OBJECTS) $(libnntp_la_OBJECTS) $(libvfs_test_la_OBJECTS) $(libhttp_la_OBJECTS) $(libbzip2_la_OBJECTS) $(libgzip_la_OBJECTS) $(libftp_la_OBJECTS) $(libvfs_pipe_la_OBJECTS) $(libvfs_translate_la_OBJECTS) $(libcdemenu_desktop_la_OBJECTS) $(libssh_la_OBJECTS) $(libtar_la_OBJECTS) - - all: all-redirect .SUFFIXES: ! .SUFFIXES: .S .c .lo .o .obj .s ! $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) ! cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps modules/Makefile ! ! Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ! cd $(top_builddir) \ ! && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status ! ! ! mostlyclean-modulesLTLIBRARIES: ! ! clean-modulesLTLIBRARIES: ! -test -z "$(modules_LTLIBRARIES)" || rm -f $(modules_LTLIBRARIES) ! ! distclean-modulesLTLIBRARIES: ! ! maintainer-clean-modulesLTLIBRARIES: ! install-modulesLTLIBRARIES: $(modules_LTLIBRARIES) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(modulesdir) @list='$(modules_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ ! echo "$(LIBTOOL) --mode=install $(INSTALL) $$p $(DESTDIR)$(modulesdir)/$$p"; \ ! $(LIBTOOL) --mode=install $(INSTALL) $$p $(DESTDIR)$(modulesdir)/$$p; \ else :; fi; \ done uninstall-modulesLTLIBRARIES: @$(NORMAL_UNINSTALL) ! list='$(modules_LTLIBRARIES)'; for p in $$list; do \ ! $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(modulesdir)/$$p; \ done ! .c.o: ! $(COMPILE) -c $< ! ! # FIXME: We should only use cygpath when building on Windows, ! # and only if it is available. ! .c.obj: ! $(COMPILE) -c `cygpath -w $<` ! ! .s.o: ! $(COMPILE) -c $< ! ! .S.o: ! $(COMPILE) -c $< mostlyclean-compile: ! -rm -f *.o core *.core ! -rm -f *.$(OBJEXT) ! ! clean-compile: distclean-compile: -rm -f *.tab.c ! maintainer-clean-compile: ! ! .c.lo: ! $(LIBTOOL) --mode=compile $(COMPILE) -c $< ! .s.lo: ! $(LIBTOOL) --mode=compile $(COMPILE) -c $< ! .S.lo: ! $(LIBTOOL) --mode=compile $(COMPILE) -c $< mostlyclean-libtool: -rm -f *.lo --- 413,577 ---- libtar_la_SOURCES = tar-method.c tarpet.h libtar_la_LDFLAGS = $(module_flags) libtar_la_LIBADD = $(MODULES_LIBS) ../libgnomevfs/libgnomevfs-2.la + subdir = modules mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ! CONFIG_HEADER = $(top_builddir)/config.h ! CONFIG_CLEAN_FILES = ! LTLIBRARIES = $(modules_LTLIBRARIES) ! ! libbzip2_la_DEPENDENCIES = ../libgnomevfs/libgnomevfs-2.la ! am_libbzip2_la_OBJECTS = bzip2-method.lo ! libbzip2_la_OBJECTS = $(am_libbzip2_la_OBJECTS) ! libcdda_la_DEPENDENCIES = ../libgnomevfs/libgnomevfs-2.la ! am_libcdda_la_OBJECTS = cdda-method.lo cdda-cddb.lo ! libcdda_la_OBJECTS = $(am_libcdda_la_OBJECTS) ! libcdemenu_desktop_la_DEPENDENCIES = ../libgnomevfs/libgnomevfs-2.la ! am_libcdemenu_desktop_la_OBJECTS = cdemenu-desktop-method.lo ! libcdemenu_desktop_la_OBJECTS = $(am_libcdemenu_desktop_la_OBJECTS) ! libextfs_la_DEPENDENCIES = ../libgnomevfs/libgnomevfs-2.la ! am_libextfs_la_OBJECTS = extfs-method.lo ! libextfs_la_OBJECTS = $(am_libextfs_la_OBJECTS) ! libfile_la_DEPENDENCIES = ../libgnomevfs/libgnomevfs-2.la ! am_libfile_la_OBJECTS = file-method.lo fstype.lo ! libfile_la_OBJECTS = $(am_libfile_la_OBJECTS) ! libftp_la_DEPENDENCIES = ../libgnomevfs/libgnomevfs-2.la ! am_libftp_la_OBJECTS = ftp-method.lo ! libftp_la_OBJECTS = $(am_libftp_la_OBJECTS) ! libgzip_la_DEPENDENCIES = ../libgnomevfs/libgnomevfs-2.la ! am_libgzip_la_OBJECTS = gzip-method.lo ! libgzip_la_OBJECTS = $(am_libgzip_la_OBJECTS) ! libhttp_la_DEPENDENCIES = ../libgnomevfs/libgnomevfs-2.la ! am_libhttp_la_OBJECTS = http-method.lo http-authn.lo http-cache.lo \ ! $(am__objects_1) ! libhttp_la_OBJECTS = $(am_libhttp_la_OBJECTS) ! libnntp_la_DEPENDENCIES = ../libgnomevfs/libgnomevfs-2.la ! am_libnntp_la_OBJECTS = nntp-method.lo ! libnntp_la_OBJECTS = $(am_libnntp_la_OBJECTS) ! libssh_la_DEPENDENCIES = ../libgnomevfs/libgnomevfs-2.la ! am_libssh_la_OBJECTS = ssh-method.lo ! libssh_la_OBJECTS = $(am_libssh_la_OBJECTS) ! libtar_la_DEPENDENCIES = ../libgnomevfs/libgnomevfs-2.la ! am_libtar_la_OBJECTS = tar-method.lo ! libtar_la_OBJECTS = $(am_libtar_la_OBJECTS) ! libvfs_pipe_la_DEPENDENCIES = ../libgnomevfs/libgnomevfs-2.la ! am_libvfs_pipe_la_OBJECTS = pipe-method.lo ! libvfs_pipe_la_OBJECTS = $(am_libvfs_pipe_la_OBJECTS) ! libvfs_test_la_DEPENDENCIES = ../libgnomevfs/libgnomevfs-2.la ! am_libvfs_test_la_OBJECTS = test-method.lo ! libvfs_test_la_OBJECTS = $(am_libvfs_test_la_OBJECTS) ! libvfs_translate_la_DEPENDENCIES = ../libgnomevfs/libgnomevfs-2.la ! am_libvfs_translate_la_OBJECTS = translate-method.lo ! libvfs_translate_la_OBJECTS = $(am_libvfs_translate_la_OBJECTS) ! ! DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ! depcomp = ! am__depfiles_maybe = ! COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ ! $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ! LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ ! $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) ! LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ! $(AM_LDFLAGS) $(LDFLAGS) -o $@ ! DIST_SOURCES = $(libbzip2_la_SOURCES) $(libcdda_la_SOURCES) \ ! $(libcdemenu_desktop_la_SOURCES) $(libextfs_la_SOURCES) \ ! $(libfile_la_SOURCES) $(libftp_la_SOURCES) \ ! $(libgzip_la_SOURCES) $(libhttp_la_SOURCES) \ ! $(libnntp_la_SOURCES) $(libssh_la_SOURCES) $(libtar_la_SOURCES) \ ! $(libvfs_pipe_la_SOURCES) $(libvfs_test_la_SOURCES) \ ! $(libvfs_translate_la_SOURCES) ! DATA = $(modulesconf_DATA) ! ! ! RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \ ! ps-recursive install-info-recursive uninstall-info-recursive \ ! all-recursive install-data-recursive install-exec-recursive \ ! installdirs-recursive install-recursive uninstall-recursive \ ! check-recursive installcheck-recursive ! DIST_COMMON = Makefile.am Makefile.in ! DIST_SUBDIRS = $(SUBDIRS) ! SOURCES = $(libbzip2_la_SOURCES) $(libcdda_la_SOURCES) $(libcdemenu_desktop_la_SOURCES) $(libextfs_la_SOURCES) $(libfile_la_SOURCES) $(libftp_la_SOURCES) $(libgzip_la_SOURCES) $(libhttp_la_SOURCES) $(libnntp_la_SOURCES) $(libssh_la_SOURCES) $(libtar_la_SOURCES) $(libvfs_pipe_la_SOURCES) $(libvfs_test_la_SOURCES) $(libvfs_translate_la_SOURCES) ! all: all-recursive .SUFFIXES: ! .SUFFIXES: .c .lo .o .obj ! $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) ! cd $(top_srcdir) && \ ! $(AUTOMAKE) --gnu --ignore-deps modules/Makefile ! Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status ! cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) ! modulesLTLIBRARIES_INSTALL = $(INSTALL) install-modulesLTLIBRARIES: $(modules_LTLIBRARIES) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(modulesdir) @list='$(modules_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ ! f="`echo $$p | sed -e 's|^.*/||'`"; \ ! echo " $(LIBTOOL) --mode=install $(modulesLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(modulesdir)/$$f"; \ ! $(LIBTOOL) --mode=install $(modulesLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(modulesdir)/$$f; \ else :; fi; \ done uninstall-modulesLTLIBRARIES: @$(NORMAL_UNINSTALL) ! @list='$(modules_LTLIBRARIES)'; for p in $$list; do \ ! p="`echo $$p | sed -e 's|^.*/||'`"; \ ! echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(modulesdir)/$$p"; \ ! $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(modulesdir)/$$p; \ done ! clean-modulesLTLIBRARIES: ! -test -z "$(modules_LTLIBRARIES)" || rm -f $(modules_LTLIBRARIES) ! @list='$(modules_LTLIBRARIES)'; for p in $$list; do \ ! dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ ! test "$$dir" = "$$p" && dir=.; \ ! echo "rm -f \"$${dir}/so_locations\""; \ ! rm -f "$${dir}/so_locations"; \ ! done ! libbzip2.la: $(libbzip2_la_OBJECTS) $(libbzip2_la_DEPENDENCIES) ! $(LINK) -rpath $(modulesdir) $(libbzip2_la_LDFLAGS) $(libbzip2_la_OBJECTS) $(libbzip2_la_LIBADD) $(LIBS) ! libcdda.la: $(libcdda_la_OBJECTS) $(libcdda_la_DEPENDENCIES) ! $(LINK) -rpath $(modulesdir) $(libcdda_la_LDFLAGS) $(libcdda_la_OBJECTS) $(libcdda_la_LIBADD) $(LIBS) ! libcdemenu-desktop.la: $(libcdemenu_desktop_la_OBJECTS) $(libcdemenu_desktop_la_DEPENDENCIES) ! $(LINK) -rpath $(modulesdir) $(libcdemenu_desktop_la_LDFLAGS) $(libcdemenu_desktop_la_OBJECTS) $(libcdemenu_desktop_la_LIBADD) $(LIBS) ! libextfs.la: $(libextfs_la_OBJECTS) $(libextfs_la_DEPENDENCIES) ! $(LINK) -rpath $(modulesdir) $(libextfs_la_LDFLAGS) $(libextfs_la_OBJECTS) $(libextfs_la_LIBADD) $(LIBS) ! libfile.la: $(libfile_la_OBJECTS) $(libfile_la_DEPENDENCIES) ! $(LINK) -rpath $(modulesdir) $(libfile_la_LDFLAGS) $(libfile_la_OBJECTS) $(libfile_la_LIBADD) $(LIBS) ! libftp.la: $(libftp_la_OBJECTS) $(libftp_la_DEPENDENCIES) ! $(LINK) -rpath $(modulesdir) $(libftp_la_LDFLAGS) $(libftp_la_OBJECTS) $(libftp_la_LIBADD) $(LIBS) ! libgzip.la: $(libgzip_la_OBJECTS) $(libgzip_la_DEPENDENCIES) ! $(LINK) -rpath $(modulesdir) $(libgzip_la_LDFLAGS) $(libgzip_la_OBJECTS) $(libgzip_la_LIBADD) $(LIBS) ! libhttp.la: $(libhttp_la_OBJECTS) $(libhttp_la_DEPENDENCIES) ! $(LINK) -rpath $(modulesdir) $(libhttp_la_LDFLAGS) $(libhttp_la_OBJECTS) $(libhttp_la_LIBADD) $(LIBS) ! libnntp.la: $(libnntp_la_OBJECTS) $(libnntp_la_DEPENDENCIES) ! $(LINK) -rpath $(modulesdir) $(libnntp_la_LDFLAGS) $(libnntp_la_OBJECTS) $(libnntp_la_LIBADD) $(LIBS) ! libssh.la: $(libssh_la_OBJECTS) $(libssh_la_DEPENDENCIES) ! $(LINK) -rpath $(modulesdir) $(libssh_la_LDFLAGS) $(libssh_la_OBJECTS) $(libssh_la_LIBADD) $(LIBS) ! libtar.la: $(libtar_la_OBJECTS) $(libtar_la_DEPENDENCIES) ! $(LINK) -rpath $(modulesdir) $(libtar_la_LDFLAGS) $(libtar_la_OBJECTS) $(libtar_la_LIBADD) $(LIBS) ! libvfs-pipe.la: $(libvfs_pipe_la_OBJECTS) $(libvfs_pipe_la_DEPENDENCIES) ! $(LINK) -rpath $(modulesdir) $(libvfs_pipe_la_LDFLAGS) $(libvfs_pipe_la_OBJECTS) $(libvfs_pipe_la_LIBADD) $(LIBS) ! libvfs-test.la: $(libvfs_test_la_OBJECTS) $(libvfs_test_la_DEPENDENCIES) ! $(LINK) -rpath $(modulesdir) $(libvfs_test_la_LDFLAGS) $(libvfs_test_la_OBJECTS) $(libvfs_test_la_LIBADD) $(LIBS) ! libvfs-translate.la: $(libvfs_translate_la_OBJECTS) $(libvfs_translate_la_DEPENDENCIES) ! $(LINK) -rpath $(modulesdir) $(libvfs_translate_la_LDFLAGS) $(libvfs_translate_la_OBJECTS) $(libvfs_translate_la_LIBADD) $(LIBS) mostlyclean-compile: ! -rm -f *.$(OBJEXT) core *.core distclean-compile: -rm -f *.tab.c ! .c.o: ! $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< ! .c.obj: ! $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'` ! .c.lo: ! $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< mostlyclean-libtool: -rm -f *.lo *************** *** 475,542 **** -rm -rf .libs _libs distclean-libtool: ! ! maintainer-clean-libtool: ! ! libcdda.la: $(libcdda_la_OBJECTS) $(libcdda_la_DEPENDENCIES) ! $(LINK) -rpath $(modulesdir) $(libcdda_la_LDFLAGS) $(libcdda_la_OBJECTS) $(libcdda_la_LIBADD) $(LIBS) ! ! libextfs.la: $(libextfs_la_OBJECTS) $(libextfs_la_DEPENDENCIES) ! $(LINK) -rpath $(modulesdir) $(libextfs_la_LDFLAGS) $(libextfs_la_OBJECTS) $(libextfs_la_LIBADD) $(LIBS) ! ! libfile.la: $(libfile_la_OBJECTS) $(libfile_la_DEPENDENCIES) ! $(LINK) -rpath $(modulesdir) $(libfile_la_LDFLAGS) $(libfile_la_OBJECTS) $(libfile_la_LIBADD) $(LIBS) ! ! libnntp.la: $(libnntp_la_OBJECTS) $(libnntp_la_DEPENDENCIES) ! $(LINK) -rpath $(modulesdir) $(libnntp_la_LDFLAGS) $(libnntp_la_OBJECTS) $(libnntp_la_LIBADD) $(LIBS) ! ! libvfs-test.la: $(libvfs_test_la_OBJECTS) $(libvfs_test_la_DEPENDENCIES) ! $(LINK) -rpath $(modulesdir) $(libvfs_test_la_LDFLAGS) $(libvfs_test_la_OBJECTS) $(libvfs_test_la_LIBADD) $(LIBS) ! ! libhttp.la: $(libhttp_la_OBJECTS) $(libhttp_la_DEPENDENCIES) ! $(LINK) -rpath $(modulesdir) $(libhttp_la_LDFLAGS) $(libhttp_la_OBJECTS) $(libhttp_la_LIBADD) $(LIBS) ! ! libbzip2.la: $(libbzip2_la_OBJECTS) $(libbzip2_la_DEPENDENCIES) ! $(LINK) -rpath $(modulesdir) $(libbzip2_la_LDFLAGS) $(libbzip2_la_OBJECTS) $(libbzip2_la_LIBADD) $(LIBS) ! ! libgzip.la: $(libgzip_la_OBJECTS) $(libgzip_la_DEPENDENCIES) ! $(LINK) -rpath $(modulesdir) $(libgzip_la_LDFLAGS) $(libgzip_la_OBJECTS) $(libgzip_la_LIBADD) $(LIBS) ! ! libftp.la: $(libftp_la_OBJECTS) $(libftp_la_DEPENDENCIES) ! $(LINK) -rpath $(modulesdir) $(libftp_la_LDFLAGS) $(libftp_la_OBJECTS) $(libftp_la_LIBADD) $(LIBS) ! ! libvfs-pipe.la: $(libvfs_pipe_la_OBJECTS) $(libvfs_pipe_la_DEPENDENCIES) ! $(LINK) -rpath $(modulesdir) $(libvfs_pipe_la_LDFLAGS) $(libvfs_pipe_la_OBJECTS) $(libvfs_pipe_la_LIBADD) $(LIBS) ! ! libvfs-translate.la: $(libvfs_translate_la_OBJECTS) $(libvfs_translate_la_DEPENDENCIES) ! $(LINK) -rpath $(modulesdir) $(libvfs_translate_la_LDFLAGS) $(libvfs_translate_la_OBJECTS) $(libvfs_translate_la_LIBADD) $(LIBS) ! ! libcdemenu-desktop.la: $(libcdemenu_desktop_la_OBJECTS) $(libcdemenu_desktop_la_DEPENDENCIES) ! $(LINK) -rpath $(modulesdir) $(libcdemenu_desktop_la_LDFLAGS) $(libcdemenu_desktop_la_OBJECTS) $(libcdemenu_desktop_la_LIBADD) $(LIBS) ! ! libssh.la: $(libssh_la_OBJECTS) $(libssh_la_DEPENDENCIES) ! $(LINK) -rpath $(modulesdir) $(libssh_la_LDFLAGS) $(libssh_la_OBJECTS) $(libssh_la_LIBADD) $(LIBS) ! ! libtar.la: $(libtar_la_OBJECTS) $(libtar_la_DEPENDENCIES) ! $(LINK) -rpath $(modulesdir) $(libtar_la_LDFLAGS) $(libtar_la_OBJECTS) $(libtar_la_LIBADD) $(LIBS) ! install-modulesconfDATA: $(modulesconf_DATA) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(modulesconfdir) @list='$(modulesconf_DATA)'; for p in $$list; do \ ! if test -f $(srcdir)/$$p; then \ ! echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(modulesconfdir)/$$p"; \ ! $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(modulesconfdir)/$$p; \ ! else if test -f $$p; then \ ! echo " $(INSTALL_DATA) $$p $(DESTDIR)$(modulesconfdir)/$$p"; \ ! $(INSTALL_DATA) $$p $(DESTDIR)$(modulesconfdir)/$$p; \ ! fi; fi; \ done uninstall-modulesconfDATA: @$(NORMAL_UNINSTALL) ! list='$(modulesconf_DATA)'; for p in $$list; do \ ! rm -f $(DESTDIR)$(modulesconfdir)/$$p; \ done # This directory's subdirectories are mostly independent; you can cd --- 580,604 ---- -rm -rf .libs _libs distclean-libtool: ! -rm -f libtool ! uninstall-info-am: ! modulesconfDATA_INSTALL = $(INSTALL_DATA) install-modulesconfDATA: $(modulesconf_DATA) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(modulesconfdir) @list='$(modulesconf_DATA)'; for p in $$list; do \ ! if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ ! f="`echo $$p | sed -e 's|^.*/||'`"; \ ! echo " $(modulesconfDATA_INSTALL) $$d$$p $(DESTDIR)$(modulesconfdir)/$$f"; \ ! $(modulesconfDATA_INSTALL) $$d$$p $(DESTDIR)$(modulesconfdir)/$$f; \ done uninstall-modulesconfDATA: @$(NORMAL_UNINSTALL) ! @list='$(modulesconf_DATA)'; for p in $$list; do \ ! f="`echo $$p | sed -e 's|^.*/||'`"; \ ! echo " rm -f $(DESTDIR)$(modulesconfdir)/$$f"; \ ! rm -f $(DESTDIR)$(modulesconfdir)/$$f; \ done # This directory's subdirectories are mostly independent; you can cd *************** *** 545,557 **** # (1) if the variable is set in `config.status', edit `config.status' # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. ! ! @SET_MAKE@ ! ! all-recursive install-data-recursive install-exec-recursive \ ! installdirs-recursive install-recursive uninstall-recursive \ ! check-recursive installcheck-recursive info-recursive dvi-recursive: ! @set fnord $(MAKEFLAGS); amf=$$2; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ list='$(SUBDIRS)'; for subdir in $$list; do \ --- 607,614 ---- # (1) if the variable is set in `config.status', edit `config.status' # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. ! $(RECURSIVE_TARGETS): ! @set fnord $$MAKEFLAGS; amf=$$2; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ list='$(SUBDIRS)'; for subdir in $$list; do \ *************** *** 571,583 **** mostlyclean-recursive clean-recursive distclean-recursive \ maintainer-clean-recursive: ! @set fnord $(MAKEFLAGS); amf=$$2; \ dot_seen=no; \ ! rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \ ! rev="$$subdir $$rev"; \ ! test "$$subdir" != "." || dot_seen=yes; \ done; \ ! test "$$dot_seen" = "no" && rev=". $$rev"; \ target=`echo $@ | sed s/-recursive//`; \ for subdir in $$rev; do \ echo "Making $$target in $$subdir"; \ --- 628,645 ---- mostlyclean-recursive clean-recursive distclean-recursive \ maintainer-clean-recursive: ! @set fnord $$MAKEFLAGS; amf=$$2; \ dot_seen=no; \ ! case "$@" in \ ! distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ ! *) list='$(SUBDIRS)' ;; \ ! esac; \ ! rev=''; for subdir in $$list; do \ ! if test "$$subdir" = "."; then :; else \ ! rev="$$subdir $$rev"; \ ! fi; \ done; \ ! rev="$$rev ."; \ target=`echo $@ | sed s/-recursive//`; \ for subdir in $$rev; do \ echo "Making $$target in $$subdir"; \ *************** *** 593,1039 **** list='$(SUBDIRS)'; for subdir in $$list; do \ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ done tags: TAGS ! ID: $(HEADERS) $(SOURCES) $(LISP) ! list='$(SOURCES) $(HEADERS)'; \ ! unique=`for i in $$list; do echo $$i; done | \ ! awk ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ ! here=`pwd` && cd $(srcdir) \ ! && mkid -f$$here/ID $$unique $(LISP) ! TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) tags=; \ here=`pwd`; \ list='$(SUBDIRS)'; for subdir in $$list; do \ ! if test "$$subdir" = .; then :; else \ test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \ ! fi; \ done; \ ! list='$(SOURCES) $(HEADERS)'; \ ! unique=`for i in $$list; do echo $$i; done | \ ! awk ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ ! test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ ! || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS) ! ! mostlyclean-tags: ! ! clean-tags: distclean-tags: ! -rm -f TAGS ID ! maintainer-clean-tags: ! ! distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) ! ! subdir = modules distdir: $(DISTFILES) ! @for file in $(DISTFILES); do \ ! d=$(srcdir); \ if test -d $$d/$$file; then \ ! cp -pr $$d/$$file $(distdir)/$$file; \ else \ test -f $(distdir)/$$file \ ! || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ ! || cp -p $$d/$$file $(distdir)/$$file || :; \ fi; \ done ! for subdir in $(SUBDIRS); do \ if test "$$subdir" = .; then :; else \ test -d $(distdir)/$$subdir \ || mkdir $(distdir)/$$subdir \ || exit 1; \ ! chmod 777 $(distdir)/$$subdir; \ ! (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(top_distdir) distdir=../$(distdir)/$$subdir distdir) \ || exit 1; \ fi; \ done - bzip2-method.lo bzip2-method.o : bzip2-method.c ../config.h \ - ../libgnomevfs/gnome-vfs-handle.h \ - ../libgnomevfs/gnome-vfs-context.h \ - ../libgnomevfs/gnome-vfs-cancellation.h \ - ../libgnomevfs/gnome-vfs-file-size.h \ - ../libgnomevfs/gnome-vfs-file-info.h \ - ../libgnomevfs/gnome-vfs-result.h \ - ../libgnomevfs/gnome-vfs-uri.h ../libgnomevfs/gnome-vfs-mime.h \ - ../libgnomevfs/gnome-vfs-module.h \ - ../libgnomevfs/gnome-vfs-method.h \ - ../libgnomevfs/gnome-vfs-find-directory.h \ - ../libgnomevfs/gnome-vfs-transform.h \ - ../libgnomevfs/gnome-vfs-monitor.h \ - ../libgnomevfs/gnome-vfs-ops.h - console-method.lo console-method.o : console-method.c ../config.h \ - ../libgnomevfs/gnome-vfs-cancellation.h \ - ../libgnomevfs/gnome-vfs-context.h \ - ../libgnomevfs/gnome-vfs-i18n.h \ - ../libgnomevfs/gnome-vfs-method.h \ - ../libgnomevfs/gnome-vfs-file-info.h \ - ../libgnomevfs/gnome-vfs-file-size.h \ - ../libgnomevfs/gnome-vfs-result.h \ - ../libgnomevfs/gnome-vfs-uri.h \ - ../libgnomevfs/gnome-vfs-find-directory.h \ - ../libgnomevfs/gnome-vfs-handle.h \ - ../libgnomevfs/gnome-vfs-transform.h \ - ../libgnomevfs/gnome-vfs-monitor.h \ - ../libgnomevfs/gnome-vfs-module-shared.h \ - ../libgnomevfs/gnome-vfs-module.h \ - ../libgnomevfs/gnome-vfs-utils.h - desktop-method.lo desktop-method.o : desktop-method.c ../config.h \ - ../libgnomevfs/gnome-vfs-mime.h ../libgnomevfs/gnome-vfs-uri.h \ - ../libgnomevfs/gnome-vfs-module.h \ - ../libgnomevfs/gnome-vfs-method.h \ - ../libgnomevfs/gnome-vfs-context.h \ - ../libgnomevfs/gnome-vfs-cancellation.h \ - ../libgnomevfs/gnome-vfs-file-info.h \ - ../libgnomevfs/gnome-vfs-file-size.h \ - ../libgnomevfs/gnome-vfs-result.h \ - ../libgnomevfs/gnome-vfs-find-directory.h \ - ../libgnomevfs/gnome-vfs-handle.h \ - ../libgnomevfs/gnome-vfs-transform.h \ - ../libgnomevfs/gnome-vfs-monitor.h \ - ../libgnomevfs/gnome-vfs-utils.h ../libgnomevfs/gnome-vfs-ops.h \ - ../libgnomevfs/gnome-vfs-module-shared.h \ - ../libgnomevfs/gnome-vfs-monitor-private.h - extfs-method.lo extfs-method.o : extfs-method.c ../config.h \ - ../libgnomevfs/gnome-vfs-cancellable-ops.h \ - ../libgnomevfs/gnome-vfs-directory.h \ - ../libgnomevfs/gnome-vfs-file-info.h \ - ../libgnomevfs/gnome-vfs-file-size.h \ - ../libgnomevfs/gnome-vfs-result.h \ - ../libgnomevfs/gnome-vfs-uri.h \ - ../libgnomevfs/gnome-vfs-find-directory.h \ - ../libgnomevfs/gnome-vfs-handle.h \ - ../libgnomevfs/gnome-vfs-context.h \ - ../libgnomevfs/gnome-vfs-cancellation.h \ - ../libgnomevfs/gnome-vfs-xfer.h ../libgnomevfs/gnome-vfs-mime.h \ - ../libgnomevfs/gnome-vfs-module-shared.h \ - ../libgnomevfs/gnome-vfs-module.h \ - ../libgnomevfs/gnome-vfs-method.h \ - ../libgnomevfs/gnome-vfs-transform.h \ - ../libgnomevfs/gnome-vfs-monitor.h \ - ../libgnomevfs/gnome-vfs-ops.h \ - ../libgnomevfs/gnome-vfs-parse-ls.h \ - ../libgnomevfs/gnome-vfs-private-utils.h \ - ../libgnomevfs/gnome-vfs-process.h - file-method.lo file-method.o : file-method.c ../config.h \ - ../libgnomevfs/gnome-vfs-cancellation.h \ - ../libgnomevfs/gnome-vfs-context.h \ - ../libgnomevfs/gnome-vfs-i18n.h \ - ../libgnomevfs/gnome-vfs-method.h \ - ../libgnomevfs/gnome-vfs-file-info.h \ - ../libgnomevfs/gnome-vfs-file-size.h \ - ../libgnomevfs/gnome-vfs-result.h \ - ../libgnomevfs/gnome-vfs-uri.h \ - ../libgnomevfs/gnome-vfs-find-directory.h \ - ../libgnomevfs/gnome-vfs-handle.h \ - ../libgnomevfs/gnome-vfs-transform.h \ - ../libgnomevfs/gnome-vfs-monitor.h \ - ../libgnomevfs/gnome-vfs-mime.h \ - ../libgnomevfs/gnome-vfs-module-shared.h \ - ../libgnomevfs/gnome-vfs-module.h \ - ../libgnomevfs/gnome-vfs-utils.h \ - ../libgnomevfs/gnome-vfs-monitor-private.h - fstype.lo fstype.o : fstype.c ../config.h - ftp-method.lo ftp-method.o : ftp-method.c ../config.h \ - ../libgnomevfs/gnome-vfs-context.h \ - ../libgnomevfs/gnome-vfs-cancellation.h \ - ../libgnomevfs/gnome-vfs-inet-connection.h \ - ../libgnomevfs/gnome-vfs-socket.h \ - ../libgnomevfs/gnome-vfs-file-size.h \ - ../libgnomevfs/gnome-vfs-result.h \ - ../libgnomevfs/gnome-vfs-socket-buffer.h \ - ../libgnomevfs/gnome-vfs-method.h \ - ../libgnomevfs/gnome-vfs-file-info.h \ - ../libgnomevfs/gnome-vfs-uri.h \ - ../libgnomevfs/gnome-vfs-find-directory.h \ - ../libgnomevfs/gnome-vfs-handle.h \ - ../libgnomevfs/gnome-vfs-transform.h \ - ../libgnomevfs/gnome-vfs-monitor.h \ - ../libgnomevfs/gnome-vfs-mime.h \ - ../libgnomevfs/gnome-vfs-mime-utils.h \ - ../libgnomevfs/gnome-vfs-module.h \ - ../libgnomevfs/gnome-vfs-module-shared.h \ - ../libgnomevfs/gnome-vfs-parse-ls.h \ - ../libgnomevfs/gnome-vfs-utils.h - gzip-method.lo gzip-method.o : gzip-method.c ../config.h \ - ../libgnomevfs/gnome-vfs-mime.h ../libgnomevfs/gnome-vfs-uri.h \ - ../libgnomevfs/gnome-vfs-module.h \ - ../libgnomevfs/gnome-vfs-method.h \ - ../libgnomevfs/gnome-vfs-context.h \ - ../libgnomevfs/gnome-vfs-cancellation.h \ - ../libgnomevfs/gnome-vfs-file-info.h \ - ../libgnomevfs/gnome-vfs-file-size.h \ - ../libgnomevfs/gnome-vfs-result.h \ - ../libgnomevfs/gnome-vfs-find-directory.h \ - ../libgnomevfs/gnome-vfs-handle.h \ - ../libgnomevfs/gnome-vfs-transform.h \ - ../libgnomevfs/gnome-vfs-monitor.h \ - ../libgnomevfs/gnome-vfs-ops.h - http-authn.lo http-authn.o : http-authn.c ../config.h http-authn.h \ - ../libgnomevfs/gnome-vfs-uri.h http-method.h \ - ../libgnomevfs/gnome-vfs-method.h \ - ../libgnomevfs/gnome-vfs-context.h \ - ../libgnomevfs/gnome-vfs-cancellation.h \ - ../libgnomevfs/gnome-vfs-file-info.h \ - ../libgnomevfs/gnome-vfs-file-size.h \ - ../libgnomevfs/gnome-vfs-result.h \ - ../libgnomevfs/gnome-vfs-find-directory.h \ - ../libgnomevfs/gnome-vfs-handle.h \ - ../libgnomevfs/gnome-vfs-transform.h \ - ../libgnomevfs/gnome-vfs-monitor.h \ - ../libgnomevfs/gnome-vfs-utils.h - http-cache.lo http-cache.o : http-cache.c ../config.h http-cache.h \ - ../libgnomevfs/gnome-vfs-file-info.h \ - ../libgnomevfs/gnome-vfs-file-size.h \ - ../libgnomevfs/gnome-vfs-result.h \ - ../libgnomevfs/gnome-vfs-uri.h http-method.h \ - ../libgnomevfs/gnome-vfs-method.h \ - ../libgnomevfs/gnome-vfs-context.h \ - ../libgnomevfs/gnome-vfs-cancellation.h \ - ../libgnomevfs/gnome-vfs-find-directory.h \ - ../libgnomevfs/gnome-vfs-handle.h \ - ../libgnomevfs/gnome-vfs-transform.h \ - ../libgnomevfs/gnome-vfs-monitor.h \ - ../libgnomevfs/gnome-vfs-utils.h - http-method.lo http-method.o : http-method.c ../config.h http-method.h \ - http-authn.h ../libgnomevfs/gnome-vfs-uri.h http-cache.h \ - ../libgnomevfs/gnome-vfs-file-info.h \ - ../libgnomevfs/gnome-vfs-file-size.h \ - ../libgnomevfs/gnome-vfs-result.h \ - ../libgnomevfs/gnome-vfs-inet-connection.h \ - ../libgnomevfs/gnome-vfs-cancellation.h \ - ../libgnomevfs/gnome-vfs-socket.h \ - ../libgnomevfs/gnome-vfs-socket-buffer.h \ - ../libgnomevfs/gnome-vfs-mime-sniff-buffer.h \ - ../libgnomevfs/gnome-vfs-handle.h \ - ../libgnomevfs/gnome-vfs-context.h \ - ../libgnomevfs/gnome-vfs-mime.h \ - ../libgnomevfs/gnome-vfs-module-callback-module-api.h \ - ../libgnomevfs/gnome-vfs-module.h \ - ../libgnomevfs/gnome-vfs-method.h \ - ../libgnomevfs/gnome-vfs-find-directory.h \ - ../libgnomevfs/gnome-vfs-transform.h \ - ../libgnomevfs/gnome-vfs-monitor.h \ - ../libgnomevfs/gnome-vfs-private-utils.h \ - ../libgnomevfs/gnome-vfs-process.h \ - ../libgnomevfs/gnome-vfs-ssl.h \ - ../libgnomevfs/gnome-vfs-standard-callbacks.h - nntp-method.lo nntp-method.o : nntp-method.c ../config.h \ - ../libgnomevfs/gnome-vfs-context.h \ - ../libgnomevfs/gnome-vfs-cancellation.h \ - ../libgnomevfs/gnome-vfs-socket-buffer.h \ - ../libgnomevfs/gnome-vfs-socket.h \ - ../libgnomevfs/gnome-vfs-file-size.h \ - ../libgnomevfs/gnome-vfs-result.h \ - ../libgnomevfs/gnome-vfs-inet-connection.h \ - ../libgnomevfs/gnome-vfs-method.h \ - ../libgnomevfs/gnome-vfs-file-info.h \ - ../libgnomevfs/gnome-vfs-uri.h \ - ../libgnomevfs/gnome-vfs-find-directory.h \ - ../libgnomevfs/gnome-vfs-handle.h \ - ../libgnomevfs/gnome-vfs-transform.h \ - ../libgnomevfs/gnome-vfs-monitor.h \ - ../libgnomevfs/gnome-vfs-module.h \ - ../libgnomevfs/gnome-vfs-module-shared.h \ - ../libgnomevfs/gnome-vfs-module-callback-module-api.h \ - ../libgnomevfs/gnome-vfs-standard-callbacks.h \ - ../libgnomevfs/gnome-vfs-mime.h \ - ../libgnomevfs/gnome-vfs-parse-ls.h \ - ../libgnomevfs/gnome-vfs-utils.h nntp-method.h - pipe-method.lo pipe-method.o : pipe-method.c ../config.h \ - ../libgnomevfs/gnome-vfs-cancellation.h \ - ../libgnomevfs/gnome-vfs-context.h \ - ../libgnomevfs/gnome-vfs-method.h \ - ../libgnomevfs/gnome-vfs-file-info.h \ - ../libgnomevfs/gnome-vfs-file-size.h \ - ../libgnomevfs/gnome-vfs-result.h \ - ../libgnomevfs/gnome-vfs-uri.h \ - ../libgnomevfs/gnome-vfs-find-directory.h \ - ../libgnomevfs/gnome-vfs-handle.h \ - ../libgnomevfs/gnome-vfs-transform.h \ - ../libgnomevfs/gnome-vfs-monitor.h \ - ../libgnomevfs/gnome-vfs-mime.h \ - ../libgnomevfs/gnome-vfs-mime-utils.h \ - ../libgnomevfs/gnome-vfs-module-shared.h \ - ../libgnomevfs/gnome-vfs-module.h \ - ../libgnomevfs/gnome-vfs-utils.h - ssh-method.lo ssh-method.o : ssh-method.c ../config.h \ - ../libgnomevfs/gnome-vfs-cancellation.h \ - ../libgnomevfs/gnome-vfs-context.h \ - ../libgnomevfs/gnome-vfs-mime.h ../libgnomevfs/gnome-vfs-uri.h \ - ../libgnomevfs/gnome-vfs-module-shared.h \ - ../libgnomevfs/gnome-vfs-file-info.h \ - ../libgnomevfs/gnome-vfs-file-size.h \ - ../libgnomevfs/gnome-vfs-result.h \ - ../libgnomevfs/gnome-vfs-module.h \ - ../libgnomevfs/gnome-vfs-method.h \ - ../libgnomevfs/gnome-vfs-find-directory.h \ - ../libgnomevfs/gnome-vfs-handle.h \ - ../libgnomevfs/gnome-vfs-transform.h \ - ../libgnomevfs/gnome-vfs-monitor.h \ - ../libgnomevfs/gnome-vfs-parse-ls.h \ - ../libgnomevfs/gnome-vfs-utils.h - tar-method.lo tar-method.o : tar-method.c \ - ../libgnomevfs/gnome-vfs-method.h \ - ../libgnomevfs/gnome-vfs-context.h \ - ../libgnomevfs/gnome-vfs-cancellation.h \ - ../libgnomevfs/gnome-vfs-file-info.h \ - ../libgnomevfs/gnome-vfs-file-size.h \ - ../libgnomevfs/gnome-vfs-result.h \ - ../libgnomevfs/gnome-vfs-uri.h \ - ../libgnomevfs/gnome-vfs-find-directory.h \ - ../libgnomevfs/gnome-vfs-handle.h \ - ../libgnomevfs/gnome-vfs-transform.h \ - ../libgnomevfs/gnome-vfs-monitor.h \ - ../libgnomevfs/gnome-vfs-mime.h \ - ../libgnomevfs/gnome-vfs-mime-utils.h \ - ../libgnomevfs/gnome-vfs-module.h ../libgnomevfs/gnome-vfs.h \ - ../libgnomevfs/gnome-vfs-async-ops.h \ - ../libgnomevfs/gnome-vfs-xfer.h \ - ../libgnomevfs/gnome-vfs-directory.h \ - ../libgnomevfs/gnome-vfs-init.h \ - ../libgnomevfs/gnome-vfs-module-callback.h \ - ../libgnomevfs/gnome-vfs-ops.h ../libgnomevfs/gnome-vfs-utils.h \ - tarpet.h - test-method.lo test-method.o : test-method.c ../config.h \ - ../libgnomevfs/gnome-vfs-cancellable-ops.h \ - ../libgnomevfs/gnome-vfs-directory.h \ - ../libgnomevfs/gnome-vfs-file-info.h \ - ../libgnomevfs/gnome-vfs-file-size.h \ - ../libgnomevfs/gnome-vfs-result.h \ - ../libgnomevfs/gnome-vfs-uri.h \ - ../libgnomevfs/gnome-vfs-find-directory.h \ - ../libgnomevfs/gnome-vfs-handle.h \ - ../libgnomevfs/gnome-vfs-context.h \ - ../libgnomevfs/gnome-vfs-cancellation.h \ - ../libgnomevfs/gnome-vfs-xfer.h ../libgnomevfs/gnome-vfs-ops.h \ - ../libgnomevfs/gnome-vfs-monitor.h \ - ../libgnomevfs/gnome-vfs-i18n.h \ - ../libgnomevfs/gnome-vfs-module.h \ - ../libgnomevfs/gnome-vfs-method.h \ - ../libgnomevfs/gnome-vfs-transform.h - translate-method.lo translate-method.o : translate-method.c ../config.h \ - ../libgnomevfs/gnome-vfs-method.h \ - ../libgnomevfs/gnome-vfs-context.h \ - ../libgnomevfs/gnome-vfs-cancellation.h \ - ../libgnomevfs/gnome-vfs-file-info.h \ - ../libgnomevfs/gnome-vfs-file-size.h \ - ../libgnomevfs/gnome-vfs-result.h \ - ../libgnomevfs/gnome-vfs-uri.h \ - ../libgnomevfs/gnome-vfs-find-directory.h \ - ../libgnomevfs/gnome-vfs-handle.h \ - ../libgnomevfs/gnome-vfs-transform.h \ - ../libgnomevfs/gnome-vfs-monitor.h \ - ../libgnomevfs/gnome-vfs-mime.h \ - ../libgnomevfs/gnome-vfs-mime-utils.h \ - ../libgnomevfs/gnome-vfs-module.h \ - ../libgnomevfs/gnome-vfs-private-utils.h \ - ../libgnomevfs/gnome-vfs-process.h - vfolder-desktop-method.lo vfolder-desktop-method.o : \ - vfolder-desktop-method.c ../config.h \ - ../libgnomevfs/gnome-vfs-mime.h ../libgnomevfs/gnome-vfs-uri.h \ - ../libgnomevfs/gnome-vfs-module.h \ - ../libgnomevfs/gnome-vfs-method.h \ - ../libgnomevfs/gnome-vfs-context.h \ - ../libgnomevfs/gnome-vfs-cancellation.h \ - ../libgnomevfs/gnome-vfs-file-info.h \ - ../libgnomevfs/gnome-vfs-file-size.h \ - ../libgnomevfs/gnome-vfs-result.h \ - ../libgnomevfs/gnome-vfs-find-directory.h \ - ../libgnomevfs/gnome-vfs-handle.h \ - ../libgnomevfs/gnome-vfs-transform.h \ - ../libgnomevfs/gnome-vfs-monitor.h \ - ../libgnomevfs/gnome-vfs-utils.h ../libgnomevfs/gnome-vfs-ops.h \ - ../libgnomevfs/gnome-vfs-module-shared.h \ - ../libgnomevfs/gnome-vfs-monitor-private.h - - info-am: - info: info-recursive - dvi-am: - dvi: dvi-recursive check-am: all-am check: check-recursive ! installcheck-am: ! installcheck: installcheck-recursive ! install-exec-am: ! install-exec: install-exec-recursive ! install-data-am: install-modulesLTLIBRARIES install-modulesconfDATA install-data: install-data-recursive install-am: all-am @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - install: install-recursive - uninstall-am: uninstall-modulesLTLIBRARIES uninstall-modulesconfDATA - uninstall: uninstall-recursive - all-am: Makefile $(LTLIBRARIES) $(DATA) - all-redirect: all-recursive - install-strip: - $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install - installdirs: installdirs-recursive - installdirs-am: - $(mkinstalldirs) $(DESTDIR)$(modulesdir) $(DESTDIR)$(modulesconfdir) - mostlyclean-generic: clean-generic: distclean-generic: -rm -f Makefile $(CONFIG_CLEAN_FILES) - -rm -f config.cache config.log stamp-h stamp-h[0-9]* maintainer-clean-generic: ! mostlyclean-am: mostlyclean-modulesLTLIBRARIES mostlyclean-compile \ ! mostlyclean-libtool mostlyclean-tags \ ! mostlyclean-generic ! mostlyclean: mostlyclean-recursive ! clean-am: clean-modulesLTLIBRARIES clean-compile clean-libtool \ ! clean-tags clean-generic mostlyclean-am ! clean: clean-recursive ! distclean-am: distclean-modulesLTLIBRARIES distclean-compile \ ! distclean-libtool distclean-tags distclean-generic \ ! clean-am ! -rm -f libtool ! distclean: distclean-recursive ! maintainer-clean-am: maintainer-clean-modulesLTLIBRARIES \ ! maintainer-clean-compile maintainer-clean-libtool \ ! maintainer-clean-tags maintainer-clean-generic \ ! distclean-am ! @echo "This command is intended for maintainers to use;" ! @echo "it deletes files that may require special tools to rebuild." maintainer-clean: maintainer-clean-recursive ! .PHONY: mostlyclean-modulesLTLIBRARIES distclean-modulesLTLIBRARIES \ ! clean-modulesLTLIBRARIES maintainer-clean-modulesLTLIBRARIES \ ! uninstall-modulesLTLIBRARIES install-modulesLTLIBRARIES \ ! mostlyclean-compile distclean-compile clean-compile \ ! maintainer-clean-compile mostlyclean-libtool distclean-libtool \ ! clean-libtool maintainer-clean-libtool uninstall-modulesconfDATA \ ! install-modulesconfDATA install-data-recursive uninstall-data-recursive \ ! install-exec-recursive uninstall-exec-recursive installdirs-recursive \ ! uninstalldirs-recursive all-recursive check-recursive \ ! installcheck-recursive info-recursive dvi-recursive \ ! mostlyclean-recursive distclean-recursive clean-recursive \ ! maintainer-clean-recursive tags tags-recursive mostlyclean-tags \ ! distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ ! dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ ! install-exec install-data-am install-data install-am install \ ! uninstall-am uninstall all-redirect all-am all installdirs-am \ ! installdirs mostlyclean-generic distclean-generic clean-generic \ ! maintainer-clean-generic clean mostlyclean distclean maintainer-clean #if HAVE_LIBEFS --- 655,868 ---- list='$(SUBDIRS)'; for subdir in $$list; do \ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ done + ctags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ + test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ + done + + ETAGS = etags + ETAGSFLAGS = + + CTAGS = ctags + CTAGSFLAGS = tags: TAGS ! ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) ! list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ ! unique=`for i in $$list; do \ ! if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ ! done | \ ! $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ ! mkid -fID $$unique ! TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ ! $(TAGS_FILES) $(LISP) tags=; \ here=`pwd`; \ list='$(SUBDIRS)'; for subdir in $$list; do \ ! if test "$$subdir" = .; then :; else \ test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \ ! fi; \ done; \ ! list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ ! unique=`for i in $$list; do \ ! if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ ! done | \ ! $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ ! test -z "$(ETAGS_ARGS)$$tags$$unique" \ ! || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ! $$tags $$unique ! ! ctags: CTAGS ! CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ ! $(TAGS_FILES) $(LISP) ! tags=; \ ! here=`pwd`; \ ! list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ ! unique=`for i in $$list; do \ ! if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ ! done | \ ! $(AWK) ' { files[$$0] = 1; } \ ! END { for (i in files) print i; }'`; \ ! test -z "$(CTAGS_ARGS)$$tags$$unique" \ ! || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ ! $$tags $$unique ! ! GTAGS: ! here=`$(am__cd) $(top_builddir) && pwd` \ ! && cd $(top_srcdir) \ ! && gtags -i $(GTAGS_ARGS) $$here distclean-tags: ! -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags ! DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ! top_distdir = .. ! distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) ! @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ ! topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ ! list='$(DISTFILES)'; for file in $$list; do \ ! case $$file in \ ! $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ ! $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ ! esac; \ ! if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ ! dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ ! if test "$$dir" != "$$file" && test "$$dir" != "."; then \ ! dir="/$$dir"; \ ! $(mkinstalldirs) "$(distdir)$$dir"; \ ! else \ ! dir=''; \ ! fi; \ if test -d $$d/$$file; then \ ! if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ ! cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ ! fi; \ ! cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ else \ test -f $(distdir)/$$file \ ! || cp -p $$d/$$file $(distdir)/$$file \ ! || exit 1; \ fi; \ done ! list='$(SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ test -d $(distdir)/$$subdir \ || mkdir $(distdir)/$$subdir \ || exit 1; \ ! (cd $$subdir && \ ! $(MAKE) $(AM_MAKEFLAGS) \ ! top_distdir="$(top_distdir)" \ ! distdir=../$(distdir)/$$subdir \ ! distdir) \ || exit 1; \ fi; \ done check-am: all-am check: check-recursive ! all-am: Makefile $(LTLIBRARIES) $(DATA) ! installdirs: installdirs-recursive ! installdirs-am: ! $(mkinstalldirs) $(DESTDIR)$(modulesdir) $(DESTDIR)$(modulesconfdir) ! install: install-recursive ! install-exec: install-exec-recursive install-data: install-data-recursive + uninstall: uninstall-recursive install-am: all-am @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + installcheck: installcheck-recursive + install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: clean-generic: distclean-generic: -rm -f Makefile $(CONFIG_CLEAN_FILES) maintainer-clean-generic: ! @echo "This command is intended for maintainers to use" ! @echo "it deletes files that may require special tools to rebuild." ! clean: clean-recursive ! clean-am: clean-generic clean-libtool clean-modulesLTLIBRARIES \ ! mostlyclean-am ! distclean: distclean-recursive ! distclean-am: clean-am distclean-compile distclean-generic \ ! distclean-libtool distclean-tags ! dvi: dvi-recursive ! dvi-am: ! info: info-recursive ! ! info-am: ! ! install-data-am: install-modulesLTLIBRARIES install-modulesconfDATA ! ! install-exec-am: ! ! install-info: install-info-recursive ! ! install-man: ! ! installcheck-am: maintainer-clean: maintainer-clean-recursive ! maintainer-clean-am: distclean-am maintainer-clean-generic ! ! mostlyclean: mostlyclean-recursive ! ! mostlyclean-am: mostlyclean-compile mostlyclean-generic \ ! mostlyclean-libtool ! ! pdf: pdf-recursive ! ! pdf-am: ! ! ps: ps-recursive ! ! ps-am: ! ! uninstall-am: uninstall-info-am uninstall-modulesLTLIBRARIES \ ! uninstall-modulesconfDATA ! ! uninstall-info: uninstall-info-recursive ! ! .PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \ ! clean-generic clean-libtool clean-modulesLTLIBRARIES \ ! clean-recursive ctags ctags-recursive distclean \ ! distclean-compile distclean-generic distclean-libtool \ ! distclean-recursive distclean-tags distdir dvi dvi-am \ ! dvi-recursive info info-am info-recursive install install-am \ ! install-data install-data-am install-data-recursive \ ! install-exec install-exec-am install-exec-recursive \ ! install-info install-info-am install-info-recursive install-man \ ! install-modulesLTLIBRARIES install-modulesconfDATA \ ! install-recursive install-strip installcheck installcheck-am \ ! installdirs installdirs-am installdirs-recursive \ ! maintainer-clean maintainer-clean-generic \ ! maintainer-clean-recursive mostlyclean mostlyclean-compile \ ! mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \ ! pdf pdf-am pdf-recursive ps ps-am ps-recursive tags \ ! tags-recursive uninstall uninstall-am uninstall-info-am \ ! uninstall-info-recursive uninstall-modulesLTLIBRARIES \ ! uninstall-modulesconfDATA uninstall-recursive #if HAVE_LIBEFS *************** *** 1044,1050 **** # efs-method.c #libvefs_la_LIBADD = $(LIBEFS_LIBS) $(MODULES_LIBS) #endif - # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: --- 873,878 ---- diff -crN ./gnome-vfs/modules/extfs/Makefile.in /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/modules/extfs/Makefile.in *** ./gnome-vfs/modules/extfs/Makefile.in Mon Sep 8 14:19:44 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/modules/extfs/Makefile.in Thu Dec 18 21:13:11 2003 *************** *** 1,6 **** ! # Makefile.in generated automatically by automake 1.4-p6 from Makefile.am ! # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. --- 1,8 ---- ! # Makefile.in generated by automake 1.7.1 from Makefile.am. ! # @configure_input@ ! # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 ! # Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. *************** *** 10,87 **** # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. ! ! SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ - prefix = @prefix@ - exec_prefix = @exec_prefix@ - - bindir = @bindir@ - sbindir = @sbindir@ - libexecdir = @libexecdir@ - datadir = @datadir@ - sysconfdir = @sysconfdir@ - sharedstatedir = @sharedstatedir@ - localstatedir = @localstatedir@ - libdir = @libdir@ - infodir = @infodir@ - mandir = @mandir@ - includedir = @includedir@ - oldincludedir = /usr/include - - DESTDIR = - pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ - top_builddir = ../.. ! ACLOCAL = @ACLOCAL@ ! AUTOCONF = @AUTOCONF@ ! AUTOMAKE = @AUTOMAKE@ ! AUTOHEADER = @AUTOHEADER@ ! INSTALL = @INSTALL@ ! INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) ! INSTALL_DATA = @INSTALL_DATA@ ! INSTALL_SCRIPT = @INSTALL_SCRIPT@ ! transform = @program_transform_name@ ! NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : - host_alias = @host_alias@ host_triplet = @host@ ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ ! AS = @AS@ AWK = @AWK@ BONOBO_ACTIVATION_REQUIRED = @BONOBO_ACTIVATION_REQUIRED@ BONOBO_IDLDIR = @BONOBO_IDLDIR@ BONOBO_REQUIRED = @BONOBO_REQUIRED@ BZ2_LIBS = @BZ2_LIBS@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ CFLAGS = @CFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ ! CXX = @CXX@ DATADIRNAME = @DATADIRNAME@ DB2HTML = @DB2HTML@ ! DLLTOOL = @DLLTOOL@ ECHO = @ECHO@ ENABLE_PROFILER = @ENABLE_PROFILER@ EXEEXT = @EXEEXT@ FAM_LIBS = @FAM_LIBS@ GCONFTOOL = @GCONFTOOL@ GCONF_REQUIRED = @GCONF_REQUIRED@ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ --- 12,85 ---- # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. ! @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = ../.. ! am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ ! install_sh_DATA = $(install_sh) -c -m 644 ! install_sh_PROGRAM = $(install_sh) -c ! install_sh_SCRIPT = $(install_sh) -c ! INSTALL_HEADER = $(INSTALL_DATA) ! transform = $(program_transform_name) NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : host_triplet = @host@ + ACLOCAL = @ACLOCAL@ ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ ! ALLOCA = @ALLOCA@ ! AMDEP_FALSE = @AMDEP_FALSE@ ! AMDEP_TRUE = @AMDEP_TRUE@ ! AMTAR = @AMTAR@ ! AUTOCONF = @AUTOCONF@ ! AUTOHEADER = @AUTOHEADER@ ! AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BONOBO_ACTIVATION_REQUIRED = @BONOBO_ACTIVATION_REQUIRED@ BONOBO_IDLDIR = @BONOBO_IDLDIR@ BONOBO_REQUIRED = @BONOBO_REQUIRED@ + BUILD_CDEMENU_MODULE_FALSE = @BUILD_CDEMENU_MODULE_FALSE@ + BUILD_CDEMENU_MODULE_TRUE = @BUILD_CDEMENU_MODULE_TRUE@ BZ2_LIBS = @BZ2_LIBS@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ + CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ ! CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ DB2HTML = @DB2HTML@ ! DEFS = @DEFS@ ! DEPDIR = @DEPDIR@ ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ + ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ + ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ENABLE_PROFILER = @ENABLE_PROFILER@ + ENABLE_PROFILER_FALSE = @ENABLE_PROFILER_FALSE@ + ENABLE_PROFILER_TRUE = @ENABLE_PROFILER_TRUE@ EXEEXT = @EXEEXT@ FAM_LIBS = @FAM_LIBS@ GCONFTOOL = @GCONFTOOL@ GCONF_REQUIRED = @GCONF_REQUIRED@ + GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ + GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ *************** *** 90,99 **** --- 88,114 ---- GMSGFMT = @GMSGFMT@ GNOME_ACLOCAL_DIR = @GNOME_ACLOCAL_DIR@ GNOME_ACLOCAL_FLAGS = @GNOME_ACLOCAL_FLAGS@ + GNOME_INTERFACE_VERSION = @GNOME_INTERFACE_VERSION@ GNOME_VFS_DIR = @GNOME_VFS_DIR@ GTKDOC = @GTKDOC@ + HAVE_CDDA_FALSE = @HAVE_CDDA_FALSE@ + HAVE_CDDA_TRUE = @HAVE_CDDA_TRUE@ + HAVE_DOCBOOK_FALSE = @HAVE_DOCBOOK_FALSE@ + HAVE_DOCBOOK_TRUE = @HAVE_DOCBOOK_TRUE@ HAVE_GTK_DOC = @HAVE_GTK_DOC@ + HAVE_GTK_DOC_FALSE = @HAVE_GTK_DOC_FALSE@ + HAVE_GTK_DOC_TRUE = @HAVE_GTK_DOC_TRUE@ + HAVE_LIBEFS_FALSE = @HAVE_LIBEFS_FALSE@ + HAVE_LIBEFS_TRUE = @HAVE_LIBEFS_TRUE@ + HAVE_SSL_FALSE = @HAVE_SSL_FALSE@ + HAVE_SSL_TRUE = @HAVE_SSL_TRUE@ HTML_DIR = @HTML_DIR@ + INSIDE_GNOME_DOCU_FALSE = @INSIDE_GNOME_DOCU_FALSE@ + INSIDE_GNOME_DOCU_TRUE = @INSIDE_GNOME_DOCU_TRUE@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ + INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLLIBS = @INTLLIBS@ INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@ *************** *** 127,135 **** --- 142,154 ---- LIBGNUTLS_CONFIG = @LIBGNUTLS_CONFIG@ LIBGNUTLS_LIBS = @LIBGNUTLS_LIBS@ LIBIDL_REQUIRED = @LIBIDL_REQUIRED@ + LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ + MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ + MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MKINSTALLDIRS = @MKINSTALLDIRS@ MODULES_CFLAGS = @MODULES_CFLAGS@ *************** *** 144,161 **** MODULES_XML_LIBS = @MODULES_XML_LIBS@ MONIKERS_CFLAGS = @MONIKERS_CFLAGS@ MONIKERS_LIBS = @MONIKERS_LIBS@ ! OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ ORBIT_IDL = @ORBIT_IDL@ ORBIT_REQUIRED = @ORBIT_REQUIRED@ PACKAGE = @PACKAGE@ PKG_CONFIG = @PKG_CONFIG@ POFILES = @POFILES@ POPT_LIBS = @POPT_LIBS@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ RANLIB = @RANLIB@ STRIP = @STRIP@ TEST_CFLAGS = @TEST_CFLAGS@ TEST_LIBS = @TEST_LIBS@ --- 163,192 ---- MODULES_XML_LIBS = @MODULES_XML_LIBS@ MONIKERS_CFLAGS = @MONIKERS_CFLAGS@ MONIKERS_LIBS = @MONIKERS_LIBS@ ! MSGFMT = @MSGFMT@ OBJEXT = @OBJEXT@ + OPENSSL_CFLAGS = @OPENSSL_CFLAGS@ + OPENSSL_LIBS = @OPENSSL_LIBS@ ORBIT_IDL = @ORBIT_IDL@ ORBIT_REQUIRED = @ORBIT_REQUIRED@ PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ + PLATFORM_GNOME_2_FALSE = @PLATFORM_GNOME_2_FALSE@ + PLATFORM_GNOME_2_TRUE = @PLATFORM_GNOME_2_TRUE@ POFILES = @POFILES@ POPT_LIBS = @POPT_LIBS@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ RANLIB = @RANLIB@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ STRIP = @STRIP@ TEST_CFLAGS = @TEST_CFLAGS@ TEST_LIBS = @TEST_LIBS@ *************** *** 173,181 **** VFS_SIZE_IS = @VFS_SIZE_IS@ VFS_SIZE_PRINTF = @VFS_SIZE_PRINTF@ WARN_CFLAGS = @WARN_CFLAGS@ ! WARN_CXXFLAGS = @WARN_CXXFLAGS@ XML_REQUIRED = @XML_REQUIRED@ ! extfsdir = $(libdir)/vfs/2.0/extfs extfs_DATA = \ --- 204,245 ---- VFS_SIZE_IS = @VFS_SIZE_IS@ VFS_SIZE_PRINTF = @VFS_SIZE_PRINTF@ WARN_CFLAGS = @WARN_CFLAGS@ ! XGETTEXT = @XGETTEXT@ XML_REQUIRED = @XML_REQUIRED@ ! ac_ct_CC = @ac_ct_CC@ ! ac_ct_RANLIB = @ac_ct_RANLIB@ ! ac_ct_STRIP = @ac_ct_STRIP@ ! am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ ! am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ ! am__include = @am__include@ ! am__quote = @am__quote@ ! bindir = @bindir@ ! build = @build@ ! build_alias = @build_alias@ ! build_cpu = @build_cpu@ ! build_os = @build_os@ ! build_vendor = @build_vendor@ ! datadir = @datadir@ ! exec_prefix = @exec_prefix@ ! host = @host@ ! host_alias = @host_alias@ ! host_cpu = @host_cpu@ ! host_os = @host_os@ ! host_vendor = @host_vendor@ ! includedir = @includedir@ ! infodir = @infodir@ ! install_sh = @install_sh@ ! libdir = @libdir@ ! libexecdir = @libexecdir@ ! localstatedir = @localstatedir@ ! mandir = @mandir@ ! oldincludedir = @oldincludedir@ ! prefix = @prefix@ ! program_transform_name = @program_transform_name@ ! sbindir = @sbindir@ ! sharedstatedir = @sharedstatedir@ ! sysconfdir = @sysconfdir@ ! target_alias = @target_alias@ extfsdir = $(libdir)/vfs/2.0/extfs extfs_DATA = \ *************** *** 220,383 **** zip.in \ zoo.in mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ! CONFIG_HEADER = ../../config.h ! CONFIG_CLEAN_FILES = ar cpio deb lha rar zip zoo ! SCRIPTS = $(extfs_SCRIPTS) - DATA = $(extfs_DATA) - - DIST_COMMON = README Makefile.am Makefile.in ar.in cpio.in deb.in \ - lha.in rar.in zip.in zoo.in - - - DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) - - TAR = gtar - GZIP_ENV = --best - all: all-redirect .SUFFIXES: ! $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) ! cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps modules/extfs/Makefile ! ! Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ! cd $(top_builddir) \ ! && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status ! ar: $(top_builddir)/config.status ar.in ! cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status cpio: $(top_builddir)/config.status cpio.in ! cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status deb: $(top_builddir)/config.status deb.in ! cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status lha: $(top_builddir)/config.status lha.in ! cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status rar: $(top_builddir)/config.status rar.in ! cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status zip: $(top_builddir)/config.status zip.in ! cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status zoo: $(top_builddir)/config.status zoo.in ! cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status ! install-extfsSCRIPTS: $(extfs_SCRIPTS) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(extfsdir) @list='$(extfs_SCRIPTS)'; for p in $$list; do \ ! if test -f $$p; then \ ! echo " $(INSTALL_SCRIPT) $$p $(DESTDIR)$(extfsdir)/`echo $$p|sed '$(transform)'`"; \ ! $(INSTALL_SCRIPT) $$p $(DESTDIR)$(extfsdir)/`echo $$p|sed '$(transform)'`; \ ! else if test -f $(srcdir)/$$p; then \ ! echo " $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(extfsdir)/`echo $$p|sed '$(transform)'`"; \ ! $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(extfsdir)/`echo $$p|sed '$(transform)'`; \ ! else :; fi; fi; \ done uninstall-extfsSCRIPTS: @$(NORMAL_UNINSTALL) ! list='$(extfs_SCRIPTS)'; for p in $$list; do \ ! rm -f $(DESTDIR)$(extfsdir)/`echo $$p|sed '$(transform)'`; \ done install-extfsDATA: $(extfs_DATA) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(extfsdir) @list='$(extfs_DATA)'; for p in $$list; do \ ! if test -f $(srcdir)/$$p; then \ ! echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(extfsdir)/$$p"; \ ! $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(extfsdir)/$$p; \ ! else if test -f $$p; then \ ! echo " $(INSTALL_DATA) $$p $(DESTDIR)$(extfsdir)/$$p"; \ ! $(INSTALL_DATA) $$p $(DESTDIR)$(extfsdir)/$$p; \ ! fi; fi; \ done uninstall-extfsDATA: @$(NORMAL_UNINSTALL) ! list='$(extfs_DATA)'; for p in $$list; do \ ! rm -f $(DESTDIR)$(extfsdir)/$$p; \ done tags: TAGS TAGS: ! distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) ! subdir = modules/extfs distdir: $(DISTFILES) ! @for file in $(DISTFILES); do \ ! d=$(srcdir); \ if test -d $$d/$$file; then \ ! cp -pr $$d/$$file $(distdir)/$$file; \ else \ test -f $(distdir)/$$file \ ! || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ ! || cp -p $$d/$$file $(distdir)/$$file || :; \ fi; \ done - info-am: - info: info-am - dvi-am: - dvi: dvi-am check-am: all-am check: check-am ! installcheck-am: ! installcheck: installcheck-am ! install-exec-am: ! install-exec: install-exec-am ! install-data-am: install-extfsSCRIPTS install-extfsDATA ! install-data: install-data-am - install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am install: install-am ! uninstall-am: uninstall-extfsSCRIPTS uninstall-extfsDATA uninstall: uninstall-am - all-am: Makefile $(SCRIPTS) $(DATA) - all-redirect: all-am - install-strip: - $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install - installdirs: - $(mkinstalldirs) $(DESTDIR)$(extfsdir) $(DESTDIR)$(extfsdir) mostlyclean-generic: clean-generic: distclean-generic: -rm -f Makefile $(CONFIG_CLEAN_FILES) - -rm -f config.cache config.log stamp-h stamp-h[0-9]* maintainer-clean-generic: ! mostlyclean-am: mostlyclean-generic ! mostlyclean: mostlyclean-am ! clean-am: clean-generic mostlyclean-am ! clean: clean-am ! distclean-am: distclean-generic clean-am ! -rm -f libtool ! distclean: distclean-am ! maintainer-clean-am: maintainer-clean-generic distclean-am ! @echo "This command is intended for maintainers to use;" ! @echo "it deletes files that may require special tools to rebuild." maintainer-clean: maintainer-clean-am ! .PHONY: uninstall-extfsSCRIPTS install-extfsSCRIPTS uninstall-extfsDATA \ ! install-extfsDATA tags distdir info-am info dvi-am dvi check check-am \ ! installcheck-am installcheck install-exec-am install-exec \ ! install-data-am install-data install-am install uninstall-am uninstall \ ! all-redirect all-am all installdirs mostlyclean-generic \ ! distclean-generic clean-generic maintainer-clean-generic clean \ ! mostlyclean distclean maintainer-clean # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. --- 284,496 ---- zip.in \ zoo.in + subdir = modules/extfs mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ! CONFIG_HEADER = $(top_builddir)/config.h ! CONFIG_CLEAN_FILES = ar cpio deb lha rar zip zoo ! SCRIPTS = $(extfs_SCRIPTS) ! ! depcomp = ! am__depfiles_maybe = ! DIST_SOURCES = ! DATA = $(extfs_DATA) ! ! DIST_COMMON = README Makefile.am Makefile.in ar.in cpio.in deb.in \ ! lha.in rar.in zip.in zoo.in ! all: all-am .SUFFIXES: ! $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) ! cd $(top_srcdir) && \ ! $(AUTOMAKE) --gnu --ignore-deps modules/extfs/Makefile ! Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status ! cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) ar: $(top_builddir)/config.status ar.in ! cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ cpio: $(top_builddir)/config.status cpio.in ! cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ deb: $(top_builddir)/config.status deb.in ! cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ lha: $(top_builddir)/config.status lha.in ! cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ rar: $(top_builddir)/config.status rar.in ! cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ zip: $(top_builddir)/config.status zip.in ! cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ zoo: $(top_builddir)/config.status zoo.in ! cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ ! extfsSCRIPT_INSTALL = $(INSTALL_SCRIPT) install-extfsSCRIPTS: $(extfs_SCRIPTS) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(extfsdir) @list='$(extfs_SCRIPTS)'; for p in $$list; do \ ! if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ ! if test -f $$d$$p; then \ ! f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ ! echo " $(extfsSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(extfsdir)/$$f"; \ ! $(extfsSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(extfsdir)/$$f; \ ! else :; fi; \ done uninstall-extfsSCRIPTS: @$(NORMAL_UNINSTALL) ! @list='$(extfs_SCRIPTS)'; for p in $$list; do \ ! f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ ! echo " rm -f $(DESTDIR)$(extfsdir)/$$f"; \ ! rm -f $(DESTDIR)$(extfsdir)/$$f; \ done + mostlyclean-libtool: + -rm -f *.lo + + clean-libtool: + -rm -rf .libs _libs + + distclean-libtool: + -rm -f libtool + uninstall-info-am: + extfsDATA_INSTALL = $(INSTALL_DATA) install-extfsDATA: $(extfs_DATA) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(extfsdir) @list='$(extfs_DATA)'; for p in $$list; do \ ! if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ ! f="`echo $$p | sed -e 's|^.*/||'`"; \ ! echo " $(extfsDATA_INSTALL) $$d$$p $(DESTDIR)$(extfsdir)/$$f"; \ ! $(extfsDATA_INSTALL) $$d$$p $(DESTDIR)$(extfsdir)/$$f; \ done uninstall-extfsDATA: @$(NORMAL_UNINSTALL) ! @list='$(extfs_DATA)'; for p in $$list; do \ ! f="`echo $$p | sed -e 's|^.*/||'`"; \ ! echo " rm -f $(DESTDIR)$(extfsdir)/$$f"; \ ! rm -f $(DESTDIR)$(extfsdir)/$$f; \ done tags: TAGS TAGS: + ctags: CTAGS + CTAGS: ! DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ! top_distdir = ../.. ! distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) ! @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ ! topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ ! list='$(DISTFILES)'; for file in $$list; do \ ! case $$file in \ ! $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ ! $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ ! esac; \ ! if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ ! dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ ! if test "$$dir" != "$$file" && test "$$dir" != "."; then \ ! dir="/$$dir"; \ ! $(mkinstalldirs) "$(distdir)$$dir"; \ ! else \ ! dir=''; \ ! fi; \ if test -d $$d/$$file; then \ ! if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ ! cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ ! fi; \ ! cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ else \ test -f $(distdir)/$$file \ ! || cp -p $$d/$$file $(distdir)/$$file \ ! || exit 1; \ fi; \ done check-am: all-am check: check-am ! all-am: Makefile $(SCRIPTS) $(DATA) ! installdirs: ! $(mkinstalldirs) $(DESTDIR)$(extfsdir) $(DESTDIR)$(extfsdir) install: install-am ! install-exec: install-exec-am ! install-data: install-data-am uninstall: uninstall-am + install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + installcheck: installcheck-am + install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: clean-generic: distclean-generic: -rm -f Makefile $(CONFIG_CLEAN_FILES) maintainer-clean-generic: ! @echo "This command is intended for maintainers to use" ! @echo "it deletes files that may require special tools to rebuild." ! clean: clean-am ! clean-am: clean-generic clean-libtool mostlyclean-am ! distclean: distclean-am ! distclean-am: clean-am distclean-generic distclean-libtool ! dvi: dvi-am ! dvi-am: ! info: info-am ! ! info-am: ! ! install-data-am: install-extfsDATA install-extfsSCRIPTS ! ! install-exec-am: ! ! install-info: install-info-am ! ! install-man: ! ! installcheck-am: maintainer-clean: maintainer-clean-am ! maintainer-clean-am: distclean-am maintainer-clean-generic ! ! mostlyclean: mostlyclean-am ! ! mostlyclean-am: mostlyclean-generic mostlyclean-libtool ! ! pdf: pdf-am ! ! pdf-am: ! ! ps: ps-am ! ! ps-am: ! ! uninstall-am: uninstall-extfsDATA uninstall-extfsSCRIPTS \ ! uninstall-info-am + .PHONY: all all-am check check-am clean clean-generic clean-libtool \ + distclean distclean-generic distclean-libtool distdir dvi \ + dvi-am info info-am install install-am install-data \ + install-data-am install-exec install-exec-am install-extfsDATA \ + install-extfsSCRIPTS install-info install-info-am install-man \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + uninstall uninstall-am uninstall-extfsDATA \ + uninstall-extfsSCRIPTS uninstall-info-am # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff -crN ./gnome-vfs/modules/vfolder/Makefile.in /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/modules/vfolder/Makefile.in *** ./gnome-vfs/modules/vfolder/Makefile.in Mon Sep 8 14:19:45 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/modules/vfolder/Makefile.in Thu Dec 18 21:13:12 2003 *************** *** 1,6 **** ! # Makefile.in generated automatically by automake 1.4-p6 from Makefile.am ! # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. --- 1,8 ---- ! # Makefile.in generated by automake 1.7.1 from Makefile.am. ! # @configure_input@ ! # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 ! # Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. *************** *** 10,87 **** # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. ! ! SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ - prefix = @prefix@ - exec_prefix = @exec_prefix@ - - bindir = @bindir@ - sbindir = @sbindir@ - libexecdir = @libexecdir@ - datadir = @datadir@ - sysconfdir = @sysconfdir@ - sharedstatedir = @sharedstatedir@ - localstatedir = @localstatedir@ - libdir = @libdir@ - infodir = @infodir@ - mandir = @mandir@ - includedir = @includedir@ - oldincludedir = /usr/include - - DESTDIR = - pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ - top_builddir = ../.. ! ACLOCAL = @ACLOCAL@ ! AUTOCONF = @AUTOCONF@ ! AUTOMAKE = @AUTOMAKE@ ! AUTOHEADER = @AUTOHEADER@ ! INSTALL = @INSTALL@ ! INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) ! INSTALL_DATA = @INSTALL_DATA@ ! INSTALL_SCRIPT = @INSTALL_SCRIPT@ ! transform = @program_transform_name@ ! NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : - host_alias = @host_alias@ host_triplet = @host@ ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ ! AS = @AS@ AWK = @AWK@ BONOBO_ACTIVATION_REQUIRED = @BONOBO_ACTIVATION_REQUIRED@ BONOBO_IDLDIR = @BONOBO_IDLDIR@ BONOBO_REQUIRED = @BONOBO_REQUIRED@ BZ2_LIBS = @BZ2_LIBS@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ CFLAGS = @CFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ ! CXX = @CXX@ DATADIRNAME = @DATADIRNAME@ DB2HTML = @DB2HTML@ ! DLLTOOL = @DLLTOOL@ ECHO = @ECHO@ ENABLE_PROFILER = @ENABLE_PROFILER@ EXEEXT = @EXEEXT@ FAM_LIBS = @FAM_LIBS@ GCONFTOOL = @GCONFTOOL@ GCONF_REQUIRED = @GCONF_REQUIRED@ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ --- 12,85 ---- # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. ! @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = ../.. ! am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ ! install_sh_DATA = $(install_sh) -c -m 644 ! install_sh_PROGRAM = $(install_sh) -c ! install_sh_SCRIPT = $(install_sh) -c ! INSTALL_HEADER = $(INSTALL_DATA) ! transform = $(program_transform_name) NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : host_triplet = @host@ + ACLOCAL = @ACLOCAL@ ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ ! ALLOCA = @ALLOCA@ ! AMDEP_FALSE = @AMDEP_FALSE@ ! AMDEP_TRUE = @AMDEP_TRUE@ ! AMTAR = @AMTAR@ ! AUTOCONF = @AUTOCONF@ ! AUTOHEADER = @AUTOHEADER@ ! AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BONOBO_ACTIVATION_REQUIRED = @BONOBO_ACTIVATION_REQUIRED@ BONOBO_IDLDIR = @BONOBO_IDLDIR@ BONOBO_REQUIRED = @BONOBO_REQUIRED@ + BUILD_CDEMENU_MODULE_FALSE = @BUILD_CDEMENU_MODULE_FALSE@ + BUILD_CDEMENU_MODULE_TRUE = @BUILD_CDEMENU_MODULE_TRUE@ BZ2_LIBS = @BZ2_LIBS@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ + CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ ! CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ DB2HTML = @DB2HTML@ ! DEFS = @DEFS@ ! DEPDIR = @DEPDIR@ ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ + ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ + ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ENABLE_PROFILER = @ENABLE_PROFILER@ + ENABLE_PROFILER_FALSE = @ENABLE_PROFILER_FALSE@ + ENABLE_PROFILER_TRUE = @ENABLE_PROFILER_TRUE@ EXEEXT = @EXEEXT@ FAM_LIBS = @FAM_LIBS@ GCONFTOOL = @GCONFTOOL@ GCONF_REQUIRED = @GCONF_REQUIRED@ + GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ + GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ *************** *** 90,99 **** --- 88,114 ---- GMSGFMT = @GMSGFMT@ GNOME_ACLOCAL_DIR = @GNOME_ACLOCAL_DIR@ GNOME_ACLOCAL_FLAGS = @GNOME_ACLOCAL_FLAGS@ + GNOME_INTERFACE_VERSION = @GNOME_INTERFACE_VERSION@ GNOME_VFS_DIR = @GNOME_VFS_DIR@ GTKDOC = @GTKDOC@ + HAVE_CDDA_FALSE = @HAVE_CDDA_FALSE@ + HAVE_CDDA_TRUE = @HAVE_CDDA_TRUE@ + HAVE_DOCBOOK_FALSE = @HAVE_DOCBOOK_FALSE@ + HAVE_DOCBOOK_TRUE = @HAVE_DOCBOOK_TRUE@ HAVE_GTK_DOC = @HAVE_GTK_DOC@ + HAVE_GTK_DOC_FALSE = @HAVE_GTK_DOC_FALSE@ + HAVE_GTK_DOC_TRUE = @HAVE_GTK_DOC_TRUE@ + HAVE_LIBEFS_FALSE = @HAVE_LIBEFS_FALSE@ + HAVE_LIBEFS_TRUE = @HAVE_LIBEFS_TRUE@ + HAVE_SSL_FALSE = @HAVE_SSL_FALSE@ + HAVE_SSL_TRUE = @HAVE_SSL_TRUE@ HTML_DIR = @HTML_DIR@ + INSIDE_GNOME_DOCU_FALSE = @INSIDE_GNOME_DOCU_FALSE@ + INSIDE_GNOME_DOCU_TRUE = @INSIDE_GNOME_DOCU_TRUE@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ + INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLLIBS = @INTLLIBS@ INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@ *************** *** 127,135 **** --- 142,154 ---- LIBGNUTLS_CONFIG = @LIBGNUTLS_CONFIG@ LIBGNUTLS_LIBS = @LIBGNUTLS_LIBS@ LIBIDL_REQUIRED = @LIBIDL_REQUIRED@ + LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ + MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ + MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MKINSTALLDIRS = @MKINSTALLDIRS@ MODULES_CFLAGS = @MODULES_CFLAGS@ *************** *** 144,161 **** MODULES_XML_LIBS = @MODULES_XML_LIBS@ MONIKERS_CFLAGS = @MONIKERS_CFLAGS@ MONIKERS_LIBS = @MONIKERS_LIBS@ ! OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ ORBIT_IDL = @ORBIT_IDL@ ORBIT_REQUIRED = @ORBIT_REQUIRED@ PACKAGE = @PACKAGE@ PKG_CONFIG = @PKG_CONFIG@ POFILES = @POFILES@ POPT_LIBS = @POPT_LIBS@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ RANLIB = @RANLIB@ STRIP = @STRIP@ TEST_CFLAGS = @TEST_CFLAGS@ TEST_LIBS = @TEST_LIBS@ --- 163,192 ---- MODULES_XML_LIBS = @MODULES_XML_LIBS@ MONIKERS_CFLAGS = @MONIKERS_CFLAGS@ MONIKERS_LIBS = @MONIKERS_LIBS@ ! MSGFMT = @MSGFMT@ OBJEXT = @OBJEXT@ + OPENSSL_CFLAGS = @OPENSSL_CFLAGS@ + OPENSSL_LIBS = @OPENSSL_LIBS@ ORBIT_IDL = @ORBIT_IDL@ ORBIT_REQUIRED = @ORBIT_REQUIRED@ PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ + PLATFORM_GNOME_2_FALSE = @PLATFORM_GNOME_2_FALSE@ + PLATFORM_GNOME_2_TRUE = @PLATFORM_GNOME_2_TRUE@ POFILES = @POFILES@ POPT_LIBS = @POPT_LIBS@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ RANLIB = @RANLIB@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ STRIP = @STRIP@ TEST_CFLAGS = @TEST_CFLAGS@ TEST_LIBS = @TEST_LIBS@ *************** *** 173,181 **** VFS_SIZE_IS = @VFS_SIZE_IS@ VFS_SIZE_PRINTF = @VFS_SIZE_PRINTF@ WARN_CFLAGS = @WARN_CFLAGS@ ! WARN_CXXFLAGS = @WARN_CXXFLAGS@ XML_REQUIRED = @XML_REQUIRED@ ! NULL = INCLUDES = \ --- 204,245 ---- VFS_SIZE_IS = @VFS_SIZE_IS@ VFS_SIZE_PRINTF = @VFS_SIZE_PRINTF@ WARN_CFLAGS = @WARN_CFLAGS@ ! XGETTEXT = @XGETTEXT@ XML_REQUIRED = @XML_REQUIRED@ ! ac_ct_CC = @ac_ct_CC@ ! ac_ct_RANLIB = @ac_ct_RANLIB@ ! ac_ct_STRIP = @ac_ct_STRIP@ ! am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ ! am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ ! am__include = @am__include@ ! am__quote = @am__quote@ ! bindir = @bindir@ ! build = @build@ ! build_alias = @build_alias@ ! build_cpu = @build_cpu@ ! build_os = @build_os@ ! build_vendor = @build_vendor@ ! datadir = @datadir@ ! exec_prefix = @exec_prefix@ ! host = @host@ ! host_alias = @host_alias@ ! host_cpu = @host_cpu@ ! host_os = @host_os@ ! host_vendor = @host_vendor@ ! includedir = @includedir@ ! infodir = @infodir@ ! install_sh = @install_sh@ ! libdir = @libdir@ ! libexecdir = @libexecdir@ ! localstatedir = @localstatedir@ ! mandir = @mandir@ ! oldincludedir = @oldincludedir@ ! prefix = @prefix@ ! program_transform_name = @program_transform_name@ ! sbindir = @sbindir@ ! sharedstatedir = @sharedstatedir@ ! sysconfdir = @sysconfdir@ ! target_alias = @target_alias@ NULL = INCLUDES = \ *************** *** 213,227 **** test-vfolder-modules.conf - ### Module setup module_flags = -export_dynamic -avoid-version -module -no-undefined modulesdir = $(libdir)/gnome-vfs-2.0/modules modules_LTLIBRARIES = libvfolder-desktop.la - ### `vfolder-desktop' method libvfolder_desktop_la_SOURCES = \ vfolder-info.c \ vfolder-util.c \ --- 277,291 ---- test-vfolder-modules.conf + ### Module setup module_flags = -export_dynamic -avoid-version -module -no-undefined modulesdir = $(libdir)/gnome-vfs-2.0/modules modules_LTLIBRARIES = libvfolder-desktop.la + ### `vfolder-desktop' method libvfolder_desktop_la_SOURCES = \ vfolder-info.c \ vfolder-util.c \ *************** *** 237,244 **** $(MODULES_XML_LIBS) - ### Default .vfolder-info files vfolderdir = $(sysconfdir)/gnome-vfs-2.0/vfolders vfolder_DATA = \ applications-all-users.vfolder-info \ --- 301,308 ---- $(MODULES_XML_LIBS) + ### Default .vfolder-info files vfolderdir = $(sysconfdir)/gnome-vfs-2.0/vfolders vfolder_DATA = \ applications-all-users.vfolder-info \ *************** *** 258,265 **** < $< > $@ - ### test-vfolder regression test noinst_PROGRAMS = test-vfolder noinst_DATA = test-vfolder-parent.vfolder-info test-vfolder.vfolder-info --- 322,329 ---- < $< > $@ + ### test-vfolder regression test noinst_PROGRAMS = test-vfolder noinst_DATA = test-vfolder-parent.vfolder-info test-vfolder.vfolder-info *************** *** 272,385 **** -DGNOME_VFS_MODULE_CONFIG_PATH=\"$(top_srcdir)/modules/vfolder\" - # TESTS = test-vfolder test_vfolder_SOURCES = test-vfolder.c test_vfolder_LDADD = $(top_builddir)/libgnomevfs/libgnomevfs-2.la mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ! CONFIG_HEADER = ../../config.h ! CONFIG_CLEAN_FILES = ! LTLIBRARIES = $(modules_LTLIBRARIES) ! ! ! DEFS = @DEFS@ -I. -I$(srcdir) -I../.. ! LIBS = @LIBS@ ! libvfolder_desktop_la_DEPENDENCIES = \ ! $(top_builddir)/libgnomevfs/libgnomevfs-2.la ! libvfolder_desktop_la_OBJECTS = vfolder-info.lo vfolder-util.lo \ ! vfolder-common.lo vfolder-method.lo ! noinst_PROGRAMS = test-vfolder$(EXEEXT) ! PROGRAMS = $(noinst_PROGRAMS) ! ! test_vfolder_OBJECTS = test-vfolder.$(OBJEXT) ! test_vfolder_DEPENDENCIES = \ ! $(top_builddir)/libgnomevfs/libgnomevfs-2.la ! test_vfolder_LDFLAGS = ! COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ! LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) ! LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ ! DATA = $(noinst_DATA) $(vfolder_DATA) ! ! DIST_COMMON = Makefile.am Makefile.in TODO ! ! DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) ! ! TAR = gtar ! GZIP_ENV = --best SOURCES = $(libvfolder_desktop_la_SOURCES) $(test_vfolder_SOURCES) - OBJECTS = $(libvfolder_desktop_la_OBJECTS) $(test_vfolder_OBJECTS) - - all: all-redirect - .SUFFIXES: - .SUFFIXES: .S .c .lo .o .obj .s - $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps modules/vfolder/Makefile ! Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ! cd $(top_builddir) \ ! && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status ! ! ! mostlyclean-modulesLTLIBRARIES: ! ! clean-modulesLTLIBRARIES: ! -test -z "$(modules_LTLIBRARIES)" || rm -f $(modules_LTLIBRARIES) ! ! distclean-modulesLTLIBRARIES: ! ! maintainer-clean-modulesLTLIBRARIES: install-modulesLTLIBRARIES: $(modules_LTLIBRARIES) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(modulesdir) @list='$(modules_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ ! echo "$(LIBTOOL) --mode=install $(INSTALL) $$p $(DESTDIR)$(modulesdir)/$$p"; \ ! $(LIBTOOL) --mode=install $(INSTALL) $$p $(DESTDIR)$(modulesdir)/$$p; \ else :; fi; \ done uninstall-modulesLTLIBRARIES: @$(NORMAL_UNINSTALL) ! list='$(modules_LTLIBRARIES)'; for p in $$list; do \ ! $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(modulesdir)/$$p; \ done ! .c.o: ! $(COMPILE) -c $< ! ! # FIXME: We should only use cygpath when building on Windows, ! # and only if it is available. ! .c.obj: ! $(COMPILE) -c `cygpath -w $<` ! ! .s.o: ! $(COMPILE) -c $< ! .S.o: ! $(COMPILE) -c $< mostlyclean-compile: ! -rm -f *.o core *.core ! -rm -f *.$(OBJEXT) ! ! clean-compile: distclean-compile: -rm -f *.tab.c ! maintainer-clean-compile: ! ! .c.lo: ! $(LIBTOOL) --mode=compile $(COMPILE) -c $< ! .s.lo: ! $(LIBTOOL) --mode=compile $(COMPILE) -c $< ! .S.lo: ! $(LIBTOOL) --mode=compile $(COMPILE) -c $< mostlyclean-libtool: -rm -f *.lo --- 336,444 ---- -DGNOME_VFS_MODULE_CONFIG_PATH=\"$(top_srcdir)/modules/vfolder\" + # TESTS = test-vfolder test_vfolder_SOURCES = test-vfolder.c test_vfolder_LDADD = $(top_builddir)/libgnomevfs/libgnomevfs-2.la + subdir = modules/vfolder mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ! CONFIG_HEADER = $(top_builddir)/config.h ! CONFIG_CLEAN_FILES = ! LTLIBRARIES = $(modules_LTLIBRARIES) ! ! libvfolder_desktop_la_DEPENDENCIES = \ ! $(top_builddir)/libgnomevfs/libgnomevfs-2.la ! am_libvfolder_desktop_la_OBJECTS = vfolder-info.lo vfolder-util.lo \ ! vfolder-common.lo vfolder-method.lo ! libvfolder_desktop_la_OBJECTS = $(am_libvfolder_desktop_la_OBJECTS) ! noinst_PROGRAMS = test-vfolder$(EXEEXT) ! PROGRAMS = $(noinst_PROGRAMS) ! ! am_test_vfolder_OBJECTS = test-vfolder.$(OBJEXT) ! test_vfolder_OBJECTS = $(am_test_vfolder_OBJECTS) ! test_vfolder_DEPENDENCIES = $(top_builddir)/libgnomevfs/libgnomevfs-2.la ! test_vfolder_LDFLAGS = ! ! DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ! depcomp = ! am__depfiles_maybe = ! COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ ! $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ! LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ ! $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) ! LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ! $(AM_LDFLAGS) $(LDFLAGS) -o $@ ! DIST_SOURCES = $(libvfolder_desktop_la_SOURCES) $(test_vfolder_SOURCES) ! DATA = $(noinst_DATA) $(vfolder_DATA) ! DIST_COMMON = Makefile.am Makefile.in TODO SOURCES = $(libvfolder_desktop_la_SOURCES) $(test_vfolder_SOURCES) ! all: all-am + .SUFFIXES: + .SUFFIXES: .c .lo .o .obj + $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu --ignore-deps modules/vfolder/Makefile + Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) + modulesLTLIBRARIES_INSTALL = $(INSTALL) install-modulesLTLIBRARIES: $(modules_LTLIBRARIES) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(modulesdir) @list='$(modules_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ ! f="`echo $$p | sed -e 's|^.*/||'`"; \ ! echo " $(LIBTOOL) --mode=install $(modulesLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(modulesdir)/$$f"; \ ! $(LIBTOOL) --mode=install $(modulesLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(modulesdir)/$$f; \ else :; fi; \ done uninstall-modulesLTLIBRARIES: @$(NORMAL_UNINSTALL) ! @list='$(modules_LTLIBRARIES)'; for p in $$list; do \ ! p="`echo $$p | sed -e 's|^.*/||'`"; \ ! echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(modulesdir)/$$p"; \ ! $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(modulesdir)/$$p; \ done ! clean-modulesLTLIBRARIES: ! -test -z "$(modules_LTLIBRARIES)" || rm -f $(modules_LTLIBRARIES) ! @list='$(modules_LTLIBRARIES)'; for p in $$list; do \ ! dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ ! test "$$dir" = "$$p" && dir=.; \ ! echo "rm -f \"$${dir}/so_locations\""; \ ! rm -f "$${dir}/so_locations"; \ ! done ! libvfolder-desktop.la: $(libvfolder_desktop_la_OBJECTS) $(libvfolder_desktop_la_DEPENDENCIES) ! $(LINK) -rpath $(modulesdir) $(libvfolder_desktop_la_LDFLAGS) $(libvfolder_desktop_la_OBJECTS) $(libvfolder_desktop_la_LIBADD) $(LIBS) ! clean-noinstPROGRAMS: ! @list='$(noinst_PROGRAMS)'; for p in $$list; do \ ! f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ ! echo " rm -f $$p $$f"; \ ! rm -f $$p $$f ; \ ! done ! test-vfolder$(EXEEXT): $(test_vfolder_OBJECTS) $(test_vfolder_DEPENDENCIES) ! @rm -f test-vfolder$(EXEEXT) ! $(LINK) $(test_vfolder_LDFLAGS) $(test_vfolder_OBJECTS) $(test_vfolder_LDADD) $(LIBS) mostlyclean-compile: ! -rm -f *.$(OBJEXT) core *.core distclean-compile: -rm -f *.tab.c ! .c.o: ! $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< ! .c.obj: ! $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'` ! .c.lo: ! $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< mostlyclean-libtool: -rm -f *.lo *************** *** 388,650 **** -rm -rf .libs _libs distclean-libtool: ! ! maintainer-clean-libtool: ! ! libvfolder-desktop.la: $(libvfolder_desktop_la_OBJECTS) $(libvfolder_desktop_la_DEPENDENCIES) ! $(LINK) -rpath $(modulesdir) $(libvfolder_desktop_la_LDFLAGS) $(libvfolder_desktop_la_OBJECTS) $(libvfolder_desktop_la_LIBADD) $(LIBS) ! ! mostlyclean-noinstPROGRAMS: ! ! clean-noinstPROGRAMS: ! -test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS) ! ! distclean-noinstPROGRAMS: ! ! maintainer-clean-noinstPROGRAMS: ! ! test-vfolder$(EXEEXT): $(test_vfolder_OBJECTS) $(test_vfolder_DEPENDENCIES) ! @rm -f test-vfolder$(EXEEXT) ! $(LINK) $(test_vfolder_LDFLAGS) $(test_vfolder_OBJECTS) $(test_vfolder_LDADD) $(LIBS) ! install-vfolderDATA: $(vfolder_DATA) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(vfolderdir) @list='$(vfolder_DATA)'; for p in $$list; do \ ! if test -f $(srcdir)/$$p; then \ ! echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(vfolderdir)/$$p"; \ ! $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(vfolderdir)/$$p; \ ! else if test -f $$p; then \ ! echo " $(INSTALL_DATA) $$p $(DESTDIR)$(vfolderdir)/$$p"; \ ! $(INSTALL_DATA) $$p $(DESTDIR)$(vfolderdir)/$$p; \ ! fi; fi; \ done uninstall-vfolderDATA: @$(NORMAL_UNINSTALL) ! list='$(vfolder_DATA)'; for p in $$list; do \ ! rm -f $(DESTDIR)$(vfolderdir)/$$p; \ done tags: TAGS ! ID: $(HEADERS) $(SOURCES) $(LISP) ! list='$(SOURCES) $(HEADERS)'; \ ! unique=`for i in $$list; do echo $$i; done | \ ! awk ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ ! here=`pwd` && cd $(srcdir) \ ! && mkid -f$$here/ID $$unique $(LISP) ! TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) tags=; \ here=`pwd`; \ ! list='$(SOURCES) $(HEADERS)'; \ ! unique=`for i in $$list; do echo $$i; done | \ ! awk ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ ! test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ ! || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS) ! ! mostlyclean-tags: ! ! clean-tags: distclean-tags: ! -rm -f TAGS ID ! ! maintainer-clean-tags: ! distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) ! ! subdir = modules/vfolder distdir: $(DISTFILES) ! @for file in $(DISTFILES); do \ ! d=$(srcdir); \ if test -d $$d/$$file; then \ ! cp -pr $$d/$$file $(distdir)/$$file; \ else \ test -f $(distdir)/$$file \ ! || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ ! || cp -p $$d/$$file $(distdir)/$$file || :; \ fi; \ done - test-vfolder.o: test-vfolder.c ../../libgnomevfs/gnome-vfs.h \ - ../../libgnomevfs/gnome-vfs-async-ops.h \ - ../../libgnomevfs/gnome-vfs-file-info.h \ - ../../libgnomevfs/gnome-vfs-file-size.h \ - ../../libgnomevfs/gnome-vfs-result.h \ - ../../libgnomevfs/gnome-vfs-uri.h \ - ../../libgnomevfs/gnome-vfs-find-directory.h \ - ../../libgnomevfs/gnome-vfs-handle.h \ - ../../libgnomevfs/gnome-vfs-context.h \ - ../../libgnomevfs/gnome-vfs-cancellation.h \ - ../../libgnomevfs/gnome-vfs-xfer.h \ - ../../libgnomevfs/gnome-vfs-directory.h \ - ../../libgnomevfs/gnome-vfs-init.h \ - ../../libgnomevfs/gnome-vfs-module-callback.h \ - ../../libgnomevfs/gnome-vfs-monitor.h \ - ../../libgnomevfs/gnome-vfs-ops.h \ - ../../libgnomevfs/gnome-vfs-utils.h - vfolder-common.lo vfolder-common.o : vfolder-common.c ../../config.h \ - ../../libgnomevfs/gnome-vfs-directory.h \ - ../../libgnomevfs/gnome-vfs-file-info.h \ - ../../libgnomevfs/gnome-vfs-file-size.h \ - ../../libgnomevfs/gnome-vfs-result.h \ - ../../libgnomevfs/gnome-vfs-uri.h \ - ../../libgnomevfs/gnome-vfs-ops.h \ - ../../libgnomevfs/gnome-vfs-handle.h \ - ../../libgnomevfs/gnome-vfs-context.h \ - ../../libgnomevfs/gnome-vfs-cancellation.h \ - ../../libgnomevfs/gnome-vfs-monitor.h \ - ../../libgnomevfs/gnome-vfs-xfer.h vfolder-common.h \ - ../../libgnomevfs/gnome-vfs-method.h \ - ../../libgnomevfs/gnome-vfs-find-directory.h \ - ../../libgnomevfs/gnome-vfs-transform.h vfolder-util.h \ - ../../libgnomevfs/gnome-vfs-utils.h - vfolder-info.lo vfolder-info.o : vfolder-info.c ../../config.h \ - ../../libgnomevfs/gnome-vfs.h \ - ../../libgnomevfs/gnome-vfs-async-ops.h \ - ../../libgnomevfs/gnome-vfs-file-info.h \ - ../../libgnomevfs/gnome-vfs-file-size.h \ - ../../libgnomevfs/gnome-vfs-result.h \ - ../../libgnomevfs/gnome-vfs-uri.h \ - ../../libgnomevfs/gnome-vfs-find-directory.h \ - ../../libgnomevfs/gnome-vfs-handle.h \ - ../../libgnomevfs/gnome-vfs-context.h \ - ../../libgnomevfs/gnome-vfs-cancellation.h \ - ../../libgnomevfs/gnome-vfs-xfer.h \ - ../../libgnomevfs/gnome-vfs-directory.h \ - ../../libgnomevfs/gnome-vfs-init.h \ - ../../libgnomevfs/gnome-vfs-module-callback.h \ - ../../libgnomevfs/gnome-vfs-monitor.h \ - ../../libgnomevfs/gnome-vfs-ops.h \ - ../../libgnomevfs/gnome-vfs-utils.h \ - ../../libgnomevfs/gnome-vfs-monitor-private.h \ - ../../libgnomevfs/gnome-vfs-method.h \ - ../../libgnomevfs/gnome-vfs-transform.h vfolder-common.h \ - vfolder-util.h - vfolder-method.lo vfolder-method.o : vfolder-method.c ../../config.h \ - ../../libgnomevfs/gnome-vfs-cancellable-ops.h \ - ../../libgnomevfs/gnome-vfs-directory.h \ - ../../libgnomevfs/gnome-vfs-file-info.h \ - ../../libgnomevfs/gnome-vfs-file-size.h \ - ../../libgnomevfs/gnome-vfs-result.h \ - ../../libgnomevfs/gnome-vfs-uri.h \ - ../../libgnomevfs/gnome-vfs-find-directory.h \ - ../../libgnomevfs/gnome-vfs-handle.h \ - ../../libgnomevfs/gnome-vfs-context.h \ - ../../libgnomevfs/gnome-vfs-cancellation.h \ - ../../libgnomevfs/gnome-vfs-xfer.h \ - ../../libgnomevfs/gnome-vfs-module.h \ - ../../libgnomevfs/gnome-vfs-method.h \ - ../../libgnomevfs/gnome-vfs-transform.h \ - ../../libgnomevfs/gnome-vfs-monitor.h \ - ../../libgnomevfs/gnome-vfs-ops.h \ - ../../libgnomevfs/gnome-vfs-utils.h \ - ../../libgnomevfs/gnome-vfs-private-utils.h \ - ../../libgnomevfs/gnome-vfs-process.h vfolder-common.h \ - vfolder-util.h - vfolder-util.lo vfolder-util.o : vfolder-util.c ../../config.h \ - ../../libgnomevfs/gnome-vfs-file-info.h \ - ../../libgnomevfs/gnome-vfs-file-size.h \ - ../../libgnomevfs/gnome-vfs-result.h \ - ../../libgnomevfs/gnome-vfs-uri.h \ - ../../libgnomevfs/gnome-vfs-ops.h \ - ../../libgnomevfs/gnome-vfs-handle.h \ - ../../libgnomevfs/gnome-vfs-context.h \ - ../../libgnomevfs/gnome-vfs-cancellation.h \ - ../../libgnomevfs/gnome-vfs-monitor.h vfolder-util.h \ - ../../libgnomevfs/gnome-vfs-utils.h vfolder-common.h \ - ../../libgnomevfs/gnome-vfs-method.h \ - ../../libgnomevfs/gnome-vfs-find-directory.h \ - ../../libgnomevfs/gnome-vfs-transform.h - - info-am: - info: info-am - dvi-am: - dvi: dvi-am check-am: all-am check: check-am ! installcheck-am: ! installcheck: installcheck-am ! install-exec-am: ! install-exec: install-exec-am ! install-data-am: install-modulesLTLIBRARIES install-vfolderDATA ! install-data: install-data-am - install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am install: install-am ! uninstall-am: uninstall-modulesLTLIBRARIES uninstall-vfolderDATA uninstall: uninstall-am - all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(DATA) - all-redirect: all-am - install-strip: - $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install - installdirs: - $(mkinstalldirs) $(DESTDIR)$(modulesdir) $(DESTDIR)$(vfolderdir) mostlyclean-generic: clean-generic: distclean-generic: -rm -f Makefile $(CONFIG_CLEAN_FILES) - -rm -f config.cache config.log stamp-h stamp-h[0-9]* maintainer-clean-generic: ! mostlyclean-am: mostlyclean-modulesLTLIBRARIES mostlyclean-compile \ ! mostlyclean-libtool mostlyclean-noinstPROGRAMS \ ! mostlyclean-tags mostlyclean-generic ! mostlyclean: mostlyclean-am ! clean-am: clean-modulesLTLIBRARIES clean-compile clean-libtool \ ! clean-noinstPROGRAMS clean-tags clean-generic \ ! mostlyclean-am ! clean: clean-am ! distclean-am: distclean-modulesLTLIBRARIES distclean-compile \ ! distclean-libtool distclean-noinstPROGRAMS \ ! distclean-tags distclean-generic clean-am ! -rm -f libtool ! distclean: distclean-am ! maintainer-clean-am: maintainer-clean-modulesLTLIBRARIES \ ! maintainer-clean-compile maintainer-clean-libtool \ ! maintainer-clean-noinstPROGRAMS maintainer-clean-tags \ ! maintainer-clean-generic distclean-am ! @echo "This command is intended for maintainers to use;" ! @echo "it deletes files that may require special tools to rebuild." maintainer-clean: maintainer-clean-am ! .PHONY: mostlyclean-modulesLTLIBRARIES distclean-modulesLTLIBRARIES \ ! clean-modulesLTLIBRARIES maintainer-clean-modulesLTLIBRARIES \ ! uninstall-modulesLTLIBRARIES install-modulesLTLIBRARIES \ ! mostlyclean-compile distclean-compile clean-compile \ ! maintainer-clean-compile mostlyclean-libtool distclean-libtool \ ! clean-libtool maintainer-clean-libtool mostlyclean-noinstPROGRAMS \ ! distclean-noinstPROGRAMS clean-noinstPROGRAMS \ ! maintainer-clean-noinstPROGRAMS uninstall-vfolderDATA \ ! install-vfolderDATA tags mostlyclean-tags distclean-tags clean-tags \ ! maintainer-clean-tags distdir info-am info dvi-am dvi check check-am \ ! installcheck-am installcheck install-exec-am install-exec \ ! install-data-am install-data install-am install uninstall-am uninstall \ ! all-redirect all-am all installdirs mostlyclean-generic \ ! distclean-generic clean-generic maintainer-clean-generic clean \ ! mostlyclean distclean maintainer-clean %.vfolder-info: %.vfolder-info.in $(VFOLDER_INFO_CREATE) - # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: --- 447,653 ---- -rm -rf .libs _libs distclean-libtool: ! -rm -f libtool ! uninstall-info-am: ! vfolderDATA_INSTALL = $(INSTALL_DATA) install-vfolderDATA: $(vfolder_DATA) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(vfolderdir) @list='$(vfolder_DATA)'; for p in $$list; do \ ! if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ ! f="`echo $$p | sed -e 's|^.*/||'`"; \ ! echo " $(vfolderDATA_INSTALL) $$d$$p $(DESTDIR)$(vfolderdir)/$$f"; \ ! $(vfolderDATA_INSTALL) $$d$$p $(DESTDIR)$(vfolderdir)/$$f; \ done uninstall-vfolderDATA: @$(NORMAL_UNINSTALL) ! @list='$(vfolder_DATA)'; for p in $$list; do \ ! f="`echo $$p | sed -e 's|^.*/||'`"; \ ! echo " rm -f $(DESTDIR)$(vfolderdir)/$$f"; \ ! rm -f $(DESTDIR)$(vfolderdir)/$$f; \ done + ETAGS = etags + ETAGSFLAGS = + + CTAGS = ctags + CTAGSFLAGS = + tags: TAGS ! ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) ! list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ ! unique=`for i in $$list; do \ ! if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ ! done | \ ! $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ ! mkid -fID $$unique ! TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ ! $(TAGS_FILES) $(LISP) tags=; \ here=`pwd`; \ ! list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ ! unique=`for i in $$list; do \ ! if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ ! done | \ ! $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ ! test -z "$(ETAGS_ARGS)$$tags$$unique" \ ! || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ! $$tags $$unique ! ! ctags: CTAGS ! CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ ! $(TAGS_FILES) $(LISP) ! tags=; \ ! here=`pwd`; \ ! list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ ! unique=`for i in $$list; do \ ! if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ ! done | \ ! $(AWK) ' { files[$$0] = 1; } \ ! END { for (i in files) print i; }'`; \ ! test -z "$(CTAGS_ARGS)$$tags$$unique" \ ! || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ ! $$tags $$unique ! ! GTAGS: ! here=`$(am__cd) $(top_builddir) && pwd` \ ! && cd $(top_srcdir) \ ! && gtags -i $(GTAGS_ARGS) $$here distclean-tags: ! -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags ! DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ! top_distdir = ../.. ! distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) ! @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ ! topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ ! list='$(DISTFILES)'; for file in $$list; do \ ! case $$file in \ ! $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ ! $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ ! esac; \ ! if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ ! dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ ! if test "$$dir" != "$$file" && test "$$dir" != "."; then \ ! dir="/$$dir"; \ ! $(mkinstalldirs) "$(distdir)$$dir"; \ ! else \ ! dir=''; \ ! fi; \ if test -d $$d/$$file; then \ ! if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ ! cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ ! fi; \ ! cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ else \ test -f $(distdir)/$$file \ ! || cp -p $$d/$$file $(distdir)/$$file \ ! || exit 1; \ fi; \ done check-am: all-am check: check-am ! all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(DATA) ! installdirs: ! $(mkinstalldirs) $(DESTDIR)$(modulesdir) $(DESTDIR)$(vfolderdir) install: install-am ! install-exec: install-exec-am ! install-data: install-data-am uninstall: uninstall-am + install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + installcheck: installcheck-am + install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: clean-generic: distclean-generic: -rm -f Makefile $(CONFIG_CLEAN_FILES) maintainer-clean-generic: ! @echo "This command is intended for maintainers to use" ! @echo "it deletes files that may require special tools to rebuild." ! clean: clean-am ! clean-am: clean-generic clean-libtool clean-modulesLTLIBRARIES \ ! clean-noinstPROGRAMS mostlyclean-am ! distclean: distclean-am ! distclean-am: clean-am distclean-compile distclean-generic \ ! distclean-libtool distclean-tags ! dvi: dvi-am ! dvi-am: ! info: info-am ! ! info-am: ! ! install-data-am: install-modulesLTLIBRARIES install-vfolderDATA ! ! install-exec-am: ! ! install-info: install-info-am ! ! install-man: ! ! installcheck-am: maintainer-clean: maintainer-clean-am ! maintainer-clean-am: distclean-am maintainer-clean-generic ! ! mostlyclean: mostlyclean-am ! ! mostlyclean-am: mostlyclean-compile mostlyclean-generic \ ! mostlyclean-libtool ! ! pdf: pdf-am ! ! pdf-am: ! ! ps: ps-am ! ! ps-am: ! ! uninstall-am: uninstall-info-am uninstall-modulesLTLIBRARIES \ ! uninstall-vfolderDATA ! ! .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ ! clean-libtool clean-modulesLTLIBRARIES clean-noinstPROGRAMS \ ! ctags distclean distclean-compile distclean-generic \ ! distclean-libtool distclean-tags distdir dvi dvi-am info \ ! info-am install install-am install-data install-data-am \ ! install-exec install-exec-am install-info install-info-am \ ! install-man install-modulesLTLIBRARIES install-strip \ ! install-vfolderDATA installcheck installcheck-am installdirs \ ! maintainer-clean maintainer-clean-generic mostlyclean \ ! mostlyclean-compile mostlyclean-generic mostlyclean-libtool pdf \ ! pdf-am ps ps-am tags uninstall uninstall-am uninstall-info-am \ ! uninstall-modulesLTLIBRARIES uninstall-vfolderDATA %.vfolder-info: %.vfolder-info.in $(VFOLDER_INFO_CREATE) # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff -crN ./gnome-vfs/monikers/Makefile.in /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/monikers/Makefile.in *** ./gnome-vfs/monikers/Makefile.in Mon Sep 8 14:19:53 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/monikers/Makefile.in Thu Dec 18 21:13:13 2003 *************** *** 1,6 **** ! # Makefile.in generated automatically by automake 1.4-p6 from Makefile.am ! # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. --- 1,8 ---- ! # Makefile.in generated by automake 1.7.1 from Makefile.am. ! # @configure_input@ ! # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 ! # Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. *************** *** 10,87 **** # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. ! ! SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ - prefix = @prefix@ - exec_prefix = @exec_prefix@ - - bindir = @bindir@ - sbindir = @sbindir@ - libexecdir = @libexecdir@ - datadir = @datadir@ - sysconfdir = @sysconfdir@ - sharedstatedir = @sharedstatedir@ - localstatedir = @localstatedir@ - libdir = @libdir@ - infodir = @infodir@ - mandir = @mandir@ - includedir = @includedir@ - oldincludedir = /usr/include - - DESTDIR = - pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ - top_builddir = .. ! ACLOCAL = @ACLOCAL@ ! AUTOCONF = @AUTOCONF@ ! AUTOMAKE = @AUTOMAKE@ ! AUTOHEADER = @AUTOHEADER@ ! INSTALL = @INSTALL@ ! INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) ! INSTALL_DATA = @INSTALL_DATA@ ! INSTALL_SCRIPT = @INSTALL_SCRIPT@ ! transform = @program_transform_name@ ! NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : - host_alias = @host_alias@ host_triplet = @host@ ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ ! AS = @AS@ AWK = @AWK@ BONOBO_ACTIVATION_REQUIRED = @BONOBO_ACTIVATION_REQUIRED@ BONOBO_IDLDIR = @BONOBO_IDLDIR@ BONOBO_REQUIRED = @BONOBO_REQUIRED@ BZ2_LIBS = @BZ2_LIBS@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ CFLAGS = @CFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ ! CXX = @CXX@ DATADIRNAME = @DATADIRNAME@ DB2HTML = @DB2HTML@ ! DLLTOOL = @DLLTOOL@ ECHO = @ECHO@ ENABLE_PROFILER = @ENABLE_PROFILER@ EXEEXT = @EXEEXT@ FAM_LIBS = @FAM_LIBS@ GCONFTOOL = @GCONFTOOL@ GCONF_REQUIRED = @GCONF_REQUIRED@ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ --- 12,85 ---- # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. ! @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = .. ! am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ ! install_sh_DATA = $(install_sh) -c -m 644 ! install_sh_PROGRAM = $(install_sh) -c ! install_sh_SCRIPT = $(install_sh) -c ! INSTALL_HEADER = $(INSTALL_DATA) ! transform = $(program_transform_name) NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : host_triplet = @host@ + ACLOCAL = @ACLOCAL@ ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ ! ALLOCA = @ALLOCA@ ! AMDEP_FALSE = @AMDEP_FALSE@ ! AMDEP_TRUE = @AMDEP_TRUE@ ! AMTAR = @AMTAR@ ! AUTOCONF = @AUTOCONF@ ! AUTOHEADER = @AUTOHEADER@ ! AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BONOBO_ACTIVATION_REQUIRED = @BONOBO_ACTIVATION_REQUIRED@ BONOBO_IDLDIR = @BONOBO_IDLDIR@ BONOBO_REQUIRED = @BONOBO_REQUIRED@ + BUILD_CDEMENU_MODULE_FALSE = @BUILD_CDEMENU_MODULE_FALSE@ + BUILD_CDEMENU_MODULE_TRUE = @BUILD_CDEMENU_MODULE_TRUE@ BZ2_LIBS = @BZ2_LIBS@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ + CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ ! CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ DB2HTML = @DB2HTML@ ! DEFS = @DEFS@ ! DEPDIR = @DEPDIR@ ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ + ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ + ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ENABLE_PROFILER = @ENABLE_PROFILER@ + ENABLE_PROFILER_FALSE = @ENABLE_PROFILER_FALSE@ + ENABLE_PROFILER_TRUE = @ENABLE_PROFILER_TRUE@ EXEEXT = @EXEEXT@ FAM_LIBS = @FAM_LIBS@ GCONFTOOL = @GCONFTOOL@ GCONF_REQUIRED = @GCONF_REQUIRED@ + GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ + GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ *************** *** 90,99 **** --- 88,114 ---- GMSGFMT = @GMSGFMT@ GNOME_ACLOCAL_DIR = @GNOME_ACLOCAL_DIR@ GNOME_ACLOCAL_FLAGS = @GNOME_ACLOCAL_FLAGS@ + GNOME_INTERFACE_VERSION = @GNOME_INTERFACE_VERSION@ GNOME_VFS_DIR = @GNOME_VFS_DIR@ GTKDOC = @GTKDOC@ + HAVE_CDDA_FALSE = @HAVE_CDDA_FALSE@ + HAVE_CDDA_TRUE = @HAVE_CDDA_TRUE@ + HAVE_DOCBOOK_FALSE = @HAVE_DOCBOOK_FALSE@ + HAVE_DOCBOOK_TRUE = @HAVE_DOCBOOK_TRUE@ HAVE_GTK_DOC = @HAVE_GTK_DOC@ + HAVE_GTK_DOC_FALSE = @HAVE_GTK_DOC_FALSE@ + HAVE_GTK_DOC_TRUE = @HAVE_GTK_DOC_TRUE@ + HAVE_LIBEFS_FALSE = @HAVE_LIBEFS_FALSE@ + HAVE_LIBEFS_TRUE = @HAVE_LIBEFS_TRUE@ + HAVE_SSL_FALSE = @HAVE_SSL_FALSE@ + HAVE_SSL_TRUE = @HAVE_SSL_TRUE@ HTML_DIR = @HTML_DIR@ + INSIDE_GNOME_DOCU_FALSE = @INSIDE_GNOME_DOCU_FALSE@ + INSIDE_GNOME_DOCU_TRUE = @INSIDE_GNOME_DOCU_TRUE@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ + INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLLIBS = @INTLLIBS@ INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@ *************** *** 127,135 **** --- 142,154 ---- LIBGNUTLS_CONFIG = @LIBGNUTLS_CONFIG@ LIBGNUTLS_LIBS = @LIBGNUTLS_LIBS@ LIBIDL_REQUIRED = @LIBIDL_REQUIRED@ + LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ + MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ + MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MKINSTALLDIRS = @MKINSTALLDIRS@ MODULES_CFLAGS = @MODULES_CFLAGS@ *************** *** 144,161 **** MODULES_XML_LIBS = @MODULES_XML_LIBS@ MONIKERS_CFLAGS = @MONIKERS_CFLAGS@ MONIKERS_LIBS = @MONIKERS_LIBS@ ! OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ ORBIT_IDL = @ORBIT_IDL@ ORBIT_REQUIRED = @ORBIT_REQUIRED@ PACKAGE = @PACKAGE@ PKG_CONFIG = @PKG_CONFIG@ POFILES = @POFILES@ POPT_LIBS = @POPT_LIBS@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ RANLIB = @RANLIB@ STRIP = @STRIP@ TEST_CFLAGS = @TEST_CFLAGS@ TEST_LIBS = @TEST_LIBS@ --- 163,192 ---- MODULES_XML_LIBS = @MODULES_XML_LIBS@ MONIKERS_CFLAGS = @MONIKERS_CFLAGS@ MONIKERS_LIBS = @MONIKERS_LIBS@ ! MSGFMT = @MSGFMT@ OBJEXT = @OBJEXT@ + OPENSSL_CFLAGS = @OPENSSL_CFLAGS@ + OPENSSL_LIBS = @OPENSSL_LIBS@ ORBIT_IDL = @ORBIT_IDL@ ORBIT_REQUIRED = @ORBIT_REQUIRED@ PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ + PLATFORM_GNOME_2_FALSE = @PLATFORM_GNOME_2_FALSE@ + PLATFORM_GNOME_2_TRUE = @PLATFORM_GNOME_2_TRUE@ POFILES = @POFILES@ POPT_LIBS = @POPT_LIBS@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ RANLIB = @RANLIB@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ STRIP = @STRIP@ TEST_CFLAGS = @TEST_CFLAGS@ TEST_LIBS = @TEST_LIBS@ *************** *** 173,181 **** VFS_SIZE_IS = @VFS_SIZE_IS@ VFS_SIZE_PRINTF = @VFS_SIZE_PRINTF@ WARN_CFLAGS = @WARN_CFLAGS@ ! WARN_CXXFLAGS = @WARN_CXXFLAGS@ XML_REQUIRED = @XML_REQUIRED@ ! INCLUDES = \ -I$(top_srcdir) \ -I$(top_builddir) \ --- 204,245 ---- VFS_SIZE_IS = @VFS_SIZE_IS@ VFS_SIZE_PRINTF = @VFS_SIZE_PRINTF@ WARN_CFLAGS = @WARN_CFLAGS@ ! XGETTEXT = @XGETTEXT@ XML_REQUIRED = @XML_REQUIRED@ ! ac_ct_CC = @ac_ct_CC@ ! ac_ct_RANLIB = @ac_ct_RANLIB@ ! ac_ct_STRIP = @ac_ct_STRIP@ ! am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ ! am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ ! am__include = @am__include@ ! am__quote = @am__quote@ ! bindir = @bindir@ ! build = @build@ ! build_alias = @build_alias@ ! build_cpu = @build_cpu@ ! build_os = @build_os@ ! build_vendor = @build_vendor@ ! datadir = @datadir@ ! exec_prefix = @exec_prefix@ ! host = @host@ ! host_alias = @host_alias@ ! host_cpu = @host_cpu@ ! host_os = @host_os@ ! host_vendor = @host_vendor@ ! includedir = @includedir@ ! infodir = @infodir@ ! install_sh = @install_sh@ ! libdir = @libdir@ ! libexecdir = @libexecdir@ ! localstatedir = @localstatedir@ ! mandir = @mandir@ ! oldincludedir = @oldincludedir@ ! prefix = @prefix@ ! program_transform_name = @program_transform_name@ ! sbindir = @sbindir@ ! sharedstatedir = @sharedstatedir@ ! sysconfdir = @sysconfdir@ ! target_alias = @target_alias@ INCLUDES = \ -I$(top_srcdir) \ -I$(top_builddir) \ *************** *** 221,325 **** libmoniker_gnome_vfs_std_la_LDFLAGS = \ -module -avoid-version -no-undefined mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ! CONFIG_HEADER = ../config.h ! CONFIG_CLEAN_FILES = ! LTLIBRARIES = $(moniker_LTLIBRARIES) ! ! ! DEFS = @DEFS@ -I. -I$(srcdir) -I.. ! LIBS = @LIBS@ ! libmoniker_gnome_vfs_std_la_DEPENDENCIES = \ ! $(top_builddir)/libgnomevfs/libgnomevfs-2.la ! libmoniker_gnome_vfs_std_la_OBJECTS = gnome-moniker-std.lo \ ! bonobo-stream-fs.lo bonobo-storage-fs.lo \ ! bonobo-moniker-extender-file.lo bonobo-moniker-file.lo \ ! bonobo-stream-vfs.lo bonobo-storage-vfs.lo bonobo-moniker-vfs.lo ! COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ! LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) ! LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ ! DATA = $(server_DATA) ! ! DIST_COMMON = ChangeLog Makefile.am Makefile.in ! ! DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) ! ! TAR = gtar ! GZIP_ENV = --best SOURCES = $(libmoniker_gnome_vfs_std_la_SOURCES) - OBJECTS = $(libmoniker_gnome_vfs_std_la_OBJECTS) ! all: all-redirect ! .SUFFIXES: ! .SUFFIXES: .S .c .lo .o .obj .s ! $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) ! cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps monikers/Makefile ! ! Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ! cd $(top_builddir) \ ! && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status ! ! ! mostlyclean-monikerLTLIBRARIES: ! ! clean-monikerLTLIBRARIES: ! -test -z "$(moniker_LTLIBRARIES)" || rm -f $(moniker_LTLIBRARIES) ! ! distclean-monikerLTLIBRARIES: ! ! maintainer-clean-monikerLTLIBRARIES: install-monikerLTLIBRARIES: $(moniker_LTLIBRARIES) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(monikerdir) @list='$(moniker_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ ! echo "$(LIBTOOL) --mode=install $(INSTALL) $$p $(DESTDIR)$(monikerdir)/$$p"; \ ! $(LIBTOOL) --mode=install $(INSTALL) $$p $(DESTDIR)$(monikerdir)/$$p; \ else :; fi; \ done uninstall-monikerLTLIBRARIES: @$(NORMAL_UNINSTALL) ! list='$(moniker_LTLIBRARIES)'; for p in $$list; do \ ! $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(monikerdir)/$$p; \ done ! .c.o: ! $(COMPILE) -c $< ! ! # FIXME: We should only use cygpath when building on Windows, ! # and only if it is available. ! .c.obj: ! $(COMPILE) -c `cygpath -w $<` ! ! .s.o: ! $(COMPILE) -c $< ! ! .S.o: ! $(COMPILE) -c $< mostlyclean-compile: ! -rm -f *.o core *.core ! -rm -f *.$(OBJEXT) ! ! clean-compile: distclean-compile: -rm -f *.tab.c ! maintainer-clean-compile: ! ! .c.lo: ! $(LIBTOOL) --mode=compile $(COMPILE) -c $< ! .s.lo: ! $(LIBTOOL) --mode=compile $(COMPILE) -c $< ! .S.lo: ! $(LIBTOOL) --mode=compile $(COMPILE) -c $< mostlyclean-libtool: -rm -f *.lo --- 285,376 ---- libmoniker_gnome_vfs_std_la_LDFLAGS = \ -module -avoid-version -no-undefined + subdir = monikers mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ! CONFIG_HEADER = $(top_builddir)/config.h ! CONFIG_CLEAN_FILES = ! LTLIBRARIES = $(moniker_LTLIBRARIES) ! ! libmoniker_gnome_vfs_std_la_DEPENDENCIES = \ ! $(top_builddir)/libgnomevfs/libgnomevfs-2.la ! am_libmoniker_gnome_vfs_std_la_OBJECTS = gnome-moniker-std.lo \ ! bonobo-stream-fs.lo bonobo-storage-fs.lo \ ! bonobo-moniker-extender-file.lo bonobo-moniker-file.lo \ ! bonobo-stream-vfs.lo bonobo-storage-vfs.lo \ ! bonobo-moniker-vfs.lo ! libmoniker_gnome_vfs_std_la_OBJECTS = \ ! $(am_libmoniker_gnome_vfs_std_la_OBJECTS) ! ! DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ! depcomp = ! am__depfiles_maybe = ! COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ ! $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ! LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ ! $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) ! LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ! $(AM_LDFLAGS) $(LDFLAGS) -o $@ ! DIST_SOURCES = $(libmoniker_gnome_vfs_std_la_SOURCES) ! DATA = $(server_DATA) ! DIST_COMMON = ChangeLog Makefile.am Makefile.in SOURCES = $(libmoniker_gnome_vfs_std_la_SOURCES) ! all: all-am + .SUFFIXES: + .SUFFIXES: .c .lo .o .obj + $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu --ignore-deps monikers/Makefile + Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) + monikerLTLIBRARIES_INSTALL = $(INSTALL) install-monikerLTLIBRARIES: $(moniker_LTLIBRARIES) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(monikerdir) @list='$(moniker_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ ! f="`echo $$p | sed -e 's|^.*/||'`"; \ ! echo " $(LIBTOOL) --mode=install $(monikerLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(monikerdir)/$$f"; \ ! $(LIBTOOL) --mode=install $(monikerLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(monikerdir)/$$f; \ else :; fi; \ done uninstall-monikerLTLIBRARIES: @$(NORMAL_UNINSTALL) ! @list='$(moniker_LTLIBRARIES)'; for p in $$list; do \ ! p="`echo $$p | sed -e 's|^.*/||'`"; \ ! echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(monikerdir)/$$p"; \ ! $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(monikerdir)/$$p; \ done ! clean-monikerLTLIBRARIES: ! -test -z "$(moniker_LTLIBRARIES)" || rm -f $(moniker_LTLIBRARIES) ! @list='$(moniker_LTLIBRARIES)'; for p in $$list; do \ ! dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ ! test "$$dir" = "$$p" && dir=.; \ ! echo "rm -f \"$${dir}/so_locations\""; \ ! rm -f "$${dir}/so_locations"; \ ! done ! libmoniker_gnome_vfs_std.la: $(libmoniker_gnome_vfs_std_la_OBJECTS) $(libmoniker_gnome_vfs_std_la_DEPENDENCIES) ! $(LINK) -rpath $(monikerdir) $(libmoniker_gnome_vfs_std_la_LDFLAGS) $(libmoniker_gnome_vfs_std_la_OBJECTS) $(libmoniker_gnome_vfs_std_la_LIBADD) $(LIBS) mostlyclean-compile: ! -rm -f *.$(OBJEXT) core *.core distclean-compile: -rm -f *.tab.c ! .c.o: ! $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< ! .c.obj: ! $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'` ! .c.lo: ! $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< mostlyclean-libtool: -rm -f *.lo *************** *** 328,477 **** -rm -rf .libs _libs distclean-libtool: ! ! maintainer-clean-libtool: ! ! libmoniker_gnome_vfs_std.la: $(libmoniker_gnome_vfs_std_la_OBJECTS) $(libmoniker_gnome_vfs_std_la_DEPENDENCIES) ! $(LINK) -rpath $(monikerdir) $(libmoniker_gnome_vfs_std_la_LDFLAGS) $(libmoniker_gnome_vfs_std_la_OBJECTS) $(libmoniker_gnome_vfs_std_la_LIBADD) $(LIBS) ! install-serverDATA: $(server_DATA) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(serverdir) @list='$(server_DATA)'; for p in $$list; do \ ! if test -f $(srcdir)/$$p; then \ ! echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(serverdir)/$$p"; \ ! $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(serverdir)/$$p; \ ! else if test -f $$p; then \ ! echo " $(INSTALL_DATA) $$p $(DESTDIR)$(serverdir)/$$p"; \ ! $(INSTALL_DATA) $$p $(DESTDIR)$(serverdir)/$$p; \ ! fi; fi; \ done uninstall-serverDATA: @$(NORMAL_UNINSTALL) ! list='$(server_DATA)'; for p in $$list; do \ ! rm -f $(DESTDIR)$(serverdir)/$$p; \ done tags: TAGS ! ID: $(HEADERS) $(SOURCES) $(LISP) ! list='$(SOURCES) $(HEADERS)'; \ ! unique=`for i in $$list; do echo $$i; done | \ ! awk ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ ! here=`pwd` && cd $(srcdir) \ ! && mkid -f$$here/ID $$unique $(LISP) ! TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) tags=; \ here=`pwd`; \ ! list='$(SOURCES) $(HEADERS)'; \ ! unique=`for i in $$list; do echo $$i; done | \ ! awk ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ ! test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ ! || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS) ! ! mostlyclean-tags: ! ! clean-tags: distclean-tags: ! -rm -f TAGS ID ! maintainer-clean-tags: ! ! distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) ! ! subdir = monikers distdir: $(DISTFILES) ! @for file in $(DISTFILES); do \ ! d=$(srcdir); \ if test -d $$d/$$file; then \ ! cp -pr $$d/$$file $(distdir)/$$file; \ else \ test -f $(distdir)/$$file \ ! || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ ! || cp -p $$d/$$file $(distdir)/$$file || :; \ fi; \ done - bonobo-moniker-extender-file.lo bonobo-moniker-extender-file.o : \ - bonobo-moniker-extender-file.c ../config.h \ - ../libgnomevfs/gnome-vfs-mime.h ../libgnomevfs/gnome-vfs-uri.h \ - gnome-moniker-std.h - bonobo-moniker-file.lo bonobo-moniker-file.o : bonobo-moniker-file.c \ - ../config.h gnome-moniker-std.h bonobo-stream-fs.h \ - bonobo-storage-fs.h - bonobo-moniker-vfs.lo bonobo-moniker-vfs.o : bonobo-moniker-vfs.c \ - ../config.h gnome-moniker-std.h bonobo-stream-vfs.h \ - ../libgnomevfs/gnome-vfs-file-info.h \ - ../libgnomevfs/gnome-vfs-file-size.h \ - ../libgnomevfs/gnome-vfs-result.h \ - ../libgnomevfs/gnome-vfs-uri.h \ - ../libgnomevfs/gnome-vfs-handle.h \ - ../libgnomevfs/gnome-vfs-context.h \ - ../libgnomevfs/gnome-vfs-cancellation.h bonobo-storage-vfs.h - bonobo-storage-fs.lo bonobo-storage-fs.o : bonobo-storage-fs.c \ - ../config.h bonobo-storage-fs.h ../libgnomevfs/gnome-vfs-mime.h \ - ../libgnomevfs/gnome-vfs-uri.h bonobo-stream-fs.h - bonobo-storage-vfs.lo bonobo-storage-vfs.o : bonobo-storage-vfs.c \ - ../config.h bonobo-storage-vfs.h bonobo-stream-vfs.h \ - ../libgnomevfs/gnome-vfs-file-info.h \ - ../libgnomevfs/gnome-vfs-file-size.h \ - ../libgnomevfs/gnome-vfs-result.h \ - ../libgnomevfs/gnome-vfs-uri.h \ - ../libgnomevfs/gnome-vfs-handle.h \ - ../libgnomevfs/gnome-vfs-context.h \ - ../libgnomevfs/gnome-vfs-cancellation.h \ - ../libgnomevfs/gnome-vfs-directory.h \ - ../libgnomevfs/gnome-vfs-ops.h \ - ../libgnomevfs/gnome-vfs-monitor.h - bonobo-stream-fs.lo bonobo-stream-fs.o : bonobo-stream-fs.c ../config.h \ - bonobo-stream-fs.h ../libgnomevfs/gnome-vfs-mime.h \ - ../libgnomevfs/gnome-vfs-uri.h - bonobo-stream-vfs.lo bonobo-stream-vfs.o : bonobo-stream-vfs.c \ - ../config.h bonobo-stream-vfs.h \ - ../libgnomevfs/gnome-vfs-file-info.h \ - ../libgnomevfs/gnome-vfs-file-size.h \ - ../libgnomevfs/gnome-vfs-result.h \ - ../libgnomevfs/gnome-vfs-uri.h \ - ../libgnomevfs/gnome-vfs-handle.h \ - ../libgnomevfs/gnome-vfs-context.h \ - ../libgnomevfs/gnome-vfs-cancellation.h \ - ../libgnomevfs/gnome-vfs-ops.h \ - ../libgnomevfs/gnome-vfs-monitor.h - gnome-moniker-std.lo gnome-moniker-std.o : gnome-moniker-std.c \ - ../config.h gnome-moniker-std.h - - info-am: - info: info-am - dvi-am: - dvi: dvi-am check-am: all-am check: check-am ! installcheck-am: ! installcheck: installcheck-am ! install-exec-am: ! install-exec: install-exec-am ! install-data-am: install-monikerLTLIBRARIES install-serverDATA ! install-data: install-data-am - install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am install: install-am ! uninstall-am: uninstall-monikerLTLIBRARIES uninstall-serverDATA uninstall: uninstall-am - all-am: Makefile $(LTLIBRARIES) $(DATA) - all-redirect: all-am - install-strip: - $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install - installdirs: - $(mkinstalldirs) $(DESTDIR)$(monikerdir) $(DESTDIR)$(serverdir) mostlyclean-generic: clean-generic: --- 379,511 ---- -rm -rf .libs _libs distclean-libtool: ! -rm -f libtool ! uninstall-info-am: ! serverDATA_INSTALL = $(INSTALL_DATA) install-serverDATA: $(server_DATA) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(serverdir) @list='$(server_DATA)'; for p in $$list; do \ ! if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ ! f="`echo $$p | sed -e 's|^.*/||'`"; \ ! echo " $(serverDATA_INSTALL) $$d$$p $(DESTDIR)$(serverdir)/$$f"; \ ! $(serverDATA_INSTALL) $$d$$p $(DESTDIR)$(serverdir)/$$f; \ done uninstall-serverDATA: @$(NORMAL_UNINSTALL) ! @list='$(server_DATA)'; for p in $$list; do \ ! f="`echo $$p | sed -e 's|^.*/||'`"; \ ! echo " rm -f $(DESTDIR)$(serverdir)/$$f"; \ ! rm -f $(DESTDIR)$(serverdir)/$$f; \ done + ETAGS = etags + ETAGSFLAGS = + + CTAGS = ctags + CTAGSFLAGS = + tags: TAGS ! ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) ! list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ ! unique=`for i in $$list; do \ ! if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ ! done | \ ! $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ ! mkid -fID $$unique ! TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ ! $(TAGS_FILES) $(LISP) tags=; \ here=`pwd`; \ ! list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ ! unique=`for i in $$list; do \ ! if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ ! done | \ ! $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ ! test -z "$(ETAGS_ARGS)$$tags$$unique" \ ! || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ! $$tags $$unique ! ! ctags: CTAGS ! CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ ! $(TAGS_FILES) $(LISP) ! tags=; \ ! here=`pwd`; \ ! list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ ! unique=`for i in $$list; do \ ! if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ ! done | \ ! $(AWK) ' { files[$$0] = 1; } \ ! END { for (i in files) print i; }'`; \ ! test -z "$(CTAGS_ARGS)$$tags$$unique" \ ! || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ ! $$tags $$unique ! ! GTAGS: ! here=`$(am__cd) $(top_builddir) && pwd` \ ! && cd $(top_srcdir) \ ! && gtags -i $(GTAGS_ARGS) $$here distclean-tags: ! -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags ! DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ! top_distdir = .. ! distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) ! @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ ! topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ ! list='$(DISTFILES)'; for file in $$list; do \ ! case $$file in \ ! $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ ! $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ ! esac; \ ! if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ ! dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ ! if test "$$dir" != "$$file" && test "$$dir" != "."; then \ ! dir="/$$dir"; \ ! $(mkinstalldirs) "$(distdir)$$dir"; \ ! else \ ! dir=''; \ ! fi; \ if test -d $$d/$$file; then \ ! if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ ! cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ ! fi; \ ! cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ else \ test -f $(distdir)/$$file \ ! || cp -p $$d/$$file $(distdir)/$$file \ ! || exit 1; \ fi; \ done check-am: all-am check: check-am ! all-am: Makefile $(LTLIBRARIES) $(DATA) ! installdirs: ! $(mkinstalldirs) $(DESTDIR)$(monikerdir) $(DESTDIR)$(serverdir) install: install-am ! install-exec: install-exec-am ! install-data: install-data-am uninstall: uninstall-am + install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + installcheck: installcheck-am + install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: clean-generic: *************** *** 479,527 **** distclean-generic: -rm -f Makefile $(CONFIG_CLEAN_FILES) - -rm -f config.cache config.log stamp-h stamp-h[0-9]* maintainer-clean-generic: ! mostlyclean-am: mostlyclean-monikerLTLIBRARIES mostlyclean-compile \ ! mostlyclean-libtool mostlyclean-tags \ ! mostlyclean-generic ! mostlyclean: mostlyclean-am ! clean-am: clean-monikerLTLIBRARIES clean-compile clean-libtool \ ! clean-tags clean-generic mostlyclean-am clean-local ! clean: clean-am ! distclean-am: distclean-monikerLTLIBRARIES distclean-compile \ ! distclean-libtool distclean-tags distclean-generic \ ! clean-am ! -rm -f libtool ! distclean: distclean-am ! maintainer-clean-am: maintainer-clean-monikerLTLIBRARIES \ ! maintainer-clean-compile maintainer-clean-libtool \ ! maintainer-clean-tags maintainer-clean-generic \ ! distclean-am ! @echo "This command is intended for maintainers to use;" ! @echo "it deletes files that may require special tools to rebuild." maintainer-clean: maintainer-clean-am ! .PHONY: mostlyclean-monikerLTLIBRARIES distclean-monikerLTLIBRARIES \ ! clean-monikerLTLIBRARIES maintainer-clean-monikerLTLIBRARIES \ ! uninstall-monikerLTLIBRARIES install-monikerLTLIBRARIES \ ! mostlyclean-compile distclean-compile clean-compile \ ! maintainer-clean-compile mostlyclean-libtool distclean-libtool \ ! clean-libtool maintainer-clean-libtool uninstall-serverDATA \ ! install-serverDATA tags mostlyclean-tags distclean-tags clean-tags \ ! maintainer-clean-tags distdir info-am info dvi-am dvi check check-am \ ! installcheck-am installcheck install-exec-am install-exec \ ! install-data-am install-data install-am install uninstall-am uninstall \ ! all-redirect all-am all installdirs mostlyclean-generic \ ! distclean-generic clean-generic maintainer-clean-generic clean \ ! mostlyclean distclean maintainer-clean GNOME_VFS_Moniker_std.server.in: $(srcdir)/GNOME_VFS_Moniker_std.server.in.in --- 513,582 ---- distclean-generic: -rm -f Makefile $(CONFIG_CLEAN_FILES) maintainer-clean-generic: ! @echo "This command is intended for maintainers to use" ! @echo "it deletes files that may require special tools to rebuild." ! clean: clean-am ! clean-am: clean-generic clean-libtool clean-local \ ! clean-monikerLTLIBRARIES mostlyclean-am ! distclean: distclean-am ! distclean-am: clean-am distclean-compile distclean-generic \ ! distclean-libtool distclean-tags ! dvi: dvi-am ! dvi-am: ! info: info-am ! ! info-am: ! ! install-data-am: install-monikerLTLIBRARIES install-serverDATA ! ! install-exec-am: ! ! install-info: install-info-am ! ! install-man: ! ! installcheck-am: maintainer-clean: maintainer-clean-am ! maintainer-clean-am: distclean-am maintainer-clean-generic ! ! mostlyclean: mostlyclean-am ! ! mostlyclean-am: mostlyclean-compile mostlyclean-generic \ ! mostlyclean-libtool ! ! pdf: pdf-am ! ! pdf-am: ! ! ps: ps-am ! ! ps-am: ! ! uninstall-am: uninstall-info-am uninstall-monikerLTLIBRARIES \ ! uninstall-serverDATA ! ! .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ ! clean-libtool clean-local clean-monikerLTLIBRARIES ctags \ ! distclean distclean-compile distclean-generic distclean-libtool \ ! distclean-tags distdir dvi dvi-am info info-am install \ ! install-am install-data install-data-am install-exec \ ! install-exec-am install-info install-info-am install-man \ ! install-monikerLTLIBRARIES install-serverDATA install-strip \ ! installcheck installcheck-am installdirs maintainer-clean \ ! maintainer-clean-generic mostlyclean mostlyclean-compile \ ! mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ ! tags uninstall uninstall-am uninstall-info-am \ ! uninstall-monikerLTLIBRARIES uninstall-serverDATA GNOME_VFS_Moniker_std.server.in: $(srcdir)/GNOME_VFS_Moniker_std.server.in.in *************** *** 532,538 **** clean-local: -rm -f $(server_DATA) - # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: --- 587,592 ---- diff -crN ./gnome-vfs/programs/Makefile.in /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/programs/Makefile.in *** ./gnome-vfs/programs/Makefile.in Mon Sep 8 14:19:52 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/programs/Makefile.in Thu Dec 18 21:13:14 2003 *************** *** 1,6 **** ! # Makefile.in generated automatically by automake 1.4-p6 from Makefile.am ! # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. --- 1,8 ---- ! # Makefile.in generated by automake 1.7.1 from Makefile.am. ! # @configure_input@ ! # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 ! # Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. *************** *** 10,87 **** # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. ! ! SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ - prefix = @prefix@ - exec_prefix = @exec_prefix@ - - bindir = @bindir@ - sbindir = @sbindir@ - libexecdir = @libexecdir@ - datadir = @datadir@ - sysconfdir = @sysconfdir@ - sharedstatedir = @sharedstatedir@ - localstatedir = @localstatedir@ - libdir = @libdir@ - infodir = @infodir@ - mandir = @mandir@ - includedir = @includedir@ - oldincludedir = /usr/include - - DESTDIR = - pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ - top_builddir = .. ! ACLOCAL = @ACLOCAL@ ! AUTOCONF = @AUTOCONF@ ! AUTOMAKE = @AUTOMAKE@ ! AUTOHEADER = @AUTOHEADER@ ! INSTALL = @INSTALL@ ! INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) ! INSTALL_DATA = @INSTALL_DATA@ ! INSTALL_SCRIPT = @INSTALL_SCRIPT@ ! transform = @program_transform_name@ ! NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : - host_alias = @host_alias@ host_triplet = @host@ ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ ! AS = @AS@ AWK = @AWK@ BONOBO_ACTIVATION_REQUIRED = @BONOBO_ACTIVATION_REQUIRED@ BONOBO_IDLDIR = @BONOBO_IDLDIR@ BONOBO_REQUIRED = @BONOBO_REQUIRED@ BZ2_LIBS = @BZ2_LIBS@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ CFLAGS = @CFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ ! CXX = @CXX@ DATADIRNAME = @DATADIRNAME@ DB2HTML = @DB2HTML@ ! DLLTOOL = @DLLTOOL@ ECHO = @ECHO@ ENABLE_PROFILER = @ENABLE_PROFILER@ EXEEXT = @EXEEXT@ FAM_LIBS = @FAM_LIBS@ GCONFTOOL = @GCONFTOOL@ GCONF_REQUIRED = @GCONF_REQUIRED@ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ --- 12,85 ---- # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. ! @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = .. ! am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ ! install_sh_DATA = $(install_sh) -c -m 644 ! install_sh_PROGRAM = $(install_sh) -c ! install_sh_SCRIPT = $(install_sh) -c ! INSTALL_HEADER = $(INSTALL_DATA) ! transform = $(program_transform_name) NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : host_triplet = @host@ + ACLOCAL = @ACLOCAL@ ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ ! ALLOCA = @ALLOCA@ ! AMDEP_FALSE = @AMDEP_FALSE@ ! AMDEP_TRUE = @AMDEP_TRUE@ ! AMTAR = @AMTAR@ ! AUTOCONF = @AUTOCONF@ ! AUTOHEADER = @AUTOHEADER@ ! AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BONOBO_ACTIVATION_REQUIRED = @BONOBO_ACTIVATION_REQUIRED@ BONOBO_IDLDIR = @BONOBO_IDLDIR@ BONOBO_REQUIRED = @BONOBO_REQUIRED@ + BUILD_CDEMENU_MODULE_FALSE = @BUILD_CDEMENU_MODULE_FALSE@ + BUILD_CDEMENU_MODULE_TRUE = @BUILD_CDEMENU_MODULE_TRUE@ BZ2_LIBS = @BZ2_LIBS@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ + CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ ! CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ DB2HTML = @DB2HTML@ ! DEFS = @DEFS@ ! DEPDIR = @DEPDIR@ ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ + ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ + ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ENABLE_PROFILER = @ENABLE_PROFILER@ + ENABLE_PROFILER_FALSE = @ENABLE_PROFILER_FALSE@ + ENABLE_PROFILER_TRUE = @ENABLE_PROFILER_TRUE@ EXEEXT = @EXEEXT@ FAM_LIBS = @FAM_LIBS@ GCONFTOOL = @GCONFTOOL@ GCONF_REQUIRED = @GCONF_REQUIRED@ + GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ + GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ *************** *** 90,99 **** --- 88,114 ---- GMSGFMT = @GMSGFMT@ GNOME_ACLOCAL_DIR = @GNOME_ACLOCAL_DIR@ GNOME_ACLOCAL_FLAGS = @GNOME_ACLOCAL_FLAGS@ + GNOME_INTERFACE_VERSION = @GNOME_INTERFACE_VERSION@ GNOME_VFS_DIR = @GNOME_VFS_DIR@ GTKDOC = @GTKDOC@ + HAVE_CDDA_FALSE = @HAVE_CDDA_FALSE@ + HAVE_CDDA_TRUE = @HAVE_CDDA_TRUE@ + HAVE_DOCBOOK_FALSE = @HAVE_DOCBOOK_FALSE@ + HAVE_DOCBOOK_TRUE = @HAVE_DOCBOOK_TRUE@ HAVE_GTK_DOC = @HAVE_GTK_DOC@ + HAVE_GTK_DOC_FALSE = @HAVE_GTK_DOC_FALSE@ + HAVE_GTK_DOC_TRUE = @HAVE_GTK_DOC_TRUE@ + HAVE_LIBEFS_FALSE = @HAVE_LIBEFS_FALSE@ + HAVE_LIBEFS_TRUE = @HAVE_LIBEFS_TRUE@ + HAVE_SSL_FALSE = @HAVE_SSL_FALSE@ + HAVE_SSL_TRUE = @HAVE_SSL_TRUE@ HTML_DIR = @HTML_DIR@ + INSIDE_GNOME_DOCU_FALSE = @INSIDE_GNOME_DOCU_FALSE@ + INSIDE_GNOME_DOCU_TRUE = @INSIDE_GNOME_DOCU_TRUE@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ + INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLLIBS = @INTLLIBS@ INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@ *************** *** 127,135 **** --- 142,154 ---- LIBGNUTLS_CONFIG = @LIBGNUTLS_CONFIG@ LIBGNUTLS_LIBS = @LIBGNUTLS_LIBS@ LIBIDL_REQUIRED = @LIBIDL_REQUIRED@ + LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ + MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ + MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MKINSTALLDIRS = @MKINSTALLDIRS@ MODULES_CFLAGS = @MODULES_CFLAGS@ *************** *** 144,161 **** MODULES_XML_LIBS = @MODULES_XML_LIBS@ MONIKERS_CFLAGS = @MONIKERS_CFLAGS@ MONIKERS_LIBS = @MONIKERS_LIBS@ ! OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ ORBIT_IDL = @ORBIT_IDL@ ORBIT_REQUIRED = @ORBIT_REQUIRED@ PACKAGE = @PACKAGE@ PKG_CONFIG = @PKG_CONFIG@ POFILES = @POFILES@ POPT_LIBS = @POPT_LIBS@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ RANLIB = @RANLIB@ STRIP = @STRIP@ TEST_CFLAGS = @TEST_CFLAGS@ TEST_LIBS = @TEST_LIBS@ --- 163,192 ---- MODULES_XML_LIBS = @MODULES_XML_LIBS@ MONIKERS_CFLAGS = @MONIKERS_CFLAGS@ MONIKERS_LIBS = @MONIKERS_LIBS@ ! MSGFMT = @MSGFMT@ OBJEXT = @OBJEXT@ + OPENSSL_CFLAGS = @OPENSSL_CFLAGS@ + OPENSSL_LIBS = @OPENSSL_LIBS@ ORBIT_IDL = @ORBIT_IDL@ ORBIT_REQUIRED = @ORBIT_REQUIRED@ PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ + PLATFORM_GNOME_2_FALSE = @PLATFORM_GNOME_2_FALSE@ + PLATFORM_GNOME_2_TRUE = @PLATFORM_GNOME_2_TRUE@ POFILES = @POFILES@ POPT_LIBS = @POPT_LIBS@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ RANLIB = @RANLIB@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ STRIP = @STRIP@ TEST_CFLAGS = @TEST_CFLAGS@ TEST_LIBS = @TEST_LIBS@ *************** *** 173,181 **** VFS_SIZE_IS = @VFS_SIZE_IS@ VFS_SIZE_PRINTF = @VFS_SIZE_PRINTF@ WARN_CFLAGS = @WARN_CFLAGS@ ! WARN_CXXFLAGS = @WARN_CXXFLAGS@ XML_REQUIRED = @XML_REQUIRED@ ! NULL = INCLUDES = \ --- 204,245 ---- VFS_SIZE_IS = @VFS_SIZE_IS@ VFS_SIZE_PRINTF = @VFS_SIZE_PRINTF@ WARN_CFLAGS = @WARN_CFLAGS@ ! XGETTEXT = @XGETTEXT@ XML_REQUIRED = @XML_REQUIRED@ ! ac_ct_CC = @ac_ct_CC@ ! ac_ct_RANLIB = @ac_ct_RANLIB@ ! ac_ct_STRIP = @ac_ct_STRIP@ ! am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ ! am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ ! am__include = @am__include@ ! am__quote = @am__quote@ ! bindir = @bindir@ ! build = @build@ ! build_alias = @build_alias@ ! build_cpu = @build_cpu@ ! build_os = @build_os@ ! build_vendor = @build_vendor@ ! datadir = @datadir@ ! exec_prefix = @exec_prefix@ ! host = @host@ ! host_alias = @host_alias@ ! host_cpu = @host_cpu@ ! host_os = @host_os@ ! host_vendor = @host_vendor@ ! includedir = @includedir@ ! infodir = @infodir@ ! install_sh = @install_sh@ ! libdir = @libdir@ ! libexecdir = @libexecdir@ ! localstatedir = @localstatedir@ ! mandir = @mandir@ ! oldincludedir = @oldincludedir@ ! prefix = @prefix@ ! program_transform_name = @program_transform_name@ ! sbindir = @sbindir@ ! sharedstatedir = @sharedstatedir@ ! sysconfdir = @sysconfdir@ ! target_alias = @target_alias@ NULL = INCLUDES = \ *************** *** 216,333 **** gnomevfs_mkdir_SOURCES = gnomevfs-mkdir.c gnomevfs_mkdir_LDADD = $(libraries) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ! CONFIG_HEADER = ../config.h ! CONFIG_CLEAN_FILES = ! bin_PROGRAMS = gnomevfs-cat$(EXEEXT) gnomevfs-copy$(EXEEXT) \ ! gnomevfs-info$(EXEEXT) gnomevfs-ls$(EXEEXT) gnomevfs-mkdir$(EXEEXT) ! PROGRAMS = $(bin_PROGRAMS) ! ! ! DEFS = @DEFS@ -I. -I$(srcdir) -I.. ! LIBS = @LIBS@ ! gnomevfs_cat_OBJECTS = gnomevfs-cat.$(OBJEXT) ! gnomevfs_cat_DEPENDENCIES = \ ! $(top_builddir)/libgnomevfs/libgnomevfs-2.la ! gnomevfs_cat_LDFLAGS = ! gnomevfs_copy_OBJECTS = gnomevfs-copy.$(OBJEXT) ! gnomevfs_copy_DEPENDENCIES = \ ! $(top_builddir)/libgnomevfs/libgnomevfs-2.la ! gnomevfs_copy_LDFLAGS = ! gnomevfs_info_OBJECTS = gnomevfs-info.$(OBJEXT) ! gnomevfs_info_DEPENDENCIES = \ ! $(top_builddir)/libgnomevfs/libgnomevfs-2.la ! gnomevfs_info_LDFLAGS = ! gnomevfs_ls_OBJECTS = gnomevfs-ls.$(OBJEXT) ! gnomevfs_ls_DEPENDENCIES = $(top_builddir)/libgnomevfs/libgnomevfs-2.la ! gnomevfs_ls_LDFLAGS = ! gnomevfs_mkdir_OBJECTS = gnomevfs-mkdir.$(OBJEXT) ! gnomevfs_mkdir_DEPENDENCIES = \ ! $(top_builddir)/libgnomevfs/libgnomevfs-2.la ! gnomevfs_mkdir_LDFLAGS = ! COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ! LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) ! LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ ! DIST_COMMON = Makefile.am Makefile.in ! ! ! DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) ! ! TAR = gtar ! GZIP_ENV = --best SOURCES = $(gnomevfs_cat_SOURCES) $(gnomevfs_copy_SOURCES) $(gnomevfs_info_SOURCES) $(gnomevfs_ls_SOURCES) $(gnomevfs_mkdir_SOURCES) - OBJECTS = $(gnomevfs_cat_OBJECTS) $(gnomevfs_copy_OBJECTS) $(gnomevfs_info_OBJECTS) $(gnomevfs_ls_OBJECTS) $(gnomevfs_mkdir_OBJECTS) - - all: all-redirect - .SUFFIXES: - .SUFFIXES: .S .c .lo .o .obj .s - $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps programs/Makefile - - Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) \ - && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status - - - mostlyclean-binPROGRAMS: - - clean-binPROGRAMS: - -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) - - distclean-binPROGRAMS: ! maintainer-clean-binPROGRAMS: install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(bindir) @list='$(bin_PROGRAMS)'; for p in $$list; do \ ! if test -f $$p; then \ ! echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ ! $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ else :; fi; \ done uninstall-binPROGRAMS: @$(NORMAL_UNINSTALL) ! list='$(bin_PROGRAMS)'; for p in $$list; do \ ! rm -f $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ done ! .c.o: ! $(COMPILE) -c $< ! ! # FIXME: We should only use cygpath when building on Windows, ! # and only if it is available. ! .c.obj: ! $(COMPILE) -c `cygpath -w $<` ! ! .s.o: ! $(COMPILE) -c $< ! ! .S.o: ! $(COMPILE) -c $< mostlyclean-compile: ! -rm -f *.o core *.core ! -rm -f *.$(OBJEXT) ! ! clean-compile: distclean-compile: -rm -f *.tab.c ! maintainer-clean-compile: ! ! .c.lo: ! $(LIBTOOL) --mode=compile $(COMPILE) -c $< ! .s.lo: ! $(LIBTOOL) --mode=compile $(COMPILE) -c $< ! .S.lo: ! $(LIBTOOL) --mode=compile $(COMPILE) -c $< mostlyclean-libtool: -rm -f *.lo --- 280,402 ---- gnomevfs_mkdir_SOURCES = gnomevfs-mkdir.c gnomevfs_mkdir_LDADD = $(libraries) + subdir = programs mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ! CONFIG_HEADER = $(top_builddir)/config.h ! CONFIG_CLEAN_FILES = ! bin_PROGRAMS = gnomevfs-cat$(EXEEXT) gnomevfs-copy$(EXEEXT) \ ! gnomevfs-info$(EXEEXT) gnomevfs-ls$(EXEEXT) \ ! gnomevfs-mkdir$(EXEEXT) ! PROGRAMS = $(bin_PROGRAMS) ! ! am_gnomevfs_cat_OBJECTS = gnomevfs-cat.$(OBJEXT) ! gnomevfs_cat_OBJECTS = $(am_gnomevfs_cat_OBJECTS) ! gnomevfs_cat_DEPENDENCIES = $(top_builddir)/libgnomevfs/libgnomevfs-2.la ! gnomevfs_cat_LDFLAGS = ! am_gnomevfs_copy_OBJECTS = gnomevfs-copy.$(OBJEXT) ! gnomevfs_copy_OBJECTS = $(am_gnomevfs_copy_OBJECTS) ! gnomevfs_copy_DEPENDENCIES = \ ! $(top_builddir)/libgnomevfs/libgnomevfs-2.la ! gnomevfs_copy_LDFLAGS = ! am_gnomevfs_info_OBJECTS = gnomevfs-info.$(OBJEXT) ! gnomevfs_info_OBJECTS = $(am_gnomevfs_info_OBJECTS) ! gnomevfs_info_DEPENDENCIES = \ ! $(top_builddir)/libgnomevfs/libgnomevfs-2.la ! gnomevfs_info_LDFLAGS = ! am_gnomevfs_ls_OBJECTS = gnomevfs-ls.$(OBJEXT) ! gnomevfs_ls_OBJECTS = $(am_gnomevfs_ls_OBJECTS) ! gnomevfs_ls_DEPENDENCIES = $(top_builddir)/libgnomevfs/libgnomevfs-2.la ! gnomevfs_ls_LDFLAGS = ! am_gnomevfs_mkdir_OBJECTS = gnomevfs-mkdir.$(OBJEXT) ! gnomevfs_mkdir_OBJECTS = $(am_gnomevfs_mkdir_OBJECTS) ! gnomevfs_mkdir_DEPENDENCIES = \ ! $(top_builddir)/libgnomevfs/libgnomevfs-2.la ! gnomevfs_mkdir_LDFLAGS = ! ! DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ! depcomp = ! am__depfiles_maybe = ! COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ ! $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ! LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ ! $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) ! LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ! $(AM_LDFLAGS) $(LDFLAGS) -o $@ ! DIST_SOURCES = $(gnomevfs_cat_SOURCES) $(gnomevfs_copy_SOURCES) \ ! $(gnomevfs_info_SOURCES) $(gnomevfs_ls_SOURCES) \ ! $(gnomevfs_mkdir_SOURCES) ! DIST_COMMON = Makefile.am Makefile.in SOURCES = $(gnomevfs_cat_SOURCES) $(gnomevfs_copy_SOURCES) $(gnomevfs_info_SOURCES) $(gnomevfs_ls_SOURCES) $(gnomevfs_mkdir_SOURCES) ! all: all-am + .SUFFIXES: + .SUFFIXES: .c .lo .o .obj + $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu --ignore-deps programs/Makefile + Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) + binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(bindir) @list='$(bin_PROGRAMS)'; for p in $$list; do \ ! p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ ! if test -f $$p \ ! || test -f $$p1 \ ! ; then \ ! f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ ! echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \ ! $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f || exit 1; \ else :; fi; \ done uninstall-binPROGRAMS: @$(NORMAL_UNINSTALL) ! @list='$(bin_PROGRAMS)'; for p in $$list; do \ ! f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ ! echo " rm -f $(DESTDIR)$(bindir)/$$f"; \ ! rm -f $(DESTDIR)$(bindir)/$$f; \ done ! clean-binPROGRAMS: ! @list='$(bin_PROGRAMS)'; for p in $$list; do \ ! f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ ! echo " rm -f $$p $$f"; \ ! rm -f $$p $$f ; \ ! done ! gnomevfs-cat$(EXEEXT): $(gnomevfs_cat_OBJECTS) $(gnomevfs_cat_DEPENDENCIES) ! @rm -f gnomevfs-cat$(EXEEXT) ! $(LINK) $(gnomevfs_cat_LDFLAGS) $(gnomevfs_cat_OBJECTS) $(gnomevfs_cat_LDADD) $(LIBS) ! gnomevfs-copy$(EXEEXT): $(gnomevfs_copy_OBJECTS) $(gnomevfs_copy_DEPENDENCIES) ! @rm -f gnomevfs-copy$(EXEEXT) ! $(LINK) $(gnomevfs_copy_LDFLAGS) $(gnomevfs_copy_OBJECTS) $(gnomevfs_copy_LDADD) $(LIBS) ! gnomevfs-info$(EXEEXT): $(gnomevfs_info_OBJECTS) $(gnomevfs_info_DEPENDENCIES) ! @rm -f gnomevfs-info$(EXEEXT) ! $(LINK) $(gnomevfs_info_LDFLAGS) $(gnomevfs_info_OBJECTS) $(gnomevfs_info_LDADD) $(LIBS) ! gnomevfs-ls$(EXEEXT): $(gnomevfs_ls_OBJECTS) $(gnomevfs_ls_DEPENDENCIES) ! @rm -f gnomevfs-ls$(EXEEXT) ! $(LINK) $(gnomevfs_ls_LDFLAGS) $(gnomevfs_ls_OBJECTS) $(gnomevfs_ls_LDADD) $(LIBS) ! gnomevfs-mkdir$(EXEEXT): $(gnomevfs_mkdir_OBJECTS) $(gnomevfs_mkdir_DEPENDENCIES) ! @rm -f gnomevfs-mkdir$(EXEEXT) ! $(LINK) $(gnomevfs_mkdir_LDFLAGS) $(gnomevfs_mkdir_OBJECTS) $(gnomevfs_mkdir_LDADD) $(LIBS) mostlyclean-compile: ! -rm -f *.$(OBJEXT) core *.core distclean-compile: -rm -f *.tab.c ! .c.o: ! $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< ! .c.obj: ! $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'` ! .c.lo: ! $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< mostlyclean-libtool: -rm -f *.lo *************** *** 336,563 **** -rm -rf .libs _libs distclean-libtool: ! maintainer-clean-libtool: ! ! gnomevfs-cat$(EXEEXT): $(gnomevfs_cat_OBJECTS) $(gnomevfs_cat_DEPENDENCIES) ! @rm -f gnomevfs-cat$(EXEEXT) ! $(LINK) $(gnomevfs_cat_LDFLAGS) $(gnomevfs_cat_OBJECTS) $(gnomevfs_cat_LDADD) $(LIBS) ! ! gnomevfs-copy$(EXEEXT): $(gnomevfs_copy_OBJECTS) $(gnomevfs_copy_DEPENDENCIES) ! @rm -f gnomevfs-copy$(EXEEXT) ! $(LINK) $(gnomevfs_copy_LDFLAGS) $(gnomevfs_copy_OBJECTS) $(gnomevfs_copy_LDADD) $(LIBS) ! ! gnomevfs-info$(EXEEXT): $(gnomevfs_info_OBJECTS) $(gnomevfs_info_DEPENDENCIES) ! @rm -f gnomevfs-info$(EXEEXT) ! $(LINK) $(gnomevfs_info_LDFLAGS) $(gnomevfs_info_OBJECTS) $(gnomevfs_info_LDADD) $(LIBS) ! ! gnomevfs-ls$(EXEEXT): $(gnomevfs_ls_OBJECTS) $(gnomevfs_ls_DEPENDENCIES) ! @rm -f gnomevfs-ls$(EXEEXT) ! $(LINK) $(gnomevfs_ls_LDFLAGS) $(gnomevfs_ls_OBJECTS) $(gnomevfs_ls_LDADD) $(LIBS) ! gnomevfs-mkdir$(EXEEXT): $(gnomevfs_mkdir_OBJECTS) $(gnomevfs_mkdir_DEPENDENCIES) ! @rm -f gnomevfs-mkdir$(EXEEXT) ! $(LINK) $(gnomevfs_mkdir_LDFLAGS) $(gnomevfs_mkdir_OBJECTS) $(gnomevfs_mkdir_LDADD) $(LIBS) tags: TAGS ! ID: $(HEADERS) $(SOURCES) $(LISP) ! list='$(SOURCES) $(HEADERS)'; \ ! unique=`for i in $$list; do echo $$i; done | \ ! awk ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ ! here=`pwd` && cd $(srcdir) \ ! && mkid -f$$here/ID $$unique $(LISP) ! TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) tags=; \ here=`pwd`; \ ! list='$(SOURCES) $(HEADERS)'; \ ! unique=`for i in $$list; do echo $$i; done | \ ! awk ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ ! test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ ! || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS) ! ! mostlyclean-tags: ! ! clean-tags: distclean-tags: ! -rm -f TAGS ID ! maintainer-clean-tags: ! ! distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) ! ! subdir = programs distdir: $(DISTFILES) ! @for file in $(DISTFILES); do \ ! d=$(srcdir); \ if test -d $$d/$$file; then \ ! cp -pr $$d/$$file $(distdir)/$$file; \ else \ test -f $(distdir)/$$file \ ! || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ ! || cp -p $$d/$$file $(distdir)/$$file || :; \ fi; \ done - gnomevfs-cat.o: gnomevfs-cat.c ../libgnomevfs/gnome-vfs.h \ - ../libgnomevfs/gnome-vfs-async-ops.h \ - ../libgnomevfs/gnome-vfs-file-info.h \ - ../libgnomevfs/gnome-vfs-file-size.h \ - ../libgnomevfs/gnome-vfs-result.h \ - ../libgnomevfs/gnome-vfs-uri.h \ - ../libgnomevfs/gnome-vfs-find-directory.h \ - ../libgnomevfs/gnome-vfs-handle.h \ - ../libgnomevfs/gnome-vfs-context.h \ - ../libgnomevfs/gnome-vfs-cancellation.h \ - ../libgnomevfs/gnome-vfs-xfer.h \ - ../libgnomevfs/gnome-vfs-directory.h \ - ../libgnomevfs/gnome-vfs-init.h \ - ../libgnomevfs/gnome-vfs-module-callback.h \ - ../libgnomevfs/gnome-vfs-monitor.h \ - ../libgnomevfs/gnome-vfs-ops.h ../libgnomevfs/gnome-vfs-utils.h - gnomevfs-copy.o: gnomevfs-copy.c ../libgnomevfs/gnome-vfs.h \ - ../libgnomevfs/gnome-vfs-async-ops.h \ - ../libgnomevfs/gnome-vfs-file-info.h \ - ../libgnomevfs/gnome-vfs-file-size.h \ - ../libgnomevfs/gnome-vfs-result.h \ - ../libgnomevfs/gnome-vfs-uri.h \ - ../libgnomevfs/gnome-vfs-find-directory.h \ - ../libgnomevfs/gnome-vfs-handle.h \ - ../libgnomevfs/gnome-vfs-context.h \ - ../libgnomevfs/gnome-vfs-cancellation.h \ - ../libgnomevfs/gnome-vfs-xfer.h \ - ../libgnomevfs/gnome-vfs-directory.h \ - ../libgnomevfs/gnome-vfs-init.h \ - ../libgnomevfs/gnome-vfs-module-callback.h \ - ../libgnomevfs/gnome-vfs-monitor.h \ - ../libgnomevfs/gnome-vfs-ops.h ../libgnomevfs/gnome-vfs-utils.h - gnomevfs-info.o: gnomevfs-info.c ../libgnomevfs/gnome-vfs.h \ - ../libgnomevfs/gnome-vfs-async-ops.h \ - ../libgnomevfs/gnome-vfs-file-info.h \ - ../libgnomevfs/gnome-vfs-file-size.h \ - ../libgnomevfs/gnome-vfs-result.h \ - ../libgnomevfs/gnome-vfs-uri.h \ - ../libgnomevfs/gnome-vfs-find-directory.h \ - ../libgnomevfs/gnome-vfs-handle.h \ - ../libgnomevfs/gnome-vfs-context.h \ - ../libgnomevfs/gnome-vfs-cancellation.h \ - ../libgnomevfs/gnome-vfs-xfer.h \ - ../libgnomevfs/gnome-vfs-directory.h \ - ../libgnomevfs/gnome-vfs-init.h \ - ../libgnomevfs/gnome-vfs-module-callback.h \ - ../libgnomevfs/gnome-vfs-monitor.h \ - ../libgnomevfs/gnome-vfs-ops.h ../libgnomevfs/gnome-vfs-utils.h - gnomevfs-ls.o: gnomevfs-ls.c ../libgnomevfs/gnome-vfs.h \ - ../libgnomevfs/gnome-vfs-async-ops.h \ - ../libgnomevfs/gnome-vfs-file-info.h \ - ../libgnomevfs/gnome-vfs-file-size.h \ - ../libgnomevfs/gnome-vfs-result.h \ - ../libgnomevfs/gnome-vfs-uri.h \ - ../libgnomevfs/gnome-vfs-find-directory.h \ - ../libgnomevfs/gnome-vfs-handle.h \ - ../libgnomevfs/gnome-vfs-context.h \ - ../libgnomevfs/gnome-vfs-cancellation.h \ - ../libgnomevfs/gnome-vfs-xfer.h \ - ../libgnomevfs/gnome-vfs-directory.h \ - ../libgnomevfs/gnome-vfs-init.h \ - ../libgnomevfs/gnome-vfs-module-callback.h \ - ../libgnomevfs/gnome-vfs-monitor.h \ - ../libgnomevfs/gnome-vfs-ops.h ../libgnomevfs/gnome-vfs-utils.h - gnomevfs-mkdir.o: gnomevfs-mkdir.c ../libgnomevfs/gnome-vfs.h \ - ../libgnomevfs/gnome-vfs-async-ops.h \ - ../libgnomevfs/gnome-vfs-file-info.h \ - ../libgnomevfs/gnome-vfs-file-size.h \ - ../libgnomevfs/gnome-vfs-result.h \ - ../libgnomevfs/gnome-vfs-uri.h \ - ../libgnomevfs/gnome-vfs-find-directory.h \ - ../libgnomevfs/gnome-vfs-handle.h \ - ../libgnomevfs/gnome-vfs-context.h \ - ../libgnomevfs/gnome-vfs-cancellation.h \ - ../libgnomevfs/gnome-vfs-xfer.h \ - ../libgnomevfs/gnome-vfs-directory.h \ - ../libgnomevfs/gnome-vfs-init.h \ - ../libgnomevfs/gnome-vfs-module-callback.h \ - ../libgnomevfs/gnome-vfs-monitor.h \ - ../libgnomevfs/gnome-vfs-ops.h ../libgnomevfs/gnome-vfs-utils.h - - info-am: - info: info-am - dvi-am: - dvi: dvi-am check-am: all-am check: check-am ! installcheck-am: ! installcheck: installcheck-am ! install-exec-am: install-binPROGRAMS ! install-exec: install-exec-am ! install-data-am: ! install-data: install-data-am - install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am install: install-am ! uninstall-am: uninstall-binPROGRAMS uninstall: uninstall-am - all-am: Makefile $(PROGRAMS) - all-redirect: all-am - install-strip: - $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install - installdirs: - $(mkinstalldirs) $(DESTDIR)$(bindir) mostlyclean-generic: clean-generic: distclean-generic: -rm -f Makefile $(CONFIG_CLEAN_FILES) - -rm -f config.cache config.log stamp-h stamp-h[0-9]* maintainer-clean-generic: ! mostlyclean-am: mostlyclean-binPROGRAMS mostlyclean-compile \ ! mostlyclean-libtool mostlyclean-tags \ ! mostlyclean-generic ! mostlyclean: mostlyclean-am ! clean-am: clean-binPROGRAMS clean-compile clean-libtool clean-tags \ ! clean-generic mostlyclean-am ! clean: clean-am ! distclean-am: distclean-binPROGRAMS distclean-compile distclean-libtool \ ! distclean-tags distclean-generic clean-am ! -rm -f libtool ! distclean: distclean-am ! maintainer-clean-am: maintainer-clean-binPROGRAMS \ ! maintainer-clean-compile maintainer-clean-libtool \ ! maintainer-clean-tags maintainer-clean-generic \ ! distclean-am ! @echo "This command is intended for maintainers to use;" ! @echo "it deletes files that may require special tools to rebuild." maintainer-clean: maintainer-clean-am ! .PHONY: mostlyclean-binPROGRAMS distclean-binPROGRAMS clean-binPROGRAMS \ ! maintainer-clean-binPROGRAMS uninstall-binPROGRAMS install-binPROGRAMS \ ! mostlyclean-compile distclean-compile clean-compile \ ! maintainer-clean-compile mostlyclean-libtool distclean-libtool \ ! clean-libtool maintainer-clean-libtool tags mostlyclean-tags \ ! distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ ! dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ ! install-exec install-data-am install-data install-am install \ ! uninstall-am uninstall all-redirect all-am all installdirs \ ! mostlyclean-generic distclean-generic clean-generic \ ! maintainer-clean-generic clean mostlyclean distclean maintainer-clean # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. --- 405,586 ---- -rm -rf .libs _libs distclean-libtool: + -rm -f libtool + uninstall-info-am: ! ETAGS = etags ! ETAGSFLAGS = ! CTAGS = ctags ! CTAGSFLAGS = tags: TAGS ! ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) ! list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ ! unique=`for i in $$list; do \ ! if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ ! done | \ ! $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ ! mkid -fID $$unique ! TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ ! $(TAGS_FILES) $(LISP) tags=; \ here=`pwd`; \ ! list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ ! unique=`for i in $$list; do \ ! if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ ! done | \ ! $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ ! test -z "$(ETAGS_ARGS)$$tags$$unique" \ ! || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ! $$tags $$unique ! ! ctags: CTAGS ! CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ ! $(TAGS_FILES) $(LISP) ! tags=; \ ! here=`pwd`; \ ! list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ ! unique=`for i in $$list; do \ ! if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ ! done | \ ! $(AWK) ' { files[$$0] = 1; } \ ! END { for (i in files) print i; }'`; \ ! test -z "$(CTAGS_ARGS)$$tags$$unique" \ ! || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ ! $$tags $$unique ! ! GTAGS: ! here=`$(am__cd) $(top_builddir) && pwd` \ ! && cd $(top_srcdir) \ ! && gtags -i $(GTAGS_ARGS) $$here distclean-tags: ! -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags ! DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ! top_distdir = .. ! distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) ! @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ ! topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ ! list='$(DISTFILES)'; for file in $$list; do \ ! case $$file in \ ! $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ ! $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ ! esac; \ ! if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ ! dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ ! if test "$$dir" != "$$file" && test "$$dir" != "."; then \ ! dir="/$$dir"; \ ! $(mkinstalldirs) "$(distdir)$$dir"; \ ! else \ ! dir=''; \ ! fi; \ if test -d $$d/$$file; then \ ! if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ ! cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ ! fi; \ ! cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ else \ test -f $(distdir)/$$file \ ! || cp -p $$d/$$file $(distdir)/$$file \ ! || exit 1; \ fi; \ done check-am: all-am check: check-am ! all-am: Makefile $(PROGRAMS) ! installdirs: ! $(mkinstalldirs) $(DESTDIR)$(bindir) install: install-am ! install-exec: install-exec-am ! install-data: install-data-am uninstall: uninstall-am + install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + installcheck: installcheck-am + install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: clean-generic: distclean-generic: -rm -f Makefile $(CONFIG_CLEAN_FILES) maintainer-clean-generic: ! @echo "This command is intended for maintainers to use" ! @echo "it deletes files that may require special tools to rebuild." ! clean: clean-am ! clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am ! distclean: distclean-am ! distclean-am: clean-am distclean-compile distclean-generic \ ! distclean-libtool distclean-tags ! dvi: dvi-am ! dvi-am: ! info: info-am ! ! info-am: ! ! install-data-am: ! ! install-exec-am: install-binPROGRAMS ! ! install-info: install-info-am ! ! install-man: ! ! installcheck-am: maintainer-clean: maintainer-clean-am ! maintainer-clean-am: distclean-am maintainer-clean-generic ! ! mostlyclean: mostlyclean-am ! ! mostlyclean-am: mostlyclean-compile mostlyclean-generic \ ! mostlyclean-libtool ! ! pdf: pdf-am ! ! pdf-am: ! ! ps: ps-am + ps-am: + + uninstall-am: uninstall-binPROGRAMS uninstall-info-am + + .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \ + clean-generic clean-libtool ctags distclean distclean-compile \ + distclean-generic distclean-libtool distclean-tags distdir dvi \ + dvi-am info info-am install install-am install-binPROGRAMS \ + install-data install-data-am install-exec install-exec-am \ + install-info install-info-am install-man install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags uninstall uninstall-am uninstall-binPROGRAMS \ + uninstall-info-am # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff -crN ./gnome-vfs/schemas/Makefile.in /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/schemas/Makefile.in *** ./gnome-vfs/schemas/Makefile.in Mon Sep 8 14:19:45 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/schemas/Makefile.in Thu Dec 18 21:13:15 2003 *************** *** 1,6 **** ! # Makefile.in generated automatically by automake 1.4-p6 from Makefile.am ! # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. --- 1,8 ---- ! # Makefile.in generated by automake 1.7.1 from Makefile.am. ! # @configure_input@ ! # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 ! # Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. *************** *** 10,87 **** # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. ! ! SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ - prefix = @prefix@ - exec_prefix = @exec_prefix@ - - bindir = @bindir@ - sbindir = @sbindir@ - libexecdir = @libexecdir@ - datadir = @datadir@ - sysconfdir = @sysconfdir@ - sharedstatedir = @sharedstatedir@ - localstatedir = @localstatedir@ - libdir = @libdir@ - infodir = @infodir@ - mandir = @mandir@ - includedir = @includedir@ - oldincludedir = /usr/include - - DESTDIR = - pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ - top_builddir = .. ! ACLOCAL = @ACLOCAL@ ! AUTOCONF = @AUTOCONF@ ! AUTOMAKE = @AUTOMAKE@ ! AUTOHEADER = @AUTOHEADER@ ! INSTALL = @INSTALL@ ! INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) ! INSTALL_DATA = @INSTALL_DATA@ ! INSTALL_SCRIPT = @INSTALL_SCRIPT@ ! transform = @program_transform_name@ ! NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : - host_alias = @host_alias@ host_triplet = @host@ ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ ! AS = @AS@ AWK = @AWK@ BONOBO_ACTIVATION_REQUIRED = @BONOBO_ACTIVATION_REQUIRED@ BONOBO_IDLDIR = @BONOBO_IDLDIR@ BONOBO_REQUIRED = @BONOBO_REQUIRED@ BZ2_LIBS = @BZ2_LIBS@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ CFLAGS = @CFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ ! CXX = @CXX@ DATADIRNAME = @DATADIRNAME@ DB2HTML = @DB2HTML@ ! DLLTOOL = @DLLTOOL@ ECHO = @ECHO@ ENABLE_PROFILER = @ENABLE_PROFILER@ EXEEXT = @EXEEXT@ FAM_LIBS = @FAM_LIBS@ GCONFTOOL = @GCONFTOOL@ GCONF_REQUIRED = @GCONF_REQUIRED@ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ --- 12,85 ---- # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. ! @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = .. ! am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ ! install_sh_DATA = $(install_sh) -c -m 644 ! install_sh_PROGRAM = $(install_sh) -c ! install_sh_SCRIPT = $(install_sh) -c ! INSTALL_HEADER = $(INSTALL_DATA) ! transform = $(program_transform_name) NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : host_triplet = @host@ + ACLOCAL = @ACLOCAL@ ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ ! ALLOCA = @ALLOCA@ ! AMDEP_FALSE = @AMDEP_FALSE@ ! AMDEP_TRUE = @AMDEP_TRUE@ ! AMTAR = @AMTAR@ ! AUTOCONF = @AUTOCONF@ ! AUTOHEADER = @AUTOHEADER@ ! AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BONOBO_ACTIVATION_REQUIRED = @BONOBO_ACTIVATION_REQUIRED@ BONOBO_IDLDIR = @BONOBO_IDLDIR@ BONOBO_REQUIRED = @BONOBO_REQUIRED@ + BUILD_CDEMENU_MODULE_FALSE = @BUILD_CDEMENU_MODULE_FALSE@ + BUILD_CDEMENU_MODULE_TRUE = @BUILD_CDEMENU_MODULE_TRUE@ BZ2_LIBS = @BZ2_LIBS@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ + CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ ! CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ DB2HTML = @DB2HTML@ ! DEFS = @DEFS@ ! DEPDIR = @DEPDIR@ ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ + ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ + ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ENABLE_PROFILER = @ENABLE_PROFILER@ + ENABLE_PROFILER_FALSE = @ENABLE_PROFILER_FALSE@ + ENABLE_PROFILER_TRUE = @ENABLE_PROFILER_TRUE@ EXEEXT = @EXEEXT@ FAM_LIBS = @FAM_LIBS@ GCONFTOOL = @GCONFTOOL@ GCONF_REQUIRED = @GCONF_REQUIRED@ + GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ + GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ *************** *** 90,99 **** --- 88,114 ---- GMSGFMT = @GMSGFMT@ GNOME_ACLOCAL_DIR = @GNOME_ACLOCAL_DIR@ GNOME_ACLOCAL_FLAGS = @GNOME_ACLOCAL_FLAGS@ + GNOME_INTERFACE_VERSION = @GNOME_INTERFACE_VERSION@ GNOME_VFS_DIR = @GNOME_VFS_DIR@ GTKDOC = @GTKDOC@ + HAVE_CDDA_FALSE = @HAVE_CDDA_FALSE@ + HAVE_CDDA_TRUE = @HAVE_CDDA_TRUE@ + HAVE_DOCBOOK_FALSE = @HAVE_DOCBOOK_FALSE@ + HAVE_DOCBOOK_TRUE = @HAVE_DOCBOOK_TRUE@ HAVE_GTK_DOC = @HAVE_GTK_DOC@ + HAVE_GTK_DOC_FALSE = @HAVE_GTK_DOC_FALSE@ + HAVE_GTK_DOC_TRUE = @HAVE_GTK_DOC_TRUE@ + HAVE_LIBEFS_FALSE = @HAVE_LIBEFS_FALSE@ + HAVE_LIBEFS_TRUE = @HAVE_LIBEFS_TRUE@ + HAVE_SSL_FALSE = @HAVE_SSL_FALSE@ + HAVE_SSL_TRUE = @HAVE_SSL_TRUE@ HTML_DIR = @HTML_DIR@ + INSIDE_GNOME_DOCU_FALSE = @INSIDE_GNOME_DOCU_FALSE@ + INSIDE_GNOME_DOCU_TRUE = @INSIDE_GNOME_DOCU_TRUE@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ + INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLLIBS = @INTLLIBS@ INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@ *************** *** 127,135 **** --- 142,154 ---- LIBGNUTLS_CONFIG = @LIBGNUTLS_CONFIG@ LIBGNUTLS_LIBS = @LIBGNUTLS_LIBS@ LIBIDL_REQUIRED = @LIBIDL_REQUIRED@ + LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ + MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ + MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MKINSTALLDIRS = @MKINSTALLDIRS@ MODULES_CFLAGS = @MODULES_CFLAGS@ *************** *** 144,161 **** MODULES_XML_LIBS = @MODULES_XML_LIBS@ MONIKERS_CFLAGS = @MONIKERS_CFLAGS@ MONIKERS_LIBS = @MONIKERS_LIBS@ ! OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ ORBIT_IDL = @ORBIT_IDL@ ORBIT_REQUIRED = @ORBIT_REQUIRED@ PACKAGE = @PACKAGE@ PKG_CONFIG = @PKG_CONFIG@ POFILES = @POFILES@ POPT_LIBS = @POPT_LIBS@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ RANLIB = @RANLIB@ STRIP = @STRIP@ TEST_CFLAGS = @TEST_CFLAGS@ TEST_LIBS = @TEST_LIBS@ --- 163,192 ---- MODULES_XML_LIBS = @MODULES_XML_LIBS@ MONIKERS_CFLAGS = @MONIKERS_CFLAGS@ MONIKERS_LIBS = @MONIKERS_LIBS@ ! MSGFMT = @MSGFMT@ OBJEXT = @OBJEXT@ + OPENSSL_CFLAGS = @OPENSSL_CFLAGS@ + OPENSSL_LIBS = @OPENSSL_LIBS@ ORBIT_IDL = @ORBIT_IDL@ ORBIT_REQUIRED = @ORBIT_REQUIRED@ PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ + PLATFORM_GNOME_2_FALSE = @PLATFORM_GNOME_2_FALSE@ + PLATFORM_GNOME_2_TRUE = @PLATFORM_GNOME_2_TRUE@ POFILES = @POFILES@ POPT_LIBS = @POPT_LIBS@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ RANLIB = @RANLIB@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ STRIP = @STRIP@ TEST_CFLAGS = @TEST_CFLAGS@ TEST_LIBS = @TEST_LIBS@ *************** *** 173,181 **** VFS_SIZE_IS = @VFS_SIZE_IS@ VFS_SIZE_PRINTF = @VFS_SIZE_PRINTF@ WARN_CFLAGS = @WARN_CFLAGS@ ! WARN_CXXFLAGS = @WARN_CXXFLAGS@ XML_REQUIRED = @XML_REQUIRED@ ! schemadir = $(GCONF_SCHEMA_FILE_DIR) schema_DATA = \ system_http_proxy.schemas \ --- 204,245 ---- VFS_SIZE_IS = @VFS_SIZE_IS@ VFS_SIZE_PRINTF = @VFS_SIZE_PRINTF@ WARN_CFLAGS = @WARN_CFLAGS@ ! XGETTEXT = @XGETTEXT@ XML_REQUIRED = @XML_REQUIRED@ ! ac_ct_CC = @ac_ct_CC@ ! ac_ct_RANLIB = @ac_ct_RANLIB@ ! ac_ct_STRIP = @ac_ct_STRIP@ ! am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ ! am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ ! am__include = @am__include@ ! am__quote = @am__quote@ ! bindir = @bindir@ ! build = @build@ ! build_alias = @build_alias@ ! build_cpu = @build_cpu@ ! build_os = @build_os@ ! build_vendor = @build_vendor@ ! datadir = @datadir@ ! exec_prefix = @exec_prefix@ ! host = @host@ ! host_alias = @host_alias@ ! host_cpu = @host_cpu@ ! host_os = @host_os@ ! host_vendor = @host_vendor@ ! includedir = @includedir@ ! infodir = @infodir@ ! install_sh = @install_sh@ ! libdir = @libdir@ ! libexecdir = @libexecdir@ ! localstatedir = @localstatedir@ ! mandir = @mandir@ ! oldincludedir = @oldincludedir@ ! prefix = @prefix@ ! program_transform_name = @program_transform_name@ ! sbindir = @sbindir@ ! sharedstatedir = @sharedstatedir@ ! sysconfdir = @sysconfdir@ ! target_alias = @target_alias@ schemadir = $(GCONF_SCHEMA_FILE_DIR) schema_DATA = \ system_http_proxy.schemas \ *************** *** 183,309 **** EXTRA_DIST = $(schema_DATA) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ! CONFIG_HEADER = ../config.h ! CONFIG_CLEAN_FILES = ! DATA = $(schema_DATA) ! ! DIST_COMMON = Makefile.am Makefile.in ! ! DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) - TAR = gtar - GZIP_ENV = --best - all: all-redirect .SUFFIXES: ! $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) ! cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps schemas/Makefile ! Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ! cd $(top_builddir) \ ! && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status install-schemaDATA: $(schema_DATA) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(schemadir) @list='$(schema_DATA)'; for p in $$list; do \ ! if test -f $(srcdir)/$$p; then \ ! echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(schemadir)/$$p"; \ ! $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(schemadir)/$$p; \ ! else if test -f $$p; then \ ! echo " $(INSTALL_DATA) $$p $(DESTDIR)$(schemadir)/$$p"; \ ! $(INSTALL_DATA) $$p $(DESTDIR)$(schemadir)/$$p; \ ! fi; fi; \ done uninstall-schemaDATA: @$(NORMAL_UNINSTALL) ! list='$(schema_DATA)'; for p in $$list; do \ ! rm -f $(DESTDIR)$(schemadir)/$$p; \ done tags: TAGS TAGS: ! distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) ! subdir = schemas distdir: $(DISTFILES) ! @for file in $(DISTFILES); do \ ! d=$(srcdir); \ if test -d $$d/$$file; then \ ! cp -pr $$d/$$file $(distdir)/$$file; \ else \ test -f $(distdir)/$$file \ ! || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ ! || cp -p $$d/$$file $(distdir)/$$file || :; \ fi; \ done - info-am: - info: info-am - dvi-am: - dvi: dvi-am check-am: all-am check: check-am ! installcheck-am: ! installcheck: installcheck-am ! install-exec-am: ! install-exec: install-exec-am ! install-data-am: install-schemaDATA install-data-local ! install-data: install-data-am - install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am install: install-am ! uninstall-am: uninstall-schemaDATA uninstall: uninstall-am - all-am: Makefile $(DATA) - all-redirect: all-am - install-strip: - $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install - installdirs: - $(mkinstalldirs) $(DESTDIR)$(schemadir) mostlyclean-generic: clean-generic: distclean-generic: -rm -f Makefile $(CONFIG_CLEAN_FILES) - -rm -f config.cache config.log stamp-h stamp-h[0-9]* maintainer-clean-generic: ! mostlyclean-am: mostlyclean-generic ! mostlyclean: mostlyclean-am ! clean-am: clean-generic mostlyclean-am ! clean: clean-am ! distclean-am: distclean-generic clean-am ! -rm -f libtool ! distclean: distclean-am ! maintainer-clean-am: maintainer-clean-generic distclean-am ! @echo "This command is intended for maintainers to use;" ! @echo "it deletes files that may require special tools to rebuild." maintainer-clean: maintainer-clean-am ! .PHONY: uninstall-schemaDATA install-schemaDATA tags distdir info-am \ ! info dvi-am dvi check check-am installcheck-am installcheck \ ! install-exec-am install-exec install-data-local install-data-am \ ! install-data install-am install uninstall-am uninstall all-redirect \ ! all-am all installdirs mostlyclean-generic distclean-generic \ ! clean-generic maintainer-clean-generic clean mostlyclean distclean \ ! maintainer-clean # don't do this if we are building in eg. rpm --- 247,420 ---- EXTRA_DIST = $(schema_DATA) + subdir = schemas mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ! CONFIG_HEADER = $(top_builddir)/config.h ! CONFIG_CLEAN_FILES = ! depcomp = ! am__depfiles_maybe = ! DIST_SOURCES = ! DATA = $(schema_DATA) ! DIST_COMMON = Makefile.am Makefile.in ! all: all-am .SUFFIXES: ! $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) ! cd $(top_srcdir) && \ ! $(AUTOMAKE) --gnu --ignore-deps schemas/Makefile ! Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status ! cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) ! mostlyclean-libtool: ! -rm -f *.lo + clean-libtool: + -rm -rf .libs _libs + distclean-libtool: + -rm -f libtool + uninstall-info-am: + schemaDATA_INSTALL = $(INSTALL_DATA) install-schemaDATA: $(schema_DATA) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(schemadir) @list='$(schema_DATA)'; for p in $$list; do \ ! if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ ! f="`echo $$p | sed -e 's|^.*/||'`"; \ ! echo " $(schemaDATA_INSTALL) $$d$$p $(DESTDIR)$(schemadir)/$$f"; \ ! $(schemaDATA_INSTALL) $$d$$p $(DESTDIR)$(schemadir)/$$f; \ done uninstall-schemaDATA: @$(NORMAL_UNINSTALL) ! @list='$(schema_DATA)'; for p in $$list; do \ ! f="`echo $$p | sed -e 's|^.*/||'`"; \ ! echo " rm -f $(DESTDIR)$(schemadir)/$$f"; \ ! rm -f $(DESTDIR)$(schemadir)/$$f; \ done tags: TAGS TAGS: + ctags: CTAGS + CTAGS: ! DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ! top_distdir = .. ! distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) ! @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ ! topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ ! list='$(DISTFILES)'; for file in $$list; do \ ! case $$file in \ ! $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ ! $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ ! esac; \ ! if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ ! dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ ! if test "$$dir" != "$$file" && test "$$dir" != "."; then \ ! dir="/$$dir"; \ ! $(mkinstalldirs) "$(distdir)$$dir"; \ ! else \ ! dir=''; \ ! fi; \ if test -d $$d/$$file; then \ ! if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ ! cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ ! fi; \ ! cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ else \ test -f $(distdir)/$$file \ ! || cp -p $$d/$$file $(distdir)/$$file \ ! || exit 1; \ fi; \ done check-am: all-am check: check-am ! all-am: Makefile $(DATA) ! installdirs: ! $(mkinstalldirs) $(DESTDIR)$(schemadir) install: install-am ! install-exec: install-exec-am ! install-data: install-data-am uninstall: uninstall-am + install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + installcheck: installcheck-am + install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: clean-generic: distclean-generic: -rm -f Makefile $(CONFIG_CLEAN_FILES) maintainer-clean-generic: ! @echo "This command is intended for maintainers to use" ! @echo "it deletes files that may require special tools to rebuild." ! clean: clean-am ! clean-am: clean-generic clean-libtool mostlyclean-am ! distclean: distclean-am ! distclean-am: clean-am distclean-generic distclean-libtool ! dvi: dvi-am ! dvi-am: ! info: info-am ! ! info-am: ! ! install-data-am: install-data-local install-schemaDATA ! ! install-exec-am: ! ! install-info: install-info-am ! ! install-man: ! ! installcheck-am: maintainer-clean: maintainer-clean-am ! maintainer-clean-am: distclean-am maintainer-clean-generic ! ! mostlyclean: mostlyclean-am ! ! mostlyclean-am: mostlyclean-generic mostlyclean-libtool ! ! pdf: pdf-am ! ! pdf-am: ! ! ps: ps-am ! ! ps-am: ! ! uninstall-am: uninstall-info-am uninstall-schemaDATA ! ! .PHONY: all all-am check check-am clean clean-generic clean-libtool \ ! distclean distclean-generic distclean-libtool distdir dvi \ ! dvi-am info info-am install install-am install-data \ ! install-data-am install-data-local install-exec install-exec-am \ ! install-info install-info-am install-man install-schemaDATA \ ! install-strip installcheck installcheck-am installdirs \ ! maintainer-clean maintainer-clean-generic mostlyclean \ ! mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ ! uninstall uninstall-am uninstall-info-am uninstall-schemaDATA # don't do this if we are building in eg. rpm *************** *** 314,320 **** @GCONF_SCHEMAS_INSTALL_TRUE@ done \ @GCONF_SCHEMAS_INSTALL_TRUE@ fi @GCONF_SCHEMAS_INSTALL_FALSE@install-data-local: - # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: --- 425,430 ---- diff -crN ./gnome-vfs/test/Makefile.in /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/test/Makefile.in *** ./gnome-vfs/test/Makefile.in Mon Sep 8 14:19:53 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/test/Makefile.in Thu Dec 18 21:13:17 2003 *************** *** 1,6 **** ! # Makefile.in generated automatically by automake 1.4-p6 from Makefile.am ! # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. --- 1,8 ---- ! # Makefile.in generated by automake 1.7.1 from Makefile.am. ! # @configure_input@ ! # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 ! # Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. *************** *** 10,87 **** # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. ! ! SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ - prefix = @prefix@ - exec_prefix = @exec_prefix@ - - bindir = @bindir@ - sbindir = @sbindir@ - libexecdir = @libexecdir@ - datadir = @datadir@ - sysconfdir = @sysconfdir@ - sharedstatedir = @sharedstatedir@ - localstatedir = @localstatedir@ - libdir = @libdir@ - infodir = @infodir@ - mandir = @mandir@ - includedir = @includedir@ - oldincludedir = /usr/include - - DESTDIR = - pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ - top_builddir = .. ! ACLOCAL = @ACLOCAL@ ! AUTOCONF = @AUTOCONF@ ! AUTOMAKE = @AUTOMAKE@ ! AUTOHEADER = @AUTOHEADER@ ! INSTALL = @INSTALL@ ! INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) ! INSTALL_DATA = @INSTALL_DATA@ ! INSTALL_SCRIPT = @INSTALL_SCRIPT@ ! transform = @program_transform_name@ ! NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : - host_alias = @host_alias@ host_triplet = @host@ ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ ! AS = @AS@ AWK = @AWK@ BONOBO_ACTIVATION_REQUIRED = @BONOBO_ACTIVATION_REQUIRED@ BONOBO_IDLDIR = @BONOBO_IDLDIR@ BONOBO_REQUIRED = @BONOBO_REQUIRED@ BZ2_LIBS = @BZ2_LIBS@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ CFLAGS = @CFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ ! CXX = @CXX@ DATADIRNAME = @DATADIRNAME@ DB2HTML = @DB2HTML@ ! DLLTOOL = @DLLTOOL@ ECHO = @ECHO@ ENABLE_PROFILER = @ENABLE_PROFILER@ EXEEXT = @EXEEXT@ FAM_LIBS = @FAM_LIBS@ GCONFTOOL = @GCONFTOOL@ GCONF_REQUIRED = @GCONF_REQUIRED@ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ --- 12,85 ---- # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. ! @SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = .. ! am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ ! install_sh_DATA = $(install_sh) -c -m 644 ! install_sh_PROGRAM = $(install_sh) -c ! install_sh_SCRIPT = $(install_sh) -c ! INSTALL_HEADER = $(INSTALL_DATA) ! transform = $(program_transform_name) NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : host_triplet = @host@ + ACLOCAL = @ACLOCAL@ ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ ! ALLOCA = @ALLOCA@ ! AMDEP_FALSE = @AMDEP_FALSE@ ! AMDEP_TRUE = @AMDEP_TRUE@ ! AMTAR = @AMTAR@ ! AUTOCONF = @AUTOCONF@ ! AUTOHEADER = @AUTOHEADER@ ! AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BONOBO_ACTIVATION_REQUIRED = @BONOBO_ACTIVATION_REQUIRED@ BONOBO_IDLDIR = @BONOBO_IDLDIR@ BONOBO_REQUIRED = @BONOBO_REQUIRED@ + BUILD_CDEMENU_MODULE_FALSE = @BUILD_CDEMENU_MODULE_FALSE@ + BUILD_CDEMENU_MODULE_TRUE = @BUILD_CDEMENU_MODULE_TRUE@ BZ2_LIBS = @BZ2_LIBS@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ + CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ ! CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ DB2HTML = @DB2HTML@ ! DEFS = @DEFS@ ! DEPDIR = @DEPDIR@ ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ + ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@ + ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@ ENABLE_PROFILER = @ENABLE_PROFILER@ + ENABLE_PROFILER_FALSE = @ENABLE_PROFILER_FALSE@ + ENABLE_PROFILER_TRUE = @ENABLE_PROFILER_TRUE@ EXEEXT = @EXEEXT@ FAM_LIBS = @FAM_LIBS@ GCONFTOOL = @GCONFTOOL@ GCONF_REQUIRED = @GCONF_REQUIRED@ + GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@ + GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ *************** *** 90,99 **** --- 88,114 ---- GMSGFMT = @GMSGFMT@ GNOME_ACLOCAL_DIR = @GNOME_ACLOCAL_DIR@ GNOME_ACLOCAL_FLAGS = @GNOME_ACLOCAL_FLAGS@ + GNOME_INTERFACE_VERSION = @GNOME_INTERFACE_VERSION@ GNOME_VFS_DIR = @GNOME_VFS_DIR@ GTKDOC = @GTKDOC@ + HAVE_CDDA_FALSE = @HAVE_CDDA_FALSE@ + HAVE_CDDA_TRUE = @HAVE_CDDA_TRUE@ + HAVE_DOCBOOK_FALSE = @HAVE_DOCBOOK_FALSE@ + HAVE_DOCBOOK_TRUE = @HAVE_DOCBOOK_TRUE@ HAVE_GTK_DOC = @HAVE_GTK_DOC@ + HAVE_GTK_DOC_FALSE = @HAVE_GTK_DOC_FALSE@ + HAVE_GTK_DOC_TRUE = @HAVE_GTK_DOC_TRUE@ + HAVE_LIBEFS_FALSE = @HAVE_LIBEFS_FALSE@ + HAVE_LIBEFS_TRUE = @HAVE_LIBEFS_TRUE@ + HAVE_SSL_FALSE = @HAVE_SSL_FALSE@ + HAVE_SSL_TRUE = @HAVE_SSL_TRUE@ HTML_DIR = @HTML_DIR@ + INSIDE_GNOME_DOCU_FALSE = @INSIDE_GNOME_DOCU_FALSE@ + INSIDE_GNOME_DOCU_TRUE = @INSIDE_GNOME_DOCU_TRUE@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ + INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLLIBS = @INTLLIBS@ INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@ *************** *** 127,135 **** --- 142,154 ---- LIBGNUTLS_CONFIG = @LIBGNUTLS_CONFIG@ LIBGNUTLS_LIBS = @LIBGNUTLS_LIBS@ LIBIDL_REQUIRED = @LIBIDL_REQUIRED@ + LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ + MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ + MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MKINSTALLDIRS = @MKINSTALLDIRS@ MODULES_CFLAGS = @MODULES_CFLAGS@ *************** *** 144,161 **** MODULES_XML_LIBS = @MODULES_XML_LIBS@ MONIKERS_CFLAGS = @MONIKERS_CFLAGS@ MONIKERS_LIBS = @MONIKERS_LIBS@ ! OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ ORBIT_IDL = @ORBIT_IDL@ ORBIT_REQUIRED = @ORBIT_REQUIRED@ PACKAGE = @PACKAGE@ PKG_CONFIG = @PKG_CONFIG@ POFILES = @POFILES@ POPT_LIBS = @POPT_LIBS@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ RANLIB = @RANLIB@ STRIP = @STRIP@ TEST_CFLAGS = @TEST_CFLAGS@ TEST_LIBS = @TEST_LIBS@ --- 163,192 ---- MODULES_XML_LIBS = @MODULES_XML_LIBS@ MONIKERS_CFLAGS = @MONIKERS_CFLAGS@ MONIKERS_LIBS = @MONIKERS_LIBS@ ! MSGFMT = @MSGFMT@ OBJEXT = @OBJEXT@ + OPENSSL_CFLAGS = @OPENSSL_CFLAGS@ + OPENSSL_LIBS = @OPENSSL_LIBS@ ORBIT_IDL = @ORBIT_IDL@ ORBIT_REQUIRED = @ORBIT_REQUIRED@ PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ + PACKAGE_NAME = @PACKAGE_NAME@ + PACKAGE_STRING = @PACKAGE_STRING@ + PACKAGE_TARNAME = @PACKAGE_TARNAME@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ + PLATFORM_GNOME_2_FALSE = @PLATFORM_GNOME_2_FALSE@ + PLATFORM_GNOME_2_TRUE = @PLATFORM_GNOME_2_TRUE@ POFILES = @POFILES@ POPT_LIBS = @POPT_LIBS@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ RANLIB = @RANLIB@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ STRIP = @STRIP@ TEST_CFLAGS = @TEST_CFLAGS@ TEST_LIBS = @TEST_LIBS@ *************** *** 173,181 **** VFS_SIZE_IS = @VFS_SIZE_IS@ VFS_SIZE_PRINTF = @VFS_SIZE_PRINTF@ WARN_CFLAGS = @WARN_CFLAGS@ ! WARN_CXXFLAGS = @WARN_CXXFLAGS@ XML_REQUIRED = @XML_REQUIRED@ ! NULL = INCLUDES = \ --- 204,245 ---- VFS_SIZE_IS = @VFS_SIZE_IS@ VFS_SIZE_PRINTF = @VFS_SIZE_PRINTF@ WARN_CFLAGS = @WARN_CFLAGS@ ! XGETTEXT = @XGETTEXT@ XML_REQUIRED = @XML_REQUIRED@ ! ac_ct_CC = @ac_ct_CC@ ! ac_ct_RANLIB = @ac_ct_RANLIB@ ! ac_ct_STRIP = @ac_ct_STRIP@ ! am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ ! am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ ! am__include = @am__include@ ! am__quote = @am__quote@ ! bindir = @bindir@ ! build = @build@ ! build_alias = @build_alias@ ! build_cpu = @build_cpu@ ! build_os = @build_os@ ! build_vendor = @build_vendor@ ! datadir = @datadir@ ! exec_prefix = @exec_prefix@ ! host = @host@ ! host_alias = @host_alias@ ! host_cpu = @host_cpu@ ! host_os = @host_os@ ! host_vendor = @host_vendor@ ! includedir = @includedir@ ! infodir = @infodir@ ! install_sh = @install_sh@ ! libdir = @libdir@ ! libexecdir = @libexecdir@ ! localstatedir = @localstatedir@ ! mandir = @mandir@ ! oldincludedir = @oldincludedir@ ! prefix = @prefix@ ! program_transform_name = @program_transform_name@ ! sbindir = @sbindir@ ! sharedstatedir = @sharedstatedir@ ! sysconfdir = @sysconfdir@ ! target_alias = @target_alias@ NULL = INCLUDES = \ *************** *** 221,226 **** --- 285,291 ---- test_files = \ + auto-test \ test.input \ test.cmds \ test.output *************** *** 247,258 **** test_performance_SOURCES = test-performance.c test_performance_LDADD = $(libraries) #test_resolv_SOURCES = test-resolv.c #test_resolv_LDADD = $(libraries) #test_subdir_SOURCES = test-subdir.c #test_subdir_LDADD = $(libraries) - test_async_directory_SOURCES = test-async-directory.c test_async_directory_LDADD = $(libraries) --- 312,323 ---- test_performance_SOURCES = test-performance.c test_performance_LDADD = $(libraries) + #test_resolv_SOURCES = test-resolv.c #test_resolv_LDADD = $(libraries) #test_subdir_SOURCES = test-subdir.c #test_subdir_LDADD = $(libraries) test_async_directory_SOURCES = test-async-directory.c test_async_directory_LDADD = $(libraries) *************** *** 325,333 **** test_monitor_SOURCES = test-monitor.c test_monitor_LDADD = $(libraries) - # test_metadata_SOURCES = test-metadata.c - # test_metadata_LDADD = $(libraries) - test_callback_SOURCES = test-callback.c test_callback_LDADD = $(libraries) --- 390,395 ---- *************** *** 339,1152 **** EXTRA_DIST = \ $(test_files) \ - auto-test \ vfs-run.in mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ! CONFIG_HEADER = ../config.h ! CONFIG_CLEAN_FILES = vfs-run ! noinst_PROGRAMS = test-async$(EXEEXT) test-async-cancel$(EXEEXT) \ ! test-async-directory$(EXEEXT) test-channel$(EXEEXT) \ ! test-directory$(EXEEXT) test-directory-visit$(EXEEXT) \ ! test-dirop$(EXEEXT) test-escape$(EXEEXT) test-find-directory$(EXEEXT) \ ! test-info$(EXEEXT) test-mime$(EXEEXT) test-mime-handlers$(EXEEXT) \ ! test-mime-handlers-set$(EXEEXT) test-mime-info$(EXEEXT) \ ! test-monitor$(EXEEXT) test-performance$(EXEEXT) test-seek$(EXEEXT) \ ! test-shell$(EXEEXT) test-symlinks$(EXEEXT) test-ssl$(EXEEXT) \ ! test-sync$(EXEEXT) test-sync-create$(EXEEXT) test-sync-write$(EXEEXT) \ ! test-unlink$(EXEEXT) test-uri$(EXEEXT) test-xfer$(EXEEXT) \ ! test-callback$(EXEEXT) test-module-selftest$(EXEEXT) \ ! test-queue$(EXEEXT) ! PROGRAMS = $(noinst_PROGRAMS) ! ! ! DEFS = @DEFS@ -I. -I$(srcdir) -I.. ! LIBS = @LIBS@ ! test_async_OBJECTS = test-async.$(OBJEXT) ! test_async_DEPENDENCIES = $(top_builddir)/libgnomevfs/libgnomevfs-2.la ! test_async_LDFLAGS = ! test_async_cancel_OBJECTS = test-async-cancel.$(OBJEXT) ! test_async_cancel_DEPENDENCIES = \ ! $(top_builddir)/libgnomevfs/libgnomevfs-2.la ! test_async_cancel_LDFLAGS = ! test_async_directory_OBJECTS = test-async-directory.$(OBJEXT) ! test_async_directory_DEPENDENCIES = \ ! $(top_builddir)/libgnomevfs/libgnomevfs-2.la ! test_async_directory_LDFLAGS = ! test_channel_OBJECTS = test-channel.$(OBJEXT) ! test_channel_DEPENDENCIES = \ ! $(top_builddir)/libgnomevfs/libgnomevfs-2.la ! test_channel_LDFLAGS = ! test_directory_OBJECTS = test-directory.$(OBJEXT) ! test_directory_DEPENDENCIES = \ ! $(top_builddir)/libgnomevfs/libgnomevfs-2.la ! test_directory_LDFLAGS = ! test_directory_visit_OBJECTS = test-directory-visit.$(OBJEXT) ! test_directory_visit_DEPENDENCIES = \ ! $(top_builddir)/libgnomevfs/libgnomevfs-2.la ! test_directory_visit_LDFLAGS = ! test_dirop_OBJECTS = test-dirop.$(OBJEXT) ! test_dirop_DEPENDENCIES = $(top_builddir)/libgnomevfs/libgnomevfs-2.la ! test_dirop_LDFLAGS = ! test_escape_OBJECTS = test-escape.$(OBJEXT) ! test_escape_DEPENDENCIES = $(top_builddir)/libgnomevfs/libgnomevfs-2.la ! test_escape_LDFLAGS = ! test_find_directory_OBJECTS = test-find-directory.$(OBJEXT) ! test_find_directory_DEPENDENCIES = \ ! $(top_builddir)/libgnomevfs/libgnomevfs-2.la ! test_find_directory_LDFLAGS = ! test_info_OBJECTS = test-info.$(OBJEXT) ! test_info_DEPENDENCIES = $(top_builddir)/libgnomevfs/libgnomevfs-2.la ! test_info_LDFLAGS = ! test_mime_OBJECTS = test-mime.$(OBJEXT) ! test_mime_DEPENDENCIES = $(top_builddir)/libgnomevfs/libgnomevfs-2.la ! test_mime_LDFLAGS = ! test_mime_handlers_OBJECTS = test-mime-handlers.$(OBJEXT) ! test_mime_handlers_DEPENDENCIES = \ ! $(top_builddir)/libgnomevfs/libgnomevfs-2.la ! test_mime_handlers_LDFLAGS = ! test_mime_handlers_set_OBJECTS = test-mime-handlers-set.$(OBJEXT) ! test_mime_handlers_set_DEPENDENCIES = \ ! $(top_builddir)/libgnomevfs/libgnomevfs-2.la ! test_mime_handlers_set_LDFLAGS = ! test_mime_info_OBJECTS = test-mime-info.$(OBJEXT) ! test_mime_info_DEPENDENCIES = \ ! $(top_builddir)/libgnomevfs/libgnomevfs-2.la ! test_mime_info_LDFLAGS = ! test_monitor_OBJECTS = test-monitor.$(OBJEXT) ! test_monitor_DEPENDENCIES = \ ! $(top_builddir)/libgnomevfs/libgnomevfs-2.la ! test_monitor_LDFLAGS = ! test_performance_OBJECTS = test-performance.$(OBJEXT) ! test_performance_DEPENDENCIES = \ ! $(top_builddir)/libgnomevfs/libgnomevfs-2.la ! test_performance_LDFLAGS = ! test_seek_OBJECTS = test-seek.$(OBJEXT) ! test_seek_DEPENDENCIES = $(top_builddir)/libgnomevfs/libgnomevfs-2.la ! test_seek_LDFLAGS = ! test_shell_OBJECTS = test-shell.$(OBJEXT) ! test_shell_DEPENDENCIES = $(top_builddir)/libgnomevfs/libgnomevfs-2.la ! test_shell_LDFLAGS = ! test_symlinks_OBJECTS = test-symlinks.$(OBJEXT) ! test_symlinks_DEPENDENCIES = \ ! $(top_builddir)/libgnomevfs/libgnomevfs-2.la ! test_symlinks_LDFLAGS = ! test_ssl_OBJECTS = test-ssl.$(OBJEXT) ! test_ssl_DEPENDENCIES = $(top_builddir)/libgnomevfs/libgnomevfs-2.la ! test_ssl_LDFLAGS = ! test_sync_OBJECTS = test-sync.$(OBJEXT) ! test_sync_DEPENDENCIES = $(top_builddir)/libgnomevfs/libgnomevfs-2.la ! test_sync_LDFLAGS = ! test_sync_create_OBJECTS = test-sync-create.$(OBJEXT) ! test_sync_create_DEPENDENCIES = \ ! $(top_builddir)/libgnomevfs/libgnomevfs-2.la ! test_sync_create_LDFLAGS = ! test_sync_write_OBJECTS = test-sync-write.$(OBJEXT) ! test_sync_write_DEPENDENCIES = \ ! $(top_builddir)/libgnomevfs/libgnomevfs-2.la ! test_sync_write_LDFLAGS = ! test_unlink_OBJECTS = test-unlink.$(OBJEXT) ! test_unlink_DEPENDENCIES = $(top_builddir)/libgnomevfs/libgnomevfs-2.la ! test_unlink_LDFLAGS = ! test_uri_OBJECTS = test-uri.$(OBJEXT) ! test_uri_DEPENDENCIES = $(top_builddir)/libgnomevfs/libgnomevfs-2.la ! test_uri_LDFLAGS = ! test_xfer_OBJECTS = test-xfer.$(OBJEXT) ! test_xfer_DEPENDENCIES = $(top_builddir)/libgnomevfs/libgnomevfs-2.la ! test_xfer_LDFLAGS = ! test_callback_OBJECTS = test-callback.$(OBJEXT) ! test_callback_DEPENDENCIES = \ ! $(top_builddir)/libgnomevfs/libgnomevfs-2.la ! test_callback_LDFLAGS = ! test_module_selftest_OBJECTS = test-module-selftest.$(OBJEXT) ! test_module_selftest_DEPENDENCIES = \ ! $(top_builddir)/libgnomevfs/libgnomevfs-2.la ! test_module_selftest_LDFLAGS = ! test_queue_OBJECTS = test-queue.$(OBJEXT) ! test_queue_DEPENDENCIES = $(top_builddir)/libgnomevfs/libgnomevfs-2.la ! test_queue_LDFLAGS = ! COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ! LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) ! LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ ! DIST_COMMON = Makefile.am Makefile.in vfs-run.in ! ! ! DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) ! TAR = gtar ! GZIP_ENV = --best ! SOURCES = $(test_async_SOURCES) $(test_async_cancel_SOURCES) $(test_async_directory_SOURCES) $(test_channel_SOURCES) $(test_directory_SOURCES) $(test_directory_visit_SOURCES) $(test_dirop_SOURCES) $(test_escape_SOURCES) $(test_find_directory_SOURCES) $(test_info_SOURCES) $(test_mime_SOURCES) $(test_mime_handlers_SOURCES) $(test_mime_handlers_set_SOURCES) $(test_mime_info_SOURCES) $(test_monitor_SOURCES) $(test_performance_SOURCES) $(test_seek_SOURCES) $(test_shell_SOURCES) $(test_symlinks_SOURCES) $(test_ssl_SOURCES) $(test_sync_SOURCES) $(test_sync_create_SOURCES) $(test_sync_write_SOURCES) $(test_unlink_SOURCES) $(test_uri_SOURCES) $(test_xfer_SOURCES) $(test_callback_SOURCES) $(test_module_selftest_SOURCES) $(test_queue_SOURCES) ! OBJECTS = $(test_async_OBJECTS) $(test_async_cancel_OBJECTS) $(test_async_directory_OBJECTS) $(test_channel_OBJECTS) $(test_directory_OBJECTS) $(test_directory_visit_OBJECTS) $(test_dirop_OBJECTS) $(test_escape_OBJECTS) $(test_find_directory_OBJECTS) $(test_info_OBJECTS) $(test_mime_OBJECTS) $(test_mime_handlers_OBJECTS) $(test_mime_handlers_set_OBJECTS) $(test_mime_info_OBJECTS) $(test_monitor_OBJECTS) $(test_performance_OBJECTS) $(test_seek_OBJECTS) $(test_shell_OBJECTS) $(test_symlinks_OBJECTS) $(test_ssl_OBJECTS) $(test_sync_OBJECTS) $(test_sync_create_OBJECTS) $(test_sync_write_OBJECTS) $(test_unlink_OBJECTS) $(test_uri_OBJECTS) $(test_xfer_OBJECTS) $(test_callback_OBJECTS) $(test_module_selftest_OBJECTS) $(test_queue_OBJECTS) - all: all-redirect .SUFFIXES: ! .SUFFIXES: .S .c .lo .o .obj .s ! $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) ! cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps test/Makefile ! ! Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ! cd $(top_builddir) \ ! && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status ! vfs-run: $(top_builddir)/config.status vfs-run.in ! cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status ! ! mostlyclean-noinstPROGRAMS: clean-noinstPROGRAMS: ! -test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS) ! ! distclean-noinstPROGRAMS: ! ! maintainer-clean-noinstPROGRAMS: ! ! .c.o: ! $(COMPILE) -c $< ! ! # FIXME: We should only use cygpath when building on Windows, ! # and only if it is available. ! .c.obj: ! $(COMPILE) -c `cygpath -w $<` ! ! .s.o: ! $(COMPILE) -c $< ! ! .S.o: ! $(COMPILE) -c $< ! ! mostlyclean-compile: ! -rm -f *.o core *.core ! -rm -f *.$(OBJEXT) ! ! clean-compile: ! ! distclean-compile: ! -rm -f *.tab.c ! ! maintainer-clean-compile: ! ! .c.lo: ! $(LIBTOOL) --mode=compile $(COMPILE) -c $< ! ! .s.lo: ! $(LIBTOOL) --mode=compile $(COMPILE) -c $< ! ! .S.lo: ! $(LIBTOOL) --mode=compile $(COMPILE) -c $< ! ! mostlyclean-libtool: ! -rm -f *.lo ! ! clean-libtool: ! -rm -rf .libs _libs ! ! distclean-libtool: ! ! maintainer-clean-libtool: ! ! test-async$(EXEEXT): $(test_async_OBJECTS) $(test_async_DEPENDENCIES) @rm -f test-async$(EXEEXT) $(LINK) $(test_async_LDFLAGS) $(test_async_OBJECTS) $(test_async_LDADD) $(LIBS) ! ! test-async-cancel$(EXEEXT): $(test_async_cancel_OBJECTS) $(test_async_cancel_DEPENDENCIES) @rm -f test-async-cancel$(EXEEXT) $(LINK) $(test_async_cancel_LDFLAGS) $(test_async_cancel_OBJECTS) $(test_async_cancel_LDADD) $(LIBS) ! ! test-async-directory$(EXEEXT): $(test_async_directory_OBJECTS) $(test_async_directory_DEPENDENCIES) @rm -f test-async-directory$(EXEEXT) $(LINK) $(test_async_directory_LDFLAGS) $(test_async_directory_OBJECTS) $(test_async_directory_LDADD) $(LIBS) ! ! test-channel$(EXEEXT): $(test_channel_OBJECTS) $(test_channel_DEPENDENCIES) @rm -f test-channel$(EXEEXT) $(LINK) $(test_channel_LDFLAGS) $(test_channel_OBJECTS) $(test_channel_LDADD) $(LIBS) ! ! test-directory$(EXEEXT): $(test_directory_OBJECTS) $(test_directory_DEPENDENCIES) @rm -f test-directory$(EXEEXT) $(LINK) $(test_directory_LDFLAGS) $(test_directory_OBJECTS) $(test_directory_LDADD) $(LIBS) ! ! test-directory-visit$(EXEEXT): $(test_directory_visit_OBJECTS) $(test_directory_visit_DEPENDENCIES) @rm -f test-directory-visit$(EXEEXT) $(LINK) $(test_directory_visit_LDFLAGS) $(test_directory_visit_OBJECTS) $(test_directory_visit_LDADD) $(LIBS) ! ! test-dirop$(EXEEXT): $(test_dirop_OBJECTS) $(test_dirop_DEPENDENCIES) @rm -f test-dirop$(EXEEXT) $(LINK) $(test_dirop_LDFLAGS) $(test_dirop_OBJECTS) $(test_dirop_LDADD) $(LIBS) ! ! test-escape$(EXEEXT): $(test_escape_OBJECTS) $(test_escape_DEPENDENCIES) @rm -f test-escape$(EXEEXT) $(LINK) $(test_escape_LDFLAGS) $(test_escape_OBJECTS) $(test_escape_LDADD) $(LIBS) ! ! test-find-directory$(EXEEXT): $(test_find_directory_OBJECTS) $(test_find_directory_DEPENDENCIES) @rm -f test-find-directory$(EXEEXT) $(LINK) $(test_find_directory_LDFLAGS) $(test_find_directory_OBJECTS) $(test_find_directory_LDADD) $(LIBS) ! ! test-info$(EXEEXT): $(test_info_OBJECTS) $(test_info_DEPENDENCIES) @rm -f test-info$(EXEEXT) $(LINK) $(test_info_LDFLAGS) $(test_info_OBJECTS) $(test_info_LDADD) $(LIBS) ! ! test-mime$(EXEEXT): $(test_mime_OBJECTS) $(test_mime_DEPENDENCIES) @rm -f test-mime$(EXEEXT) $(LINK) $(test_mime_LDFLAGS) $(test_mime_OBJECTS) $(test_mime_LDADD) $(LIBS) ! ! test-mime-handlers$(EXEEXT): $(test_mime_handlers_OBJECTS) $(test_mime_handlers_DEPENDENCIES) @rm -f test-mime-handlers$(EXEEXT) $(LINK) $(test_mime_handlers_LDFLAGS) $(test_mime_handlers_OBJECTS) $(test_mime_handlers_LDADD) $(LIBS) ! ! test-mime-handlers-set$(EXEEXT): $(test_mime_handlers_set_OBJECTS) $(test_mime_handlers_set_DEPENDENCIES) @rm -f test-mime-handlers-set$(EXEEXT) $(LINK) $(test_mime_handlers_set_LDFLAGS) $(test_mime_handlers_set_OBJECTS) $(test_mime_handlers_set_LDADD) $(LIBS) ! ! test-mime-info$(EXEEXT): $(test_mime_info_OBJECTS) $(test_mime_info_DEPENDENCIES) @rm -f test-mime-info$(EXEEXT) $(LINK) $(test_mime_info_LDFLAGS) $(test_mime_info_OBJECTS) $(test_mime_info_LDADD) $(LIBS) ! ! test-monitor$(EXEEXT): $(test_monitor_OBJECTS) $(test_monitor_DEPENDENCIES) @rm -f test-monitor$(EXEEXT) $(LINK) $(test_monitor_LDFLAGS) $(test_monitor_OBJECTS) $(test_monitor_LDADD) $(LIBS) ! ! test-performance$(EXEEXT): $(test_performance_OBJECTS) $(test_performance_DEPENDENCIES) @rm -f test-performance$(EXEEXT) $(LINK) $(test_performance_LDFLAGS) $(test_performance_OBJECTS) $(test_performance_LDADD) $(LIBS) ! ! test-seek$(EXEEXT): $(test_seek_OBJECTS) $(test_seek_DEPENDENCIES) @rm -f test-seek$(EXEEXT) $(LINK) $(test_seek_LDFLAGS) $(test_seek_OBJECTS) $(test_seek_LDADD) $(LIBS) ! ! test-shell$(EXEEXT): $(test_shell_OBJECTS) $(test_shell_DEPENDENCIES) @rm -f test-shell$(EXEEXT) $(LINK) $(test_shell_LDFLAGS) $(test_shell_OBJECTS) $(test_shell_LDADD) $(LIBS) ! ! test-symlinks$(EXEEXT): $(test_symlinks_OBJECTS) $(test_symlinks_DEPENDENCIES) ! @rm -f test-symlinks$(EXEEXT) ! $(LINK) $(test_symlinks_LDFLAGS) $(test_symlinks_OBJECTS) $(test_symlinks_LDADD) $(LIBS) ! ! test-ssl$(EXEEXT): $(test_ssl_OBJECTS) $(test_ssl_DEPENDENCIES) @rm -f test-ssl$(EXEEXT) $(LINK) $(test_ssl_LDFLAGS) $(test_ssl_OBJECTS) $(test_ssl_LDADD) $(LIBS) ! ! test-sync$(EXEEXT): $(test_sync_OBJECTS) $(test_sync_DEPENDENCIES) @rm -f test-sync$(EXEEXT) $(LINK) $(test_sync_LDFLAGS) $(test_sync_OBJECTS) $(test_sync_LDADD) $(LIBS) ! ! test-sync-create$(EXEEXT): $(test_sync_create_OBJECTS) $(test_sync_create_DEPENDENCIES) @rm -f test-sync-create$(EXEEXT) $(LINK) $(test_sync_create_LDFLAGS) $(test_sync_create_OBJECTS) $(test_sync_create_LDADD) $(LIBS) ! ! test-sync-write$(EXEEXT): $(test_sync_write_OBJECTS) $(test_sync_write_DEPENDENCIES) @rm -f test-sync-write$(EXEEXT) $(LINK) $(test_sync_write_LDFLAGS) $(test_sync_write_OBJECTS) $(test_sync_write_LDADD) $(LIBS) ! ! test-unlink$(EXEEXT): $(test_unlink_OBJECTS) $(test_unlink_DEPENDENCIES) @rm -f test-unlink$(EXEEXT) $(LINK) $(test_unlink_LDFLAGS) $(test_unlink_OBJECTS) $(test_unlink_LDADD) $(LIBS) ! ! test-uri$(EXEEXT): $(test_uri_OBJECTS) $(test_uri_DEPENDENCIES) @rm -f test-uri$(EXEEXT) $(LINK) $(test_uri_LDFLAGS) $(test_uri_OBJECTS) $(test_uri_LDADD) $(LIBS) ! ! test-xfer$(EXEEXT): $(test_xfer_OBJECTS) $(test_xfer_DEPENDENCIES) @rm -f test-xfer$(EXEEXT) $(LINK) $(test_xfer_LDFLAGS) $(test_xfer_OBJECTS) $(test_xfer_LDADD) $(LIBS) ! test-callback$(EXEEXT): $(test_callback_OBJECTS) $(test_callback_DEPENDENCIES) ! @rm -f test-callback$(EXEEXT) ! $(LINK) $(test_callback_LDFLAGS) $(test_callback_OBJECTS) $(test_callback_LDADD) $(LIBS) ! test-module-selftest$(EXEEXT): $(test_module_selftest_OBJECTS) $(test_module_selftest_DEPENDENCIES) ! @rm -f test-module-selftest$(EXEEXT) ! $(LINK) $(test_module_selftest_LDFLAGS) $(test_module_selftest_OBJECTS) $(test_module_selftest_LDADD) $(LIBS) ! test-queue$(EXEEXT): $(test_queue_OBJECTS) $(test_queue_DEPENDENCIES) ! @rm -f test-queue$(EXEEXT) ! $(LINK) $(test_queue_LDFLAGS) $(test_queue_OBJECTS) $(test_queue_LDADD) $(LIBS) tags: TAGS ! ID: $(HEADERS) $(SOURCES) $(LISP) ! list='$(SOURCES) $(HEADERS)'; \ ! unique=`for i in $$list; do echo $$i; done | \ ! awk ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ ! here=`pwd` && cd $(srcdir) \ ! && mkid -f$$here/ID $$unique $(LISP) ! TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) tags=; \ here=`pwd`; \ ! list='$(SOURCES) $(HEADERS)'; \ ! unique=`for i in $$list; do echo $$i; done | \ ! awk ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ ! test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ ! || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS) ! ! mostlyclean-tags: ! ! clean-tags: distclean-tags: ! -rm -f TAGS ID ! ! maintainer-clean-tags: ! distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) ! subdir = test distdir: $(DISTFILES) ! @for file in $(DISTFILES); do \ ! d=$(srcdir); \ if test -d $$d/$$file; then \ ! cp -pr $$d/$$file $(distdir)/$$file; \ else \ test -f $(distdir)/$$file \ ! || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ ! || cp -p $$d/$$file $(distdir)/$$file || :; \ fi; \ done - test-async-cancel.o: test-async-cancel.c ../config.h \ - ../libgnomevfs/gnome-vfs-async-ops.h \ - ../libgnomevfs/gnome-vfs-file-info.h \ - ../libgnomevfs/gnome-vfs-file-size.h \ - ../libgnomevfs/gnome-vfs-result.h \ - ../libgnomevfs/gnome-vfs-uri.h \ - ../libgnomevfs/gnome-vfs-find-directory.h \ - ../libgnomevfs/gnome-vfs-handle.h \ - ../libgnomevfs/gnome-vfs-context.h \ - ../libgnomevfs/gnome-vfs-cancellation.h \ - ../libgnomevfs/gnome-vfs-xfer.h ../libgnomevfs/gnome-vfs-init.h \ - ../libgnomevfs/gnome-vfs-job.h \ - ../libgnomevfs/gnome-vfs-module-callback.h \ - ../libgnomevfs/gnome-vfs-module-callback-private.h - test-async-directory.o: test-async-directory.c ../config.h \ - ../libgnomevfs/gnome-vfs-async-ops.h \ - ../libgnomevfs/gnome-vfs-file-info.h \ - ../libgnomevfs/gnome-vfs-file-size.h \ - ../libgnomevfs/gnome-vfs-result.h \ - ../libgnomevfs/gnome-vfs-uri.h \ - ../libgnomevfs/gnome-vfs-find-directory.h \ - ../libgnomevfs/gnome-vfs-handle.h \ - ../libgnomevfs/gnome-vfs-context.h \ - ../libgnomevfs/gnome-vfs-cancellation.h \ - ../libgnomevfs/gnome-vfs-xfer.h ../libgnomevfs/gnome-vfs-init.h - test-async.o: test-async.c ../config.h \ - ../libgnomevfs/gnome-vfs-async-ops.h \ - ../libgnomevfs/gnome-vfs-file-info.h \ - ../libgnomevfs/gnome-vfs-file-size.h \ - ../libgnomevfs/gnome-vfs-result.h \ - ../libgnomevfs/gnome-vfs-uri.h \ - ../libgnomevfs/gnome-vfs-find-directory.h \ - ../libgnomevfs/gnome-vfs-handle.h \ - ../libgnomevfs/gnome-vfs-context.h \ - ../libgnomevfs/gnome-vfs-cancellation.h \ - ../libgnomevfs/gnome-vfs-xfer.h ../libgnomevfs/gnome-vfs-init.h - test-callback.o: test-callback.c ../config.h \ - ../libgnomevfs/gnome-vfs-async-ops.h \ - ../libgnomevfs/gnome-vfs-file-info.h \ - ../libgnomevfs/gnome-vfs-file-size.h \ - ../libgnomevfs/gnome-vfs-result.h \ - ../libgnomevfs/gnome-vfs-uri.h \ - ../libgnomevfs/gnome-vfs-find-directory.h \ - ../libgnomevfs/gnome-vfs-handle.h \ - ../libgnomevfs/gnome-vfs-context.h \ - ../libgnomevfs/gnome-vfs-cancellation.h \ - ../libgnomevfs/gnome-vfs-xfer.h ../libgnomevfs/gnome-vfs-init.h \ - ../libgnomevfs/gnome-vfs-ops.h \ - ../libgnomevfs/gnome-vfs-monitor.h \ - ../libgnomevfs/gnome-vfs-module-callback.h \ - ../libgnomevfs/gnome-vfs-standard-callbacks.h - test-channel.o: test-channel.c ../config.h \ - ../libgnomevfs/gnome-vfs-async-ops.h \ - ../libgnomevfs/gnome-vfs-file-info.h \ - ../libgnomevfs/gnome-vfs-file-size.h \ - ../libgnomevfs/gnome-vfs-result.h \ - ../libgnomevfs/gnome-vfs-uri.h \ - ../libgnomevfs/gnome-vfs-find-directory.h \ - ../libgnomevfs/gnome-vfs-handle.h \ - ../libgnomevfs/gnome-vfs-context.h \ - ../libgnomevfs/gnome-vfs-cancellation.h \ - ../libgnomevfs/gnome-vfs-xfer.h ../libgnomevfs/gnome-vfs-init.h - test-directory-visit.o: test-directory-visit.c ../config.h \ - ../libgnomevfs/gnome-vfs-directory.h \ - ../libgnomevfs/gnome-vfs-file-info.h \ - ../libgnomevfs/gnome-vfs-file-size.h \ - ../libgnomevfs/gnome-vfs-result.h \ - ../libgnomevfs/gnome-vfs-uri.h ../libgnomevfs/gnome-vfs-init.h - test-directory.o: test-directory.c ../config.h \ - ../libgnomevfs/gnome-vfs-directory.h \ - ../libgnomevfs/gnome-vfs-file-info.h \ - ../libgnomevfs/gnome-vfs-file-size.h \ - ../libgnomevfs/gnome-vfs-result.h \ - ../libgnomevfs/gnome-vfs-uri.h ../libgnomevfs/gnome-vfs-init.h - test-dirop.o: test-dirop.c ../config.h ../libgnomevfs/gnome-vfs-init.h \ - ../libgnomevfs/gnome-vfs-ops.h \ - ../libgnomevfs/gnome-vfs-file-info.h \ - ../libgnomevfs/gnome-vfs-file-size.h \ - ../libgnomevfs/gnome-vfs-result.h \ - ../libgnomevfs/gnome-vfs-uri.h \ - ../libgnomevfs/gnome-vfs-handle.h \ - ../libgnomevfs/gnome-vfs-context.h \ - ../libgnomevfs/gnome-vfs-cancellation.h \ - ../libgnomevfs/gnome-vfs-monitor.h - test-escape.o: test-escape.c ../config.h ../libgnomevfs/gnome-vfs-init.h \ - ../libgnomevfs/gnome-vfs-utils.h \ - ../libgnomevfs/gnome-vfs-file-size.h \ - ../libgnomevfs/gnome-vfs-result.h \ - ../libgnomevfs/gnome-vfs-uri.h \ - ../libgnomevfs/gnome-vfs-handle.h \ - ../libgnomevfs/gnome-vfs-context.h \ - ../libgnomevfs/gnome-vfs-cancellation.h \ - ../libgnomevfs/gnome-vfs-file-info.h - test-find-directory.o: test-find-directory.c ../config.h \ - ../libgnomevfs/gnome-vfs-find-directory.h \ - ../libgnomevfs/gnome-vfs-result.h \ - ../libgnomevfs/gnome-vfs-uri.h ../libgnomevfs/gnome-vfs-init.h - test-info.o: test-info.c ../config.h ../libgnomevfs/gnome-vfs-init.h \ - ../libgnomevfs/gnome-vfs-ops.h \ - ../libgnomevfs/gnome-vfs-file-info.h \ - ../libgnomevfs/gnome-vfs-file-size.h \ - ../libgnomevfs/gnome-vfs-result.h \ - ../libgnomevfs/gnome-vfs-uri.h \ - ../libgnomevfs/gnome-vfs-handle.h \ - ../libgnomevfs/gnome-vfs-context.h \ - ../libgnomevfs/gnome-vfs-cancellation.h \ - ../libgnomevfs/gnome-vfs-monitor.h - test-metadata.o: test-metadata.c ../libgnomevfs/gnome-vfs.h \ - ../libgnomevfs/gnome-vfs-async-ops.h \ - ../libgnomevfs/gnome-vfs-file-info.h \ - ../libgnomevfs/gnome-vfs-file-size.h \ - ../libgnomevfs/gnome-vfs-result.h \ - ../libgnomevfs/gnome-vfs-uri.h \ - ../libgnomevfs/gnome-vfs-find-directory.h \ - ../libgnomevfs/gnome-vfs-handle.h \ - ../libgnomevfs/gnome-vfs-context.h \ - ../libgnomevfs/gnome-vfs-cancellation.h \ - ../libgnomevfs/gnome-vfs-xfer.h \ - ../libgnomevfs/gnome-vfs-directory.h \ - ../libgnomevfs/gnome-vfs-init.h \ - ../libgnomevfs/gnome-vfs-module-callback.h \ - ../libgnomevfs/gnome-vfs-monitor.h \ - ../libgnomevfs/gnome-vfs-ops.h ../libgnomevfs/gnome-vfs-utils.h \ - ../libgnomevfs/gnome-vfs-metadata.h - test-mime-handlers-set.o: test-mime-handlers-set.c ../config.h \ - ../libgnomevfs/gnome-vfs-application-registry.h \ - ../libgnomevfs/gnome-vfs-mime-handlers.h \ - ../libgnomevfs/gnome-vfs-mime-utils.h \ - ../libgnomevfs/gnome-vfs-result.h \ - ../libgnomevfs/gnome-vfs-uri.h ../libgnomevfs/gnome-vfs-init.h - test-mime-handlers.o: test-mime-handlers.c ../config.h \ - ../libgnomevfs/gnome-vfs-init.h \ - ../libgnomevfs/gnome-vfs-mime-handlers.h \ - ../libgnomevfs/gnome-vfs-mime-utils.h \ - ../libgnomevfs/gnome-vfs-result.h \ - ../libgnomevfs/gnome-vfs-uri.h \ - ../libgnomevfs/gnome-vfs-mime-info.h - test-mime-info.o: test-mime-info.c ../config.h \ - ../libgnomevfs/gnome-vfs-init.h \ - ../libgnomevfs/gnome-vfs-mime-handlers.h \ - ../libgnomevfs/gnome-vfs-mime-utils.h \ - ../libgnomevfs/gnome-vfs-result.h \ - ../libgnomevfs/gnome-vfs-uri.h \ - ../libgnomevfs/gnome-vfs-mime-info.h - test-mime.o: test-mime.c ../config.h ../libgnomevfs/gnome-vfs-init.h \ - ../libgnomevfs/gnome-vfs-mime-magic.h \ - ../libgnomevfs/gnome-vfs-mime-utils.h \ - ../libgnomevfs/gnome-vfs-mime-info.h \ - ../libgnomevfs/gnome-vfs-result.h \ - ../libgnomevfs/gnome-vfs-mime.h ../libgnomevfs/gnome-vfs-uri.h \ - ../libgnomevfs/gnome-vfs-utils.h \ - ../libgnomevfs/gnome-vfs-file-size.h \ - ../libgnomevfs/gnome-vfs-handle.h \ - ../libgnomevfs/gnome-vfs-context.h \ - ../libgnomevfs/gnome-vfs-cancellation.h \ - ../libgnomevfs/gnome-vfs-file-info.h - test-module-selftest.o: test-module-selftest.c ../config.h \ - ../libgnomevfs/gnome-vfs-init.h \ - ../libgnomevfs/gnome-vfs-private-utils.h \ - ../libgnomevfs/gnome-vfs-cancellation.h \ - ../libgnomevfs/gnome-vfs-handle.h \ - ../libgnomevfs/gnome-vfs-context.h \ - ../libgnomevfs/gnome-vfs-file-size.h \ - ../libgnomevfs/gnome-vfs-file-info.h \ - ../libgnomevfs/gnome-vfs-result.h \ - ../libgnomevfs/gnome-vfs-uri.h \ - ../libgnomevfs/gnome-vfs-process.h - test-monitor.o: test-monitor.c ../libgnomevfs/gnome-vfs.h \ - ../libgnomevfs/gnome-vfs-async-ops.h \ - ../libgnomevfs/gnome-vfs-file-info.h \ - ../libgnomevfs/gnome-vfs-file-size.h \ - ../libgnomevfs/gnome-vfs-result.h \ - ../libgnomevfs/gnome-vfs-uri.h \ - ../libgnomevfs/gnome-vfs-find-directory.h \ - ../libgnomevfs/gnome-vfs-handle.h \ - ../libgnomevfs/gnome-vfs-context.h \ - ../libgnomevfs/gnome-vfs-cancellation.h \ - ../libgnomevfs/gnome-vfs-xfer.h \ - ../libgnomevfs/gnome-vfs-directory.h \ - ../libgnomevfs/gnome-vfs-init.h \ - ../libgnomevfs/gnome-vfs-module-callback.h \ - ../libgnomevfs/gnome-vfs-monitor.h \ - ../libgnomevfs/gnome-vfs-ops.h ../libgnomevfs/gnome-vfs-utils.h - test-performance.o: test-performance.c ../config.h \ - ../libgnomevfs/gnome-vfs.h ../libgnomevfs/gnome-vfs-async-ops.h \ - ../libgnomevfs/gnome-vfs-file-info.h \ - ../libgnomevfs/gnome-vfs-file-size.h \ - ../libgnomevfs/gnome-vfs-result.h \ - ../libgnomevfs/gnome-vfs-uri.h \ - ../libgnomevfs/gnome-vfs-find-directory.h \ - ../libgnomevfs/gnome-vfs-handle.h \ - ../libgnomevfs/gnome-vfs-context.h \ - ../libgnomevfs/gnome-vfs-cancellation.h \ - ../libgnomevfs/gnome-vfs-xfer.h \ - ../libgnomevfs/gnome-vfs-directory.h \ - ../libgnomevfs/gnome-vfs-init.h \ - ../libgnomevfs/gnome-vfs-module-callback.h \ - ../libgnomevfs/gnome-vfs-monitor.h \ - ../libgnomevfs/gnome-vfs-ops.h ../libgnomevfs/gnome-vfs-utils.h \ - ../libgnomevfs/gnome-vfs-mime-info.h - test-queue.o: test-queue.c ../config.h \ - ../libgnomevfs/gnome-vfs-async-ops.h \ - ../libgnomevfs/gnome-vfs-file-info.h \ - ../libgnomevfs/gnome-vfs-file-size.h \ - ../libgnomevfs/gnome-vfs-result.h \ - ../libgnomevfs/gnome-vfs-uri.h \ - ../libgnomevfs/gnome-vfs-find-directory.h \ - ../libgnomevfs/gnome-vfs-handle.h \ - ../libgnomevfs/gnome-vfs-context.h \ - ../libgnomevfs/gnome-vfs-cancellation.h \ - ../libgnomevfs/gnome-vfs-xfer.h \ - ../libgnomevfs/gnome-vfs-job-limit.h \ - ../libgnomevfs/gnome-vfs-init.h ../libgnomevfs/gnome-vfs-job.h \ - ../libgnomevfs/gnome-vfs-module-callback.h \ - ../libgnomevfs/gnome-vfs-module-callback-private.h - test-resolv.o: test-resolv.c ../config.h ../libgnomevfs/gnome-vfs-init.h \ - ../libgnomevfs/gnome-vfs-ops.h \ - ../libgnomevfs/gnome-vfs-file-info.h \ - ../libgnomevfs/gnome-vfs-file-size.h \ - ../libgnomevfs/gnome-vfs-result.h \ - ../libgnomevfs/gnome-vfs-uri.h \ - ../libgnomevfs/gnome-vfs-handle.h \ - ../libgnomevfs/gnome-vfs-context.h \ - ../libgnomevfs/gnome-vfs-cancellation.h \ - ../libgnomevfs/gnome-vfs-monitor.h \ - ../libgnomevfs/gnome-vfs-private-utils.h \ - ../libgnomevfs/gnome-vfs-process.h - test-seek.o: test-seek.c ../config.h ../libgnomevfs/gnome-vfs-init.h \ - ../libgnomevfs/gnome-vfs-ops.h \ - ../libgnomevfs/gnome-vfs-file-info.h \ - ../libgnomevfs/gnome-vfs-file-size.h \ - ../libgnomevfs/gnome-vfs-result.h \ - ../libgnomevfs/gnome-vfs-uri.h \ - ../libgnomevfs/gnome-vfs-handle.h \ - ../libgnomevfs/gnome-vfs-context.h \ - ../libgnomevfs/gnome-vfs-cancellation.h \ - ../libgnomevfs/gnome-vfs-monitor.h - test-shell.o: test-shell.c ../config.h ../libgnomevfs/gnome-vfs-init.h \ - ../libgnomevfs/gnome-vfs-directory.h \ - ../libgnomevfs/gnome-vfs-file-info.h \ - ../libgnomevfs/gnome-vfs-file-size.h \ - ../libgnomevfs/gnome-vfs-result.h \ - ../libgnomevfs/gnome-vfs-uri.h \ - ../libgnomevfs/gnome-vfs-find-directory.h \ - ../libgnomevfs/gnome-vfs-ops.h \ - ../libgnomevfs/gnome-vfs-handle.h \ - ../libgnomevfs/gnome-vfs-context.h \ - ../libgnomevfs/gnome-vfs-cancellation.h \ - ../libgnomevfs/gnome-vfs-monitor.h \ - ../libgnomevfs/gnome-vfs-ssl.h \ - ../libgnomevfs/gnome-vfs-socket.h \ - ../libgnomevfs/gnome-vfs-module-callback.h \ - ../libgnomevfs/gnome-vfs-standard-callbacks.h - test-ssl.o: test-ssl.c ../config.h ../libgnomevfs/gnome-vfs-init.h \ - ../libgnomevfs/gnome-vfs-socket-buffer.h \ - ../libgnomevfs/gnome-vfs-socket.h \ - ../libgnomevfs/gnome-vfs-file-size.h \ - ../libgnomevfs/gnome-vfs-result.h \ - ../libgnomevfs/gnome-vfs-ssl.h - test-subdir.o: test-subdir.c ../config.h ../libgnomevfs/gnome-vfs-init.h \ - ../libgnomevfs/gnome-vfs-ops.h \ - ../libgnomevfs/gnome-vfs-file-info.h \ - ../libgnomevfs/gnome-vfs-file-size.h \ - ../libgnomevfs/gnome-vfs-result.h \ - ../libgnomevfs/gnome-vfs-uri.h \ - ../libgnomevfs/gnome-vfs-handle.h \ - ../libgnomevfs/gnome-vfs-context.h \ - ../libgnomevfs/gnome-vfs-cancellation.h \ - ../libgnomevfs/gnome-vfs-monitor.h \ - ../libgnomevfs/gnome-vfs-private-utils.h \ - ../libgnomevfs/gnome-vfs-process.h - test-symlinks.o: test-symlinks.c ../config.h \ - ../libgnomevfs/gnome-vfs-async-ops.h \ - ../libgnomevfs/gnome-vfs-file-info.h \ - ../libgnomevfs/gnome-vfs-file-size.h \ - ../libgnomevfs/gnome-vfs-result.h \ - ../libgnomevfs/gnome-vfs-uri.h \ - ../libgnomevfs/gnome-vfs-find-directory.h \ - ../libgnomevfs/gnome-vfs-handle.h \ - ../libgnomevfs/gnome-vfs-context.h \ - ../libgnomevfs/gnome-vfs-cancellation.h \ - ../libgnomevfs/gnome-vfs-xfer.h ../libgnomevfs/gnome-vfs-init.h \ - ../libgnomevfs/gnome-vfs-ops.h \ - ../libgnomevfs/gnome-vfs-monitor.h - test-sync-create.o: test-sync-create.c ../config.h \ - ../libgnomevfs/gnome-vfs-init.h ../libgnomevfs/gnome-vfs-ops.h \ - ../libgnomevfs/gnome-vfs-file-info.h \ - ../libgnomevfs/gnome-vfs-file-size.h \ - ../libgnomevfs/gnome-vfs-result.h \ - ../libgnomevfs/gnome-vfs-uri.h \ - ../libgnomevfs/gnome-vfs-handle.h \ - ../libgnomevfs/gnome-vfs-context.h \ - ../libgnomevfs/gnome-vfs-cancellation.h \ - ../libgnomevfs/gnome-vfs-monitor.h - test-sync-write.o: test-sync-write.c ../config.h \ - ../libgnomevfs/gnome-vfs-init.h ../libgnomevfs/gnome-vfs-ops.h \ - ../libgnomevfs/gnome-vfs-file-info.h \ - ../libgnomevfs/gnome-vfs-file-size.h \ - ../libgnomevfs/gnome-vfs-result.h \ - ../libgnomevfs/gnome-vfs-uri.h \ - ../libgnomevfs/gnome-vfs-handle.h \ - ../libgnomevfs/gnome-vfs-context.h \ - ../libgnomevfs/gnome-vfs-cancellation.h \ - ../libgnomevfs/gnome-vfs-monitor.h - test-sync.o: test-sync.c ../config.h ../libgnomevfs/gnome-vfs-init.h \ - ../libgnomevfs/gnome-vfs-ops.h \ - ../libgnomevfs/gnome-vfs-file-info.h \ - ../libgnomevfs/gnome-vfs-file-size.h \ - ../libgnomevfs/gnome-vfs-result.h \ - ../libgnomevfs/gnome-vfs-uri.h \ - ../libgnomevfs/gnome-vfs-handle.h \ - ../libgnomevfs/gnome-vfs-context.h \ - ../libgnomevfs/gnome-vfs-cancellation.h \ - ../libgnomevfs/gnome-vfs-monitor.h - test-unlink.o: test-unlink.c ../config.h ../libgnomevfs/gnome-vfs-init.h \ - ../libgnomevfs/gnome-vfs-ops.h \ - ../libgnomevfs/gnome-vfs-file-info.h \ - ../libgnomevfs/gnome-vfs-file-size.h \ - ../libgnomevfs/gnome-vfs-result.h \ - ../libgnomevfs/gnome-vfs-uri.h \ - ../libgnomevfs/gnome-vfs-handle.h \ - ../libgnomevfs/gnome-vfs-context.h \ - ../libgnomevfs/gnome-vfs-cancellation.h \ - ../libgnomevfs/gnome-vfs-monitor.h - test-uri.o: test-uri.c ../config.h ../libgnomevfs/gnome-vfs-init.h \ - ../libgnomevfs/gnome-vfs-private-utils.h \ - ../libgnomevfs/gnome-vfs-cancellation.h \ - ../libgnomevfs/gnome-vfs-handle.h \ - ../libgnomevfs/gnome-vfs-context.h \ - ../libgnomevfs/gnome-vfs-file-size.h \ - ../libgnomevfs/gnome-vfs-file-info.h \ - ../libgnomevfs/gnome-vfs-result.h \ - ../libgnomevfs/gnome-vfs-uri.h \ - ../libgnomevfs/gnome-vfs-process.h \ - ../libgnomevfs/gnome-vfs-utils.h - test-xfer.o: test-xfer.c ../config.h ../libgnomevfs/gnome-vfs-init.h \ - ../libgnomevfs/gnome-vfs-xfer.h \ - ../libgnomevfs/gnome-vfs-file-info.h \ - ../libgnomevfs/gnome-vfs-file-size.h \ - ../libgnomevfs/gnome-vfs-result.h \ - ../libgnomevfs/gnome-vfs-uri.h - - check-TESTS: $(TESTS) - @failed=0; all=0; \ - srcdir=$(srcdir); export srcdir; \ - for tst in $(TESTS); do \ - if test -f $$tst; then dir=.; \ - else dir="$(srcdir)"; fi; \ - if $(TESTS_ENVIRONMENT) $$dir/$$tst; then \ - all=`expr $$all + 1`; \ - echo "PASS: $$tst"; \ - elif test $$? -ne 77; then \ - all=`expr $$all + 1`; \ - failed=`expr $$failed + 1`; \ - echo "FAIL: $$tst"; \ - fi; \ - done; \ - if test "$$failed" -eq 0; then \ - banner="All $$all tests passed"; \ - else \ - banner="$$failed of $$all tests failed"; \ - fi; \ - dashes=`echo "$$banner" | sed s/./=/g`; \ - echo "$$dashes"; \ - echo "$$banner"; \ - echo "$$dashes"; \ - test "$$failed" -eq 0 - info-am: - info: info-am - dvi-am: - dvi: dvi-am check-am: all-am $(MAKE) $(AM_MAKEFLAGS) check-TESTS check: check-am ! installcheck-am: ! installcheck: installcheck-am ! install-exec-am: ! install-exec: install-exec-am ! install-data-am: ! install-data: install-data-am - install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am install: install-am ! uninstall-am: uninstall: uninstall-am - all-am: Makefile $(PROGRAMS) - all-redirect: all-am - install-strip: - $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install - installdirs: mostlyclean-generic: clean-generic: distclean-generic: -rm -f Makefile $(CONFIG_CLEAN_FILES) - -rm -f config.cache config.log stamp-h stamp-h[0-9]* maintainer-clean-generic: ! mostlyclean-am: mostlyclean-noinstPROGRAMS mostlyclean-compile \ ! mostlyclean-libtool mostlyclean-tags \ ! mostlyclean-generic ! mostlyclean: mostlyclean-am ! clean-am: clean-noinstPROGRAMS clean-compile clean-libtool clean-tags \ ! clean-generic mostlyclean-am ! clean: clean-am ! distclean-am: distclean-noinstPROGRAMS distclean-compile \ ! distclean-libtool distclean-tags distclean-generic \ ! clean-am ! -rm -f libtool ! distclean: distclean-am ! maintainer-clean-am: maintainer-clean-noinstPROGRAMS \ ! maintainer-clean-compile maintainer-clean-libtool \ ! maintainer-clean-tags maintainer-clean-generic \ ! distclean-am ! @echo "This command is intended for maintainers to use;" ! @echo "it deletes files that may require special tools to rebuild." maintainer-clean: maintainer-clean-am ! .PHONY: mostlyclean-noinstPROGRAMS distclean-noinstPROGRAMS \ ! clean-noinstPROGRAMS maintainer-clean-noinstPROGRAMS \ ! mostlyclean-compile distclean-compile clean-compile \ ! maintainer-clean-compile mostlyclean-libtool distclean-libtool \ ! clean-libtool maintainer-clean-libtool tags mostlyclean-tags \ ! distclean-tags clean-tags maintainer-clean-tags distdir check-TESTS \ ! info-am info dvi-am dvi check check-am installcheck-am installcheck \ ! install-exec-am install-exec install-data-am install-data install-am \ ! install uninstall-am uninstall all-redirect all-am all installdirs \ ! mostlyclean-generic distclean-generic clean-generic \ ! maintainer-clean-generic clean mostlyclean distclean maintainer-clean # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. --- 401,962 ---- EXTRA_DIST = \ $(test_files) \ vfs-run.in + subdir = test mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ! CONFIG_HEADER = $(top_builddir)/config.h ! CONFIG_CLEAN_FILES = vfs-run ! noinst_PROGRAMS = test-async$(EXEEXT) test-async-cancel$(EXEEXT) \ ! test-async-directory$(EXEEXT) test-channel$(EXEEXT) \ ! test-directory$(EXEEXT) test-directory-visit$(EXEEXT) \ ! test-dirop$(EXEEXT) test-escape$(EXEEXT) \ ! test-find-directory$(EXEEXT) test-info$(EXEEXT) \ ! test-mime$(EXEEXT) test-mime-handlers$(EXEEXT) \ ! test-mime-handlers-set$(EXEEXT) test-mime-info$(EXEEXT) \ ! test-monitor$(EXEEXT) test-performance$(EXEEXT) \ ! test-seek$(EXEEXT) test-shell$(EXEEXT) test-symlinks$(EXEEXT) \ ! test-ssl$(EXEEXT) test-sync$(EXEEXT) test-sync-create$(EXEEXT) \ ! test-sync-write$(EXEEXT) test-unlink$(EXEEXT) test-uri$(EXEEXT) \ ! test-xfer$(EXEEXT) test-callback$(EXEEXT) \ ! test-module-selftest$(EXEEXT) test-queue$(EXEEXT) ! PROGRAMS = $(noinst_PROGRAMS) ! ! am_test_async_OBJECTS = test-async.$(OBJEXT) ! test_async_OBJECTS = $(am_test_async_OBJECTS) ! test_async_DEPENDENCIES = $(top_builddir)/libgnomevfs/libgnomevfs-2.la ! test_async_LDFLAGS = ! am_test_async_cancel_OBJECTS = test-async-cancel.$(OBJEXT) ! test_async_cancel_OBJECTS = $(am_test_async_cancel_OBJECTS) ! test_async_cancel_DEPENDENCIES = \ ! $(top_builddir)/libgnomevfs/libgnomevfs-2.la ! test_async_cancel_LDFLAGS = ! am_test_async_directory_OBJECTS = test-async-directory.$(OBJEXT) ! test_async_directory_OBJECTS = $(am_test_async_directory_OBJECTS) ! test_async_directory_DEPENDENCIES = \ ! $(top_builddir)/libgnomevfs/libgnomevfs-2.la ! test_async_directory_LDFLAGS = ! am_test_callback_OBJECTS = test-callback.$(OBJEXT) ! test_callback_OBJECTS = $(am_test_callback_OBJECTS) ! test_callback_DEPENDENCIES = \ ! $(top_builddir)/libgnomevfs/libgnomevfs-2.la ! test_callback_LDFLAGS = ! am_test_channel_OBJECTS = test-channel.$(OBJEXT) ! test_channel_OBJECTS = $(am_test_channel_OBJECTS) ! test_channel_DEPENDENCIES = $(top_builddir)/libgnomevfs/libgnomevfs-2.la ! test_channel_LDFLAGS = ! am_test_directory_OBJECTS = test-directory.$(OBJEXT) ! test_directory_OBJECTS = $(am_test_directory_OBJECTS) ! test_directory_DEPENDENCIES = \ ! $(top_builddir)/libgnomevfs/libgnomevfs-2.la ! test_directory_LDFLAGS = ! am_test_directory_visit_OBJECTS = test-directory-visit.$(OBJEXT) ! test_directory_visit_OBJECTS = $(am_test_directory_visit_OBJECTS) ! test_directory_visit_DEPENDENCIES = \ ! $(top_builddir)/libgnomevfs/libgnomevfs-2.la ! test_directory_visit_LDFLAGS = ! am_test_dirop_OBJECTS = test-dirop.$(OBJEXT) ! test_dirop_OBJECTS = $(am_test_dirop_OBJECTS) ! test_dirop_DEPENDENCIES = $(top_builddir)/libgnomevfs/libgnomevfs-2.la ! test_dirop_LDFLAGS = ! am_test_escape_OBJECTS = test-escape.$(OBJEXT) ! test_escape_OBJECTS = $(am_test_escape_OBJECTS) ! test_escape_DEPENDENCIES = $(top_builddir)/libgnomevfs/libgnomevfs-2.la ! test_escape_LDFLAGS = ! am_test_find_directory_OBJECTS = test-find-directory.$(OBJEXT) ! test_find_directory_OBJECTS = $(am_test_find_directory_OBJECTS) ! test_find_directory_DEPENDENCIES = \ ! $(top_builddir)/libgnomevfs/libgnomevfs-2.la ! test_find_directory_LDFLAGS = ! am_test_info_OBJECTS = test-info.$(OBJEXT) ! test_info_OBJECTS = $(am_test_info_OBJECTS) ! test_info_DEPENDENCIES = $(top_builddir)/libgnomevfs/libgnomevfs-2.la ! test_info_LDFLAGS = ! am_test_mime_OBJECTS = test-mime.$(OBJEXT) ! test_mime_OBJECTS = $(am_test_mime_OBJECTS) ! test_mime_DEPENDENCIES = $(top_builddir)/libgnomevfs/libgnomevfs-2.la ! test_mime_LDFLAGS = ! am_test_mime_handlers_OBJECTS = test-mime-handlers.$(OBJEXT) ! test_mime_handlers_OBJECTS = $(am_test_mime_handlers_OBJECTS) ! test_mime_handlers_DEPENDENCIES = \ ! $(top_builddir)/libgnomevfs/libgnomevfs-2.la ! test_mime_handlers_LDFLAGS = ! am_test_mime_handlers_set_OBJECTS = test-mime-handlers-set.$(OBJEXT) ! test_mime_handlers_set_OBJECTS = $(am_test_mime_handlers_set_OBJECTS) ! test_mime_handlers_set_DEPENDENCIES = \ ! $(top_builddir)/libgnomevfs/libgnomevfs-2.la ! test_mime_handlers_set_LDFLAGS = ! am_test_mime_info_OBJECTS = test-mime-info.$(OBJEXT) ! test_mime_info_OBJECTS = $(am_test_mime_info_OBJECTS) ! test_mime_info_DEPENDENCIES = \ ! $(top_builddir)/libgnomevfs/libgnomevfs-2.la ! test_mime_info_LDFLAGS = ! am_test_module_selftest_OBJECTS = test-module-selftest.$(OBJEXT) ! test_module_selftest_OBJECTS = $(am_test_module_selftest_OBJECTS) ! test_module_selftest_DEPENDENCIES = \ ! $(top_builddir)/libgnomevfs/libgnomevfs-2.la ! test_module_selftest_LDFLAGS = ! am_test_monitor_OBJECTS = test-monitor.$(OBJEXT) ! test_monitor_OBJECTS = $(am_test_monitor_OBJECTS) ! test_monitor_DEPENDENCIES = $(top_builddir)/libgnomevfs/libgnomevfs-2.la ! test_monitor_LDFLAGS = ! am_test_performance_OBJECTS = test-performance.$(OBJEXT) ! test_performance_OBJECTS = $(am_test_performance_OBJECTS) ! test_performance_DEPENDENCIES = \ ! $(top_builddir)/libgnomevfs/libgnomevfs-2.la ! test_performance_LDFLAGS = ! am_test_queue_OBJECTS = test-queue.$(OBJEXT) ! test_queue_OBJECTS = $(am_test_queue_OBJECTS) ! test_queue_DEPENDENCIES = $(top_builddir)/libgnomevfs/libgnomevfs-2.la ! test_queue_LDFLAGS = ! am_test_seek_OBJECTS = test-seek.$(OBJEXT) ! test_seek_OBJECTS = $(am_test_seek_OBJECTS) ! test_seek_DEPENDENCIES = $(top_builddir)/libgnomevfs/libgnomevfs-2.la ! test_seek_LDFLAGS = ! am_test_shell_OBJECTS = test-shell.$(OBJEXT) ! test_shell_OBJECTS = $(am_test_shell_OBJECTS) ! test_shell_DEPENDENCIES = $(top_builddir)/libgnomevfs/libgnomevfs-2.la ! test_shell_LDFLAGS = ! am_test_ssl_OBJECTS = test-ssl.$(OBJEXT) ! test_ssl_OBJECTS = $(am_test_ssl_OBJECTS) ! test_ssl_DEPENDENCIES = $(top_builddir)/libgnomevfs/libgnomevfs-2.la ! test_ssl_LDFLAGS = ! am_test_symlinks_OBJECTS = test-symlinks.$(OBJEXT) ! test_symlinks_OBJECTS = $(am_test_symlinks_OBJECTS) ! test_symlinks_DEPENDENCIES = \ ! $(top_builddir)/libgnomevfs/libgnomevfs-2.la ! test_symlinks_LDFLAGS = ! am_test_sync_OBJECTS = test-sync.$(OBJEXT) ! test_sync_OBJECTS = $(am_test_sync_OBJECTS) ! test_sync_DEPENDENCIES = $(top_builddir)/libgnomevfs/libgnomevfs-2.la ! test_sync_LDFLAGS = ! am_test_sync_create_OBJECTS = test-sync-create.$(OBJEXT) ! test_sync_create_OBJECTS = $(am_test_sync_create_OBJECTS) ! test_sync_create_DEPENDENCIES = \ ! $(top_builddir)/libgnomevfs/libgnomevfs-2.la ! test_sync_create_LDFLAGS = ! am_test_sync_write_OBJECTS = test-sync-write.$(OBJEXT) ! test_sync_write_OBJECTS = $(am_test_sync_write_OBJECTS) ! test_sync_write_DEPENDENCIES = \ ! $(top_builddir)/libgnomevfs/libgnomevfs-2.la ! test_sync_write_LDFLAGS = ! am_test_unlink_OBJECTS = test-unlink.$(OBJEXT) ! test_unlink_OBJECTS = $(am_test_unlink_OBJECTS) ! test_unlink_DEPENDENCIES = $(top_builddir)/libgnomevfs/libgnomevfs-2.la ! test_unlink_LDFLAGS = ! am_test_uri_OBJECTS = test-uri.$(OBJEXT) ! test_uri_OBJECTS = $(am_test_uri_OBJECTS) ! test_uri_DEPENDENCIES = $(top_builddir)/libgnomevfs/libgnomevfs-2.la ! test_uri_LDFLAGS = ! am_test_xfer_OBJECTS = test-xfer.$(OBJEXT) ! test_xfer_OBJECTS = $(am_test_xfer_OBJECTS) ! test_xfer_DEPENDENCIES = $(top_builddir)/libgnomevfs/libgnomevfs-2.la ! test_xfer_LDFLAGS = ! ! DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ! depcomp = ! am__depfiles_maybe = ! COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ ! $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ! LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ ! $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) ! LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ! $(AM_LDFLAGS) $(LDFLAGS) -o $@ ! DIST_SOURCES = $(test_async_SOURCES) $(test_async_cancel_SOURCES) \ ! $(test_async_directory_SOURCES) $(test_callback_SOURCES) \ ! $(test_channel_SOURCES) $(test_directory_SOURCES) \ ! $(test_directory_visit_SOURCES) $(test_dirop_SOURCES) \ ! $(test_escape_SOURCES) $(test_find_directory_SOURCES) \ ! $(test_info_SOURCES) $(test_mime_SOURCES) \ ! $(test_mime_handlers_SOURCES) $(test_mime_handlers_set_SOURCES) \ ! $(test_mime_info_SOURCES) $(test_module_selftest_SOURCES) \ ! $(test_monitor_SOURCES) $(test_performance_SOURCES) \ ! $(test_queue_SOURCES) $(test_seek_SOURCES) \ ! $(test_shell_SOURCES) $(test_ssl_SOURCES) \ ! $(test_symlinks_SOURCES) $(test_sync_SOURCES) \ ! $(test_sync_create_SOURCES) $(test_sync_write_SOURCES) \ ! $(test_unlink_SOURCES) $(test_uri_SOURCES) $(test_xfer_SOURCES) ! DIST_COMMON = Makefile.am Makefile.in vfs-run.in ! SOURCES = $(test_async_SOURCES) $(test_async_cancel_SOURCES) $(test_async_directory_SOURCES) $(test_callback_SOURCES) $(test_channel_SOURCES) $(test_directory_SOURCES) $(test_directory_visit_SOURCES) $(test_dirop_SOURCES) $(test_escape_SOURCES) $(test_find_directory_SOURCES) $(test_info_SOURCES) $(test_mime_SOURCES) $(test_mime_handlers_SOURCES) $(test_mime_handlers_set_SOURCES) $(test_mime_info_SOURCES) $(test_module_selftest_SOURCES) $(test_monitor_SOURCES) $(test_performance_SOURCES) $(test_queue_SOURCES) $(test_seek_SOURCES) $(test_shell_SOURCES) $(test_ssl_SOURCES) $(test_symlinks_SOURCES) $(test_sync_SOURCES) $(test_sync_create_SOURCES) $(test_sync_write_SOURCES) $(test_unlink_SOURCES) $(test_uri_SOURCES) $(test_xfer_SOURCES) ! all: all-am .SUFFIXES: ! .SUFFIXES: .c .lo .o .obj ! $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) ! cd $(top_srcdir) && \ ! $(AUTOMAKE) --gnu --ignore-deps test/Makefile ! Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status ! cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) vfs-run: $(top_builddir)/config.status vfs-run.in ! cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ clean-noinstPROGRAMS: ! @list='$(noinst_PROGRAMS)'; for p in $$list; do \ ! f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ ! echo " rm -f $$p $$f"; \ ! rm -f $$p $$f ; \ ! done ! test-async$(EXEEXT): $(test_async_OBJECTS) $(test_async_DEPENDENCIES) @rm -f test-async$(EXEEXT) $(LINK) $(test_async_LDFLAGS) $(test_async_OBJECTS) $(test_async_LDADD) $(LIBS) ! test-async-cancel$(EXEEXT): $(test_async_cancel_OBJECTS) $(test_async_cancel_DEPENDENCIES) @rm -f test-async-cancel$(EXEEXT) $(LINK) $(test_async_cancel_LDFLAGS) $(test_async_cancel_OBJECTS) $(test_async_cancel_LDADD) $(LIBS) ! test-async-directory$(EXEEXT): $(test_async_directory_OBJECTS) $(test_async_directory_DEPENDENCIES) @rm -f test-async-directory$(EXEEXT) $(LINK) $(test_async_directory_LDFLAGS) $(test_async_directory_OBJECTS) $(test_async_directory_LDADD) $(LIBS) ! test-callback$(EXEEXT): $(test_callback_OBJECTS) $(test_callback_DEPENDENCIES) ! @rm -f test-callback$(EXEEXT) ! $(LINK) $(test_callback_LDFLAGS) $(test_callback_OBJECTS) $(test_callback_LDADD) $(LIBS) ! test-channel$(EXEEXT): $(test_channel_OBJECTS) $(test_channel_DEPENDENCIES) @rm -f test-channel$(EXEEXT) $(LINK) $(test_channel_LDFLAGS) $(test_channel_OBJECTS) $(test_channel_LDADD) $(LIBS) ! test-directory$(EXEEXT): $(test_directory_OBJECTS) $(test_directory_DEPENDENCIES) @rm -f test-directory$(EXEEXT) $(LINK) $(test_directory_LDFLAGS) $(test_directory_OBJECTS) $(test_directory_LDADD) $(LIBS) ! test-directory-visit$(EXEEXT): $(test_directory_visit_OBJECTS) $(test_directory_visit_DEPENDENCIES) @rm -f test-directory-visit$(EXEEXT) $(LINK) $(test_directory_visit_LDFLAGS) $(test_directory_visit_OBJECTS) $(test_directory_visit_LDADD) $(LIBS) ! test-dirop$(EXEEXT): $(test_dirop_OBJECTS) $(test_dirop_DEPENDENCIES) @rm -f test-dirop$(EXEEXT) $(LINK) $(test_dirop_LDFLAGS) $(test_dirop_OBJECTS) $(test_dirop_LDADD) $(LIBS) ! test-escape$(EXEEXT): $(test_escape_OBJECTS) $(test_escape_DEPENDENCIES) @rm -f test-escape$(EXEEXT) $(LINK) $(test_escape_LDFLAGS) $(test_escape_OBJECTS) $(test_escape_LDADD) $(LIBS) ! test-find-directory$(EXEEXT): $(test_find_directory_OBJECTS) $(test_find_directory_DEPENDENCIES) @rm -f test-find-directory$(EXEEXT) $(LINK) $(test_find_directory_LDFLAGS) $(test_find_directory_OBJECTS) $(test_find_directory_LDADD) $(LIBS) ! test-info$(EXEEXT): $(test_info_OBJECTS) $(test_info_DEPENDENCIES) @rm -f test-info$(EXEEXT) $(LINK) $(test_info_LDFLAGS) $(test_info_OBJECTS) $(test_info_LDADD) $(LIBS) ! test-mime$(EXEEXT): $(test_mime_OBJECTS) $(test_mime_DEPENDENCIES) @rm -f test-mime$(EXEEXT) $(LINK) $(test_mime_LDFLAGS) $(test_mime_OBJECTS) $(test_mime_LDADD) $(LIBS) ! test-mime-handlers$(EXEEXT): $(test_mime_handlers_OBJECTS) $(test_mime_handlers_DEPENDENCIES) @rm -f test-mime-handlers$(EXEEXT) $(LINK) $(test_mime_handlers_LDFLAGS) $(test_mime_handlers_OBJECTS) $(test_mime_handlers_LDADD) $(LIBS) ! test-mime-handlers-set$(EXEEXT): $(test_mime_handlers_set_OBJECTS) $(test_mime_handlers_set_DEPENDENCIES) @rm -f test-mime-handlers-set$(EXEEXT) $(LINK) $(test_mime_handlers_set_LDFLAGS) $(test_mime_handlers_set_OBJECTS) $(test_mime_handlers_set_LDADD) $(LIBS) ! test-mime-info$(EXEEXT): $(test_mime_info_OBJECTS) $(test_mime_info_DEPENDENCIES) @rm -f test-mime-info$(EXEEXT) $(LINK) $(test_mime_info_LDFLAGS) $(test_mime_info_OBJECTS) $(test_mime_info_LDADD) $(LIBS) ! test-module-selftest$(EXEEXT): $(test_module_selftest_OBJECTS) $(test_module_selftest_DEPENDENCIES) ! @rm -f test-module-selftest$(EXEEXT) ! $(LINK) $(test_module_selftest_LDFLAGS) $(test_module_selftest_OBJECTS) $(test_module_selftest_LDADD) $(LIBS) ! test-monitor$(EXEEXT): $(test_monitor_OBJECTS) $(test_monitor_DEPENDENCIES) @rm -f test-monitor$(EXEEXT) $(LINK) $(test_monitor_LDFLAGS) $(test_monitor_OBJECTS) $(test_monitor_LDADD) $(LIBS) ! test-performance$(EXEEXT): $(test_performance_OBJECTS) $(test_performance_DEPENDENCIES) @rm -f test-performance$(EXEEXT) $(LINK) $(test_performance_LDFLAGS) $(test_performance_OBJECTS) $(test_performance_LDADD) $(LIBS) ! test-queue$(EXEEXT): $(test_queue_OBJECTS) $(test_queue_DEPENDENCIES) ! @rm -f test-queue$(EXEEXT) ! $(LINK) $(test_queue_LDFLAGS) $(test_queue_OBJECTS) $(test_queue_LDADD) $(LIBS) ! test-seek$(EXEEXT): $(test_seek_OBJECTS) $(test_seek_DEPENDENCIES) @rm -f test-seek$(EXEEXT) $(LINK) $(test_seek_LDFLAGS) $(test_seek_OBJECTS) $(test_seek_LDADD) $(LIBS) ! test-shell$(EXEEXT): $(test_shell_OBJECTS) $(test_shell_DEPENDENCIES) @rm -f test-shell$(EXEEXT) $(LINK) $(test_shell_LDFLAGS) $(test_shell_OBJECTS) $(test_shell_LDADD) $(LIBS) ! test-ssl$(EXEEXT): $(test_ssl_OBJECTS) $(test_ssl_DEPENDENCIES) @rm -f test-ssl$(EXEEXT) $(LINK) $(test_ssl_LDFLAGS) $(test_ssl_OBJECTS) $(test_ssl_LDADD) $(LIBS) ! test-symlinks$(EXEEXT): $(test_symlinks_OBJECTS) $(test_symlinks_DEPENDENCIES) ! @rm -f test-symlinks$(EXEEXT) ! $(LINK) $(test_symlinks_LDFLAGS) $(test_symlinks_OBJECTS) $(test_symlinks_LDADD) $(LIBS) ! test-sync$(EXEEXT): $(test_sync_OBJECTS) $(test_sync_DEPENDENCIES) @rm -f test-sync$(EXEEXT) $(LINK) $(test_sync_LDFLAGS) $(test_sync_OBJECTS) $(test_sync_LDADD) $(LIBS) ! test-sync-create$(EXEEXT): $(test_sync_create_OBJECTS) $(test_sync_create_DEPENDENCIES) @rm -f test-sync-create$(EXEEXT) $(LINK) $(test_sync_create_LDFLAGS) $(test_sync_create_OBJECTS) $(test_sync_create_LDADD) $(LIBS) ! test-sync-write$(EXEEXT): $(test_sync_write_OBJECTS) $(test_sync_write_DEPENDENCIES) @rm -f test-sync-write$(EXEEXT) $(LINK) $(test_sync_write_LDFLAGS) $(test_sync_write_OBJECTS) $(test_sync_write_LDADD) $(LIBS) ! test-unlink$(EXEEXT): $(test_unlink_OBJECTS) $(test_unlink_DEPENDENCIES) @rm -f test-unlink$(EXEEXT) $(LINK) $(test_unlink_LDFLAGS) $(test_unlink_OBJECTS) $(test_unlink_LDADD) $(LIBS) ! test-uri$(EXEEXT): $(test_uri_OBJECTS) $(test_uri_DEPENDENCIES) @rm -f test-uri$(EXEEXT) $(LINK) $(test_uri_LDFLAGS) $(test_uri_OBJECTS) $(test_uri_LDADD) $(LIBS) ! test-xfer$(EXEEXT): $(test_xfer_OBJECTS) $(test_xfer_DEPENDENCIES) @rm -f test-xfer$(EXEEXT) $(LINK) $(test_xfer_LDFLAGS) $(test_xfer_OBJECTS) $(test_xfer_LDADD) $(LIBS) ! mostlyclean-compile: ! -rm -f *.$(OBJEXT) core *.core ! distclean-compile: ! -rm -f *.tab.c ! .c.o: ! $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< ! ! .c.obj: ! $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'` ! ! .c.lo: ! $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< ! ! mostlyclean-libtool: ! -rm -f *.lo ! ! clean-libtool: ! -rm -rf .libs _libs ! ! distclean-libtool: ! -rm -f libtool ! uninstall-info-am: ! ! ETAGS = etags ! ETAGSFLAGS = ! ! CTAGS = ctags ! CTAGSFLAGS = tags: TAGS ! ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) ! list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ ! unique=`for i in $$list; do \ ! if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ ! done | \ ! $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ ! mkid -fID $$unique ! TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ ! $(TAGS_FILES) $(LISP) tags=; \ here=`pwd`; \ ! list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ ! unique=`for i in $$list; do \ ! if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ ! done | \ ! $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ ! test -z "$(ETAGS_ARGS)$$tags$$unique" \ ! || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ! $$tags $$unique ! ! ctags: CTAGS ! CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ ! $(TAGS_FILES) $(LISP) ! tags=; \ ! here=`pwd`; \ ! list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ ! unique=`for i in $$list; do \ ! if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ ! done | \ ! $(AWK) ' { files[$$0] = 1; } \ ! END { for (i in files) print i; }'`; \ ! test -z "$(CTAGS_ARGS)$$tags$$unique" \ ! || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ ! $$tags $$unique ! ! GTAGS: ! here=`$(am__cd) $(top_builddir) && pwd` \ ! && cd $(top_srcdir) \ ! && gtags -i $(GTAGS_ARGS) $$here distclean-tags: ! -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags ! check-TESTS: $(TESTS) ! @failed=0; all=0; xfail=0; xpass=0; skip=0; \ ! srcdir=$(srcdir); export srcdir; \ ! list='$(TESTS)'; \ ! if test -n "$$list"; then \ ! for tst in $$list; do \ ! if test -f ./$$tst; then dir=./; \ ! elif test -f $$tst; then dir=; \ ! else dir="$(srcdir)/"; fi; \ ! if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ ! all=`expr $$all + 1`; \ ! case " $(XFAIL_TESTS) " in \ ! *" $$tst "*) \ ! xpass=`expr $$xpass + 1`; \ ! failed=`expr $$failed + 1`; \ ! echo "XPASS: $$tst"; \ ! ;; \ ! *) \ ! echo "PASS: $$tst"; \ ! ;; \ ! esac; \ ! elif test $$? -ne 77; then \ ! all=`expr $$all + 1`; \ ! case " $(XFAIL_TESTS) " in \ ! *" $$tst "*) \ ! xfail=`expr $$xfail + 1`; \ ! echo "XFAIL: $$tst"; \ ! ;; \ ! *) \ ! failed=`expr $$failed + 1`; \ ! echo "FAIL: $$tst"; \ ! ;; \ ! esac; \ ! else \ ! skip=`expr $$skip + 1`; \ ! echo "SKIP: $$tst"; \ ! fi; \ ! done; \ ! if test "$$failed" -eq 0; then \ ! if test "$$xfail" -eq 0; then \ ! banner="All $$all tests passed"; \ ! else \ ! banner="All $$all tests behaved as expected ($$xfail expected failures)"; \ ! fi; \ ! else \ ! if test "$$xpass" -eq 0; then \ ! banner="$$failed of $$all tests failed"; \ ! else \ ! banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \ ! fi; \ ! fi; \ ! dashes="$$banner"; \ ! skipped=""; \ ! if test "$$skip" -ne 0; then \ ! skipped="($$skip tests were not run)"; \ ! test `echo "$$skipped" | wc -c` -gt `echo "$$banner" | wc -c` && \ ! dashes="$$skipped"; \ ! fi; \ ! report=""; \ ! if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \ ! report="Please report to $(PACKAGE_BUGREPORT)"; \ ! test `echo "$$report" | wc -c` -gt `echo "$$banner" | wc -c` && \ ! dashes="$$report"; \ ! fi; \ ! dashes=`echo "$$dashes" | sed s/./=/g`; \ ! echo "$$dashes"; \ ! echo "$$banner"; \ ! test -n "$$skipped" && echo "$$skipped"; \ ! test -n "$$report" && echo "$$report"; \ ! echo "$$dashes"; \ ! test "$$failed" -eq 0; \ ! else :; fi ! DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ! top_distdir = .. ! distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) ! @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ ! topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ ! list='$(DISTFILES)'; for file in $$list; do \ ! case $$file in \ ! $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ ! $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ ! esac; \ ! if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ ! dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ ! if test "$$dir" != "$$file" && test "$$dir" != "."; then \ ! dir="/$$dir"; \ ! $(mkinstalldirs) "$(distdir)$$dir"; \ ! else \ ! dir=''; \ ! fi; \ if test -d $$d/$$file; then \ ! if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ ! cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ ! fi; \ ! cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ else \ test -f $(distdir)/$$file \ ! || cp -p $$d/$$file $(distdir)/$$file \ ! || exit 1; \ fi; \ done check-am: all-am $(MAKE) $(AM_MAKEFLAGS) check-TESTS check: check-am ! all-am: Makefile $(PROGRAMS) ! installdirs: install: install-am ! install-exec: install-exec-am ! install-data: install-data-am uninstall: uninstall-am + install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + installcheck: installcheck-am + install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: clean-generic: distclean-generic: -rm -f Makefile $(CONFIG_CLEAN_FILES) maintainer-clean-generic: ! @echo "This command is intended for maintainers to use" ! @echo "it deletes files that may require special tools to rebuild." ! clean: clean-am ! clean-am: clean-generic clean-libtool clean-noinstPROGRAMS \ ! mostlyclean-am ! distclean: distclean-am ! distclean-am: clean-am distclean-compile distclean-generic \ ! distclean-libtool distclean-tags ! dvi: dvi-am ! dvi-am: ! info: info-am ! ! info-am: ! ! install-data-am: ! ! install-exec-am: ! ! install-info: install-info-am ! ! install-man: ! ! installcheck-am: maintainer-clean: maintainer-clean-am ! maintainer-clean-am: distclean-am maintainer-clean-generic ! ! mostlyclean: mostlyclean-am ! ! mostlyclean-am: mostlyclean-compile mostlyclean-generic \ ! mostlyclean-libtool ! ! pdf: pdf-am ! ! pdf-am: ! ! ps: ps-am ! ! ps-am: ! ! uninstall-am: uninstall-info-am + .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \ + clean-generic clean-libtool clean-noinstPROGRAMS ctags \ + distclean distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am info info-am install \ + install-am install-data install-data-am install-exec \ + install-exec-am install-info install-info-am install-man \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic mostlyclean-libtool pdf \ + pdf-am ps ps-am tags uninstall uninstall-am uninstall-info-am # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded.